Skip to content

Commit

Permalink
CIV-0000 CUI Bulk branch (#3933)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: sankhajuria <[email protected]>
Co-authored-by: hmcts-version1-pablo <[email protected]>
Co-authored-by: Pablo Ortiz <[email protected]>
Co-authored-by: Raja Mani <[email protected]>
Co-authored-by: jarekPierchala <[email protected]>

* 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 <[email protected]>
Co-authored-by: sankaviv1 <[email protected]>
Co-authored-by: GarethLancaster <[email protected]>
Co-authored-by: douglasrice <[email protected]>

* 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 <[email protected]>
Co-authored-by: neeta-hmcts <[email protected]>
Co-authored-by: Pablo Ortiz <[email protected]>
Co-authored-by: annika-moorthy <[email protected]>

* 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 <[email protected]>
Co-authored-by: MMNycz <[email protected]>

* 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 <[email protected]>

* testing master build (#3650)

Co-authored-by: sankhajuria <[email protected]>

---------

Co-authored-by: Raja Mani <[email protected]>
Co-authored-by: drummondjm <[email protected]>
Co-authored-by: MMNycz <[email protected]>
Co-authored-by: Astha Malviya <[email protected]>
Co-authored-by: asthamalviya <[email protected]>
Co-authored-by: sankhajuria <[email protected]>
Co-authored-by: jarekPierchala <[email protected]>

* 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 <[email protected]>
Co-authored-by: jarekPierchala <[email protected]>
Co-authored-by: neeta-hmcts <[email protected]>
Co-authored-by: sankhajuria <[email protected]>
Co-authored-by: hmcts-version1-pablo <[email protected]>
Co-authored-by: Pablo Ortiz <[email protected]>
Co-authored-by: Raja Mani <[email protected]>
Co-authored-by: Gareth Lancaster <[email protected]>
Co-authored-by: sankaviv1 <[email protected]>
Co-authored-by: sankaviv1 <[email protected]>
Co-authored-by: GarethLancaster <[email protected]>
Co-authored-by: douglasrice <[email protected]>
Co-authored-by: jeswanth-hmcts <[email protected]>
Co-authored-by: neeta-hmcts <[email protected]>
Co-authored-by: annika-moorthy <[email protected]>
Co-authored-by: marianadpereira <[email protected]>
Co-authored-by: Manish Garg <[email protected]>
Co-authored-by: MMNycz <[email protected]>
Co-authored-by: Paul Pearson <[email protected]>
Co-authored-by: drummondjm <[email protected]>
Co-authored-by: Astha Malviya <[email protected]>
Co-authored-by: asthamalviya <[email protected]>
Co-authored-by: Harry H <[email protected]>
Co-authored-by: marianadpereira <[email protected]>

* 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 <[email protected]>
Co-authored-by: jeswanth-hmcts <[email protected]>
Co-authored-by: jarekPierchala <[email protected]>
Co-authored-by: jarekPierchala <[email protected]>
Co-authored-by: neeta-hmcts <[email protected]>
Co-authored-by: sankhajuria <[email protected]>
Co-authored-by: hmcts-version1-pablo <[email protected]>
Co-authored-by: Pablo Ortiz <[email protected]>
Co-authored-by: Raja Mani <[email protected]>
Co-authored-by: Gareth Lancaster <[email protected]>
Co-authored-by: sankaviv1 <[email protected]>
Co-authored-by: sankaviv1 <[email protected]>
Co-authored-by: GarethLancaster <[email protected]>
Co-authored-by: douglasrice <[email protected]>
Co-authored-by: neeta-hmcts <[email protected]>
Co-authored-by: annika-moorthy <[email protected]>
Co-authored-by: marianadpereira <[email protected]>
Co-authored-by: Manish Garg <[email protected]>
Co-authored-by: MMNycz <[email protected]>
Co-authored-by: Paul Pearson <[email protected]>
Co-authored-by: drummondjm <[email protected]>
Co-authored-by: Astha Malviya <[email protected]>
Co-authored-by: asthamalviya <[email protected]>
Co-authored-by: Harry H <[email protected]>
Co-authored-by: marianadpereira <[email protected]>

* CIV-12068 CYABug (#3844)

* CYA bug fix

* Update CaseData.java

---------

Co-authored-by: jarekPierchala <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: sankhajuria <[email protected]>
Co-authored-by: hmcts-version1-pablo <[email protected]>
Co-authored-by: Pablo Ortiz <[email protected]>
Co-authored-by: Raja Mani <[email protected]>
Co-authored-by: jarekPierchala <[email protected]>

* 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 <[email protected]>
Co-authored-by: sankaviv1 <[email protected]>
Co-authored-by: GarethLancaster <[email protected]>
Co-authored-by: douglasrice <[email protected]>

* 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 <[email protected]>
Co-authored-by: neeta-hmcts <[email protected]>
Co-authored-by: Pablo Ortiz <[email protected]>
Co-authored-by: annika-moorthy <[email protected]>

* 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 <[email protected]>
Co-authored-by: MMNycz <[email protected]>

* 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 <[email protected]>

* testing master build (#3650)

Co-authored-by: sankhajuria <[email protected]>

---------

Co-authored-by: Raja Mani <[email protected]>
Co-authored-by: drummondjm <[email protected]>
Co-authored-by: MMNycz <[email protected]>
Co-authored-by: Astha Malviya <[email protected]>
Co-authored-by: asthamalviya <[email protected]>
Co-authored-by: sankhajuria <[email protected]>
Co-authored-by: jarekPierchala <[email protected]>

* 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>CVE-2023-33202</cve>

* CIV-9040 suppressed <cve>CVE-2023-46589</cve>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: sankhajuria <[email protected]>
Co-authored-by: hmcts-version1-pablo <[email protected]>
Co-authored-by: Pablo Ortiz <[email protected]>
Co-authored-by: Raja Mani <[email protected]>
Co-authored-by: jarekPierchala <[email protected]>

* 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 <[email protected]>
Co-authored-by: sankaviv1 <[email protected]>
Co-authored-by: GarethLancaster <[email protected]>
Co-authored-by: douglasrice <[email protected]>

* 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 <[email protected]>
Co-authored-by: neeta-hmcts <[email protected]>
Co-authored-by: Pablo Ortiz <[email protected]>
Co-authored-by: annika-moorthy <[email protected]>

* 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 <[email protected]>
Co-authored-by: MMNycz <[email protected]>

* 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 <[email protected]>

* testing master build (#3650)

Co-authored-by: sankhajuria <[email protected]>

---------

Co-authored-by: Raja Mani <[email protected]>
Co-authored-by: drummondjm <[email protected]>
Co-authored-by: MMNycz <[email protected]>
Co-authored-by: Astha Malviya <[email protected]>
Co-authored-by: asthamalviya <[email protected]>
Co-authored-by: sankhajuria <[email protected]>
Co-authored-by: jarekPierchala <[email protected]>

* 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 <[email protected]>
Co-authored-by: jarekPierchala <[email protected]>
Co-authored-by: neeta-hmcts <[email protected]>
Co-authored-by: sankhajuria <[email protected]>
Co-authored-by: hmcts-version1-pablo <[email protected]>
Co-authored-by: Pablo Ortiz <[email protected]>
Co-authored-by: Raja Mani <[email protected]>
Co-authored-by: Gareth Lancaster <[email protected]>
Co-authored-by: sankaviv1 <[email protected]>
Co-authored-by: sankaviv1 <[email protected]>
Co-authored-by: GarethLancaster <[email protected]>
Co-authored-by: douglasrice <[email protected]>
Co-authored-by: jeswanth-hmcts <[email protected]>
Co-authored-by: neeta-hmcts <[email protected]>
Co-authored-by: annika-moorthy <[email protected]>
Co-authored-by: marianadpereira <[email protected]>
Co-authored-by: Manish Garg <[email protected]>
Co-authored-by: MMNycz <[email protected]>
Co-authored-by: Paul Pearson <[email protected]>
Co-authored-by: drummondjm <[email protected]>
Co-authored-by: Astha Malviya <[email protected]>
Co-authored-by: asthamalviya <[email protected]>
Co-authored-by: Harry H <[email protected]>
Co-authored-by: marianadpereira <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: sankhajuria <[email protected]>
Co-authored-by: hmcts-version1-pablo <[email protected]>
Co-authored-by: Pablo Ortiz <[email protected]>
Co-authored-by: Raja Mani <[email protected]>
Co-authored-by: jarekPierchala <[email protected]>

* 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 <[email protected]>
Co-authored-by: sankaviv1 <[email protected]>
Co-authored-by: GarethLancaster <[email protected]>
Co-authored-by: douglasrice <[email protected]>

* 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 <[email protected]>
Co-authored-by: neeta-hmcts <[email protected]>
Co-authored-by: Pablo Ortiz <[email protected]>
Co-authored-by: annika-moorthy <[email protected]>

* 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 <[email protected]>
Co-authored-by: MMNycz <[email protected]>

* 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 <[email protected]>

* testing master build (#3650)

Co-authored-by: sankhajuria <[email protected]>

---------

Co-authored-by: Raja Mani <[email protected]>
Co-authored-by: drummondjm <[email protected]>
Co-authored-by: MMNycz <[email protected]>
Co-authored-by: Astha Malviya <[email protected]>
Co-authored-by: asthamalviya <[email protected]>
Co-authored-by: sankhajuria <[email protected]>
Co-authored-by: jarekPierchala <[email protected]>

* 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 <[email protected]>
Co-authored-by: jarekPierchala <[email protected]>
Co-authored-by: neeta-hmcts <[email protected]>
Co-authored-by: sankhajuria <[email protected]>
Co-authored-by: hmcts-version1-pablo <[email protected]>
Co-authored-by: Pablo Ortiz <[email protected]>
Co-authored-by: Raja Mani <[email protected]>
Co-authored-by: Gareth Lancaster <[email protected]>
Co-authored-by: sankaviv1 <[email protected]>
Co-authored-by: sankaviv1 <[email protected]>
Co-authored-by: GarethLancaster <[email protected]>
Co-authored-by: douglasrice <[email protected]>
Co-authored-by: jeswanth-hmcts <[email protected]>
Co-authored-by: neeta-hmcts <[email protected]>
Co-authored-by: annika-moorthy <[email protected]>
Co-authored-by: marianadpereira <[email protected]>
Co-authored-by: Manish Garg <[email protected]>
Co-authored-by: MMNycz <[email protected]>
Co-authored-by: Paul Pearson <[email protected]>
Co-authored-by: drummondjm <[email protected]>
Co-authored-by: Astha Malviya <[email protected]>
Co-authored-by: asthamalviya <[email protected]>
Co-authored-by: Harry H <[email protected]>
Co-authored-by: marianadpereira <[email protected]>

* 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 <[email protected]>
Co-authored-by: vasudevganesanhmcts <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: Pijian Liao <[email protected]>
Co-authored-by: pliao-hmcts <[email protected]>

* 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 <[email protected]>
Co-authored-by: Azam <[email protected]>

* CIV-11980 Investigation : Claims missing tasks/role categories (#3811)

* CIV-11980 test caseId

* CIV-8336 fix sonar issue (#3822)

Co-authored-by: Azam <[email protected]>

* 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 <[email protected]>

* CIV-11467 Paragraph 4.1 for claimant LR (#3736)

Co-authored-by: kdaHMCTS <[email protected]>
Co-authored-by: mfallonhmcts <[email protected]>

---------

Co-authored-by: hmcts-version1-ignacio <[email protected]>
Co-authored-by: karthick mohanasundaram <[email protected]>
Co-authored-by: Madhan Mahadevan <[email protected]>
Co-authored-by: vasudevganesanhmcts <[email protected]>
Co-authored-by: asthamalviya <[email protected]>
Co-authored-by: MMNycz <[email protected]>
Co-authored-by: Deepthi Doppalapudi <[email protected]>
Co-authored-by: Pijian Liao <[email protected]>
Co-authored-by: pliao-hmcts <[email protected]>
Co-authored-by: bhagyashreesharma90 <[email protected]>
Co-authored-by: krishnanuthalapati <[email protected]>
Co-authored-by: Azam <[email protected]>
Co-authored-by: UshaPanneerselvam1 <[email protected]>
Co-authored-by: mfallonhmcts <[email protected]>
Co-authored-by: zikrurR <[email protected]>
Co-authored-by: kdaHMCTS <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: sankhajuria <[email protected]>
Co-authored-by: hmcts-version1-pablo <[email protected]>
Co-authored-by: Pablo Ortiz <[email protected]>
Co-authored-by: Raja Mani <[email protected]>
Co-authored-by: jarekPierchala <[email protected]>

* 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 <[email protected]>
Co-authored-by: sankaviv1 <[email protected]>
Co-authored-by: GarethLancaster <[email protected]>
Co-authored-by: douglasrice <[email protected]>

* 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 <[email protected]>
Co-authored-by: neeta-hmcts <[email protected]>
Co-authored-by: Pablo Ortiz <[email protected]>
Co-authored-by: annika-moorthy <[email protected]>

* 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 <[email protected]>
Co-authored-by: MMNycz <[email protected]>

* 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 <[email protected]>

* testing master build (#3650)

Co-authored-by: sankhajuria <[email protected]>

---------

Co-authored-by: Raja Mani <[email protected]>
Co-authored-by: drummondjm <[email protected]>
Co-authored-by: MMNycz <[email protected]>
Co-authored-by: Astha Malviya <[email protected]>
Co-authored-by: asthamalviya <[email protected]>
Co-authored-by: sankhajuria <[email protected]>
Co-authored-by: jarekPierchala <[email protected]>

* 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 <[email protected]>
Co-authored-by: kalachandrasekar1 <[email protected]>
Co-authored-by: paul-pearson <[email protected]>
Co-authored-by: Paul Pearson <[email protected]>
Co-authored-by: jarekPierchala <[email protected]>
Co-authored-by: kenneth-hmcts <[email protected]>
Co-authored-by: jarekPierchala <[email protected]>
Co-authored-by: neeta-hmcts <[email protected]>
Co-authored-by: sankhajuria <[email protected]>
Co-authored-by: hmcts-version1-pablo <[email protected]>
Co-authored-by: Pablo Ortiz <[email protected]>
Co-authored-by: Raja Mani <[email protected]>
Co-authored-by: Gareth Lancaster <[email protected]>
Co-authored-by: sankaviv1 <[email protected]>
Co-authored-by: sankaviv1 <[email protected]>
Co-authored-by: GarethLancaster <[email protected]>
Co-authored-by: douglasrice <[email protected]>
Co-authored-by: jeswanth-hmcts <[email protected]>
Co-authored-by: neeta-hmcts <[email protected]>
Co-authored-by: annika-moorthy <[email protected]>
Co-authored-by: marianadpereira <[email protected]>
Co-authored-by: MMNycz <[email protected]>
Co-authored-by: drummondjm <[email protected]>
Co-authored-by: Astha Malviya <[email protected]>
Co-authored-by: asthamalviya <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: sankhajuria <[email protected]>
Co-authored-by: hmcts-version1-pablo <[email protected]>
Co-authored-by: Pablo Ortiz <[email protected]>
Co-authored-by: Raja Mani <[email protected]>
Co-authored-by: jarekPierchala <[email protected]>

* 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 <[email protected]>
Co-authored-by: sankaviv1 <[email protected]>
Co-authored-by: GarethLancaster <[email protected]>
Co-authored-by: douglasrice <[email protected]>

* 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 <[email protected]>
Co-authored-by: neeta-hmcts <[email protected]>
Co-authored-by: Pablo Ortiz <[email protected]>
Co-authored-by: annika-moorthy <[email protected]>

* 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 <[email protected]>
Co-authored-by: MMNycz <[email protected]>

* 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 <[email protected]>

* testing master build (#3650)

Co-authored-by: sankhajuria <[email protected]>

---------

Co-authored-by: Raja Mani <[email protected]>
Co-authored-by: drummondjm <[email protected]>
Co-authored-by: MMNycz <[email protected]>
Co-authored-by: Astha Malviya <[email protected]>
Co-authored-by: asthamalviya <[email protected]>
Co-authored-by: sankhajuria <[email protected]>
Co-authored-by: jarekPierchala <[email protected]>

* 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 <[email protected]>
Co-authored-by: kenneth-hmcts <[email protected]>
Co-authored-by: jarekPierchala <[email protected]>
Co-authored-by: neeta-hmcts <[email protected]>
Co-authored-by: sankhajuria <[email protected]>
Co-authored-by: hmcts-version1-pablo <[email protected]>
Co-authored-by: Pablo Ortiz <[email protected]>
Co-authored-by: Raja Mani <[email protected]>
Co-authored-by: Gareth Lancaster <[email protected]>
Co-authored-by: sankaviv1 <[email protected]>
Co-authored-by: sankaviv1 <[email protected]>
Co-authored-by: GarethLancaster <[email protected]>
Co-authored-by: douglasrice <[email protected]>
Co-authored-by: jeswanth-hmcts <[email protected]>
Co-authored-by: neeta-hmcts <[email protected]>
Co-authored-by: annika-moorthy <[email protected]>
Co-authored-by: marianadpereira <[email protected]>
Co-authored-by: Manish Garg <[email protected]>
Co-authored-by: MMNycz <[email protected]>
Co-authored-by: Paul Pearson <[email protected]>
Co-authored-by: drummondjm <[email protected]>
Co-authored-by: Astha Malviya <[email protected]>
Co-authored-by: asthamalviya <[email protected]>
Co-authored-by: Harry H <[email protected]>
Co-authored-by: marianadpereira <[email protected]>

* 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 <[email protected]>
Co-authored-by: hmcts-version1-pablo <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: sankhajuria <[email protected]>
Co-authored-by: hmcts-version1-pablo <[email protected]>
Co-authored-by: Pablo Ortiz <[email protected]>
Co-authored-by: Raja Mani <[email protected]>
Co-authored-by: jarekPierchala <[email protected]>

* 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 <[email protected]>
Co-authored-by: sankaviv1 <[email protected]>
Co-authored-by: GarethLancaster <[email protected]>
Co-authored-by: douglasrice <[email protected]>

* 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 <[email protected]>
Co-authored-by: neeta-hmcts <[email protected]>
Co-authored-by: Pablo Ortiz <[email protected]>
Co-authored-by: annika-moorthy <[email protected]>

* 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 <[email protected]>
Co-authored-by: MMNycz <[email protected]>

* 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 <[email protected]>

* testing master build (#3650)

Co-authored-by: sankhajuria <[email protected]>

---------

Co-authored-by: Raja Mani <[email protected]>
Co-authored-by: drummondjm <[email protected]>
Co-authored-by: MMNycz <[email protected]>
Co-authored-by: Astha Malviya <[email protected]>
Co-authored-by: asthamalviya <[email protected]>
Co-authored-by: sankhajuria <[email protected]>
Co-authored-by: jarekPierchala <[email protected]>

* 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 <[email protected]>
Co-authored-by: kenneth-hmcts <[email protected]>
Co-authored-by: jarekPierchala <[email protected]>
Co-authored-by: neeta-hmcts <[email protected]>
Co-authored-by: sankhajuria <[email protected]>
Co-authored-by: hmcts-version1-pablo <[email protected]>
Co-authored-by: Pablo Ortiz <[email protected]>
Co-authored-by: Raja Mani <[email protected]>
Co-authored-by: Gareth Lancaster <[email protected]>
Co-authored-by: sankaviv1 <[email protected]>
Co-authored-by: sankaviv1 <[email protected]>
Co-authored-by: GarethLancaster <[email protected]>
Co-authored-by: douglasrice <[email protected]>
Co-authored-by: jeswanth-hmcts <[email protected]>
Co-authored-by: neeta-hmcts <[email protected]>
Co-authored-by: annika-moorthy <[email protected]>
Co-authored-by: marianadpereira <[email protected]>
Co-authored-by: Manish Garg <[email protected]>
Co-authored-by: MMNycz <[email protected]>
Co-authored-by: Paul Pearson <[email protected]>
Co-authored-by: drummondjm <[email protected]>
Co-authored-by: Astha Malviya <[email protected]>
Co-authored-by: asthamalviya <[email protected]>
Co-authored-by: Harry H <[email protected]>
Co-authored-by: marianadpereira <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: kenneth-hmcts <[email protected]>
Co-authored-by: jarekPierchala <[email protected]>
Co-authored-by: neeta-hmcts <[email protected]>
Co-authored-by: sankhajuria <[email protected]>
Co-authored-by: hmcts-version1-pablo <[email protected]>
Co-authored-by: Pablo Ortiz <[email protected]>
Co-authored-by: Raja Mani <[email protected]>
Co-authored-by: Gareth Lancaster <[email protected]>
Co-authored-by: sankaviv1 <[email protected]>
Co-authored-by: sankaviv1 <[email protected]>
Co-authored-by: GarethLancaster <[email protected]>
Co-authored-by: douglasrice <[email protected]>
Co-authored-by: jeswanth-hmcts <[email protected]>
Co-authored-by: neeta-hmcts <[email protected]>
Co-authored-by: annika-moorthy <[email protected]>
Co-authored-by: marianadpereira <[email protected]>
Co-authored-by: MMNycz <[email protected]>
Co-authored-by: Paul Pearson <[email protected]>
Co-authored-by: drummondjm <[email protected]>
Co-authored-by: Astha Malviya <[email protected]>
Co-authored-by: asthamalviya <[email protected]>
Co-authored-by: Harry H <[email protected]>
Co-authored-by: marianadpereira <[email protected]>
Co-authored-by: kenneth-hmcts <[email protected]>
Co-authored-by: jeswanth <[email protected]>
Co-authored-by: hmcts-version1-ignacio <[email protected]>
Co-authored-by: karthick mohanasundaram <[email protected]>
Co-authored-by: Madhan Mahadevan <[email protected]>
Co-authored-by: vasudevganesanhmcts <[email protected]>
Co-authored-by: Deepthi Doppalapudi <[email protected]>
Co-authored-by: Pijian Liao <[email protected]>
Co-authored-by: pliao-hmcts <[email protected]>
Co-authored-by: bhagyashreesharma90 <[email protected]>
Co-authored-by: krishnanuthalapati <[email protected]>
Co-authored-by: Azam <[email protected]>
Co-authored-by: UshaPanneerselvam1 <[email protected]>
Co-authored-by: mfallonhmcts <[email protected]>
Co-authored-by: zikrurR <[email protected]>
Co-authored-by: kdaHMCTS <[email protected]>
Co-authored-by: kalachandrasekar1 <[email protected]>
Co-authored-by: kalachandrasekar1 <[email protected]>
Co-authored-by: paul-pearson <[email protected]>
Co-authored-by: ElifDenizEsea <[email protected]>

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

* ccd chart bump

* CIV-9939 Payment details (#3818)

* CIV-9939 Payment details

* CIV-9939 Payment details

* CIV-9939 Payment details

---------

Co-authored-by: Raja Mani <[email protected]>

* CIV-11038 LipvsLip mediation csv (#3821)

* CIV-11038 changes

* CIV-11545 changes

* CIV-11542 changes

* CIV-11542 changes

* CIV-11542 checkstyle fixed

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: sankhajuria <[email protected]>
Co-authored-by: hmcts-version1-pablo <[email protected]>
Co-authored-by: Pablo Ortiz <[email protected]>
Co-authored-by: Raja Mani <[email protected]>
Co-authored-by: jarekPierchala <[email protected]>

* 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 <[email protected]>
Co-authored-by: sankaviv1 <[email protected]>
Co-authored-by: GarethLancaster <[email protected]>
Co-authored-by: douglasrice <[email protected]>

* 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 <[email protected]>
Co-authored-by: neeta-hmcts <[email protected]>
Co-authored-by: Pablo Ortiz <[email protected]>
Co-authored-by: annika-moorthy <[email protected]>

* 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 <[email protected]>
Co-authored-by: MMNycz <[email protected]>

* 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 <[email protected]>

* testing master build (#3650)

Co-authored-by: sankhajuria <[email protected]>

---------

Co-authored-by: Raja Mani <[email protected]>
Co-authored-by: drummondjm <[email protected]>
Co-authored-by: MMNycz <[email protected]>
Co-authored-by: Astha Malviya <[email protected]>
Co-authored-by: asthamalviya <[email protected]>
Co-authored-by: sankhajuria <[email protected]>
Co-authored-by: jarekPierchala <[email protected]>

* 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 <[email protected]>
Co-authored-by: jarekPierchala <[email protected]>
Co-authored-by: neeta-hmcts <[email protected]>
Co-authored-by: sankhajuria <[email protected]>
Co-authored-by: hmcts-version1-pablo <[email protected]>
Co-authored-by: Pablo Ortiz <[email protected]>
Co-authored-by: Raja Mani <[email protected]>
Co-authored-by: Gareth Lancaster <[email protected]>
Co-authored-by: sankaviv1 <[email protected]>
Co-authored-by: sankaviv1 <[email protected]>
Co-authored-by: GarethLancaster <[email protected]>
Co-authored-by: douglasrice <[email protected]>
Co-authored-by: jeswanth-hmcts <[email protected]>
Co-authored-by: neeta-hmcts <[email protected]>
Co-authored-by: annika-moorthy <[email protected]>
Co-authored-by: marianadpereira <[email protected]>
Co-authored-by: Manish Garg <[email protected]>
Co-authored-by: MMNycz <[email protected]>
Co-authored-by: Paul Pearson <[email protected]>
Co-authored-by: drummondjm <[email protected]>
Co-authored-by: Astha Malviya <[email protected]>
Co-authored-by: asthamalviya <104994907…
  • Loading branch information
Show file tree
Hide file tree
Showing 31 changed files with 1,425 additions and 301 deletions.
Binary file modified docker/docmosis/templates/CV-SPC-CLM-ENG-00001-DRAFT.docx
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@ public enum CaseEvent {
CREATE_SERVICE_REQUEST_API_HMC(CAMUNDA),
UPDATE_PARTIES_NOTIFIED_HMC(CAMUNDA),
UPDATE_CASE_PROGRESS_HMC(CAMUNDA),
UPDATE_CLAIMANT_INTENTION_CLAIM_STATE(CAMUNDA),
NOTIFY_APPLICANT1_CLAIM_SUBMITTED(CAMUNDA),
NOTIFY_DEFENDANT_CLAIMANT_SETTLE_THE_CLAIM(CAMUNDA),
NOTIFY_DEFENDANT_LIP_CLAIMANT_REPRESENTED(CAMUNDA),
Expand All @@ -326,8 +327,11 @@ public enum CaseEvent {
RETRIGGER_CASES(CAMUNDA),
GENERATE_LIP_CLAIMANT_MANUAL_DETERMINATION(CAMUNDA),
GENERATE_LIP_SIGN_SETTLEMENT_AGREEMENT_FORM(CAMUNDA),
UPDATE_CLAIM_STATE_AFTER_TRANSLATED_DOCUMENT_UPLOADED(CAMUNDA),
NOTIFY_CLAIMANT_LIP_HELP_WITH_FEES(CAMUNDA),
GENERATE_INTERLOCUTORY_JUDGEMENT_DOCUMENT(CAMUNDA);
GENERATE_INTERLOCUTORY_JUDGEMENT_DOCUMENT(CAMUNDA),
GENERATE_LIP_CLAIMANT_CLAIM_FORM_SPEC(CAMUNDA),
GENERATE_LIP_DEFENDANT_CLAIM_FORM_SPEC(CAMUNDA);

private final UserType userType;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
package uk.gov.hmcts.reform.civil.handler.callback.camunda.caseevents;

import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import uk.gov.hmcts.reform.ccd.client.model.AboutToStartOrSubmitCallbackResponse;
import uk.gov.hmcts.reform.ccd.client.model.CallbackResponse;
import uk.gov.hmcts.reform.civil.callback.Callback;
import uk.gov.hmcts.reform.civil.callback.CallbackHandler;
import uk.gov.hmcts.reform.civil.callback.CallbackParams;
import uk.gov.hmcts.reform.civil.callback.CaseEvent;
import uk.gov.hmcts.reform.civil.enums.CaseState;
import uk.gov.hmcts.reform.civil.model.CaseData;

import java.util.Collections;
import java.util.List;
import java.util.Map;

import static uk.gov.hmcts.reform.civil.callback.CallbackType.ABOUT_TO_SUBMIT;
import static uk.gov.hmcts.reform.civil.callback.CaseEvent.UPDATE_CLAIM_STATE_AFTER_TRANSLATED_DOCUMENT_UPLOADED;

@Service
@RequiredArgsConstructor
public class UpdateClaimStateAfterUploadingTranslatedDocuments extends CallbackHandler {

private static final List<CaseEvent> EVENTS = Collections.singletonList(UPDATE_CLAIM_STATE_AFTER_TRANSLATED_DOCUMENT_UPLOADED);
private Map<String, Callback> callbackMap = Map.of(callbackKey(ABOUT_TO_SUBMIT), this::updateClaimState);
private static final String TASK_ID = "updateClaimStateAfterTranslateDocumentUploadedID";
private final ObjectMapper objectMapper;

@Override
protected Map<String, Callback> callbacks() {
return callbackMap;
}

private CallbackResponse updateClaimState(CallbackParams callbackParams) {
CaseData caseData = callbackParams.getCaseData();

String changeToState = setClaimState(caseData);
return AboutToStartOrSubmitCallbackResponse.builder()
.data(caseData.toMap(objectMapper))
.state(changeToState)
.build();
}

private String setClaimState(CaseData caseData) {
if (caseData.getCcdState().equals(CaseState.AWAITING_RESPONDENT_ACKNOWLEDGEMENT)) {
return CaseState.AWAITING_APPLICANT_INTENTION.name();
}
return caseData.getCcdState().name();
}

@Override
public List<CaseEvent> handledEvents() {
return EVENTS;
}

@Override
public String camundaActivityId(CallbackParams callbackParams) {
return TASK_ID;
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
package uk.gov.hmcts.reform.civil.handler.callback.camunda.caseevents;

import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import uk.gov.hmcts.reform.ccd.client.model.AboutToStartOrSubmitCallbackResponse;
import uk.gov.hmcts.reform.ccd.client.model.CallbackResponse;
import uk.gov.hmcts.reform.civil.callback.Callback;
import uk.gov.hmcts.reform.civil.callback.CallbackHandler;
import uk.gov.hmcts.reform.civil.callback.CallbackParams;
import uk.gov.hmcts.reform.civil.callback.CaseEvent;
import uk.gov.hmcts.reform.civil.model.CaseData;
import uk.gov.hmcts.reform.civil.service.UpdateClaimStateService;

import java.util.Collections;
import java.util.List;
import java.util.Map;

import static uk.gov.hmcts.reform.civil.callback.CallbackType.ABOUT_TO_SUBMIT;
import static uk.gov.hmcts.reform.civil.callback.CaseEvent.UPDATE_CLAIMANT_INTENTION_CLAIM_STATE;

@Service
@RequiredArgsConstructor
public class UpdateClaimantIntentionClaimStateCallbackHandler extends CallbackHandler {

private static final List<CaseEvent> EVENTS = Collections.singletonList(UPDATE_CLAIMANT_INTENTION_CLAIM_STATE);

public static final String TASK_ID = "updateClaimantIntentionClaimStateID";
private Map<String, Callback> callbackMap = Map.of(callbackKey(ABOUT_TO_SUBMIT), this::updateCaseState);
private final ObjectMapper objectMapper;
private final UpdateClaimStateService updateClaimStateService;

@Override
public String camundaActivityId(CallbackParams callbackParams) {
return TASK_ID;
}

@Override
protected Map<String, Callback> callbacks() {
return callbackMap;
}

@Override
public List<CaseEvent> handledEvents() {
return EVENTS;
}

private CallbackResponse updateCaseState(CallbackParams callbackParams) {
CaseData caseData = callbackParams.getCaseData();

CaseData.CaseDataBuilder<?, ?> caseDataBuilder = caseData.toBuilder();
CaseData updatedData = caseDataBuilder.build();
AboutToStartOrSubmitCallbackResponse.AboutToStartOrSubmitCallbackResponseBuilder response =
AboutToStartOrSubmitCallbackResponse.builder()
.data(updatedData.toMap(objectMapper));
if (!updatedData.isBilingual()) {
response.state(updateClaimStateService.setUpCaseState(updatedData));
}
return response.build();
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
package uk.gov.hmcts.reform.civil.handler.callback.camunda.docmosis;

import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import uk.gov.hmcts.reform.ccd.client.model.AboutToStartOrSubmitCallbackResponse;
import uk.gov.hmcts.reform.ccd.client.model.CallbackResponse;
import uk.gov.hmcts.reform.civil.callback.Callback;
import uk.gov.hmcts.reform.civil.callback.CallbackHandler;
import uk.gov.hmcts.reform.civil.callback.CallbackParams;
import uk.gov.hmcts.reform.civil.callback.CaseEvent;
import uk.gov.hmcts.reform.civil.documentmanagement.model.CaseDocument;
import uk.gov.hmcts.reform.civil.documentmanagement.model.DocumentType;
import uk.gov.hmcts.reform.civil.model.CaseData;
import uk.gov.hmcts.reform.civil.model.common.Element;
import uk.gov.hmcts.reform.civil.service.SystemGeneratedDocumentService;
import uk.gov.hmcts.reform.civil.service.docmosis.claimform.ClaimFormGenerator;

import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import static uk.gov.hmcts.reform.civil.callback.CallbackParams.Params.BEARER_TOKEN;
import static uk.gov.hmcts.reform.civil.callback.CallbackType.ABOUT_TO_SUBMIT;
import static uk.gov.hmcts.reform.civil.callback.CaseEvent.GENERATE_DRAFT_FORM;
import static uk.gov.hmcts.reform.civil.callback.CaseEvent.GENERATE_LIP_CLAIMANT_CLAIM_FORM_SPEC;
import static uk.gov.hmcts.reform.civil.callback.CaseEvent.GENERATE_LIP_DEFENDANT_CLAIM_FORM_SPEC;

@Service
@RequiredArgsConstructor
public class GenerateLipClaimFormCallBackHandler extends CallbackHandler {

private static final List<CaseEvent> EVENTS = List.of(
GENERATE_DRAFT_FORM,
GENERATE_LIP_CLAIMANT_CLAIM_FORM_SPEC,
GENERATE_LIP_DEFENDANT_CLAIM_FORM_SPEC
);
private final ObjectMapper objectMapper;
private final ClaimFormGenerator claimFormGenerator;
private final SystemGeneratedDocumentService systemGeneratedDocumentService;
private final Map<String, Callback> callbackMap = Map.of(callbackKey(ABOUT_TO_SUBMIT), this::generateClaimForm);

@Override
protected Map<String, Callback> callbacks() {
return callbackMap;
}

@Override
public List<CaseEvent> handledEvents() {
return EVENTS;
}

private CallbackResponse generateClaimForm(CallbackParams callbackParams) {
CaseData caseData = callbackParams.getCaseData();
CaseEvent caseEvent = CaseEvent.valueOf(callbackParams.getRequest().getEventId());
CaseDocument caseDocument = claimFormGenerator.generate(
caseData,
callbackParams.getParams().get(BEARER_TOKEN).toString(),
caseEvent
);

CaseData updatedCaseData = updateCaseData(caseData, caseDocument, caseEvent);
return AboutToStartOrSubmitCallbackResponse.builder()
.data(updatedCaseData.toMap(objectMapper))
.build();
}

private CaseData updateCaseData(CaseData caseData, CaseDocument caseDocument, CaseEvent caseEvent) {
return switch (caseEvent) {
case GENERATE_DRAFT_FORM, GENERATE_LIP_CLAIMANT_CLAIM_FORM_SPEC, GENERATE_LIP_DEFENDANT_CLAIM_FORM_SPEC ->
buildClaimFormData(caseData, caseDocument, caseEvent);
default -> throw new IllegalArgumentException("case event not found");
};
}

private CaseData buildClaimFormData(CaseData caseData, CaseDocument caseDocument, CaseEvent event) {
List<Element<CaseDocument>> systemGeneratedCaseDocuments = systemGeneratedDocumentService.getSystemGeneratedDocumentsWithAddedDocument(
caseDocument,
caseData
);

// Remove Draft form from documents
if (event == GENERATE_LIP_CLAIMANT_CLAIM_FORM_SPEC) {
systemGeneratedCaseDocuments = systemGeneratedCaseDocuments.stream().filter(claimDoc -> claimDoc.getValue().getDocumentType() != DocumentType.DRAFT_CLAIM_FORM)
.collect(Collectors.toList());
}

return caseData.toBuilder()
.systemGeneratedCaseDocuments(systemGeneratedCaseDocuments)
.build();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public class ClaimantResponseConfirmsToProceedLiPRespondentNotificationHandler e

private CallbackResponse notifyRespondentForClaimantConfirmsToProceed(CallbackParams callbackParams) {
CaseData caseData = callbackParams.getCaseData();
if (Objects.nonNull(caseData.getRespondent1().getPartyEmail())) {
if (!caseData.isBilingual() && Objects.nonNull(caseData.getRespondent1().getPartyEmail())) {
notificationService.sendMail(
caseData.getRespondent1().getPartyEmail(),
notificationsProperties.getRespondent1LipClaimUpdatedTemplate(),
Expand All @@ -50,7 +50,7 @@ private CallbackResponse notifyRespondentForClaimantConfirmsToProceed(CallbackPa

@Override
protected Map<String, Callback> callbacks() {
return callbackMap;
return callbackMap;
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

import com.fasterxml.jackson.databind.ObjectMapper;
import feign.FeignException;

import java.util.Collections;

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
Expand All @@ -13,6 +15,8 @@
import uk.gov.hmcts.reform.civil.callback.CallbackParams;
import uk.gov.hmcts.reform.civil.callback.CaseEvent;
import uk.gov.hmcts.reform.civil.model.CaseData;
import uk.gov.hmcts.reform.civil.model.Fee;
import uk.gov.hmcts.reform.civil.model.SRPbaDetails;
import uk.gov.hmcts.reform.civil.service.PaymentsService;

import java.util.ArrayList;
Expand Down Expand Up @@ -62,11 +66,14 @@ private CallbackResponse makePaymentServiceReq(CallbackParams callbackParams) {
if (isServiceRequestNotRequested(caseData) && !caseData.isHelpWithFees()) {
log.info("Calling payment service request (claim fee) for case {}", caseData.getCcdCaseReference());
String serviceRequestReference = getServiceRequestReference(caseData, authToken);
caseData = caseData.toBuilder().serviceRequestReference(serviceRequestReference).build();
caseData = caseData.toBuilder().serviceRequestReference(serviceRequestReference)
.claimIssuedPBADetails(getClaimIssuePbaDetails(serviceRequestReference, caseData.getClaimFee()))
.build();
}
} catch (FeignException e) {
log.error("Failed creating a payment service request for case {}. Http status: {}. Exception: {}",
caseData.getCcdCaseReference(), e.status(), e);
caseData.getCcdCaseReference(), e.status(), e
);
errors.add(ERROR_MESSAGE);
}
return AboutToStartOrSubmitCallbackResponse.builder()
Expand All @@ -83,4 +90,11 @@ private String getServiceRequestReference(CaseData caseData, String authToken) {
private boolean isServiceRequestNotRequested(CaseData caseData) {
return isNull(caseData.getServiceRequestReference());
}

private SRPbaDetails getClaimIssuePbaDetails(String serviceReference, Fee claimFee) {
return SRPbaDetails.builder()
.serviceReqReference(serviceReference)
.fee(claimFee)
.build();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ private CallbackResponse aboutToSubmit(CallbackParams callbackParams) {
CaseData.CaseDataBuilder<?, ?> builder = caseData.toBuilder()
.applicant1ResponseDate(applicant1ResponseDate)
.businessProcess(BusinessProcess.ready(CLAIMANT_RESPONSE_CUI))
.respondent1RespondToSettlementAgreementDeadline(getRespondToSettlementAgreementDeadline(
.respondent1RespondToSettlementAgreementDeadline(caseData.isBilingual() ? null : getRespondToSettlementAgreementDeadline(
caseData,
applicant1ResponseDate
));
Expand Down
Loading

0 comments on commit 911ef68

Please sign in to comment.