removed PDS

Author: JamesW1-NHS

backend/src/authentication.py

@@ -7,7 +7,6 @@
 from botocore.config import Config
 from decimal import Decimal
 from typing import Optional
-from authentication import AppRestrictedAuth, Service
 import boto3
 from aws_lambda_typing.events import APIGatewayProxyEventV1
 from botocore.config import Config
@@ -36,7 +35,6 @@
 from models.utils.generic_utils import check_keys_in_sources
 from models.utils.permissions import get_supplier_permissions
 from models.utils.permission_checker import ApiOperationCode, validate_permissions, _expand_permissions
-from pds_service import PdsService
 from parameter_parser import process_params, process_search_params, create_query_string
 import urllib.parse
 
@@ -45,23 +43,15 @@
 
 
 def make_controller(
-    pds_env: str = os.getenv("PDS_ENV", "int"),
     immunization_env: str = os.getenv("IMMUNIZATION_ENV"),
 ):
     endpoint_url = "http://localhost:4566" if immunization_env == "local" else None
     imms_repo = ImmunizationRepository(create_table(endpoint_url=endpoint_url))
     boto_config = Config(region_name="eu-west-2")
     cache = Cache(directory="/tmp")
-    authenticator = AppRestrictedAuth(
-        service=Service.PDS,
-        secret_manager_client=boto3.client("secretsmanager", config=boto_config),
-        environment=pds_env,
-        cache=cache,
-    )
-    pds_service = PdsService(authenticator, pds_env)
 
     authorizer = Authorization()
-    service = FhirService(imms_repo=imms_repo, pds_service=pds_service)
+    service = FhirService(imms_repo=imms_repo)
 
     return FhirController(authorizer=authorizer, fhir_service=service)
 

backend/src/fhir_controller.py

@@ -23,7 +23,6 @@
 from models.utils.generic_utils import nhs_number_mod11_check, get_occurrence_datetime, create_diagnostics, form_json, get_contained_patient
 from models.constants import Constants
 from models.errors import MandatoryError
-from pds_service import PdsService
 from timer import timed
 from filter import Filter
 
@@ -53,11 +52,9 @@ class FhirService:
     def __init__(
         self,
         imms_repo: ImmunizationRepository,
-        pds_service: PdsService,
         validator: ImmunizationValidator = ImmunizationValidator(),
     ):
         self.immunization_repo = imms_repo
-        self.pds_service = pds_service
         self.validator = validator
 
     def get_immunization_by_identifier(
@@ -344,10 +341,10 @@ def search_immunizations(
     @timed
     def _validate_patient(self, imms: dict) -> dict:
         """
-        Get the NHS number from the contained Patient resource and validate it with PDS.
+        Get the NHS number from the contained Patient resource and validate it.
 
         If the NHS number doesn't exist, return an empty dict.
-        If the NHS number exists, get the patient details from PDS and return the patient details.
+        If the NHS number exists, check it's valid, and return the patient details.
         """
         try:
             contained_patient = get_contained_patient(imms)
@@ -358,28 +355,7 @@ def _validate_patient(self, imms: dict) -> dict:
         if not nhs_number:
             return {}
 
-        if os.getenv("PDS_CHECK_ENABLED") == "false":
-            logger.warning("Skipping PDS check")
-            return contained_patient
-
-        # JW: PoC
-        # the above pre-validation code is valid I think, it's just a question of
-        # removing the PDS call below
-        # TODO: we then have to tweak the tests, possibly write new ones
-        # - 
         if nhs_number_mod11_check(nhs_number):
             return contained_patient
 
-        '''
-        patient = self.pds_service.get_patient_details(nhs_number)
-        # To check whether the Superseded NHS number present in PDS
-        if patient:
-            pds_nhs_number = patient["identifier"][0]["value"]
-            if pds_nhs_number != nhs_number:
-                diagnostics_error = create_diagnostics()
-                return diagnostics_error
-
-            return patient
-        '''
-
         raise InvalidPatientId(patient_identifier=nhs_number)