merge from main

.ds.baseline

@@ -209,7 +209,7 @@
         "filename": "tests/app/aws/test_s3.py",
         "hashed_secret": "67a74306b06d0c01624fe0d0249a570f4d093747",
         "is_verified": false,
-        "line_number": 40,
+        "line_number": 42,
         "is_secret": false
       }
     ],
@@ -384,5 +384,5 @@
       }
     ]
   },
-  "generated_at": "2025-02-10T16:57:15Z"
+  "generated_at": "2025-02-27T21:09:45Z"
 }

Makefile

@@ -152,4 +152,4 @@ clean:
 .PHONY: test-single
 test-single: export NEW_RELIC_ENVIRONMENT=test
 test-single: ## Run a single test file
-	poetry run pytest $(TEST_FILE)
+	poetry run pytest -s $(TEST_FILE)

tests/app/aws/test_s3.py

@@ -22,8 +22,10 @@ from app.aws.s3 import (
     get_s3_object,
     get_s3_resource,
     list_s3_objects,
+    purge_bucket,
     read_s3_file,
     remove_csv_object,
+    remove_job_from_s3,
     remove_s3_object,
 )
 from app.clients import AWS_CLIENT_CONFIG
@@ -563,3 +565,72 @@ def test_get_s3_object_client_error(mocker):
     mock_logger.exception.assert_called_once_with(
         f"Can't retrieve S3 Object from {file_location}"
     )
+
+
+def test_purge_bucket(mocker):
+    mock_s3_resource = MagicMock()
+    mock_bucket = MagicMock()
+    mock_s3_resource.Bucket.return_value = mock_bucket
+    mocker.patch('app.aws.s3.get_s3_resource', return_value=mock_s3_resource)
+
+    purge_bucket('my-bucket', 'access-key', 'secret-key', 'region')
+
+    # Assert that the bucket's objects.all().delete() method was called
+    mock_bucket.objects.all.return_value.delete.assert_called_once()
+
+
+def test_remove_job_from_s3(mocker):
+    mock_get_job_location = mocker.patch("app.aws.s3.get_job_location")
+    mock_remove_s3_object = mocker.patch("app.aws.s3.remove_s3_object")
+
+    mock_get_job_location.return_value = (
+        "test-bucket",
+        "test.csv",
+        "fake-stuff",
+    )
+
+    remove_job_from_s3("service-id-123", "job-id-456")
+
+    mock_get_job_location.assert_called_once_with("service-id-123", "job-id-456")
+    mock_remove_s3_object.assert_called_once_with(
+        "test-bucket",
+        "test.csv",
+        "fake-stuff",
+    )
+
+
+def test_get_s3_files_handles_exception(mocker):
+    mock_current_app = mocker.patch("app.aws.s3.current_app")
+    mock_current_app.config = {
+        "CSV_UPLOAD_BUCKET": {"bucket": "test-bucket"},
+        "job_cache": {},
+    }
+
+    mock_list_s3_objects = mocker.patch("app.aws.s3.list_s3_objects")
+    mock_list_s3_objects.return_value = ["file1.csv", "file2.csv"]
+
+    mock_get_s3_resource = mocker.patch("app.aws.s3.get_s3_resource")
+
+    # Make the first call succeed, second call should fail.
+    mock_read_s3_file = mocker.patch(
+        "app.aws.s3.read_s3_file",
+        side_effect=[None, Exception("exception here")]
+    )
+
+    mock_thread_pool_executor = mocker.patch("app.aws.s3.ThreadPoolExecutor")
+    mock_executor = mock_thread_pool_executor.return_value.__enter__.return_value
+
+    def mock_map(func, iterable):
+        for item in iterable:
+            func(item)
+
+    mock_executor.map.side_effect = mock_map
+    get_s3_files()
+
+    calls = [
+        mocker.call("test-bucket", "file1.csv", mock_get_s3_resource.return_value),
+        mocker.call("test-bucket", "file2.csv", mock_get_s3_resource.return_value),
+    ]
+    mock_read_s3_file.assert_has_calls(calls, any_order=True)
+
+    mock_current_app.logger.exception.assert_called_with("Connection pool issue")

tests/app/dao/notification_dao/test_notification_dao.py

@@ -2134,3 +2134,55 @@ def test_sanitize_successful_notification_by_id():
                 "sent_at": ANY,
             },
         )
+
+
+def test_dao_get_notifications_by_recipient_or_reference_covers_sms_search_by_reference(notify_db_session):
+    """
+    This test:
+      1. Creates a service and an SMS template.
+      2. Creates a notification with a specific client_reference and status=FAILED.
+      3. Calls dao_get_notifications_by_recipient_or_reference with notification_type=SMS,
+         statuses=[FAILED], and a search term = client_reference.
+      4. Confirms the function returns exactly one notification matching that reference.
+    """
+
+    service = create_service(service_name="Test Service")
+    template = create_template(service=service, template_type=NotificationType.SMS)
+
+    # Instead of matching phone logic, we'll match on client_reference
+    data = {
+        "id": uuid.uuid4(),
+        "to": "1",
+        "normalised_to": "1",     # phone is irrelevant here
+        "service_id": service.id,
+        "service": service,
+        "template_id": template.id,
+        "template_version": template.version,
+        "status": NotificationStatus.FAILED,
+        "created_at": utc_now(),
+        "billable_units": 1,
+        "notification_type": template.template_type,
+        "key_type": KeyType.NORMAL,
+        "client_reference": "some-ref",  # <--- We'll search for this
+    }
+    notification = Notification(**data)
+    dao_create_notification(notification)
+
+    # We'll search by this reference instead of a phone number
+    search_term = "some-ref"
+
+    results_page = dao_get_notifications_by_recipient_or_reference(
+        service_id=service.id,
+        search_term=search_term,
+        notification_type=NotificationType.SMS,
+        statuses=[NotificationStatus.FAILED],
+        page=1,
+        page_size=50,
+    )
+
+    # Now we should find exactly one match
+    assert len(results_page.items) == 1, "Should find exactly one matching notification"
+    found = results_page.items[0]
+    assert found.id == notification.id
+    assert found.status == NotificationStatus.FAILED
+    assert found.client_reference == "some-ref"

tests/app/test_commands.py

@@ -15,6 +15,7 @@ from app.commands import (
     dump_sms_senders,
     dump_user_info,
     fix_billable_units,
+    generate_salt,
     insert_inbound_numbers_from_file,
     populate_annual_billing_with_defaults,
     populate_annual_billing_with_the_previous_years_allowance,
@@ -661,3 +662,10 @@ def test_dump_user_info(notify_api, mocker):
 
     mock_get_user_by_email.assert_called_once_with("john@example.com")
     mock_open_file.assert_called_once_with("user_download.json", "wb")
+
+
+def test_generate_salt(notify_api):
+    runner = notify_api.test_cli_runner()
+    result = runner.invoke(generate_salt)
+    assert result.exit_code == 0
+    assert len(result.output.strip()) == 32