Merge pull request #1595 from GSA/notify-admin-1588

Add debug for admin #1588

app/main/views/send.py

@@ -3,7 +3,16 @@ import uuid
 from string import ascii_uppercase
 from zipfile import BadZipFile
 
-from flask import abort, flash, redirect, render_template, request, session, url_for
+from flask import (
+    abort,
+    current_app,
+    flash,
+    redirect,
+    render_template,
+    request,
+    session,
+    url_for,
+)
 from flask_login import current_user
 from markupsafe import Markup
 from notifications_python_client.errors import HTTPError
@@ -31,12 +40,18 @@ from app.s3_client.s3_csv_client import (
     s3upload,
     set_metadata_on_csv_upload,
 )
-from app.utils import PermanentRedirect, should_skip_template_page, unicode_truncate
+from app.utils import (
+    PermanentRedirect,
+    hilite,
+    should_skip_template_page,
+    unicode_truncate,
+)
 from app.utils.csv import Spreadsheet, get_errors_for_csv
 from app.utils.templates import get_template
 from app.utils.user import user_has_permissions
 from notifications_utils import SMS_CHAR_COUNT_LIMIT
 from notifications_utils.insensitive_dict import InsensitiveDict
+from notifications_utils.logging import scrub
 from notifications_utils.recipients import RecipientCSV, first_column_headings
 from notifications_utils.sanitise_text import SanitiseASCII
 
@@ -938,6 +953,9 @@ def send_notification(service_id, template_id):
             )
         )
 
+    current_app.logger.info(
+        hilite(scrub(f"Recipient for the one-off will be {recipient}"))
+    )
     keys = []
     values = []
     for k, v in session["placeholders"].items():
@@ -971,6 +989,19 @@ def send_notification(service_id, template_id):
         valid="True",
     )
 
+    # Here we are attempting to cleverly link the job id to the one-off recipient
+    # If we know the partial phone number of the recipient, we can search
+    # on that initially and find this, which will give us the job_id
+    # And once we know the job_id, we can search on that and it might tell us something
+    # about report generation.
+    current_app.logger.info(
+        hilite(
+            scrub(
+                f"Created job to send one-off, recipient is {recipient}, job_id is {upload_id}"
+            )
+        )
+    )
+
     session.pop("recipient")
     session.pop("placeholders")
 

app/utils/csv.py

@@ -1,10 +1,13 @@
 import datetime
 
 import pytz
+from flask import current_app, json
 from flask_login import current_user
 
 from app.models.spreadsheet import Spreadsheet
+from app.utils import hilite
 from app.utils.templates import get_sample_template
+from notifications_utils.logging import scrub
 from notifications_utils.recipients import RecipientCSV
 
 
@@ -71,7 +74,24 @@ def generate_notifications_csv(**kwargs):
 
     # This generates the "batch" csv report
     if kwargs.get("job_id"):
+        # The kwargs contain the job id, which is linked to the recipient's partial phone number in other debug
+        # Some unit tests are mocking the kwargs and turning them into a function instead of dict,
+        # hence the try/except.
+        try:
+            current_app.logger.info(
+                hilite(f"Setting up report with kwargs {scrub(json.dumps(kwargs))}")
+            )
+        except TypeError:
+            pass
+
         original_file_contents = s3download(kwargs["service_id"], kwargs["job_id"])
+        # This will verify that the user actually did successfully upload a csv for a one-off.  Limit the size
+        # we display to 999 characters, because we don't want to show the contents for reports with thousands of rows.
+        current_app.logger.info(
+            hilite(
+                f"Original csv for job_id {kwargs['job_id']}: {scrub(original_file_contents[0:999])}"
+            )
+        )
         original_upload = RecipientCSV(
             original_file_contents,
             template=get_sample_template(kwargs["template_type"]),