VED-457: Move E-Tag to response header (#664)

Return E-Tag in headers not body

Author: Akol125

backend/src/fhir_controller.py

@@ -167,7 +167,7 @@ def create_immunization(self, aws_event):
         try:
             if aws_event.get("headers"):
                 if response := self.authorize_request(aws_event):
-                        return response
+                    return response
             else:
                 raise UnauthorizedError()
         except UnauthorizedError as unauthorized:
@@ -364,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, None, {"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:

backend/tests/test_fhir_controller.py

@@ -1066,7 +1066,7 @@ def test_update_immunization(self,mock_get_permissions):
         )
         mock_get_permissions.assert_called_once_with("Test")
         self.assertEqual(response["statusCode"], 200)
-        self.assertEqual(json.loads(response["body"]), {"E-Tag": 2})
+        self.assertEqual(response["headers"]["E-Tag"], 2)
 
     @patch("fhir_controller.get_supplier_permissions")
     def test_update_immunization_etag_missing(self, mock_get_supplier_permissions):
@@ -1262,7 +1262,7 @@ def test_update_deletedat_immunization_with_version(self, mock_get_supplier_perm
             imms_id, json.loads(imms), 1, ["COVID19.CRUDS"], "Test"
         )
         self.assertEqual(response["statusCode"], 200)
-        self.assertEqual(json.loads(response["body"]), {"E-Tag": 2})
+        self.assertEqual(response["headers"]["E-Tag"], 2)
 
     @patch("fhir_controller.get_supplier_permissions")
     def test_update_deletedat_immunization_without_version(self, mock_get_supplier_permissions):
@@ -1291,7 +1291,7 @@ def test_update_deletedat_immunization_without_version(self, mock_get_supplier_p
         )
         mock_get_supplier_permissions.assert_called_once_with("Test")
         self.assertEqual(response["statusCode"], 200)
-        self.assertEqual(json.loads(response["body"]), {"E-Tag": 2})
+        self.assertEqual(response["headers"]["E-Tag"],  2)
 
     @patch("fhir_controller.get_supplier_permissions")
     def test_update_record_exists(self, mock_get_supplier_permissions):
@@ -1507,7 +1507,7 @@ def test_update_immunization_when_reinstated_true(self, mock_get_permissions):
             imms_id, json.loads(imms), 1, ["COVID19.CRUD"], "Test"
         )
         self.assertEqual(response["statusCode"], 200)
-        self.assertEqual(json.loads(response["body"]), {"E-Tag": 3})
+        self.assertEqual(response["headers"]["E-Tag"], int("3"))
 
     def test_update_immunization_missing_id(self):
         """it should raise KeyError if pathParameters['id'] is missing"""

e2e/test_update_immunization.py

@@ -31,7 +31,7 @@ def test_update_imms(self):
 
                     # Then
                     self.assertEqual(response.status_code, 200, response.text)
-                    self.assertEqual(response.json(), {"E-Tag": 2})
+                    self.assertEqual(int(response.headers["E-Tag"]), 2)
                     self.assertNotIn("Location", response.headers)
 
     def test_update_non_existent_identifier(self):