Merge branch 'main' into dependabot/gradle/e2e-tests/com.fasterxml.jackson.core-jackson-databind-2.20.0

Author: ORybak5

service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/EncounterMapperTest.java

@@ -173,6 +173,22 @@ public void When_MappingEncounterWithNoType_Expect_Exception() {
             .hasMessage("Could not map Encounter type");
     }
 
+    @Test
+    public void When_MappingEncounterLocationWithNoReference_Expect_Exception() {
+        lenient().when(randomIdGeneratorService.createNewId()).thenReturn(TEST_ID);
+        lenient().when(bundle.getEntry()).thenReturn(List.of(BUNDLE_ENTRY_WITH_CONSULTATION));
+        var sampleComponent = ResourceTestFileUtils.getFileContent(SAMPLE_EHR_COMPOSITION_COMPONENT);
+
+        var jsonInput = ResourceTestFileUtils.getFileContent(TEST_FILES_DIRECTORY
+                                                             + "input-encounter-with-location-with-no-reference.json");
+        Encounter parsedEncounter = new FhirParseService().parseResource(jsonInput, Encounter.class);
+        when(encounterComponentsMapper.mapComponents(parsedEncounter)).thenReturn(sampleComponent);
+
+        assertThatThrownBy(() -> encounterMapper.mapEncounterToEhrComposition(parsedEncounter))
+            .isExactlyInstanceOf(EhrMapperException.class)
+            .hasMessage("Resource not found: Location/EB3994A6-5A87-4B53-A414-913137072F57");
+    }
+
     @Test
     public void When_MappingEncounterWithInvalidParticipantReferenceResourceType_Expect_Exception() {
         var sampleComponent = ResourceTestFileUtils.getFileContent(SAMPLE_EHR_COMPOSITION_COMPONENT);

service/src/test/resources/ehr/mapper/encounter/input-encounter-with-location-with-no-reference.json

@@ -0,0 +1,79 @@
+{
+  "resourceType":"Encounter",
+  "id":"F550CC56-EF65-4934-A7B1-3DC2E02243C3",
+  "meta":{
+    "profile":[
+      "https://fhir.nhs.uk/STU3/StructureDefinition/CareConnect-GPC-Encounter-1"
+    ]
+  },
+  "identifier":[
+    {
+      "system":"https://EMISWeb/A82038",
+      "value":"F550CC56-EF65-4934-A7B1-3DC2E02243C3"
+    }
+  ],
+  "status":"finished",
+  "type":[
+    {
+      "text":"GP Surgery",
+      "coding": [
+        {
+          "system":"http://snomed.info/sct",
+          "code":"24561000000109",
+          "display":"A+E report"
+        }
+      ]
+    }
+  ],
+  "subject":{
+    "reference":"Patient/88F14BF6-CADE-47D6-90E2-B10519BF956F"
+  },
+  "participant":[
+    {
+      "type":[
+        {
+          "coding":[
+            {
+              "system":"http://hl7.org/fhir/v3/ParticipationType",
+              "code":"PPRF",
+              "display":"primary performer"
+            }
+          ]
+        }
+      ],
+      "individual":{
+        "reference":"Practitioner/6D340A1B-BC15-4D4E-93CF-BBCB5B74DF73"
+      }
+    },
+    {
+      "type":[
+        {
+          "coding":[
+            {
+              "system":"https://fhir.nhs.uk/STU3/CodeSystem/GPConnect-ParticipantType-1",
+              "code":"REC",
+              "display":"recorder"
+            }
+          ]
+        }
+      ],
+      "individual":{
+        "reference":"Practitioner/6D340A1B-BC15-4D4E-93CF-BBCB5B74DF73"
+      }
+    }
+  ],
+  "period":{
+    "start":"2010-01-13T15:20:00+00:00",
+    "end":"2010-01-13T16:20:00+00:00"
+  },
+  "location":[
+    {
+      "location":{
+        "reference":"Location/EB3994A6-5A87-4B53-A414-913137072F57"
+      }
+    }
+  ],
+  "serviceProvider":{
+    "reference":"Organization/5E496953-065B-41F2-9577-BE8F2FBD0757"
+  }
+}