CIV-14661 resolved conflicts

hmcts · Jul 19, 2024 · 65f796b · 65f796b
2 parents 0bfed18 + abffdea
commit 65f796b
Show file tree

Hide file tree

Showing 21 changed files with 206 additions and 59 deletions.
diff --git a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json
@@ -95,5 +95,43 @@
         "CRUD": "CRU"
       }
     ]
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseEventID": "NOTIFY_VALIDATION_DICONTINUANCE_FAILURE_CLAIMANT",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-civil-systemupdate"
+        ],
+        "CRUD": "CRU"
+      },
+      {
+        "UserRoles": [
+          "caseworker-civil-admin",
+          "caseworker-civil-staff"
+        ],
+        "CRUD": "R"
+      }
+    ]
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseEventID": "UPDATE_VISIBILITY_NOTICE_OF_DISCONTINUANCE",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "caseworker-civil-systemupdate"
+        ],
+        "CRUD": "CRU"
+      },
+      {
+        "UserRoles": [
+          "caseworker-civil-admin",
+          "caseworker-civil-staff"
+        ],
+        "CRUD": "R"
+      }
+    ]
   }
 ]
diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-HMC-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-HMC-nonprod.json
@@ -52,5 +52,25 @@
         "CRUD": "R"
       }
     ]
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseFieldID": "hmcEaCourtLocation",
+    "AccessControl": [
+      {
+        "UserRoles": [
+          "judge-profile",
+          "legal-adviser",
+          "caseworker-civil-admin"
+        ],
+        "CRUD": "CRU"
+      },
+      {
+        "UserRoles": [
+          "caseworker-civil-solicitor"
+        ],
+        "CRUD": "R"
+      }
+    ]
   }
 ]
diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-R2-CUI-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-R2-CUI-nonprod.json
@@ -2427,11 +2427,7 @@
       {
         "UserRoles": [
          "citizen-profile",
-         "CITIZEN-CLAIMANT-PROFILE",
-          "caseworker-civil",
-          "caseworker-civil-staff",
-          "caseworker-civil-admin"
-
+          "caseworker-civil"
         ],
         "CRUD": "CRU"
       },

diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField-SettleDiscontinue-nonprod.json
@@ -407,7 +407,8 @@
       {
         "UserRoles": [
           "caseworker-civil-admin",
-          "caseworker-civil-staff"
+          "caseworker-civil-staff",
+          "caseworker-civil-systemupdate"
         ],
         "CRUD": "CRU"
       }

diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseFieldLRspec-R2-CUI-nonprod.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseFieldLRspec-R2-CUI-nonprod.json
@@ -2510,6 +2510,12 @@
           "CITIZEN-CLAIMANT-PROFILE"
         ],
         "CRUD": "CRU"
+      },
+      {
+        "UserRoles": [
+          "CITIZEN-DEFENDANT-PROFILE"
+        ],
+        "CRUD": "R"
       }
     ]
   },

diff --git a/ccd-definition/AuthorisationCaseField/systemUpdate-HMC-nonprod.json b/ccd-definition/AuthorisationCaseField/systemUpdate-HMC-nonprod.json
@@ -0,0 +1,8 @@
+[
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseFieldID": "hmcEaCourtLocation",
+    "UserRole": "caseworker-civil-systemupdate",
+    "CRUD": "R"
+  }
+]
diff --git a/ccd-definition/CaseEvent/Camunda/CaseEventsCUI.json b/ccd-definition/CaseEvent/Camunda/CaseEventsCUI.json
@@ -24,6 +24,7 @@
     "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit",
     "ShowSummary": "N",
     "ShowEventNotes": "N",
-    "RetriesTimeoutURLAboutToSubmitEvent": 0
+    "RetriesTimeoutURLAboutToSubmitEvent": 0,
+    "Publish": "Y"
   }
 ]
diff --git a/ccd-definition/CaseEvent/Camunda/NotificationEvents-SettleDiscontinue-nonprod.json b/ccd-definition/CaseEvent/Camunda/NotificationEvents-SettleDiscontinue-nonprod.json
@@ -24,6 +24,31 @@
     "ShowSummary": "N",
     "ShowEventNotes": "N",
     "RetriesTimeoutURLAboutToSubmitEvent": 0
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "ID": "NOTIFY_VALIDATION_DICONTINUANCE_FAILURE_CLAIMANT",
+    "Name": "Notify Validation Failure",
+    "Description": "Notify Validation Failure Claimant",
+    "PreConditionState(s)": "*",
+    "PostConditionState": "*",
+    "SecurityClassification": "Public",
+    "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit",
+    "ShowSummary": "N",
+    "ShowEventNotes": "N",
+    "RetriesTimeoutURLAboutToSubmitEvent": 0
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "ID": "UPDATE_VISIBILITY_NOTICE_OF_DISCONTINUANCE",
+    "Name": "Update Visibility Notice Disc",
+    "Description": "Update Visibility Notice of Discontinuance",
+    "PreConditionState(s)": "*",
+    "PostConditionState": "*",
+    "SecurityClassification": "Public",
+    "CallBackURLAboutToSubmitEvent": "${CCD_DEF_CASE_SERVICE_BASE_URL}/cases/callbacks/about-to-submit",
+    "ShowSummary": "N",
+    "ShowEventNotes": "N",
+    "RetriesTimeoutURLAboutToSubmitEvent": 0
   }
-
 ]
diff --git a/ccd-definition/CaseEvent/User/UserEvents-TOC-prod.json b/ccd-definition/CaseEvent/User/UserEvents-TOC-prod.json
diff --git a/...aseEvent/User/UserEvents-TOC-nonprod.json → ...nition/CaseEvent/User/UserEvents-TOC.json b/...aseEvent/User/UserEvents-TOC-nonprod.json → ...nition/CaseEvent/User/UserEvents-TOC.json
diff --git a/ccd-definition/CaseEventToFields/WorkAllocationIntegrationFields-CUI-R2-nonprod.json b/ccd-definition/CaseEventToFields/WorkAllocationIntegrationFields-CUI-R2-nonprod.json
@@ -199,6 +199,16 @@
     "PageDisplayOrder": 2,
     "Publish": "Y"
   },
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseEventID": "GENERATE_RESPONSE_DQ_LIP_SEALED",
+    "CaseFieldID": "claimantBilingualLanguagePreference",
+    "PageFieldDisplayOrder": 2,
+    "DisplayContext": "READONLY",
+    "PageID": "WorkAllocationIntegrationFields",
+    "PageDisplayOrder": 2,
+    "Publish": "Y"
+  },
   {
     "CaseTypeID": "CIVIL",
     "CaseEventID": "UPDATE_CLAIMANT_INTENTION_CLAIM_STATE",

diff --git a/ccd-definition/CaseEventToFields/WorkAllocationIntegrationFields-HMC-nonprod.json b/ccd-definition/CaseEventToFields/WorkAllocationIntegrationFields-HMC-nonprod.json
@@ -0,0 +1,53 @@
+[
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseEventID": "CREATE_SDO",
+    "CaseFieldID": "hmcEaCourtLocation",
+    "PageFieldDisplayOrder": 1,
+    "DisplayContext": "READONLY",
+    "PageID": "WorkAllocationIntegrationFields",
+    "PageDisplayOrder": 99,
+    "Publish": "Y"
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseEventID": "STANDARD_DIRECTION_ORDER_DJ",
+    "CaseFieldID": "hmcEaCourtLocation",
+    "PageFieldDisplayOrder": 1,
+    "DisplayContext": "READONLY",
+    "PageID": "WorkAllocationIntegrationFields",
+    "PageDisplayOrder": 99,
+    "Publish": "Y"
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseEventID": "COURT_OFFICER_ORDER",
+    "CaseFieldID": "hmcEaCourtLocation",
+    "PageFieldDisplayOrder": 1,
+    "DisplayContext": "READONLY",
+    "PageShowCondition": "courtOfficerGiveReasonsComplex=\"DONOTSHOW\"",
+    "PageID": "WorkAllocationIntegrationFields",
+    "PageDisplayOrder": 99,
+    "Publish": "Y"
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseEventID": "HEARING_SCHEDULED_RETRIGGER",
+    "CaseFieldID": "hmcEaCourtLocation",
+    "PageFieldDisplayOrder": 1,
+    "DisplayContext": "READONLY",
+    "PageID": "WorkAllocationIntegrationFields",
+    "PageDisplayOrder": 99,
+    "Publish": "Y"
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseEventID": "GENERATE_DIRECTIONS_ORDER",
+    "CaseFieldID": "hmcEaCourtLocation",
+    "PageFieldDisplayOrder": 1,
+    "DisplayContext": "READONLY",
+    "PageID": "WorkAllocationIntegrationFields",
+    "PageDisplayOrder": 99,
+    "Publish": "Y"
+  }
+]
diff --git a/ccd-definition/CaseField/CaseField-HMC-nonprod.json b/ccd-definition/CaseField/CaseField-HMC-nonprod.json
@@ -25,5 +25,14 @@
     "FieldTypeParameter": "PartyFlagStructure",
     "SecurityClassification": "Public",
     "Searchable": "N"
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "ID": "hmcEaCourtLocation",
+    "Label": " ",
+    "FieldType": "YesOrNo",
+    "Searchable": "N",
+    "SecurityClassification": "Public",
+    "Publish": "Y"
   }
 ]
diff --git a/e2e/api/steps.js b/e2e/api/steps.js
@@ -1669,7 +1669,7 @@ const assertCorrectEventsAreAvailableToUser = async (user, state) => {
   if (['preview', 'demo'].includes(config.runningEnv)) {
     expect(caseForDisplay.triggers).to.deep.include.members(nonProdExpectedEvents[user.type][state]);
   } else {
-    expect(caseForDisplay.triggers).to.deep.equalInAnyOrder(expectedEvents[user.type][state]);
+    expect(caseForDisplay.triggers).to.deep.include.members(expectedEvents[user.type][state]);
   }
 };
 

diff --git a/e2e/api/steps_LRspec.js b/e2e/api/steps_LRspec.js
@@ -2003,7 +2003,7 @@ const assertCorrectEventsAreAvailableToUser = async (user, state) => {
     expect(caseForDisplay.triggers).to.deep.include.members(nonProdExpectedEvents[user.type][state],
       'Unexpected events for state ' + state + ' and user type ' + user.type);
   } else {
-    expect(caseForDisplay.triggers).to.deep.equalInAnyOrder(expectedEvents[user.type][state],
+    expect(caseForDisplay.triggers).to.deep.include.members(expectedEvents[user.type][state],
       'Unexpected events for state ' + state + ' and user type ' + user.type);
   }
 };

diff --git a/e2e/api/steps_LRspecCui.js b/e2e/api/steps_LRspecCui.js
@@ -481,7 +481,7 @@ const assertCorrectEventsAreAvailableToUser = async (user, state) => {
       'Unexpected events for state ' + state + ' and user type ' + user.type);
   } else {
     // expect(caseForDisplay.triggers).to.deep.include.members(expectedEvents[user.type][state],
-    expect(caseForDisplay.triggers).to.deep.equalInAnyOrder(expectedEvents[user.type][state],
+    expect(caseForDisplay.triggers).to.deep.include.members(expectedEvents[user.type][state],
       'Unexpected events for state ' + state + ' and user type ' + user.type);
   }
 };

diff --git a/e2e/api/steps_LRspecFast.js b/e2e/api/steps_LRspecFast.js
@@ -493,7 +493,7 @@ const assertCorrectEventsAreAvailableToUser = async (user, state) => {
     expect(caseForDisplay.triggers).to.deep.include.members(nonProdExpectedEvents[user.type][state],
       'Unexpected events for state ' + state + ' and user type ' + user.type);
   } else {
-    expect(caseForDisplay.triggers).to.deep.equalInAnyOrder(expectedEvents[user.type][state],
+    expect(caseForDisplay.triggers).to.deep.include.members(expectedEvents[user.type][state],
       'Unexpected events for state ' + state + ' and user type ' + user.type);
   }
 };
diff --git a/e2e/api/steps_LRspecSmall.js b/e2e/api/steps_LRspecSmall.js
@@ -776,7 +776,7 @@ const assertCorrectEventsAreAvailableToUser = async (user, state) => {
     expect(caseForDisplay.triggers).to.deep.include.members(nonProdExpectedEvents[user.type][state],
       'Unexpected events for state ' + state + ' and user type ' + user.type);
   } else {
-    expect(caseForDisplay.triggers).to.deep.equalInAnyOrder(expectedEvents[user.type][state],
+    expect(caseForDisplay.triggers).to.deep.include.members(expectedEvents[user.type][state],
       'Unexpected events for state ' + state + ' and user type ' + user.type);
   }
 };

diff --git a/e2e/tests/api_tests/mediation/api_1v1_spec_small_mediation_documents_upload_test.js b/e2e/tests/api_tests/mediation/api_1v1_spec_small_mediation_documents_upload_test.js
@@ -4,6 +4,7 @@ const config = require('../../../config.js');
 
 let mediationAdminRegion1 = config.localMediationTests ? config.nbcUserLocal : config.nbcUserWithRegionId1;
 let mediationAdminRegion4 = config.localMediationTests ? config.nbcUserLocal : config.nbcUserWithRegionId4;
+let mediationAdminRegion2 = config.localMediationTests ? config.nbcUserLocal : config.nbcUserWithRegionId2;
 
 Feature('Spec small claims mediation API test @api-spec-mediation');
 

diff --git a/e2e/tests/api_tests/sdo_R2/api_request_for_reconsideration_test.js b/e2e/tests/api_tests/sdo_R2/api_request_for_reconsideration_test.js
@@ -1,8 +1,7 @@
 const config = require('../../../config.js');
 const legalAdvUser = config.tribunalCaseworkerWithRegionId4;
 // To use on local because the idam images are different
-//const judgeUser = config.judgeUserWithRegionId1Local;
-const judgeUser = config.judgeUser2WithRegionId4;
+const judgeUserReg2 = config.judgeUser2WithRegionId2;
 const judgeUserForFastClaim = config.testEarlyAdopterCourts ? config.judgeUser2WithRegionId2 : config.judgeUserWithRegionId1;
 
 async function prepareClaimSpec(api_spec_small) {
@@ -17,33 +16,33 @@ Scenario('1v1 spec request for reconsideration for uphold previous order', async
     await prepareClaimSpec(api_spec_small);
     await api_spec_small.createSDO(legalAdvUser, 'CREATE_SMALL_NO_SUM');
     await api_spec_small.requestForReconsideration(config.applicantSolicitorUser, 'Applicant');
-    await api_spec_small.judgeDecisionOnReconsiderationRequest(judgeUser, 'YES');
+    await api_spec_small.judgeDecisionOnReconsiderationRequest(judgeUserReg2, 'YES');
 });
 
 Scenario('1v1 spec request for reconsideration for create new SDO', async ({api_spec_small}) => {
     await prepareClaimSpec(api_spec_small);
     await api_spec_small.createSDO(legalAdvUser, 'CREATE_SMALL_NO_SUM');
     await api_spec_small.requestForReconsideration(config.defendantSolicitorUser, 'Respondent1');
-    await api_spec_small.judgeDecisionOnReconsiderationRequest(judgeUser, 'CREATE_SDO');
+    await api_spec_small.judgeDecisionOnReconsiderationRequest(judgeUserReg2, 'CREATE_SDO');
     // Create a new SDO again
-    await api_spec_small.createSDO(judgeUser, 'CREATE_SMALL_NO_SUM');
+    await api_spec_small.createSDO(judgeUserReg2, 'CREATE_SMALL_NO_SUM');
 });
 
 Scenario('1v1 spec request for reconsideration for create general order', async ({api_spec_small}) => {
     await prepareClaimSpec(api_spec_small);
     await api_spec_small.createSDO(legalAdvUser, 'CREATE_SMALL_NO_SUM');
     await api_spec_small.requestForReconsideration(config.defendantSolicitorUser,'Respondent1');
-    await api_spec_small.judgeDecisionOnReconsiderationRequest(judgeUser, 'CREATE_GENERAL_ORDER');
+    await api_spec_small.judgeDecisionOnReconsiderationRequest(judgeUserReg2, 'CREATE_GENERAL_ORDER');
 });
 
-Scenario('1v2 spec request for reconsideration by defendant2 for create general order', async ({api_spec_small}) => {
+Scenario.skip('1v2 spec request for reconsideration by defendant2 for create general order', async ({api_spec_small}) => {
     await api_spec_small.createClaimWithRepresentedRespondent(config.applicantSolicitorUser, 'ONE_V_TWO');
     await api_spec_small.defendantResponse(config.defendantSolicitorUser, 'FULL_DEFENCE1', 'ONE_V_TWO_DIF_SOL',true);
     await api_spec_small.defendantResponse(config.secondDefendantSolicitorUser, 'FULL_DEFENCE2', 'ONE_V_TWO_DIF_SOL',true);
     await api_spec_small.claimantResponse(config.applicantSolicitorUser, true);
     await api_spec_small.createSDO(legalAdvUser, 'CREATE_SMALL_NO_SUM');
     await api_spec_small.requestForReconsideration(config.secondDefendantSolicitorUser,'Respondent2');
-    await api_spec_small.judgeDecisionOnReconsiderationRequest(judgeUser, 'CREATE_GENERAL_ORDER');
+    await api_spec_small.judgeDecisionOnReconsiderationRequest(judgeUserReg2, 'CREATE_GENERAL_ORDER');
 }).tag('@api-prod');
 
 Scenario.skip('1v1 spec request for reconsideration when claim amount is greater than 1000', async ({api_spec}) => {
@@ -60,8 +59,8 @@ Scenario('1v1 spec request for reconsideration for create a new SDO ', async ({a
     await prepareClaimSpec(api_spec_small);
     await api_spec_small.createSDO(legalAdvUser, 'CREATE_SMALL_NO_SUM');
     await api_spec_small.requestForReconsideration(config.defendantSolicitorUser,'Respondent1');
-    await api_spec_small.judgeDecisionOnReconsiderationRequest(judgeUser, 'CREATE_SDO');
-    await api_spec_small.notSuitableSdoChangeLocation(judgeUser, 'CHANGE_LOCATION');
+    await api_spec_small.judgeDecisionOnReconsiderationRequest(judgeUserReg2, 'CREATE_SDO');
+    await api_spec_small.notSuitableSdoChangeLocation(judgeUserReg2, 'CHANGE_LOCATION');
 });
 
 AfterSuite(async ({api_spec_small, api_spec}) => {