SPRDT-660 reworked implementation

src/integrationTest/java/uk/gov/hmcts/cp/http/SjpCourtListPublishControllerHttpLiveTest.java

@@ -0,0 +1,156 @@
+package uk.gov.hmcts.cp.http;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import uk.gov.hmcts.cp.config.ObjectMapperConfig;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * Integration tests for SJP court list publish endpoint (/api/court-list-publish/sjp/publishCourtList).
+ * Same style as {@link CourtListPublishControllerHttpLiveTest}; requires app running with integration profile.
+ */
+public class SjpCourtListPublishControllerHttpLiveTest extends AbstractTest {
+
+    private static final String BASE_URL = System.getProperty("app.baseUrl", "http://localhost:8082/courtlistpublishing-service");
+    private static final String SJP_PUBLISH_ENDPOINT = BASE_URL + "/api/court-list-publish/sjp/publishCourtList";
+
+    private static final String CJSCPPUID_HEADER = "CJSCPPUID";
+    private static final String INTEGRATION_TEST_USER_ID = "integration-test-user-id";
+
+    private final RestTemplate http = new RestTemplate();
+    private final ObjectMapper objectMapper = ObjectMapperConfig.getObjectMapper();
+
+    @Test
+    void postSjpCourtList_returns200_withFailedStatus_whenListPayloadOmitted() throws Exception {
+        String requestJson = """
+            {
+                "listType": "SJP_PUBLISH_LIST"
+            }
+            """;
+
+        ResponseEntity<String> response = postSjpRequest(requestJson);
+
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+        JsonNode body = objectMapper.readTree(response.getBody());
+        assertThat(body.get("status").asText()).isEqualTo("FAILED");
+        assertThat(body.get("listType").asText()).isEqualTo("SJP_PUBLISH_LIST");
+        assertThat(body.get("message").asText()).contains("listPayload");
+    }
+
+    @Test
+    void postSjpCourtList_returns200_withFailedStatus_whenListPayloadInBodyButNotExposedByApi() throws Exception {
+        // When API model exposes getListPayload() this can be changed to expect ACCEPTED
+        String requestJson = """
+            {
+                "listType": "SJP_PUBLISH_LIST",
+                "listPayload": {
+                    "generatedDateAndTime": "2025-03-09T10:00:00",
+                    "readyCases": [
+                        {
+                            "caseUrn": "SJP-INT-TEST-001",
+                            "defendantName": "Defendant One",
+                            "prosecutorName": "CPS",
+                            "sjpOffences": [{"title": "Offence 1", "wording": "Wording 1"}]
+                        }
+                    ]
+                }
+            }
+            """;
+
+        ResponseEntity<String> response = postSjpRequest(requestJson);
+
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+        JsonNode body = objectMapper.readTree(response.getBody());
+        assertThat(body.get("listType").asText()).isEqualTo("SJP_PUBLISH_LIST");
+        // Until API 0.1.21+ exposes listPayload, controller passes null -> FAILED
+        assertThat(body.get("status").asText()).isEqualTo("FAILED");
+        assertThat(body.get("message").asText()).contains("listPayload");
+    }
+
+    @Test
+    void postSjpCourtList_returns200_forPressListType() throws Exception {
+        String requestJson = """
+            {
+                "listType": "SJP_PRESS_LIST"
+            }
+            """;
+
+        ResponseEntity<String> response = postSjpRequest(requestJson);
+
+        assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
+        JsonNode body = objectMapper.readTree(response.getBody());
+        assertThat(body.get("listType").asText()).isEqualTo("SJP_PRESS_LIST");
+        assertThat(body.get("status").asText()).isEqualTo("FAILED");
+        assertThat(body.get("message").asText()).contains("listPayload");
+    }
+
+    @Test
+    void postSjpCourtList_returns400_whenListTypeInvalid() {
+        String requestJson = """
+            {
+                "listType": "INVALID_LIST_TYPE"
+            }
+            """;
+
+        assertThatThrownBy(() -> postSjpRequest(requestJson))
+                .isInstanceOf(HttpClientErrorException.class)
+                .satisfies(ex -> {
+                    assertThat(((HttpClientErrorException) ex).getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
+                });
+    }
+
+    @Test
+    void postSjpCourtList_returns400_whenListTypeMissing() {
+        String requestJson = "{}";
+
+        assertThatThrownBy(() -> postSjpRequest(requestJson))
+                .isInstanceOf(HttpClientErrorException.class)
+                .satisfies(ex -> {
+                    assertThat(((HttpClientErrorException) ex).getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
+                });
+    }
+
+    @Test
+    void postSjpCourtList_returns400_whenBodyNull() {
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.set(CJSCPPUID_HEADER, INTEGRATION_TEST_USER_ID);
+
+        assertThatThrownBy(() -> http.exchange(
+                SJP_PUBLISH_ENDPOINT,
+                HttpMethod.POST,
+                new HttpEntity<>(headers),
+                String.class))
+                .isInstanceOf(HttpClientErrorException.class)
+                .satisfies(ex -> {
+                    assertThat(((HttpClientErrorException) ex).getStatusCode()).isEqualTo(HttpStatus.BAD_REQUEST);
+                });
+    }
+
+    private HttpEntity<String> createSjpHttpEntity(String json) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.set(CJSCPPUID_HEADER, INTEGRATION_TEST_USER_ID);
+        return new HttpEntity<>(json, headers);
+    }
+
+    private ResponseEntity<String> postSjpRequest(String requestJson) {
+        return http.exchange(
+                SJP_PUBLISH_ENDPOINT,
+                HttpMethod.POST,
+                createSjpHttpEntity(requestJson),
+                String.class);
+    }
+}

src/main/java/uk/gov/hmcts/cp/controllers/CourtListPublishController.java

@@ -6,10 +6,13 @@
 import uk.gov.hmcts.cp.openapi.model.CourtListPublishRequest;
 import uk.gov.hmcts.cp.openapi.model.CourtListPublishResponse;
 import uk.gov.hmcts.cp.openapi.model.CourtListType;
-import uk.gov.hmcts.cp.openapi.model.Status;
+import uk.gov.hmcts.cp.openapi.model.PublishCourtListRequest;
+import uk.gov.hmcts.cp.openapi.model.PublishCourtListResponse;
 import uk.gov.hmcts.cp.services.courtlistdownload.CourtListDownloadException;
 import uk.gov.hmcts.cp.services.courtlistdownload.CourtListDownloadService;
 import uk.gov.hmcts.cp.services.CourtListPublishStatusService;
+import uk.gov.hmcts.cp.services.sjp.SjpCourtListPublishService;
+import uk.gov.hmcts.cp.services.sjp.SjpCourtListPublishService.SjpPublishResult;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -42,13 +45,16 @@ public class CourtListPublishController implements CourtListPublishApi {
     private final CourtListPublishStatusService service;
     private final CourtListTaskTriggerService courtListTaskTriggerService;
     private final CourtListDownloadService courtListDownloadService;
+    private final SjpCourtListPublishService sjpCourtListPublishService;
 
     public CourtListPublishController(final CourtListPublishStatusService service,
                                      CourtListTaskTriggerService courtListTaskTriggerService,
-                                     CourtListDownloadService courtListDownloadService) {
+                                     CourtListDownloadService courtListDownloadService,
+                                     SjpCourtListPublishService sjpCourtListPublishService) {
         this.service = service;
         this.courtListTaskTriggerService = courtListTaskTriggerService;
         this.courtListDownloadService = courtListDownloadService;
+        this.sjpCourtListPublishService = sjpCourtListPublishService;
     }
 
 
@@ -127,6 +133,31 @@ public ResponseEntity<Resource> downloadCourtList(@RequestBody CourtListDownload
         }
     }
 
+    @Override
+    public ResponseEntity<PublishCourtListResponse> publishSjpCourtList(
+            @RequestBody final PublishCourtListRequest request) {
+        if (request == null) {
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Request body is required");
+        }
+        if (request.getListType() == null) {
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "listType is required");
+        }
+
+        LOG.atInfo().log("SJP court list publish request for listType: {}", request.getListType());
+
+        SjpPublishResult result = sjpCourtListPublishService.publishSjpCourtList(
+                request.getListType().getValue(),
+                null,
+                null,
+                null);
+
+        PublishCourtListResponse response = new PublishCourtListResponse(
+                result.getStatus(),
+                request.getListType(),
+                result.getMessage());
+        return ResponseEntity.ok(response);
+    }
+
     @SuppressWarnings("unused") // Method is used by Spring's request mapping
     public ResponseEntity<List<CourtListPublishResponse>> findCourtListPublishStatus(
             @RequestParam(required = false) final UUID courtListId,

src/main/java/uk/gov/hmcts/cp/domain/sjp/SjpListPayload.java

@@ -0,0 +1,27 @@
+package uk.gov.hmcts.cp.domain.sjp;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * SJP list payload (PubHub parity). Contains generatedDateAndTime and readyCases
+ * as supplied by SJP (e.g. public.sjp.pending-cases-public-list-generated).
+ */
+@Getter
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class SjpListPayload {
+
+    private final String generatedDateAndTime;
+    private final List<Map<String, Object>> readyCases;
+
+    public SjpListPayload(
+            @JsonProperty("generatedDateAndTime") String generatedDateAndTime,
+            @JsonProperty("readyCases") List<Map<String, Object>> readyCases) {
+        this.generatedDateAndTime = generatedDateAndTime;
+        this.readyCases = readyCases;
+    }
+}

src/main/java/uk/gov/hmcts/cp/domain/sjp/cath/PubhubMaster.java

@@ -0,0 +1,19 @@
+package uk.gov.hmcts.cp.domain.sjp.cath;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Builder;
+import lombok.Value;
+
+import java.util.List;
+
+/**
+ * CaTH root payload (mirrors staging PubHub schema PubhubMaster).
+ */
+@Value
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class PubhubMaster {
+
+    SjpCathDocument document;
+    List<SjpCathCourtLists> courtLists;
+}

src/main/java/uk/gov/hmcts/cp/domain/sjp/cath/SjpCathAddress.java

@@ -0,0 +1,21 @@
+package uk.gov.hmcts.cp.domain.sjp.cath;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Builder;
+import lombok.Value;
+
+import java.util.List;
+
+/**
+ * CaTH address (mirrors staging PubHub schema Address).
+ */
+@Value
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SjpCathAddress {
+
+    List<String> line;
+    String town;
+    String county;
+    String postCode;
+}

src/main/java/uk/gov/hmcts/cp/domain/sjp/cath/SjpCathCases.java

@@ -0,0 +1,16 @@
+package uk.gov.hmcts.cp.domain.sjp.cath;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Builder;
+import lombok.Value;
+
+/**
+ * CaTH case reference (mirrors staging PubHub schema Cases).
+ */
+@Value
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SjpCathCases {
+
+    String caseUrn;
+}

src/main/java/uk/gov/hmcts/cp/domain/sjp/cath/SjpCathCourtHouse.java

@@ -0,0 +1,18 @@
+package uk.gov.hmcts.cp.domain.sjp.cath;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Builder;
+import lombok.Value;
+
+import java.util.List;
+
+/**
+ * CaTH court house (mirrors staging PubHub schema CourtHouse).
+ */
+@Value
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SjpCathCourtHouse {
+
+    List<SjpCathCourtRoom> courtRoom;
+}

src/main/java/uk/gov/hmcts/cp/domain/sjp/cath/SjpCathCourtLists.java

@@ -0,0 +1,18 @@
+package uk.gov.hmcts.cp.domain.sjp.cath;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Builder;
+import lombok.Value;
+
+import java.util.List;
+
+/**
+ * CaTH court lists (mirrors staging PubHub schema CourtLists).
+ */
+@Value
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SjpCathCourtLists {
+
+    SjpCathCourtHouse courtHouse;
+}

src/main/java/uk/gov/hmcts/cp/domain/sjp/cath/SjpCathCourtRoom.java

@@ -0,0 +1,18 @@
+package uk.gov.hmcts.cp.domain.sjp.cath;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Builder;
+import lombok.Value;
+
+import java.util.List;
+
+/**
+ * CaTH court room (mirrors staging PubHub schema CourtRoom).
+ */
+@Value
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SjpCathCourtRoom {
+
+    List<SjpCathSession> session;
+}

src/main/java/uk/gov/hmcts/cp/domain/sjp/cath/SjpCathDocument.java

@@ -0,0 +1,18 @@
+package uk.gov.hmcts.cp.domain.sjp.cath;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.Builder;
+import lombok.Value;
+
+/**
+ * CaTH document header (mirrors staging PubHub schema Document).
+ */
+@Value
+@Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class SjpCathDocument {
+
+    String documentName;
+    String publicationDate;
+    String version;
+}