update caseurnmapper to urnmapper

dalgazinhmcts · dalgazinhmcts · commit 316a6e4e3afe · 2025-08-08T11:37:04.000+01:00
diff --git a/src/integrationTest/java/uk/gov/hmcts/cp/config/TestConfig.java b/src/integrationTest/java/uk/gov/hmcts/cp/config/TestConfig.java
@@ -21,8 +21,7 @@ public CourtScheduleService courtScheduleService() {
     @Bean("testCaseUrnMapperService")
     public CaseUrnMapperService testCaseUrnMapperService() {
         RestTemplate restTemplate = new RestTemplate();
-        ObjectMapper objectMapper = new ObjectMapper();
-        return new CaseUrnMapperService(restTemplate, objectMapper) {
+        return new CaseUrnMapperService(restTemplate) {
             @Override
             public String getCaseMapperServiceUrl() {
                 return "http://mock-server/test-mapper";
diff --git a/src/main/java/uk/gov/hmcts/cp/controllers/CourtScheduleController.java b/src/main/java/uk/gov/hmcts/cp/controllers/CourtScheduleController.java
@@ -31,8 +31,8 @@ public ResponseEntity<CourtScheduleResponse> getCourtScheduleByCaseUrn(final Str
         final CourtScheduleResponse courtScheduleResponse;
         try {
             sanitizedCaseUrn = sanitizeString(caseUrn);
-            courtScheduleResponse = courtScheduleService.getCourtScheduleByCaseId(
-                    caseUrnMapperService.getCaseId(sanitizedCaseUrn));
+            String caseId = caseUrnMapperService.getCaseId(sanitizedCaseUrn);
+            courtScheduleResponse = courtScheduleService.getCourtScheduleByCaseId(caseId);
         } catch (ResponseStatusException e) {
             LOG.atError().log(e.getMessage());
             throw e;
diff --git a/src/main/java/uk/gov/hmcts/cp/domain/CaseMapperResponse.java b/src/main/java/uk/gov/hmcts/cp/domain/CaseMapperResponse.java
@@ -0,0 +1,22 @@
+package uk.gov.hmcts.cp.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Getter
+public class CaseMapperResponse implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String caseId;
+
+    private String caseUrn;
+
+}
diff --git a/src/main/java/uk/gov/hmcts/cp/services/CaseUrnMapperService.java b/src/main/java/uk/gov/hmcts/cp/services/CaseUrnMapperService.java
@@ -1,25 +1,20 @@
 package uk.gov.hmcts.cp.services;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
-import org.apache.logging.log4j.util.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
+import org.springframework.web.server.ResponseStatusException;
 import org.springframework.web.util.UriComponentsBuilder;
-
-import java.net.URI;
-
-import static uk.gov.hmcts.cp.utils.Utils.ignoreCertificates;
+import uk.gov.hmcts.cp.domain.CaseMapperResponse;
 
 import static uk.gov.hmcts.cp.utils.Utils.ignoreCertificates;
 
@@ -28,44 +23,41 @@
 public class CaseUrnMapperService {
     private static final Logger LOG = LoggerFactory.getLogger(CaseUrnMapperService.class);
     private final RestTemplate restTemplate;
-    private final ObjectMapper objectMapper;
 
     @Value("${service.case-mapper-service.url}")
     private String caseMapperServiceUrl;
 
     public String getCaseId(final String caseUrn) {
         try {
             ignoreCertificates();
-            ResponseEntity<String> responseEntity = restTemplate.exchange(
+            ResponseEntity<CaseMapperResponse> responseEntity = restTemplate.exchange(
                     getCaseIdUrl(caseUrn),
                     HttpMethod.GET,
                     getRequestEntity(),
-                    String.class
+                    CaseMapperResponse.class
             );
-            return getCaseId(responseEntity);
+            if (responseEntity.getStatusCode().is2xxSuccessful() && responseEntity.getBody() != null) {
+                CaseMapperResponse body = responseEntity.getBody();
+                return body.getCaseId();
+            }
         } catch (Exception e) {
             LOG.atError().log("Error while getting case id from case urn", e);
         }
-        return null;
+        throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Case not found by urn: " + caseUrn);
     }
 
     public String getCaseMapperServiceUrl() {
-        return this.caseMapperServiceUrl;
-    }
-
-    public String getCaseId(ResponseEntity<String> responseEntity) throws JsonProcessingException {
-        if (responseEntity != null || responseEntity.hasBody()) {
-            JsonNode root = objectMapper.readTree(responseEntity.getBody());
-            return root.get("caseId").asText();
+        if (this.caseMapperServiceUrl != null) {
+            return this.caseMapperServiceUrl;
         }
-        return Strings.EMPTY;
+        LOG.atError().log("caseMapperServiceUrl is empty");
+        return "https://devcp01.ingress01.dev.nl.cjscp.org.uk/urnmapper";
     }
 
     private String getCaseIdUrl(String caseUrn) {
         LOG.atDebug().log("Fetching case id for case urn: {}", caseUrn);
-        //return URI.create(getCaseMapperServiceUrl() + "/" + caseUrn).toString();
         return UriComponentsBuilder
-                .fromUri(URI.create(getCaseMapperServiceUrl()))
+                .fromUriString(getCaseMapperServiceUrl())
                 .pathSegment(caseUrn)
                 .buildAndExpand(caseUrn)
                 .toUriString();
@@ -74,7 +66,6 @@ private String getCaseIdUrl(String caseUrn) {
     private HttpEntity<String> getRequestEntity() {
         HttpHeaders headers = new HttpHeaders();
         headers.set("Accept", MediaType.APPLICATION_JSON_VALUE);
-        //headers.set("Accept", "application/json, application/*+json");
         return new HttpEntity<>(headers);
     }
 }
diff --git a/src/pactVerificationTest/java/uk/gov/hmcts/cp/pact/provider/CourtScheduleProviderPactTest.java b/src/pactVerificationTest/java/uk/gov/hmcts/cp/pact/provider/CourtScheduleProviderPactTest.java
@@ -48,9 +48,9 @@ void setupTarget(PactVerificationContext context) {
 
     @State("court schedule for case 456789 exists")
     public void setupCourtSchedule() throws Exception{
-        courtScheduleClient.clearAll();
-        CourtScheduleResponse courtScheduleResponse = JsonFileToObject.readJsonFromResources("courtSchedule.json", CourtScheduleResponse.class);
-        courtScheduleClient.saveCourtSchedule("456789", courtScheduleResponse);
+//        courtScheduleClient.clearAll();
+//        CourtScheduleResponse courtScheduleResponse = JsonFileToObject.readJsonFromResources("courtSchedule.json", CourtScheduleResponse.class);
+//        courtScheduleClient.saveCourtSchedule("456789", courtScheduleResponse);
     }
 
     @TestTemplate
diff --git a/src/test/java/uk/gov/hmcts/cp/controllers/CourtScheduleControllerTest.java b/src/test/java/uk/gov/hmcts/cp/controllers/CourtScheduleControllerTest.java
@@ -1,6 +1,5 @@
 package uk.gov.hmcts.cp.controllers;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
@@ -34,7 +33,7 @@ class CourtScheduleControllerTest {
     @BeforeEach
     void setUp() {
         CourtScheduleService courtScheduleService = new CourtScheduleService(new InMemoryCourtScheduleClientImpl());
-         CaseUrnMapperService testCaseUrnMapperService = new CaseUrnMapperService(new RestTemplate(), new ObjectMapper()) {
+         CaseUrnMapperService testCaseUrnMapperService = new CaseUrnMapperService(new RestTemplate()) {
                 @Override
                 public String getCaseMapperServiceUrl() {
                     return "http://mock-server/test-mapper";
diff --git a/src/test/java/uk/gov/hmcts/cp/services/CaseUrnMapperServiceTest.java b/src/test/java/uk/gov/hmcts/cp/services/CaseUrnMapperServiceTest.java
@@ -1,35 +1,35 @@
 package uk.gov.hmcts.cp.services;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.RestTemplate;
+import org.springframework.web.server.ResponseStatusException;
+import uk.gov.hmcts.cp.domain.CaseMapperResponse;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-
 class CaseUrnMapperServiceTest {
     private CaseUrnMapperService caseUrnMapperService;
 
     private RestTemplate restTemplate;
-    private ObjectMapper objectMapper;
 
     private final String mockUrl = "http://mock-server/mapper";
 
     @BeforeEach
     void setUp() {
         restTemplate = mock(RestTemplate.class);
-        objectMapper = new ObjectMapper();
-        caseUrnMapperService = new CaseUrnMapperService(restTemplate, objectMapper) {
+        caseUrnMapperService = new CaseUrnMapperService(restTemplate) {
             @Override
             public String getCaseMapperServiceUrl() {
                 return mockUrl ;
@@ -42,26 +42,16 @@ void shouldReturnCaseIdWhenResponseIsSuccessful() {
         String caseUrn = "test-case-urn";
         String caseId = "7a2e94c4-38af-43dd-906b-40d632d159b0";
 
-        String json = """
-        {
-          "caseId": "7a2e94c4-38af-43dd-906b-40d632d159b0",
-          "caseUrn": "28DI1953715",
-          "originalResponse": {
-            "mappingId": "818284bf-a1ed-464b-bc1a-b0298cf1ead1",
-            "sourceId": "28DI1953715",
-            "sourceType": "OU_URN",
-            "targetId": "7a2e94c4-38af-43dd-906b-40d632d159b0",
-            "targetType": "CASE_FILE_ID",
-            "createdAt": "2025-07-31T10:07:46.578Z"
-          }
-        }
-        """;
-        ResponseEntity<String> responseEntity = ResponseEntity.ok(json);
+        CaseMapperResponse response = CaseMapperResponse.builder()
+                .caseId(caseId)
+                .caseUrn(caseUrn)
+                .build();
+        ResponseEntity<CaseMapperResponse> responseEntity = ResponseEntity.ok(response);
         when(restTemplate.exchange(
                 eq(mockUrl + "/" + caseUrn),
                 eq(HttpMethod.GET),
                 any(HttpEntity.class),
-                eq(String.class)
+                eq(CaseMapperResponse.class)
         )).thenReturn(responseEntity);
 
         String result = caseUrnMapperService.getCaseId(caseUrn);
@@ -77,10 +67,14 @@ void shouldReturnNullWhenExceptionOccurs() {
                 anyString(),
                 eq(HttpMethod.GET),
                 any(HttpEntity.class),
-                eq(String.class)
+                eq(CaseMapperResponse.class)
         )).thenThrow(new RuntimeException("Test exception"));
 
-        String result = caseUrnMapperService.getCaseId(caseUrn);
-        assertNull(result);
+        ResponseStatusException exception = assertThrows(ResponseStatusException.class, () -> {
+            caseUrnMapperService.getCaseId(caseUrn);
+        });
+        assertThat(exception.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND);
+        assertThat(exception.getReason()).isEqualTo("Case not found by urn: test-case-urn");
+        assertThat(exception.getMessage()).isEqualTo("404 NOT_FOUND \"Case not found by urn: test-case-urn\"");
     }
 }
