From 5ef468e128169c64a8b18fb034f6a8b3cbd47c1a Mon Sep 17 00:00:00 2001 From: dtortolaV1 <93722198+dtortolaV1@users.noreply.github.com> Date: Fri, 26 Apr 2024 11:08:39 +0100 Subject: [PATCH] CIV-13408 dashboard notification for help with fees in review (#958) * CIV-12654 Claim fee required dashboard notification (#874) * CIV-12654 Dashboard notification event * CIV-12654 merge with master * CIV-12691 Create Claimant dashboard notifications for issue claim (#876) * DASHBOARD_APPLICANT1_AFTER_PAY_FEE_SCENARIO * DASHBOARD_APPLICANT1_AFTER_PAY_FEE_SCENARIO * DASHBOARD_APPLICANT1_AFTER_PAY_FEE_SCENARIO * Add additonal tests * Update camunda activity id for claim issue --------- Co-authored-by: dharmendra kumar Co-authored-by: m-meulendijks-v1 <107135537+m-meulendijks-v1@users.noreply.github.com> Co-authored-by: marianadpereira <71711509+marianadpereira@users.noreply.github.com> * CIV-12693 Create defendant dashboard notification for Issue claim (#875) * Update: dashboard notification event * CIV-12693 camunda dashbboard notification event * CIV-12693 camunda dashbboard notification event * CIV-12693 - fixed camunda test --------- Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> Co-authored-by: meulendijksm Co-authored-by: dharmendra kumar * CIV-12757 Dashboard Notification HWF (#882) * CIV-12757 Dashboard Notification HWF * CIV-12757 lint * CIV-13015 Create defendant notifications when LRVLIP claim is issued (#881) * CIV-12654 Claim fee required dashboard notification (#874) * CIV-12654 Dashboard notification event * CIV-12654 merge with master * CIV-12691 Create Claimant dashboard notifications for issue claim (#876) * DASHBOARD_APPLICANT1_AFTER_PAY_FEE_SCENARIO * DASHBOARD_APPLICANT1_AFTER_PAY_FEE_SCENARIO * DASHBOARD_APPLICANT1_AFTER_PAY_FEE_SCENARIO * Add additonal tests * Update camunda activity id for claim issue --------- Co-authored-by: dharmendra kumar Co-authored-by: m-meulendijks-v1 <107135537+m-meulendijks-v1@users.noreply.github.com> Co-authored-by: marianadpereira <71711509+marianadpereira@users.noreply.github.com> * CIV-12693 Create defendant dashboard notification for Issue claim (#875) * Update: dashboard notification event * CIV-12693 camunda dashbboard notification event * CIV-12693 camunda dashbboard notification event * CIV-12693 - fixed camunda test --------- Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> Co-authored-by: meulendijksm Co-authored-by: dharmendra kumar * CIV-13015 Create defendant notifications when LRVLIP claim is issued --------- Co-authored-by: Miguel Molina <93722947+miguelMolina3691@users.noreply.github.com> Co-authored-by: Sergio Salguero Co-authored-by: m-meulendijks-v1 <107135537+m-meulendijks-v1@users.noreply.github.com> Co-authored-by: marianadpereira <71711509+marianadpereira@users.noreply.github.com> Co-authored-by: Felipe <36081861+GorilaNaranja@users.noreply.github.com> Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> Co-authored-by: meulendijksm * CIV-12742 - added dashboard notification handler. (#889) * added dashboard notification handler. * fixed unit test. --------- Co-authored-by: Raja Mani * CIV-12758 Dashboard notification - Claim settled (Defendant) (#888) * CIV-12758 Claim settle defendant notification * Update ClaimantResponseSpecTest.java --------- Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> Co-authored-by: jeswanth-hmcts <134285996+jeswanth-hmcts@users.noreply.github.com> * CIV-12792 Add dashboard notification service tasks (#884) * CIV-12792 Add dashboard notification service tasks * CIV-12792 Rework - trigger event after state change * CIV-12792 making the Id generic * CIV-12792 fixing state flow engine issue for Full defence journey * CIV-12792 fixing state flow engine issue for Full defence journey --------- Co-authored-by: VijayaKumarK Co-authored-by: Raja Mani Co-authored-by: kalachandrasekar1 * CIV-12800 dashboard notification part remission hwf granted (#879) * CIV-12654 Claim fee required dashboard notification (#874) * CIV-12654 Dashboard notification event * CIV-12654 merge with master * CIV-12691 Create Claimant dashboard notifications for issue claim (#876) * DASHBOARD_APPLICANT1_AFTER_PAY_FEE_SCENARIO * DASHBOARD_APPLICANT1_AFTER_PAY_FEE_SCENARIO * DASHBOARD_APPLICANT1_AFTER_PAY_FEE_SCENARIO * Add additonal tests * Update camunda activity id for claim issue --------- Co-authored-by: dharmendra kumar Co-authored-by: m-meulendijks-v1 <107135537+m-meulendijks-v1@users.noreply.github.com> Co-authored-by: marianadpereira <71711509+marianadpereira@users.noreply.github.com> * CIV-12693 Create defendant dashboard notification for Issue claim (#875) * Update: dashboard notification event * CIV-12693 camunda dashbboard notification event * CIV-12693 camunda dashbboard notification event * CIV-12693 - fixed camunda test --------- Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> Co-authored-by: meulendijksm Co-authored-by: dharmendra kumar * CIV-12800 Dashboard Notification common service task * CIV-12800 Dashboard Notification common service task * CIV-12757 Dashboard Notification HWF * CIV-12757 lint * CIV-12800 Dashboard Notification common service task * Update create_lip_claim.bpmn * CIV-13000 Assign GA to additional users after payment (#892) * CIV-13000 Added assign roles after payment process * CIV-13000 corrected test * CIV-12800 Dashboard Notification common service task --------- Co-authored-by: Miguel Molina <93722947+miguelMolina3691@users.noreply.github.com> Co-authored-by: Sergio Salguero Co-authored-by: dharmendra kumar Co-authored-by: m-meulendijks-v1 <107135537+m-meulendijks-v1@users.noreply.github.com> Co-authored-by: marianadpereira <71711509+marianadpereira@users.noreply.github.com> Co-authored-by: Felipe <36081861+GorilaNaranja@users.noreply.github.com> Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> Co-authored-by: meulendijksm Co-authored-by: miguelMolina3691 Co-authored-by: Manish Garg Co-authored-by: kalachandrasekar1 Co-authored-by: Deepthi Doppalapudi <107422736+deepthidoppalapudihmcts@users.noreply.github.com> * CIV-12962 Add scheduler for full admit pay immediately no payment (#891) * CIV-12962 Add schedler for full admin pay immediately no payment * Change scheduled time to 00 hours --------- Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> * CIV-12960 Add schedler for settlement no response from defendant (#890) Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> Co-authored-by: jeswanth-hmcts <134285996+jeswanth-hmcts@users.noreply.github.com> * CIV-12747 Generate Dashboard Notification in CUI for CCJ requested by defendant (#894) * CIV-13065 Claimant pays claim fee over the phone (#902) * CIV-12942 - Dashboard Notification - claimant uses tell us you've ended the claim (claimant) (#907) * added dashboard notification handler for claim settled event. * fixed claimant intention CUI bug. * CIV-13119 - Dashboard Defendant Response Part Admit pay immediately (#900) * CIV-13119 - camunda changes for defendant response dashboard * CIV-13119 - move camunda flows --------- Co-authored-by: Raja Mani Co-authored-by: dharmendra kumar * CIV-12895 defendant sign settlement agreement (#898) * CIV-12895 defendant sign settlement agreement * CIV-12895 defendant sign settlement agreement --------- Co-authored-by: Raja Mani * CIV-13072 dr more time requested (#904) * Generate Dashboard Notification in CUI for more time requested by defendant * Generate Dashboard Notification in CUI for more time requested by defendant --------- Co-authored-by: dharmendra kumar * rebase with master * rebase with master * rebase with master unit test case fix * CIV-13071 Add claimant dashboard service task (#906) * CIV-12943 claim settled defendant notification (#910) * added dashboard notification handler for claim settled event. * fixed claimant intention CUI bug. * CIV-12943 added service task for defendant * CIV-12943 claim settled --------- Co-authored-by: neeta-hmcts Co-authored-by: neeta-hmcts <115545612+neeta-hmcts@users.noreply.github.com> Co-authored-by: dharmendra kumar * CIV-0000 Remove ip address that was unintentionally committed (#920) * CIV-13149 Add dashboard notifications for mediation successful (#905) * fix unit tests * add unit tests * Update values.preview.template.yaml --------- Co-authored-by: vasudevganesanhmcts <100689363+vasudevganesanhmcts@users.noreply.github.com> Co-authored-by: Sherlyn Khaw * team2b - add empty space * CIV-13070 claimant has accepted the repayment plan ccj (#916) * CIV-13070 added service task for defendant * CIV-13070 added service task for ccj * rebase with team2b * rebase with team2b --------- Co-authored-by: Raja Mani Co-authored-by: dharmendra kumar * CIV-13201 - Scheduler for Defendant Response Deadline Check (#918) * CIV-13201 - basis for respondent response deadlin check * CIV-13201 - built extra tests + renamed * CIV-13201 - scheduler time update * CIV-13202 Defendant Deadline Passed (#919) * CIV-13202 BPMN update * CIV-13202 BPMN update * CIV-13202 BPMN update * CIV-13202 test cases update * Revert "CIV-13202 test cases update" This reverts commit da248d54713f854fdf1bc25fe7c59a72b61d9074, reversing changes made to d8020984c44a6720d042a3d2ed1b2211f1bfdd04. * CIV-13202 checkstyle error --------- Co-authored-by: Raja Mani Co-authored-by: kannan-v-hmcts <148557022+kannan-v-hmcts@users.noreply.github.com> Co-authored-by: dharmendra kumar * CIV-11299 - Add dashboard tasks to hearing fee unpaid (#929) * CIV-11299 - hearing fee unpaid dashboard changes * CIV-11299 - change event name to claimant1 * CIV-11299 - add suppressions * CIV-13259 Notify Defendent Trial Ready (#935) * CIV-11302 dashboard notification * CIV-11302 dashboard notification tests * CIV-13259 Trail arrangement notify defendant * CIV-11302 adding supressions * CIV-13259 adding task to trigger notifications * CIV-0000 Mediation unsuccessful tasks (#941) * Dashboard notification - Go to hearing (Claimant - mediation unsuccessful) * CIV-12812 : Dashboard Mediation Unsuccessful Notification * CIV-13028 : Fix conflicts * CIV-0000 : Merge CIV-12812 --------- Co-authored-by: laarmada Co-authored-by: hmcts-version1-pablo <107927784+hmcts-version1-pablo@users.noreply.github.com> Co-authored-by: dharmendra kumar * CIV-11300 Dashboard Notification Hearing Scheduled (#936) * CIV-11300 Dashboard Notification Hearing Scheduled * CIV-11300 name * CIV-11300 tests * CIV-11300 separate scenarios --------- Co-authored-by: VijayaKumarK * CIV-11301 dashboard notification trial arrangements (#933) * CIV-13408 dashboard notification, help with fee request in review * CIV-13408 dashboard notification, help with fee request in review --------- Co-authored-by: Miguel Molina <93722947+miguelMolina3691@users.noreply.github.com> Co-authored-by: Sergio Salguero Co-authored-by: dharmendra kumar Co-authored-by: m-meulendijks-v1 <107135537+m-meulendijks-v1@users.noreply.github.com> Co-authored-by: marianadpereira <71711509+marianadpereira@users.noreply.github.com> Co-authored-by: Felipe <36081861+GorilaNaranja@users.noreply.github.com> Co-authored-by: jarekPierchala <118526007+jarekPierchala@users.noreply.github.com> Co-authored-by: meulendijksm Co-authored-by: miguelMolina3691 Co-authored-by: neeta-hmcts <115545612+neeta-hmcts@users.noreply.github.com> Co-authored-by: Raja Mani Co-authored-by: Manish Garg Co-authored-by: jeswanth-hmcts <134285996+jeswanth-hmcts@users.noreply.github.com> Co-authored-by: Paul Pearson <46532983+paul-pearson@users.noreply.github.com> Co-authored-by: VijayaKumarK Co-authored-by: kalachandrasekar1 Co-authored-by: Deepthi Doppalapudi <107422736+deepthidoppalapudihmcts@users.noreply.github.com> Co-authored-by: ElifDenizEsea <61947470+ElifDenizEsea@users.noreply.github.com> Co-authored-by: jeswanth Co-authored-by: neeta-hmcts Co-authored-by: LeonardoPalmeiro <93268657+LeonardoPalmeiro@users.noreply.github.com> Co-authored-by: vasudevganesanhmcts <100689363+vasudevganesanhmcts@users.noreply.github.com> Co-authored-by: Sherlyn Khaw Co-authored-by: kannan-v-hmcts <148557022+kannan-v-hmcts@users.noreply.github.com> Co-authored-by: Pablo Ortiz Co-authored-by: hmcts-version1-pablo <107927784+hmcts-version1-pablo@users.noreply.github.com> Co-authored-by: Johnny Vineall --- .../camunda/apply_help_with_hearing_fee.bpmn | 48 +++++++++++++------ .../bpmn/ApplyHelpWithHearingFeeTest.java | 7 +++ 2 files changed, 40 insertions(+), 15 deletions(-) diff --git a/src/main/resources/camunda/apply_help_with_hearing_fee.bpmn b/src/main/resources/camunda/apply_help_with_hearing_fee.bpmn index 178089511..9cba37083 100644 --- a/src/main/resources/camunda/apply_help_with_hearing_fee.bpmn +++ b/src/main/resources/camunda/apply_help_with_hearing_fee.bpmn @@ -1,5 +1,5 @@ - + @@ -23,7 +23,7 @@ - Flow_0s1knp4 + Flow_0buha2s Flow_1ew3g5l @@ -43,14 +43,24 @@ Flow_0agok6u Flow_0s1knp4 - + + + + + CREATE_DASHBOARD_NOTIFICATION_HELP_FEE_IN_REVIEW_CLAIMANT + + + Flow_0s1knp4 + Flow_0buha2s + + - - - + + + @@ -64,16 +74,20 @@ - - - + + + + + + + - - - + + + @@ -84,11 +98,15 @@ + + + - + - - + + + diff --git a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/ApplyHelpWithHearingFeeTest.java b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/ApplyHelpWithHearingFeeTest.java index 9d30f7148..b523f7247 100644 --- a/src/test/java/uk/gov/hmcts/reform/civil/bpmn/ApplyHelpWithHearingFeeTest.java +++ b/src/test/java/uk/gov/hmcts/reform/civil/bpmn/ApplyHelpWithHearingFeeTest.java @@ -46,6 +46,13 @@ void shouldSuccessfullyCompleteProcess() { NOTIFY_CLAIMANT_LIP_HELP_WITH_FEES_ACTIVITY_ID, variables ); + //complete generation of dashboard notification + notificationTask = assertNextExternalTask(PROCESS_CASE_EVENT); + assertCompleteExternalTask(notificationTask, PROCESS_CASE_EVENT, + "CREATE_DASHBOARD_NOTIFICATION_HELP_FEE_IN_REVIEW_CLAIMANT", + "DB_Notify_Claim_HWF", variables + ); + //end business process ExternalTask endBusinessProcess = assertNextExternalTask(END_BUSINESS_PROCESS); completeBusinessProcess(endBusinessProcess);