Skip to content

Commit

Permalink
[DTSSTCI-943] Update Next Steps - process tasks (Send Order) (#1861)
Browse files Browse the repository at this point in the history 
* [DTSSTCI-578] Updated WA release scripts and templates

* Bumping chart version/ fixing aliases

* [DTSSTCI-578] Add temporary cve suppression

* [DTSSTCI-578] Bump Java chart version

* [DTSSTCI-578] Revert Java chart version and correct other chart dependencies

* [DTSSTCI-578] Update Jenkinsfile_CNP and remove duplicate wa-task-batch-service

* [DTSSTCI-578] Temporarily remove Work Allocation services from Chart.yaml

* [DTSSTCI-578] Update Jenkins and rename pull scripts

* [DTSSTCI-578] Update camunda values in preview.yml

* [DTSSTCI-578] Reenable camunda values chart

* test new ccd definition importer version, ccd chart release

* updated em-ccdorc

* update em-stitching

* test with disabled em kvs

* [DTSSTCI-578] Add wa-chart amend service bus values in preview

* [DTSSTCI-578] Extend temporary suppressions for Azure CLI

* kv disabled

* db hosts

* [DTSSTCI-578] Rollback build.gradle and Jenkinsfile_CNP

* globals

* fix name

* [DTSSTCI-578] Rollback and add minimum wa dependencies for Chart.yaml and values.preview.template.yaml

* switch postgres

* [DTSSTCI-578] Update Chart.yaml and add values.wa.preview.template.yaml

* [DTSSTCI-578] Add publish to camunda for missed events

* [DTSSTCI-578] Update values.preview.template.yaml and duplicate into values.wa.preview.template.yaml

* [DTSSTCI-578] Update Chart.yaml to use patch-level version

* fix and test em auth

* role assignment

* data store

* overwrite secrets fix (still an issue even with these updated versions)

* [DTSSTCI-578] Copy across Ccd-data-store changes from preview

* clear

* cleanup

* switch sptribs

* [DTSSTCI-578] Fix naming for ccd-case-events topic, and initial config for postgres flexibleserver

* Bumping chart version/ fixing aliases

* [DTSSTCI-578] Add wa-task-management-api secrets

* [DTSSTCI-578] Add wa-workflow-api secrets

* [DTSSTCI-578] Update wa.preview config, remove wa-secret references

* [DTSSTCI-578] Update wa.preview config, add wa.globals

* [DTSSTCI-578] Update wa.preview config, add missing databases

* updated all dependencies in ccd-chart and testing with this new version

* Bumping chart version/ fixing aliases

* [DTSSTCI-578] Add postgres chart

* Update Chart.yaml

Updated ccd chart version

* [DTSSTCI-578] Update ccd-message-publisher config

* [DTSSTCI-578] Add ccd-message-publisher reference to wa app-insights secret

* [DTSSTCI-578] Add missing references to wa app-insights secret

* [DTSSTCI-578] Add missing references to wa app-insights secret

* [DTSSTCI-578] update postgresql chart condition and database config in wa.preview

* [DTSSTCI-578] Updates to postgres, separate wa config

* [DTSSTCI-578] Update ccd version

* [DTSSTCI-578] Fix am-role-assignment database naming. Rollback ccd version

* [DTSSTCI-578] Bump ccd version

* [DTSSTCI-578] Update wa-workflow-api secrets

* [DTSSTCI-578] Update wa-workflow-api environment variables

* [DTSSTCI-578] Update wa-workflow-api environment variables postgres connection options

* [DTSSTCI-578] Temporarily remove wa-workflow-api config

* [DTSSTCI-578] Update pull scripts

* [DTSSTCI-578] Update script command

* [DTSSTCI-578] Update script command

* [DTSSTCI-578] Update script command

* [DTSSTCI-578] Update sptribs S2S secret

* [DTSSTCI-578] Update sptribs S2S secret

* logstash

* [DTSSTCI-578] Update script naming

* temp

* test userprofile importer

* remove unneeded bit

* [DTSSTCI-578] Update S2S_SECRET naming

* [DTSSTCI-578] Revert changes to ccd-import-definition.sh

* [DTSSTCI-578] Remove unnecessary script and reference

* try

* [DTSSTCI-578] Update em-ccdorc chart

* [DTSSTCI-578] Update preview values

* [DTSSTCI-578] Update wa preview values

* [DTSSTCI-578] Rollback wa preview values

* [DTSSTCI-578] Rollback ccd chart and emccdorc versions

* [DTSSTCI-578] Add secret for am-role-assignment

* [DTSSTCI-578] Restore previous config options

* [DTSSTCI-578] Restore previous config options

* [DTSSTCI-578] Fix ccd-data-store api attempt

* [DTSSTCI-578] Fix ccd-user-profile-importer attempt

* [DTSSTCI-578] Fix ccd-data-store-api attempt

* [DTSSTCI-578] Fix ccd-data-store-api attempt

* [DTSSTCI-578] Fix ccd-data-store-api attempt

* [DTSSTCI-578] Update postgres DB name, passwords and usernames

* [DTSSTCI-578] Update postgres DB setup

* [DTSSTCI-578] Update postgres DB values

* [DTSSTCI-578] Fix secrets references

* [DTSSTCI-578] Update script reference to sptribs tenantId

* [DTSSTCI-578] Update secrets and keyVaults

* [DTSSTCI-578] Update am-role-assignment-service

* [DTSSTCI-578] Update db hostname and references

* [DTSSTCI-578] Update Chart.yaml

* [DTSSTCI-578] Update database references

* [DTSSTCI-578] Update preview.template.yaml

* [DTSSTCI-578] rollback em-ccdorc

* [DTSSTCI-578] Update em-ccdorc and java charts

* old typo fixed

* fix

* [DTSSTCI-578] Revert DB changes in values.preview.template.yaml

* revert importer change

* Fix connection string

* [DTSSTCI-578] Update role-assignment db name

* [DTSSTCI-578] Update DB settings for ccd-message-publisher

* [DTSSTCI-578] Update scripts and remove unused files

* [DTSSTCI-578] Undo overwrite of keyVaults

* [DTSSTCI-578] Slim down wa-chart overwrites

* [DTSSTCI-578] Add am-role-mapping-service

* [DTSSTCI-578] Add am-role-mapping-service to xui-webapp

* [DTSSTCI-578] Add am-role-mapping-service to Chart.yaml

* [DTSSTCI-578] Fix image am-role-mapping-service

* [DTSSTCI-578] Fix service name am-org-role-mapping-service

* [DTSSTCI-578] Fix references for asb topics/subscriptions in am-org-role-mapping-service

* [DTSSTCI-578] Remove image pull policy setting

* [DTSSTCI-578] Disable postgresql in am-org-role-mapping

* [DTSSTCI-578] Rename dbs for role_assignment and org_role_mapping

* [DTSSTCI-578] Remove KeyVault overrides for am-org-role-mapping

* [DTSSTCI-578] Retest without ORM

* [DTSSTCI-578] Rollback ORM changes

* [DTSSTCI-578] Re-add ORM

* DTSSTCI-578: Update db name for wa-workflow-api

* DTSSTCI-578: Update RAS url for ORM and set REFRESH_BULK_ASSIGNMENT_INCLUDE_BOOKINGS

* DTSSTCI-578: Enable cic flag for AM DB

* DTSSTCI-578: Import toolbelt/oathtool from hmctspublic to resolve toomanyrequests error

* [DTSSTCI-578] Update servicebus version and move remove duplicated global values

* [DTSSTCI-578] Update naming of role_assignment db

* [DTSSTCI-578] Remove unnecessary cft-lib files

* [DTSSTCI-578] Update sptribs tenant_id for camunda/wa-workflow-api

* [DTSSTCI-578] Use import-bpmn-diagram script

* [DTSSTCI-578] Use import-wa-bpmn-diagram script

* [DTSSTCI-578] Whitelist wa services for S2S with CCD data-store

* [DTSSTCI-578] Update XUI to point to preview pods for wa

* [DTSSTCI-578] Add WA_SUPPORTED_JURISDICTIONS

* [DTSSTCI-578] Configure initiation job to run every minute

* [DTSSTCI-578] Configure reconfiguration and termination job to run every minute

* [DTSSTCI-578] Test initiation with 2 jobs

* [DTSSTCI-578] Revert initiation and also schedule message-cron every minute

* Bumping chart version/ fixing aliases

* [DTSSTCI-578] Test using new import script for dmn files

* [DTSSTCI-578] Update new import-dmn-diagram.sh and remove unused files

* [DTSSTCI-578] Update Jenkinsfile_CNP for new script

* [DTSSTCI-578] Re-add permissions

* [DTSSTCI-578] Fix bpmn function

* [DTSSTCI-578] Fix bpmn script

* [DTSSTCI-578] Fix bpmn script

* [DTSSTCI-578] Fix bpmn script

* [DTSSTCI-578] Fix bpmn script

* [DTSSTCI-578] Fix bpmn script

* [DTSSTCI-578] Update ReferToJudge with field for WA

* [DTSSTCI-578] Update tests for ReferToJudge and ReferToLegalOfficer

* [DTSSTCI-578] Update tests for ReferToJudge and ReferToLegalOfficer

* [DTSSTCI-578] Update tests CaseWorkerCreateDraftOrderTest

* [DTSSTCI-578] Remove unnecessary referral type setting in CaseWorkerCreateDraftOrder

* [DTSSTCI-578] Update getReferralTypeForWA for Judge Additional Info

* [DTSSTCI-578] Remove unused imports

* [DTSSTCI-578] Re-add referralTypeForWA in additional information of CreateDraftOrder

* [DTSSTCI-578] Add publish flag for CaseworkerEditCase

* [DTSSTCI-578] Remove unused dependencies

* [DTSSTCI-578] Remove unused dependencies

* [DTSSTCI-578] Add feature toggle for WA

* DTSSTCI-578: Update show conditions

* [DTSSTCI-578] Update feature flag to be enabled in Jenkinsfile_CNP

* [DTSSTCI-578] Revert changes to CaseWorkerCreateDraftOrder and st-cic-wa-task-config user

* [DTSSTCI-578] Add feature flag for setting referralTypeForWA

* [DTSSTCI-578] Update usage of WA_CONFIG_USER

* DTSSTCI-578: Update completion DMN and spelling error

* DTSSTCI-578: Update tests

* DTSSTCI-578: Undo change to exporterVersion

* [DTSSTCI-578] Update usage of WA_CONFIG_USER

* [DTSSTCI-578] Fix sonar issue

* [DTSSTCI-578] Temporary fix - revert CaseworkerDocumentManagementAmend publish

* [DTSSTCI-578] Fix checkstyle

* [DTSSTCI-578] [DTSSTCI-931] Update DMN for DSS_Submitted

* [DTSSTCI-578] Update Completion DMN column to Task Type

* DTSSTCI-578: Use done to close complex type

* DTSSTCI-578: Use json unwrapped to prevent usage of COMPLEX in fields to events definition file sheet

* DTSSTCI-578: Fix issue causing NPE

* DTSSTCI-578: Retire field and create new field that will not use complex in caseField tab

* DTSSTCI-578: Update code to use individual fields instead of complex type

* DTSSTCI-578: Add selectedDocumentLink as readonly never show

* [DTSSTCI-578] Add CaseTypes and Jurisdictions for wa-task-management-api

* [DTSSTCI-578] Add caseworker-wa-task-configuration to CftLibConfig to fix bootWithCCD

* DTSSTCI-578: Fix incorrect case type

* [DTSSTCI-578] Update Completion DMN to make taskless events and remove unsupported defaultNone completion

* [DTSSTCI-578] Update Completion DMN to make taskless events

* [DTSSTCI-578] Remove duplicate grant history permissions for users

* [DTSSTCI-943] Update Next Steps - process tasks (Send Order)

* [DTSSTCI-578] Add S2S for sptribs_dss_update_case_web

* [DTSSTCI-578] Update citizen-cic-dss-update-case event for Process Further Evidence task

* [DTSSTCI-940] Update description link for Register New Case (#1853)

* [DTSSTCI-578] Update BPMN/DMN upload with placeholders for aat

* [DTSSTCI-941] Update description link for Vet New Case Documents (#1854)

---------

Co-authored-by: hmcts-jenkins-j-to-z <61242337+hmcts-jenkins-j-to-z[bot]@users.noreply.github.com>
Co-authored-by: Hannah Smith <hannah.smith16@justice.gov.uk>
Co-authored-by: Hannah Smith <13995068+hannah38@users.noreply.github.com>
Co-authored-by: Tom Elliott <tomelliott@Toms-MacBook-Pro.local>
Co-authored-by: Tom Elliott <tomlaelliott@gmail.com>
Co-authored-by: Rajaram <70951210+rajaram-nagarajan@users.noreply.github.com>
  • Loading branch information
@oleon23 @hmcts-jenkins-j-to-z
@hannah38 @tomxelliott @rajaram-nagarajan
7 people authored Aug 21, 2024
1 parent 76a2ec8 commit 9e2aa7b
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 33 deletions.
2 changes: 1 addition & 1 deletion src/main/resources/dmn/wa-task-configuration-st_cic-criminalinjuriescompensation.dmn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ else 5000</text>
<text>"description"</text>
</outputEntry>
<outputEntry id="LiteralExpression_1nzw62x">
<text>"[Orders: Send order](/cases/case-details/${[CASE_REFERENCE]}/trigger/caseworker-send-order/caseworker-send-ordercaseworkerSendOrderSelectOrderIssuingType)"</text>
<text>"[Orders: Send order](/cases/case-details/${[CASE_REFERENCE]}/trigger/caseworker-send-order)"</text>
</outputEntry>
<outputEntry id="LiteralExpression_07pv3yt">
<text>true</text>
Expand Down
48 changes: 16 additions & 32 deletions src/test/java/uk/gov/hmcts/sptribs/dmn/CamundaTaskWaConfigurationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,7 @@ static Stream<Arguments> scenarioProvider() throws IOException {
.expectedValue(ROLE_CATEGORY, ROLE_CATEGORY_ADMIN, true)
.expectedValue(DUE_DATE_INTERVAL_DAYS, "10", true)
.expectedValue(DESCRIPTION, "[Orders: Send order](/cases/case-details"
+ "/${[CASE_REFERENCE]}/trigger/caseworker-send-order/"
+ "caseworker-send-ordercaseworkerSendOrderSelectOrderIssuingType)", true)
+ "/${[CASE_REFERENCE]}/trigger/caseworker-send-order)", true)
.expectedValue(DUE_DATE_ORIGIN, ZonedDateTime.now(), false)
.build()
),
Expand All @@ -152,8 +151,7 @@ static Stream<Arguments> scenarioProvider() throws IOException {
.expectedValue(
DESCRIPTION,
"[Orders: Send order](/cases/case-details/${[CASE_REFERENCE]}/trigger"
+ "/caseworker-send-order/"
+ "caseworker-send-ordercaseworkerSendOrderSelectOrderIssuingType)",
+ "/caseworker-send-order)",
true
)
.build()
Expand All @@ -170,8 +168,7 @@ static Stream<Arguments> scenarioProvider() throws IOException {
.expectedValue(
DESCRIPTION,
"[Orders: Send order](/cases/case-details/${[CASE_REFERENCE]}/trigger"
+ "/caseworker-send-order/"
+ "caseworker-send-ordercaseworkerSendOrderSelectOrderIssuingType)",
+ "/caseworker-send-order)",
true
)
.build()
Expand All @@ -188,8 +185,7 @@ static Stream<Arguments> scenarioProvider() throws IOException {
.expectedValue(
DESCRIPTION,
"[Orders: Send order](/cases/case-details/${[CASE_REFERENCE]}/trigger"
+ "/caseworker-send-order/"
+ "caseworker-send-ordercaseworkerSendOrderSelectOrderIssuingType)",
+ "/caseworker-send-order)",
true
)
.build()
Expand All @@ -206,8 +202,7 @@ static Stream<Arguments> scenarioProvider() throws IOException {
.expectedValue(
DESCRIPTION,
"[Orders: Send order](/cases/case-details/${[CASE_REFERENCE]}/trigger"
+ "/caseworker-send-order/"
+ "caseworker-send-ordercaseworkerSendOrderSelectOrderIssuingType)",
+ "/caseworker-send-order)",
true
)
.build()
Expand All @@ -229,8 +224,7 @@ static Stream<Arguments> scenarioProvider() throws IOException {
.expectedValue(
DESCRIPTION,
"[Orders: Send order](/cases/case-details/${[CASE_REFERENCE]}/trigger"
+ "/caseworker-send-order/"
+ "caseworker-send-ordercaseworkerSendOrderSelectOrderIssuingType)",
+ "/caseworker-send-order)",
true
)
.build()
Expand All @@ -249,8 +243,7 @@ static Stream<Arguments> scenarioProvider() throws IOException {
.expectedValue(
DESCRIPTION,
"[Orders: Send order](/cases/case-details/${[CASE_REFERENCE]}/trigger"
+ "/caseworker-send-order/"
+ "caseworker-send-ordercaseworkerSendOrderSelectOrderIssuingType)",
+ "/caseworker-send-order)",
true
)
.build()
Expand All @@ -267,8 +260,7 @@ static Stream<Arguments> scenarioProvider() throws IOException {
.expectedValue(
DESCRIPTION,
"[Orders: Send order](/cases/case-details/${[CASE_REFERENCE]}/trigger"
+ "/caseworker-send-order/"
+ "caseworker-send-ordercaseworkerSendOrderSelectOrderIssuingType)",
+ "/caseworker-send-order)",
true
)
.build()
Expand All @@ -285,8 +277,7 @@ static Stream<Arguments> scenarioProvider() throws IOException {
.expectedValue(
DESCRIPTION,
"[Orders: Send order](/cases/case-details/${[CASE_REFERENCE]}/trigger"
+ "/caseworker-send-order/"
+ "caseworker-send-ordercaseworkerSendOrderSelectOrderIssuingType)",
+ "/caseworker-send-order)",
true
)
.build()
Expand All @@ -303,8 +294,7 @@ static Stream<Arguments> scenarioProvider() throws IOException {
.expectedValue(
DESCRIPTION,
"[Orders: Send order](/cases/case-details/${[CASE_REFERENCE]}/trigger"
+ "/caseworker-send-order/"
+ "caseworker-send-ordercaseworkerSendOrderSelectOrderIssuingType)",
+ "/caseworker-send-order)",
true
)
.build()
Expand All @@ -326,8 +316,7 @@ static Stream<Arguments> scenarioProvider() throws IOException {
.expectedValue(
DESCRIPTION,
"[Orders: Send order](/cases/case-details/${[CASE_REFERENCE]}/trigger"
+ "/caseworker-send-order/"
+ "caseworker-send-ordercaseworkerSendOrderSelectOrderIssuingType)",
+ "/caseworker-send-order)",
true
)
.build()
Expand All @@ -344,8 +333,7 @@ static Stream<Arguments> scenarioProvider() throws IOException {
.expectedValue(
DESCRIPTION,
"[Orders: Send order](/cases/case-details/${[CASE_REFERENCE]}/trigger"
+ "/caseworker-send-order/"
+ "caseworker-send-ordercaseworkerSendOrderSelectOrderIssuingType)",
+ "/caseworker-send-order)",
true
)
.build()
Expand All @@ -364,8 +352,7 @@ static Stream<Arguments> scenarioProvider() throws IOException {
.expectedValue(
DESCRIPTION,
"[Orders: Send order](/cases/case-details/${[CASE_REFERENCE]}/trigger"
+ "/caseworker-send-order/"
+ "caseworker-send-ordercaseworkerSendOrderSelectOrderIssuingType)",
+ "/caseworker-send-order)",
true
)
.build()
Expand All @@ -382,8 +369,7 @@ static Stream<Arguments> scenarioProvider() throws IOException {
.expectedValue(
DESCRIPTION,
"[Orders: Send order](/cases/case-details/${[CASE_REFERENCE]}/trigger"
+ "/caseworker-send-order/"
+ "caseworker-send-ordercaseworkerSendOrderSelectOrderIssuingType)",
+ "/caseworker-send-order)",
true
)
.build()
Expand All @@ -400,8 +386,7 @@ static Stream<Arguments> scenarioProvider() throws IOException {
.expectedValue(
DESCRIPTION,
"[Orders: Send order](/cases/case-details/${[CASE_REFERENCE]}/trigger"
+ "/caseworker-send-order/"
+ "caseworker-send-ordercaseworkerSendOrderSelectOrderIssuingType)",
+ "/caseworker-send-order)",
true
)
.build()
Expand Down Expand Up @@ -1084,8 +1069,7 @@ static Stream<Arguments> scenarioProvider() throws IOException {
.expectedValue(
DESCRIPTION,
"[Orders: Send order](/cases/case-details/${[CASE_REFERENCE]}/trigger"
+ "/caseworker-send-order/"
+ "caseworker-send-ordercaseworkerSendOrderSelectOrderIssuingType)",
+ "/caseworker-send-order)",
true
)
.build()
Expand Down

0 comments on commit 9e2aa7b

Please sign in to comment.