AMP-256 - E2E IntegrationTest changes

src/test/java/uk/gov/hmcts/cp/subscription/integration/controllers/NotificationControllerIntegrationTest.java

@@ -31,7 +31,7 @@
 import uk.gov.hmcts.cp.subscription.services.CallbackDeliveryService;
 
 
-@EnableWireMock({@ConfigureWireMock(name = "material-client", baseUrlProperties = "material-client.url", port = 18081)})
+@EnableWireMock({@ConfigureWireMock(name = "material-client", baseUrlProperties = "material-client.url", port = 0)})
 @TestPropertySource(properties = {
         "material-client.retry.timeoutMilliSecs=500",
         "material-client.retry.intervalMilliSecs=100"
@@ -54,7 +54,7 @@ void setUp() {
 
     @Test
     void prison_court_register_generated_should_return_success() throws Exception {
-        String pcrPayload = loadPayload("stubs/requests/pcr-request-prison-court-register.json");
+        String pcrPayload = loadPayload("stubs/requests/progression-pcr/pcr-request-prison-court-register.json");
 
         mockMvc.perform(post(NOTIFICATION_PCR_URI)
                         .contentType(MediaType.APPLICATION_JSON)
@@ -68,7 +68,7 @@ void prison_court_register_generated_should_return_success() throws Exception {
 
     @Test
     void custodial_result_should_return_unsupported() throws Exception {
-        String pcrPayload = loadPayload("stubs/requests/pcr-request-custodial-result.json");
+        String pcrPayload = loadPayload("stubs/requests/progression-pcr/pcr-request-custodial-result.json");
 
         doThrow(new UnsupportedOperationException("CUSTODIAL_RESULT not implemented"))
                 .when(callbackDeliveryService).processPcrEvent(any(PcrEventPayload.class), any(UUID.class));
@@ -86,7 +86,7 @@ void custodial_result_should_return_unsupported() throws Exception {
 
     @Test
     void material_metadata_not_found_should_return_404() throws Exception {
-        String pcrPayload = loadPayload("stubs/requests/pcr-request-material-not-found.json");
+        String pcrPayload = loadPayload("stubs/requests/progression-pcr/pcr-request-material-not-found.json");
 
         mockMvc.perform(post(NOTIFICATION_PCR_URI)
                         .contentType(MediaType.APPLICATION_JSON)
@@ -98,7 +98,8 @@ void material_metadata_not_found_should_return_404() throws Exception {
 
     @Test
     void material_metadata_timeout_should_return_504_via_global_exception_handler() throws Exception {
-        String pcrPayload = loadPayload("stubs/requests/pcr-request-material-timeout.json");
+        String pcrPayload = loadPayload("stubs/requests/progression-pcr/pcr-request-material-timeout.json");
+
 
         mockMvc.perform(post(NOTIFICATION_PCR_URI)
                         .contentType(MediaType.APPLICATION_JSON)

src/test/java/uk/gov/hmcts/cp/subscription/integration/controllers/NotificationControllerValidationTest.java

@@ -28,9 +28,9 @@
 class NotificationControllerValidationTest extends IntegrationTestBase {
 
     private static final String NOTIFICATION_PCR_URI = "/notifications/pcr";
-    private static final String PCR_REQUEST_VALID = "stubs/requests/pcr-request-valid.json";
-    private static final String PCR_REQUEST_MISSING_MATERIAL = "stubs/requests/pcr-request-missing-material.json";
-    private static final String PCR_REQUEST_MISSING_EVENT = "stubs/requests/pcr-request-missing-event.json";
+    private static final String PCR_REQUEST_VALID = "stubs/requests/progression-pcr/pcr-request-valid.json";
+    private static final String PCR_REQUEST_MISSING_MATERIAL = "stubs/requests/progression-pcr/pcr-request-missing-material.json";
+    private static final String PCR_REQUEST_MISSING_EVENT = "stubs/requests/progression-pcr/pcr-request-missing-event.json";
     private static final UUID SUBSCRIPTION_ID = randomUUID();
     private static final UUID DOCUMENT_ID = randomUUID();
     private static final String SUBSCRIPTION_DOCUMENT_URI = "/client-subscriptions/{clientSubscriptionId}/documents/{documentId}";

src/test/java/uk/gov/hmcts/cp/subscription/integration/controllers/SubscriptionControllerValidationTest.java

@@ -11,8 +11,8 @@
 class SubscriptionControllerValidationTest extends IntegrationTestBase {
 
     private static final String CLIENT_SUBSCRIPTIONS = "/client-subscriptions";
-    private static final String SUBSCRIPTION_REQUEST_BAD_EVENT = "stubs/requests/subscription-request-bad-event-type.json";
-    private static final String SUBSCRIPTION_REQUEST_INVALID_CALLBACK = "stubs/requests/subscription-request-invalid-callback-url.json";
+    private static final String SUBSCRIPTION_REQUEST_BAD_EVENT = "stubs/requests/subscription/subscription-request-bad-event-type.json";
+    private static final String SUBSCRIPTION_REQUEST_INVALID_CALLBACK = "stubs/requests/subscription/subscription-request-invalid-callback-url.json";
 
     @Test
     void bad_event_type_should_return_400() throws Exception {

src/test/java/uk/gov/hmcts/cp/subscription/integration/controllers/SubscriptionSaveControllerIntegrationTest.java

@@ -17,7 +17,7 @@
 
 class SubscriptionSaveControllerIntegrationTest extends IntegrationTestBase {
 
-    private static final String SUBSCRIPTION_REQUEST_VALID = "stubs/requests/subscription-request-valid.json";
+    private static final String SUBSCRIPTION_REQUEST_VALID = "stubs/requests/subscription/subscription-request-valid.json";
 
     @BeforeEach
     void beforeEach() {

src/test/java/uk/gov/hmcts/cp/subscription/integration/controllers/SubscriptionUpdateControllerIntegrationTest.java

@@ -22,7 +22,7 @@
 @Slf4j
 class SubscriptionUpdateControllerIntegrationTest extends IntegrationTestBase {
 
-    private static final String SUBSCRIPTION_REQUEST_VALID = "stubs/requests/subscription-request-valid.json";
+    private static final String SUBSCRIPTION_REQUEST_VALID = "stubs/requests/subscription/subscription-request-valid.json";
 
     @BeforeEach
     void beforeEach() {

src/test/java/uk/gov/hmcts/cp/subscription/integration/e2e/NotificationPcrE2EIntegrationTest.java

@@ -0,0 +1,196 @@
+package uk.gov.hmcts.cp.subscription.integration.e2e;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
+import org.wiremock.spring.ConfigureWireMock;
+import org.wiremock.spring.EnableWireMock;
+
+import uk.gov.hmcts.cp.material.openapi.api.MaterialApi;
+import uk.gov.hmcts.cp.openapi.model.PcrEventPayload;
+import uk.gov.hmcts.cp.subscription.integration.IntegrationTestBase;
+import uk.gov.hmcts.cp.subscription.model.EntityEventType;
+import uk.gov.hmcts.cp.subscription.services.CallbackDeliveryService;
+import uk.gov.hmcts.cp.subscription.services.DocumentService;
+
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+/**
+ * E2E: success = subscription → material API → callback → document (full chain).
+ * failure = metadata never ready → 504, no callback.
+ */
+// TODO - comments can be removed after handover to QA
+
+@EnableWireMock({@ConfigureWireMock(name = "material-client", baseUrlProperties = "material-client.url", port = 0)})
+@TestPropertySource(properties = {
+        "material-client.retry.timeoutMilliSecs=500",
+        "material-client.retry.intervalMilliSecs=100"
+})
+class NotificationPcrE2EIntegrationTest extends IntegrationTestBase {
+
+    private static final String NOTIFICATION_PCR_URI = "/notifications/pcr";
+    private static final String CLIENT_SUBSCRIPTIONS_URI = "/client-subscriptions";
+    private static final String DOCUMENT_URI = "/client-subscriptions/{clientSubscriptionId}/documents/{documentId}";
+    private static final String SUBSCRIPTION_REQUEST_E2E = "stubs/requests/subscription/subscription-pcr-request.json";
+    private static final String PCR_EVENT_PAYLOAD_PATH = "stubs/requests/progression-pcr/pcr-request-prison-court-register.json";
+    private static final String PCR_EVENT_TIMEOUT_PATH = "stubs/requests/progression-pcr/pcr-request-material-timeout.json";
+    private static final UUID MATERIAL_ID = UUID.fromString("6c198796-08bb-4803-b456-fa0c29ca6021");
+    private static final UUID MATERIAL_ID_TIMEOUT = UUID.fromString("11111111-1111-1111-1111-111111111112");
+
+    @MockitoBean
+    private CallbackDeliveryService callbackDeliveryService;
+
+    @MockitoSpyBean
+    private MaterialApi materialApi;
+
+    @MockitoSpyBean
+    private DocumentService documentService;
+
+    private UUID subscriptionId;
+    private UUID callbackDocumentId;
+
+    @BeforeEach
+    void setUp() {
+        reset(callbackDeliveryService);
+        clearAllTables();
+    }
+
+    @Test
+    void test_document_retrieval_success() throws Exception {
+        given_i_am_a_subscriber_with_a_subscription();
+        given_i_have_a_callback_endpoint();
+        given_material_service_returns_document_success();
+
+        when_a_pcr_event_is_posted();
+        when_material_service_responds();
+
+        then_the_material_api_is_called();
+        then_the_subscriber_receives_a_callback();
+        then_the_subscriber_can_retrieve_the_document();
+    }
+
+    @Test
+    void test_document_retrieval_failure() throws Exception {
+        given_i_am_a_subscriber_with_a_subscription();
+        given_i_have_a_callback_endpoint();
+        given_material_service_returns_document_not_found();
+
+        when_a_pcr_event_is_posted_with_timeout();
+        when_material_service_responds();
+
+        then_the_material_api_was_polled();
+        then_the_subscriber_does_not_receive_a_callback();
+        then_the_subscriber_cannot_retrieve_the_document();
+    }
+
+    private void given_i_am_a_subscriber_with_a_subscription() throws Exception {
+        createSubscription();
+    }
+
+    private void given_i_have_a_callback_endpoint() {
+        // Callback endpoint represented by @MockitoBean CallbackDeliveryService
+    }
+
+    private void given_material_service_returns_document_success() {
+         /*WireMock (material-client) stubs from wiremock/material-client/mappings/:
+         material-metadata-mapping.json     GET .../material/6c198796-08bb-4803-b456-fa0c29ca6021/metadata  → 200, __files/material-response.json
+         material-content-full-mapping.json GET .../material/6c198796-08bb-4803-b456-fa0c29ca6021/content   → 200, __files/material-with-contenturl.json
+         material-binary-mapping.json       GET .../material/6c198796-08bb-4803-b456-fa0c29ca6021/binary    → 200, __files/material-content.pdf*/
+    }
+
+    private void given_material_service_returns_document_not_found() {
+         /*Request payload: stubs/requests/progression-pcr/pcr-request-material-timeout.json
+           eventId: 11111111-1111-1111-1111-111111111111, materialId: 11111111-1111-1111-1111-111111111112, eventType: PRISON_COURT_REGISTER_GENERATED
+           WireMock stub (wiremock/material-client/mappings/):
+           material-metadata-timeout-mapping.json  GET .../material/11111111-1111-1111-1111-111111111112/metadata  → 204 (no body)
+           App polls until Awaitility times out → 504 "Material metadata not ready", no save/callback.*/
+    }
+
+    private void when_a_pcr_event_is_posted() throws Exception {
+        mockMvc.perform(post(NOTIFICATION_PCR_URI)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .header("Accept", MediaType.APPLICATION_JSON_VALUE)
+                        .content(loadPayload(PCR_EVENT_PAYLOAD_PATH)))
+                .andDo(print())
+                .andExpect(status().isAccepted());
+    }
+
+    private void when_a_pcr_event_is_posted_with_timeout() throws Exception {
+        mockMvc.perform(post(NOTIFICATION_PCR_URI)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .header("Accept", MediaType.APPLICATION_JSON_VALUE)
+                        .content(loadPayload(PCR_EVENT_TIMEOUT_PATH)))
+                .andDo(print())
+                .andExpect(status().isGatewayTimeout())
+                .andExpect(content().string("Material metadata not ready"));
+    }
+
+    private void when_material_service_responds() {
+        /* This step does nothing; the material response already happens during when_a_pcr_event_is_posted (app calls MaterialApi, WireMock serves stubs)
+           Success: GET metadata → 200 → save document mapping → callback.
+           Failure: GET metadata → 204 until timeout → 504.*/
+    }
+
+    private void then_the_material_api_is_called() {
+        verify(materialApi, times(1)).getMaterialMetadataByMaterialId(eq(MATERIAL_ID));
+    }
+
+    private void then_the_material_api_was_polled() {
+        verify(materialApi, atLeastOnce()).getMaterialMetadataByMaterialId(eq(MATERIAL_ID_TIMEOUT));
+    }
+
+    private void then_the_subscriber_receives_a_callback() {
+        ArgumentCaptor<UUID> documentIdCaptor = ArgumentCaptor.forClass(UUID.class);
+        verify(callbackDeliveryService, times(1))
+                .processPcrEvent(any(PcrEventPayload.class), documentIdCaptor.capture());
+        callbackDocumentId = documentIdCaptor.getValue();
+        assertThat(callbackDocumentId).isNotNull();
+    }
+
+    private void then_the_subscriber_does_not_receive_a_callback() {
+        verify(callbackDeliveryService, times(0)).processPcrEvent(any(PcrEventPayload.class), any());
+    }
+
+    private void then_the_subscriber_can_retrieve_the_document() throws Exception {
+        mockMvc.perform(get(DOCUMENT_URI, subscriptionId, callbackDocumentId))
+                .andDo(print())
+                .andExpect(status().isOk())
+                .andExpect(header().string("Content-Type", org.hamcrest.Matchers.containsString("application/pdf")))
+                .andExpect(header().string("Content-Disposition", org.hamcrest.Matchers.containsString("PrisonCourtRegister")))
+                .andExpect(content().contentType(MediaType.APPLICATION_PDF));
+    }
+
+    private void then_the_subscriber_cannot_retrieve_the_document() {
+        verify(documentService, times(0)).saveDocumentMapping(any(UUID.class), any(EntityEventType.class));
+    }
+
+    private void createSubscription() throws Exception {
+        String json = mockMvc.perform(post(CLIENT_SUBSCRIPTIONS_URI)
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content(loadPayload(SUBSCRIPTION_REQUEST_E2E)))
+                .andExpect(status().isCreated())
+                .andExpect(jsonPath("$.clientSubscriptionId").exists())
+                .andReturn().getResponse().getContentAsString();
+        subscriptionId = UUID.fromString(new ObjectMapper().readTree(json).get("clientSubscriptionId").asText());
+    }
+}

src/test/resources/stubs/requests/subscription/subscription-pcr-request.json

@@ -0,0 +1,8 @@
+{
+  "notificationEndpoint": {
+    "callbackUrl": "https://callback.example.com"
+  },
+  "eventTypes": [
+    "PRISON_COURT_REGISTER_GENERATED"
+  ]
+}

src/test/resources/__files/material-response.json → src/test/resources/wiremock/material-client/__files/material-response.json

@@ -4,4 +4,4 @@
   "fileName": "PrisonCourtRegister_20251219083322.pdf",
   "mimeType": "application/pdf",
   "materialAddedDate": "2025-12-19T08:33:29.866Z"
-}
+}

src/test/resources/__files/material-with-contenturl.json → src/test/resources/wiremock/material-client/__files/material-with-contenturl.json

@@ -5,5 +5,5 @@
     "fileName": "PrisonCourtRegister_20251219083322.pdf",
     "mimeType": "application/pdf"
   },
-  "contentUrl": "http://localhost:18081/material-query-api/query/api/rest/material/material/6c198796-08bb-4803-b456-fa0c29ca6021/binary"
+  "contentUrl": "http://{{request.host}}:{{request.port}}/material-query-api/query/api/rest/material/material/6c198796-08bb-4803-b456-fa0c29ca6021/binary"
 }

src/test/resources/mappings/material-content-mapping.json → src/test/resources/wiremock/material-client/mappings/material-binary-mapping.json

@@ -1,7 +1,7 @@
 {
   "request": {
     "method": "GET",
-    "url": "/material-query-api/query/api/rest/material/material/7c198796-08bb-4803-b456-fa0c29ca6021/content"
+    "url": "/material-query-api/query/api/rest/material/material/6c198796-08bb-4803-b456-fa0c29ca6021/binary"
   },
   "response": {
     "status": 200,

src/test/resources/wiremock/material-client/mappings/material-content-full-mapping.json

@@ -0,0 +1,16 @@
+{
+  "request": {
+    "method": "GET",
+    "url": "/material-query-api/query/api/rest/material/material/6c198796-08bb-4803-b456-fa0c29ca6021/content"
+  },
+  "response": {
+    "status": 200,
+    "headers": {
+      "Content-Type": "application/vnd.material.query.material+json"
+    },
+    "bodyFileName": "material-with-contenturl.json",
+    "transformers": [
+      "response-template"
+    ]
+  }
+}

stubs/material-client/__files/material-response.json

@@ -0,0 +1,7 @@
+{
+  "materialId": "6c198796-08bb-4803-b456-fa0c29ca6021",
+  "alfrescoAssetId": "82257b1b-571d-432e-8871-b0c5b4bd18b1",
+  "fileName": "PrisonCourtRegister_20251219083322.pdf",
+  "mimeType": "application/pdf",
+  "materialAddedDate": "2025-12-19T08:33:29.866Z"
+}

stubs/material-client/__files/material-with-contenturl.json

@@ -0,0 +1,9 @@
+{
+  "materialId": "6c198796-08bb-4803-b456-fa0c29ca6021",
+  "metadata": {
+    "materialId": "6c198796-08bb-4803-b456-fa0c29ca6021",
+    "fileName": "PrisonCourtRegister_20251219083322.pdf",
+    "mimeType": "application/pdf"
+  },
+  "contentUrl": "http://{{request.host}}:{{request.port}}/material-query-api/query/api/rest/material/material/6c198796-08bb-4803-b456-fa0c29ca6021/binary"
+}

src/test/resources/mappings/material-binary-mapping.json → stubs/material-client/mappings/material-binary-mapping.json

@@ -1,7 +1,7 @@
 {
   "request": {
     "method": "GET",
-    "urlPathPattern": "/material-query-api/query/api/rest/material/material/6c198796-08bb-4803-b456-fa0c29ca6021/binary"
+    "url": "/material-query-api/query/api/rest/material/material/6c198796-08bb-4803-b456-fa0c29ca6021/binary"
   },
   "response": {
     "status": 200,

stubs/material-client/mappings/material-content-full-mapping.json

@@ -0,0 +1,16 @@
+{
+  "request": {
+    "method": "GET",
+    "url": "/material-query-api/query/api/rest/material/material/6c198796-08bb-4803-b456-fa0c29ca6021/content"
+  },
+  "response": {
+    "status": 200,
+    "headers": {
+      "Content-Type": "application/vnd.material.query.material+json"
+    },
+    "bodyFileName": "material-with-contenturl.json",
+    "transformers": [
+      "response-template"
+    ]
+  }
+}