Fixed merge conflicts

Author: RobertNovac

backend/.gitignore

@@ -1,7 +1,2 @@
 build
-.venv
-.direnv
-.env
-.envrc
-terraform.tfstate
-.python-version
+.venv

backend/src/fhir_service.py

@@ -76,7 +76,7 @@ def get_immunization_by_identifier(
             base_url = f"{get_service_url()}/Immunization"
             response = form_json(imms_resp, element, identifier, base_url)
             return response
-    
+
     def get_immunization_by_id(self, imms_id: str, imms_vax_type_perms: str) -> Optional[dict]:
         """
         Get an Immunization by its ID. Return None if not found. If the patient doesn't have an NHS number,

backend/src/filter.py

@@ -94,6 +94,7 @@ def add_use_to_identifier(imms: dict) -> dict:
 
 class Filter:
     """Functions for filtering a FHIR Immunization Resource"""
+    
     @staticmethod
     def read(imms: dict) -> dict:
         """Apply filtering for READ request"""

backend/src/get_imms_handler.py

@@ -16,7 +16,7 @@ def get_imms_handler(event, context):
 
 def get_immunization_by_id(event, controller: FhirController):
     try:
-        return controller.get_immunization_by_id(event)  
+        return controller.get_immunization_by_id(event)
     except Exception:  # pylint: disable = broad-exception-caught
         exp_error = create_operation_outcome(
             resource_id=str(uuid.uuid4()),

backend/tests/test_fhir_service.py

@@ -157,7 +157,7 @@ def setUp(self):
         self.pds_service = create_autospec(PdsService)
         self.validator = create_autospec(ImmunizationValidator)
         self.fhir_service = FhirService(self.imms_repo, self.pds_service, self.validator)
-    
+
     def test_get_immunization_by_id(self):
         """it should find an Immunization by id"""
         imms_id = "an-id"