Merge branch 'master' into CIV-15576

Jenkinsfile_CNP

@@ -48,6 +48,7 @@ def secrets = [
     secret('microservicekey-ccd-gw', 'CCD_API_GATEWAY_S2S_KEY')
   ],
   'civil-${env}': [
+    secret('case-document-am-api-s2s-secret', 'CASE_DOCUMENT_AM_API_S2S_SECRET'),
     secret('microservicekey-civil-service', 'S2S_SECRET'),
     secret('ccd-importer-username', 'CCD_CONFIGURER_IMPORTER_USERNAME'),
     secret('ccd-importer-password', 'CCD_CONFIGURER_IMPORTER_PASSWORD'),

charts/civil-service/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 description: A Helm chart for civil-service App
 name: civil-service
 home: https://github.com/hmcts/civil-service
-version: 0.0.72
+version: 0.0.73
 maintainers:
   - name: HMCTS Civil team
 
@@ -34,3 +34,15 @@ dependencies:
     version: 0.0.5
     repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'
     condition: wiremock.enabled
+  - name: ccd-case-document-am-api
+    version: 1.7.14
+    repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'
+    condition: ccd-case-document-am-api.enabled
+  - name: em-ccdorc
+    version: 2.0.25
+    repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'
+    condition: em-ccdorc.enabled
+  - name: em-stitching
+    version: 1.0.55
+    repository: 'https://hmctspublic.azurecr.io/helm/v1/repo/'
+    condition: em-stitching.enabled

charts/civil-service/values.preview.template.yaml

@@ -12,13 +12,14 @@ java:
     CMC_DB_PASSWORD: ${POSTGRES_PASSWORD}
     CMC_DB_CONNECTION_OPTIONS: '?sslmode=allow'
     REFERENCE_DATABASE_MIGRATION: true
+    EM_CCD_ORCHESTRATOR_URL: http://${SERVICE_NAME}-em-ccdorc
     CAMUNDA_URL: http://${SERVICE_NAME}-camunda/engine-rest/
     SERVICE_REQUEST_UPDATE: https://${SERVICE_NAME}.preview.platform.hmcts.net/service-request-update
     SERVICE_REQUEST_UPDATE_CLAIM_ISSUED: https://${SERVICE_NAME}.preview.platform.hmcts.net/service-request-update-claim-issued
-    LAUNCH_DARKLY_ENV: ${SERVICE_FQDN}
+    LAUNCH_DARKLY_ENV: aat
     TESTING_SUPPORT_ENABLED: true
     POLLING_EVENT_EMITTER_ENABLED: true
-    CASE_DOCUMENT_AM_URL: http://ccd-case-document-am-api-aat.service.core-compute-aat.internal
+    CASE_DOCUMENT_AM_URL:  http://${SERVICE_NAME}-cdam
     STITCHING_API_ENABLED: true
     ACA_SERVICE_API_BASEURL: http://${SERVICE_NAME}-aac-manage-case-assignment
     HMC_HEARINGS_SUBSCRIPTION_ENABLED: false
@@ -94,6 +95,7 @@ java:
             CREATE DATABASE "definition-store" WITH OWNER = hmcts ENCODING = 'UTF-8' CONNECTION LIMIT = -1;
             CREATE DATABASE "camunda" WITH OWNER = hmcts ENCODING = 'UTF-8' CONNECTION LIMIT = -1;
             CREATE DATABASE "role_assignment" WITH OWNER = hmcts ENCODING = 'UTF-8' CONNECTION LIMIT = -1;
+            CREATE DATABASE "emstitch" WITH OWNER = hmcts ENCODING = 'UTF-8' CONNECTION LIMIT = -1;
     auth:
       username: ${POSTGRES_USER}
       password: ${POSTGRES_PASSWORD}
@@ -120,11 +122,13 @@ xui-webapp:
     devmemoryLimits: 8Gi
     devcpuLimits: 4500m
     environment:
+      FEATURE_ACCESS_MANAGEMENT_ENABLED: true
       HEALTH_CCD_COMPONENT_API: http://${SERVICE_NAME}-ccd-api-gw/health
       HEALTH_CCD_DATA_API: http://${SERVICE_NAME}-ccd-data-store-api/health
       HEALTH_TERMS_AND_CONDITIONS_API: http://xui-terms-and-conditions-${SERVICE_FQDN}.service.core-compute-preview.internal/health
       SERVICES_CCD_COMPONENT_API: http://${SERVICE_NAME}-ccd-api-gw
       SERVICES_CCD_DATA_STORE_API: http://${SERVICE_NAME}-ccd-data-store-api
+      SERVICES_DOCUMENTS_API_V2: http://${SERVICE_NAME}-cdam
       SERVICES_TERMS_AND_CONDITIONS: http://xui-terms-and-conditions-${SERVICE_FQDN}.service.core-compute-preview.internal
       JURISDICTIONS: CIVIL
       LAUNCH_DARKLY_CLIENT_ID: ~
@@ -154,6 +158,7 @@ ccd:
   global:
     ccdApiGatewayIngress: http://${SERVICE_NAME}-ccd-api-gw
     ccdDataStoreUrl: http://${SERVICE_NAME}-ccd-data-store-api
+    ccdStitchUrl: http://${SERVICE_NAME}-emstitch
     ccdDefinitionStoreUrl: http://${SERVICE_NAME}-ccd-definition-store
     ccdUserProfileUrl: http://ccd-user-profile-api-aat.service.core-compute-aat.internal
     dmStoreUrl: http://dm-store-aat.service.core-compute-aat.internal
@@ -182,15 +187,15 @@ ccd:
       autoscaling:
         enabled: false
       environment:
-        CASE_DOCUMENT_AM_API_ATTACH_DOCUMENT_ENABLED: false
+        CASE_DOCUMENT_AM_API_ATTACH_DOCUMENT_ENABLED: true
         DATA_STORE_DB_HOST: ${SERVICE_NAME}-postgresql
         DATA_STORE_IDAM_KEY: ${CCD_DATA_STORE_S2S_SECRET}
         DATA_STORE_S2S_AUTHORISED_SERVICES: ccd_data,ccd_gw,ccd_ps,bulk_scan_orchestrator,ccpay_bubble,ctsc_work_allocation,em_ccd_orchestrator,xui_webapp,civil_service,ccd_case_document_am_api,aac_manage_case_assignment
         IDAM_API_BASE_URL: https://idam-api.aat.platform.hmcts.net
         IDAM_OIDC_URL: https://idam-web-public.aat.platform.hmcts.net
         OIDC_ISSUER: https://forgerock-am.service.core-compute-idam-aat2.internal:8443/openam/oauth2/realms/root/realms/hmcts
         CCD_S2S_AUTHORISED_SERVICES_CASE_USER_ROLES: civil_service,aac_manage_case_assignment
-        CASE_DOCUMENT_AM_URL: http://ccd-case-document-am-api-aat.service.core-compute-aat.internal
+        CASE_DOCUMENT_AM_URL: http://${SERVICE_NAME}-cdam
         IDAM_OAUTH2_DATA_STORE_CLIENT_SECRET: ${IDAM_OAUTH2_DATA_STORE_CLIENT_SECRET}
         IDAM_DATA_STORE_SYSTEM_USER_USERNAME: ${IDAM_DATA_STORE_SYSTEM_USER_USERNAME}
         IDAM_DATA_STORE_SYSTEM_USER_PASSWORD: ${IDAM_DATA_STORE_SYSTEM_USER_PASSWORD}
@@ -270,6 +275,63 @@ aac-manage-case-assignment:
     autoscaling:
       enabled: false
 
+em-ccdorc:
+  enabled: true
+  java:
+    image: hmctspublic.azurecr.io/em/ccdorc:latest
+    releaseNameOverride: ${SERVICE_NAME}-em-ccdorc
+    ingressHost: em-ccdorc-${SERVICE_FQDN}
+    environment:
+      IDAM_API_BASE_URI: https://idam-api.aat.platform.hmcts.net
+      OPEN_ID_API_BASE_URI: https://idam-web-public.aat.platform.hmcts.net/o
+      S2S_BASE_URI: http://rpe-service-auth-provider-aat.service.core-compute-aat.internal
+      EM_STITCHING_API_URL: https://em-stitching-${SERVICE_FQDN}
+      DM_STORE_APP_URL: http://dm-store-aat.service.core-compute-aat.internal
+      CCD_DATA_API_URL: http://${SERVICE_NAME}-ccd-data-store-api
+      CALLBACK_HTTP_SCHEME: https
+      CALLBACK_DOMAIN: em-ccdorc-${SERVICE_FQDN}
+
+em-stitching:
+  enabled: true
+  java:
+    imagePullPolicy: Always
+    releaseNameOverride: ${SERVICE_NAME}-em-stitching
+    image: hmctspublic.azurecr.io/em/stitching:latest
+    ingressHost: em-stitching-${SERVICE_FQDN}
+    environment:
+      IDAM_API_BASE_URI: https://idam-api.aat.platform.hmcts.net
+      OPEN_ID_API_BASE_URI: https://idam-web-public.aat.platform.hmcts.net/o
+      S2S_BASE_URI: http://rpe-service-auth-provider-aat.service.core-compute-aat.internal
+      DM_STORE_APP_URL: http://dm-store-aat.service.core-compute-aat.internal
+      CDAM_URL: http://${SERVICE_NAME}-cdam
+      SPRING_DATASOURCE_HOST: ${SERVICE_NAME}-postgresql
+      SPRING_DATASOURCE_NAME: emstitch
+      SPRING_DATASOURCE_OPTIONS: "?ssl=disable"
+      SPRING_DATASOURCE_PORT: 5432
+      SPRING_DATASOURCE_USERNAME: ${POSTGRES_USER}
+      SPRING_DATASOURCE_PASSWORD: ${POSTGRES_PASSWORD}
+      ENABLE_DB_MIGRATE: true
+      RUN_DB_MIGRATION_ON_STARTUP: true
+      FLYWAY_POSTGRESQL_TRANSACTIONAL_LOCK: false
+      LOGGING_LEVEL_UK_GOV_HMCTS_REFORM_EM: DEBUG
+
+ccd-case-document-am-api:
+  enabled: true
+  java:
+    releaseNameOverride: ${SERVICE_NAME}-cdam
+    imagePullPolicy: Always
+    image: hmctspublic.azurecr.io/ccd/case-document-am-api:latest
+    ingressHost: ccd-case-document-am-api-${SERVICE_FQDN}
+    environment:
+      IDAM_API_URL: https://idam-api.aat.platform.hmcts.net
+      IDAM_OIDC_URL: https://idam-web-public.aat.platform.hmcts.net
+      OIDC_ISSUER: https://forgerock-am.service.core-compute-idam-aat.internal:8443/openam/oauth2/hmcts
+      S2S_URL: http://rpe-service-auth-provider-aat.service.core-compute-aat.internal
+      DM_STORE_BASE_URL: http://dm-store-aat.service.core-compute-aat.internal
+      CCD_DATA_STORE_API_BASE_URL: http://${SERVICE_NAME}-ccd-data-store-api
+      CASE_DOCUMENT_AM_API_S2S_SECRET: ${CASE_DOCUMENT_AM_API_S2S_SECRET}
+    keyVaults: []
+
 wiremock:
   enabled: true
   image: "wiremock/wiremock"

charts/civil-service/values.yaml

@@ -10,8 +10,19 @@ camunda-bpm:
 
 aac-manage-case-assignment:
   enabled: false
+
 ccd:
   enabled: false
+
+ccd-case-document-am-api:
+  enabled: false
+
+em-ccdorc:
+  enabled: false
+
+em-stitching:
+  enabled: false
+
 java:
   applicationPort: 4000
   image: 'hmctspublic.azurecr.io/civil/service:latest'

src/main/java/uk/gov/hmcts/reform/civil/callback/CallbackParams.java

@@ -17,6 +17,7 @@ public class CallbackParams {
     private CallbackVersion version;
     private String pageId;
     private CaseData caseData;
+    private CaseData caseDataBefore;
 
     public enum Params {
         BEARER_TOKEN

src/main/java/uk/gov/hmcts/reform/civil/callback/CaseEvent.java

@@ -317,6 +317,7 @@ public enum CaseEvent {
     GENERATE_RESPONSE_SEALED(CAMUNDA),
     GENERATE_RESPONSE_CUI_SEALED(CAMUNDA),
     NOTIFY_RPA_ON_CASE_HANDED_OFFLINE(CAMUNDA),
+
     NOTIFY_RPA_ON_CONTINUOUS_FEED(CAMUNDA),
     RETRY_NOTIFY_RPA_ON_CASE_HANDED_OFFLINE(CAMUNDA),
     RESET_RPA_NOTIFICATION_BUSINESS_PROCESS(CAMUNDA),

src/main/java/uk/gov/hmcts/reform/civil/controllers/CallbackController.java

@@ -55,9 +55,10 @@ public CallbackResponse callback(
         @PathVariable("page-id") Optional<String> pageId
     ) {
         final CaseDetails caseDetails = callback.getCaseDetails();
+        final CaseDetails caseDetailsBefore = callback.getCaseDetailsBefore();
         MDC.put("caseId", Objects.toString(caseDetails.getId(), ""));
         log.info("Received callback from CCD, eventId: {}, callback type: {}, page id: {}, version: {}",
-                 callback.getEventId(), callbackType, pageId, version
+            callback.getEventId(), callbackType, pageId, version
         );
 
         CallbackParams callbackParams = CallbackParams.builder()
@@ -67,6 +68,7 @@ public CallbackResponse callback(
             .version(version.orElse(null))
             .pageId(pageId.orElse(null))
             .caseData(caseDetailsConverter.toCaseData(caseDetails))
+            .caseDataBefore(caseDetailsBefore != null ? caseDetailsConverter.toCaseData(caseDetailsBefore) : null)
             .build();
 
         return callbackHandlerFactory.dispatch(callbackParams);

src/main/java/uk/gov/hmcts/reform/civil/enums/caseprogression/EvidenceUploadType.java

@@ -0,0 +1,42 @@
+package uk.gov.hmcts.reform.civil.enums.caseprogression;
+
+public enum EvidenceUploadType {
+
+    DISCLOSURE_LIST("Disclosure list", "%s - Disclosure list"),
+    DOCUMENTS_FOR_DISCLOSURE("Document for disclosure", "%s - Documents for disclosure"),
+    EXPERT_REPORT("Experts report", "%s - Expert's report"),
+    PRE_TRIAL_SUMMARY("Pre Trial Summary", "%s - Case Summary"),
+    JOINT_STATEMENT("Joint report", "%s - Joint Statement of Experts / Single Joint Expert Report"),
+    QUESTIONS_FOR_EXPERTS("Expert Questions", "%s - Questions for other party's expert or joint experts"),
+    ANSWERS_FOR_EXPERTS("Expert Answers", "%s - Answer to questions asked"),
+    CASE_SUMMARY("Case Summary", "Trial documents"),
+    SKELETON_ARGUMENT("Skeleton Argument", "Trial documents"),
+    AUTHORITIES("Authorities", "%s - Authorities"),
+    COSTS("Costs", "%s - Costs"),
+    TRIAL_CORRESPONDENCE("Documentary Evidence", "%s - Documentary evidence for trial"),
+    TRIAL_SKELETON("Trial Skeleton", "%s - Skeleton argument"),
+    DOCUMENTARY("Documentary", "Trial documents"),
+    WITNESS_STATEMENT("Witness Statement of", "%s - Witness statement"),
+    WITNESS_SUMMARY("Witness Summary of", "%s - Witness summary"),
+    WITNESS_HEARSAY("Hearsay evidence", "%s - Notice of the intention to rely on hearsay evidence"),
+    WITNESS_REFERRED(" referred to in the statement of ", "%s - Documents referred to in the statement"),
+    NOTICE_OF_INTENTION("Notice of Intention", "Witness evidence"),
+    DOCUMENTS_REFERRED("Documents Referred", "Witness evidence"),
+    BUNDLE_EVIDENCE("Bundle evidence", "%s - Bundle");
+
+    String documentTypeDisplayName;
+    String notifictationTextRegEx;
+
+    EvidenceUploadType(String documentTypeDisplayName, String notifictationTextRegEx) {
+        this.documentTypeDisplayName = documentTypeDisplayName;
+        this.notifictationTextRegEx = notifictationTextRegEx;
+    }
+
+    public String getNotifictationTextRegEx() {
+        return notifictationTextRegEx;
+    }
+
+    public String getDocumentTypeDisplayName() {
+        return documentTypeDisplayName;
+    }
+}