Fixed in response to Argus' comments

bcgov · Nov 27, 2023 · 9eaa7a1 · 9eaa7a1
1 parent 8eb1339
commit 9eaa7a1
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/queue_services/entity-emailer/src/entity_emailer/message_tracker/tracker.py b/queue_services/entity-emailer/src/entity_emailer/message_tracker/tracker.py
@@ -89,15 +89,7 @@ def get_message_context_properties(queue_msg: nats.aio.client.Msg):
             message_id = f'{etype}_{option}_{ar_year}_{business_id}'
             return create_message_context_properties(etype, message_id, None, None, False)
 
-        if etype == 'agmLocationChange' \
-                and (option := email.get('option', None)) \
-                and option == 'COMPLETED' \
-                and (filing_id := email.get('filingId', None)):
-            # option contains current status of filing - COMPLETED
-            message_id = f'{etype}_{option}_{filing_id}'
-            return create_message_context_properties(etype, message_id, None, None, False)
-
-        if etype == 'agmExtension' \
+        if etype in ('agmLocationChange', 'agmExtension') \
                 and (option := email.get('option', None)) \
                 and option == 'COMPLETED' \
                 and (filing_id := email.get('filingId', None)):