update caseurnmapper to urnmapper

Author: yashyashm

src/main/java/uk/gov/hmcts/cp/repositories/CourtScheduleClientImpl.java

@@ -79,18 +79,14 @@ private List<Hearing> getHearings(String caseId){
         try {
             //ignoreCertificates();
             HttpRequest request = HttpRequest.newBuilder()
-                    //.uri(new URI("https://steccm64.ingress01.dev.nl.cjscp.org.uk/listing-query-api/query/api/rest/listing/hearings/allocated-and-unallocated?caseId=f552dee6-f092-415b-839c-5e5b5f46635e"))
                     .uri(new URI(buildUrl(caseId)))
                     .GET()
                     .header("Accept", "application/vnd.listing.search.hearings+json")
-                    //.header("CJSCPPUID", "d7c91866-646a-462c-9203-46678e8cddef")
                     .header("CJSCPPUID", getCjscppuid())
                     .build();
 
-            // Send the request
             response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
 
-            // Check response status
             if (response.statusCode() != HttpStatus.OK.value()) {
                 LOG.error("Failed to fetch hearing data. HTTP Status: {}", response.statusCode());
                 return null;
@@ -107,7 +103,6 @@ private List<Hearing> getHearings(String caseId){
 
     private String buildUrl(String caseId) {
         return UriComponentsBuilder
-                //.fromUri(URI.create("https://steccm64.ingress01.dev.nl.cjscp.org.uk/listing-query-api/query/api/rest/listing/hearings/allocated-and-unallocated"))
                 .fromUri(URI.create(getCourtScheduleClientUrl()))
                 .queryParam("caseId", caseId)
                 .toUriString();
@@ -160,5 +155,4 @@ private List<CourtSitting> getCourtSittings(JsonNode hearingNode, String judicia
         }
         return courtSittings;
     }
-
 }

src/main/java/uk/gov/hmcts/cp/services/CaseUrnMapperService.java

@@ -10,6 +10,7 @@
 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.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
@@ -19,6 +20,8 @@
 import java.net.URI;
 import java.util.List;
 
+import static uk.gov.hmcts.cp.utils.Utils.ignoreCertificates;
+
 @Service
 @RequiredArgsConstructor
 public class CaseUrnMapperService {
@@ -30,20 +33,19 @@ public class CaseUrnMapperService {
     private String caseMapperServiceUrl;
 
     public String getCaseId(final String caseUrn) {
-        return "f552dee6-f092-415b-839c-5e5b5f46635e";
-//        try {
-//            ignoreCertificates();
-//            ResponseEntity<String> responseEntity = restTemplate.exchange(
-//                    getCaseIdUrl(caseUrn),
-//                    HttpMethod.GET,
-//                    getRequestEntity(),
-//                    String.class
-//            );
-//            return getCaseId(responseEntity);
-//        } catch (Exception e) {
-//            LOG.atError().log("Error while getting case id from case urn", e);
-//        }
-//        return null;
+        try {
+            ignoreCertificates();
+            ResponseEntity<String> responseEntity = restTemplate.exchange(
+                    getCaseIdUrl(caseUrn),
+                    HttpMethod.GET,
+                    getRequestEntity(),
+                    String.class
+            );
+            return getCaseId(responseEntity);
+        } catch (Exception e) {
+            LOG.atError().log("Error while getting case id from case urn", e);
+        }
+        return null;
     }
 
     public String getCaseMapperServiceUrl() {
@@ -60,16 +62,18 @@ public String getCaseId(ResponseEntity<String> responseEntity) throws JsonProces
 
     private String getCaseIdUrl(String caseUrn) {
         LOG.atDebug().log("Fetching case id for case urn: {}", caseUrn);
-        return UriComponentsBuilder
-                .fromUri(URI.create(getCaseMapperServiceUrl()))
-                .pathSegment(caseUrn)
-                .buildAndExpand(caseUrn)
-                .toUriString();
+        return URI.create(getCaseMapperServiceUrl() + "/" + caseUrn).toString();
+//        return UriComponentsBuilder
+//                .fromUri(URI.create(getCaseMapperServiceUrl()))
+//                .pathSegment(caseUrn)
+//                .buildAndExpand(caseUrn)
+//                .toUriString();
     }
 
     private HttpEntity<String> getRequestEntity() {
         HttpHeaders headers = new HttpHeaders();
-        headers.setAccept(List.of(MediaType.APPLICATION_JSON));
+        headers.set("Accept", MediaType.APPLICATION_JSON_VALUE);
+        //headers.setAccept(List.of(MediaType.APPLICATION_JSON));
         return new HttpEntity<>(headers);
     }
 }

src/main/resources/application.yaml

@@ -32,7 +32,7 @@ spring:
 
 service:
   case-mapper-service:
-    url: ${CASE_MAPPER_SERVICE_URL:https://devcp01.ingress01.dev.nl.cjscp.org.uk/caseurnmapper}
+    url: ${CASE_MAPPER_SERVICE_URL:https://devcp01.ingress01.dev.nl.cjscp.org.uk/urnmapper}
 
   court-schedule-client:
     url: ${COURT_SCHEDULE_CLIENT_URL:https://steccm64.ingress01.dev.nl.cjscp.org.uk/listing-query-api/query/api/rest/listing/hearings/allocated-and-unallocated}

src/test/java/uk/gov/hmcts/cp/services/CaseUrnMapperServiceTest.java

@@ -37,7 +37,7 @@ public String getCaseMapperServiceUrl() {
         };
     }
 
-    //@Test  uncoment when casemapperserivce method is uncommented
+    @Test
     void shouldReturnCaseIdWhenResponseIsSuccessful() {
         String caseUrn = "test-case-urn";
         String caseId = "7a2e94c4-38af-43dd-906b-40d632d159b0";
@@ -69,7 +69,7 @@ void shouldReturnCaseIdWhenResponseIsSuccessful() {
         assertEquals(caseId, result);
     }
 
-    //@Test  uncoment when casemapperserivce method is uncommented
+    @Test
     void shouldReturnNullWhenExceptionOccurs() {
         String caseUrn = "test-case-urn";