Merge branch 'master' into VED-803-filenameprocessor

Author: JamesW1-NHS

lambdas/delta_backend/pyproject.toml

@@ -5,7 +5,8 @@ description = ""
 authors = ["Your Name <[email protected]>"]
 readme = "README.md"
 packages = [
-    {include = "src"}
+    {include = "src"},
+    {include = "common", from = "../shared/src"}
 ]
 
 [tool.poetry.dependencies]

lambdas/delta_backend/src/extractor.py

@@ -14,7 +14,7 @@ class Extractor:
     )
     EXTENSION_URL_SCT_DESC_DISPLAY = "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-CodingSCTDescDisplay"
 
-    CODING_SYSTEM_URL_SNOMED = "http://snomed.info/sct"  # NOSONAR(S5332) this is a code system identifier, not a URL
+    CODING_SYSTEM_URL_SNOMED = "http://snomed.info/sct"  # NOSONAR(S5332) this is a code system descriptor, not a URL
     ODS_ORG_CODE_SYSTEM_URL = "https://fhir.nhs.uk/Id/ods-organization-code"
     DEFAULT_LOCATION = "X99999"
     NHS_NUMBER_SYSTEM_URL = "https://fhir.nhs.uk/Id/nhs-number"

lambdas/id_sync/src/pds_details.py

@@ -12,7 +12,7 @@
 from os_vars import get_pds_env
 
 pds_env = get_pds_env()
-safe_tmp_dir = tempfile.mkdtemp(dir="/tmp")  # NOSONAR
+safe_tmp_dir = tempfile.mkdtemp(dir="/tmp")  # NOSONAR(S5443)
 
 
 # Get Patient details from external service PDS using NHS number from MNS notification

lambdas/shared/src/common/utils.py

@@ -17,7 +17,7 @@
     "@redocly/cli": "^2.7.0",
     "husky": "^9.1.7",
     "license-checker": "^25.0.1",
-    "lint-staged": "^16.2.5",
+    "lint-staged": "^16.2.6",
     "prettier": "^3.6.2"
   },
   "lint-staged": {

lambdas/shared/tests/test_common/test_utils.py

@@ -6,11 +6,10 @@ sonar.python.version=3.11
 sonar.exclusions=**/e2e/**,**/e2e_batch/**,**/devtools/**,**/proxies/**,**/utilities/scripts/**,**/infrastructure/account/**,**/infrastructure/instance/**,**/infrastructure/grafana/**,**/terraform_aws_backup/**,**/tests/**
 sonar.python.coverage.reportPaths=backend-coverage.xml,delta-coverage.xml,ack-lambda-coverage.xml,filenameprocessor-coverage.xml,recordforwarder-coverage.xml,recordprocessor-coverage.xml,mesh_processor-coverage.xml,redis_sync-coverage.xml,mns_subscription-coverage.xml,id_sync-coverage.xml,shared-coverage.xml,batchprocessorfilter-coverage.xml
 sonar.cpd.exclusions=**/cache.py,**/authentication.py,**/test_cache.py,**/test_authentication.py,**/mns_service.py,**/errors.py,**/Dockerfile,lambdas/shared/src/common/**,filenameprocessor/src/logging_decorator.py,backend/src/fhir_service.py
-sonar.issue.ignore.multicriteria=exclude_snomed_urls,exclude_hl7_urls
+sonar.issue.ignore.multicriteria=exclude_snomed_urls,exclude_hl7_urls,exclude_safe_tmpdirs
 sonar.issue.ignore.multicriteria.exclude_snomed_urls.ruleKey=python:S5332
-sonar.issue.ignore.multicriteria.exclude_snomed_urls.resourceKey=**http://snomed\.info/sct**
+sonar.issue.ignore.multicriteria.exclude_snomed_urls.resourceKey=**/extractor.py,**/constants.py
 sonar.issue.ignore.multicriteria.exclude_hl7_urls.ruleKey=python:S5332
-sonar.issue.ignore.multicriteria.exclude_hl7_urls.resourceKey=**http://terminology\.hl7\.org/CodeSystem/v3-NullFlavor**
-sonar.issue.ignore.multicriteria=e1
-sonar.issue.ignore.multicriteria.e1.ruleKey=python:S5443
-sonar.issue.ignore.multicriteria.e1.resourceKey=**/mns_setup.py
+sonar.issue.ignore.multicriteria.exclude_hl7_urls.resourceKey=**/constants.py
+sonar.issue.ignore.multicriteria.exclude_safe_tmpdirs.ruleKey=python:S5443
+sonar.issue.ignore.multicriteria.exclude_safe_tmpdirs.resourceKey=**/mns_setup.py,**/pds_details.py