Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
DFPL-1682 Need to be able to select both a C1 with supplement applica…
…tion and a C110a application (#4995) * DFPL-CFV FPL-CFV- Feature Branch (#4678) * simplified test cases * Capture uploaderCaseRoles when uploading new documents * Fixing JSON to use MultiSelectList instead of Collection * List<CaseRole> to List<String> * Revert "List<CaseRole> to List<String>" This reverts commit f45188c. * Fix test cases. * Use uploaderCaseRoles to determine the right of removing documents. * capture uploaderCaseRoles for the placement response case * Showing placementResponse to the dropdown list * Logic for removing placementNoticeDocument * Add revokeCaseAccess to TestingSupportController * Grant CU permission for judiciary to CaseSummary * Grant "U" access to judiciary * Add placement response option for admin * Grant U to magistrate * missing final modifier * test case for buildDocumentTypeDynamicListForRemoval * prevent NPE * more test cases for buildDocumentTypeDynamicListForRemoval * add test cases to increase code coverage. * simplified * More test cases for DocumentType. * test case for getFieldNameOfRemovedList * simplified test case * code tidy up * Make use of toList() * making use of toList() * test case for no document available * missing assertThat * add test cases on toJsonFieldName * revert * DFPL-1493 CFV - Further application documents (#4642) * Documents filed on issue and Threshold * Care plan * permission settings * migrate scripts for application documents * Migration case tests * migration script for mixed application documents * rollback script and its test case * MigrateCaseController for testing * remove an extra line * remove 1401 test case * hide documents from `applicationDocuments` * fixiing permission issues * deprecated applicationDocuments * DEPRECATED applicationDocuments * remove unused methods * remove unused test cases * checkstyle * Added swetList, socialWorkChronList, genogramList, checklistDocList, birthCertList and otherDocFiledList * update test cases * Fixing test cases * revert migratCaseController --------- Co-authored-by: Ashley Wong <ashley.wong@justice.gov.uk> * Missing new fields for documents created on DFPL-1493 * Revert commented codes * Sara confirmed the placement responses are viewable by everyone. * Sara confirmed placementResponses are viewable by everyone. * missing permission for solicitors on some of the documents. * add test case for removeDocuments * more test cases * updated test cases * test cases for removing caseSummary * Test case for removing placementResponses * code smell. * Clean up - making use of anyMatch * Code cleanup * Code smell - making use of anyMatch * Unit tests for REMOVE_DOCUMENT action. * Add translation requirement option * Missing translationRequirements in PlacementResponse * add back constructors * Remove unnecessary file. * Revert "add revokeCaseAccess" This reverts commit 8aab026f5704bfac369800725330f092fa8b7a1f. * Consolidated migration scripts. * checkstyle * add a checking to prevent the migration being performed twice. * use remove instead * Grant superuser with CRUD for the purpose of rollback script * Remove property if the collection is an empty list. * Remove property if the collection is an empty list in rollback script. * Revoke R access from respondentStatements * Revoke R access from respondentStatements * Resolving code review conversation. * Rename the event name * Check NPE * Created MigratCFVService * Add test cases for the MigrateCaseController * Fix court bundle issue on migration * Deprecated courtBundleNC * Checkstyle * Updated due to deprecate courtBundleNC * Rename manage document to (OLD) Manage document * Fixed test cases * Squashed commit of the following: commit e1d682f Merge: c820d53 60ab818 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Mon Sep 4 15:09:17 2023 +0100 Merge remote-tracking branch 'origin/DFPL-1464' into DFPL-1609 commit c820d53 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Wed Aug 30 18:34:31 2023 +0100 update cafcass noti mapping commit d0cd924 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Wed Aug 30 16:28:55 2023 +0100 fix code style check commit e6f8739 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Wed Aug 30 16:19:33 2023 +0100 remove temporary skip logic in unit test commit b1ab719 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Wed Aug 30 16:16:22 2023 +0100 remove temporary skip logic commit 0395efc Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Wed Aug 30 13:11:57 2023 +0100 remove extra line commit 730e552 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Wed Aug 30 12:41:35 2023 +0100 rollback toList commit 0b45987 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Wed Aug 30 12:05:54 2023 +0100 update test commit 40c4f79 Merge: d5be137 ab7db77 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Wed Aug 30 11:26:04 2023 +0100 Merge branch 'DFPL-1464' into DFPL-1609 commit d5be137 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Wed Aug 30 11:25:41 2023 +0100 fix check style commit 2ff8fdc Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Wed Aug 30 10:57:33 2023 +0100 fix comment commit 56d4a38 Merge: 1bca23c 97414f1 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Tue Aug 29 12:48:09 2023 +0100 Merge branch 'DFPL-1464' into DFPL-1609 commit 1bca23c Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Tue Aug 29 10:31:00 2023 +0100 fix code check commit 40d662a Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Tue Aug 29 10:09:12 2023 +0100 update translation commit 9038f94 Merge: b055206 fc82de3 Author: Chak Shing Lo <95437003+chak-shing-lo-justice@users.noreply.github.com> Date: Tue Aug 29 09:41:44 2023 +0100 Merge branch 'DFPL-1464' into DFPL-1609 commit b055206 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Thu Aug 24 17:49:54 2023 +0100 add log for future debugging commit 80cbd8a Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Thu Aug 24 17:24:16 2023 +0100 update cafcass mapping commit f41ba62 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Wed Aug 23 23:11:12 2023 +0100 fix cafcass doc description commit 62da755 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Wed Aug 23 19:18:35 2023 +0100 backward compatible cafcass email provider commit f11bedf Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Wed Aug 23 19:13:42 2023 +0100 update cafcass category list commit 6c3319c Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Wed Aug 23 18:49:51 2023 +0100 update cafcass noti logic commit 95ddc4a Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Wed Aug 23 13:30:23 2023 +0100 controller unit test commit 83b0705 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Wed Aug 23 12:24:04 2023 +0100 fix bug commit a4ff5a4 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Wed Aug 23 11:47:44 2023 +0100 update translation commit a6f0c48 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Tue Aug 22 18:15:01 2023 +0100 fix code check and unit test commit f8ce4f7 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Tue Aug 22 17:03:50 2023 +0100 update handler unit test commit 48c664a Merge: f715b39 8158d4b Author: Chak Shing Lo <95437003+chak-shing-lo-justice@users.noreply.github.com> Date: Tue Aug 22 11:35:56 2023 +0100 Merge branch 'DFPL-1464' into DFPL-1609 commit f715b39 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Tue Aug 22 11:24:39 2023 +0100 fix send by post sending hearing document commit 17045c0 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Mon Aug 21 21:54:16 2023 +0100 update document uploaded unit test commit 25b5d47 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Mon Aug 21 20:12:39 2023 +0100 update handler unit test commit 36560f3 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Thu Aug 17 17:24:16 2023 +0100 fix after resolving conflict commit 05334d2 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Thu Aug 17 17:20:43 2023 +0100 update notification logic commit f42299c Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Thu Aug 17 17:19:55 2023 +0100 revert sonarqube commit a30c931 Merge: e322219 9f35d24 Author: Chak Shing Lo <95437003+chak-shing-lo-justice@users.noreply.github.com> Date: Thu Aug 17 17:17:59 2023 +0100 Merge branch 'DFPL-1464' into DFPL-1609 commit e322219 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Mon Aug 14 17:08:52 2023 +0100 skip sonarqube for testing commit f97e8b0 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Mon Aug 14 17:02:39 2023 +0100 fix getting new document uploaded commit 3a30a19 Merge: d5409e8 d7a0447 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Mon Aug 14 12:52:11 2023 +0100 Merge branch 'DFPL-1464' into DFPL-1609 commit d5409e8 Merge: 3c83c27 a1e4c78 Author: Chak Shing Lo <95437003+chak-shing-lo-justice@users.noreply.github.com> Date: Fri Aug 11 10:27:23 2023 +0100 Merge branch 'DFPL-1464' into DFPL-1609 commit 3c83c27 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Wed Aug 9 16:38:20 2023 +0100 ObjectHelperTest commit 73a4261 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Tue Aug 8 17:43:06 2023 +0100 update publish event commit 2844ccf Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Tue Aug 8 15:55:34 2023 +0100 update interface NotifyDocumentUploaded commit 518effc Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Tue Aug 8 15:29:38 2023 +0100 update comment commit ce330b7 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Tue Aug 8 15:28:18 2023 +0100 update comment and default config commit a0258d0 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Tue Aug 8 15:12:11 2023 +0100 update comment commit e0ffe38 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Tue Aug 8 14:41:17 2023 +0100 update comment commit cba1a89 Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Tue Aug 8 14:10:03 2023 +0100 remove unused comment commit f90167d Author: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Date: Tue Aug 8 14:04:33 2023 +0100 new managedDoc handler for sending document uploaded noti * Fix Field Not Recognised error * add missing properties of applicationDocuments * add missing new fields * Fix wrong category for expert reports * Revoke R access to hearingFurtherEvidenceDocuments * Migration tests * Hide documents * update fpla-docker to master * Fix court bundle rollback script * Checkstyle * Categorise Sealed CMO to Order * Missing manage document instruction in demo * remove an extra blank line * remove logic which is not needed. * Set lastUploadedOrder to be non-readable since previously it is set to be DO_NOT_SHOW using FieldShowCondition. * added caseSummaryListBackup * Categorise documents under `urgentHearingOrder` field to category: "Orders". And hide "unsealedOrder" by setting authorisation setting. * Categorise supporting documents under CMO to category "Orders" * Fix applicationDocuments cannot be removed after migration. * Keep positionStatementRespondentListV2 and positionStatementChildListV2 * backup skeltonArgumentList * Fix test case * rollback some line changes * Revoke read access of "ordersToBeSent" field. * Fix issues on CAFCASS permission * Hide document tab and hearing document tab. * Remove access of old manage documents event. * Suppress unused graph ql vuln * DFPL-1775 Upload journey -updated event for Cafcass England & Cyrmu (#4727) * Enable CAFCASS to upload document * Enable cafcass user to upload/remove documents * updated unit tests * Fix test cases --------- Co-authored-by: Ashley Wong <ashley.wong@justice.gov.uk> * Remove done migraitons * add back removed import * DFPL 1609 / DFPL-1730 New Upload Document Notification- Cafcass England & Cyrmu (#4774) * new managedDoc handler for sending document uploaded noti * remove unused comment * update comment * update comment * update comment and default config * update comment * update interface NotifyDocumentUploaded * update publish event * ObjectHelperTest * fix getting new document uploaded * skip sonarqube for testing * revert sonarqube * update notification logic * fix after resolving conflict * update handler unit test * update document uploaded unit test * fix send by post sending hearing document * update handler unit test * fix code check and unit test * update translation * fix bug * controller unit test * update cafcass noti logic * update cafcass category list * backward compatible cafcass email provider * fix cafcass doc description * update cafcass mapping * add log for future debugging * update translation * fix code check * fix comment * fix check style * update test * rollback toList * remove extra line * remove temporary skip logic * remove temporary skip logic in unit test * fix code style check * update cafcass noti mapping * Update dependency @babel/core to v7.23.2 (#4769) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency codeceptjs to v3.5.6 (#4771) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Update dependency com.fasterxml.jackson.datatype:jackson-datatype-joda to v2.15.3 (#4773) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix not notifying Cafcass welsh * fix not notifying cafcass welsh * revert changes after merge * revert changes after merge * revert changes after merge * revert changes after merge --------- Co-authored-by: Ashley Wong <ashley.wong@justice.gov.uk> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * Adding postgres upgrade work to this branch, so demo can be used for initial config and testing * fix delimiter when familyman number is null (#4820) * Revert "fix delimiter when familyman number is null (#4820)" This reverts commit 52af2c2. * Revert "Adding postgres upgrade work to this branch, so demo can be used for initial config and testing" This reverts commit c7911b9. --------- Co-authored-by: Ashley Wong <ashley.wong@justice.gov.uk> Co-authored-by: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Co-authored-by: Daniel Catchpole <daniel.catchpole@justice.gov.uk> Co-authored-by: Chak Shing Lo <95437003+chak-shing-lo-justice@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: jamesrferguson1 <94848497+jamesrferguson1@users.noreply.github.com> Co-authored-by: Paul Trelease <paul.trelease@justice.gov.uk> * Resolved code conflict error. * missing curly bracket. * Remove unused imports. * DFPL-1902 - Data Migration for FurtherEvidenceDocument without Document Type (#4909) * Fixing issue without document type * remove unnecessary code. * temporary enable the old manage doc menu. * Logic for validating the counts * remove blank lines * Add rollback script and fix test cases * add missing test * add missing method * validate the response data * remove unnecessary codes. * update test case * Logic for validating position statements * logic for validating respondent statement * logic for validating correspondence documents * logic for validating application documents * Logic for validating migrated court bundle * checkstyle * added unit tests * added unit tests * updated test cases * increase test coverage * unit test for validating respondent statement migrations * unit tests for validting correspondence documents * Unit test for validating application documents * typo * Fixing court bundle validate migration logic and add its test cases. * fine tuning * remove an extra line * Revert "temporary enable the old manage doc menu." This reverts commit 0196807. * simplifying * tidy up * checkstyle * Capitalised * Moving old documents to archived migrated data category e.g. documents_socialWorkChronology_document * Temporary enable the old manage doc menu for Charles’ testing. * remove unnecessary codes. * Hide "Correspondence" tab as those documents can be viewed in CFV. * Bug fix on typo * Logic for moving migrated documents to archived migrated data. * Logic for moving migrated documents to archived migrated data. * Revert "Temporary enable the old manage doc menu for Charles’ testing." This reverts commit 167d058. * typo * add unit tests for the new methods * Test cases and fixes. * using doesNotContain instead of extracting the property and check isNull * checkstyle fix * unit test cases * missing import * checkstyle fix * Fix test cases. * DFPL-1902: Correct merge error in commit bf9c4a9 * DFPL-1902: Added missing Util.UUID import --------- Co-authored-by: Ashley Wong <ashley.wong@justice.gov.uk> Co-authored-by: Paul Trelease <paul.trelease@justice.gov.uk> * WIP Updating Task List * adding c1Application field to caseData in order to control the event dropdown list * wip * wip * checkstyle * add missing AuthorisationCaseField entry * Fix unit tests * rearrange the code changes order. * Add checkbox for removing submitted C1 application with supplement * Capturing document uploader type and case roles. And clear submittedC1WithSupplement when changing order types. * update permission settings * Fix test case TaskListControllerSubmittedTest * checkstyle * Fix EventsCheckerTest * Add unit tests for OrdersNeededController * Remove @Autowired * Move logic to EnterC1WithSupplementController. * checkstyle * Checkstyle * Add test case for C1WithSupplementChecker * add test case * Setting default value * Code coverage * Add TaskListServiceTest * Test case on about-to-start controller * add case for clearSubmittedC1WithSupplement * add emptiness checkings. * add one more case * simplifed * resolving code smell. * into a single statement. * switch to single statement * Fix wrong category * Resolve merging error. --------- Co-authored-by: Ashley Wong <ashley.wong@justice.gov.uk> Co-authored-by: Chak Shing, Lo <ChakShing.Lo@justice.gov.uk> Co-authored-by: Daniel Catchpole <daniel.catchpole@justice.gov.uk> Co-authored-by: Chak Shing Lo <95437003+chak-shing-lo-justice@users.noreply.github.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: jamesrferguson1 <94848497+jamesrferguson1@users.noreply.github.com> Co-authored-by: Paul Trelease <paul.trelease@justice.gov.uk> Co-authored-by: Braimah101 <41795070+Braimah101@users.noreply.github.com>
- Loading branch information
9 people
authored
Feb 1, 2024
1 parent
74742ea
commit 48b2635