AMP-167 - addressed review comments.

Author: madhusudan-yasa

build.gradle

@@ -32,7 +32,7 @@ apply {
 }
 
 dependencies {
-  implementation(group: 'uk.gov.hmcts.cp', name: 'api-cp-crime-hearing-case-event-subscription', version: '1.0.2')
+  implementation(group: 'uk.gov.hmcts.cp', name: 'api-cp-crime-hearing-case-event-subscription', version: '1.0.4')
 
   // This is proving to be a real puzzle. This is actually included in the api published pom
   // ( though with scope of "runtime" )

docs/debugging.md

@@ -6,15 +6,15 @@ export PORT=4550
 export HOST="localhost:$PORT"
 curl -XPOST http://$HOST/client-subscriptions \
     -H "Content-Type: application/json" \
-    -d '{"eventTypes":["PCR","CUSTODIAL_RESULT"],"notificationEndpoint":{"webhookUrl":"https://my-callback-url"}}'
+    -d '{"eventTypes":["PRISON_COURT_REGISTER_GENERATED","CUSTODIAL_RESULT"],"notificationEndpoint":{"webhookUrl":"https://my-callback-url"}}'
 ```
 
 ... Creates and returns a subscription with a clientSubscriptionId 
 ie.
 ```
 {"clientSubscriptionId":"585fde62-44df-4b3d-ac38-5e1f4d7669e3",
     "createdAt":"2025-12-19T15:16:38.456506Z",
-    "eventTypes":["CUSTODIAL_RESULT","PCR"],
+    "eventTypes":["CUSTODIAL_RESULT","PRISON_COURT_REGISTER_GENERATED"],
     "notificationEndpoint":{"webhookUrl":"https://my-callback-url"},"updatedAt":"2025-12-19T15:16:38.456772Z"}
 ```
 

src/apiTest/java/uk/gov/hmcts/cp/subscription/http/SubscriptionApiTest.java

@@ -27,7 +27,7 @@ void round_trip_subscription_should_work_ok() throws InterruptedException {
         final String postUrl = String.format("%s/client-subscriptions", baseUrl);
         final HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
-        final String body = "{\"eventTypes\":[\"PCR\",\"CUSTODIAL_RESULT\"],\n" +
+        final String body = "{\"eventTypes\":[\"PRISON_COURT_REGISTER_GENERATED\",\"CUSTODIAL_RESULT\"],\n" +
                 "\"notificationEndpoint\":{\"webhookUrl\":\"https://my-callback-url\"}}";
         final ResponseEntity<String> postResult = http.exchange(
                 postUrl,

src/main/java/uk/gov/hmcts/cp/subscription/controllers/GlobalExceptionHandler.java

@@ -1,5 +1,6 @@
 package uk.gov.hmcts.cp.subscription.controllers;
 
+import feign.FeignException;
 import jakarta.persistence.EntityNotFoundException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
@@ -37,4 +38,16 @@ public ResponseEntity<String> handleUnknownException(final Exception exception)
                 .status(HttpStatus.INTERNAL_SERVER_ERROR)
                 .body(exception.getMessage());
     }
+
+    @ExceptionHandler(FeignException.class)
+    public ResponseEntity<String> handleFeignException(FeignException ex) {
+        log.error("FeignException from downstream service", ex);
+        HttpStatus status = HttpStatus.resolve(ex.status());
+        if (status == null) {
+            status = HttpStatus.BAD_GATEWAY;
+        }
+        return ResponseEntity
+                .status(status)
+                .body(ex.contentUTF8());
+    }
 }

src/main/java/uk/gov/hmcts/cp/subscription/controllers/NotificationController.java

@@ -5,26 +5,22 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import uk.gov.hmcts.cp.openapi.model.PcrEventPayload;
 import uk.gov.hmcts.cp.subscription.services.NotificationService;
 
-import java.util.UUID;
-
 @RestController
 @RequiredArgsConstructor
 @Slf4j
 public class NotificationController {
 
     private final NotificationService notificationService;
 
-    @PostMapping("/notifications/pcr/{materialId}")
-    public ResponseEntity<PcrEventPayload> notificationPCR(@PathVariable UUID materialId, @RequestBody @Valid PcrEventPayload pcrEventPayload) {
-
-        notificationService.processPcrEvent(materialId);
-        return new ResponseEntity<>(pcrEventPayload, HttpStatus.CREATED);
+    @PostMapping("/notifications/pcr")
+    public ResponseEntity<PcrEventPayload> notificationPCR(@RequestBody @Valid final PcrEventPayload pcrEventPayload) {
+        notificationService.processPcrEvent(pcrEventPayload.getMaterialId());
+        return new ResponseEntity<>(HttpStatus.ACCEPTED);
     }
 }

src/main/java/uk/gov/hmcts/cp/subscription/mappers/SubscriptionMapper.java

@@ -34,7 +34,9 @@ public interface SubscriptionMapper {
     ClientSubscriptionEntity mapUpdateRequestToEntity(@Context ClockService clockService, ClientSubscriptionEntity existing, ClientSubscriptionRequest request);
 
     @Mapping(source = "id", target = "clientSubscriptionId")
-    ClientSubscription mapEntityToResponse(ClientSubscriptionEntity entity);
+    @Mapping(target = "createdAt", expression = "java(clockService.now().toInstant())")
+    @Mapping(target = "updatedAt", expression = "java(clockService.now().toInstant())")
+    ClientSubscription mapEntityToResponse(@Context ClockService clockService, ClientSubscriptionEntity entity);
 
     @Named("mapWithSortedEventTypes")
     static List<EntityEventType> sortedEventTypes(final List<EventType> events) {

src/main/java/uk/gov/hmcts/cp/subscription/model/EntityEventType.java

@@ -1,6 +1,6 @@
 package uk.gov.hmcts.cp.subscription.model;
 
 public enum EntityEventType {
-    PCR,
+    PRISON_COURT_REGISTER_GENERATED,
     CUSTODIAL_RESULT
 }

src/main/java/uk/gov/hmcts/cp/subscription/services/NotificationService.java

@@ -1,6 +1,5 @@
 package uk.gov.hmcts.cp.subscription.services;
 
-import feign.FeignException;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -15,13 +14,7 @@ public class NotificationService {
 
     private final MaterialClient client;
 
-    public void processPcrEvent(final UUID materialId) {
-        try {
-            client.getContentById(materialId);
-            log.info("Successfully received document.");
-        } catch (FeignException ex) {
-            log.error("Failed to get document.", ex);
-            throw ex;
-        }
+    public byte[] processPcrEvent(final UUID materialId) {
+        return client.getContentById(materialId);
     }
 }

src/main/java/uk/gov/hmcts/cp/subscription/services/SubscriptionService.java

@@ -22,18 +22,18 @@ public class SubscriptionService {
 
     public ClientSubscription saveSubscription(final ClientSubscriptionRequest request) {
         final ClientSubscriptionEntity entity = mapper.mapCreateRequestToEntity(clockService, request);
-        return mapper.mapEntityToResponse(subscriptionRepository.save(entity));
+        return mapper.mapEntityToResponse(clockService, subscriptionRepository.save(entity));
     }
 
     public ClientSubscription updateSubscription(final UUID clientSubscriptionId, final ClientSubscriptionRequest request) {
         final ClientSubscriptionEntity existing = subscriptionRepository.getReferenceById(clientSubscriptionId);
         final ClientSubscriptionEntity entity = mapper.mapUpdateRequestToEntity(clockService, existing, request);
-        return mapper.mapEntityToResponse(subscriptionRepository.save(entity));
+        return mapper.mapEntityToResponse(clockService, subscriptionRepository.save(entity));
     }
 
     public ClientSubscription getSubscription(final UUID clientSubscriptionId) {
         final ClientSubscriptionEntity entity = subscriptionRepository.getReferenceById(clientSubscriptionId);
-        return mapper.mapEntityToResponse(entity);
+        return mapper.mapEntityToResponse(clockService, entity);
     }
 
     public void deleteSubscription(final UUID clientSubscriptionId) {

src/test/java/uk/gov/hmcts/cp/subscription/config/TestContainersInitialise.java

@@ -10,7 +10,7 @@
 @Slf4j
 public class TestContainersInitialise implements ApplicationContextInitializer<ConfigurableApplicationContext> {
 
-    private static final PostgreSQLContainer postgreSQLContainer = new PostgreSQLContainer(
+    private final PostgreSQLContainer<?> postgreSQLContainer = new PostgreSQLContainer(
             "postgres")
             .withDatabaseName("appdb")
             .withUsername("postgres")