Skip to content

Commit

Permalink
DFPL-1377: App Insights Demo Deployment (#4535)
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

* Disabling sync with master for demo while testing wa. (#4344)

* DFPL-1260: Fix no field found error in amend children flow (#4323)

* DFPL-1371: Removal of Doc on PO22C50396 (#4326)

* DFPL-1380: MIgration to reinstate closed case (#4338)

* DFPL-1310-rollback: Rollback CCD changes for court value as has to happen concurrently with a migration (#4350)

* DFPL-1381 Unknown Error when uploading Gatekeeping Order - Judicial Gatekeeping (#4347)

* fix null pointer

* add null checking

* fix unuse import

* fix check style

* DFPL-1378 Warning restriction on gatekeeping is not allowing urgent gatekeeping to be completed (#4334)

* add test case

* allow standalone interim care order

* typo

* allow standalone secure accommodation order

* check style

* allow adding urgent direction to standalone child recovery order.

* Allow access for ICO and EPO

---------

Co-authored-by: Ashley Wong <ashley.wong@justice.gov.uk>

* DFPL-1249: Update .internal links to .platform links (#4221)

* DFPL-1249: Update internal link in Jenkinsfile_CNP

* Update more internal links

* Update internal link for api tests

* DFPL-1412: Add system update user permissions for gatekeeping sealing (#4351)

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

* Update suppressions list. (#4356)

* DFPL-1400: Add permission for system-update user to see the multiCourts field for task list rendering (#4349)

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

* DFPL-1395: Add Package script for nightly e2e tests (#4343)

* DFPL-1152: Yarn v3 update

* update outdated packages

* update dependancy check to work around yarn upgrade

* add yarn lock

* switch to immutable from frozen lock file

* yarn lock update

* re-add yarn lock

* set node version

* set node version

* set node version

* DFPL-1152-V2: Yarn V3

* testing gradle task to for node update

* install and swap node version with nvm

* add directory to nvm call

* shift to use yarnBuilder

* remove immutable to allow for lockfile changes

* remove functionals gradle task

* add mocha and set eslint

* remove deprecated mutex flag

* remove dependency check as no longer supported in yarn 3

* add lint UI tests to yarnbuilder

* remove silent call on lint tests

* remove silent call on browser tests + shift smoke test dependency install to jenkins file

* change syntax of functionals script in package

* add dependency install into nightly, remove from gradle tasks

* add debug node module for concepts

* add peer dependencies

* add yarnrc for mocha reporter

* move browser tests to jenkinsfile

* remove test_selector from grep as no longer works with new yarn

* change to after success to prevent longer pipeline times

* change nightly to alwaysAfter and remove branch reference

* DFPL-1395: Add Package script for nightly e2e tests

* add flaky too!

* use http for nightly case service access

* set case service url to use http

* ensure functionals point at AAT

* ensure functionals point at AAT

* DFPL-1200: Add a new case list filters - DFJ Area and Court (#4342)

* DFPL-1200: Initial work basket configuration

* DFPL-1200: Updated dft label and add config to search input fields

* DFPL-1200: Added missing courts

* DFPL-1200: Added high court and renamed dfj to dfjArea

* DFPL-1200: Update court transfer flow to add DFJ Area and court info

* DFPL-1200: Added test DFJ Area Court mapping

* DFPL-1200: Updated DFJ Area Court

* DFPL-1200: Fix for HighCourt DFJ

* DFPL-1200: Removed unused variable courtCode

* DFPL-1200: Incorporated code review comments

* DFPL-1200: Rollback implementation

* DFPL-1200: Fixed build issue

* DFPL-1200: adding suppressions

* DFPL-1200: Fixed CaseInitiationController about to submit test

* DFPL-1200: Updated court codes

* DFPL-1200: Adding idam credentials to key vaults

* DFPL-1200: Upgraded java chart version to 4.0.13

* Bumping chart version/ fixing aliases

* Merging in master

* Checkstyle

* Fix dupe permission

* Bumping chart version/ fixing aliases

* Fixing merge conflicts

---------

Co-authored-by: SomeshRA <somesh.acharya1@hmcts.net>
Co-authored-by: SomeshRA <69344273+SomeshRA@users.noreply.github.com>
Co-authored-by: Tom Elliott <tomlaelliott@gmail.com>
Co-authored-by: hmcts-jenkins-d-to-i <62423932+hmcts-jenkins-d-to-i[bot]@users.noreply.github.com>
Co-authored-by: Daniel Catchpole <daniel.catchpole@justice.gov.uk>

* Revert "DFPL-1200: Add a new case list filters - DFJ Area and Court (#4342)" (#4364)

This reverts commit 4addc69.

* fix timezone math (#4365)

* Dfpl 1200 revert skip test (#4366)

* fix timezone math

* skip API tests

* add house keep option to final decision detail (#4325)

* Re-enabling functional tests. (#4369)

* DFPL-1336: Remove CTSC feature toggle, always set sending emails to the CTSC on submission (#4269)

* DFPL-1336: Disable the CTSC feature toggle, set always YES on case submission

* DFPL-1336: Set default if all other paths fail to be the CTSC inbox

* checkstyle

* DFPL-1336: Update tests as no longer using LD during case submission

* checkstyle

* DFPL-1336: Remove CTSC feature flag completely

* DFPL-1336: Fix tests to use CTSC as email not null

* DFPL-1336: Revert to using value not enum as CaseData is storing it as a string

* checkstyle

* DFPL-1386 Notification of Document Uploaded- but showing several documents (#4345)

* add log message for debugging

* enhanced log messages

* fix for applicationDocument

* checkstyle

* update checking new document upload logic

* update

* checkstyle

* update test cases

* checkstyle

* checkstyle

* simlpify

* rename

* renaming

* Rename and add back element id to testing data

* Rename to CAFCASS_REPRESENTATIVE to make it clearly.

* Rename to CAFCASS_REPRESENTATIVE to make it clearly.

* Rename to CAFCASS_REPRESENTATIVE to make it clearly.

* Move test case to template

* checkstyle

* fine tuning

* removing unused import

* removed moved test case

* add test case when docs removed. not sending notification to cafcass

* added test case for not sending notification to cafcass when uploaded documents are the same.

* code format

* added test case for not sending notification when confidential change in AnyDocumentUpload

* Fix cafcass hearing further evidence path

* moved test cases to template for sending notification to cafcass when application document upload

* updated

* simplied

* test cases updated

* missing line

* test case's already moved

* updated

* update test cases

* checkstyle

* fix getDocumentInfo

* update respondent statement test cases

* updated. test cases

* suppress CVE-2023-20863

* checkstyle

* checkstyle

* added test case for uploading correspondence.

* checkstyle

* fix test cases without UUID

* remove extra space

* remove debug messages

* Fix test cases

* update assert

* Fix test cases

* remove debug message

* checkstyle fix

* add debug message

* Revert "add debug message"

This reverts commit 353344e.

* confidential documents uploaded by LA restricts access to solicitors only.

* CAFCASS should not be notified when HMCTS admin upload a document.

* checkstyle fix

* Fix the loophole that CAFCASS can access confidential document when HMCTS upload it.

* checkstyle

* remove unused methods

* Fix Cafcass getting notification when HMCTS uploads a confidential documents for additional application

* Fix Cafcass getting notification when HMCTS uploads a confidential documents for C2 additional application

* checkstyle

* rename and tidy up

* confidential issue when uploading court bundle

* simplified

* method renamed

* typo

* Deprecated wrapElementsWithRandomUUID

* simplified the logic

---------

Co-authored-by: Ashley Wong <ashley.wong@justice.gov.uk>

* DFPL-1325 Enable Consumer Deploy Checks for Pact tests (#4299)

* Update Jenkinsfile_CNP

* test pact test failed

* test pact test failed

* revert testing

* try update CaseAccessDataStoreConsumerTest

* Revert "try update CaseAccessDataStoreConsumerTest"

This reverts commit a353b7b.

* DFPL-1450 INC5505842 Court Address Amendment - Watford County & Famil… (#4382)

* DFPL-1450 INC5505842 Court Address Amendment - Watford County & Family Court

* remove (new address) wording

* remove 404

---------

Co-authored-by: Ashley Wong <ashley.wong@justice.gov.uk>

* DFPL-1437 Document removal for data breach on ZW23C50136 (#4375)

* removed done test cases

* Migration script for DFPL-1437

* renamed

* checkstyle fix

* Test case for removeHearingFurtherEvidenceDocuments

* test cases for removeFurtherEvidenceSolicitorDocuments

---------

Co-authored-by: Ashley Wong <ashley.wong@justice.gov.uk>

* DFPL-1118: Fix case access when swapping solicitors in `children` event (#4037)

* DFPL-1118: Add CaseEventToXYZ ccd configuration for updateRepresentation

* DFPL-1118: Add logging to check if the request has null fields

* DFPL-1118: Fix logging

* DFPL-1118: checkstyle

* DFPL-1118: Log errors + skip tests for speed

* DFPL-1118: Change applyDecision to user version

* Add extraEnvs

* bump ccd chart

* Bumping chart version/ fixing aliases

* Add values copied from civil's successful PR

* TEST Spin up manage org in preview

* Bumping chart version/ fixing aliases

* Add manage org oauth callback

* remove vault access for AAC

* Update AAC url for manage-org

* add xui_mo_webapp to aac in preview

* Revert "remove vault access for AAC"

This reverts commit a2b4d87.

* Update secrets + bump AAC chart version

* case type not jurisdiction id...

* Bumping chart version/ fixing aliases

* change updateRepresentation to be about-to-start

* Update change org request field THEN apply it in another event

* update tests to take into account new update pattern

* update tests to take into account new update pattern

* DFPL-1118: Add tests for about-to-start callback

* Fix checkstyle

* DFPL-1118: Respondent tests

* DFPL-1118: Add child controller test changes

* DFPL-1118: remove unused imports

* DFPL-1118: update NoCServiceTest

* DFPL-1118: Rearrange RespondentController.prepareNewRespondents

* DFPL-1118: Revert rearrange - add caseData conversion so we can replace the OrgPolicy

* Add permission for systemupdate user to modify the policies

* Remove permissions dupes

---------

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

* DFPL-1242 - Reverting OrderType:EDUCATION_SUPERVISION_ORDER - Unable to upload documents to case (#4241)

* Fix typo

* Migration script

* checkstyle fix

---------

Co-authored-by: Ashley Wong <ashley.wong@justice.gov.uk>

* DFPL-1393 INC5501309 Cases getting stuck in gatekeeping (#4361)

* add EventEnablingCondition

* Update GatekeepingListing.json

* update with new behaviour

* fix sdo checking

* DFPL-1455 INC5507506 Unable to return application (#4392)

* DFPL-1455 null check on submittedForm

* Test case

* typo

---------

Co-authored-by: Ashley Wong <ashley.wong@justice.gov.uk>

* 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 fpla-docker commit (#4401)

Co-authored-by: Ashley Wong <ashley.wong@justice.gov.uk>

* update fpla-docker (#4402)

Co-authored-by: Ashley Wong <ashley.wong@justice.gov.uk>

* Revert "DFPL-1310-rollback: Rollback CCD changes for court value as has to happen concurrently with a migration (#4350)" (#4403)

This reverts commit 32ddeca.

* Dfpl 1310 v2 (#4405)

* Revert "DFPL-1310-rollback: Rollback CCD changes for court value as has to happen concurrently with a migration (#4350)"

This reverts commit 32ddeca.

* DFPL-1310-fix: Migrate the orders.court

* DFPL-1310-fix: Migrate the orders.court

* Dfpl 1310 v2 (#4406)

* Revert "DFPL-1310-rollback: Rollback CCD changes for court value as has to happen concurrently with a migration (#4350)"

This reverts commit 32ddeca.

* DFPL-1310-fix: Migrate the orders.court

* DFPL-1310-fix: Migrate the orders.court

* DFPL-1310-fix2: Migrate the ordersSolicitor.court

* DFPL-1310-v4: Migrate the orders.court specifically (#4409)

* Grant system update user read permission for orderPreview field. (#4407)

* Grant system update user read permission for orderPreview field.

* Log when order has been manually uploaded for a case.

* DFPL-1427: Fix Cafcass gatekeeping notifications (#4371)

* DFPL-1427: Fix Cafcass gatekeeping notifications

* fix translation submitted tests and remove json ignore for casedata function

* remove unused imports

* remove unrequired test changes

* Remove override and replace with standalone function

* Fix tests

* fix respondents updater test mock

* add permissions for court select when making standalone application

* add suppressions

---------

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

* DFPL-1401 INC5501195 Manage Cases/CCD Not creating orders (#4384)

* migration script for setting missing relatingLA to NCC

* test case for the migration script

* resolved conflicts

---------

Co-authored-by: Ashley Wong <ashley.wong@justice.gov.uk>

* DFPL-1451: Migration script to remove the draft order from advocates meeting (#4396)

* DFPL-1451: Migration script to remove the draft order from advocates meeting

* Add new line

* Remove older migrations

* Re-add 1359

* Remove unused imports

* Remove test

* Remove imports

* Update suppressions.

* DFPL-1414: Fix issue of Bulk Print receiving duplicated requests (#4391)

* DFPL-1414: Fix issue of Bulk Print receiving duplicated requests

* Send array of recipient names

* Send one recipient name per request

* Fix tests

* Fix checkstyle

* Fix more tests

---------

Co-authored-by: Braimah101 <41795070+Braimah101@users.noreply.github.com>

* DFPL-1390: Update permissions to fix 'no field found' error in ManageOrders flow (#4380)

* DFPL-1390: Update permissions to fix 'no field found' error in ManageOrders flow

* Revert permission changes

* Migration script to remove manageorder temp fields

* Update permissions for manageorders temp fields

* Revert migration changes

---------

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

* DFPL-1445: Fix use of old case data/details causing docstore errors (#4373)

* DFPL-1332: Fix use of old case data/details causing docstore errors

* DFPL-1445: Unify permissions for all roles working on behalf of LA

* DFPL-1482: Remove wide-ranging role access to this event (#4422)

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

* 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>
Co-authored-by: Qasim Nawaz <96177697+qasimnawaz-moj@users.noreply.github.com>

* DFPL-1214: Changes to Send/Reply to Message CCD Events (#4119)

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

* Update spelling for Legal Adviser

---------

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

* Add Publish attributes to all initiating events

* Add Publish attributes hearing field in submitApplication.json

* DTSPO-13810 reschedule nightlybuilds to start at 8am (#4427)

* DTSPO-13810 reschedule nightlybuilds to start at 8am

* Update Jenkinsfile_nightly

* DFPL-1511 INC5512575 Confidential Document to be removed (#4424)

Co-authored-by: Ashley Wong <ashley.wong@justice.gov.uk>

* DFPL-1501: Document removal (#4423)

* DFPL-1466: Migration to remove incorrect position statement (#4416)

* DFPL-1344 ZE23C50059 draft order emailed to judge instead of uploaded into hearing tab (#4353)

* fix link

* update test

---------

Co-authored-by: randersonMOJ <97732206+randersonMOJ@users.noreply.github.com>

* enable review on CYA page (#4370)

* 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-1484 INC5511563 Document removal via hearing documents tab (#4428)

* DFPL-1484 INC5511563 Document removal via hearing documents tab

* test cases

* missing comma

---------

Co-authored-by: Ashley Wong <ashley.wong@justice.gov.uk>

* DFPL-1435: Update Cafcass England subject line mappings (#4381)

* DFPL-1435: Add noticeOfPlacement + placementApplication to mapping

* DFPL-1435: Add skeleton argument mapping

* DFPL-1435: Remove skeleton argument mapping

* DFPL-1435: Add document type to the DocumentReference

* use the set we just modified!

* Don't sync perftest at the moment

* Update Gradle to 7.6.1 (+ build.gradle changes), update cftlib to 0.19.693 (#4080)

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

* fix merge conflict

* DFPL-1134: make hearingTypeDetails optional/visible in listing event

* DFPL-1408: fix integration test issue

* DFPL-1408: tidy up to fix functional tests

* DFPL-1408: bump the version to 7.6.1

---------

Co-authored-by: taleb <tech@benouaer.com>
Co-authored-by: taleb <20416858+benouaer@users.noreply.github.com>
Co-authored-by: jamesrferguson1 <94848497+jamesrferguson1@users.noreply.github.com>

* Upgrading pact version to fix annotation issue following gradle upgrade. (#4444)

* Dfpl update pact version (#4445)

* Upgrading pact version to fix annotation issue following gradle upgrade.

* Upgrading pact version to fix annotation issue following gradle upgrade.

* Dfpl update pact version (#4446)

* Upgrading pact version to fix annotation issue following gradle upgrade.

* Upgrading pact version to fix annotation issue following gradle upgrade.

* Upgrading pact version to fix annotation issue following gradle upgrade.

* Dfpl revert gradle upgrade (#4447)

* Revert "Dfpl update pact version (#4446)"

This reverts commit 74561ae.

* Revert "Dfpl update pact version (#4445)"

This reverts commit e79286e.

* Revert "Upgrading pact version to fix annotation issue following gradle upgrade. (#4444)"

This reverts commit b25b415.

* Revert "Update Gradle to 7.6.1 (+ build.gradle changes), update cftlib to 0.19.693 (#4080)"

This reverts commit 9569ad1.

* DFPL-1532: Reading Code incorrect in case progression (#4443)

* Specifying ShowEventNotes so that it is set on all events. (#4450)

* 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

* CFTLib and Gradle Upgrade (#4457)

* Disable functional tests in preview for testing pact step

* Update Gradle to 7.6.1 (+ build.gradle changes), update cftlib to 0.19.693 (#4080)

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

* fix merge conflict

* DFPL-1134: make hearingTypeDetails optional/visible in listing event

* DFPL-1408: fix integration test issue

* DFPL-1408: tidy up to fix functional tests

* DFPL-1408: bump the version to 7.6.1

---------

Co-authored-by: taleb <tech@benouaer.com>
Co-authored-by: taleb <20416858+benouaer@users.noreply.github.com>
Co-authored-by: jamesrferguson1 <94848497+jamesrferguson1@users.noreply.github.com>
(cherry picked from commit 9569ad1)

* Upgrade pact version

* Upgrade pact version

* Re-enabling functional tests

---------

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

* 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'

* suppress CVE-2023-20883 (#4466)

Co-authored-by: Ashley Wong <ashley.wong@justice.gov.uk>

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

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

* DFPL-1445: Remove unnecessary upload as part of send letter implementation (#4436)

* DFPL-1445: Remove unnecessary upload as part of send letter implementation

* Rearrange for checkstyle

* Fix tests

* Fix couple more tests

* Fix tests

* DFPL-1445: Add convertToPdfBytes tests

* schedule 'overnight job' for 2pm in demo

* DFPL-1477 Cafcass receiving multiple notifications (#4451)

* change to async listener for sending email to cafcass

* add retry to cafcass async listener

* fix unit test

* change to async for all notification listener in manageDoc

* fix unit test

* remove unused import

* fix unit test

* remove notification service Retryable

* only retry on EmailFailedSendException

* Dfpl 1447 - 404 errors on downloading docs via CDAM for manage orders (#4474)

* Grant system update user read permission for orderPreview field.

* Log when order has been manually uploaded for a case.

* Turning off retry mechanism for manage orders

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

* DFPL-1528 not populating the Applicant's name when the Applicant isn't a local authority (#4471)

* get first applicant name if no designatedLocalAuthority is found

* add new unit test

* fix check style

* apply changes to all application type

* Fix failing tests

* remove duplicate reviewAdditionalApplication

* DFPL-1200: Add a new case list filters - DFJ Area and court (#4431)

* Revert "Revert "DFPL-1200: Add a new case list filters - DFJ Area and Court (#4342)" (#4364)"

This reverts commit 47f9054

* Fix fpla-docker pointing at wrong commit

* missing import

* Update MigrateCaseController.java

comma!

* DFPL-1584: Remove blank document from case summary (#4483)

* DFPL-1572: Remove blocker on Cafcass notifications for newly submitted standalones (#4478)

* Remove blocker on Cafcass notifications for newly submitted applications

* checkstyle

* Fix Brighton DFJ court code (#4494)

* DFPL-1529 SDO created but venue didn't pull though to the order (#4484)

* fix previous hearing venue is empty

* fix unit test

* fix checkstyle

* fix check style

* update format

---------

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

* DFPL-1571: Change wording on C2 application type (#4488)

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

* Update suppressions list. (#4498)

* Use DFPL-702 fpla-docker branch

* Fix tests after merge master

* DFPL-1293: Change court name from "Central London County" to "Central Family Court" (#4285)

Co-authored-by: jamesrferguson1 <94848497+jamesrferguson1@users.noreply.github.com>

* Update suppressions list. (#4504)

* DFPL-1589: Add system-update permissions for factorsParenting field (#4486)

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

* fix labarrister permission (#4499)

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

* DFPL-1352: Add migration to set sendToCtsc to true (#4288)

* DFPL-1352: Add migration to set sendToCtsc to true

* Fix merge conflicts

* DFPL-1612: Remove UDO from case (#4506)

* DFPL-1612: Remove UDO from case

* add UUID and remove filename

* change to use substring of 32

* remove unused import

* checkstyle

* checkstyle 2

* checkstyle 3

* add additional test

* fix test to use correct directions order

* Add migration for DFPL-1616

* remove field entirely

* DFPL-1533: Remove generic solicitor IDAM role from accessing non-LA event (#4496)

* DFPL-1533: Remove generic solicitor IDAM role from accessing non-LA event

* DFPL-1533: Revert more event permission changes

---------

Co-authored-by: Braimah101 <41795070+Braimah101@users.noreply.github.com>

* Fix merge conflict issues

* DFPL-702 Global search Migration (#3737)

* DPFL-779 Reduce number of case data fields

* DFPL-779 fix lombok bug with jsonunwrapped

* remove commented code

* DFPL-702 Global Search

* Remove caseNamePublic and caseNameHmctsRestricted. Set caseManagementCategory.

* Set supplementary data in migration script

* remove comments

* update region_id and epimmsid to court

* missing cardiff

* migrating caseManagementLocation

* update test

* missing ccd configuration for new fields

* GlobalSearchMigrationAPITest

* update court to caseManagementLocation

* missing required court JSON

* method renamed

* remove GlobalSearchMigrationApiTest and test case fine tuning

* Fixing checkstyle

* revert

* update submodule commit

* revert

* rollback

* remove caseNameHmctsRestricted and caseNamePublic

* update migration script to use orders.court before outer court.

* Add missing roles defined in CaseRoles.json

* resolve merge conflicts

* checkstyle fix

* fixing checkstyle

* Fix test cases

* check null

* Duplicated MockBean for CoreCaseDataApiV2

* checkstyle fix

* Fix wrongly merged

* Change to caseTypeID

* Fix test case

* update constants according to changed configuration

* bypass the internal error

* linked to fpla-docker branch DFPL-702

* skip test

* update migration script after resolving conflicts

* update after resolving conflicts

* add back test case 985

* method relocation

* update method position

* resolving conflicts

* resolving conflicts

* checkstyle issue

* checkstyle issue

* checkstyle

* checkstyle issue

* update fpla-docker subproject commit

* revert for global search migration

* rollback script for the migration script

* add back SearchCriteria.json and SearchParty.json

* Changes for code review

* Remove fields not set to null

* fix tests

* fix checkstyle

* Use latest 'fpla-docker'

---------

Co-authored-by: Ashley Wong <ashley.wong@justice.gov.uk>
Co-authored-by: chak-shing-lo-justice <ChakShing.Lo@justice.gov.uk>
Co-authored-by: Chak Shing Lo <95437003+chak-shing-lo-justice@users.noreply.github.com>
Co-authored-by: Daniel Catchpole <daniel.catchpole@justice.gov.uk>

* 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-1372-AppInsights: App insights upgrade

* Bumping chart version/ fixing aliases

* 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 unused files

* fix merge conflict errors in migratecasecontroller and tests

---------

Co-authored-by: Daniel Catchpole <daniel.catchpole@justice.gov.uk>
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: SomeshRA <somesh.acharya1@hmcts.net>
Co-authored-by: SomeshRA <69344273+SomeshRA@users.noreply.github.com>
Co-authored-by: Tom Elliott <tomlaelliott@gmail.com>
Co-authored-by: hmcts-jenkins-d-to-i <62423932+hmcts-jenkins-d-to-i[bot]@users.noreply.github.com>
Co-authored-by: Braimah101 <41795070+Braimah101@users.noreply.github.com>
Co-authored-by: mokainos <72137340+mokainos@users.noreply.github.com>
Co-authored-by: taleb <tech@benouaer.com>
Co-authored-by: taleb <20416858+benouaer@users.noreply.github.com>
Co-authored-by: chak-shing-lo-justice <ChakShing.Lo@justice.gov.uk>
  • Loading branch information
20 people authored Jul 13, 2023
1 parent 9fd0d30 commit b4ed1c9
Show file tree
Hide file tree
Showing 10 changed files with 371 additions and 79 deletions.
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@

!lib/applicationinsights-agent-*.jar
!lib/AI-Agent.xml

!lib/applicationinsights.json
!build/libs/*.jar
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG APP_INSIGHTS_AGENT_VERSION=3.4.12

FROM hmctspublic.azurecr.io/base/java:17-distroless
FROM hmctspublic.azurecr.io/base/java:11-distroless

EXPOSE 4000

Expand Down
7 changes: 3 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ plugins {
id 'org.owasp.dependencycheck' version '8.0.2' apply true
}

java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
allprojects {
sourceCompatibility = '11'
targetCompatibility = '11'
}

repositories {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
[
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "SearchCriteria",
"UserRoles": [
"[LASOLICITOR]",
"[LAMANAGING]",
"[EPSMANAGING]",
"[LASHARED]",
"[BARRISTER]",
"[CAFCASSSOLICITOR]",

"[SOLICITOR]", "[SOLICITORA]", "[SOLICITORB]", "[SOLICITORC]", "[SOLICITORD]",
"[SOLICITORE]", "[SOLICITORF]", "[SOLICITORG]", "[SOLICITORH]", "[SOLICITORI]", "[SOLICITORJ]",
"[CHILDSOLICITORA]", "[CHILDSOLICITORB]", "[CHILDSOLICITORC]", "[CHILDSOLICITORD]",
"[CHILDSOLICITORE]", "[CHILDSOLICITORF]", "[CHILDSOLICITORG]", "[CHILDSOLICITORH]",
"[CHILDSOLICITORI]", "[CHILDSOLICITORJ]", "[CHILDSOLICITORK]", "[CHILDSOLICITORL]",
"[CHILDSOLICITORM]", "[CHILDSOLICITORN]", "[CHILDSOLICITORO]",

"caseworker-publiclaw-cafcass",
"caseworker-publiclaw-courtadmin",
"caseworker-publiclaw-gatekeeper",
"caseworker-publiclaw-judiciary",
"caseworker-publiclaw-magistrate",
"caseworker-publiclaw-solicitor",
"caseworker-publiclaw-superuser",
"caseworker-publiclaw-systemupdate"
],
"CRUD": "R"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "caseNameHmctsInternal",
"UserRoles": [
"[LASOLICITOR]",
"[LAMANAGING]",
"[EPSMANAGING]",
"[LASHARED]",
"[BARRISTER]",
"[CAFCASSSOLICITOR]",

"[SOLICITOR]", "[SOLICITORA]", "[SOLICITORB]", "[SOLICITORC]", "[SOLICITORD]",
"[SOLICITORE]", "[SOLICITORF]", "[SOLICITORG]", "[SOLICITORH]", "[SOLICITORI]", "[SOLICITORJ]",
"[CHILDSOLICITORA]", "[CHILDSOLICITORB]", "[CHILDSOLICITORC]", "[CHILDSOLICITORD]",
"[CHILDSOLICITORE]", "[CHILDSOLICITORF]", "[CHILDSOLICITORG]", "[CHILDSOLICITORH]",
"[CHILDSOLICITORI]", "[CHILDSOLICITORJ]", "[CHILDSOLICITORK]", "[CHILDSOLICITORL]",
"[CHILDSOLICITORM]", "[CHILDSOLICITORN]", "[CHILDSOLICITORO]",

"caseworker-publiclaw-cafcass",
"caseworker-publiclaw-courtadmin",
"caseworker-publiclaw-gatekeeper",
"caseworker-publiclaw-judiciary",
"caseworker-publiclaw-magistrate",
"caseworker-publiclaw-solicitor",
"caseworker-publiclaw-superuser",
"caseworker-publiclaw-systemupdate"
],
"CRUD": "R"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "caseManagementLocation",
"UserRoles": [
"[LASOLICITOR]",
"[LAMANAGING]",
"[EPSMANAGING]",
"[LASHARED]",
"[BARRISTER]",
"[CAFCASSSOLICITOR]",

"[SOLICITOR]", "[SOLICITORA]", "[SOLICITORB]", "[SOLICITORC]", "[SOLICITORD]",
"[SOLICITORE]", "[SOLICITORF]", "[SOLICITORG]", "[SOLICITORH]", "[SOLICITORI]", "[SOLICITORJ]",
"[CHILDSOLICITORA]", "[CHILDSOLICITORB]", "[CHILDSOLICITORC]", "[CHILDSOLICITORD]",
"[CHILDSOLICITORE]", "[CHILDSOLICITORF]", "[CHILDSOLICITORG]", "[CHILDSOLICITORH]",
"[CHILDSOLICITORI]", "[CHILDSOLICITORJ]", "[CHILDSOLICITORK]", "[CHILDSOLICITORL]",
"[CHILDSOLICITORM]", "[CHILDSOLICITORN]", "[CHILDSOLICITORO]",

"caseworker-publiclaw-cafcass",
"caseworker-publiclaw-courtadmin",
"caseworker-publiclaw-gatekeeper",
"caseworker-publiclaw-judiciary",
"caseworker-publiclaw-magistrate",
"caseworker-publiclaw-solicitor",
"caseworker-publiclaw-superuser",
"caseworker-publiclaw-systemupdate"
],
"CRUD": "R"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "caseManagementCategory",
"UserRoles": [
"[LASOLICITOR]",
"[LAMANAGING]",
"[EPSMANAGING]",
"[LASHARED]",
"[BARRISTER]",
"[CAFCASSSOLICITOR]",

"[SOLICITOR]", "[SOLICITORA]", "[SOLICITORB]", "[SOLICITORC]", "[SOLICITORD]",
"[SOLICITORE]", "[SOLICITORF]", "[SOLICITORG]", "[SOLICITORH]", "[SOLICITORI]", "[SOLICITORJ]",
"[CHILDSOLICITORA]", "[CHILDSOLICITORB]", "[CHILDSOLICITORC]", "[CHILDSOLICITORD]",
"[CHILDSOLICITORE]", "[CHILDSOLICITORF]", "[CHILDSOLICITORG]", "[CHILDSOLICITORH]",
"[CHILDSOLICITORI]", "[CHILDSOLICITORJ]", "[CHILDSOLICITORK]", "[CHILDSOLICITORL]",
"[CHILDSOLICITORM]", "[CHILDSOLICITORN]", "[CHILDSOLICITORO]",

"caseworker-publiclaw-cafcass",
"caseworker-publiclaw-courtadmin",
"caseworker-publiclaw-gatekeeper",
"caseworker-publiclaw-judiciary",
"caseworker-publiclaw-magistrate",
"caseworker-publiclaw-solicitor",
"caseworker-publiclaw-superuser",
"caseworker-publiclaw-systemupdate"
],
"CRUD": "R"
}
]
1 change: 1 addition & 0 deletions ccd-definition/CaseEvent/CareSupervision/MultiState.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"PostConditionState": "*",
"SecurityClassification": "Public",
"CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/callback/migrate-case/about-to-submit",
"CallBackURLSubmittedEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/callback/migrate-case/submitted",
"Comment": "Event is triggered by running migration tool - callback modifies the data."
},
{
Expand Down
3 changes: 2 additions & 1 deletion charts/fpl-case-service/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,8 @@ java:
- ctsc-inbox
- ctsc-team-lead-inbox
- AppInsightsInstrumentationKey
- app-insights-connection-string
- name: app-insights-connection-string
alias: app-insights-connection-string
- scheduler-db-password
- rcj-family-high-court-inbox
- court-to-court-admin-mapping
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,8 @@ void shouldTransferToOrdinaryCourt() {
.localAuthoritiesEventData(eventData)
.build();

final CaseData updatedCaseData = extractCaseData(postAboutToSubmitEvent(initialCaseData));
final AboutToStartOrSubmitCallbackResponse resp = postAboutToSubmitEvent(initialCaseData);
final CaseData updatedCaseData = extractCaseData(resp);

Court currentCourt = updatedCaseData.getCourt();
assertThat(currentCourt.getCode()).isEqualTo("384");
Expand All @@ -448,6 +449,8 @@ void shouldTransferToOrdinaryCourt() {
assertThat(lastCourt.getCode()).isEqualTo(COURT_1.getCode());
assertThat(updatedCaseData.getDfjArea()).isEqualTo(dfjAreaCourtMapping.getDfjArea());
assertThat(updatedCaseData.getCourtField()).isNull();
assertThat(resp.getData()).extracting("caseManagementLocation")
.extracting("baseLocation", "region").containsExactly("637145", "7");
}

@Test
Expand Down
Loading

0 comments on commit b4ed1c9

Please sign in to comment.