refactor the case mapper urn service

Author: yashyashm

run.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# Load env vars from .env if available
+if [ -f .env ]; then
+  set -a
+  source .env
+  set +a
+fi
+
+# Export Git metadata
+export GIT_COMMIT=$(git rev-parse HEAD)
+
+if [ -n "$GIT_BRANCH" ]; then
+  BRANCH_NAME="$GIT_BRANCH"
+else
+  BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)
+fi
+
+export GIT_BRANCH="$BRANCH_NAME"
+
+# Run provider verification with results published
+gradle pactVerificationTest \
+  -Dpact.provider.version="$GIT_COMMIT" \
+  -Dpact.verifier.publishResults=true \
+  -Dpact.provider.branch="$GIT_BRANCH" \
+  -DPACT_BROKER_TOKEN="$PACT_BROKER_TOKEN" \
+  -DPACT_BROKER_HOST="$PACT_BROKER_URL"
+
+# Tag provider in the broker
+pact-broker create-version-tag \
+  --pacticipant "VPCourtScheduleProvider" \
+  --version "$GIT_COMMIT" \
+  --tag "$PACT_ENV" \
+  --broker-base-url "$PACT_BROKER_URL" \
+  --broker-token "$PACT_BROKER_TOKEN"

src/integrationTest/java/uk/gov/hmcts/cp/config/TestConfig.java

@@ -14,8 +14,6 @@
 import org.springframework.http.MediaType;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
-import uk.gov.hmcts.cp.config.TestConfig;
-import uk.gov.hmcts.cp.services.InMemoryCaseUrnMapper;
 
 import java.util.UUID;
 
@@ -26,22 +24,12 @@
 @ExtendWith(SpringExtension.class)
 @SpringBootTest
 @AutoConfigureMockMvc
-@Import(TestConfig.class)
 class CourtScheduleControllerIT {
     private static final Logger log = LoggerFactory.getLogger(CourtScheduleControllerIT.class);
 
     @Autowired
     private MockMvc mockMvc;
 
-    @Autowired
-    private InMemoryCaseUrnMapper inMemoryCaseUrnMapper;
-
-    @BeforeEach
-    void setUp() {
-        inMemoryCaseUrnMapper.clearAllMappings();
-        inMemoryCaseUrnMapper.saveCaseUrnMapping("test-case-urn", "test-case-id");
-    }
-
     @Test
     void shouldReturnOkWhenValidUrnIsProvided() throws Exception {
         String caseUrn = "test-case-urn";

src/integrationTest/java/uk/gov/hmcts/cp/controllers/CourtScheduleControllerIT.java

@@ -1,23 +1,67 @@
 package uk.gov.hmcts.cp.services;
 
 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.MediaType;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.util.UriComponentsBuilder;
 
 import java.net.URI;
 import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
 
+@Service
+@RequiredArgsConstructor
+public class CaseUrnMapperService {
 
-public interface CaseUrnMapperService {
-    public String getCaseId(final String caseUrn) ;
+    private static final Logger LOG = LoggerFactory.getLogger(CaseUrnMapperService.class);
+
+    private final RestTemplate restTemplate;
+
+    @Value("${service.case-mapper-service.url}")
+    private String caseMapperServiceUrl;
+
+    private static final String CASEURN_ID = "caseurn/{caseurn}";
+
+    private final Map<String, String> caseUrnToCaseIdMap = new ConcurrentHashMap<>();
+
+
+
+    public String getCaseId(final String caseUrn) {
+        return UUID.randomUUID().toString();
+
+/*        try {
+            ResponseEntity<String> responseEntity = restTemplate.exchange(
+                    getCaseIdUrl(caseUrn),
+                    HttpMethod.GET,
+                    getRequestEntity(),
+                    String.class
+            );
+            return responseEntity.hasBody() ? responseEntity.getBody(): Strings.EMPTY;
+        } catch (Exception e) {
+            LOG.atError().log("Error while getting case id from case urn", e);
+        }
+        return null;*/
+    }
+
+    private String getCaseIdUrl(String caseUrn) {
+        return UriComponentsBuilder
+                .fromUri(URI.create(caseMapperServiceUrl))
+                .pathSegment(caseUrn)
+                .buildAndExpand(caseUrn)
+                .toUriString();
+    }
+
+    private HttpEntity<String> getRequestEntity() {
+        HttpHeaders headers = new HttpHeaders();
+        headers.setAccept(List.of(MediaType.APPLICATION_JSON));
+        return new HttpEntity<>(headers);
+    }
 }

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

@@ -15,9 +15,7 @@
 import uk.gov.hmcts.cp.openapi.model.Hearing;
 import uk.gov.hmcts.cp.repositories.InMemoryCourtScheduleRepositoryImpl;
 import uk.gov.hmcts.cp.services.CaseUrnMapperService;
-import uk.gov.hmcts.cp.services.CaseUrnMapperServiceImpl;
 import uk.gov.hmcts.cp.services.CourtScheduleService;
-import uk.gov.hmcts.cp.services.InMemoryCaseUrnMapper;
 
 import java.util.UUID;
 
@@ -36,7 +34,7 @@ class CourtScheduleControllerTest {
     @BeforeEach
     void setUp() {
         CourtScheduleService courtScheduleService = new CourtScheduleService(new InMemoryCourtScheduleRepositoryImpl());
-        CaseUrnMapperService caseUrnMapperService  = new InMemoryCaseUrnMapper();
+        CaseUrnMapperService caseUrnMapperService  = new CaseUrnMapperService(new RestTemplate());
         courtScheduleController = new CourtScheduleController(courtScheduleService, caseUrnMapperService);
     }