Added more logging

Author: adrianoaru-nhs

pages/datasets/investigation_dataset_page.py

@@ -1,14 +1,14 @@
 import re
 from playwright.sync_api import Page, expect, Locator
 from pages.base_page import BasePage
-from enum import StrEnum
+from enum import Enum, StrEnum
 from utils.oracle.oracle_specific_functions import (
     get_investigation_dataset_polyp_category,
     get_investigation_dataset_polyp_algorithm_size,
 )
 from typing import Optional, Any, Union, List
 import logging
-from enum import Enum
+import sys
 
 
 class InvestigationDatasetsPage(BasePage):
@@ -1326,8 +1326,14 @@ class AntibioticsAdministeredDrugTypeOptions(StrEnum):
 
 # Registry of all known Enums to search when matching string values
 ALL_ENUMS: List[type[Enum]] = [
-    DrugTypeOptions,
-    AntibioticsAdministeredDrugTypeOptions,
+    obj
+    for obj in globals().values()
+    if (
+        isinstance(obj, type)
+        and issubclass(obj, Enum)
+        and obj is not Enum
+        and obj is not StrEnum  # Exclude only the base classes, not subclasses
+    )
 ]
 
 

utils/dataset_field_util.py

@@ -1,6 +1,9 @@
 from playwright.sync_api import Page, Locator
 from typing import Optional, List
 import logging
+from pages.datasets.investigation_dataset_page import (
+    to_enum_name_or_value,
+)
 
 
 class DatasetFieldUtil:
@@ -25,6 +28,7 @@ def populate_input_locator_for_field(self, text: str, value: str) -> None:
             text (str): The text of the element you want to get the input locator of
             value (str): The value you want to input
         """
+        logging.info(f"Filling input for field '{text}' with value '{value}'")
         locator = self.get_input_locator_for_field(text)
         locator.fill(value)
 
@@ -45,6 +49,9 @@ def populate_select_locator_for_field(self, text: str, option: str) -> None:
             text (str): The text of the element you want to get the select locator of.
             option (str): The option you want to select
         """
+        logging.info(
+            f"Selecting option '{to_enum_name_or_value(option)}' for field '{text}'"
+        )
         locator = self.get_select_locator_for_field(text)
         locator.select_option(option)
 
@@ -70,6 +77,7 @@ def populate_input_locator_for_field_inside_div(
             div (str): The ID of the DIV the text belongs in
             value (str): The value you want to input
         """
+        logging.info(f"Filling input for field '{text}' with value '{value}'")
         locator = self.get_input_locator_for_field_inside_div(text, div)
         locator.fill(value)
 
@@ -95,6 +103,9 @@ def populate_select_locator_for_field_inside_div(
             div (str): The ID of the DIV the text belongs in
             option (str): The option you want to select
         """
+        logging.info(
+            f"Selecting option '{to_enum_name_or_value(option)}' for field '{text}'"
+        )
         locator = self.get_select_locator_for_field_inside_div(text, div)
         locator.select_option(option)
 

utils/investigation_dataset.py

@@ -39,6 +39,7 @@
     PolypInterventionModalityOptions,
     PolypInterventionDeviceOptions,
     PolypInterventionExcisionTechniqueOptions,
+    to_enum_name_or_value,
 )
 from pages.screening_subject_search.advance_fobt_screening_episode_page import (
     AdvanceFOBTScreeningEpisodePage,
@@ -408,32 +409,38 @@ def fill_out_drug_information(self, drug_information: dict) -> None:
         for key, value in drug_information.items():
             if key.startswith("drug_type"):
                 index = key[len("drug_type") :]
-                logging.info(f"Adding drug type {index}")
+                logging.info(
+                    f"Adding drug type {index}: {to_enum_name_or_value(value)}"
+                )
                 select_locator = f"#UI_BOWEL_PREP_DRUG{index}"
                 self.page.select_option(select_locator, value)
             elif key.startswith("drug_dose"):
                 index = key[len("drug_dose") :]
-                logging.info(f"Adding drug dose {index}")
+                logging.info(f"Adding drug dose {index}: {value}")
                 input_locator = f"#UI_BOWEL_PREP_DRUG_DOSE{index}"
                 self.page.fill(input_locator, value)
             elif key.startswith("antibiotic_drug_type"):
                 index = key[len("antibiotic_drug_type") :]
-                logging.info(f"Adding antibiotic drug type {index}")
+                logging.info(
+                    f"Adding antibiotic drug type {index}: {to_enum_name_or_value(value)}"
+                )
                 select_locator = f"#UI_ANTIBIOTIC{index}"
                 self.page.select_option(select_locator, value)
             elif key.startswith("antibiotic_drug_dose"):
                 index = key[len("antibiotic_drug_dose") :]
-                logging.info(f"Adding antibiotic drug dose {index}")
+                logging.info(f"Adding antibiotic drug dose {index}: {value}")
                 input_locator = f"#UI_ANTIBIOTIC_DOSE{index}"
                 self.page.fill(input_locator, value)
             elif key.startswith("other_drug_type"):
                 index = key[len("other_drug_type") :]
-                logging.info(f"Adding other drug type {index}")
+                logging.info(
+                    f"Adding other drug type {index}: {to_enum_name_or_value(value)}"
+                )
                 select_locator = f"#UI_DRUG{index}"
                 self.page.select_option(select_locator, value)
             elif key.startswith("other_drug_dose"):
                 index = key[len("other_drug_dose") :]
-                logging.info(f"Adding other drug dose {index}")
+                logging.info(f"Adding other drug dose {index}: {value}")
                 input_locator = f"#UI_DOSE{index}"
                 self.page.fill(input_locator, value)