Updates

rodrigo-barraza · rodrigo-barraza · commit 6702c7c37739 · 2025-02-19T08:29:35.000-08:00
diff --git a/jobs/payment-jobs/tasks/eft_statement_due_task.py b/jobs/payment-jobs/tasks/eft_statement_due_task.py
@@ -160,14 +160,15 @@ def _update_invoice_overdue_status(cls):
 
             # Only publish lock event if it is not already locked
             if payment_account.has_overdue_invoices is None:
-                lock_account_event_params = {
-                    "pay_account": payment_account,
-                    "additional_emails": current_app.config.get("EFT_OVERDUE_NOTIFY_EMAILS"),
-                    "payment_method": PaymentMethod.EFT.value,
-                    "source": QueueSources.PAY_JOBS.value,
-                    "suspension_reason_code": SuspensionReasonCodes.OVERDUE_EFT.value,
-                }
-                AuthEvent.publish_lock_account_event(lock_account_event_params)
+                AuthEvent.publish_lock_account_event(
+                    AuthEvent.LockAccountDetails(
+                        pay_account=payment_account,
+                        additional_emails=current_app.config.get("EFT_OVERDUE_NOTIFY_EMAILS"),
+                        payment_method=PaymentMethod.EFT.value,
+                        source=QueueSources.PAY_JOBS.value,
+                        suspension_reason_code=SuspensionReasonCodes.OVERDUE_EFT.value,
+                    )
+                )
 
             # Even if the account is locked, there is a new overdue statement that needs NSF invoices added and
             # set the most recent date for has_overdue_invoices
diff --git a/jobs/payment-jobs/tests/jobs/test_eft_statement_due_task.py b/jobs/payment-jobs/tests/jobs/test_eft_statement_due_task.py
@@ -232,13 +232,17 @@ def test_account_lock(setup, session):
         with patch("tasks.eft_statement_due_task.publish_payment_notification"):
             EFTStatementDueTask.process_unpaid_statements()
             mock_auth_event.assert_called_once()
-            expected_calls = [call({
-                'pay_account': account1,
-                'additional_emails': '',
-                'payment_method': PaymentMethod.EFT.value,
-                'source': 'PAY-JOBS',
-                'suspension_reason_code': 'OVERDUE_EFT'
-            })]
+            expected_calls = [
+                call(
+                    {
+                        "pay_account": account1,
+                        "additional_emails": "",
+                        "payment_method": PaymentMethod.EFT.value,
+                        "source": "PAY-JOBS",
+                        "suspension_reason_code": "OVERDUE_EFT",
+                    }
+                )
+            ]
             mock_auth_event.assert_has_calls(expected_calls, any_order=True)
             assert account1.has_overdue_invoices
             assert statements[0][0].overdue_notification_date
@@ -326,20 +330,24 @@ def test_multi_account_lock(setup, session):
             EFTStatementDueTask.process_unpaid_statements()
             mock_auth_event.call_count == 2
             expected_calls = [
-                call({
-                    'pay_account': account1,
-                    'additional_emails': '',
-                    'payment_method': PaymentMethod.EFT.value,
-                    'source': 'PAY-JOBS',
-                    'suspension_reason_code': 'OVERDUE_EFT'
-                }),
-                call({
-                    'pay_account': account2,
-                    'additional_emails': '',
-                    'payment_method': PaymentMethod.EFT.value,
-                    'source': 'PAY-JOBS',
-                    'suspension_reason_code': 'OVERDUE_EFT'
-                })
+                call(
+                    {
+                        "pay_account": account1,
+                        "additional_emails": "",
+                        "payment_method": PaymentMethod.EFT.value,
+                        "source": "PAY-JOBS",
+                        "suspension_reason_code": "OVERDUE_EFT",
+                    }
+                ),
+                call(
+                    {
+                        "pay_account": account2,
+                        "additional_emails": "",
+                        "payment_method": PaymentMethod.EFT.value,
+                        "source": "PAY-JOBS",
+                        "suspension_reason_code": "OVERDUE_EFT",
+                    }
+                ),
             ]
             mock_auth_event.assert_has_calls(expected_calls, any_order=True)
             assert statements1[0][1].overdue_notification_date
diff --git a/pay-api/src/pay_api/utils/auth_event.py b/pay-api/src/pay_api/utils/auth_event.py
@@ -1,5 +1,8 @@
 """Common code that sends AUTH events."""
 
+from dataclasses import asdict, dataclass
+from typing import Any, Optional
+
 from flask import current_app
 from sbc_common_components.utils.enums import QueueMessageTypes
 from sentry_sdk import capture_message
@@ -13,17 +16,30 @@
 class AuthEvent:
     """Publishes to the auth-queue as an auth event though PUBSUB, this message gets sent to account-mailer after."""
 
+    @dataclass
+    class LockAccountDetails:
+        """Lock account details."""
+
+        pay_account: Any
+        additional_emails: str = ""
+        payment_method: Optional[str] = None
+        source: Optional[str] = None
+        suspension_reason_code: Optional[str] = None
+        outstanding_amount: Optional[float] = None
+        original_amount: Optional[float] = None
+        amount: Optional[float] = None
+
     @staticmethod
-    def publish_lock_account_event(params: dict):
+    def publish_lock_account_event(params: LockAccountDetails):
         """Publish NSF lock account event to the auth queue."""
-        pay_account = params.get("pay_account")
-        additional_emails = params.get("additional_emails", "")
-        payment_method = params.get("payment_method", None)
-        source = params.get("source", None)
-        suspension_reason_code = params.get("suspension_reason_code", None)
-        outstanding_amount = params.get("outstanding_amount", None)
-        original_amount = params.get("original_amount", None)
-        amount = params.get("amount", None)
+        pay_account = params.pay_account
+        additional_emails = params.additional_emails
+        payment_method = params.payment_method
+        source = params.source
+        suspension_reason_code = params.suspension_reason_code
+        outstanding_amount = params.outstanding_amount
+        original_amount = params.original_amount
+        amount = params.amount
         try:
             lock_payload = {
                 "accountId": pay_account.auth_account_id,
diff --git a/pay-queue/devops/vaults.gcp.env b/pay-queue/devops/vaults.gcp.env
@@ -34,4 +34,4 @@ PAY_CONNECTOR_AUTH="op://relationship/$APP_ENV/pay-api/PAY_CONNECTOR_AUTH"
 EFT_TDI17_LOCATION_ID="op://relationship/$APP_ENV/pay-queue/EFT_TDI17_LOCATION_ID"
 EFT_WIRE_PATTERNS="op://relationship/$APP_ENV/pay-queue/EFT_WIRE_PATTERNS"
 EFT_PATTERNS="op://relationship/$APP_ENV/pay-queue/EFT_PATTERNS"
-PAD_OVERDUE_NOTIFY_EMAILS="op://relationship/$APP_ENV/pay-queue/PAD_OVERDUE_NOTIFY_EMAILS"
+PAD_NSF_NOTIFY_EMAILS="op://relationship/$APP_ENV/pay-queue/PAD_NSF_NOTIFY_EMAILS"
diff --git a/pay-queue/src/pay_queue/config.py b/pay-queue/src/pay_queue/config.py
@@ -102,7 +102,7 @@ class _Config:  # pylint: disable=too-few-public-methods,protected-access
     EFT_PATTERNS = get_comma_delimited_string_as_tuple(os.getenv("EFT_PATTERNS", ""))
 
     # PAD Config
-    PAD_OVERDUE_NOTIFY_EMAILS = os.getenv("PAD_OVERDUE_NOTIFY_EMAILS", "")
+    PAD_NSF_NOTIFY_EMAILS = os.getenv("PAD_NSF_NOTIFY_EMAILS", "")
 
     # Secret key for encrypting bank account
     ACCOUNT_SECRET_KEY = os.getenv("ACCOUNT_SECRET_KEY")
diff --git a/pay-queue/src/pay_queue/services/payment_reconciliations.py b/pay-queue/src/pay_queue/services/payment_reconciliations.py
@@ -394,17 +394,18 @@ def _process_consolidated_invoices(row, error_messages: List[Dict[str, any]]) ->
             # NSF Condition. Publish to account events for NSF.
             if _process_failed_payments(row):
                 # Send mailer and account events to update status and send email notification
-                lock_account_event_params = {
-                    "pay_account": payment_account,
-                    "additional_emails": current_app.config.get("PAD_OVERDUE_NOTIFY_EMAILS"),
-                    "payment_method": _convert_payment_method(_get_row_value(row, Column.SOURCE_TXN)),
-                    "source": QueueSources.PAY_QUEUE.value,
-                    "suspension_reason_code": SuspensionReasonCodes.OVERDUE_EFT.value,
-                    "outstanding_amount": _get_row_value(row, Column.TARGET_TXN_OUTSTANDING),
-                    "original_amount": _get_row_value(row, Column.TARGET_TXN_ORIGINAL),
-                    "amount": _get_row_value(row, Column.APP_AMOUNT),
-                }
-                AuthEvent.publish_lock_account_event(lock_account_event_params)
+                AuthEvent.publish_lock_account_event(
+                    AuthEvent.LockAccountDetails(
+                        pay_account=payment_account,
+                        additional_emails=current_app.config.get("PAD_OVERDUE_NOTIFY_EMAILS"),
+                        payment_method=_convert_payment_method(_get_row_value(row, Column.SOURCE_TXN)),
+                        source=QueueSources.PAY_QUEUE.value,
+                        suspension_reason_code=SuspensionReasonCodes.OVERDUE_EFT.value,
+                        outstanding_amount=_get_row_value(row, Column.TARGET_TXN_OUTSTANDING),
+                        original_amount=_get_row_value(row, Column.TARGET_TXN_ORIGINAL),
+                        amount=_get_row_value(row, Column.APP_AMOUNT),
+                    )
+                )
         else:
             error_msg = f"Target Transaction Type is received as {target_txn} for PAD, and cannot process {row}."
             has_errors = True
