NRL-1554 sonar qube fixes

Author: eesa456

layer/nrlf/core/constants.py

@@ -677,6 +677,7 @@ def coding_value(self):
 CONTENT_STABILITY_EXTENSION_URL = (
     "https://fhir.nhs.uk/England/StructureDefinition/Extension-England-ContentStability"
 )
+CONTENT_RETRIEVAL_EXTENSION_URL = "https://fhir.nhs.uk/England/StructureDefinition/Extension-England-RetrievalMechanism"
 CONTENT_STABILITY_SYSTEM_URL = (
     "https://fhir.nhs.uk/England/CodeSystem/England-NRLContentStability"
 )

layer/nrlf/core/validators.py

@@ -507,14 +507,14 @@ def _validate_content_extension(self, model: DocumentReference):
         Validate the content.extension field contains an appropriate coding.
         """
         logger.log(LogReference.VALIDATOR001, step="content_extension")
-
         logger.debug("Validating extension")
+
         for i, content in enumerate(model.content):
-            if len(content.extension) == 0:
+            if not content.extension:
                 self.result.add_error(
                     issue_code="business-rule",
                     error_code="UNPROCESSABLE_ENTITY",
-                    diagnostics=f"Invalid content extension: Extension must have at least one value",
+                    diagnostics="Invalid content extension: Extension must have at least one value",
                     field=f"content[{i}].extension",
                 )
                 return
@@ -525,44 +525,55 @@ def _validate_content_extension(self, model: DocumentReference):
                     extension.url
                     == "https://fhir.nhs.uk/England/StructureDefinition/Extension-England-ContentStability"
                 ):
-                    coding = extension.valueCodeableConcept.coding[0]
-                    if coding.code != coding.display.lower() or coding.display not in [
-                        "Static",
-                        "Dynamic",
-                    ]:
-                        self.result.add_error(
-                            issue_code="business-rule",
-                            error_code="UNPROCESSABLE_ENTITY",
-                            diagnostics=f"Invalid content extension display: {coding.display} Extension display must be the same as code either 'Static' or 'Dynamic'",
-                            field=f"content[{i}].extension[{j}].valueCodeableConcept.coding[0].display",
-                        )
+                    if not self._validate_content_stability_extension(extension, i, j):
                         return
                     has_content_stability = True
-
                 elif (
                     extension.url
                     == "https://fhir.nhs.uk/England/StructureDefinition/Extension-England-RetrievalMechanism"
                 ):
-                    coding = extension.valueCodeableConcept.coding[0]
-                    retrievalDisplay = CONTENT_RETRIEVAL_CODE_MAP.get(coding.code)
-                    if coding.display != retrievalDisplay:
-                        self.result.add_error(
-                            issue_code="business-rule",
-                            error_code="UNPROCESSABLE_ENTITY",
-                            diagnostics=f"Invalid content extension display: {coding.display} Expected display is '{retrievalDisplay}'",
-                            field=f"content[{i}].extension[{j}].valueCodeableConcept.coding[0].display",
-                        )
+                    if not self._validate_retrieval_mechanism_extension(
+                        extension, i, j
+                    ):
                         return
 
             if not has_content_stability:
                 self.result.add_error(
                     issue_code="business-rule",
                     error_code="UNPROCESSABLE_ENTITY",
-                    diagnostics=f"Invalid content extension: Extension must have one content stability extension see value set ('https://fhir.nhs.uk/England/CodeSystem/England-NRLContentStability')",
+                    diagnostics="Invalid content extension: Extension must have one content stability extension see value set ('https://fhir.nhs.uk/England/CodeSystem/England-NRLContentStability')",
                     field=f"content[{i}].extension",
                 )
                 return
 
+    def _validate_content_stability_extension(self, extension, i, j):
+        coding = extension.valueCodeableConcept.coding[0]
+        if coding.code != coding.display.lower() or coding.display not in [
+            "Static",
+            "Dynamic",
+        ]:
+            self.result.add_error(
+                issue_code="business-rule",
+                error_code="UNPROCESSABLE_ENTITY",
+                diagnostics=f"Invalid content extension display: {coding.display} Extension display must be the same as code either 'Static' or 'Dynamic'",
+                field=f"content[{i}].extension[{j}].valueCodeableConcept.coding[0].display",
+            )
+            return False
+        return True
+
+    def _validate_retrieval_mechanism_extension(self, extension, i, j):
+        coding = extension.valueCodeableConcept.coding[0]
+        expected_retrieval_display = CONTENT_RETRIEVAL_CODE_MAP.get(coding.code)
+        if coding.display != expected_retrieval_display:
+            self.result.add_error(
+                issue_code="business-rule",
+                error_code="UNPROCESSABLE_ENTITY",
+                diagnostics=f"Invalid content extension display: {coding.display} Expected display is '{expected_retrieval_display}'",
+                field=f"content[{i}].extension[{j}].valueCodeableConcept.coding[0].display",
+            )
+            return False
+        return True
+
     def _validate_author(self, model: DocumentReference):
         """
         Validate the author field contains an appropriate coding system and code.

tests/features/utils/data.py

@@ -1,6 +1,8 @@
 from layer.nrlf.core.constants import (
     CATEGORY_ATTRIBUTES,
     CONTENT_FORMAT_CODE_URL,
+    CONTENT_RETRIEVAL_EXTENSION_URL,
+    CONTENT_RETRIEVAL_SYSTEM_URL,
     CONTENT_STABILITY_EXTENSION_URL,
     CONTENT_STABILITY_SYSTEM_URL,
     SNOMED_PRACTICE_SETTINGS,
@@ -22,6 +24,9 @@
     NRLCoding,
     NRLFormatCode,
     Reference,
+    RetrievalMechanismExtension,
+    RetrievalMechanismExtensionCoding,
+    RetrievalMechanismExtensionValueCodeableConcept,
 )
 from tests.features.utils.constants import (
     DEFAULT_TEST_AUTHOR,
@@ -75,7 +80,19 @@ def create_test_document_reference(items: dict) -> DocumentReference:
                                     )
                                 ]
                             ),
-                        )
+                        ),
+                        RetrievalMechanismExtension(
+                            url=CONTENT_RETRIEVAL_EXTENSION_URL,
+                            valueCodeableConcept=RetrievalMechanismExtensionValueCodeableConcept(
+                                coding=[
+                                    RetrievalMechanismExtensionCoding(
+                                        system=CONTENT_RETRIEVAL_SYSTEM_URL,
+                                        code="Direct",
+                                        display="Direct",
+                                    )
+                                ]
+                            ),
+                        ),
                     ],
                 )
             ],