Dev/connection impl (#65)

* added code to test the connectvity

* Replace the url with actual url and implemented other functionlity

* merge from main

* update caseurnmapper to urnmapper

* update caseurnmapper to urnmapper

* update caseurnmapper to urnmapper

* update caseurnmapper to urnmapper

* update pact flow test

* updated code for pact testing

---------

Co-authored-by: Dmitri Algazin <dmitri.algazin@hmcts.net>

Author: yashyashm

.env

@@ -1,4 +1,7 @@
 SERVER_PORT=4550
 BASE_IMAGE=openjdk:21-jdk-slim
-JAR_FILENAME=service-cp-crime-schedulingandlisting-courtschedule-*.jar
-JAR_FILE_PATH=build/libs
+JAR_FILENAME=service-cp-crime-scheduleandlist-courtschedule-*.jar
+JAR_FILE_PATH=build/libs
+CASE_MAPPER_SERVICE_URL=https://devcp01.ingress01.dev.nl.cjscp.org.uk/urnmapper
+COURT_SCHEDULE_CLIENT_URL=https://steccm64.ingress01.dev.nl.cjscp.org.uk/listing-query-api/query/api/rest/listing/hearings/allocated-and-unallocated
+CJSCPPUID=d7c91866-646a-462c-9203-46678e8cddef

.github/workflows/ci-build-publish.yml

@@ -79,9 +79,24 @@ jobs:
       - name: Gradle Build
         env:
           ARTEFACT_VERSION: ${{ needs.Artefact-Version.outputs.artefact_version }}
+          CASE_MAPPER_SERVICE_URL: ${{ vars.CASE_MAPPER_SERVICE_URL }}
+          COURT_SCHEDULE_CLIENT_URL: ${{ vars.COURT_SCHEDULE_CLIENT_URL }}
+          CJSCPPUID: ${{ vars.CJSCPPUID }}
         run: |
           echo "Building with ARTEFACT_VERSION=$ARTEFACT_VERSION"
           gradle build -DARTEFACT_VERSION=$ARTEFACT_VERSION
+          
+          if [ -z "$CASE_MAPPER_SERVICE_URL" ]; then
+            echo "::warning::CASE_MAPPER_SERVICE_URL is null or not set"
+          fi
+
+          if [ -z "$COURT_SCHEDULE_CLIENT_URL" ]; then
+            echo "::warning::COURT_SCHEDULE_CLIENT_URL is null or not set"
+          fi
+          
+          if [ -z "$CJSCPPUID" ]; then
+            echo "::warning::CJSCPPUID is null or not set"
+          fi
 
       - name: Extract repo name
         id: repo_vars
@@ -173,7 +188,10 @@ jobs:
             -DGITHUB_ACTOR=${{ github.actor }} \
             -DGITHUB_TOKEN=$GITHUB_TOKEN \
             -DAZURE_DEVOPS_ARTIFACT_USERNAME=$AZURE_DEVOPS_ARTIFACT_USERNAME \
-            -DAZURE_DEVOPS_ARTIFACT_TOKEN=$AZURE_DEVOPS_ARTIFACT_TOKEN
+            -DAZURE_DEVOPS_ARTIFACT_TOKEN=$AZURE_DEVOPS_ARTIFACT_TOKEN \
+            -DCASE_MAPPER_SERVICE_URL=$CASE_MAPPER_SERVICE_URL \
+            -DCOURT_SCHEDULE_CLIENT_URL=$COURT_SCHEDULE_CLIENT_URL \
+            -DCJSCPPUID=$CJSCPPUID
 
   Build-Docker:
     needs: [ Provider-Deploy, Build, Artefact-Version ]
@@ -210,6 +228,9 @@ jobs:
           build-args: |
             BASE_IMAGE=openjdk:21-jdk-slim
             JAR_FILENAME=${{ needs.Build.outputs.artefact_name }}.jar
+            CASE_MAPPER_SERVICE_URL=${{ vars.CASE_MAPPER_SERVICE_URL }}
+            COURT_SCHEDULE_CLIENT_URL=${{ vars.COURT_SCHEDULE_CLIENT_URL }}
+            CJSCPPUID=${{ vars.CJSCPPUID }}
 
   Deploy:
     needs: [ Provider-Deploy, Build, Artefact-Version ]

Dockerfile

@@ -5,11 +5,19 @@ FROM ${BASE_IMAGE:-openjdk:21-jdk-slim}
 # ---- Runtime arguments ----
 ARG JAR_FILENAME
 ARG JAR_FILE_PATH
+ARG CASE_MAPPER_SERVICE_URL
+ARG COURT_SCHEDULE_CLIENT_URL
+ARG CJSCPPUID
 
 ENV JAR_FILENAME=${JAR_FILENAME:-app.jar}
 ENV JAR_FILE_PATH=${JAR_FILE_PATH:-build/libs}
 ENV JAR_FULL_PATH=$JAR_FILE_PATH/$JAR_FILENAME
 
+ENV CASE_MAPPER_SERVICE_URL=$CASE_MAPPER_SERVICE_URL
+ENV COURT_SCHEDULE_CLIENT_URL=$COURT_SCHEDULE_CLIENT_URL
+ENV CJSCPPUID=$CJSCPPUID
+
+
 # ---- Set runtime ENV for Spring Boot to bind port
 ARG SERVER_PORT
 ENV SERVER_PORT=${SERVER_PORT:-4550}
@@ -29,4 +37,4 @@ RUN chmod 755 /opt/app/app.jar
 # ---- Runtime ----
 EXPOSE 4550
 
-CMD ["java", "-jar", "/opt/app/app.jar"]
+CMD ["java", "-Dcom.sun.net.ssl.checkRevocation=false", "-jar", "/opt/app/app.jar"]

deploy.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# Define the service name
+SERVICE_NAME="service-cp-crime-scheduleandlist-courtschedule"
+
+# Check if the Docker container is running
+if [ "$(docker ps -q -f name=${SERVICE_NAME})" ]; then
+    echo "Stopping the running Docker container..."
+    docker-compose down
+fi
+
+# Rebuild the Docker image
+echo "Rebuilding the Docker image..."
+docker-compose build
+
+# Deploy the service
+echo "Starting the Docker container..."
+docker-compose up -d
+
+echo "Deployment completed successfully."

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.8'
 
 services:
-  service-cp-crime-schedulingandlisting-courtschedule:
+  service-cp-crime-scheduleandlist-courtschedule:
     env_file:
       - .env
     build:
@@ -15,6 +15,10 @@ services:
         SERVER_PORT: ${SERVER_PORT}
         JAR_FILENAME: ${JAR_FILENAME}
         JAR_FILE_PATH: ${JAR_FILE_PATH}
+        CASE_MAPPER_SERVICE_URL: ${CASE_MAPPER_SERVICE_URL}
+        COURT_SCHEDULE_CLIENT_URL: ${COURT_SCHEDULE_CLIENT_URL}
+        CJSCPPUID: ${CJSCPPUID}
+
     environment:
       - SERVER_PORT=${SERVER_PORT:-4550}
     ports:
@@ -30,4 +34,4 @@ services:
 
 networks:
   service-network:
-    name: service-cp-crime-schedulingandlisting-courtschedule-network
+    name: service-cp-crime-scheduleandlist-courtschedule-network

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

@@ -1,15 +1,41 @@
 package uk.gov.hmcts.cp.config;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import uk.gov.hmcts.cp.repositories.CourtScheduleRepository;
-import uk.gov.hmcts.cp.repositories.CourtScheduleRepositoryImpl;
+import org.springframework.web.client.RestTemplate;
+import uk.gov.hmcts.cp.controllers.CourtScheduleController;
+import uk.gov.hmcts.cp.repositories.InMemoryCourtScheduleClientImpl;
+import uk.gov.hmcts.cp.services.CaseUrnMapperService;
+import uk.gov.hmcts.cp.services.CourtScheduleService;
 
-import java.net.http.HttpClient;
-
-import static org.mockito.Mockito.mock;
+import java.util.UUID;
 
 @Configuration
 public class TestConfig {
+    @Bean("courtScheduleService")
+    public CourtScheduleService courtScheduleService() {
+        return new CourtScheduleService(new InMemoryCourtScheduleClientImpl());
+    }
+
+    @Bean("testCaseUrnMapperService")
+    public CaseUrnMapperService testCaseUrnMapperService() {
+        RestTemplate restTemplate = new RestTemplate();
+        return new CaseUrnMapperService(restTemplate) {
+            @Override
+            public String getCaseMapperServiceUrl() {
+                return "http://mock-server/test-mapper";
+            }
+            public String getCaseId(final String caseUrn) {
+                return UUID.randomUUID().toString();
+            }
+        };
+    }
 
+    @Bean("courtScheduleController")
+    public CourtScheduleController courtScheduleController(
+            CourtScheduleService courtScheduleService,
+            CaseUrnMapperService testCaseUrnMapperService) {
+        return new CourtScheduleController(courtScheduleService, testCaseUrnMapperService);
+    }
 }

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

@@ -12,10 +12,12 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.annotation.Import;
 import org.springframework.http.MediaType;
+import org.springframework.test.context.ActiveProfiles;
 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.repositories.CourtScheduleRepository;
+import uk.gov.hmcts.cp.repositories.CourtScheduleClient;
+import uk.gov.hmcts.cp.services.CaseUrnMapperService;
 
 import java.util.UUID;
 
@@ -28,6 +30,7 @@
 @ExtendWith(SpringExtension.class)
 @SpringBootTest
 @AutoConfigureMockMvc
+@ActiveProfiles("pact-test")
 @Import(TestConfig.class)
 class CourtScheduleControllerIT {
     private static final Logger log = LoggerFactory.getLogger(CourtScheduleControllerIT.class);
@@ -36,15 +39,21 @@ class CourtScheduleControllerIT {
     private MockMvc mockMvc;
 
     @Autowired
-    @Qualifier("inMemoryCourtScheduleRepositoryImpl")
-    private CourtScheduleRepository courtScheduleRepository;
+    @Qualifier("inMemoryCourtScheduleClientImpl")
+    private CourtScheduleClient courtScheduleClient;
 
-    /*@BeforeEach
-    void setUp() {
-        inMemoryCaseUrnMapper.clearAllMappings();
-        inMemoryCaseUrnMapper.saveCaseUrnMapping("test-case-urn", "test-case-id");
+    @Autowired
+    @Qualifier("testCaseUrnMapperService")
+    private CaseUrnMapperService caseUrnMapperService;
+
+    @Test
+    void shouldReturnOkWhenValidUrnIsProvided1() throws Exception {
+        String caseUrn = "test-case-urn";
+        mockMvc.perform(get("/case/{case_urn}/courtschedule", caseUrn)
+                        .accept(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk());
     }
-    */
+
     @Test
     void shouldReturnOkWhenValidUrnIsProvided() throws Exception {
         String caseUrn = "test-case-urn";

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;

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;
+
+}

src/main/java/uk/gov/hmcts/cp/domain/HearingResponse.java

@@ -0,0 +1,70 @@
+package uk.gov.hmcts.cp.domain;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@Getter
+public class HearingResponse implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private List<HearingResult> hearings;
+
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    @Builder
+    @AllArgsConstructor
+    @NoArgsConstructor
+    @Getter
+    public static class HearingResult implements Serializable {
+
+//    private static final long serialVersionUID = 1L;
+
+        private String id;
+        private Type type;
+        private List<Judiciary> judiciary;
+        private List<HearingDay> hearingDays;
+
+        @JsonIgnoreProperties(ignoreUnknown = true)
+        @Builder
+        @AllArgsConstructor
+        @NoArgsConstructor
+        @Getter
+        public static class Type {
+            private String description;
+        }
+
+        @JsonIgnoreProperties(ignoreUnknown = true)
+        @Builder
+        @AllArgsConstructor
+        @NoArgsConstructor
+        @Getter
+        public static class Judiciary {
+            private String judicialId;
+        }
+
+        @JsonIgnoreProperties(ignoreUnknown = true)
+        @Builder
+        @AllArgsConstructor
+        @NoArgsConstructor
+        @Getter
+        public static class HearingDay {
+            private String endTime;
+            private int sequence;
+            private String startTime;
+            private String courtRoomId;
+            private String hearingDate;
+            private String courtCentreId;
+            private int durationMinutes;
+        }
+    }
+
+}