Increasing test coverage

common/src/test/java/uk/nhs/adaptors/common/service/MDCServiceTest.java

@@ -0,0 +1,34 @@
+package uk.nhs.adaptors.common.service;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+
+public class MDCServiceTest {
+
+    private final MDCService mdcService = new MDCService();
+
+    @AfterEach
+    public void tearDown() {
+        mdcService.resetAllMdcKeys();
+    }
+
+    @Test
+    public void shouldApplyAndGetConversationId() {
+        mdcService.applyConversationId("conversation-id");
+
+        assertEquals("conversation-id", mdcService.getConversationId());
+    }
+
+    @Test
+    public void shouldResetConversationId() {
+        mdcService.applyConversationId("conversation-id");
+
+        mdcService.resetAllMdcKeys();
+
+        assertNull(mdcService.getConversationId());
+    }
+}
+

common/src/test/java/uk/nhs/adaptors/common/util/fhir/FhirParserTest.java

@@ -0,0 +1,48 @@
+package uk.nhs.adaptors.common.util.fhir;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.hl7.fhir.dstu3.model.Parameters;
+import org.junit.jupiter.api.Test;
+
+import ca.uhn.fhir.context.FhirContext;
+import uk.nhs.adaptors.common.exception.FhirValidationException;
+
+public class FhirParserTest {
+
+    private final FhirParser fhirParser = new FhirParser(FhirContext.forDstu3());
+
+    @Test
+    public void shouldParseParametersResource() {
+        var json = "{"
+            + "\"resourceType\":\"Parameters\","
+            + "\"parameter\":[{\"name\":\"test-name\",\"valueString\":\"value\"}]"
+            + "}";
+
+        var parsed = fhirParser.parseResource(json, Parameters.class);
+
+        assertEquals("test-name", parsed.getParameterFirstRep().getName());
+        assertEquals("value", parsed.getParameterFirstRep().getValue().primitiveValue());
+    }
+
+    @Test
+    public void shouldThrowValidationExceptionForInvalidJson() {
+        assertThrows(FhirValidationException.class, () -> fhirParser.parseResource("{not-json}", Parameters.class));
+    }
+
+    @Test
+    public void shouldEncodeResourceToJson() {
+        var parameters = new Parameters();
+        parameters.addParameter().setName("test-name").setValue(new org.hl7.fhir.dstu3.model.StringType("value"));
+
+        var encoded = fhirParser.encodeToJson(parameters);
+        var compact = encoded.replaceAll("\\s+", "");
+
+        assertTrue(compact.contains("\"resourceType\":\"Parameters\""));
+        assertTrue(compact.contains("\"name\":\"test-name\""));
+        assertTrue(compact.contains("\"valueString\":\"value\""));
+    }
+}
+

db-connector/src/test/java/uk/nhs/adaptors/connector/mapper/PatientMigrationRequestRowMapperTest.java

@@ -0,0 +1,46 @@
+package uk.nhs.adaptors.connector.mapper;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.when;
+
+import java.sql.ResultSet;
+
+import org.jdbi.v3.core.statement.StatementContext;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+public class PatientMigrationRequestRowMapperTest {
+
+    public static final String PATIENT_NHS_NUMBER = "1234567890";
+    public static final int ID = 99999;
+    public static final String BUNDLE_RESOURCE = "bundle";
+    public static final String INBOUND = "inbound";
+    public static final String CONVERSATION_ID = "conversation-id";
+    public static final String LOOSING_ODS_CODE = "A123";
+    public static final String WINNING_ODS_CODE = "B123";
+
+    @Test
+    public void shouldMapPatientMigrationRequestFields() throws Exception {
+        var mapper = new PatientMigrationRequestRowMapper();
+        ResultSet resultSet = Mockito.mock(ResultSet.class);
+        StatementContext statementContext = Mockito.mock(StatementContext.class);
+
+        when(resultSet.getInt("id")).thenReturn(ID);
+        when(resultSet.getString("patient_nhs_number")).thenReturn(PATIENT_NHS_NUMBER);
+        when(resultSet.getString("bundle_resource")).thenReturn(BUNDLE_RESOURCE);
+        when(resultSet.getString("inbound_message")).thenReturn(INBOUND);
+        when(resultSet.getString("conversation_id")).thenReturn(CONVERSATION_ID);
+        when(resultSet.getString("losing_practice_ods_code")).thenReturn(LOOSING_ODS_CODE);
+        when(resultSet.getString("winning_practice_ods_code")).thenReturn(WINNING_ODS_CODE);
+
+        var mapped = mapper.map(resultSet, statementContext);
+
+        assertEquals(ID, mapped.getId());
+        assertEquals(PATIENT_NHS_NUMBER, mapped.getPatientNhsNumber());
+        assertEquals(BUNDLE_RESOURCE, mapped.getBundleResource());
+        assertEquals(INBOUND, mapped.getInboundMessage());
+        assertEquals(CONVERSATION_ID, mapped.getConversationId());
+        assertEquals(LOOSING_ODS_CODE, mapped.getLosingPracticeOdsCode());
+        assertEquals(WINNING_ODS_CODE, mapped.getWinningPracticeOdsCode());
+    }
+}

gpc-api-facade/src/integrationTest/java/uk/nhs/adaptors/pss/gpc/controller/PatientTransferContractIT.java

@@ -0,0 +1,65 @@
+package uk.nhs.adaptors.pss.gpc.controller;
+
+import static org.apache.commons.lang3.RandomStringUtils.randomNumeric;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static uk.nhs.adaptors.common.util.FileUtil.readResourceAsString;
+
+import java.util.Locale;
+import java.util.UUID;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.http.HttpHeaders;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.test.web.servlet.MockMvc;
+
+import uk.nhs.adaptors.pss.gpc.GpcFacadeApplication;
+
+@SpringBootTest(classes = GpcFacadeApplication.class)
+@AutoConfigureMockMvc
+@Transactional
+public class PatientTransferContractIT {
+
+    private static final String ENDPOINT = "/Patient/$gpc.migratestructuredrecord";
+    private static final String CONTENT_TYPE = "application/fhir+json";
+    public static final String CONVERSATION_ID = "ConversationId";
+    public static final int NHS_NUMBER = 10;
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @Test
+    public void shouldReturnOperationOutcomeForInvalidRequestPayload() throws Exception {
+        var requestBody = buildRequestBody("/requests/migrate-patient-record/invalidRequestBody.json");
+
+        mockMvc.perform(post(ENDPOINT)
+                .contentType(CONTENT_TYPE)
+                .headers(requiredHeaders())
+                .header(CONVERSATION_ID, UUID.randomUUID().toString().toUpperCase(Locale.ROOT))
+                .content(requestBody))
+            .andExpect(status().isUnprocessableEntity())
+            .andExpect(content().contentType(CONTENT_TYPE))
+            .andExpect(jsonPath("$.resourceType").value("OperationOutcome"))
+            .andExpect(jsonPath("$.issue[0].code").value("invalid"))
+            .andExpect(jsonPath("$.issue[0].details.coding[0].code").value("INVALID_RESOURCE"));
+    }
+
+    private String buildRequestBody(String templatePath) {
+        return readResourceAsString(templatePath).replace("{{nhsNumber}}", randomNumeric(NHS_NUMBER));
+    }
+
+    private static HttpHeaders requiredHeaders() {
+        var headers = new HttpHeaders();
+        headers.set("from-asid", "123456");
+        headers.set("to-asid", "32145");
+        headers.set("from-ods", "B943");
+        headers.set("to-ods", "F765");
+        return headers;
+    }
+}
+