Merge branch 'master' into feat/CIV-14244

# Conflicts: # ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json # ccd-definition/CaseEvent/Camunda/NotificationEvents-SettleDiscontinue-nonprod.json
hmcts · Jul 19, 2024 · ad0f712 · ad0f712
2 parents baaf333 + 8dbbc86
commit ad0f712
Show file tree

Hide file tree

Showing 19 changed files with 163 additions and 71 deletions.
diff --git a/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json b/ccd-definition/AuthorisationCaseEvent/AuthorisationCaseEvent-SettleDiscontinue-nonprod.json
@@ -191,5 +191,43 @@
         "CRUD": "R"
       }
     ]
+  },
+  {
+    "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-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
@@ -408,7 +408,8 @@
       {
         "UserRoles": [
           "caseworker-civil-admin",
-          "caseworker-civil-staff"
+          "caseworker-civil-staff",
+          "caseworker-civil-systemupdate"
         ],
         "CRUD": "CRU"
       }

diff --git a/ccd-definition/AuthorisationCaseField/AuthorisationCaseField.json b/ccd-definition/AuthorisationCaseField/AuthorisationCaseField.json
@@ -5027,6 +5027,12 @@
           "caseworker-civil-solicitor"
         ],
         "CRUD": "CRU"
+      },
+      {
+        "UserRoles": [
+          "caseworker-civil-admin"
+        ],
+        "CRUD": "R"
       }
     ]
   },
@@ -5039,6 +5045,12 @@
           "caseworker-civil-solicitor"
         ],
         "CRUD": "CRU"
+      },
+      {
+        "UserRoles": [
+          "caseworker-civil-admin"
+        ],
+        "CRUD": "R"
       }
     ]
   },
@@ -5099,6 +5111,12 @@
           "caseworker-civil-solicitor"
         ],
         "CRUD": "CRU"
+      },
+      {
+        "UserRoles": [
+          "caseworker-civil-admin"
+        ],
+        "CRUD": "R"
       }
     ]
   },
@@ -5111,6 +5129,12 @@
           "caseworker-civil-solicitor"
         ],
         "CRUD": "CRU"
+      },
+      {
+        "UserRoles": [
+          "caseworker-civil-admin"
+        ],
+        "CRUD": "R"
       }
     ]
   },
@@ -5120,7 +5144,8 @@
     "AccessControl": [
       {
         "UserRoles": [
-          "caseworker-civil-solicitor"
+          "caseworker-civil-solicitor",
+          "caseworker-civil-admin"
         ],
         "CRUD": "R"
       }
@@ -5132,7 +5157,8 @@
     "AccessControl": [
       {
         "UserRoles": [
-          "caseworker-civil-solicitor"
+          "caseworker-civil-solicitor",
+          "caseworker-civil-admin"
         ],
         "CRUD": "R"
       }
@@ -5144,7 +5170,8 @@
     "AccessControl": [
       {
         "UserRoles": [
-          "caseworker-civil-solicitor"
+          "caseworker-civil-solicitor",
+          "caseworker-civil-admin"
         ],
         "CRUD": "R"
       }
@@ -5192,7 +5219,8 @@
     "AccessControl": [
       {
         "UserRoles": [
-          "caseworker-civil-solicitor"
+          "caseworker-civil-solicitor",
+          "caseworker-civil-admin"
         ],
         "CRUD": "R"
       }
@@ -5204,7 +5232,8 @@
     "AccessControl": [
       {
         "UserRoles": [
-          "caseworker-civil-solicitor"
+          "caseworker-civil-solicitor",
+          "caseworker-civil-admin"
         ],
         "CRUD": "R"
       }
@@ -5216,7 +5245,8 @@
     "AccessControl": [
       {
         "UserRoles": [
-          "caseworker-civil-solicitor"
+          "caseworker-civil-solicitor",
+          "caseworker-civil-admin"
         ],
         "CRUD": "R"
       }
@@ -5228,7 +5258,8 @@
     "AccessControl": [
       {
         "UserRoles": [
-          "caseworker-civil-solicitor"
+          "caseworker-civil-solicitor",
+          "caseworker-civil-admin"
         ],
         "CRUD": "R"
       }
@@ -5240,7 +5271,8 @@
     "AccessControl": [
       {
         "UserRoles": [
-          "caseworker-civil-solicitor"
+          "caseworker-civil-solicitor",
+          "caseworker-civil-admin"
         ],
         "CRUD": "R"
       }
@@ -5252,7 +5284,8 @@
     "AccessControl": [
       {
         "UserRoles": [
-          "caseworker-civil-solicitor"
+          "caseworker-civil-solicitor",
+          "caseworker-civil-admin"
         ],
         "CRUD": "R"
       }
@@ -5264,7 +5297,8 @@
     "AccessControl": [
       {
         "UserRoles": [
-          "caseworker-civil-solicitor"
+          "caseworker-civil-solicitor",
+          "caseworker-civil-admin"
         ],
         "CRUD": "R"
       }

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/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
@@ -89,6 +89,32 @@
     "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
@@ -198,5 +198,15 @@
     "PageID": "WorkAllocationIntegrationFields",
     "PageDisplayOrder": 2,
     "Publish": "Y"
+  },
+  {
+    "CaseTypeID": "CIVIL",
+    "CaseEventID": "GENERATE_RESPONSE_DQ_LIP_SEALED",
+    "CaseFieldID": "claimantBilingualLanguagePreference",
+    "PageFieldDisplayOrder": 2,
+    "DisplayContext": "READONLY",
+    "PageID": "WorkAllocationIntegrationFields",
+    "PageDisplayOrder": 2,
+    "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');
 
@@ -57,7 +58,7 @@ Scenario('1v1 claimant and defendant upload mediation documents - CARM enabled',
 
 Scenario('1v2 same solicitor claimant and defendant upload mediation documents - CARM enabled', async ({api_spec}) => {
   await prepareClaim1v2SameSol(api_spec, true);
-  await api_spec.mediationUnsuccessful(mediationAdminRegion1, true);
+  await api_spec.mediationUnsuccessful(mediationAdminRegion2, true);
   await api_spec.uploadMediationDocuments(config.applicantSolicitorUser );
   await api_spec.uploadMediationDocuments(config.defendantSolicitorUser);
 });
@@ -71,7 +72,7 @@ Scenario('1v2 different solicitor claimant and defendant upload mediation docume
 
 Scenario('1v2 different solicitor claimant and defendant upload mediation documents - CARM enabled', async ({api_spec}) => {
   await prepareClaim1v2DiffSol(api_spec, true);
-  await api_spec.mediationUnsuccessful(mediationAdminRegion1, true);
+  await api_spec.mediationUnsuccessful(mediationAdminRegion2, true);
   await api_spec.uploadMediationDocuments(config.applicantSolicitorUser);
   await api_spec.uploadMediationDocuments(config.defendantSolicitorUser);
   await api_spec.uploadMediationDocuments(config.secondDefendantSolicitorUser);