[NRL-1165] Fix failing integ test. Fix sonarcloud warnings

Author: mattdean3-nhs

layer/nrlf/core/tests/test_pydantic_errors.py

@@ -1,5 +1,6 @@
 import pytest
 
+from nrlf.core.constants import SNOMED_SYSTEM_URL
 from nrlf.core.errors import ParseError
 from nrlf.core.validators import DocumentReferenceValidator
 from nrlf.tests.data import load_document_reference_json
@@ -310,17 +311,17 @@ def test_validate_multiple_codings():
     document_ref_data["category"][0] = {
         "coding": [
             {
-                "system": "http://snomed.info/sct",
+                "system": SNOMED_SYSTEM_URL,
                 "code": "734163000",
                 "display": "Care plan",
             },
             {
-                "system": "http://snomed.info/sct",
+                "system": SNOMED_SYSTEM_URL,
                 "code": "734163000",
                 "display": "Care plan",
             },
             {
-                "system": "http://snomed.info/sct",
+                "system": SNOMED_SYSTEM_URL,
                 "code": "734163000",
                 "display": "Care plan",
             },
@@ -384,7 +385,7 @@ def test_validate_empty_strings():
     document_ref_data["category"][0] = {
         "coding": [
             {
-                "system": "http://snomed.info/sct",
+                "system": SNOMED_SYSTEM_URL,
                 "code": "734163000",
                 "display": "",
             }
@@ -420,7 +421,7 @@ def test_validate_whitespace_strings():
     document_ref_data["category"][0] = {
         "coding": [
             {
-                "system": "http://snomed.info/sct",
+                "system": SNOMED_SYSTEM_URL,
                 "code": "734163000",
                 "display": "  ",
             }
@@ -534,7 +535,7 @@ def test_validate_missing_code_from_coding_where_mandatory():
     document_ref_data["context"]["practiceSetting"] = {
         "coding": [
             {
-                "system": "http://snomed.info/sct",
+                "system": SNOMED_SYSTEM_URL,
                 "display": "Valid display string",
             }
         ]
@@ -569,7 +570,7 @@ def test_validate_missing_display_from_coding_where_mandatory():
     document_ref_data["context"]["practiceSetting"] = {
         "coding": [
             {
-                "system": "http://snomed.info/sct",
+                "system": SNOMED_SYSTEM_URL,
                 "code": "788002001",
             }
         ]

tests/features/producer/createDocumentReference-failure.feature

@@ -913,47 +913,27 @@ Feature: Producer - createDocumentReference - Failure Scenarios
     When producer 'TSTCUS' requests creation of a DocumentReference with default test values except 'context' is:
       """
       "context": {
-      "practiceSetting": {
-      "coding": [
-      {
-      "system": "http://snomed.info/sct",
-      "code": "788002001",
-      "display": ""
-      }
-      ]
-      },
-      "facilityType": {
-      "coding": [
-      {
-      "system": " system",
-      "code": "1234"
-      }
-      ]
-      }
-      }
-      """
-    Then the response status code is 400
-    And the response is an OperationOutcome with 1 issue
-    And the OperationOutcome contains the issue:
-      """
-      {
-        "severity": "error",
-        "code": "invalid",
-        "details": {
-            "coding": [
+        "practiceSetting": {
+          "coding": [
             {
-                "system": "https://fhir.nhs.uk/ValueSet/Spine-ErrorOrWarningCode-1",
-                "code": "MESSAGE_NOT_WELL_FORMED",
-                "display": "Message not well formed"
+              "system": "http://snomed.info/sct",
+              "code": "788002001",
+              "display": ""
             }
-            ]
+          ]
         },
-        "diagnostics": "Request body could not be parsed (context.facilityType.coding[0].system: String should match pattern '[^\\s]+(\\s[^\\s]+)*')",
-        "expression": [
-            "context.facilityType.coding[0].system"
-        ]
+        "facilityType": {
+          "coding": [
+            {
+              "system": " system",
+              "code": "1234"
+            }
+          ]
+        }
       }
       """
+    Then the response status code is 400
+    And the response is an OperationOutcome with 1 issue
     And the OperationOutcome contains the issue:
       """
       {
@@ -968,7 +948,7 @@ Feature: Producer - createDocumentReference - Failure Scenarios
             }
             ]
         },
-        "diagnostics": "Request body could not be parsed (context.practiceSetting.coding[0].display: String should match pattern '[^\\s]+(\\s[^\\s]+)*')",
+        "diagnostics": "Request body could not be parsed (context.practiceSetting.coding[0].display: String should match pattern '[\\S]+[ \\r\\n\\t\\S]*')",
         "expression": [
             "context.practiceSetting.coding[0].display"
         ]