Merge branch 'main' into dependabot/github_actions/actions/setup-java-4

Author: dalgazinhmcts

.env

@@ -1,2 +1,4 @@
 SERVER_PORT=4550
-BASE_IMAGE=openjdk:21-jdk-slim
+BASE_IMAGE=openjdk:21-jdk-slim
+JAR_FILENAME=service-cp-crime-schedulingandlisting-courtschedule-*.jar
+JAR_FILE_PATH=build/libs

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

@@ -105,7 +105,7 @@ jobs:
       - name: Upload JAR Artefact
         uses: actions/upload-artifact@v4
         with:
-          name: app-jar
+          name: app.jar
           path: build/libs/${{ steps.repo_vars.outputs.artefact_name }}.jar
 
   Build-Docker:
@@ -119,7 +119,7 @@ jobs:
       - name: Download JAR Artefact
         uses: actions/download-artifact@v4
         with:
-          name: app-jar
+          name: app.jar
           path: build/libs
 
       - name: Set up Docker Buildx

Dockerfile

@@ -3,20 +3,30 @@ ARG BASE_IMAGE
 FROM ${BASE_IMAGE:-openjdk:21-jdk-slim}
 
 # ---- Runtime arguments ----
-ARG JAR_FILENAME=app.jar
+ARG JAR_FILENAME
+ARG JAR_FILE_PATH
+
+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
+
+# ---- Set runtime ENV for Spring Boot to bind port
+ARG SERVER_PORT
+ENV SERVER_PORT=${SERVER_PORT:-4550}
 
 # ---- Dependencies ----
 RUN apt-get update \
     && apt-get install -y curl \
     && rm -rf /var/lib/apt/lists/*
 
 # ---- Application files ----
-COPY build/libs/${JAR_FILENAME} /opt/app/${JAR_FILENAME}
+COPY $JAR_FULL_PATH /opt/app/app.jar
 COPY lib/applicationinsights.json /opt/app/
 
 # ---- Permissions ----
-RUN chmod 755 /opt/app/$JAR_FILENAME
+RUN chmod 755 /opt/app/app.jar
 
 # ---- Runtime ----
 EXPOSE 4550
-CMD ["java", "-jar", "/opt/app/$JAR_FILENAME"]
+
+CMD ["java", "-jar", "/opt/app/app.jar"]

build.gradle

@@ -247,6 +247,10 @@ ext {
   lombokVersion = "1.18.38"
 }
 
+tasks.named('processPactVerificationTestResources') {
+  duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
+
 dependencies {
   implementation "uk.gov.hmcts.cp:api-cp-crime-schedulingandlisting-courtschedule:$apiCourtScheduleVersion"
   implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.9'
@@ -272,6 +276,9 @@ dependencies {
   implementation 'org.hibernate.validator:hibernate-validator:9.0.1.Final'
   implementation 'org.apache.commons:commons-text:1.13.1'
 
+  implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.2'
+  implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2'
+
   compileOnly group: 'org.projectlombok', name: 'lombok', version: lombokVersion
   annotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombokVersion
 

docker-compose.yml

@@ -1,7 +1,9 @@
-version: '2.1'
+version: '3.8'
 
 services:
-  service-cp-refdata-courthearing-judges:
+  service-cp-crime-schedulingandlisting-courtschedule:
+    env_file:
+      - .env
     build:
       context: .
       dockerfile: Dockerfile
@@ -10,11 +12,22 @@ services:
         https_proxy: ${https_proxy}
         no_proxy: ${no_proxy}
         BASE_IMAGE: ${BASE_IMAGE}
+        SERVER_PORT: ${SERVER_PORT}
+        JAR_FILENAME: ${JAR_FILENAME}
+        JAR_FILE_PATH: ${JAR_FILE_PATH}
+    environment:
+      - SERVER_PORT=${SERVER_PORT:-4550}
     ports:
-      - $SERVER_PORT:$SERVER_PORT
+      - "${SERVER_PORT:-4550}:${SERVER_PORT:-4550}"
+    networks:
+      - service-network
     healthcheck:
       test: [ "CMD", "curl", "-f", "http://localhost:${SERVER_PORT}/health" ]
       interval: 30s
       timeout: 10s
       retries: 3
       start_period: 5s
+
+networks:
+  service-network:
+    name: service-cp-crime-schedulingandlisting-courtschedule-network

src/pactVerificationTest/java/uk/gov/hmcts/cp/pact/helper/JsonFileToObject.java

@@ -0,0 +1,17 @@
+package uk.gov.hmcts.cp.pact.helper;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+
+import java.io.File;
+
+public class JsonFileToObject {
+
+    private static final ObjectMapper mapper = new ObjectMapper()
+            .registerModule(new JavaTimeModule());
+
+    public static <T> T readJsonFromResources(String fileName, Class<T> clazz) throws Exception {
+        File file = new File(JsonFileToObject.class.getClassLoader().getResource(fileName).toURI());
+        return mapper.readValue(file, clazz);
+    }
+}

…vider/CourtScheduleProviderPactTest.java …vider/CourtScheduleProviderPactTest.javasrc/pactVerificationTest/java/pact.provider/CourtScheduleProviderPactTest.java renamed to src/pactVerificationTest/java/uk/gov/hmcts/cp/pact/provider/CourtScheduleProviderPactTest.java src/pactVerificationTest/java/pact.provider/CourtScheduleProviderPactTest.java renamed to src/pactVerificationTest/java/uk/gov/hmcts/cp/pact/provider/CourtScheduleProviderPactTest.java

@@ -16,15 +16,9 @@
 import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import uk.gov.hmcts.cp.openapi.model.CourtScheduleResponse;
-import uk.gov.hmcts.cp.openapi.model.CourtSchedule;
-import uk.gov.hmcts.cp.openapi.model.Hearing;
-import uk.gov.hmcts.cp.openapi.model.CourtSitting;
+import uk.gov.hmcts.cp.pact.helper.JsonFileToObject;
 import uk.gov.hmcts.cp.repositories.CourtScheduleRepository;
 
-import java.time.OffsetDateTime;
-import java.util.List;
-import java.util.UUID;
-
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 @ExtendWith({SpringExtension.class, PactVerificationInvocationContextProvider.class})
 @Provider("CPCourtScheduleProvider")
@@ -50,31 +44,10 @@ void setupTarget(PactVerificationContext context) {
     }
 
     @State("court schedule for case 456789 exists")
-    public void setupCourtSchedule() {
+    public void setupCourtSchedule() throws Exception{
         courtScheduleRepository.clearAll();
-        var courtSitting = CourtSitting.builder()
-                .courtHouse("Central Criminal Court")
-                .sittingStart(OffsetDateTime.now())
-                .sittingEnd(OffsetDateTime.now().plusMinutes(60))
-                .judiciaryId(UUID.randomUUID().toString())
-                .build();
-        var hearing = Hearing.builder()
-                .hearingId(UUID.randomUUID().toString())
-                .listNote("Requires interpreter")
-                .hearingDescription("Sentencing for theft case")
-                .hearingType("Trial")
-                .courtSittings(List.of(courtSitting))
-                .build();
-
-        var schedule = CourtSchedule.builder()
-                .hearings(List.of(hearing))
-                .build();
-
-        var response = CourtScheduleResponse.builder()
-                .courtSchedule(List.of(schedule))
-                .build();
-
-        courtScheduleRepository.saveCourtSchedule("456789", response);
+        CourtScheduleResponse courtScheduleResponse = JsonFileToObject.readJsonFromResources("courtSchedule.json", CourtScheduleResponse.class);
+        courtScheduleRepository.saveCourtSchedule("456789", courtScheduleResponse);
     }
 
     @TestTemplate

src/pactVerificationTest/resources/courtSchedule.json

@@ -0,0 +1,22 @@
+{
+  "courtSchedule": [
+    {
+      "hearings": [
+        {
+          "hearingId": "HRG-123456",
+          "hearingType": "Preliminary",
+          "hearingDescription": "Initial appearance for case 456789",
+          "listNote": "Judge prefers afternoon start",
+          "courtSittings": [
+            {
+              "sittingStart": "2025-03-25T09:00:00Z",
+              "sittingEnd": "2025-03-25T12:00:00Z",
+              "judiciaryId": "123e4567-e89b-12d3-a456-426614174000",
+              "courtHouse": "223e4567-e89b-12d3-a456-426614174111"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}