DTSSTCI-1418: Notify tab (DECENTRALISED)

Dockerfile

@@ -6,6 +6,7 @@ USER hmcts
 
 COPY build/libs/sptribs-case-api.jar /opt/app/
 COPY lib/applicationinsights.json /opt/app/
+COPY build/cftlib/definition-snapshots /opt/app/build/cftlib/definition-snapshots
 
 EXPOSE 4013
 CMD [ "sptribs-case-api.jar" ]

bin/utils/idam-lease-user-token.sh

@@ -8,7 +8,7 @@ PASSWORD=${2}
 IDAM_URI=${IDAM_API_URL_BASE:-http://localhost:5000}
 REDIRECT_URI=http://localhost:3451/oauth2redirect
 CLIENT_ID="ccd_gateway"
-CLIENT_SECRET=${CCD_API_GATEWAY_IDAM_CLIENT_SECRET:-ccd_gateway_secret}
+CLIENT_SECRET=${CCD_API_GATEWAY_IDAM_CLIENT_SECRET:-${CCD_API_GATEWAY_OAUTH2_CLIENT_SECRET:-ccd_gateway_secret}}
 SCOPE="openid%20profile%20roles"
 
 curl --silent --show-error --fail \

build.gradle

@@ -1,3 +1,6 @@
+import uk.gov.hmcts.rse.AuthMode
+import uk.gov.hmcts.rse.CftlibExec
+
 buildscript {
   repositories {
     mavenLocal()
@@ -27,7 +30,7 @@ plugins {
   id 'io.spring.dependency-management' version '1.1.7'
   id 'org.springframework.boot' version '3.5.7'
   id 'com.github.ben-manes.versions' version '0.50.0'
-  id 'hmcts.ccd.sdk' version '5.6.1'
+  id 'hmcts.ccd.sdk' version '6.4.3'
   id "au.com.dius.pact" version "4.3.10"
   id 'com.github.hmcts.rse-cft-lib' version '0.19.1911'
 }
@@ -40,6 +43,16 @@ version = '0.0.1'
 
 ccd {
   configDir = file('ccd-definitions/definitions')
+  decentralised = true
+  caseEventServiceBus = true
+}
+
+project.tasks.named("generateCCDConfig") {
+  environment 'SPRING_PROFILES_ACTIVE', 'config-gen'
+  environment 'SPRING_FLYWAY_ENABLED', 'false'
+  environment 'SPRING_JMS_SERVICEBUS_ENABLED', 'false'
+  environment 'SPRING_DATASOURCE_URL',
+    'jdbc:h2:mem:configgen;MODE=PostgreSQL;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false'
 }
 
 sourceSets {
@@ -176,7 +189,7 @@ tasks.register('fortifyScan', JavaExec) {
 checkstyle {
   maxWarnings = 0
   toolVersion = '9.3'
-  getConfigDirectory().set(new File(rootDir, 'config/checkstyle'))
+  getConfigDirectory().set(project.layout.projectDirectory.dir('config/checkstyle').asFile)
 }
 
 pmd {
@@ -185,7 +198,7 @@ pmd {
   reportsDir = file("$project.buildDir/reports/pmd")
   // https://github.com/pmd/pmd/issues/876
   ruleSets = []
-  ruleSetFiles = files("${rootDir}/config/pmd/ruleset.xml")
+  ruleSetFiles = files(project.layout.projectDirectory.file('config/pmd/ruleset.xml'))
 }
 
 jacocoTestReport {
@@ -228,7 +241,7 @@ def sonarExclusions = [
   '**/uk/gov/hmcts/sptribs/CaseApiApplication.java',
   '**/uk/gov/hmcts/sptribs/notification/GetAllTemplatesFromNotify.java',
   '**/uk/gov/hmcts/sptribs/ciccase/model/UserRolesForAccessProfiles.java',
-  '**/uk/gov/hmcts/sptribs/common/config/**'
+  '**/uk/gov/hmcts/sptribs/common/config/**',
 ]
 
 sonarqube {
@@ -330,6 +343,7 @@ dependencies {
   implementation group: 'com.github.hmcts', name: 'core-case-data-store-client', version: '5.1.1'
   implementation group: 'com.github.hmcts', name:'ccd-case-document-am-client', version: '1.59.2'
   implementation group: 'com.github.hmcts', name: 'idam-java-client', version: '3.0.4'
+  implementation group: 'com.github.hmcts', name: 'pdf-service-client', version: '8.0.2'
   implementation group: 'com.github.hmcts.java-logging', name: 'logging', version: '6.1.9'
   implementation group: 'com.github.hmcts', name: 'service-auth-provider-java-client', version: '5.3.3'
   implementation group: 'net.logstash.logback', name: 'logstash-logback-encoder', version: '8.1'
@@ -339,21 +353,26 @@ dependencies {
   implementation group: 'org.projectlombok', name: 'lombok', version: versions.lombok
   implementation group: 'org.springdoc', name: 'springdoc-openapi-starter-webmvc-ui', version: '2.8.14'
   implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web'
+  runtimeOnly 'com.h2database:h2'
+  implementation group: 'org.springframework.boot', name: 'spring-boot-starter-jdbc'
   implementation group: 'org.springframework.boot', name: 'spring-boot-starter-actuator'
   implementation group: 'org.springframework.boot', name: 'spring-boot-starter-aop'
   implementation group: 'org.springframework.boot', name: 'spring-boot-starter-json'
+  implementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-jpa'
   implementation group: 'org.springframework.boot', name: 'spring-boot-starter-validation', version: versions.springBoot
   implementation group: 'org.springframework.retry', name: 'spring-retry', version: '2.0.12'
   implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-netflix-hystrix', version: '2.2.10.RELEASE'
   implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-bootstrap', version: '4.3.0'
   implementation group: 'org.springframework.cloud', name: 'spring-cloud-starter-openfeign', version: '4.3.0'
+  implementation group: 'org.springframework.data', name: 'spring-data-commons', version: '3.5.3'
   implementation group: 'uk.gov.service.notify', name: 'notifications-java-client', version: '5.2.1-RELEASE'
   implementation group: 'com.launchdarkly', name: 'launchdarkly-java-server-sdk', version: '7.10.2'
   implementation group: 'org.apache.commons', name: 'commons-collections4', version: '4.5.0'
   implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.18.0'
   implementation group: 'com.github.ben-manes.caffeine', name: 'caffeine', version: '3.2.3'
   implementation 'org.camunda.bpm:camunda-external-task-client:7.23.0'
-
+  implementation group: 'org.postgresql', name: 'postgresql', version: '42.7.5'
+  implementation 'org.flywaydb:flyway-database-postgresql:11.3.1'
   annotationProcessor group: 'org.projectlombok', name: 'lombok', version: versions.lombok
   testImplementation group: 'com.github.hmcts', name: 'fortify-client', version: '1.4.10', classifier: 'all'
 
@@ -385,9 +404,12 @@ dependencies {
   testAnnotationProcessor group: 'org.projectlombok', name: 'lombok', version: versions.lombok
   integrationTestImplementation sourceSets.main.runtimeClasspath
   integrationTestImplementation sourceSets.test.runtimeClasspath
+  integrationTestImplementation group: 'org.testcontainers', name: 'junit-jupiter', version: '1.20.3'
+  integrationTestImplementation group: 'org.testcontainers', name: 'postgresql', version: '1.20.3'
 
   functionalTestImplementation sourceSets.main.runtimeClasspath
   functionalTestImplementation sourceSets.test.runtimeClasspath
+  functionalTestImplementation 'com.h2database:h2'
 
   functionalTestImplementation group: 'com.github.hmcts', name: 'document-management-client', version: '7.0.1'
   functionalTestImplementation group: 'com.github.hmcts', name: 'service-auth-provider-java-client', version: '5.3.3'
@@ -409,7 +431,7 @@ dependencies {
 
 mainClassName = 'uk.gov.hmcts.sptribs.CaseApiApplication'
 
-tasks.register('loadEnvSecrets') {
+def loadEnvSecretsTask = tasks.register('loadEnvSecrets') {
   doLast {
     if (!project.file('./.aat-env').exists()) {
       new ByteArrayOutputStream().withStream { os ->
@@ -424,7 +446,7 @@ tasks.register('loadEnvSecrets') {
 }
 
 tasks.register('reloadEnvSecrets') {
-  dependsOn[loadEnvSecrets]
+  dependsOn loadEnvSecretsTask
   doFirst {
     if (project.file('./.aat-env').exists()) {
       project.file('./.aat-env').delete()
@@ -497,11 +519,19 @@ ccd {
   configDir = file('build/definitions')
 }
 
+tasks.withType(CftlibExec).configureEach {
+  environment 'RSE_LIB_ADDITIONAL_DATABASES', 'sptribs'
+  environment 'CCD_DECENTRALISED_CASE-TYPE-SERVICE-URLS_CriminalInjuriesCompensation', 'http://localhost:4013'
+  environment 'SPRING_JMS_SERVICEBUS_ENABLED', 'false'
+}
+
 bootWithCCD {
     environment 'XUI_JURISDICTIONS', 'ST_CIC'
     environment 'CASE_DOCUMENT_S2S_AUTHORISED_SERVICES', 'ccd_case_document_am_api,ccd_gw,xui_webapp,ccd_data,bulk_scan_processor,em_npa_app,dg_docassembly_api,em_stitching_api,em_ccd_orchestrator,bulk_scan_orchestrator,sptribs_case_api,sptribs_frontend'
+    environment 'PDF_API_URL', 'http://rpe-pdf-service-aat.service.core-compute-aat.internal'
+    environment 'SPRING_JMS_SERVICEBUS_ENABLED', 'false'
     group = 'ccd tasks'
-    dependsOn(loadEnvSecrets)
+    dependsOn loadEnvSecretsTask
 
     doFirst() {
         project.file('./.aat-env').readLines().each() {
@@ -513,6 +543,7 @@ bootWithCCD {
     }
 }
 
+assemble.dependsOn(dumpCCDDefinitions)
 
 cftlibTest {
   // IDAM simulator will be started on port 5000,
@@ -560,7 +591,7 @@ configurations.testImplementation {
   exclude group: 'ch.qos.logback', module: 'logback-classic'
 }
 
-rootProject.tasks.named("processContractTestResources") {
+tasks.named("processContractTestResources") {
   duplicatesStrategy = 'include'
 }
 

charts/sptribs-case-api/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: "1.0"
 description: A Helm chart for sptribs-case-api App
 name: sptribs-case-api
 home: https://github.com/hmcts/sptribs-case-api
-version: 0.0.110
+version: 0.0.111
 maintainers:
   - name: HMCTS sptribs team
 dependencies:
@@ -48,10 +48,6 @@ dependencies:
     version: ~1.1.0
     repository: 'oci://hmctspublic.azurecr.io/helm'
     condition: wa.enabled
-  - name: ccd-message-publisher
-    version: ~0.1.7
-    repository: 'oci://hmctspublic.azurecr.io/helm'
-    condition: wa.enabled
   - name: servicebus
     version: ~1.2.1
     repository: 'oci://hmctspublic.azurecr.io/helm'

charts/sptribs-case-api/values.preview.template.yaml

@@ -6,14 +6,19 @@ java:
   image: ${IMAGE_NAME}
   ingressHost: ${SERVICE_FQDN}
   environment:
+    PDF_API_URL: "http://rpe-pdf-service-aat.service.core-compute-aat.internal"
     CASE_DATA_STORE_BASEURL: http://{{ .Release.Name }}-ccd-data-store-api
     CASE_DOCUMENT_AM_BASEURL: http://${SERVICE_NAME}-ccd-case-document-am-api
     BUNDLING_API_URL: https://em-ccdorc-${SERVICE_FQDN}
+    DB_NAME: "{{ .Values.global.databaseNamePrefix }}sptribs"
+    DB_HOST: '{{ tpl .Values.global.postgresHostname $}}'
+    DB_USER_NAME: "{{ .Values.global.postgresUsername}}"
+    DB_PORT: 5432
+    SPRING_JMS_SERVICEBUS_ENABLED: false
     POSTGRES_HOST: '{{ tpl .Values.global.postgresHostname $}}'
     POSTGRES_NAME: "{{ .Values.global.databaseNamePrefix }}sptribs-case-api"
     POSTGRES_USERNAME: ${SPTRIBS_POSTGRES_USERNAME_PREVIEW}
     POSTGRES_CONNECTION_OPTIONS: ""
-
   keyVaults:
     sptribs:
       secrets:
@@ -34,7 +39,7 @@ java:
         - name: launchdarkly-sdk-key
           alias: LAUNCH_DARKLY_SDK_KEY
   secrets:
-    POSTGRES_PASSWORD:
+    DB_PASSWORD:
       secretRef: postgres
       key: PASSWORD
       disabled: false
@@ -100,6 +105,7 @@ ccd:
         ELASTIC_SEARCH_HOSTS: ${SERVICE_NAME}-es-master:9200
         ELASTIC_SEARCH_DATA_NODES_HOSTS: http://${SERVICE_NAME}-es-master:9200
         CASE_DOCUMENT_AM_URL: http://${SERVICE_NAME}-ccd-case-document-am-api
+        CCD_DECENTRALISED_CASE-TYPE-SERVICE-URLS_CriminalInjuriesCompensation: https://${SERVICE_FQDN}
         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}
@@ -261,14 +267,54 @@ ccd:
       01_input.conf: |
         input  {
           jdbc {
-            jdbc_connection_string => "jdbc:postgresql://sptribs-preview.postgres.database.azure.com:5432/pr-${CHANGE_ID}-data-store?sslmode-require&stringtype=unspecified"
+            jdbc_connection_string => "jdbc:postgresql://sptribs-preview.postgres.database.azure.com:5432/pr-${CHANGE_ID}-sptribs?sslmode=require"
             jdbc_user => "hmcts"
             jdbc_password_filepath => "/etc/logstash/secrets/PASSWORD"
             jdbc_validate_connection => true
             jdbc_driver_library => "/usr/share/logstash/ccd/postgresql.jar"
             jdbc_driver_class => "org.postgresql.Driver"
             jdbc_default_timezone => "UTC"
-            statement => "UPDATE case_data SET marked_by_logstash = true WHERE marked_by_logstash = false RETURNING id, created_date, last_modified, jurisdiction, case_type_id, state, last_state_modified_date, data::TEXT as json_data, data_classification::TEXT as json_data_classification, reference, security_classification, supplementary_data::TEXT as json_supplementary_data"
+            statement => "
+              WITH next_batch AS (
+                SELECT reference, case_revision
+                FROM ccd.es_queue
+                ORDER BY enqueued_at
+                LIMIT 1000
+                FOR UPDATE SKIP LOCKED
+              ),
+              deleted AS (
+                DELETE FROM ccd.es_queue q
+                USING next_batch nb
+                WHERE q.reference = nb.reference
+                  AND q.case_revision = nb.case_revision
+                RETURNING q.reference, q.case_revision
+              )
+              SELECT
+                cd.id AS case_data_id,
+                cd.reference,
+                ce.id AS event_id,
+                cd.case_type_id,
+                cd.created_date,
+                ce.created_date AS last_modified,
+                cd.jurisdiction,
+                cd.last_state_modified_date,
+                cd.state,
+                cd.security_classification::TEXT,
+                ce.data::TEXT AS json_data,
+                '{}' AS json_data_classification,
+                cd.supplementary_data::TEXT AS json_supplementary_data,
+                cd.case_revision
+              FROM deleted d
+              JOIN ccd.case_data cd ON cd.reference = d.reference
+              JOIN LATERAL (
+                SELECT ce.*
+                FROM ccd.case_event ce
+                WHERE ce.case_data_id = cd.id
+                ORDER BY ce.id DESC
+                LIMIT 1
+              ) ce ON TRUE
+              WHERE cd.case_revision = d.case_revision
+            "
             clean_run => false
             schedule => "* * * * * *"
           }
@@ -379,7 +425,9 @@ ccd:
                 sniffing => false
                 index => "%{[index_id]}"
                 document_type => "_doc"
-                document_id => "%{id}"
+                document_id => "%{case_data_id}"
+                version => "%{case_revision}"
+                version_type => "external"
                 timeout => 60
             }
         }
@@ -533,6 +581,7 @@ postgresql:
       - name: "pr-${CHANGE_ID}-user-profile"
       - name: "pr-${CHANGE_ID}-role_assignment"
       - name: "pr-${CHANGE_ID}-emstitch"
+      - name: "pr-${CHANGE_ID}-sptribs"
 
 servicebus:
   enabled: false

charts/sptribs-case-api/values.wa.preview.template.yaml

@@ -1,4 +1,16 @@
-
+java:
+  secrets:
+    AZURE_SERVICE_BUS_CONNECTION_STRING:
+      secretRef: sptribs-sb-preview
+      key: connectionString
+    AZURE_SERVICE_BUS_PREVIEW_CONNECTION_STRING:
+      secretRef: sptribs-sb-preview
+      key: connectionString
+  environment:
+    SPRING_JMS_SERVICEBUS_ENABLED: true
+    SPTRIBS_SERVICEBUS_SCHEDULER_ENABLED: true
+    AZURE_SERVICE_BUS_TOPIC_NAME: ${SERVICE_NAME}-asb-ccd-case-events
+    AZURE_SERVICE_BUS_SUBSCRIPTION_NAME: ${SERVICE_NAME}-asb-ccd-case-events
 
 servicebus:
   enabled: true
@@ -26,6 +38,7 @@ postgresql:
       - name: "pr-${CHANGE_ID}-role_assignment"
       - name: "pr-${CHANGE_ID}-user-profile"
       - name: "pr-${CHANGE_ID}-emstitch"
+      - name: "pr-${CHANGE_ID}-sptribs"
       - name: "pr-${CHANGE_ID}-camunda"
       - name: "pr-${CHANGE_ID}-cft_task_db"
       - name: "pr-${CHANGE_ID}-wa_workflow_api"
@@ -93,29 +106,6 @@ wa:
     postgresql:
       enabled: false
 
-ccd-message-publisher:
-  java:
-    ingressHost: ccd-message-publisher-${SERVICE_FQDN}
-    releaseNameOverride: ${SERVICE_NAME}-ccd-message-publisher
-    keyVaults:
-      ccd:
-        secrets:
-          - name: AppInsightsInstrumentationKey
-            alias: azure.application-insights.instrumentation-key
-    environment:
-      DATA_STORE_DB_HOST: sptribs-preview.postgres.database.azure.com
-      DATA_STORE_DB_NAME: "pr-${CHANGE_ID}-data-store"
-      DATA_STORE_DB_USERNAME: ${CCD_GLOBAL_POSTGRES_USERNAME_PREVIEW}
-      DATA_STORE_DB_OPTIONS: "?stringtype=unspecified&reWriteBatchedInserts=true&sslmode=require"
-      CCD_CASE_EVENTS_DESTINATION: "${SERVICE_NAME}-asb-ccd-case-events"
-    secrets:
-      SERVICE_BUS_CONNECTION_STRING:
-        secretRef: sptribs-sb-preview
-        key: connectionString
-      DATA_STORE_DB_PASSWORD:
-        secretRef: "{{ .Values.global.postgresSecret }}"
-        key: PASSWORD
-
 am-org-role-mapping-service:
   enabled: true
   java:
@@ -178,4 +168,3 @@ xui-webapp:
       SERVICES_WORK_ALLOCATION_TASK_API: http://{{ .Release.Name }}-wa-task-management-api
       SERVICES_ROLE_ASSIGNMENT_MAPPING_API: http://{{ .Release.Name }}-am-org-role-mapping-service
       WA_SUPPORTED_JURISDICTIONS: ST_CIC
-

charts/sptribs-case-api/values.yaml

@@ -86,6 +86,7 @@ java:
     CASE_DOCUMENT_AM_BASEURL: http://ccd-case-document-am-api-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal
     DOC_ASSEMBLY_URL: http://dg-docassembly-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal
     DOCUMENT_MANAGEMENT_URL: http://dm-store-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal
+    PDF_API_URL: "http://rpe-pdf-service-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal"
 
     CASE_API_DOCUMENT_DOWNLOAD_URL: http://manage-case.{{ .Values.global.environment }}.platform.hmcts.net/
     SEND_LETTER_SERVICE_BASEURL: "http://rpe-send-letter-service-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal"