From a9e7dcfef9fedd2ea6abf6df4e7991f31f8746e4 Mon Sep 17 00:00:00 2001 From: kalachandrasekar1 Date: Mon, 2 Dec 2024 16:51:51 +0000 Subject: [PATCH 1/6] CIV-15997 changes --- .../AuthorisationCaseField-JO-nonprod.json | 9 +++++++++ .../SetAsideJudgment-JO-nonprod.json | 19 +++++++++++++++---- .../CaseField/CaseField-JO-nonprod.json | 9 +++++++++ .../OnlineJudgmentDetails-JO-nonprod.json | 8 ++++++++ e2e/fixtures/events/judgmentOnline1v1Spec.js | 1 + 5 files changed, 42 insertions(+), 4 deletions(-) diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-JO-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-JO-nonprod.json index 50b482c2ad..7ef7877c94 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-JO-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-JO-nonprod.json @@ -280,6 +280,15 @@ ], "CRUD": "CRU" }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "joSetAsideApplicationDate", + "UserRoles": [ + "caseworker-civil-admin", + "caseworker-civil-staff" + ], + "CRUD": "CRU" + }, { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseFieldID": "joShowRegisteredWithRTLOption", diff --git a/ccd-definition/CaseEventToFields/SetAsideJudgment-JO-nonprod.json b/ccd-definition/CaseEventToFields/SetAsideJudgment-JO-nonprod.json index b7e5158a41..67dc3c5fe8 100644 --- a/ccd-definition/CaseEventToFields/SetAsideJudgment-JO-nonprod.json +++ b/ccd-definition/CaseEventToFields/SetAsideJudgment-JO-nonprod.json @@ -48,13 +48,24 @@ { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseEventID": "SET_ASIDE_JUDGMENT", - "CaseFieldID": "joSetAsideOrderType", + "CaseFieldID": "joSetAsideOrderDate", "PageFieldDisplayOrder": 1, "DisplayContext": "MANDATORY", "PageID": "SetAsideOrderType", "PageLabel": "Judgment details", "PageDisplayOrder": 2, "PageColumnNumber": 1, + "ShowSummaryChangeOption": "Y" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseEventID": "SET_ASIDE_JUDGMENT", + "CaseFieldID": "joSetAsideOrderType", + "PageFieldDisplayOrder": 2, + "DisplayContext": "MANDATORY", + "PageID": "SetAsideOrderType", + "PageDisplayOrder": 2, + "PageColumnNumber": 1, "ShowSummaryChangeOption": "Y", "PageShowCondition": "joSetAsideReason=\"JUDGE_ORDER\"", "CallBackURLMidEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/mid/validate-set-aside-dates" @@ -62,8 +73,8 @@ { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseEventID": "SET_ASIDE_JUDGMENT", - "CaseFieldID": "joSetAsideOrderDate", - "PageFieldDisplayOrder": 2, + "CaseFieldID": "joSetAsideApplicationDate", + "PageFieldDisplayOrder": 3, "DisplayContext": "MANDATORY", "PageID": "SetAsideOrderType", "PageDisplayOrder": 2, @@ -75,7 +86,7 @@ "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "CaseEventID": "SET_ASIDE_JUDGMENT", "CaseFieldID": "joSetAsideDefenceReceivedDate", - "PageFieldDisplayOrder": 3, + "PageFieldDisplayOrder": 4, "DisplayContext": "MANDATORY", "PageID": "SetAsideOrderType", "PageDisplayOrder": 2, diff --git a/ccd-definition/CaseField/CaseField-JO-nonprod.json b/ccd-definition/CaseField/CaseField-JO-nonprod.json index 4035308058..887c91543c 100644 --- a/ccd-definition/CaseField/CaseField-JO-nonprod.json +++ b/ccd-definition/CaseField/CaseField-JO-nonprod.json @@ -318,5 +318,14 @@ "FieldTypeParameter": "JoJudgment", "SecurityClassification": "Public", "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "joSetAsideApplicationDate", + "Label": "Enter the date of the application to set aside judgment", + "HintText": "For example, 16 04 2021", + "FieldType": "Date", + "SecurityClassification": "Public", + "Searchable": "N" } ] diff --git a/ccd-definition/ComplexTypes/JudgmentOnline/OnlineJudgmentDetails-JO-nonprod.json b/ccd-definition/ComplexTypes/JudgmentOnline/OnlineJudgmentDetails-JO-nonprod.json index 09f71f0f7a..1c701037b1 100644 --- a/ccd-definition/ComplexTypes/JudgmentOnline/OnlineJudgmentDetails-JO-nonprod.json +++ b/ccd-definition/ComplexTypes/JudgmentOnline/OnlineJudgmentDetails-JO-nonprod.json @@ -224,5 +224,13 @@ "FieldType": "InstalmentPaymentDetails", "SecurityClassification": "Public", "Searchable": "N" + }, + { + "ID": "JoJudgment", + "ListElementCode": "setAsideApplicationDate", + "ElementLabel": " ", + "FieldType": "Date", + "SecurityClassification": "Public", + "Searchable": "N" } ] diff --git a/e2e/fixtures/events/judgmentOnline1v1Spec.js b/e2e/fixtures/events/judgmentOnline1v1Spec.js index a1336fad3d..d767a9a6ee 100644 --- a/e2e/fixtures/events/judgmentOnline1v1Spec.js +++ b/e2e/fixtures/events/judgmentOnline1v1Spec.js @@ -211,6 +211,7 @@ module.exports = { setAsideJudgment.userInput = { ...setAsideJudgment.userInput, SetAsideJudgment: { + joSetAsideApplicationDate: '2008-06-06', joSetAsideOrderDate: '2008-06-06', joSetAsideOrderType: setAsideOrderType, joSetAsideReason: setAsideReason From d380b3f438fd287e9c1336199b9079a89fb3b9cd Mon Sep 17 00:00:00 2001 From: kalachandrasekar1 Date: Mon, 2 Dec 2024 18:00:48 +0000 Subject: [PATCH 2/6] CIV-15997 changes --- .../JudgmentOnline/OnlineJudgmentDetails-JO-nonprod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccd-definition/ComplexTypes/JudgmentOnline/OnlineJudgmentDetails-JO-nonprod.json b/ccd-definition/ComplexTypes/JudgmentOnline/OnlineJudgmentDetails-JO-nonprod.json index 1c701037b1..7ac94a97ce 100644 --- a/ccd-definition/ComplexTypes/JudgmentOnline/OnlineJudgmentDetails-JO-nonprod.json +++ b/ccd-definition/ComplexTypes/JudgmentOnline/OnlineJudgmentDetails-JO-nonprod.json @@ -227,7 +227,7 @@ }, { "ID": "JoJudgment", - "ListElementCode": "setAsideApplicationDate", + "ListElementCode": "setAsideOrderDate", "ElementLabel": " ", "FieldType": "Date", "SecurityClassification": "Public", From 685406af9430dd03d19aa5db079cbd647af18137 Mon Sep 17 00:00:00 2001 From: kalachandrasekar1 Date: Tue, 3 Dec 2024 11:13:31 +0000 Subject: [PATCH 3/6] CIV-15997 fieldname updated --- .../JudgmentOnline/OnlineJudgmentDetails-JO-nonprod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccd-definition/ComplexTypes/JudgmentOnline/OnlineJudgmentDetails-JO-nonprod.json b/ccd-definition/ComplexTypes/JudgmentOnline/OnlineJudgmentDetails-JO-nonprod.json index 7ac94a97ce..1c701037b1 100644 --- a/ccd-definition/ComplexTypes/JudgmentOnline/OnlineJudgmentDetails-JO-nonprod.json +++ b/ccd-definition/ComplexTypes/JudgmentOnline/OnlineJudgmentDetails-JO-nonprod.json @@ -227,7 +227,7 @@ }, { "ID": "JoJudgment", - "ListElementCode": "setAsideOrderDate", + "ListElementCode": "setAsideApplicationDate", "ElementLabel": " ", "FieldType": "Date", "SecurityClassification": "Public", From 8c59d945ca122f0c80363bc68b830570e6eb2f37 Mon Sep 17 00:00:00 2001 From: kalachandrasekar1 <114995593+kalachandrasekar1@users.noreply.github.com> Date: Tue, 3 Dec 2024 11:17:18 +0000 Subject: [PATCH 4/6] CIV-15997 question updated --- ccd-definition/CaseField/CaseField-JO-nonprod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccd-definition/CaseField/CaseField-JO-nonprod.json b/ccd-definition/CaseField/CaseField-JO-nonprod.json index 887c91543c..b888f51688 100644 --- a/ccd-definition/CaseField/CaseField-JO-nonprod.json +++ b/ccd-definition/CaseField/CaseField-JO-nonprod.json @@ -322,7 +322,7 @@ { "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", "ID": "joSetAsideApplicationDate", - "Label": "Enter the date of the application to set aside judgment", + "Label": "Enter the date of the application to set aside", "HintText": "For example, 16 04 2021", "FieldType": "Date", "SecurityClassification": "Public", From a9922b29c957f7f6a9036d35b57addcee966a9ab Mon Sep 17 00:00:00 2001 From: ShwetaTandel-hmcts Date: Mon, 9 Dec 2024 17:29:44 +0000 Subject: [PATCH 5/6] State change and API test update for set aside Judgment --- .../CaseEvent/User/UserEvents-JO-nonprod.json | 2 +- e2e/api/steps_LRspec.js | 2 +- .../api_judgment_online_spec_1v1_test.js | 11 +---------- .../api_judgment_online_spec_1v2_test.js | 12 +----------- 4 files changed, 4 insertions(+), 23 deletions(-) diff --git a/ccd-definition/CaseEvent/User/UserEvents-JO-nonprod.json b/ccd-definition/CaseEvent/User/UserEvents-JO-nonprod.json index 1b6b7b24e8..a1e8026324 100644 --- a/ccd-definition/CaseEvent/User/UserEvents-JO-nonprod.json +++ b/ccd-definition/CaseEvent/User/UserEvents-JO-nonprod.json @@ -25,7 +25,7 @@ "Description": "Set aside judgment", "DisplayOrder": 1, "PreConditionState(s)": "All_FINAL_ORDERS_ISSUED", - "PostConditionState": "*", + "PostConditionState": "All_FINAL_ORDERS_ISSUED", "SecurityClassification": "Public", "ShowSummary": "Y", "ShowEventNotes": "N", diff --git a/e2e/api/steps_LRspec.js b/e2e/api/steps_LRspec.js index d72b7b89bc..4e6efe012f 100644 --- a/e2e/api/steps_LRspec.js +++ b/e2e/api/steps_LRspec.js @@ -1538,7 +1538,7 @@ module.exports = { await waitForFinishedBusinessProcess(caseId); }, - setAsideJudgment: async (user, setAsideReason, setAsideOrderType,expectedState = 'PROCEEDS_IN_HERITAGE_SYSTEM') => { + setAsideJudgment: async (user, setAsideReason, setAsideOrderType,expectedState = 'All_FINAL_ORDERS_ISSUED') => { console.log(`case in All set aside judgment ${caseId}`); console.log(`calling setup token *** setAside case ${caseId} user : ${user.email}`); await apiRequest.setupTokens(user); diff --git a/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v1_test.js b/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v1_test.js index 763a1ac3af..4869098778 100644 --- a/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v1_test.js +++ b/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v1_test.js @@ -61,16 +61,7 @@ Scenario('SetAside Default Judgment Spec claim 1v1 - Record new judgment after h await api_spec.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, mpScenario); await api_spec.amendRespondent1ResponseDeadline(config.systemupdate); await api_spec.defaultJudgmentSpec(config.applicantSolicitorUser, mpScenario, false); - await api_spec.setAsideJudgment(caseWorkerUserReg2, 'JUDGE_ORDER','ORDER_AFTER_APPLICATION', 'AWAITING_RESPONDENT_ACKNOWLEDGEMENT'); - console.log('--defendantResponse--'); - await api_spec.defendantResponse(config.defendantSolicitorUser); - console.log('--claimantResponse--'); - await api_spec.claimantResponse(config.applicantSolicitorUser, 'FULL_DEFENCE', mpScenario, - 'AWAITING_APPLICANT_INTENTION'); - console.log('--sdo--'); - await api_spec.createSDO(judgeUser, 'CREATE_FAST_NO_SUM'); - console.log('--createFinalOrderJO--'); - await api_spec.createFinalOrderJO(judgeUser, 'FREE_FORM_ORDER'); + await api_spec.setAsideJudgment(caseWorkerUserReg2, 'JUDGE_ORDER','ORDER_AFTER_APPLICATION', 'All_FINAL_ORDERS_ISSUED'); console.log('--recordJudgment--'); await api_spec.recordJudgment(caseWorkerUserReg1, mpScenario, 'DETERMINATION_OF_MEANS', 'PAY_IMMEDIATELY'); await api_spec.editJudgment(caseWorkerUserReg1, mpScenario, 'DETERMINATION_OF_MEANS', 'PAY_IN_INSTALMENTS'); diff --git a/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v2_test.js b/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v2_test.js index 0ed5fd4e30..78ac4c691c 100644 --- a/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v2_test.js +++ b/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v2_test.js @@ -32,17 +32,7 @@ Scenario('Default judgment Spec claim 1v2 - Set Aside After Order - Record new await api_spec.amendRespondent1ResponseDeadline(config.systemupdate); await api_spec.defaultJudgmentSpec(config.applicantSolicitorUser, mpScenario, false); console.log('--setAsideJudgment--'); - await api_spec.setAsideJudgment(caseWorkerUserReg2, 'JUDGE_ORDER', 'ORDER_AFTER_APPLICATION','AWAITING_RESPONDENT_ACKNOWLEDGEMENT'); - console.log('--defendantResponse--'); - await api_spec.defendantResponse(config.defendantSolicitorUser, 'FULL_DEFENCE', mpScenario, 'AWAITING_APPLICANT_INTENTION', false, - false,'00000',true); - console.log('--claimantResponse--'); - await api_spec.claimantResponse(config.applicantSolicitorUser, 'FULL_DEFENCE', mpScenario, - 'JUDICIAL_REFERRAL'); - console.log('--sdo--'); - await api_spec.createSDO(judgeUser, 'CREATE_FAST_NO_SUM'); - console.log('--createFinalOrderJO--'); - await api_spec.createFinalOrderJO(judgeUser, 'FREE_FORM_ORDER'); + await api_spec.setAsideJudgment(caseWorkerUserReg2, 'JUDGE_ORDER', 'ORDER_AFTER_APPLICATION','All_FINAL_ORDERS_ISSUED'); console.log('--recordJudgment--'); await api_spec.recordJudgment(caseWorkerUserReg1, mpScenario, 'DETERMINATION_OF_MEANS', 'PAY_IMMEDIATELY'); await api_spec.editJudgment(caseWorkerUserReg1, mpScenario, 'DETERMINATION_OF_MEANS', 'PAY_BY_DATE'); From d24a56eeb47c24c9349eb0c4ce7d16cf2b9b6e97 Mon Sep 17 00:00:00 2001 From: ShwetaTandel-hmcts Date: Tue, 10 Dec 2024 17:54:54 +0000 Subject: [PATCH 6/6] fixes --- .../AuthorisationCaseField-JO-nonprod.json | 10 ++++++++++ ccd-definition/CaseField/CaseField-JO-nonprod.json | 8 ++++++++ .../api_judgment_online_spec_1v1_test.js | 3 --- .../api_judgment_online_spec_1v2_test.js | 5 ----- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-JO-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-JO-nonprod.json index 7ef7877c94..06dcb258e7 100644 --- a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-JO-nonprod.json +++ b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-JO-nonprod.json @@ -382,5 +382,15 @@ "CRUD": "R" } ] + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "CaseFieldID": "joSetAsideCreatedDate", + "UserRoles": [ + "caseworker-civil-admin", + "caseworker-civil-staff", + "caseworker-civil-systemupdate" + ], + "CRUD": "CRU" } ] diff --git a/ccd-definition/CaseField/CaseField-JO-nonprod.json b/ccd-definition/CaseField/CaseField-JO-nonprod.json index b888f51688..96038c0fe0 100644 --- a/ccd-definition/CaseField/CaseField-JO-nonprod.json +++ b/ccd-definition/CaseField/CaseField-JO-nonprod.json @@ -327,5 +327,13 @@ "FieldType": "Date", "SecurityClassification": "Public", "Searchable": "N" + }, + { + "CaseTypeID": "CIVIL${CCD_DEF_VERSION}", + "ID": "joSetAsideCreatedDate", + "Label": "Enter the date set aside is done", + "FieldType": "DateTime", + "SecurityClassification": "Public", + "Searchable": "N" } ] diff --git a/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v1_test.js b/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v1_test.js index 4869098778..b26c9b08ed 100644 --- a/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v1_test.js +++ b/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v1_test.js @@ -62,9 +62,6 @@ Scenario('SetAside Default Judgment Spec claim 1v1 - Record new judgment after h await api_spec.amendRespondent1ResponseDeadline(config.systemupdate); await api_spec.defaultJudgmentSpec(config.applicantSolicitorUser, mpScenario, false); await api_spec.setAsideJudgment(caseWorkerUserReg2, 'JUDGE_ORDER','ORDER_AFTER_APPLICATION', 'All_FINAL_ORDERS_ISSUED'); - console.log('--recordJudgment--'); - await api_spec.recordJudgment(caseWorkerUserReg1, mpScenario, 'DETERMINATION_OF_MEANS', 'PAY_IMMEDIATELY'); - await api_spec.editJudgment(caseWorkerUserReg1, mpScenario, 'DETERMINATION_OF_MEANS', 'PAY_IN_INSTALMENTS'); } }); diff --git a/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v2_test.js b/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v2_test.js index 78ac4c691c..880ac4711c 100644 --- a/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v2_test.js +++ b/e2e/tests/api_tests/judgmentOnline/api_judgment_online_spec_1v2_test.js @@ -33,11 +33,6 @@ Scenario('Default judgment Spec claim 1v2 - Set Aside After Order - Record new await api_spec.defaultJudgmentSpec(config.applicantSolicitorUser, mpScenario, false); console.log('--setAsideJudgment--'); await api_spec.setAsideJudgment(caseWorkerUserReg2, 'JUDGE_ORDER', 'ORDER_AFTER_APPLICATION','All_FINAL_ORDERS_ISSUED'); - console.log('--recordJudgment--'); - await api_spec.recordJudgment(caseWorkerUserReg1, mpScenario, 'DETERMINATION_OF_MEANS', 'PAY_IMMEDIATELY'); - await api_spec.editJudgment(caseWorkerUserReg1, mpScenario, 'DETERMINATION_OF_MEANS', 'PAY_BY_DATE'); - console.log('--markJudgmentPaid--'); - await api_spec.markJudgmentPaid(config.applicantSolicitorUser); } });