From 4a91db8e113dbdf5ea388c53f72d4219fdbf86f7 Mon Sep 17 00:00:00 2001
From: Son NK <>
Date: Tue, 26 Jan 2021 09:46:47 +0100
Subject: [PATCH] rename parse_email_log_id_from_bounce -> parse_id_from_bounce

---
 app/email_utils.py        | 2 +-
 email_handler.py          | 4 ++--
 tests/test_email_utils.py | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/email_utils.py b/app/email_utils.py
index b1387771..6f3a652c 100644
--- a/app/email_utils.py
+++ b/app/email_utils.py
@@ -970,5 +970,5 @@ def should_disable(alias: Alias) -> bool:
     return False
 
 
-def parse_email_log_id_from_bounce(email_address: str) -> int:
+def parse_id_from_bounce(email_address: str) -> int:
     return int(email_address[email_address.find("+") : email_address.rfind("+")])
diff --git a/email_handler.py b/email_handler.py
index e23dcf9e..e1c93cbd 100644
--- a/email_handler.py
+++ b/email_handler.py
@@ -109,7 +109,7 @@ from app.email_utils import (
     is_valid_email,
     replace,
     should_disable,
-    parse_email_log_id_from_bounce,
+    parse_id_from_bounce,
 )
 from app.extensions import db
 from app.greylisting import greylisting_needed
@@ -1593,7 +1593,7 @@ def handle_bounce(envelope, rcpt_to) -> str:
     msg = email.message_from_bytes(envelope.original_content)
 
     # parse the EmailLog
-    email_log_id = parse_email_log_id_from_bounce(rcpt_to)
+    email_log_id = parse_id_from_bounce(rcpt_to)
     email_log = EmailLog.get(email_log_id)
 
     if not email_log:
diff --git a/tests/test_email_utils.py b/tests/test_email_utils.py
index 5c841093..9668d60c 100644
--- a/tests/test_email_utils.py
+++ b/tests/test_email_utils.py
@@ -26,7 +26,7 @@ from app.email_utils import (
     replace,
     should_disable,
     decode_text,
-    parse_email_log_id_from_bounce,
+    parse_id_from_bounce,
 )
 from app.extensions import db
 from app.models import User, CustomDomain, Alias, Contact, EmailLog
@@ -652,6 +652,6 @@ def test_should_disable_bounce_consecutive_days(flask_client):
     assert should_disable(alias)
 
 
-def test_parse_email_log_id_from_bounce():
-    assert parse_email_log_id_from_bounce("bounces+1234+@local") == 1234
-    assert parse_email_log_id_from_bounce(BOUNCE_EMAIL.format(1234)) == 1234
+def test_parse_id_from_bounce():
+    assert parse_id_from_bounce("bounces+1234+@local") == 1234
+    assert parse_id_from_bounce(BOUNCE_EMAIL.format(1234)) == 1234