Refactoring more code and fixing broken utils

Author: adrianoaru-nhs

classes/analyser.py

@@ -1,50 +1,50 @@
-from dataclasses import dataclass
-from typing import Optional
-import pandas as pd
-
-
-@dataclass
-class Analyser:
-    """
-    Data class representing an analyser.
-    """
-
-    analyser_id: Optional[int] = None
-    analyser_code: Optional[str] = None
-    hub_id: Optional[int] = None
-    analyser_type_id: Optional[int] = None
-    spoil_result_code: Optional[int] = None
-    tech_fail_result_code: Optional[int] = None
-    below_range_result_code: Optional[int] = None
-    above_range_result_code: Optional[int] = None
-
-    def __str__(self) -> str:
-        return (
-            f"Analyser [analyser_id={self.analyser_id}, analyser_code={self.analyser_code}, "
-            f"hub_id={self.hub_id}, spoil_result_code={self.spoil_result_code}, "
-            f"tech_fail_result_code={self.tech_fail_result_code}, "
-            f"below_range_result_code={self.below_range_result_code}, "
-            f"above_range_result_code={self.above_range_result_code}]"
-        )
-
-    @staticmethod
-    def from_dataframe_row(row: pd.Series) -> "Analyser":
-        """
-        Creates an Analyser object from a pandas DataFrame row containing analyser query results.
-
-        Args:
-            row (pd.Series): A row from a pandas DataFrame with columns:
-                - tk_analyser_id
-                - analyser_code
-                - hub_id
-                - tk_analyser_type_id
-
-        Returns:
-            Analyser: The constructed Analyser object.
-        """
-        return Analyser(
-            analyser_id=row.get("tk_analyser_id"),
-            analyser_code=row.get("analyser_code"),
-            hub_id=row.get("hub_id"),
-            analyser_type_id=row.get("tk_analyser_type_id"),
-        )
+from dataclasses import dataclass
+from typing import Optional
+import pandas as pd
+
+
+@dataclass
+class Analyser:
+    """
+    Data class representing an analyser.
+    """
+
+    analyser_id: Optional[int] = None
+    analyser_code: Optional[str] = None
+    hub_id: Optional[int] = None
+    analyser_type_id: Optional[int] = None
+    spoil_result_code: Optional[int] = None
+    tech_fail_result_code: Optional[int] = None
+    below_range_result_code: Optional[int] = None
+    above_range_result_code: Optional[int] = None
+
+    def __str__(self) -> str:
+        return (
+            f"Analyser [analyser_id={self.analyser_id}, analyser_code={self.analyser_code}, "
+            f"hub_id={self.hub_id}, spoil_result_code={self.spoil_result_code}, "
+            f"tech_fail_result_code={self.tech_fail_result_code}, "
+            f"below_range_result_code={self.below_range_result_code}, "
+            f"above_range_result_code={self.above_range_result_code}]"
+        )
+
+    @staticmethod
+    def from_dataframe_row(row: pd.Series) -> "Analyser":
+        """
+        Creates an Analyser object from a pandas DataFrame row containing analyser query results.
+
+        Args:
+            row (pd.Series): A row from a pandas DataFrame with columns:
+                - tk_analyser_id
+                - analyser_code
+                - hub_id
+                - tk_analyser_type_id
+
+        Returns:
+            Analyser: The constructed Analyser object.
+        """
+        return Analyser(
+            analyser_id=row.get("tk_analyser_id"),
+            analyser_code=row.get("analyser_code"),
+            hub_id=row.get("hub_id"),
+            analyser_type_id=row.get("tk_analyser_type_id"),
+        )

classes/analyser_result_code_type.py

@@ -1,66 +1,66 @@
-from enum import Enum
-from typing import Optional, Dict
-
-
-class AnalyserResultCodeType(Enum):
-    """
-    Enum for analyser result code types, mapped to valid value IDs and descriptions.
-    """
-
-    ABOVE_DILUTION_RANGE = (309030, "Above dilution range")
-    BELOW_MEASURING_RANGE = (309028, "Below measuring range")
-    SPOILT = (309026, "Spoilt")
-    TECHNICAL_FAIL = (309027, "Technical Fail")
-
-    def __init__(self, valid_value_id: int, description: str) -> None:
-        self._valid_value_id = valid_value_id
-        self._description = description
-
-    @property
-    def valid_value_id(self) -> int:
-        """
-        Returns the valid value ID for the analyser result code type.
-        """
-        return self._valid_value_id
-
-    @property
-    def description(self) -> str:
-        """
-        Returns the description for the analyser result code type.
-        """
-        return self._description
-
-    @classmethod
-    def by_description(cls, description: str) -> Optional["AnalyserResultCodeType"]:
-        """
-        Returns the enum member matching the given description (case-sensitive).
-        """
-        for member in cls:
-            if member.description == description:
-                return member
-        return None
-
-    @classmethod
-    def by_description_case_insensitive(
-        cls, description: str
-    ) -> Optional["AnalyserResultCodeType"]:
-        """
-        Returns the enum member matching the given description (case-insensitive).
-        """
-        desc_lower = description.lower()
-        for member in cls:
-            if member.description.lower() == desc_lower:
-                return member
-        return None
-
-    @classmethod
-    def by_valid_value_id(
-        cls, valid_value_id: int
-    ) -> Optional["AnalyserResultCodeType"]:
-        """
-        Returns the enum member matching the given valid value ID.
-        """
-        for member in cls:
-            if member.valid_value_id == valid_value_id:
-                return member
-        return None
+from enum import Enum
+from typing import Optional, Dict
+
+
+class AnalyserResultCodeType(Enum):
+    """
+    Enum for analyser result code types, mapped to valid value IDs and descriptions.
+    """
+
+    ABOVE_DILUTION_RANGE = (309030, "Above dilution range")
+    BELOW_MEASURING_RANGE = (309028, "Below measuring range")
+    SPOILT = (309026, "Spoilt")
+    TECHNICAL_FAIL = (309027, "Technical Fail")
+
+    def __init__(self, valid_value_id: int, description: str) -> None:
+        self._valid_value_id = valid_value_id
+        self._description = description
+
+    @property
+    def valid_value_id(self) -> int:
+        """
+        Returns the valid value ID for the analyser result code type.
+        """
+        return self._valid_value_id
+
+    @property
+    def description(self) -> str:
+        """
+        Returns the description for the analyser result code type.
+        """
+        return self._description
+
+    @classmethod
+    def by_description(cls, description: str) -> Optional["AnalyserResultCodeType"]:
+        """
+        Returns the enum member matching the given description (case-sensitive).
+        """
+        for member in cls:
+            if member.description == description:
+                return member
+        return None
+
+    @classmethod
+    def by_description_case_insensitive(
+        cls, description: str
+    ) -> Optional["AnalyserResultCodeType"]:
+        """
+        Returns the enum member matching the given description (case-insensitive).
+        """
+        desc_lower = description.lower()
+        for member in cls:
+            if member.description.lower() == desc_lower:
+                return member
+        return None
+
+    @classmethod
+    def by_valid_value_id(
+        cls, valid_value_id: int
+    ) -> Optional["AnalyserResultCodeType"]:
+        """
+        Returns the enum member matching the given valid value ID.
+        """
+        for member in cls:
+            if member.valid_value_id == valid_value_id:
+                return member
+        return None