VED-805 Refactor meshprocessor (#945)

* init: move

* terraform fmt

* terraform

* sonar

* -shared

* revert source_path

* smells

* ruff

* fmt

* unsplit line II

Author: JamesW1-NHS

.github/dependabot.yml

@@ -9,11 +9,11 @@ updates:
     directories:
       - "/batch_processor_filter"
       - "/infrastructure/grafana/non-prod/docker"
-      - "/lambdas/filenameprocessor"
       - "/lambdas/ack_backend"
       - "/lambdas/delta_backend"
+      - "/lambdas/filenameprocessor"
+      - "/lambdas/mesh_processor"
       - "/lambdas/recordprocessor"
-      - "/mesh_processor"
       - "/sandbox"
     schedule:
       interval: "daily"
@@ -51,13 +51,13 @@ updates:
       - "/"
       - "/backend"
       - "/batch_processor_filter"
-      - "/mesh_processor"
-      - "/lambdas/recordprocessor"
       - "/lambdas/ack_backend"
       - "/lambdas/delta_backend"
       - "/lambdas/filenameprocessor"
       - "/lambdas/id_sync"
+      - "/lambdas/mesh_processor"
       - "/lambdas/mns_subscription"
+      - "/lambdas/recordprocessor"
       - "/lambdas/redis_sync"
       - "/lambdas/shared"
       - "/tests/e2e"

.github/workflows/quality-checks.yml

@@ -142,15 +142,6 @@ jobs:
           poetry run coverage run -m unittest discover || echo "fhir-api tests failed" >> ../failed_tests.txt
           poetry run coverage xml -o ../backend-coverage.xml
 
-      - name: Run unittest with coverage-mesh-processor
-        working-directory: mesh_processor
-        id: meshprocessor
-        continue-on-error: true
-        run: |
-          poetry install
-          poetry run coverage run -m unittest discover || echo "mesh_processor tests failed" >> ../failed_tests.txt
-          poetry run coverage xml -o ../mesh_processor-coverage.xml
-
       - name: Run unittest with coverage-ack-lambda
         working-directory: lambdas/ack_backend
         id: acklambda
@@ -195,6 +186,15 @@ jobs:
           poetry run coverage run --rcfile=.coveragerc --source=src -m unittest discover || echo "id_sync tests failed" >> ../../failed_tests.txt
           poetry run coverage xml -o ../../id_sync-coverage.xml
 
+      - name: Run unittest with coverage-mesh-processor
+        working-directory: lambdas/mesh_processor
+        id: meshprocessor
+        continue-on-error: true
+        run: |
+          poetry install
+          poetry run coverage run -m unittest discover || echo "mesh_processor tests failed" >> ../../failed_tests.txt
+          poetry run coverage xml -o ../../mesh_processor-coverage.xml
+
       - name: Run unittest with coverage-mns-subscription
         working-directory: lambdas/mns_subscription
         id: mns_subscription

Makefile

@@ -1,6 +1,6 @@
 SHELL=/usr/bin/env bash -euo pipefail
 
-PYTHON_PROJECT_DIRS_WITH_UNIT_TESTS = backend batch_processor_filter mesh_processor lambdas/ack_backend lambdas/delta_backend lambdas/filenameprocessor lambdas/id_sync lambdas/mns_subscription lambdas/recordprocessor lambdas/redis_sync lambdas/shared
+PYTHON_PROJECT_DIRS_WITH_UNIT_TESTS = backend batch_processor_filter lambdas/ack_backend lambdas/delta_backend lambdas/filenameprocessor lambdas/id_sync lambdas/mesh_processor lambdas/mns_subscription lambdas/recordprocessor lambdas/redis_sync lambdas/shared
 PYTHON_PROJECT_DIRS = tests/e2e tests/e2e_batch quality_checks $(PYTHON_PROJECT_DIRS_WITH_UNIT_TESTS)
 
 .PHONY: install lint format format-check clean publish build-proxy release initialise-all-python-venvs update-all-python-dependencies run-all-python-unit-tests build-all-docker-images

backend/src/constants.py

@@ -11,7 +11,7 @@ class Urls:
 
     nhs_number = "https://fhir.nhs.uk/Id/nhs-number"
     vaccination_procedure = "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-VaccinationProcedure"
-    snomed = "http://snomed.info/sct"
+    snomed = "http://snomed.info/sct"  # NOSONAR(S5332)
     nhs_number_verification_status_structure_definition = (
         "https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-NHSNumberVerificationStatus"
     )

immunisation-fhir-api.code-workspace

@@ -6,9 +6,6 @@
         {
             "path": "backend",
         },
-        {
-            "path": "mesh_processor",
-        },
         {
             "path": "lambdas/ack_backend",
         },
@@ -21,6 +18,9 @@
         {
             "path": "lambdas/id_sync",
         },
+        {
+            "path": "lambdas/mesh_processor",
+        },
         {
             "path": "lambdas/mns_subscription",
         },

infrastructure/instance/mesh_processor.tf

@@ -1,6 +1,6 @@
 # Define the directory containing the Docker image and calculate its SHA-256 hash for triggering redeployments
 locals {
-  mesh_processor_lambda_dir     = abspath("${path.root}/../../mesh_processor")
+  mesh_processor_lambda_dir     = abspath("${path.root}/../../lambdas/mesh_processor")
   mesh_processor_lambda_files   = fileset(local.mesh_processor_lambda_dir, "**")
   mesh_processor_lambda_dir_sha = sha1(join("", [for f in local.mesh_processor_lambda_files : filesha1("${local.mesh_processor_lambda_dir}/${f}")]))
   # This should match the prefix used in the global Terraform