VED-26: Revert Redis client change. Temporarily skip PDS callout.

Author: mfjarvis

backend/src/clients.py

@@ -17,9 +17,8 @@
 REDIS_PORT = int(os.getenv("REDIS_PORT", 6379))
 
 
-# logging.basicConfig(level="INFO")
-# logger = logging.getLogger()
-# logger.setLevel("INFO")
-# logger.info(f"Connecting to Redis at {REDIS_HOST}:{REDIS_PORT}")
-#
-# redis_client = redis.StrictRedis(host=REDIS_HOST, port=REDIS_PORT, decode_responses=True)
+logging.basicConfig(level="INFO")
+logger = logging.getLogger()
+logger.info(f"Connecting to Redis at {REDIS_HOST}:{REDIS_PORT}")
+
+redis_client = redis.StrictRedis(host=REDIS_HOST, port=REDIS_PORT, decode_responses=True)

backend/src/fhir_service.py

@@ -342,6 +342,9 @@ def search_immunizations(
 
     @timed
     def _validate_patient(self, imms: dict) -> dict:
+        # TODO - REVERT - skipping PDS call for test purposes
+        return {}
+
         """
         Get the NHS number from the contained Patient resource and validate it with PDS.
 

backend/src/models/utils/permissions.py

@@ -1,13 +1,8 @@
-# from clients import redis_client
+from clients import redis_client
 import json
-import redis
-
-from clients import REDIS_HOST, REDIS_PORT
 
 
 def get_supplier_permissions(supplier: str) -> list[str]:
-    print(f"Connecting to Redis at {REDIS_HOST}:{REDIS_PORT}")
-    redis_client = redis.StrictRedis(host=REDIS_HOST, port=REDIS_PORT, decode_responses=True)
     print(f"Getting permissions for supplier: {supplier}")
     permissions_data = redis_client.hget("supplier_permissions", supplier)
     print(f"Got permissions: {permissions_data}")

backend/tests/test_fhir_service.py

@@ -3,6 +3,7 @@
 import datetime
 import unittest
 from copy import deepcopy
+from unittest import skip
 from unittest.mock import create_autospec
 from decimal import Decimal
 
@@ -304,7 +305,7 @@ def test_immunization_not_found(self):
 
         # Then
         self.imms_repo.get_immunization_by_identifier.assert_called_once_with(imms_id, "COVID19:search")
-        
+
         self.assertEqual(act_imms["entry"], [])
 
 
@@ -322,6 +323,7 @@ def setUp(self):
             ImmunizationValidator(add_post_validators=False),
         )
 
+    @skip
     def test_create_immunization(self):
         """it should create Immunization and validate it"""
         imms_id = "an-id"
@@ -343,7 +345,7 @@ def test_create_immunization(self):
 
         # Then
         self.imms_repo.create_immunization.assert_called_once_with(req_imms, pds_patient, ["COVID19:create"], "Test")
-        
+
         self.validator.validate.assert_called_once_with(req_imms)
         self.fhir_service.pds_service.get_patient_details.assert_called_once_with(
             nhs_number
@@ -416,6 +418,7 @@ def test_post_validation_failed(self):
         self.imms_repo.create_immunization.assert_not_called()
         self.pds_service.get_patient_details.assert_not_called()
 
+    @skip
     def test_patient_error(self):
         """it should throw error when PDS can't resolve patient"""
         self.fhir_service.pds_service.get_patient_details.return_value = None
@@ -440,6 +443,7 @@ def setUp(self):
         self.validator = create_autospec(ImmunizationValidator)
         self.fhir_service = FhirService(self.imms_repo, self.pds_service, self.validator)
 
+    @skip
     def test_update_immunization(self):
         """it should update Immunization and validate NHS number"""
         imms_id = "an-id"
@@ -476,6 +480,7 @@ def test_id_not_present(self):
         passed_imms = self.imms_repo.update_immunization.call_args.args[1]
         self.assertEqual(passed_imms["id"], req_imms_id)
 
+    @skip
     def test_patient_error(self):
         """it should throw error when PDS can't resolve patient"""
         self.fhir_service.pds_service.get_patient_details.return_value = None

backend/tests/utils/test_permissions.py

@@ -1,10 +1,8 @@
 import unittest
-from unittest import skip
 from unittest.mock import patch
 from src.models.utils.permissions import get_supplier_permissions
 
 
-@skip("Commented out global client to test whether this is causing our issues")
 class TestPermissions(unittest.TestCase):
 
     @patch("clients.redis_client.hget")