Inital commit. Fixing subject selection query builder and started scenario

Author: adrianoaru-nhs

classes/diagnostic_test_type.py

@@ -1,39 +1,104 @@
-class DiagnosticTestType:
-    """
-    Utility class for mapping descriptive diagnostic test types to valid value IDs.
+from enum import Enum
+from typing import Optional, Dict
 
-    This class provides:
-    - A mapping between human-readable diagnostic test type descriptions (e.g., "pcr", "antigen", "lateral flow") and their corresponding internal valid value IDs.
-    - A method to retrieve the valid value ID for a given description.
 
-    Methods:
-        get_valid_value_id(description: str) -> int:
-            Returns the valid value ID for a given diagnostic test type description.
-            Raises ValueError if the description is not recognized.
+class DiagnosticTestType(Enum):
+    """
+    Enum representing diagnostic test types, with valid value IDs, descriptions, categories, and allowed status.
     """
 
-    _mapping = {
-        "pcr": 3001,
-        "antigen": 3002,
-        "lateral flow": 3003,
-        # Add more mappings as needed
-    }
+    BARIUM_ENEMA = (16003, "Barium Enema", "RADIOLOGY", "DISALLOWED")
+    CT_COLONOGRAPHY = (16087, "CT Colonography", "RADIOLOGY", "ALLOWED")
+    COLONOSCOPY = (16002, "Colonoscopy", "COLONOSCOPY", "ALLOWED")
+    FLEXIBLE_SIGMOIDOSCOPY = (16004, "Flexible Sigmoidoscopy", "COLONOSCOPY", "ALLOWED")
+    LIMITED_COLONOSCOPY = (17996, "Limited Colonoscopy", "COLONOSCOPY", "ALLOWED")
+    NHS_BOWEL_SCOPE = (200554, "NHS bowel scope", "COLONOSCOPY", "ALLOWED")
+    SCAN_XRAY = (16005, "Scan (x-ray)", "RADIOLOGY", "DISALLOWED")
+    STANDARD_ABDOMINO_PELVIC_CT_SCAN = (
+        16088,
+        "Standard Abdomino-pelvic CT Scan",
+        "RADIOLOGY",
+        "DISALLOWED",
+    )
+    ANY = (0, "Any", "", "")
+
+    def __init__(
+        self, valid_value_id: int, description: str, category: str, allowed: str
+    ):
+        self._valid_value_id: int = valid_value_id
+        self._description: str = description
+        self._category: str = category
+        self._allowed: str = allowed
+
+    @property
+    def valid_value_id(self) -> int:
+        """Returns the valid value ID for the diagnostic test type."""
+        return self._valid_value_id
+
+    @property
+    def description(self) -> str:
+        """Returns the description for the diagnostic test type."""
+        return self._description
+
+    @property
+    def category(self) -> str:
+        """Returns the category for the diagnostic test type."""
+        return self._category
+
+    @property
+    def allowed(self) -> str:
+        """Returns the allowed status for the diagnostic test type."""
+        return self._allowed
 
     @classmethod
-    def get_valid_value_id(cls, description: str) -> int:
-        """
-        Returns the valid value ID for a given diagnostic test type description.
+    def _build_maps(cls) -> None:
+        if not hasattr(cls, "_descriptions"):
+            cls._descriptions: Dict[str, DiagnosticTestType] = {}
+            cls._lowercase_descriptions: Dict[str, DiagnosticTestType] = {}
+            cls._valid_value_ids: Dict[int, DiagnosticTestType] = {}
+            for item in cls:
+                cls._descriptions[item.description] = item
+                cls._lowercase_descriptions[item.description.lower()] = item
+                cls._valid_value_ids[item.valid_value_id] = item
 
-        Args:
-            description (str): The diagnostic test type description (e.g., "pcr").
+    @classmethod
+    def by_description(cls, description: str) -> Optional["DiagnosticTestType"]:
+        """
+        Returns the DiagnosticTestType matching the given description.
+        """
+        cls._build_maps()
+        return cls._descriptions.get(description)
 
-        Returns:
-            int: The valid value ID corresponding to the description.
+    @classmethod
+    def by_description_case_insensitive(
+        cls, description: str
+    ) -> Optional["DiagnosticTestType"]:
+        """
+        Returns the DiagnosticTestType matching the given description (case-insensitive).
+        """
+        cls._build_maps()
+        return cls._lowercase_descriptions.get(description.lower())
 
-        Raises:
-            ValueError: If the description is not recognized.
+    @classmethod
+    def by_valid_value_id(cls, valid_value_id: int) -> Optional["DiagnosticTestType"]:
         """
-        key = description.strip().lower()
-        if key not in cls._mapping:
-            raise ValueError(f"Unknown diagnostic test type: '{description}'")
-        return cls._mapping[key]
+        Returns the DiagnosticTestType matching the given valid value ID.
+        """
+        cls._build_maps()
+        return cls._valid_value_ids.get(valid_value_id)
+
+    def get_valid_value_id(self) -> int:
+        """Returns the valid value ID for the diagnostic test type."""
+        return self._valid_value_id
+
+    def get_description(self) -> str:
+        """Returns the description for the diagnostic test type."""
+        return self._description
+
+    def get_category(self) -> str:
+        """Returns the category for the diagnostic test type."""
+        return self._category
+
+    def get_allowed(self) -> str:
+        """Returns the allowed status for the diagnostic test type."""
+        return self._allowed

classes/event_status_type.py

@@ -1021,6 +1021,130 @@ class EventStatusType(Enum):
     U81 = (11283, "U81", "Kit Returned and Logged (Technical Fail; Weak Positive")
     U97 = (11284, "U97", "Weak Positive, Waiting for Screening Centre Assistance")
     U98 = (11285, "U98", "Weak Positive, Waiting for Programme Hub Assistance")
+    X2 = (20346, "X2", "Surveillance appointment rescheduled")
+    X372 = (11554, "X372", "Handover into Symptomatic Care - GP Letter Printed")
+    X374 = (20085, "X374", "Handover into Symptomatic Care - Patient Letter Printed")
+    X376 = (20086, "X376", "Discharged from Surveillance - GP Letter Printed")
+    X377 = (20087, "X377", "Discharged from Surveillance - GP Letter Printed")
+    X379 = (20088, "X379", "Discharged from Surveillance - GP Letter Printed")
+    X380 = (20089, "X380", "Discharge from Screening and Surveillance - Patient Choice")
+    X381 = (
+        20090,
+        "X381",
+        "Discharge from Screening and Surveillance - No Patient Contact",
+    )
+    X382 = (
+        20091,
+        "X382",
+        "Discharge from Screening and Surveillance - Clinical Decision",
+    )
+    X384 = (
+        20183,
+        "X384",
+        "Discharged from Screening & Surveillance - GP Letter Not Required",
+    )
+    X386 = (20092, "X386", "Discharged from Surveillance - Patient Letter Printed")
+    X387 = (20093, "X387", "Discharged from Surveillance - Patient Letter Printed")
+    X389 = (20184, "X389", "Discharge from Surveillance - Clinical Decision")
+    X390 = (20094, "X390", "Discharge from Surveillance - Clinical Decision")
+    X391 = (20095, "X391", "Handover into Symptomatic Care")
+    X392 = (20096, "X392", "Discharge from Surveillance - Patient Choice")
+    X394 = (20097, "X394", "Handover into Symptomatic Care - Patient Age")
+    X395 = (
+        20098,
+        "X395",
+        "Discharged from Surveillance - National Guidelines Return FOBT",
+    )
+    X398 = (20099, "X398", "Discharge from Surveillance - No Patient Contact")
+    X399 = (
+        200263,
+        "X399",
+        "Discharged  from Surveillance - National Guidelines Cease Screening",
+    )
+    X500 = (20100, "X500", "Selected For Surveillance")
+    X501 = (20101, "X501", "No Response to HealthCheck Form")
+    X505 = (20102, "X505", "HealthCheck Form Printed")
+    X510 = (20103, "X510", "Surveillance Reminder Printed")
+    X512 = (20104, "X512", "Patient Contact Resulted in Discharge from Surveillance")
+    X513 = (20196, "X513", "No Patient Contact - Discharge from Surveillance")
+    X600 = (20107, "X600", "Surveillance Appointment Required")
+    X610 = (20114, "X610", "Surveillance Appointment Made")
+    X615 = (20116, "X615", "Surveillance Appointment Invitation Letter Printed")
+    X617 = (20117, "X617", "Surveillance Appointment Cancelled by SC")
+    X620 = (20118, "X620", "Surveillance Appointment Cancelled by Patient")
+    X622 = (20122, "X622", "Surveillance Appointment Cancellation Letter Printed")
+    X625 = (20119, "X625", "Practitioner did not attend Surveillance Appointment")
+    X641 = (20120, "X641", "Patient did not attend Surveillance Appointment")
+    X650 = (20108, "X650", "Patient Attended Surveillance Appointment")
+    X76 = (20109, "X76", "Discharged from Surveillance & Screening - GP Letter Printed")
+    X77 = (20110, "X77", "Discharged from Surveillance & Screening - GP Letter Printed")
+    X79 = (20111, "X79", "Discharge from Surveillance & Screening - GP Letter Printed")
+    X86 = (
+        20112,
+        "X86",
+        "Discharged from Surveillance & Screening - Patient Letter Printed",
+    )
+    X87 = (
+        20113,
+        "X87",
+        "Discharged from Surveillance & Screening - Patient Letter Printed",
+    )
+    X89 = (
+        20185,
+        "X89",
+        "Discharge from Screening and Surveillance - Clinical Decision",
+    )
+    X9 = (20115, "X9", "Surveillance Appointment Cancelled Letters not Prepared")
+    X900 = (20237, "X900", "Surveillance Episode reopened")
+    X92 = (20188, "X92", "Close Surveillance Episode via interrupt")
+    Z1 = (
+        11289,
+        "Z1",
+        "Appointment Cancellation Requested by SC prior to Letter Preparation",
+    )
+    Z10 = (20344, "Z10", "Colonoscopy assessment appointment rescheduled")
+    Z11 = (20345, "Z11", "Post-Investigation appointment rescheduled")
+    Z12 = (
+        205221,
+        "Z12",
+        "Redirected Colonoscopy Assessment Appointment Cancellation Requested by SC prior to Preparation of Letters",
+    )
+    Z2 = (
+        11290,
+        "Z2",
+        "Appointment Cancellation Requested by SC (follows a DNA) prior to Letter Preparation",
+    )
+    Z3 = (
+        15006,
+        "Z3",
+        "Appointment Cancellation Requested by SC prior to Letter Preparation",
+    )
+    Z4 = (
+        15007,
+        "Z4",
+        "Appointment Cancellation Requested by SC (follows a DNA)  prior to Letter Preparation",
+    )
+    Z5 = (
+        15008,
+        "Z5",
+        "Appointment Cancellation Requested prior to Letter Preparation (Patient to Reschedule)",
+    )
+    Z6 = (
+        15009,
+        "Z6",
+        "Appointment Cancellation Requested (follows a DNA)  prior to Letter Preparation (Patient to Reschedule)",
+    )
+    Z7 = (
+        15010,
+        "Z7",
+        "Appointment Cancellation Requested prior to Letter Preparation (SC Non-attendance)",
+    )
+    Z8 = (
+        15011,
+        "Z8",
+        "Appointment Cancellation Requested (follows a DNA)  prior to Letter Preparation (SC Non-attendance)",
+    )
+    Z9 = (160174, "Z9", "Post-investigation Appointment Cancelled Letters not Prepared")
 
     def __init__(self, valid_value_id: int, allowed_value: str, description: str):
         """