common.clients

toml

sonarqube shared path

id sync path

sonarQube

duplicate ignore

Author: nhsdevws

.github/dependabot.yml

@@ -59,6 +59,7 @@ updates:
       - "/recordprocessor"
       - "/redis_sync"
       - "/lambdas/id_sync"
+      - "/lambdas/shared"
     schedule:
       interval: "daily"
     open-pull-requests-limit: 1

.github/workflows/sonarcloud.yml

@@ -7,6 +7,10 @@ on:
   pull_request:
     types: [labeled, opened, synchronize, reopened, unlabeled]
 
+env:
+  SHARED_PATH: ${{ github.workspace }}/lambdas/shared/src:${{ github.workspace }}/lambdas/shared/tests
+  LAMBDA_PATH: ${{ github.workspace }}/lambdas
+
 jobs:
   sonarcloud:
     name: SonarCloud
@@ -26,6 +30,11 @@ jobs:
             3.10
             3.11
           cache: 'poetry'
+      - name: Debug shared folder
+        run: |
+          echo "Showing shared/src/common structure:"
+          ls
+          ls -R lambdas/shared/src/common || echo "Directory missing"
 
       - name: Set up AWS credentials
         env:
@@ -124,11 +133,23 @@ jobs:
             poetry run coverage run -m unittest discover || echo "redis_sync tests failed" >> ../failed_tests.txt
             poetry run coverage xml -o ../redis_sync-coverage.xml
 
+      - name: Run unittest with shared
+        working-directory: lambdas/shared
+        id: shared
+        env:
+          PYTHONPATH: ${{ env.SHARED_PATH }}
+        continue-on-error: true
+        run: |
+            poetry env use 3.11
+            poetry install
+            poetry run coverage run -m unittest discover || echo "shared tests failed" >> ../../failed_tests.txt
+            poetry run coverage xml -o ../../shared-coverage.xml
+
       - name: Run unittest with id_sync
         working-directory: lambdas/id_sync
         id: id_sync
         env:
-          PYTHONPATH: ${{ github.workspace }}/lambdas/id_sync/src:${{ github.workspace }}/lambdas/id_sync/tests
+          PYTHONPATH: ${{ env.LAMBDA_PATH }}/id_sync/src:${{ env.LAMBDA_PATH }}/id_sync/tests:${{ env.SHARED_PATH }}
         continue-on-error: true
         run: |
             poetry env use 3.11

immunisation-fhir-api.code-workspace

@@ -32,6 +32,9 @@
         },
         {
             "path": "lambdas/id_sync"
+        },
+        {
+            "path": "lambdas/shared"
         }
     ],
 	"settings": {},

lambdas/id_sync/Makefile

@@ -1,14 +1,16 @@
+TEST_ENV := @PYTHONPATH=src:tests:../shared/src
 
 test:
-	@PYTHONPATH=src:tests:../shared/src python -m unittest
+	$(TEST_ENV) python -m unittest
 
 coverage-run:
-	coverage run -m unittest discover -v
+	$(TEST_ENV) coverage run -m unittest discover -v
 
 coverage-report:
-	coverage report -m
+	$(TEST_ENV) coverage report -m
 
 coverage-html:
-	coverage html
+	$(TEST_ENV) coverage html
+
 
 .PHONY: build package

lambdas/id_sync/pyproject.toml

@@ -1,20 +1,20 @@
 [project]
-name = "redis-sync"
+name = "id-sync"
 version = "0.1.0"
 description = "Sync s3 to REDIS"
 authors = [
     {name = "nhsdevws",email = "[email protected]"}
 ]
 
 [tool.poetry]
-name = "redis-sync"
+name = "id-sync"
 version = "0.1.0"
 description = ""
 authors = ["s.wates <[email protected]>"]
 readme = "README.md"
 packages = [
     {include = "src"},
-    {include = "common", from = "../shared/src/common"}
+    {include = "common", from = "../shared/src"}
 ]
 
 [tool.poetry.dependencies]

lambdas/id_sync/src/clients.py

@@ -1,5 +1,5 @@
 from common.clients import logger
-from clients import STREAM_NAME
+from common.clients import STREAM_NAME
 from common.log_decorator import logging_decorator
 from record_processor import process_record
 

lambdas/id_sync/src/id_sync.py

@@ -4,4 +4,4 @@
 
 
 def process_record(record, _):
-    return "hello world"
+    return f"hello world {record}"

lambdas/id_sync/src/record_processor.py

@@ -16,7 +16,8 @@ def setUp(self):
         self.record_processor_patcher = patch("id_sync.process_record")
         self.mock_record_processor = self.record_processor_patcher.start()
         # patch log_decorator to pass through
-        self.mock_log_decorator = patch("common.log_decorator.logging_decorator", lambda prefix=None: (lambda f: f)).start()
+        self.mock_log_decorator = patch("common.log_decorator.logging_decorator",
+                                        lambda prefix=None: (lambda f: f)).start()
 
     def tearDown(self):
         patch.stopall()

lambdas/id_sync/tests/test_handler.py

@@ -0,0 +1,17 @@
+from record_processor import process_record
+import unittest
+from unittest.mock import patch
+
+
+class TestRecordProcessor(unittest.TestCase):
+    def setUp(self):
+        self.logger_info_patcher = patch("logging.Logger.info")
+        self.mock_logger_info = self.logger_info_patcher.start()
+
+    def tearDown(self):
+        patch.stopall()
+
+    def test_record_processor_success(self):
+        test_record = "abc1"
+        response = process_record(test_record, None)
+        self.assertEqual(response, f"hello world {test_record}")