change subject age to integer in test

Author: motola

lambdas/mns_publisher/src/constants.py

@@ -12,7 +12,7 @@ class FilteringData(TypedDict):
     generalpractitioner: str | None
     sourceorganisation: str
     sourceapplication: str
-    subjectage: str
+    subjectage: int
     immunisationtype: str
     action: str
 
@@ -31,16 +31,3 @@ class MnsNotificationPayload(TypedDict):
 
 
 DYNAMO_DB_TYPE_DESCRIPTORS = ("S", "N", "BOOL", "M", "L")
-
-
-class ImmsData(TypedDict):
-    """Extracted immunisation data from DynamoDB stream."""
-
-    imms_id: str
-    supplier_system: str
-    vaccine_type: str
-    operation: str
-    nhs_number: str
-    person_dob: str
-    date_and_time: str
-    site_code: str

lambdas/mns_publisher/src/create_notification.py

@@ -51,8 +51,8 @@ def create_mns_notification(sqs_event: SQSMessage) -> MnsNotificationPayload:
             "generalpractitioner": gp_ods_code,
             "sourceorganisation": site_code,
             "sourceapplication": supplier_system,
-            "subjectage": str(patient_age),
-            "immunisationtype": vaccine_type,
+            "subjectage": patient_age,
+            "immunisationtype": vaccine_type.upper(),
             "action": operation,
         },
     }

lambdas/mns_publisher/tests/test_create_notification.py

@@ -73,7 +73,7 @@ def setUp(self):
     @patch("create_notification.get_practitioner_details_from_pds")
     @patch("create_notification.get_service_url")
     @patch("create_notification.uuid.uuid4")
-    def test_create_mns_notification_complete_payload(self, mock_uuid, mock_get_service_url, mock_get_gp):
+    def test_success_create_mns_notification_complete_payload(self, mock_uuid, mock_get_service_url, mock_get_gp):
         mock_uuid.return_value = MagicMock(hex="236a1d4a-5d69-4fa9-9c7f-e72bf505aa5b")
         mock_get_service_url.return_value = self.expected_immunisation_url
         mock_get_gp.return_value = self.expected_gp_ods_code
@@ -92,9 +92,9 @@ def test_create_mns_notification_complete_payload(self, mock_uuid, mock_get_serv
         self.assertEqual(filtering["generalpractitioner"], self.expected_gp_ods_code)
         self.assertEqual(filtering["sourceorganisation"], "B0C4P")
         self.assertEqual(filtering["sourceapplication"], "TPP")
-        self.assertEqual(filtering["immunisationtype"], "hib")
+        self.assertEqual(filtering["immunisationtype"], "HIB")
         self.assertEqual(filtering["action"], "CREATE")
-        self.assertEqual(filtering["subjectage"], "21")
+        self.assertEqual(filtering["subjectage"], 21)
 
         self.assertIn("id", result)
         self.assertIsInstance(result["id"], str)

lambdas/mns_publisher/tests/test_lambda_handler.py

@@ -292,9 +292,9 @@ def test_successful_notification_creation_with_gp(self, mock_logger, mock_get_to
         self.assertEqual(mns_payload["filtering"]["generalpractitioner"], "Y12345")
         self.assertEqual(mns_payload["filtering"]["sourceorganisation"], "B0C4P")
         self.assertEqual(mns_payload["filtering"]["sourceapplication"], "TPP")
-        self.assertEqual(mns_payload["filtering"]["immunisationtype"], "hib")
+        self.assertEqual(mns_payload["filtering"]["immunisationtype"], "HIB")
         self.assertEqual(mns_payload["filtering"]["action"], "CREATE")
-        self.assertEqual(mns_payload["filtering"]["subjectage"], "21")
+        self.assertEqual(mns_payload["filtering"]["subjectage"], 21)
 
         mock_logger.info.assert_any_call("Successfully processed all 1 messages")
 
@@ -335,7 +335,7 @@ def test_pds_failure(self, mock_logger, mock_get_mns, mock_get_token):
     @responses.activate
     @patch("common.api_clients.authentication.AppRestrictedAuth.get_access_token")
     @patch("process_records.logger")
-    def test_non_successful_notification_creation_without_gp(self, mock_logger, mock_get_token):
+    def test_successful_notification_creation_with_expired_gp(self, mock_logger, mock_get_token):
         """
         Test a Successful MNS Publish notification with calls to PDS for GP details, no batch failure
         """
@@ -374,8 +374,8 @@ def test_non_successful_notification_creation_without_gp(self, mock_logger, mock
         self.assertEqual(mns_payload["filtering"]["generalpractitioner"], None)
         self.assertEqual(mns_payload["filtering"]["sourceorganisation"], "B0C4P")
         self.assertEqual(mns_payload["filtering"]["sourceapplication"], "TPP")
-        self.assertEqual(mns_payload["filtering"]["immunisationtype"], "hib")
+        self.assertEqual(mns_payload["filtering"]["immunisationtype"], "HIB")
         self.assertEqual(mns_payload["filtering"]["action"], "CREATE")
-        self.assertEqual(mns_payload["filtering"]["subjectage"], "21")
+        self.assertEqual(mns_payload["filtering"]["subjectage"], 21)
 
         mock_logger.info.assert_any_call("Successfully processed all 1 messages")