tidy

Author: nhsdevws

.github/workflows/sonarcloud.yml

@@ -24,45 +24,6 @@ jobs:
       - name: Install poetry
         run: pip install poetry==2.1.4
 
-      - name: Debug PR Info
-        if: github.event_name == 'pull_request'
-        run: |
-          echo "PR Number: ${{ github.event.pull_request.number }}"
-          echo "PR Head SHA: ${{ github.event.pull_request.head.sha }}"
-          echo "PR Base SHA: ${{ github.event.pull_request.base.sha }}"
-          echo "Current SHA: ${{ github.sha }}"
-
-
-      - name: Debug Trigger Info
-        run: |
-          echo "=== WORKFLOW TRIGGER DEBUG ==="
-          echo "Event Name: ${{ github.event_name }}"
-          echo "Current SHA: ${{ github.sha }}"
-
-          if [ "${{ github.event_name }}" = "pull_request" ]; then
-            echo "=== PULL REQUEST DETAILS ==="
-            echo "PR Number: ${{ github.event.pull_request.number }}"
-            echo "PR Head SHA: ${{ github.event.pull_request.head.sha }}"
-            echo "PR Base SHA: ${{ github.event.pull_request.base.sha }}"
-            echo "PR Head Ref: ${{ github.event.pull_request.head.ref }}"
-            echo "PR Base Ref: ${{ github.event.pull_request.base.ref }}"
-            echo "✅ Using PR HEAD commit for analysis"
-          elif [ "${{ github.event_name }}" = "push" ]; then
-            echo "=== PUSH DETAILS ==="
-            echo "Branch: ${{ github.ref_name }}"
-            echo "Pushed SHA: ${{ github.sha }}"
-            echo "Before SHA: ${{ github.event.before }}"
-            echo "After SHA: ${{ github.event.after }}"
-            echo "✅ Using pushed commit for analysis"
-          else
-            echo "=== OTHER EVENT ==="
-            echo "Unknown event type: ${{ github.event_name }}"
-          fi
-
-
-      - name: Install poetry
-        run: pip install poetry==2.1.2
-
       - uses: actions/setup-python@v5
         with:
           python-version: 3.11

.gitignore

@@ -30,4 +30,3 @@ openapi.json
 
 devtools/volume/
 **/.coverage
-backend/src/1.json

.tool-versions

@@ -1,4 +1,3 @@
-
 poetry 2.1.2
 nodejs 23.11.0
 python 3.11.12

backend/src/fhir_controller.py

@@ -36,7 +36,6 @@
 from parameter_parser import process_params, process_search_params, create_query_string
 import urllib.parse
 
-
 sqs_client = boto3_client("sqs", region_name="eu-west-2")
 queue_url = os.getenv("SQS_QUEUE_URL", "Queue_url")
 
@@ -392,10 +391,10 @@ def delete_immunization(self, aws_event):
         except UnauthorizedVaxError as unauthorized:
             return self.create_response(403, unauthorized.to_operation_outcome())
 
-    def search_immunizations(self, aws_event: APIGatewayProxyEventV1) -> dict:
-        
+    def search_immunizations(self, aws_event: APIGatewayProxyEventV1) -> dict:        
         if response := self.authorize_request(aws_event):
             return response
+        
         try:
             search_params = process_search_params(process_params(aws_event))
         except ParameterException as e:
@@ -429,6 +428,7 @@ def search_immunizations(self, aws_event: APIGatewayProxyEventV1) -> dict:
         except UnauthorizedVaxError as unauthorized:
             return self.create_response(403, unauthorized.to_operation_outcome())
         # Check vaxx type permissions on the existing record - end
+        
         result = self.fhir_service.search_immunizations(
             search_params.patient_identifier,
             vax_type_perm,
@@ -657,8 +657,7 @@ def create_response(status_code, body=None, headers=None):
 
     @staticmethod
     def _identify_supplier_system(aws_event):
-        headers = aws_event.get("headers", {})
-        supplier_system = headers.get("SupplierSystem")
+        supplier_system = aws_event["headers"]["SupplierSystem"]
         if not supplier_system:
             raise UnauthorizedError("SupplierSystem header is missing")
         return supplier_system

backend/src/fhir_repository.py

@@ -22,6 +22,7 @@
 
 from models.utils.validation_utils import get_vaccine_type, check_identifier_system_value
 
+
 def create_table(table_name=None, endpoint_url=None, region_name="eu-west-2"):
     if not table_name:
         table_name = os.environ["DYNAMODB_TABLE_NAME"]
@@ -395,34 +396,12 @@ def delete_immunization(
 
     def find_immunizations(self, patient_identifier: str, vaccine_types: list):
         """it should find all of the specified patient's Immunization events for all of the specified vaccine_types"""
-        
-        # ✅ Add debug logging
-        import logging
-        logger = logging.getLogger(__name__)
-        
-        # Create the patient PK and log it
-        patient_pk = _make_patient_pk(patient_identifier)
-
-        condition = Key("PatientPK").eq(patient_pk)
+        condition = Key("PatientPK").eq(_make_patient_pk(patient_identifier))
         is_not_deleted = Attr("DeletedAt").not_exists() | Attr("DeletedAt").eq("reinstated")
 
-        # # check response without filter
-        # response = self.table.query(
-        #     IndexName="PatientGSI",
-        #     KeyConditionExpression=condition
-        # )
-        # if 'LastEvaluatedKey' in response:
-        #     print("More rows are available. Use LastEvaluatedKey to paginate.")
-        # else:
-        #     print("No more rows.")
-
-        raw_items = self.get_all_items(condition,is_not_deleted)
-
-        # ✅ Log the raw DynamoDB response
+        raw_items = self.get_all_items(condition, is_not_deleted)
 
         if raw_items:    
-            # Log first few items for debugging
-            
             # Filter the response to contain only the requested vaccine types
             items = [x for x in raw_items if x["PatientSK"].split("#")[0] in vaccine_types]
 

backend/src/fhir_service.py

@@ -290,7 +290,6 @@ def search_immunizations(
         """
         # TODO: is disease type a mandatory field? (I assumed it is)
         #  i.e. Should we provide a search option for getting Patient's entire imms history?
-
         if not nhs_number_mod11_check(nhs_number):
             return create_diagnostics()
 
@@ -300,6 +299,7 @@ def search_immunizations(
             for r in self.immunization_repo.find_immunizations(nhs_number, vaccine_types)
             if self.is_valid_date_from(r, date_from) and self.is_valid_date_to(r, date_to)
         ]
+        
         # Create the patient URN for the fullUrl field.
         # NOTE: This UUID is assigned when a SEARCH request is received and used only for referencing the patient
         # resource from immunisation resources within the bundle. The fullUrl value we are using is a urn (hence the
@@ -311,14 +311,14 @@ def search_immunizations(
 
         # Filter and amend the immunization resources for the SEARCH response
         resources_filtered_for_search = [Filter.search(imms, patient_full_url) for imms in resources]
+        
         # Add bundle entries for each of the immunization resources
         entries = [
             BundleEntry(
                 resource=Immunization.parse_obj(imms),
                 search=BundleEntrySearch(mode="match"),
                 fullUrl=f"https://api.service.nhs.uk/immunisation-fhir-api/Immunization/{imms['id']}",
             )
-            # get imms and log for debug
             for imms in resources_filtered_for_search
         ]
 

backend/src/get_imms_handler.py

@@ -8,12 +8,10 @@
 from models.errors import Severity, Code, create_operation_outcome
 from log_structure import function_info
 from constants import GENERIC_SERVER_ERROR_DIAGNOSTICS_MESSAGE
-from clients import logger
 
 logging.basicConfig(level="INFO")
 logger = logging.getLogger()
 
-
 @function_info
 def get_imms_handler(event, _context):
     return get_immunization_by_id(event, make_controller())

backend/src/models/utils/a.json

@@ -85,6 +85,7 @@ def process_search_params(params: ParamContainer) -> SearchParams:
 
     :raises ParameterException:
     """
+    
     # patient.identifier
     patient_identifiers = params.get(patient_identifier_key, [])
     patient_identifier = patient_identifiers[0] if len(patient_identifiers) == 1 else None
@@ -124,6 +125,7 @@ def process_search_params(params: ParamContainer) -> SearchParams:
             if len(date_froms) == 1 else date_from_default
     except ValueError:
         raise ParameterException(f"Search parameter {date_from_key} must be in format: YYYY-MM-DD")
+    
     # date.to
     date_tos = params.get(date_to_key, [])
 

backend/src/parameter_parser.py

@@ -24,7 +24,6 @@ def search_imms_handler(event: events.APIGatewayProxyEventV1, _context: context_
 
 def search_imms(event: events.APIGatewayProxyEventV1, controller: FhirController):
     try:
-        logger.info(json.dumps(event, indent=2))
         query_params = event.get("queryStringParameters", {})
         body = event.get("body")
         body_has_immunization_identifier = False
@@ -46,7 +45,6 @@ def search_imms(event: events.APIGatewayProxyEventV1, controller: FhirController
                 # Check for 'immunization.identifier' in body
                 body_has_immunization_identifier = "immunization.identifier" in parsed_body
                 body_has_immunization_element = "_element" in parsed_body
-            
             if (
                 query_string_has_immunization_identifier
                 or body_has_immunization_identifier