Merge pull request #1601 from GSA/phone_fix

fix phone number changing

.github/workflows/dependabot-auto-merge.yml

@@ -1,36 +0,0 @@
-name: Dependabot Auto-Merge
-
-on:
-  pull_request_target:
-    types: [opened, synchronize, reopened]
-
-permissions:
-  pull-requests: write # To approve PRs
-  contents: write # to merge PRs
-
-jobs:
-  auto-merge:
-    runs-on: ubuntu-latest
-    if: github.actor == 'dependabot[bot]' # Only dependabot PRs
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-
-      - name: Fetch Dependabot metadata
-        id: metadata
-        uses: dependabot/fetch-metadata@v2
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Auto-approve dependabot PR
-        uses: hmarr/auto-approve-action@v4
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Enable auto-merge for minor updates
-        if: steps.metadata.outputs.update-type == 'version-update:semver-minor'
-        run: |
-          gh pr merge --auto --squash "$PR_URL"
-        env:
-          PR_URL: ${{ github.event.pull_request.html_url }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

app/celery/scheduled_tasks.py

@@ -325,7 +325,14 @@ def batch_insert_notifications(self):
             elif isinstance(notification_dict["created_at"], list):
                 notification_dict["created_at"] = notification_dict["created_at"][0]
             notification = Notification(**notification_dict)
-            if notification is not None:
+            # notify-api-749 do not write to db
+            # if we have a verify_code we know this is the authentication notification at login time
+            # and not csv (containing PII) provided by the user, so allow verify_code to continue to exist
+            if notification is None:
+                continue
+            if "verify_code" in str(notification.personalisation):
+                pass
+            else:
                 batch.append(notification)
     try:
         dao_batch_insert_notifications(batch)

app/delivery/send_to_providers.py

@@ -42,12 +42,14 @@ def send_sms_to_provider(notification):
     """
     # Take this path for report generation, where we know
     # everything is in the cache.
-    personalisation = get_personalisation_from_s3(
-        notification.service_id,
-        notification.job_id,
-        notification.job_row_number,
-    )
-    notification.personalisation = personalisation
+
+    if "verify_code" not in str(notification.personalisation):
+        personalisation = get_personalisation_from_s3(
+            notification.service_id,
+            notification.job_id,
+            notification.job_row_number,
+        )
+        notification.personalisation = personalisation
 
     service = SerialisedService.from_id(notification.service_id)
     message_id = None
@@ -92,7 +94,6 @@ def send_sms_to_provider(notification):
                 recipient = None
                 # It is our 2facode, maybe
                 recipient = _get_verify_code(notification)
-
                 if recipient is None:
                     recipient = get_phone_number_from_s3(
                         notification.service_id,

app/notifications/process_notifications.py

@@ -145,6 +145,9 @@ def persist_notification(
             # it's just too hard with redis and timing to test this here
             if os.getenv("NOTIFY_ENVIRONMENT") == "test":
                 dao_create_notification(notification)
+            elif "verify_code" in str(notification.personalisation):
+                dao_create_notification(notification)
+
             else:
                 redis_store.rpush(
                     "message_queue",