Fixing file format and duplication errors

Author: adrianoaru-nhs

pages/screening_subject_search/patient_advised_of_diagnosis_page.py

@@ -34,4 +34,4 @@ def select_diagnosis_reason(self, reason: str) -> None:
             reason (str): The reason for the diagnosis.
         """
         self.reason_dropdown.select_option(label=reason)
-        self.click(self.save_button)
+        self.click(self.save_button)

tests/regression/regression_tests/fobt_regression_tests/test_scenario_9.py

@@ -133,7 +133,8 @@ def test_scenario_9(page: Page) -> None:
     FitKitLogged().read_latest_logged_kit(user_role, 2, fit_kit, "ABNORMAL")
 
     # Then my subject has been updated as follows:
-    subject_assertion(nhs_no, {"latest event status": "A8 Abnormal"})
+    criteria = {"latest event status": "A8 Abnormal"}
+    subject_assertion(nhs_no, criteria)
 
     # When I view the subject
     screening_subject_page_searcher.navigate_to_subject_summary_page(page, nhs_no)
@@ -153,7 +154,7 @@ def test_scenario_9(page: Page) -> None:
     # Then my subject has been updated as follows:
     subject_assertion(
         nhs_no,
-        {
+        criteria={
             "latest event status": "A183 1st Colonoscopy Assessment Appointment Requested",
         },
     )
@@ -191,7 +192,7 @@ def test_scenario_9(page: Page) -> None:
     # Then my subject has been updated as follows:
     subject_assertion(
         nhs_no,
-        {
+        criteria={
             "latest event status": "J10 Attended Colonoscopy Assessment Appointment",
         },
     )

utils/oracle/subject_selection_query_builder.py

@@ -1128,7 +1128,7 @@ def _add_criteria_latest_episode_kit_class(self) -> None:
                 " SELECT tkt.tk_type_id"
                 " FROM tk_type_t tkt "
                 f" WHERE tkt.tk_test_class_id {comparator} {kit_class_id} "
-                " ) " 
+                " ) "
             )
 
         except Exception: