VED-740: fix occurrence date time microseconds via parseobj

Author: Akol125

backend/src/models/utils/generic_utils.py

@@ -169,7 +169,7 @@ def form_json(response, _elements, identifier, baseurl):
         resource["meta"] = meta
 
     entry = BundleEntry(fullUrl=f"{baseurl}/{response['id']}",
-        resource=Immunization.construct(**resource),
+        resource=Immunization.construct(**resource) if _elements else Immunization.parse_obj(resource),
         search=BundleEntrySearch.construct(mode="match") if not _elements else None,
     )
 

backend/tests/utils/test_generic_utils.py

@@ -1,20 +1,23 @@
 """Generic utils for tests"""
 
-
+import json
 import unittest
 from src.models.utils.generic_utils import form_json
+from tests.utils.generic_utils import load_json_data
 
 
 class TestFormJson(unittest.TestCase):
     def setUp(self):
         self.baseurl = "https://api.service.nhs.uk/immunisation-fhir-api/Immunization"
         self.identifier = "https://supplierABC/identifiers/vacc|f10b59b3-fc73-4616-99c9-9e882ab31184"
         self.response = {
-            "resource": {"resourceType": "Immunization", "id": "f10b59b3-fc73-4616-99c9-9e882ab31184", "status": "completed"},
+            "resource": load_json_data("completed_covid19_immunization_event.json"),
             "id": "f10b59b3-fc73-4616-99c9-9e882ab31184",
             "version": 2,
         }
 
+        self.maxDiff = None
+
     def test_no_response(self):
         out = form_json(None, None, self.identifier, self.baseurl)
         self.assertEqual(out["resourceType"], "Bundle")
@@ -27,7 +30,7 @@ def test_identifier_only_returns_full_resource(self):
         out = form_json(self.response, None, self.identifier, self.baseurl)
         self.assertEqual(out["total"], 1)
         self.assertEqual(out["link"][0]["url"], f"{self.baseurl}?identifier={self.identifier}")
-        self.assertDictEqual(out["entry"][0]["resource"], self.response["resource"])
+        self.assertDictEqual(json.loads(out["entry"][0]["resource"]), json.loads(self.response["resource"]))
         self.assertEqual(out["entry"][0]["fullUrl"], f"{self.baseurl}/{self.response['id']}")
 
     def test_identifier_with_id_element_truncates_to_id(self):