Altering method to use datasetfieldutil and creating a new Enum class

Author: adrianoaru-nhs

pages/datasets/investigation_dataset_page.py

@@ -1578,10 +1578,18 @@ class ExtracolonicSummaryCodeOptions(StrEnum):
 
 
 class TaggingAgentDrugAdministeredOptions(StrEnum):
+    """Enum for tagging agent drug administered options"""
     YES = "17058~~204368"
     NO = "17059"
     NOT_REPORTED = "202140"
 
+class IVConstantAdminsteredOptions(StrEnum):
+    """Enum for iv constant administered options"""
+    YES = "17058~~204367"
+    NO = "17059~~204334"
+    NOT_REPORTED = "202140"
+
+
 
 # Registry of all known Enums to search when matching string values
 ALL_ENUMS: List[type[Enum]] = [

tests/regression/regression_tests/fobt_regression_tests/test_scenario_8.py

@@ -17,6 +17,7 @@
     ProcedureOutcomeOptions,
     ScanPositionOptions,
     SegmentalInadequacyOptions,
+    IVConstantAdminsteredOptions,
 )
 from pages.datasets.subject_datasets_page import SubjectDatasetsPage
 from utils.user_tools import UserTools
@@ -505,7 +506,7 @@ def test_scenario_8(page: Page) -> None:
     contrast_tagging_and_drug = {
         "iv buscopan administered": CancerRadiologyYesNoOptions.NO,
         "contraindicated": YesNoOptions.NO,
-        "iv contrast administered": CancerRadiologyYesNoOptions.NO,
+        "iv contrast administered": IVConstantAdminsteredOptions.NO,
         "tagging agent given": TaggingAgentDrugAdministeredOptions.YES,
         "additional bowel preparation administered": CancerRadiologyYesNoOptions.YES,
         "drug_type1": DrugTypeOptions.PICOLAX,
@@ -542,8 +543,8 @@ def test_scenario_8(page: Page) -> None:
     # # And I press OK on my confirmation prompt
     InvestigationDatasetCompletion(page).complete_dataset_with_args(
         general_information=general_information,
-        tagging_agent_given_drug_information=tagging_agent_given_drug_information,
         contrast_tagging_and_drug=contrast_tagging_and_drug,
+        tagging_agent_given_drug_information=tagging_agent_given_drug_information,
         radiology_information=radiology_information,
     )
 

utils/investigation_dataset.py

@@ -486,49 +486,46 @@ def fill_out_contrast_tagging_and_drug_information(
         logging.info("🧪 Filling out Contrast, Tagging & Drug Information")
         self.investigation_datasets_pom.click_show_contrast_tagging_and_drug_information()
 
-        field_map = {
-            "iv buscopan administered": "#UI_BUSCOPAN_ADMINISTERED",
-            "iv contrast administered": "#UI_CONTRAST_ADMINISTERED",
-            "tagging agent given": "#UI_TAGGING_AGENT_GIVEN_DRUGS_ADMINISTERED",
-            "additional bowel preparation administered": "#UI_ADDITIONAL_BOWEL_PREPARATION_ADMINISTERED",
-            "contraindicated": "#UI_BUSCOPAN_CONTRAINDICATED",
-        }
-        normalized_map = {k.strip().lower(): v for k, v in field_map.items()}
-
+        # Use for loop and match-case for endoscopy_information fields
         for key, value in contrast_tagging_and_drug.items():
-            normalized_key = key.strip().lower()
-
-            if normalized_key in normalized_map:
-                selector = normalized_map[normalized_key]
-
-                if normalized_key == "tagging agent given":
-                    logging.info(
-                        "🔍 Waiting for 'Tagging Agent Given' dropdown to become visible..."
+            match key:
+                case "iv buscopan administered":
+                    DatasetFieldUtil(self.page).populate_select_locator_for_field(
+                        "IV Buscopan Administered", value
                     )
-                    self.page.locator(selector).wait_for(state="visible")
-                    options = self.page.locator(selector + " option").all_inner_texts()
-                    logging.info(
-                        f"🧾 Options available in 'Tagging Agent Given': {options}"
+                case "Contraindicated":
+                    DatasetFieldUtil(
+                        self.page
+                    ).populate_select_locator_for_field_inside_div(
+                        "contraindicated", "UI_BUSCOPAN_CONTRAINDICATED_ROW", value
                     )
-                    logging.info(
-                        f"✅ Dropdown visible. Selecting value: {to_enum_name_or_value(value)}"
+                case "iv contrast administered":
+                    DatasetFieldUtil(self.page).populate_select_locator_for_field(
+                        "IV Contrast Administered", value
                     )
-                else:
-                    logging.info(f"Setting {key}: {to_enum_name_or_value(value)}")
-
-                self.page.select_option(selector, value)
-
-            elif normalized_key.startswith(("drug_type", "drug_dose")):
-                drug_info = {
-                    dk: dv
-                    for dk, dv in contrast_tagging_and_drug.items()
-                    if dk.strip().lower().startswith(("drug_type", "drug_dose"))
-                }
-                self.fill_out_drug_information(drug_info)
-                break
-
-            else:
-                logging.warning(f"⚠️ Unknown contrast field: {key}")
+                case "reason":
+                    DatasetFieldUtil(
+                        self.page
+                    ).populate_select_locator_for_field_inside_div(
+                        "Reason", "UI_CONTRAST_ADMINISTERED_REASON_ROW", value
+                    )
+                case "tagging agent given":
+                    DatasetFieldUtil(self.page).populate_select_locator_for_field(
+                        "Tagging Agent Given", value
+                    )
+                case "additional bowel preparation administered":
+                    DatasetFieldUtil(self.page).populate_select_locator_for_field(
+                        "Additional Bowel Preparation Administered", value
+                    )
+                case k if k.startswith(("drug_type", "drug_dose")):
+                    # Extract all drug-related keys/values from the main dict
+                    drug_info = {
+                        dk: dv
+                        for dk, dv in contrast_tagging_and_drug.items()
+                        if dk.startswith(("drug_type", "drug_dose"))
+                    }
+                    # Call the existing drug filling method once
+                    self.fill_out_drug_information(drug_info)
 
     def fill_out_drug_information(self, drug_information: dict) -> None:
         """