VED-457: Return updated version in two missed places.

Author: mfjarvis

backend/src/fhir_controller.py

@@ -225,7 +225,7 @@ def update_immunization(self, aws_event):
 
         # Validate the imms id - start
         if id_error := self._validate_id(imms_id):
-            return FhirController.create_response(400, json.dumps(id_error))    
+            return FhirController.create_response(400, json.dumps(id_error))
         # Validate the imms id - end
 
         # Validate the body of the request - start
@@ -281,9 +281,13 @@ def update_immunization(self, aws_event):
         try:
             # Validate if the imms resource to be updated is a logically deleted resource - start
             if existing_record["DeletedAt"] == True:
-
                 outcome, resource, updated_version = self.fhir_service.reinstate_immunization(
-                    imms_id, imms, existing_resource_version, imms_vax_type_perms, supplier_system)
+                    imms_id,
+                    imms,
+                    existing_resource_version,
+                    imms_vax_type_perms,
+                    supplier_system
+                )
             # Validate if the imms resource to be updated is a logically deleted resource-end
             else:
                 # Validate if imms resource version is part of the request - start
@@ -332,7 +336,7 @@ def update_immunization(self, aws_event):
 
                 # Check if the record is reinstated record - start
                 if existing_record["Reinstated"] == True:
-                    outcome, resource = self.fhir_service.update_reinstated_immunization(
+                    outcome, resource, updated_version = self.fhir_service.update_reinstated_immunization(
                         imms_id,
                         imms,
                         existing_resource_version,
@@ -360,7 +364,7 @@ def update_immunization(self, aws_event):
                 )
                 return self.create_response(400, json.dumps(exp_error))
             if outcome == UpdateOutcome.UPDATE:
-                return self.create_response(200, {"E-Tag": updated_version}) #include e-tag here, is it not included in the response resource 
+                return self.create_response(200, {"E-Tag": updated_version}) #include e-tag here, is it not included in the response resource
         except ValidationError as error:
             return self.create_response(400, error.to_operation_outcome())
         except IdentifierDuplicationError as duplicate:
@@ -543,7 +547,7 @@ def _create_bad_request(self, message):
         )
         return self.create_response(400, error)
 
-    
+
     def authorize_request(self, aws_event: dict) -> Optional[dict]:
         try:
             self.authorizer.authorize(aws_event)

backend/src/fhir_repository.py

@@ -194,9 +194,9 @@ def update_immunization(
         immunization: dict,
         patient: any,
         existing_resource_version: int,
-        imms_vax_type_perms: str,
+        imms_vax_type_perms: list[str],
         supplier_system: str,
-    ) -> dict:
+    ) -> tuple[dict, int]:
         attr = RecordAttributes(immunization, patient)
         self._handle_permissions(imms_vax_type_perms, attr)
         update_exp = self._build_update_expression(is_reinstate=False)
@@ -219,10 +219,10 @@ def reinstate_immunization(
         immunization: dict,
         patient: any,
         existing_resource_version: int,
-        imms_vax_type_perms: str,
+        imms_vax_type_perms: list[str],
         supplier_system: str,
 
-    ) -> dict:
+    ) -> tuple[dict, int]:
         attr = RecordAttributes(immunization, patient)
         self._handle_permissions(imms_vax_type_perms, attr)
         update_exp = self._build_update_expression(is_reinstate=True)
@@ -245,9 +245,9 @@ def update_reinstated_immunization(
         immunization: dict,
         patient: any,
         existing_resource_version: int,
-        imms_vax_type_perms: str,
+        imms_vax_type_perms: list[str],
         supplier_system: str,
-    ) -> dict:
+    ) -> tuple[dict, int]:
         attr = RecordAttributes(immunization, patient)
         self._handle_permissions(imms_vax_type_perms, attr)
         update_exp = self._build_update_expression(is_reinstate=False)
@@ -353,12 +353,12 @@ def _perform_dynamo_update(
     def delete_immunization(
             self, imms_id: str, imms_vax_type_perms: str, supplier_system: str) -> dict:
         now_timestamp = int(time.time())
-        
+
         try:
             item = self.table.get_item(Key={"PK": _make_immunization_pk(imms_id)}).get("Item")
             if not item:
                 raise ResourceNotFoundError(resource_type="Immunization", resource_id=imms_id)
-            
+
             if not item.get("DeletedAt") or item.get("DeletedAt") == "reinstated":
                 vaccine_type = self._vaccine_type(item["PatientSK"])
                 if not validate_permissions(imms_vax_type_perms, ApiOperationCode.DELETE, [vaccine_type]):
@@ -381,7 +381,7 @@ def delete_immunization(
                     (Attr("DeletedAt").not_exists() | Attr("DeletedAt").eq("reinstated"))
                 ),
             )
-            
+
             return self._handle_dynamo_response(response)
         except botocore.exceptions.ClientError as error:
             if error.response["Error"]["Code"] == "ConditionalCheckFailedException":

backend/src/fhir_service.py

@@ -136,12 +136,12 @@ def update_immunization(
         existing_resource_version: int,
         imms_vax_type_perms: list[str],
         supplier_system: str,
-    ) -> tuple[UpdateOutcome, Immunization]:
+    ) -> tuple[UpdateOutcome, Immunization, int]:
         immunization["id"] = imms_id
 
         patient = self._validate_patient(immunization)
         if "diagnostics" in patient:
-            return (None, patient)
+            return (None, patient, None)
         imms, updated_version = self.immunization_repo.update_immunization(
             imms_id,
             immunization,
@@ -160,12 +160,12 @@ def reinstate_immunization(
         existing_resource_version: int,
         imms_vax_type_perms: list[str],
         supplier_system: str,
-    ) -> tuple[UpdateOutcome, Immunization]:
+    ) -> tuple[UpdateOutcome, Immunization, int]:
         immunization["id"] = imms_id
         patient = self._validate_patient(immunization)
         if "diagnostics" in patient:
-            return (None, patient)
-        imms = self.immunization_repo.reinstate_immunization(
+            return (None, patient, None)
+        imms, updated_version = self.immunization_repo.reinstate_immunization(
             imms_id,
             immunization,
             patient,
@@ -174,7 +174,7 @@ def reinstate_immunization(
             supplier_system,
         )
 
-        return UpdateOutcome.UPDATE, Immunization.parse_obj(imms)
+        return UpdateOutcome.UPDATE, Immunization.parse_obj(imms), updated_version
 
     def update_reinstated_immunization(
         self,
@@ -183,14 +183,12 @@ def update_reinstated_immunization(
         existing_resource_version: int,
         imms_vax_type_perms: list[str],
         supplier_system: str,
-    ) -> tuple[UpdateOutcome, Immunization]:
+    ) -> tuple[UpdateOutcome, Immunization, int]:
         immunization["id"] = imms_id
-
-        patient = None
         patient = self._validate_patient(immunization)
         if "diagnostics" in patient:
-            return (None, patient)
-        imms = self.immunization_repo.update_reinstated_immunization(
+            return (None, patient, None)
+        imms, updated_version = self.immunization_repo.update_reinstated_immunization(
             imms_id,
             immunization,
             patient,
@@ -199,7 +197,7 @@ def update_reinstated_immunization(
             supplier_system,
         )
 
-        return UpdateOutcome.UPDATE, Immunization.parse_obj(imms)
+        return UpdateOutcome.UPDATE, Immunization.parse_obj(imms), updated_version
 
     def delete_immunization(self, imms_id, imms_vax_type_perms, supplier_system) -> Immunization:
         """