From 1bfacf2fc5dcd1803974fd9b708562910ded9a64 Mon Sep 17 00:00:00 2001 From: ElifDenizEsea <61947470+ElifDenizEsea@users.noreply.github.com> Date: Wed, 31 Jan 2024 17:57:51 +0000 Subject: [PATCH] CIV-11256 claimant dashboard status (#3637) * CIV-11256 Updating the claimant dashboard status messages * CIV-11256 Tests fixed * CIV-11571 Fix court location if no specific court (#3569) * CIV-11571: Add null checking * CIV-11571: Add unit test --------- Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> * CIV-8241 Manual Determination - Lip Notifications (#3529) * added changes for claimant response cui event. * CIV-8291 : Functional code - Need to refactor * CIV-8291 : Refactor duplicated methods to a common service * CIV-8291 : Handler Test * CIV-8291 : Fix checkStyle * CIV-8291 : Fix checkStyle * CIV-8291 : Adding mocks * CIV-8291 : Adding mocks * CIV-8291 : Adding mocks * CIV-8291 : Change final state to PROCEEDS_IN_HERITAGE_SYSTEM * CIV-8291 : Dev comments * CIV-8291 : Dev comments * CIV-8291 : Dev comments * CIV-8291 : Dev comments * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification Test * CIV-8241: Set Up Notification Test * CIV-8241: Roll back one line * CIV-8241: Change method name * Update build.gradle * Update build.gradle --------- Co-authored-by: neeta-hmcts Co-authored-by: sankhajuria Co-authored-by: hmcts-version1-pablo <107927784+hmcts-version1-pablo@users.noreply.github.com> Co-authored-by: Pablo Ortiz Co-authored-by: Raja Mani Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> * Update CmcClaim.java * Update CcdDashboardClaimantClaimMatcher.java * CIV-10727 Assisted order uplift (#3550) * CIV-11158 Save hearing location in case data * Added setting assisted order courtLocation to hearingLocation or caseManagementLocation is hearingLocation is not defined * Fixed not filtering courtLocations by caseTypeId --------- Co-authored-by: sankaviv1 Co-authored-by: sankaviv1 <95748224+sankaviv1@users.noreply.github.com> Co-authored-by: GarethLancaster <31533575+Gareth40342@users.noreply.github.com> Co-authored-by: douglasrice * CIV-11695 - Update ClaimantResponseCuiCallbackHandler.java (#3616) * Update ClaimantResponseCuiCallbackHandler.java * fix for judicial referral * fixed claim state issue and unit tests. --------- Co-authored-by: neeta-hmcts <115545612+neeta-hmcts@users.noreply.github.com> Co-authored-by: neeta-hmcts Co-authored-by: Pablo Ortiz Co-authored-by: annika-moorthy <85934693+annika-moorthy@users.noreply.github.com> * CIV-8905 Claimant Dashboard Status "Mediation E2E, Manual Determination (org), ITP failed" (#3564) * CIV-8905 Added functionality for dashboard status * CIV-8905 Added functionality for dashboard status * CIV-8905 Fixed AC 4 * CIV-11363 add trigger event (#3633) * CIV-11363 add trigger event * CIV-8905 Merged with bulk_tasks --------- Co-authored-by: Pablo Ortiz Co-authored-by: MMNycz <94067802+MMNycz@users.noreply.github.com> * CIV-8454 Trigger service request after CCD case creation (#3597) * CIV-8454 Trigger service request after CCD case creation * CIV-8454 Move Service Request creation to Camunda * CIV-8454 Undo flow state change - not required * CIV-8454 Remove empty lines * CIV-8454 Add test for service request handler CUI * CIV-8454 Only create service request when no help with fees * CIV-8454 Change event name * CIV-11144 updated witness summary to add date (#3623) * updated witness summary to add date * Update Jenkinsfile_CNP point at CCD * Update Jenkinsfile_CNP * CIV-11363 add caseId to caseIdForRetrigger.txt (#3646) * CIV-11363 add caseId to caseIdForRetrigger.txt * adding not suitable for sdo too * update caseIdForRetriger --------- Co-authored-by: Astha Malviya * testing master build (#3650) Co-authored-by: sankhajuria --------- Co-authored-by: Raja Mani Co-authored-by: drummondjm <93932689+drummondjm@users.noreply.github.com> Co-authored-by: MMNycz <94067802+MMNycz@users.noreply.github.com> Co-authored-by: Astha Malviya Co-authored-by: asthamalviya <104994907+asthamalviya@users.noreply.github.com> Co-authored-by: sankhajuria Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> * CIV-11256 merge bulk_tasks * CIV-11256 Merge master * CIV-11697 Notify Defendant LiP claimant is now represented (#3838) * CIV-11699 added organisation policy for triggering NOC * CIV-11603 Fast Track Claimant Intent (#3720) * CIV-11571 Fix court location if no specific court (#3569) * CIV-11571: Add null checking * CIV-11571: Add unit test --------- Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> * CIV-8241 Manual Determination - Lip Notifications (#3529) * added changes for claimant response cui event. * CIV-8291 : Functional code - Need to refactor * CIV-8291 : Refactor duplicated methods to a common service * CIV-8291 : Handler Test * CIV-8291 : Fix checkStyle * CIV-8291 : Fix checkStyle * CIV-8291 : Adding mocks * CIV-8291 : Adding mocks * CIV-8291 : Adding mocks * CIV-8291 : Change final state to PROCEEDS_IN_HERITAGE_SYSTEM * CIV-8291 : Dev comments * CIV-8291 : Dev comments * CIV-8291 : Dev comments * CIV-8291 : Dev comments * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification Test * CIV-8241: Set Up Notification Test * CIV-8241: Roll back one line * CIV-8241: Change method name * Update build.gradle * Update build.gradle --------- Co-authored-by: neeta-hmcts Co-authored-by: sankhajuria Co-authored-by: hmcts-version1-pablo <107927784+hmcts-version1-pablo@users.noreply.github.com> Co-authored-by: Pablo Ortiz Co-authored-by: Raja Mani Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> * CIV-10727 Assisted order uplift (#3550) * CIV-11158 Save hearing location in case data * Added setting assisted order courtLocation to hearingLocation or caseManagementLocation is hearingLocation is not defined * Fixed not filtering courtLocations by caseTypeId --------- Co-authored-by: sankaviv1 Co-authored-by: sankaviv1 <95748224+sankaviv1@users.noreply.github.com> Co-authored-by: GarethLancaster <31533575+Gareth40342@users.noreply.github.com> Co-authored-by: douglasrice * CIV-11695 - Update ClaimantResponseCuiCallbackHandler.java (#3616) * Update ClaimantResponseCuiCallbackHandler.java * fix for judicial referral * fixed claim state issue and unit tests. --------- Co-authored-by: neeta-hmcts <115545612+neeta-hmcts@users.noreply.github.com> Co-authored-by: neeta-hmcts Co-authored-by: Pablo Ortiz Co-authored-by: annika-moorthy <85934693+annika-moorthy@users.noreply.github.com> * CIV-8905 Claimant Dashboard Status "Mediation E2E, Manual Determination (org), ITP failed" (#3564) * CIV-8905 Added functionality for dashboard status * CIV-8905 Added functionality for dashboard status * CIV-8905 Fixed AC 4 * CIV-11363 add trigger event (#3633) * CIV-11363 add trigger event * CIV-8905 Merged with bulk_tasks --------- Co-authored-by: Pablo Ortiz Co-authored-by: MMNycz <94067802+MMNycz@users.noreply.github.com> * CIV-8454 Trigger service request after CCD case creation (#3597) * CIV-8454 Trigger service request after CCD case creation * CIV-8454 Move Service Request creation to Camunda * CIV-8454 Undo flow state change - not required * CIV-8454 Remove empty lines * CIV-8454 Add test for service request handler CUI * CIV-8454 Only create service request when no help with fees * CIV-8454 Change event name * CIV-11144 updated witness summary to add date (#3623) * updated witness summary to add date * Update Jenkinsfile_CNP point at CCD * Update Jenkinsfile_CNP * CIV-11363 add caseId to caseIdForRetrigger.txt (#3646) * CIV-11363 add caseId to caseIdForRetrigger.txt * adding not suitable for sdo too * update caseIdForRetriger --------- Co-authored-by: Astha Malviya * testing master build (#3650) Co-authored-by: sankhajuria --------- Co-authored-by: Raja Mani Co-authored-by: drummondjm <93932689+drummondjm@users.noreply.github.com> Co-authored-by: MMNycz <94067802+MMNycz@users.noreply.github.com> Co-authored-by: Astha Malviya Co-authored-by: asthamalviya <104994907+asthamalviya@users.noreply.github.com> Co-authored-by: sankhajuria Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> * CIV-11603 Set Up Case State * CIV-11603 Set Up Translation * CIV-11603 Update Mediation Check * CIV-11603 Remove unused import * CIV-11603 Update Unit Test * CIV-11603 Adding more unit test * CIV-11603 Update from review * CIV-11603 Merged with master --------- Co-authored-by: jarekPierchala Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> Co-authored-by: neeta-hmcts Co-authored-by: sankhajuria Co-authored-by: hmcts-version1-pablo <107927784+hmcts-version1-pablo@users.noreply.github.com> Co-authored-by: Pablo Ortiz Co-authored-by: Raja Mani Co-authored-by: Gareth Lancaster <90632240+Gareth40343@users.noreply.github.com> Co-authored-by: sankaviv1 Co-authored-by: sankaviv1 <95748224+sankaviv1@users.noreply.github.com> Co-authored-by: GarethLancaster <31533575+Gareth40342@users.noreply.github.com> Co-authored-by: douglasrice Co-authored-by: jeswanth-hmcts <134285996+jeswanth-hmcts@users.noreply.github.com> Co-authored-by: neeta-hmcts <115545612+neeta-hmcts@users.noreply.github.com> Co-authored-by: annika-moorthy <85934693+annika-moorthy@users.noreply.github.com> Co-authored-by: marianadpereira Co-authored-by: Manish Garg Co-authored-by: MMNycz <94067802+MMNycz@users.noreply.github.com> Co-authored-by: Paul Pearson <46532983+paul-pearson@users.noreply.github.com> Co-authored-by: drummondjm <93932689+drummondjm@users.noreply.github.com> Co-authored-by: Astha Malviya Co-authored-by: asthamalviya <104994907+asthamalviya@users.noreply.github.com> Co-authored-by: Harry H <33700332+HarryH96@users.noreply.github.com> Co-authored-by: marianadpereira <71711509+marianadpereira@users.noreply.github.com> * CIV-11697 Adding Template * CIV-11523 Revoking access to claim for claimant LiP after NoC and representative assigned * CIV-11697 Set Up Case Event, Handler * CIV-11694 Adding Template for CIV-11694 * CIV-11697 Update Name * CIV-11697 Update civil commons * CIV-11697 Update stitching * CIV-11697 Update template for civil commons * CIV-11697 build error * CIV-11694 added code claimant notification afet noc approval * CIV-0000 Update from master * Update CreateClaimLipCallBackHandler.java fixed typo error * CIV-11697 Update from master civil-commons --------- Co-authored-by: jeswanth Co-authored-by: jeswanth-hmcts <134285996+jeswanth-hmcts@users.noreply.github.com> Co-authored-by: jarekPierchala Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> Co-authored-by: neeta-hmcts Co-authored-by: sankhajuria Co-authored-by: hmcts-version1-pablo <107927784+hmcts-version1-pablo@users.noreply.github.com> Co-authored-by: Pablo Ortiz Co-authored-by: Raja Mani Co-authored-by: Gareth Lancaster <90632240+Gareth40343@users.noreply.github.com> Co-authored-by: sankaviv1 Co-authored-by: sankaviv1 <95748224+sankaviv1@users.noreply.github.com> Co-authored-by: GarethLancaster <31533575+Gareth40342@users.noreply.github.com> Co-authored-by: douglasrice Co-authored-by: neeta-hmcts <115545612+neeta-hmcts@users.noreply.github.com> Co-authored-by: annika-moorthy <85934693+annika-moorthy@users.noreply.github.com> Co-authored-by: marianadpereira Co-authored-by: Manish Garg Co-authored-by: MMNycz <94067802+MMNycz@users.noreply.github.com> Co-authored-by: Paul Pearson <46532983+paul-pearson@users.noreply.github.com> Co-authored-by: drummondjm <93932689+drummondjm@users.noreply.github.com> Co-authored-by: Astha Malviya Co-authored-by: asthamalviya <104994907+asthamalviya@users.noreply.github.com> Co-authored-by: Harry H <33700332+HarryH96@users.noreply.github.com> Co-authored-by: marianadpereira <71711509+marianadpereira@users.noreply.github.com> * CIV-12068 CYABug (#3844) * CYA bug fix * Update CaseData.java --------- Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> * commons bump * CIV-9040 Redetermination - Interlocutory Judgement PDF (docmosis) (#3663) * CIV-9040 Updated functionality for interlocutory judgement document generation * CIV-9040 Added functionality for generate interlock doc * CIV-11571 Fix court location if no specific court (#3569) * CIV-11571: Add null checking * CIV-11571: Add unit test --------- Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> * CIV-8241 Manual Determination - Lip Notifications (#3529) * added changes for claimant response cui event. * CIV-8291 : Functional code - Need to refactor * CIV-8291 : Refactor duplicated methods to a common service * CIV-8291 : Handler Test * CIV-8291 : Fix checkStyle * CIV-8291 : Fix checkStyle * CIV-8291 : Adding mocks * CIV-8291 : Adding mocks * CIV-8291 : Adding mocks * CIV-8291 : Change final state to PROCEEDS_IN_HERITAGE_SYSTEM * CIV-8291 : Dev comments * CIV-8291 : Dev comments * CIV-8291 : Dev comments * CIV-8291 : Dev comments * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification Test * CIV-8241: Set Up Notification Test * CIV-8241: Roll back one line * CIV-8241: Change method name * Update build.gradle * Update build.gradle --------- Co-authored-by: neeta-hmcts Co-authored-by: sankhajuria Co-authored-by: hmcts-version1-pablo <107927784+hmcts-version1-pablo@users.noreply.github.com> Co-authored-by: Pablo Ortiz Co-authored-by: Raja Mani Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> * CIV-10727 Assisted order uplift (#3550) * CIV-11158 Save hearing location in case data * Added setting assisted order courtLocation to hearingLocation or caseManagementLocation is hearingLocation is not defined * Fixed not filtering courtLocations by caseTypeId --------- Co-authored-by: sankaviv1 Co-authored-by: sankaviv1 <95748224+sankaviv1@users.noreply.github.com> Co-authored-by: GarethLancaster <31533575+Gareth40342@users.noreply.github.com> Co-authored-by: douglasrice * CIV-11695 - Update ClaimantResponseCuiCallbackHandler.java (#3616) * Update ClaimantResponseCuiCallbackHandler.java * fix for judicial referral * fixed claim state issue and unit tests. --------- Co-authored-by: neeta-hmcts <115545612+neeta-hmcts@users.noreply.github.com> Co-authored-by: neeta-hmcts Co-authored-by: Pablo Ortiz Co-authored-by: annika-moorthy <85934693+annika-moorthy@users.noreply.github.com> * CIV-8905 Claimant Dashboard Status "Mediation E2E, Manual Determination (org), ITP failed" (#3564) * CIV-8905 Added functionality for dashboard status * CIV-8905 Added functionality for dashboard status * CIV-8905 Fixed AC 4 * CIV-11363 add trigger event (#3633) * CIV-11363 add trigger event * CIV-8905 Merged with bulk_tasks --------- Co-authored-by: Pablo Ortiz Co-authored-by: MMNycz <94067802+MMNycz@users.noreply.github.com> * CIV-8454 Trigger service request after CCD case creation (#3597) * CIV-8454 Trigger service request after CCD case creation * CIV-8454 Move Service Request creation to Camunda * CIV-8454 Undo flow state change - not required * CIV-8454 Remove empty lines * CIV-8454 Add test for service request handler CUI * CIV-8454 Only create service request when no help with fees * CIV-8454 Change event name * CIV-11144 updated witness summary to add date (#3623) * updated witness summary to add date * Update Jenkinsfile_CNP point at CCD * Update Jenkinsfile_CNP * CIV-11363 add caseId to caseIdForRetrigger.txt (#3646) * CIV-11363 add caseId to caseIdForRetrigger.txt * adding not suitable for sdo too * update caseIdForRetriger --------- Co-authored-by: Astha Malviya * testing master build (#3650) Co-authored-by: sankhajuria --------- Co-authored-by: Raja Mani Co-authored-by: drummondjm <93932689+drummondjm@users.noreply.github.com> Co-authored-by: MMNycz <94067802+MMNycz@users.noreply.github.com> Co-authored-by: Astha Malviya Co-authored-by: asthamalviya <104994907+asthamalviya@users.noreply.github.com> Co-authored-by: sankhajuria Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> * CIV-9040 Fixed formatting issues * CIV-9040 Fixed formatting issues * CIV-9040 Fixed formatting issues * CIV-9040 Fixed formatting issues * CIV-9040 Fixed formatting issues * CIV-9040 Added functionality for interloc document * CIV-9040 suppressed CVE-2023-33202 * CIV-9040 suppressed CVE-2023-46589 * CIV-9040 Fixed formatting issue * CIV-9040 Rebase with master * CIV-9040 Updated template * CIV-9040 updated template to include header * CIV-9040 merged with master * CIV-9040 Fixed review comments * CIV-9040 Fixed review comments * CIV-9040 updated civil commons version * CIV-9040 Fixed formatting issue * CIV-9040 Updated build gradle with civil commons * CIV-9040 Added case worker documents field * CIV-9040 Added case worker documents field * CIV-9040 reverting unwanted changes * CIV-9040 updating common jar version * CIV-9040 Merged with master and resolved conflicts * CIV-11603 Fast Track Claimant Intent (#3720) * CIV-11571 Fix court location if no specific court (#3569) * CIV-11571: Add null checking * CIV-11571: Add unit test --------- Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> * CIV-8241 Manual Determination - Lip Notifications (#3529) * added changes for claimant response cui event. * CIV-8291 : Functional code - Need to refactor * CIV-8291 : Refactor duplicated methods to a common service * CIV-8291 : Handler Test * CIV-8291 : Fix checkStyle * CIV-8291 : Fix checkStyle * CIV-8291 : Adding mocks * CIV-8291 : Adding mocks * CIV-8291 : Adding mocks * CIV-8291 : Change final state to PROCEEDS_IN_HERITAGE_SYSTEM * CIV-8291 : Dev comments * CIV-8291 : Dev comments * CIV-8291 : Dev comments * CIV-8291 : Dev comments * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification Test * CIV-8241: Set Up Notification Test * CIV-8241: Roll back one line * CIV-8241: Change method name * Update build.gradle * Update build.gradle --------- Co-authored-by: neeta-hmcts Co-authored-by: sankhajuria Co-authored-by: hmcts-version1-pablo <107927784+hmcts-version1-pablo@users.noreply.github.com> Co-authored-by: Pablo Ortiz Co-authored-by: Raja Mani Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> * CIV-10727 Assisted order uplift (#3550) * CIV-11158 Save hearing location in case data * Added setting assisted order courtLocation to hearingLocation or caseManagementLocation is hearingLocation is not defined * Fixed not filtering courtLocations by caseTypeId --------- Co-authored-by: sankaviv1 Co-authored-by: sankaviv1 <95748224+sankaviv1@users.noreply.github.com> Co-authored-by: GarethLancaster <31533575+Gareth40342@users.noreply.github.com> Co-authored-by: douglasrice * CIV-11695 - Update ClaimantResponseCuiCallbackHandler.java (#3616) * Update ClaimantResponseCuiCallbackHandler.java * fix for judicial referral * fixed claim state issue and unit tests. --------- Co-authored-by: neeta-hmcts <115545612+neeta-hmcts@users.noreply.github.com> Co-authored-by: neeta-hmcts Co-authored-by: Pablo Ortiz Co-authored-by: annika-moorthy <85934693+annika-moorthy@users.noreply.github.com> * CIV-8905 Claimant Dashboard Status "Mediation E2E, Manual Determination (org), ITP failed" (#3564) * CIV-8905 Added functionality for dashboard status * CIV-8905 Added functionality for dashboard status * CIV-8905 Fixed AC 4 * CIV-11363 add trigger event (#3633) * CIV-11363 add trigger event * CIV-8905 Merged with bulk_tasks --------- Co-authored-by: Pablo Ortiz Co-authored-by: MMNycz <94067802+MMNycz@users.noreply.github.com> * CIV-8454 Trigger service request after CCD case creation (#3597) * CIV-8454 Trigger service request after CCD case creation * CIV-8454 Move Service Request creation to Camunda * CIV-8454 Undo flow state change - not required * CIV-8454 Remove empty lines * CIV-8454 Add test for service request handler CUI * CIV-8454 Only create service request when no help with fees * CIV-8454 Change event name * CIV-11144 updated witness summary to add date (#3623) * updated witness summary to add date * Update Jenkinsfile_CNP point at CCD * Update Jenkinsfile_CNP * CIV-11363 add caseId to caseIdForRetrigger.txt (#3646) * CIV-11363 add caseId to caseIdForRetrigger.txt * adding not suitable for sdo too * update caseIdForRetriger --------- Co-authored-by: Astha Malviya * testing master build (#3650) Co-authored-by: sankhajuria --------- Co-authored-by: Raja Mani Co-authored-by: drummondjm <93932689+drummondjm@users.noreply.github.com> Co-authored-by: MMNycz <94067802+MMNycz@users.noreply.github.com> Co-authored-by: Astha Malviya Co-authored-by: asthamalviya <104994907+asthamalviya@users.noreply.github.com> Co-authored-by: sankhajuria Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> * CIV-11603 Set Up Case State * CIV-11603 Set Up Translation * CIV-11603 Update Mediation Check * CIV-11603 Remove unused import * CIV-11603 Update Unit Test * CIV-11603 Adding more unit test * CIV-11603 Update from review * CIV-11603 Merged with master --------- Co-authored-by: jarekPierchala Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> Co-authored-by: neeta-hmcts Co-authored-by: sankhajuria Co-authored-by: hmcts-version1-pablo <107927784+hmcts-version1-pablo@users.noreply.github.com> Co-authored-by: Pablo Ortiz Co-authored-by: Raja Mani Co-authored-by: Gareth Lancaster <90632240+Gareth40343@users.noreply.github.com> Co-authored-by: sankaviv1 Co-authored-by: sankaviv1 <95748224+sankaviv1@users.noreply.github.com> Co-authored-by: GarethLancaster <31533575+Gareth40342@users.noreply.github.com> Co-authored-by: douglasrice Co-authored-by: jeswanth-hmcts <134285996+jeswanth-hmcts@users.noreply.github.com> Co-authored-by: neeta-hmcts <115545612+neeta-hmcts@users.noreply.github.com> Co-authored-by: annika-moorthy <85934693+annika-moorthy@users.noreply.github.com> Co-authored-by: marianadpereira Co-authored-by: Manish Garg Co-authored-by: MMNycz <94067802+MMNycz@users.noreply.github.com> Co-authored-by: Paul Pearson <46532983+paul-pearson@users.noreply.github.com> Co-authored-by: drummondjm <93932689+drummondjm@users.noreply.github.com> Co-authored-by: Astha Malviya Co-authored-by: asthamalviya <104994907+asthamalviya@users.noreply.github.com> Co-authored-by: Harry H <33700332+HarryH96@users.noreply.github.com> Co-authored-by: marianadpereira <71711509+marianadpereira@users.noreply.github.com> * CIV-9040 Removed code for restriction of document view * CIV-11603 Fast Track Claimant Intent (#3720) * CIV-11571 Fix court location if no specific court (#3569) * CIV-11571: Add null checking * CIV-11571: Add unit test --------- Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> * CIV-8241 Manual Determination - Lip Notifications (#3529) * added changes for claimant response cui event. * CIV-8291 : Functional code - Need to refactor * CIV-8291 : Refactor duplicated methods to a common service * CIV-8291 : Handler Test * CIV-8291 : Fix checkStyle * CIV-8291 : Fix checkStyle * CIV-8291 : Adding mocks * CIV-8291 : Adding mocks * CIV-8291 : Adding mocks * CIV-8291 : Change final state to PROCEEDS_IN_HERITAGE_SYSTEM * CIV-8291 : Dev comments * CIV-8291 : Dev comments * CIV-8291 : Dev comments * CIV-8291 : Dev comments * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification Test * CIV-8241: Set Up Notification Test * CIV-8241: Roll back one line * CIV-8241: Change method name * Update build.gradle * Update build.gradle --------- Co-authored-by: neeta-hmcts Co-authored-by: sankhajuria Co-authored-by: hmcts-version1-pablo <107927784+hmcts-version1-pablo@users.noreply.github.com> Co-authored-by: Pablo Ortiz Co-authored-by: Raja Mani Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> * CIV-10727 Assisted order uplift (#3550) * CIV-11158 Save hearing location in case data * Added setting assisted order courtLocation to hearingLocation or caseManagementLocation is hearingLocation is not defined * Fixed not filtering courtLocations by caseTypeId --------- Co-authored-by: sankaviv1 Co-authored-by: sankaviv1 <95748224+sankaviv1@users.noreply.github.com> Co-authored-by: GarethLancaster <31533575+Gareth40342@users.noreply.github.com> Co-authored-by: douglasrice * CIV-11695 - Update ClaimantResponseCuiCallbackHandler.java (#3616) * Update ClaimantResponseCuiCallbackHandler.java * fix for judicial referral * fixed claim state issue and unit tests. --------- Co-authored-by: neeta-hmcts <115545612+neeta-hmcts@users.noreply.github.com> Co-authored-by: neeta-hmcts Co-authored-by: Pablo Ortiz Co-authored-by: annika-moorthy <85934693+annika-moorthy@users.noreply.github.com> * CIV-8905 Claimant Dashboard Status "Mediation E2E, Manual Determination (org), ITP failed" (#3564) * CIV-8905 Added functionality for dashboard status * CIV-8905 Added functionality for dashboard status * CIV-8905 Fixed AC 4 * CIV-11363 add trigger event (#3633) * CIV-11363 add trigger event * CIV-8905 Merged with bulk_tasks --------- Co-authored-by: Pablo Ortiz Co-authored-by: MMNycz <94067802+MMNycz@users.noreply.github.com> * CIV-8454 Trigger service request after CCD case creation (#3597) * CIV-8454 Trigger service request after CCD case creation * CIV-8454 Move Service Request creation to Camunda * CIV-8454 Undo flow state change - not required * CIV-8454 Remove empty lines * CIV-8454 Add test for service request handler CUI * CIV-8454 Only create service request when no help with fees * CIV-8454 Change event name * CIV-11144 updated witness summary to add date (#3623) * updated witness summary to add date * Update Jenkinsfile_CNP point at CCD * Update Jenkinsfile_CNP * CIV-11363 add caseId to caseIdForRetrigger.txt (#3646) * CIV-11363 add caseId to caseIdForRetrigger.txt * adding not suitable for sdo too * update caseIdForRetriger --------- Co-authored-by: Astha Malviya * testing master build (#3650) Co-authored-by: sankhajuria --------- Co-authored-by: Raja Mani Co-authored-by: drummondjm <93932689+drummondjm@users.noreply.github.com> Co-authored-by: MMNycz <94067802+MMNycz@users.noreply.github.com> Co-authored-by: Astha Malviya Co-authored-by: asthamalviya <104994907+asthamalviya@users.noreply.github.com> Co-authored-by: sankhajuria Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> * CIV-11603 Set Up Case State * CIV-11603 Set Up Translation * CIV-11603 Update Mediation Check * CIV-11603 Remove unused import * CIV-11603 Update Unit Test * CIV-11603 Adding more unit test * CIV-11603 Update from review * CIV-11603 Merged with master --------- Co-authored-by: jarekPierchala Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> Co-authored-by: neeta-hmcts Co-authored-by: sankhajuria Co-authored-by: hmcts-version1-pablo <107927784+hmcts-version1-pablo@users.noreply.github.com> Co-authored-by: Pablo Ortiz Co-authored-by: Raja Mani Co-authored-by: Gareth Lancaster <90632240+Gareth40343@users.noreply.github.com> Co-authored-by: sankaviv1 Co-authored-by: sankaviv1 <95748224+sankaviv1@users.noreply.github.com> Co-authored-by: GarethLancaster <31533575+Gareth40342@users.noreply.github.com> Co-authored-by: douglasrice Co-authored-by: jeswanth-hmcts <134285996+jeswanth-hmcts@users.noreply.github.com> Co-authored-by: neeta-hmcts <115545612+neeta-hmcts@users.noreply.github.com> Co-authored-by: annika-moorthy <85934693+annika-moorthy@users.noreply.github.com> Co-authored-by: marianadpereira Co-authored-by: Manish Garg Co-authored-by: MMNycz <94067802+MMNycz@users.noreply.github.com> Co-authored-by: Paul Pearson <46532983+paul-pearson@users.noreply.github.com> Co-authored-by: drummondjm <93932689+drummondjm@users.noreply.github.com> Co-authored-by: Astha Malviya Co-authored-by: asthamalviya <104994907+asthamalviya@users.noreply.github.com> Co-authored-by: Harry H <33700332+HarryH96@users.noreply.github.com> Co-authored-by: marianadpereira <71711509+marianadpereira@users.noreply.github.com> * CIV-9040 resolved compilation error for allocatedTrack * CIV-0000 Update from master * CIV-11699 added organisation policy for triggering NOC (#3795) * CIV-11699 added organisation policy for triggering NOC * CIV-8334 fast track noise induced hearing (#3780) * CIV-8334 set allocatedTrack to fast track in case it's NIHL * CIV-8334 AllocatedTrack refactor * CIV-8334 AllocatedTrack refactor * CIV-8334 AllocatedTrack refactor * CIV-11935 Content Changes - Make Application (#3768) * CIV-11935 Content Changes - Make Application * Revert Enum code * Revert "Revert Enum code" This reverts commit ce3db8627bc52f71ccda5ae011aa5e4cfa080329. --------- Co-authored-by: Madhan Mahadevan Co-authored-by: vasudevganesanhmcts <100689363+vasudevganesanhmcts@users.noreply.github.com> * CIV-0000 1v2DS response type is null when Respondent 1 is not represented (#3810) * 1v2DS response type is null when resp 1 is not represented * CIV-11980 test caseId * adding logs for take case offline scheduler --------- Co-authored-by: MMNycz <94067802+MMNycz@users.noreply.github.com> * CIV-10338 Added condition to check regions for Early Adaptors for General Apps (#3604) * CIV-10338 Added condition to check regions for Early Adaptors * CIV-10338 revert perf change 1 step for setresp --------- Co-authored-by: vasudevganesanhmcts <100689363+vasudevganesanhmcts@users.noreply.github.com> Co-authored-by: Pijian Liao Co-authored-by: pliao-hmcts <113367232+pliao-hmcts@users.noreply.github.com> * CIV-8336 Judge decision to reconsider request changes (#3790) * CIV-8336 Judge decision to reconsider request changes * CIV-8336 fix checkstyle * Update JudgeDecisionOnReconsiderationRequestCallbackHandler.java * Update JudgeDecisionOnReconsiderationRequestCallbackHandlerTest.java --------- Co-authored-by: krishnanuthalapati <32389208+krishnanuthalapati@users.noreply.github.com> Co-authored-by: Azam <106387766+Azam-Hmcts@users.noreply.github.com> * CIV-11980 Investigation : Claims missing tasks/role categories (#3811) * CIV-11980 test caseId * CIV-8336 fix sonar issue (#3822) Co-authored-by: Azam <106387766+Azam-Hmcts@users.noreply.github.com> * CIV-11937 Update GA Doc template (#3793) * CIV-11937 Update GA Doc template * Update GA Judicial doc template * CIV-11862 Remove Damages form from LR vs LiP claim forms (#3762) * CIV-11862 Remove Damages form from LR vs LiP claim forms * CIV-11862 Remove Damages form from LR vs LiP claim forms --------- Co-authored-by: mfallonhmcts <114912573+mfallonhmcts@users.noreply.github.com> * CIV-11467 Paragraph 4.1 for claimant LR (#3736) Co-authored-by: kdaHMCTS <128375235+kdaHMCTS@users.noreply.github.com> Co-authored-by: mfallonhmcts <114912573+mfallonhmcts@users.noreply.github.com> --------- Co-authored-by: hmcts-version1-ignacio <107860328+hmcts-version1-ignacio@users.noreply.github.com> Co-authored-by: karthick mohanasundaram <92928238+karthick-mohanasundaram-HMCTS@users.noreply.github.com> Co-authored-by: Madhan Mahadevan Co-authored-by: vasudevganesanhmcts <100689363+vasudevganesanhmcts@users.noreply.github.com> Co-authored-by: asthamalviya <104994907+asthamalviya@users.noreply.github.com> Co-authored-by: MMNycz <94067802+MMNycz@users.noreply.github.com> Co-authored-by: Deepthi Doppalapudi <107422736+deepthidoppalapudihmcts@users.noreply.github.com> Co-authored-by: Pijian Liao Co-authored-by: pliao-hmcts <113367232+pliao-hmcts@users.noreply.github.com> Co-authored-by: bhagyashreesharma90 <114094319+bhagyashreesharma90@users.noreply.github.com> Co-authored-by: krishnanuthalapati <32389208+krishnanuthalapati@users.noreply.github.com> Co-authored-by: Azam <106387766+Azam-Hmcts@users.noreply.github.com> Co-authored-by: UshaPanneerselvam1 <122611188+UshaPanneerselvam1@users.noreply.github.com> Co-authored-by: mfallonhmcts <114912573+mfallonhmcts@users.noreply.github.com> Co-authored-by: zikrurR Co-authored-by: kdaHMCTS <128375235+kdaHMCTS@users.noreply.github.com> * CIV-8903 dashboard settlement agreement (#3787) * Based on full and part admit repayment plan settlement agreement signed * reverted the change * build issue resolved * CIV-8903 Set settlement agreement response deadline and statuses * CIV-8147 Merge in dependency * CIV-8903 Add statuses for AC3 and AC4 * CIV-8903 Fix checkstyle * CIV-8903 Fix checkstyle * CIV-8903 Add tests for settlement agreement deadline * CIV-8903 Implement claim statuses for CmcClaim * CIV-8903 Run against required ccd and camunda branches * CIV-11571 Fix court location if no specific court (#3569) * CIV-11571: Add null checking * CIV-11571: Add unit test --------- Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> * CIV-8241 Manual Determination - Lip Notifications (#3529) * added changes for claimant response cui event. * CIV-8291 : Functional code - Need to refactor * CIV-8291 : Refactor duplicated methods to a common service * CIV-8291 : Handler Test * CIV-8291 : Fix checkStyle * CIV-8291 : Fix checkStyle * CIV-8291 : Adding mocks * CIV-8291 : Adding mocks * CIV-8291 : Adding mocks * CIV-8291 : Change final state to PROCEEDS_IN_HERITAGE_SYSTEM * CIV-8291 : Dev comments * CIV-8291 : Dev comments * CIV-8291 : Dev comments * CIV-8291 : Dev comments * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification Test * CIV-8241: Set Up Notification Test * CIV-8241: Roll back one line * CIV-8241: Change method name * Update build.gradle * Update build.gradle --------- Co-authored-by: neeta-hmcts Co-authored-by: sankhajuria Co-authored-by: hmcts-version1-pablo <107927784+hmcts-version1-pablo@users.noreply.github.com> Co-authored-by: Pablo Ortiz Co-authored-by: Raja Mani Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> * CIV-10727 Assisted order uplift (#3550) * CIV-11158 Save hearing location in case data * Added setting assisted order courtLocation to hearingLocation or caseManagementLocation is hearingLocation is not defined * Fixed not filtering courtLocations by caseTypeId --------- Co-authored-by: sankaviv1 Co-authored-by: sankaviv1 <95748224+sankaviv1@users.noreply.github.com> Co-authored-by: GarethLancaster <31533575+Gareth40342@users.noreply.github.com> Co-authored-by: douglasrice * CIV-11695 - Update ClaimantResponseCuiCallbackHandler.java (#3616) * Update ClaimantResponseCuiCallbackHandler.java * fix for judicial referral * fixed claim state issue and unit tests. --------- Co-authored-by: neeta-hmcts <115545612+neeta-hmcts@users.noreply.github.com> Co-authored-by: neeta-hmcts Co-authored-by: Pablo Ortiz Co-authored-by: annika-moorthy <85934693+annika-moorthy@users.noreply.github.com> * CIV-8905 Claimant Dashboard Status "Mediation E2E, Manual Determination (org), ITP failed" (#3564) * CIV-8905 Added functionality for dashboard status * CIV-8905 Added functionality for dashboard status * CIV-8905 Fixed AC 4 * CIV-11363 add trigger event (#3633) * CIV-11363 add trigger event * CIV-8905 Merged with bulk_tasks --------- Co-authored-by: Pablo Ortiz Co-authored-by: MMNycz <94067802+MMNycz@users.noreply.github.com> * CIV-8454 Trigger service request after CCD case creation (#3597) * CIV-8454 Trigger service request after CCD case creation * CIV-8454 Move Service Request creation to Camunda * CIV-8454 Undo flow state change - not required * CIV-8454 Remove empty lines * CIV-8454 Add test for service request handler CUI * CIV-8454 Only create service request when no help with fees * CIV-8454 Change event name * CIV-11144 updated witness summary to add date (#3623) * updated witness summary to add date * Update Jenkinsfile_CNP point at CCD * Update Jenkinsfile_CNP * CIV-11363 add caseId to caseIdForRetrigger.txt (#3646) * CIV-11363 add caseId to caseIdForRetrigger.txt * adding not suitable for sdo too * update caseIdForRetriger --------- Co-authored-by: Astha Malviya * testing master build (#3650) Co-authored-by: sankhajuria --------- Co-authored-by: Raja Mani Co-authored-by: drummondjm <93932689+drummondjm@users.noreply.github.com> Co-authored-by: MMNycz <94067802+MMNycz@users.noreply.github.com> Co-authored-by: Astha Malviya Co-authored-by: asthamalviya <104994907+asthamalviya@users.noreply.github.com> Co-authored-by: sankhajuria Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> * CIV-8903 Implement missing methods * CIV-8903 Revert ccd and camunda branches * CIV-8903 Change SEND to SIGNED * CIV-8903 Move new common implementations to superclass * CIV-8903 Remove unused imports * CIV-8903 Fix checkstyle * CIV-8903 temporary changes to check response of OCMC claims in preview * CIV-8903 temporary changes to check response of OCMC claims in preview * CIV-8903 Removed dateformat from desearilization of cmc claim localdatetime * CIV-8903 Revert unwanted change in DATE_TIME_FORMAT_CMC * Update FeatureToggleService.java * Update FeatureToggleServiceTest.java * CIV-8903 Temporary System out for debugging OCMC claims * Update ClaimStoreService.java Temporary changes for debugging OCMC claims * CIV-8903 Changes for settlement agreement dashboard status * CIV-8903 Reverting FeatureToggleService temp changes * CIV-8903 Updated functionality to show OCMC status with correct status * CIV-8903 Updated functionality to show OCMC status with correct status --------- Co-authored-by: kalachandrasekar1 Co-authored-by: kalachandrasekar1 <114995593+kalachandrasekar1@users.noreply.github.com> Co-authored-by: paul-pearson Co-authored-by: Paul Pearson <46532983+paul-pearson@users.noreply.github.com> Co-authored-by: jarekPierchala Co-authored-by: kenneth-hmcts <91327278+kenneth-hmcts@users.noreply.github.com> Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> Co-authored-by: neeta-hmcts Co-authored-by: sankhajuria Co-authored-by: hmcts-version1-pablo <107927784+hmcts-version1-pablo@users.noreply.github.com> Co-authored-by: Pablo Ortiz Co-authored-by: Raja Mani Co-authored-by: Gareth Lancaster <90632240+Gareth40343@users.noreply.github.com> Co-authored-by: sankaviv1 Co-authored-by: sankaviv1 <95748224+sankaviv1@users.noreply.github.com> Co-authored-by: GarethLancaster <31533575+Gareth40342@users.noreply.github.com> Co-authored-by: douglasrice Co-authored-by: jeswanth-hmcts <134285996+jeswanth-hmcts@users.noreply.github.com> Co-authored-by: neeta-hmcts <115545612+neeta-hmcts@users.noreply.github.com> Co-authored-by: annika-moorthy <85934693+annika-moorthy@users.noreply.github.com> Co-authored-by: marianadpereira Co-authored-by: MMNycz <94067802+MMNycz@users.noreply.github.com> Co-authored-by: drummondjm <93932689+drummondjm@users.noreply.github.com> Co-authored-by: Astha Malviya Co-authored-by: asthamalviya <104994907+asthamalviya@users.noreply.github.com> * CIV-9040 Updated interloc template * CIV-11161 - Docmosis: Manual Determination -"Claimant's Response" (#3656) * CIV-11571 Fix court location if no specific court (#3569) * CIV-11571: Add null checking * CIV-11571: Add unit test --------- Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> * CIV-8241 Manual Determination - Lip Notifications (#3529) * added changes for claimant response cui event. * CIV-8291 : Functional code - Need to refactor * CIV-8291 : Refactor duplicated methods to a common service * CIV-8291 : Handler Test * CIV-8291 : Fix checkStyle * CIV-8291 : Fix checkStyle * CIV-8291 : Adding mocks * CIV-8291 : Adding mocks * CIV-8291 : Adding mocks * CIV-8291 : Change final state to PROCEEDS_IN_HERITAGE_SYSTEM * CIV-8291 : Dev comments * CIV-8291 : Dev comments * CIV-8291 : Dev comments * CIV-8291 : Dev comments * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification Test * CIV-8241: Set Up Notification Test * CIV-8241: Roll back one line * CIV-8241: Change method name * Update build.gradle * Update build.gradle --------- Co-authored-by: neeta-hmcts Co-authored-by: sankhajuria Co-authored-by: hmcts-version1-pablo <107927784+hmcts-version1-pablo@users.noreply.github.com> Co-authored-by: Pablo Ortiz Co-authored-by: Raja Mani Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> * CIV-10727 Assisted order uplift (#3550) * CIV-11158 Save hearing location in case data * Added setting assisted order courtLocation to hearingLocation or caseManagementLocation is hearingLocation is not defined * Fixed not filtering courtLocations by caseTypeId --------- Co-authored-by: sankaviv1 Co-authored-by: sankaviv1 <95748224+sankaviv1@users.noreply.github.com> Co-authored-by: GarethLancaster <31533575+Gareth40342@users.noreply.github.com> Co-authored-by: douglasrice * CIV-11695 - Update ClaimantResponseCuiCallbackHandler.java (#3616) * Update ClaimantResponseCuiCallbackHandler.java * fix for judicial referral * fixed claim state issue and unit tests. --------- Co-authored-by: neeta-hmcts <115545612+neeta-hmcts@users.noreply.github.com> Co-authored-by: neeta-hmcts Co-authored-by: Pablo Ortiz Co-authored-by: annika-moorthy <85934693+annika-moorthy@users.noreply.github.com> * CIV-8905 Claimant Dashboard Status "Mediation E2E, Manual Determination (org), ITP failed" (#3564) * CIV-8905 Added functionality for dashboard status * CIV-8905 Added functionality for dashboard status * CIV-8905 Fixed AC 4 * CIV-11363 add trigger event (#3633) * CIV-11363 add trigger event * CIV-8905 Merged with bulk_tasks --------- Co-authored-by: Pablo Ortiz Co-authored-by: MMNycz <94067802+MMNycz@users.noreply.github.com> * CIV-8454 Trigger service request after CCD case creation (#3597) * CIV-8454 Trigger service request after CCD case creation * CIV-8454 Move Service Request creation to Camunda * CIV-8454 Undo flow state change - not required * CIV-8454 Remove empty lines * CIV-8454 Add test for service request handler CUI * CIV-8454 Only create service request when no help with fees * CIV-8454 Change event name * CIV-11144 updated witness summary to add date (#3623) * updated witness summary to add date * Update Jenkinsfile_CNP point at CCD * Update Jenkinsfile_CNP * CIV-11363 add caseId to caseIdForRetrigger.txt (#3646) * CIV-11363 add caseId to caseIdForRetrigger.txt * adding not suitable for sdo too * update caseIdForRetriger --------- Co-authored-by: Astha Malviya * testing master build (#3650) Co-authored-by: sankhajuria --------- Co-authored-by: Raja Mani Co-authored-by: drummondjm <93932689+drummondjm@users.noreply.github.com> Co-authored-by: MMNycz <94067802+MMNycz@users.noreply.github.com> Co-authored-by: Astha Malviya Co-authored-by: asthamalviya <104994907+asthamalviya@users.noreply.github.com> Co-authored-by: sankhajuria Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> * CIV-11161 docmosis form generate * CIV-11161 build issue fixed * CIV-11161 checkstyle issue fix * CIV-11161 test code updated * CIV-11161 test case updated * CIV-11161 - testcase updated * CIV-11161 review comments fixed * CIV-11161 common jar version updated * CIV-11161 common jar version updated * CIV-11161 common jar version updated * CIV-11161 common jar version updated * CIV-11161 rebase issue fixed --------- Co-authored-by: jarekPierchala Co-authored-by: kenneth-hmcts <91327278+kenneth-hmcts@users.noreply.github.com> Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> Co-authored-by: neeta-hmcts Co-authored-by: sankhajuria Co-authored-by: hmcts-version1-pablo <107927784+hmcts-version1-pablo@users.noreply.github.com> Co-authored-by: Pablo Ortiz Co-authored-by: Raja Mani Co-authored-by: Gareth Lancaster <90632240+Gareth40343@users.noreply.github.com> Co-authored-by: sankaviv1 Co-authored-by: sankaviv1 <95748224+sankaviv1@users.noreply.github.com> Co-authored-by: GarethLancaster <31533575+Gareth40342@users.noreply.github.com> Co-authored-by: douglasrice Co-authored-by: jeswanth-hmcts <134285996+jeswanth-hmcts@users.noreply.github.com> Co-authored-by: neeta-hmcts <115545612+neeta-hmcts@users.noreply.github.com> Co-authored-by: annika-moorthy <85934693+annika-moorthy@users.noreply.github.com> Co-authored-by: marianadpereira Co-authored-by: Manish Garg Co-authored-by: MMNycz <94067802+MMNycz@users.noreply.github.com> Co-authored-by: Paul Pearson <46532983+paul-pearson@users.noreply.github.com> Co-authored-by: drummondjm <93932689+drummondjm@users.noreply.github.com> Co-authored-by: Astha Malviya Co-authored-by: asthamalviya <104994907+asthamalviya@users.noreply.github.com> Co-authored-by: Harry H <33700332+HarryH96@users.noreply.github.com> Co-authored-by: marianadpereira <71711509+marianadpereira@users.noreply.github.com> * CIV-11523 Revoking access to claim for claimant LiP after NoC and representative assigned (#3834) * CIV-11542 Bilingual claim creation (#3781) * CIV-11542 Bilingual claim creation * CIV-11542 Bilingual claim creation * CIV-11542 Bilingual claim creation * CIV-11542 Merge master fix * CIV-11542 Merge master fix --------- Co-authored-by: Pablo Ortiz Co-authored-by: hmcts-version1-pablo <107927784+hmcts-version1-pablo@users.noreply.github.com> * CIV-11820 Part Admit Immediately Flow have incorrect states (#3690) * CIV-11571 Fix court location if no specific court (#3569) * CIV-11571: Add null checking * CIV-11571: Add unit test --------- Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> * CIV-8241 Manual Determination - Lip Notifications (#3529) * added changes for claimant response cui event. * CIV-8291 : Functional code - Need to refactor * CIV-8291 : Refactor duplicated methods to a common service * CIV-8291 : Handler Test * CIV-8291 : Fix checkStyle * CIV-8291 : Fix checkStyle * CIV-8291 : Adding mocks * CIV-8291 : Adding mocks * CIV-8291 : Adding mocks * CIV-8291 : Change final state to PROCEEDS_IN_HERITAGE_SYSTEM * CIV-8291 : Dev comments * CIV-8291 : Dev comments * CIV-8291 : Dev comments * CIV-8291 : Dev comments * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification * CIV-8241: Set Up Notification Test * CIV-8241: Set Up Notification Test * CIV-8241: Roll back one line * CIV-8241: Change method name * Update build.gradle * Update build.gradle --------- Co-authored-by: neeta-hmcts Co-authored-by: sankhajuria Co-authored-by: hmcts-version1-pablo <107927784+hmcts-version1-pablo@users.noreply.github.com> Co-authored-by: Pablo Ortiz Co-authored-by: Raja Mani Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> * CIV-10727 Assisted order uplift (#3550) * CIV-11158 Save hearing location in case data * Added setting assisted order courtLocation to hearingLocation or caseManagementLocation is hearingLocation is not defined * Fixed not filtering courtLocations by caseTypeId --------- Co-authored-by: sankaviv1 Co-authored-by: sankaviv1 <95748224+sankaviv1@users.noreply.github.com> Co-authored-by: GarethLancaster <31533575+Gareth40342@users.noreply.github.com> Co-authored-by: douglasrice * CIV-11695 - Update ClaimantResponseCuiCallbackHandler.java (#3616) * Update ClaimantResponseCuiCallbackHandler.java * fix for judicial referral * fixed claim state issue and unit tests. --------- Co-authored-by: neeta-hmcts <115545612+neeta-hmcts@users.noreply.github.com> Co-authored-by: neeta-hmcts Co-authored-by: Pablo Ortiz Co-authored-by: annika-moorthy <85934693+annika-moorthy@users.noreply.github.com> * CIV-8905 Claimant Dashboard Status "Mediation E2E, Manual Determination (org), ITP failed" (#3564) * CIV-8905 Added functionality for dashboard status * CIV-8905 Added functionality for dashboard status * CIV-8905 Fixed AC 4 * CIV-11363 add trigger event (#3633) * CIV-11363 add trigger event * CIV-8905 Merged with bulk_tasks --------- Co-authored-by: Pablo Ortiz Co-authored-by: MMNycz <94067802+MMNycz@users.noreply.github.com> * CIV-8454 Trigger service request after CCD case creation (#3597) * CIV-8454 Trigger service request after CCD case creation * CIV-8454 Move Service Request creation to Camunda * CIV-8454 Undo flow state change - not required * CIV-8454 Remove empty lines * CIV-8454 Add test for service request handler CUI * CIV-8454 Only create service request when no help with fees * CIV-8454 Change event name * CIV-11144 updated witness summary to add date (#3623) * updated witness summary to add date * Update Jenkinsfile_CNP point at CCD * Update Jenkinsfile_CNP * CIV-11363 add caseId to caseIdForRetrigger.txt (#3646) * CIV-11363 add caseId to caseIdForRetrigger.txt * adding not suitable for sdo too * update caseIdForRetriger --------- Co-authored-by: Astha Malviya * testing master build (#3650) Co-authored-by: sankhajuria --------- Co-authored-by: Raja Mani Co-authored-by: drummondjm <93932689+drummondjm@users.noreply.github.com> Co-authored-by: MMNycz <94067802+MMNycz@users.noreply.github.com> Co-authored-by: Astha Malviya Co-authored-by: asthamalviya <104994907+asthamalviya@users.noreply.github.com> Co-authored-by: sankhajuria Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> * CIV-11820 changes * CIV-11820 cve suppresion * CIV-11820 changes * CIV-11820 changes * CIV-11820 space removed * CIV-11820 merge issue fixed * CIV-11820 checkstyle issue fixed * CIV-11820 checkstyle fix --------- Co-authored-by: jarekPierchala Co-authored-by: kenneth-hmcts <91327278+kenneth-hmcts@users.noreply.github.com> Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> Co-authored-by: neeta-hmcts Co-authored-by: sankhajuria Co-authored-by: hmcts-version1-pablo <107927784+hmcts-version1-pablo@users.noreply.github.com> Co-authored-by: Pablo Ortiz Co-authored-by: Raja Mani Co-authored-by: Gareth Lancaster <90632240+Gareth40343@users.noreply.github.com> Co-authored-by: sankaviv1 Co-authored-by: sankaviv1 <95748224+sankaviv1@users.noreply.github.com> Co-authored-by: GarethLancaster <31533575+Gareth40342@users.noreply.github.com> Co-authored-by: douglasrice Co-authored-by: jeswanth-hmcts <134285996+jeswanth-hmcts@users.noreply.github.com> Co-authored-by: neeta-hmcts <115545612+neeta-hmcts@users.noreply.github.com> Co-authored-by: annika-moorthy <85934693+annika-moorthy@users.noreply.github.com> Co-authored-by: marianadpereira Co-authored-by: Manish Garg Co-authored-by: MMNycz <94067802+MMNycz@users.noreply.github.com> Co-authored-by: Paul Pearson <46532983+paul-pearson@users.noreply.github.com> Co-authored-by: drummondjm <93932689+drummondjm@users.noreply.github.com> Co-authored-by: Astha Malviya Co-authored-by: asthamalviya <104994907+asthamalviya@users.noreply.github.com> Co-authored-by: Harry H <33700332+HarryH96@users.noreply.github.com> Co-authored-by: marianadpereira <71711509+marianadpereira@users.noreply.github.com> * CIV-11213 Settlement Agreement Document (#3763) * CIV-11213 changes * CIV-11213 changes * CIV-11213 rebase issue fixed * CIV-11213 rebase issue fixed * CIV-11213 updated settlement template --------- Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> * Resolved compilation issue * Resolved compilation issue * Update build.gradle * removed duplicated method and field * fixed comma end of enums * CIV-9040 Merged with sprint branch and resolved conflicts * CIV-9040 Merged with sprint branch and resolved conflicts * CIV-5304 Merged with sprint branch and resolved conflicts * CIV-9040 Merged with Sprint branch and resolved conflicts * Update build.gradle * Update build.gradle --------- Co-authored-by: jarekPierchala Co-authored-by: kenneth-hmcts <91327278+kenneth-hmcts@users.noreply.github.com> Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> Co-authored-by: neeta-hmcts Co-authored-by: sankhajuria Co-authored-by: hmcts-version1-pablo <107927784+hmcts-version1-pablo@users.noreply.github.com> Co-authored-by: Pablo Ortiz Co-authored-by: Raja Mani Co-authored-by: Gareth Lancaster <90632240+Gareth40343@users.noreply.github.com> Co-authored-by: sankaviv1 Co-authored-by: sankaviv1 <95748224+sankaviv1@users.noreply.github.com> Co-authored-by: GarethLancaster <31533575+Gareth40342@users.noreply.github.com> Co-authored-by: douglasrice Co-authored-by: jeswanth-hmcts <134285996+jeswanth-hmcts@users.noreply.github.com> Co-authored-by: neeta-hmcts <115545612+neeta-hmcts@users.noreply.github.com> Co-authored-by: annika-moorthy <85934693+annika-moorthy@users.noreply.github.com> Co-authored-by: marianadpereira Co-authored-by: MMNycz <94067802+MMNycz@users.noreply.github.com> Co-authored-by: Paul Pearson <46532983+paul-pearson@users.noreply.github.com> Co-authored-by: drummondjm <93932689+drummondjm@users.noreply.github.com> Co-authored-by: Astha Malviya Co-authored-by: asthamalviya <104994907+asthamalviya@users.noreply.github.com> Co-authored-by: Harry H <33700332+HarryH96@users.noreply.github.com> Co-authored-by: marianadpereira <71711509+marianadpereira@users.noreply.github.com> Co-authored-by: kenneth-hmcts Co-authored-by: jeswanth Co-authored-by: hmcts-version1-ignacio <107860328+hmcts-version1-ignacio@users.noreply.github.com> Co-authored-by: karthick mohanasundaram <92928238+karthick-mohanasundaram-HMCTS@users.noreply.github.com> Co-authored-by: Madhan Mahadevan Co-authored-by: vasudevganesanhmcts <100689363+vasudevganesanhmcts@users.noreply.github.com> Co-authored-by: Deepthi Doppalapudi <107422736+deepthidoppalapudihmcts@users.noreply.github.com> Co-authored-by: Pijian Liao Co-authored-by: pliao-hmcts <113367232+pliao-hmcts@users.noreply.github.com> Co-authored-by: bhagyashreesharma90 <114094319+bhagyashreesharma90@users.noreply.github.com> Co-authored-by: krishnanuthalapati <32389208+krishnanuthalapati@users.noreply.github.com> Co-authored-by: Azam <106387766+Azam-Hmcts@users.noreply.github.com> Co-authored-by: UshaPanneerselvam1 <122611188+UshaPanneerselvam1@users.noreply.github.com> Co-authored-by: mfallonhmcts <114912573+mfallonhmcts@users.noreply.github.com> Co-authored-by: zikrurR Co-authored-by: kdaHMCTS <128375235+kdaHMCTS@users.noreply.github.com> Co-authored-by: kalachandrasekar1 Co-authored-by: kalachandrasekar1 <114995593+kalachandrasekar1@users.noreply.github.com> Co-authored-by: paul-pearson Co-authored-by: ElifDenizEsea <61947470+ElifDenizEsea@users.noreply.github.com> * CIV-12020 Change state to ALL_FINAL_ORDERS_ISSUED (#3890) * CIV-12020 Updating case status to All_FINAL_ORDERS_ISSUED for signed settlement scenarios * CIV-12020 Updating case status to All_FINAL_ORDERS_ISSUED for signed settlement scenarios * CIV-11310 - Claim Issue: Case Flags (#3881) * added caseFlag InitialiserFlag for Create Lip Claim event. * removed unused import. * fixed unit test failure. * refactored * added unit test. * Update CmcClaim.java * CIV-11256 Dasboard Status * Update CmcClaim.java * CIV-11256 Dashboard Claimant status * CIV-11256 Dashboard Claimant status * CIV-11256 Claimant Dashboard --------- Co-authored-by: VijayaKumarK Co-authored-by: jarekPierchala Co-authored-by: kenneth-hmcts <91327278+kenneth-hmcts@users.noreply.github.com> Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> Co-authored-by: neeta-hmcts Co-authored-by: sankhajuria Co-authored-by: hmcts-version1-pablo <107927784+hmcts-version1-pablo@users.noreply.github.com> Co-authored-by: Pablo Ortiz Co-authored-by: Raja Mani Co-authored-by: Gareth Lancaster <90632240+Gareth40343@users.noreply.github.com> Co-authored-by: sankaviv1 Co-authored-by: sankaviv1 <95748224+sankaviv1@users.noreply.github.com> Co-authored-by: GarethLancaster <31533575+Gareth40342@users.noreply.github.com> Co-authored-by: douglasrice Co-authored-by: jeswanth-hmcts <134285996+jeswanth-hmcts@users.noreply.github.com> Co-authored-by: neeta-hmcts <115545612+neeta-hmcts@users.noreply.github.com> Co-authored-by: annika-moorthy <85934693+annika-moorthy@users.noreply.github.com> Co-authored-by: marianadpereira Co-authored-by: Manish Garg Co-authored-by: MMNycz <94067802+MMNycz@users.noreply.github.com> Co-authored-by: Paul Pearson <46532983+paul-pearson@users.noreply.github.com> Co-authored-by: drummondjm <93932689+drummondjm@users.noreply.github.com> Co-authored-by: Astha Malviya Co-authored-by: asthamalviya <104994907+asthamalviya@users.noreply.github.com> Co-authored-by: Harry H <33700332+HarryH96@users.noreply.github.com> Co-authored-by: marianadpereira <71711509+marianadpereira@users.noreply.github.com> Co-authored-by: jeswanth Co-authored-by: rhysbeazleyy <121017387+rhysbeazleyy@users.noreply.github.com> Co-authored-by: kenneth-hmcts Co-authored-by: hmcts-version1-ignacio <107860328+hmcts-version1-ignacio@users.noreply.github.com> Co-authored-by: karthick mohanasundaram <92928238+karthick-mohanasundaram-HMCTS@users.noreply.github.com> Co-authored-by: Madhan Mahadevan Co-authored-by: vasudevganesanhmcts <100689363+vasudevganesanhmcts@users.noreply.github.com> Co-authored-by: Deepthi Doppalapudi <107422736+deepthidoppalapudihmcts@users.noreply.github.com> Co-authored-by: Pijian Liao Co-authored-by: pliao-hmcts <113367232+pliao-hmcts@users.noreply.github.com> Co-authored-by: bhagyashreesharma90 <114094319+bhagyashreesharma90@users.noreply.github.com> Co-authored-by: krishnanuthalapati <32389208+krishnanuthalapati@users.noreply.github.com> Co-authored-by: Azam <106387766+Azam-Hmcts@users.noreply.github.com> Co-authored-by: UshaPanneerselvam1 <122611188+UshaPanneerselvam1@users.noreply.github.com> Co-authored-by: mfallonhmcts <114912573+mfallonhmcts@users.noreply.github.com> Co-authored-by: zikrurR Co-authored-by: kdaHMCTS <128375235+kdaHMCTS@users.noreply.github.com> Co-authored-by: kalachandrasekar1 Co-authored-by: kalachandrasekar1 <114995593+kalachandrasekar1@users.noreply.github.com> Co-authored-by: paul-pearson --- .../CcdDashboardClaimantClaimMatcher.java | 27 ++++++++++++++++--- .../CcdDashboardDefendantClaimMatcher.java | 10 +++++++ .../reform/civil/model/citizenui/Claim.java | 4 +++ .../model/citizenui/DashboardClaimStatus.java | 23 ++++++++++------ .../gov/hmcts/reform/cmc/model/CmcClaim.java | 15 +++++++++++ .../CcdClaimStatusDashboardFactoryTest.java | 5 ++-- .../CmcClaimStatusDashboardFactoryTest.java | 8 +++--- 7 files changed, 74 insertions(+), 18 deletions(-) diff --git a/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdDashboardClaimantClaimMatcher.java b/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdDashboardClaimantClaimMatcher.java index c4f7897c2cf..83464ed5db0 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdDashboardClaimantClaimMatcher.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdDashboardClaimantClaimMatcher.java @@ -15,6 +15,9 @@ import java.util.Objects; import java.util.Optional; +import static uk.gov.hmcts.reform.civil.enums.YesOrNo.NO; +import static uk.gov.hmcts.reform.civil.enums.YesOrNo.YES; + @Slf4j public class CcdDashboardClaimantClaimMatcher extends CcdDashboardClaimMatcher implements Claim { @@ -95,8 +98,10 @@ public boolean isSentToCourt() { @Override public boolean claimantRequestedCountyCourtJudgement() { - return caseData.getApplicant1DQ() != null && caseData.getApplicant1DQ().getApplicant1DQRequestedCourt() != null - && !hasSdoBeenDrawn(); + return (caseData.getApplicant1DQ() != null && caseData.getApplicant1DQ().getApplicant1DQRequestedCourt() != null + && !hasSdoBeenDrawn()) + || (null != caseData.getCcjPaymentDetails() + && null != caseData.getCcjPaymentDetails().getCcjJudgmentStatement()); } @Override @@ -273,7 +278,8 @@ public boolean hasClaimantRejectOffer() { @Override public boolean isPartialAdmissionRejected() { return CaseState.JUDICIAL_REFERRAL.equals(caseData.getCcdState()) - && caseData.isPartAdmitClaimSpec() && YesOrNo.NO.equals(caseData.getApplicant1PartAdmitConfirmAmountPaidSpec()); + && caseData.isPartAdmitClaimSpec() + && NO.equals(caseData.getApplicant1AcceptAdmitAmountPaidSpec()); } @Override @@ -288,4 +294,19 @@ public boolean isClaimantDefaultJudgement() { && caseData.getRespondent1ResponseDeadline().isBefore(LocalDate.now().atTime(FOUR_PM)) && caseData.getPaymentTypeSelection() != null; } + + @Override + public boolean isPartialAdmissionAccepted() { + return caseData.isPartAdmitClaimSpec() + && caseData.isPartAdmitClaimNotSettled() + && caseData.isPayImmediately() + && YES == caseData.getApplicant1AcceptAdmitAmountPaidSpec(); + } + + @Override + public boolean isPaymentPlanRejected() { + return ((caseData.isPartAdmitClaimSpec() || caseData.isFullAdmitClaimSpec()) + && (caseData.isPayBySetDate() || caseData.isPayByInstallment()) + && caseData.hasApplicantRejectedRepaymentPlan()); + } } diff --git a/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdDashboardDefendantClaimMatcher.java b/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdDashboardDefendantClaimMatcher.java index ddfc375a873..2e40e314eca 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdDashboardDefendantClaimMatcher.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdDashboardDefendantClaimMatcher.java @@ -288,4 +288,14 @@ public boolean isClaimantDefaultJudgement() { && caseData.getPaymentTypeSelection() != null; } + @Override + public boolean isPartialAdmissionAccepted() { + return false; + } + + @Override + public boolean isPaymentPlanRejected() { + return false; + } + } diff --git a/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/Claim.java b/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/Claim.java index 1f78c45c3d4..55b6e906711 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/Claim.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/Claim.java @@ -90,4 +90,8 @@ public interface Claim { boolean isClaimantDefaultJudgement(); + boolean isPartialAdmissionAccepted(); + + boolean isPaymentPlanRejected(); + } diff --git a/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/DashboardClaimStatus.java b/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/DashboardClaimStatus.java index 2d18920fb0b..ae75a98237a 100644 --- a/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/DashboardClaimStatus.java +++ b/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/DashboardClaimStatus.java @@ -33,8 +33,8 @@ public enum DashboardClaimStatus { CLAIM_ENDED( Claim::hasClaimEnded ), - RESPONSE_BY_POST( - Claim::isPaperResponse + CLAIMANT_REJECTED_PAYMENT_PLAN( + Claim::isPaymentPlanRejected ), WAITING_COURT_REVIEW( Claim::isCourtReviewing @@ -57,6 +57,9 @@ public enum DashboardClaimStatus { SETTLED( Claim::isSettled ), + REQUESTED_COUNTRY_COURT_JUDGEMENT( + Claim::claimantRequestedCountyCourtJudgement + ), DEFENDANT_PART_ADMIT_PAID( Claim::hasDefendantStatedTheyPaid ), @@ -76,9 +79,7 @@ public enum DashboardClaimStatus { REQUESTED_CCJ_BY_REDETERMINATION( Claim::hasCCJByRedetermination ), - REQUESTED_COUNTRY_COURT_JUDGEMENT( - Claim::claimantRequestedCountyCourtJudgement - ), + DEFAULT_JUDGEMENT( Claim::isClaimantDefaultJudgement ), @@ -88,9 +89,6 @@ public enum DashboardClaimStatus { RESPONSE_DUE_NOW( Claim::hasResponseDueToday ), - ELIGIBLE_FOR_CCJ( - Claim::isEligibleForCCJ - ), ADMIT_PAY_IMMEDIATELY( Claim::defendantRespondedWithFullAdmitAndPayImmediately ), @@ -128,6 +126,15 @@ public enum DashboardClaimStatus { Claim::isPassedToCountyCourtBusinessCentre ), + CLAIMANT_ACCEPTED_PARTIAL_ADMISSION( + Claim::isPartialAdmissionAccepted + ), + ELIGIBLE_FOR_CCJ( + Claim::isEligibleForCCJ + ), + RESPONSE_BY_POST( + Claim::isPaperResponse + ), NO_STATUS(c -> false); @Getter diff --git a/src/main/java/uk/gov/hmcts/reform/cmc/model/CmcClaim.java b/src/main/java/uk/gov/hmcts/reform/cmc/model/CmcClaim.java index d17de99f2d9..6e4ccc19b2e 100644 --- a/src/main/java/uk/gov/hmcts/reform/cmc/model/CmcClaim.java +++ b/src/main/java/uk/gov/hmcts/reform/cmc/model/CmcClaim.java @@ -445,6 +445,21 @@ public boolean isClaimantDefaultJudgement() { return false; } + @Override + public boolean isPartialAdmissionAccepted() { + + return hasResponse() && response.isPartAdmitPayImmediately() + && !response.getPaymentIntention().hasAlreadyPaid() + && claimantAcceptedDefendantResponse(); + } + + @Override + public boolean isPaymentPlanRejected() { + + return (hasResponse() && (response.isPartAdmit() || response.isFullAdmit()) + && (response.getPaymentIntention().isPayByDate() || response.getPaymentIntention().isPayByInstallments())); + } + private boolean isThroughAdmissions(Settlement settlement) { List partyStatements = new ArrayList<>(settlement.getPartyStatements()); if (CollectionUtils.isEmpty(partyStatements) || !settlement.hasOffer()) { diff --git a/src/test/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdClaimStatusDashboardFactoryTest.java b/src/test/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdClaimStatusDashboardFactoryTest.java index c37552f429f..652aa5b7b85 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdClaimStatusDashboardFactoryTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdClaimStatusDashboardFactoryTest.java @@ -411,8 +411,7 @@ void given_claimantRejectsDefendantsPaymentPlan() { } @Test - void givenClaimStatusInProcessHeritageSystem_WhenGetStatus_thenReturnResponseByPost() { - given(featureToggleService.isLipVLipEnabled()).willReturn(true); + void givenClaimStatusInProcessHeritageSystem_WhenGetStatus_thenReturnDefendantPartAdmit() { CaseData claim = CaseData.builder() .respondent1ResponseDate(LocalDateTime.now()) @@ -424,6 +423,6 @@ void givenClaimStatusInProcessHeritageSystem_WhenGetStatus_thenReturnResponseByP DashboardClaimStatus status = ccdClaimStatusDashboardFactory.getDashboardClaimStatus(new CcdDashboardDefendantClaimMatcher( claim, featureToggleService)); - assertThat(status).isEqualTo(DashboardClaimStatus.RESPONSE_BY_POST); + assertThat(status).isEqualTo(DashboardClaimStatus.DEFENDANT_PART_ADMIT); } } diff --git a/src/test/java/uk/gov/hmcts/reform/civil/model/citizenui/CmcClaimStatusDashboardFactoryTest.java b/src/test/java/uk/gov/hmcts/reform/civil/model/citizenui/CmcClaimStatusDashboardFactoryTest.java index 0a7b21baa20..7a779f6baf0 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/model/citizenui/CmcClaimStatusDashboardFactoryTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/model/citizenui/CmcClaimStatusDashboardFactoryTest.java @@ -85,14 +85,14 @@ void given_responseAdmitPayImmediately_whenGetStatus_thenReturnAdmitPayImmediate void given_responseAdmitPayBySetDate_whenGetStatus_thenReturnAdmitPayBySetDate() { CmcClaim claim = getFullAdmitClaim(PaymentOption.BY_SPECIFIED_DATE); DashboardClaimStatus status = cmcClaimStatusDashboardFactory.getDashboardClaimStatus(claim); - assertThat(status).isEqualTo(DashboardClaimStatus.ADMIT_PAY_BY_SET_DATE); + assertThat(status).isEqualTo(DashboardClaimStatus.CLAIMANT_REJECTED_PAYMENT_PLAN); } @Test void given_responseAdmitPayByInstallments_whenGetStatus_thenReturnAdmitPayByInstallments() { CmcClaim claim = getFullAdmitClaim(PaymentOption.INSTALMENTS); DashboardClaimStatus status = cmcClaimStatusDashboardFactory.getDashboardClaimStatus(claim); - assertThat(status).isEqualTo(DashboardClaimStatus.ADMIT_PAY_INSTALLMENTS); + assertThat(status).isEqualTo(DashboardClaimStatus.CLAIMANT_REJECTED_PAYMENT_PLAN); } @Test @@ -178,7 +178,7 @@ void given_hasCourtDetermination_whenGetStatus_thenReturnRequestCCJByRedetermina } @Test - void given_settlementBreachedAndCCJRaised_whenGetStatus_thenReturnRequestCCJByRedetermination() { + void given_settlementBreachedAndCCJRaised_whenGetStatus_thenReturnRequestCCJ() { CmcClaim claim = CmcClaim.builder() .responseDeadline(LocalDate.now().plusDays(10)) .response(Response.builder().build()) @@ -190,7 +190,7 @@ void given_settlementBreachedAndCCJRaised_whenGetStatus_thenReturnRequestCCJByRe .build())).build()) .build(); DashboardClaimStatus status = cmcClaimStatusDashboardFactory.getDashboardClaimStatus(claim); - assertThat(status).isEqualTo(DashboardClaimStatus.REQUESTED_CCJ_BY_REDETERMINATION); + assertThat(status).isEqualTo(DashboardClaimStatus.REQUESTED_COUNTRY_COURT_JUDGEMENT); } @Test