Skip to content

Commit

Permalink
Work Allocation feature branch (#4772)
Browse files Browse the repository at this point in the history
* DFPL-WA: Add utility function to create the work allocation dummy event

* DFPL-WA: extract var out

* DFPL-WA: Add basic test

* Add CMO_REVIEWED work allocation task

* Create work allocation task if CMO not refused

* Update test

* Add work allocation task for manage order for judges

* Implement work allocation tasks into event listeners and undo prev changes

* Add tests

* Fix tests

* checkstyle fix

* DFPL-702 Global Search (0aa11b8)

* Link to fpla-docker's commit hmcts/fpla-docker#83

* DFPL-1214: Changes to Send/Reply to Message CCD Events

* checkstyle

* DFPL-806: Add AuthorisationCaseField for fields accessed by WA

* Dfpl 1047 New event for judges to review additional applications  (#4076)

* add new event - confirmApplicationReviewed

* show review status in Tab

* update unit test

* fix ConfirmApplicationReviewedService

* fix code review

* update 1047

* fix check style

* fix err

* Update judiciary.json

* Update ReviewAdditionalApplicationServiceTest.java

* fix typo

* fix historical case data

* fix default review status not set

* fix code style check

* Update UploadAdditionalApplicationsServiceTest.java

* Update ReviewAdditionalApplicationServiceTest.java

* remove magistrate access from reviewing add app

---------

Co-authored-by: Ashley Wong <50691452+so99y@users.noreply.github.com>

* DFPL-1092 Create New CCD Event- CTSC when Reviewing Failed Payment (WA-FPL-CCD) (#4069)

* DFPL-WA: Add utility function to create the work allocation dummy event

* DFPL-WA: extract var out

* DFPL-WA: Add basic test

* PLEASE REVERT

* sending dummy work allocation event.

* Set variables to payment api url and fees-register api url

* sending dummy work allocation event.

* reverted

* Updating caseData when failed payment event caught

* UI flow

* fix check style

* update test case

* dont need the completion events

* dont need the completion events

* dont need the completion events

* revert secure doc store flag

* update log message

* test case

* remove extra line

* remove logging

* Fix test cases

* fix checkstyle

* fix test case

---------

Co-authored-by: Daniel Catchpole <daniel.catchpole@justice.gov.uk>
Co-authored-by: Ashley Wong <ashley.wong@justice.gov.uk>
Co-authored-by: Qasim Nawaz <96177697+qasimnawaz-moj@users.noreply.github.com>

* DFPL-1093 Create New Event-CTSC to Review Correspondence (WA-FPL-CCD) (#4086)

* DFPL-WA: Add utility function to create the work allocation dummy event

* DFPL-WA: extract var out

* DFPL-WA: Add basic test

* DFLP-1093 Create New Event-CTSC to Review Correspondence (WA-FPL-CCD)

* checkstyle fix

* resolve code review conversation

* fixing test cases

* fix test cases

* missing permission

* check if the uploader is a judge.

* fix test cases

* move featureToogleService.isNewDocumentUploadNotificationEnabled to FurtherEvidenceUploadedEventHandler

* checkstyle

* revert

* fix test cases

* update test cases

* fixing test cases

* add back the checking on uploader

* revert

* tidy up

* revert removing extra lines

* prevent NPE for cafcass flow

* missing userService

* revert

* remove duplicated code

* move the same codes to init()

* code tidy up

* reverting changes

* tidy up

* bug fix

* remove extra blank lines.

* remove extra blank lines

* add logging message

* change to use helper class for the cafcass logic

* Cafcass user also create work allocation task

* remove extra line

---------

Co-authored-by: Daniel Catchpole <daniel.catchpole@justice.gov.uk>
Co-authored-by: Ashley Wong <ashley.wong@justice.gov.uk>
Co-authored-by: randersonMOJ <97732206+randersonMOJ@users.noreply.github.com>

* DFPL-1191: Allow AM validation user to access case details

* Add caseworker-wa-task-configuration and caseworker-ras-validation

* Merge Dfpl 1095 into superbranch (#4181)

* DFPL-1095: Add ES index for hearing end date (!!!)

* DFPL-1095: Create initial chasing task creation job

* DFPL-1095: Add basic event for sending a reminder notification

* DFPL-1095: Update event text

* Update Gradle to 7.5.1 (+ build.gradle changes), update cftlib to 0.19.559

* DFPL-1095: Update ES query to find hearings now-5d ago

* DFPL-1095: add comment explaining hasCMOAssociation call

* Revert "Update Gradle to 7.5.1 (+ build.gradle changes), update cftlib to 0.19.559"

This reverts commit 96f18b4.

* DFPL-1095: fix checkstyle

* DFPL-1095: Add tests + add missing default event data builders

* DFPL-1095: Add more tests + refactor common functions

* DFPL-1095: checkstyle

* DFPL-1095: checkstyle

* DFPL-1095: Simple content provider test

* DFPL-1095: checkstyle

* DFPL-1095: Remove unnecessary feature toggle

* DFPL-1095: Add extra test + sorting hearings by date

* DFPL-1095: Add hearingIds to draft orders + add checking logic for sealed CMOs

* DFPL-1095: Fix checkstyle + broken test initiation

* DFPL-1095: Fix unit tests with new id param

* DFPL-1095: Fix unit tests with new id param

* DFPL-1095: Add missing subfield for other type of HearingOrder

---------

Co-authored-by: Ashley Wong <50691452+so99y@users.noreply.github.com>
Co-authored-by: JJonesMoJ <101256639+JJonesMoJ@users.noreply.github.com>

* DFPL-702 Migration script

* fix resolving conflict errors

* Setting fields used in DMN initiation table as publishable. (#4108)

Co-authored-by: Daniel Catchpole <daniel.catchpole@justice.gov.uk>

* DFPL-972: Add role to access profiles for AM roles

* Fix missing curly bracket

* Fix checkstyle

* DFPL-1095: Fix sonar complaint

* DFPL-1095: Add basic EventHandler test

* Removing unused migration controller tests left after resolving merge conflicts

* Removing unused imports

* Grant caseworker-ras-validation permission to read caseManagementLocation

* Fix merge conflict missing commas

* Point at fpla-docker branch

* add IDAM roles: caseworker-caa and casworker-approver to RoleToAccessProfiles.json

* Add caseworker-wa-task-configuration to the case states + case type

* Fix merge accidentally removing a function

* fix checkstyle + missing curly brace in application-local

* update fpla-docker

* DFPL-1431: Add dummy migration for testing migration-tool (#4386)

* Remove 404ing submitted callback from migrateCase event

* Update suppressions.

* Add Publish attributes to all initiating events

* Add Publish attributes hearing field in submitApplication.json

* Add a dummy DateTime whilst we don't have HMC (#4433)

* Add a dummy DateTime whilst we don't have HMC

* Add hearing time in test

* Add time to gatekeeping test

* fix generator test

* DFPL-1483: Align caseData.court with caseData.caseManagementLocation (#4453)

* DFPL-1483: Get court from JSON config rather than onboardings to store in caseData.court

* DFPL-1483: Use a 'real' court ID in tests

* Publish task reconfiguration events (#4464)

* COT-317: Remove idam role mappings + update AM AccessProfiles (#4459)

* Update the jobClass to match the actual java class

* publish changeCaseName-superuser

* add suppression from branch 'master'

* Make sure court name follows 'Family Court sitting at X' pattern on transfer (#4468)

* Fix tests, don't change the High Court's name

* schedule 'overnight job' for 2pm in demo

* Add specific and challenged access for staff roles (#4475)

* Fix failing tests

* remove duplicate reviewAdditionalApplication

* Use DFPL-702 fpla-docker branch

* Fix tests after merge master

* Fix merge conflict issues

* Dfpl 1379 (#4512)

* Upgrading app insights to v3 and upgrading to java 17.

* Update app insights terraform.

* Updating Dockerfile

* Deleting test duplicated in UpdateCMOHearingTest shouldThrowExceptionWhenNoHearingFoundForTheCMOId

* Bumping chart version/ fixing aliases

* Correcting resource group names for app insights and key vault

* Correcting app insights name.

* Disable functional tests in preview to test rest of pipeline.

* Move connection string app insights secret creation to main.tf.

* Reinstate functional tests.

* Disable ithc sync with prod

* Undoing change to remove syncing with ithc branch.

---------

Co-authored-by: hmcts-jenkins-d-to-i <62423932+hmcts-jenkins-d-to-i[bot]@users.noreply.github.com>

* DFPL-1629: Keep caseManagementLocation upto date when transferring courts (#4533)

* Update caseManagementLocation on transfer court + add test

* move variable closer for checkstyle

* revert change, has to be recorded before we transfer...

* mark oldCourt as final

* Revert "Dfpl 1379 (#4512)"

This reverts commit 61b5117.

* Remove post-submit callback in message judge controllers so it doesn't reconfigure tasks

* Remove test for post submit callback if we're removing it

* checkstyle

* Revert "checkstyle"

This reverts commit 542e85a.

* Revert "Remove test for post submit callback if we're removing it"

This reverts commit abdfb39.

* Revert "Remove post-submit callback in message judge controllers so it doesn't reconfigure tasks"

This reverts commit b538af6.

* Revert possible regression

* Code changes + toggle off event ready for release

* Revert "Revert possible regression"

This reverts commit 10ec15a.

* checkstyle

* fix test clash

* fix dupe RoleToAccessProfile

* DFPL-1561: Re-add code for changing flows

* DFPL-1561: Re-add code for changing flows

* fix regression

* fix checkstyle

* Refactor + move duped code into JudicialService

* add elinks header

* merge issue

* Revert JRD Header

* DISABLE Outstanding orders overnight job

* DISABLE publishing events/fields

* Add superuser IDAM AccessProfile

* Add WA user + global search access profile for preview

* bump xui-webapp chart

* Bumping chart version/ fixing aliases

* Enable test logging

* Revert "Enable test logging"

This reverts commit a6fffb0.

---------

Co-authored-by: Qasim Nawaz <qasim.nawaz@justice.gov.uk>
Co-authored-by: Qasim Nawaz <96177697+qasimnawaz-moj@users.noreply.github.com>
Co-authored-by: Ashley Wong <ashley.wong@justice.gov.uk>
Co-authored-by: Ashley Wong <50691452+so99y@users.noreply.github.com>
Co-authored-by: Chak Shing Lo <95437003+chak-shing-lo-justice@users.noreply.github.com>
Co-authored-by: randersonMOJ <97732206+randersonMOJ@users.noreply.github.com>
Co-authored-by: JJonesMoJ <101256639+JJonesMoJ@users.noreply.github.com>
Co-authored-by: jamesrferguson1 <94848497+jamesrferguson1@users.noreply.github.com>
Co-authored-by: jamesrferguson1 <james.ferguson1@justice.gov.uk>
Co-authored-by: hmcts-jenkins-d-to-i <62423932+hmcts-jenkins-d-to-i[bot]@users.noreply.github.com>
  • Loading branch information
11 people authored and “Georgina committed Nov 30, 2023
1 parent c8cf5d5 commit 00e6492
Show file tree
Hide file tree
Showing 92 changed files with 2,611 additions and 89 deletions.
2 changes: 2 additions & 0 deletions bin/add-ccd-user-roles.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@ done

${dir}/utils/ccd-add-role.sh "citizen"
${dir}/utils/ccd-add-role.sh "caseworker-ras-validation"
${dir}/utils/ccd-add-role.sh "caseworker-wa-task-configuration"
${dir}/utils/ccd-add-role.sh "GS_profile"
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseEventID": "sendOrderReminder",
"AccessControl": [
{
"UserRoles": [
"caseworker-publiclaw-courtadmin"
],
"CRUD": "CR"
}
]
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -636,6 +636,13 @@
"UserRole": "caseworker-publiclaw-systemupdate",
"CRUD": "CR"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseEventID": "create-work-allocation-task",
"UserRole": "caseworker-publiclaw-systemupdate",
"CRUD": "CR"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,29 @@
}
]
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "caseSummaryNextHearingDateTime",
"AccessControl": [
{
"UserRoles": [
"caseworker-publiclaw-courtadmin",
"caseworker-publiclaw-magistrate",
"caseworker-publiclaw-judiciary",
"caseworker-publiclaw-gatekeeper",
"caseworker-publiclaw-superuser"
],
"CRUD": "R"
},
{
"UserRoles": [
"caseworker-publiclaw-systemupdate"
],
"CRUD": "CRUD"
}
]
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5298,6 +5298,41 @@
"UserRole": "caseworker-publiclaw-courtadmin",
"CRUD": "CRU"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "hasHearingsMissingOrders",
"UserRole": "caseworker-publiclaw-courtadmin",
"CRUD": "CRU"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "listOfHearingsMissingOrders",
"UserRole": "caseworker-publiclaw-courtadmin",
"CRUD": "CRU"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "hearingsMissingOrdersMessage",
"UserRole": "caseworker-publiclaw-courtadmin",
"CRUD": "CRU"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "noHearingsMissingOrdersMessage",
"UserRole": "caseworker-publiclaw-courtadmin",
"CRUD": "CRU"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "shouldSendOrderReminder",
"UserRole": "caseworker-publiclaw-courtadmin",
"CRUD": "CRU"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
[
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "SearchCriteria",
"UserRole": "GS_profile",
"CRUD": "R"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "caseNameHmctsInternal",
"UserRole": "GS_profile",
"CRUD": "R"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "caseManagementLocation",
"UserRole": "GS_profile",
"CRUD": "R"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "caseManagementCategory",
"UserRole": "GS_profile",
"CRUD": "R"
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -3779,6 +3779,13 @@
"UserRole": "caseworker-publiclaw-judiciary",
"CRUD": "CRU"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "manageDocumentsPlacementList",
"UserRole": "caseworker-publiclaw-judiciary",
"CRUD": "CRU"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1602,6 +1602,13 @@
"UserRole": "caseworker-publiclaw-systemupdate",
"CRUD": "CRUD"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "lastCreatedWATask",
"UserRole": "caseworker-publiclaw-systemupdate",
"CRUD": "CRU"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "caseName",
"UserRole": "caseworker-wa-task-configuration",
"CRUD": "R"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "caseManagementLocation",
"UserRole": "caseworker-wa-task-configuration",
"CRUD": "R"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "court",
"UserRole": "caseworker-wa-task-configuration",
"CRUD": "R"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "caseSummaryNextHearingDate",
"UserRole": "caseworker-wa-task-configuration",
"CRUD": "R"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "caseSummaryNextHearingDateTime",
"UserRole": "caseworker-wa-task-configuration",
"CRUD": "R"
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"caseworker-publiclaw-systemupdate",
"caseworker-caa",
"caseworker-approver",
"caseworker-ras-validation"
"caseworker-ras-validation",
"caseworker-wa-task-configuration"
],
"CRUD": "CRU"
},
Expand All @@ -28,7 +29,8 @@
"caseworker-publiclaw-bulkscansystemupdate",
"caseworker-caa",
"caseworker-approver",
"caseworker-ras-validation"
"caseworker-ras-validation",
"caseworker-wa-task-configuration"
],
"CRUD": "CRU"
},
Expand All @@ -48,7 +50,8 @@
"caseworker-publiclaw-bulkscansystemupdate",
"caseworker-caa",
"caseworker-approver",
"caseworker-ras-validation"
"caseworker-ras-validation",
"caseworker-wa-task-configuration"
],
"CRUD": "CRU"
},
Expand All @@ -68,7 +71,8 @@
"caseworker-publiclaw-bulkscansystemupdate",
"caseworker-caa",
"caseworker-approver",
"caseworker-ras-validation"
"caseworker-ras-validation",
"caseworker-wa-task-configuration"
],
"CRUD": "CRU"
},
Expand All @@ -88,7 +92,8 @@
"caseworker-caa",
"caseworker-approver",
"caseworker-publiclaw-cafcass",
"caseworker-ras-validation"
"caseworker-ras-validation",
"caseworker-wa-task-configuration"
],
"CRUD": "CRU"
},
Expand All @@ -103,7 +108,8 @@
"caseworker-caa",
"caseworker-approver",
"caseworker-publiclaw-cafcass",
"caseworker-ras-validation"
"caseworker-ras-validation",
"caseworker-wa-task-configuration"
],
"CRUD": "CRU"
},
Expand All @@ -123,7 +129,8 @@
"caseworker-publiclaw-bulkscansystemupdate",
"caseworker-caa",
"caseworker-approver",
"caseworker-ras-validation"
"caseworker-ras-validation",
"caseworker-wa-task-configuration"
],
"CRUD": "CRU"
},
Expand All @@ -143,8 +150,90 @@
"caseworker-publiclaw-bulkscansystemupdate",
"caseworker-caa",
"caseworker-approver",
"caseworker-ras-validation"
"caseworker-ras-validation",
"caseworker-wa-task-configuration"
],
"CRUD": "CRU"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseStateID": "Open",
"UserRoles": [
"GS_profile"
],
"CRUD": "R"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseStateID": "Submitted",
"UserRoles": [
"GS_profile"
],
"CRUD": "R"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseStateID": "Gatekeeping",
"UserRoles": [
"GS_profile"
],
"CRUD": "R"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseStateID": "PREPARE_FOR_HEARING",
"UserRoles": [
"GS_profile"
],
"CRUD": "R"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseStateID": "CLOSED",
"UserRoles": [
"GS_profile"
],
"CRUD": "R"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseStateID": "Deleted",
"UserRoles": [
"GS_profile"
],
"CRUD": "R"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseStateID": "RETURNED",
"UserRoles": [
"GS_profile"
],
"CRUD": "R"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseStateID": "FINAL_HEARING",
"UserRoles": [
"GS_profile"
],
"CRUD": "R"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseStateID": "GATEKEEPING_LISTING",
"UserRoles": [
"GS_profile"
],
"CRUD": "R"
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"caseworker-publiclaw-bulkscansystemupdate",
"caseworker-caa",
"caseworker-approver",
"caseworker-ras-validation"
"caseworker-ras-validation",
"caseworker-wa-task-configuration"
],
"CRUD": "CRU"
},
Expand All @@ -29,5 +30,11 @@
"CaseTypeID": "Shared_Storage_DRAFTType",
"UserRole": "caseworker-publiclaw-courtadmin",
"CRUD": "RU"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"UserRole": "GS_profile",
"CRUD": "R"
}
]
Loading

0 comments on commit 00e6492

Please sign in to comment.