resolve merge conflicts

hmcts · Dec 13, 2024 · dba7a36 · dba7a36
2 parents 8b72047 + 7b1d422
commit dba7a36
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 61 deletions.
diff --git a/definitions/benefit/sheets/AuthorisationCaseEvent/AuthorisationCaseEvent-nonprod.json b/definitions/benefit/sheets/AuthorisationCaseEvent/AuthorisationCaseEvent-nonprod.json
@@ -5,9 +5,6 @@
   {"LiveFrom": "01/01/2018", "CaseTypeID": "Benefit", "CaseEventID": "createResponseReceivedTestCase", "AccessProfile": "caseworker-sscs", "CRUD": "R"},
   {"LiveFrom": "01/01/2018", "CaseTypeID": "Benefit", "CaseEventID": "createTestCase", "AccessProfile": "caseworker-sscs-systemupdate", "CRUD": "CRUD"},
   {"LiveFrom": "01/01/2018", "CaseTypeID": "Benefit", "CaseEventID": "createTestCase", "AccessProfile": "caseworker-sscs", "CRUD": "R"},
-  {"LiveFrom": "02/12/2024", "CaseTypeID": "Benefit", "CaseEventID": "caseOutcomeMigration", "AccessProfile": "caseworker-sscs-systemupdate", "CRUD": "CRU"},
-  {"LiveFrom": "02/12/2024", "CaseTypeID": "Benefit", "CaseEventID": "caseOutcomeMigration", "AccessProfile": "caseworker-sscs", "CRUD": "R"},
-  {"LiveFrom": "02/12/2024", "CaseTypeID": "Benefit", "CaseEventID": "caseOutcomeMigration", "AccessProfile": "caseworker-sscs-superuser", "CRUD": "CRU"},
   {"LiveFrom": "30/11/2022", "CaseTypeID": "Benefit", "CaseEventID": "amendHearingOutcome", "AccessProfile": "caseworker-sscs", "CRUD": "CRUD"},
   {"LiveFrom": "30/11/2022", "CaseTypeID": "Benefit", "CaseEventID": "amendHearingOutcome", "AccessProfile": "caseworker-sscs-clerk", "CRUD": "CRUD"}
-]
+]
diff --git a/definitions/benefit/sheets/AuthorisationCaseEvent/AuthorisationCaseEvent.json b/definitions/benefit/sheets/AuthorisationCaseEvent/AuthorisationCaseEvent.json
@@ -968,5 +968,8 @@
   {"LiveFrom": "06/02/2024", "CaseTypeID": "Benefit", "CaseEventID": "caseManagementLocationMigration", "AccessProfile": "caseworker-sscs-superuser", "CRUD": "CRU"},
   {"LiveFrom": "30/10/2024", "CaseTypeID": "Benefit", "CaseEventID": "addHearingOutcome", "AccessProfile": "caseworker-sscs", "CRUD": "CRUD"},
   {"LiveFrom": "30/10/2024", "CaseTypeID": "Benefit", "CaseEventID": "addHearingOutcome", "AccessProfile": "caseworker-sscs-clerk", "CRUD": "CRUD"},
-  {"LiveFrom": "03/12/2024", "CaseTypeID": "Benefit", "CaseEventID": "removeCaseOutcome", "AccessProfile": "caseworker-sscs-superuser", "CRUD": "CRUD"}
+  {"LiveFrom": "03/12/2024", "CaseTypeID": "Benefit", "CaseEventID": "removeCaseOutcome", "AccessProfile": "caseworker-sscs-superuser", "CRUD": "CRUD"},
+  {"LiveFrom": "02/12/2024", "CaseTypeID": "Benefit", "CaseEventID": "caseOutcomeMigration", "AccessProfile": "caseworker-sscs-systemupdate", "CRUD": "CRU"},
+  {"LiveFrom": "02/12/2024", "CaseTypeID": "Benefit", "CaseEventID": "caseOutcomeMigration", "AccessProfile": "caseworker-sscs", "CRUD": "R"},
+  {"LiveFrom": "02/12/2024", "CaseTypeID": "Benefit", "CaseEventID": "caseOutcomeMigration", "AccessProfile": "caseworker-sscs-superuser", "CRUD": "CRU"}
 ]
diff --git a/definitions/benefit/sheets/CaseEvent/CaseEvent-nonprod.json b/definitions/benefit/sheets/CaseEvent/CaseEvent-nonprod.json
@@ -1,24 +1,14 @@
 [
   {
-    "LiveFrom": "02/12/2024",
-    "CaseTypeID": "Benefit",
-    "ID": "caseOutcomeMigration",
-    "Name": "Case migrated automatically",
-    "DisplayOrder": 10007,
-    "PreConditionState(s)": "*",
-    "PostConditionState": "*",
-    "SecurityClassification": "Public"
-  },
-  {
-    "LiveFrom": "04/07/2024",
-    "CaseTypeID": "Benefit",
-    "ID": "amendHearingOutcome",
-    "Name": "Amend Hearing Outcome",
-    "Description": "Amend a Hearing Outcome",
-    "DisplayOrder": 141,
-    "PreConditionState(s)": "*",
-    "CallBackURLAboutToStartEvent": "${CCD_DEF_TRIBUNALS_API_URL}/ccdAboutToStart",
-    "PostConditionState": "*",
-    "SecurityClassification": "Public"
+  "LiveFrom": "04/07/2024",
+  "CaseTypeID": "Benefit",
+  "ID": "amendHearingOutcome",
+  "Name": "Amend Hearing Outcome",
+  "Description": "Amend a Hearing Outcome",
+  "DisplayOrder": 141,
+  "PreConditionState(s)": "*",
+  "CallBackURLAboutToStartEvent": "${CCD_DEF_TRIBUNALS_API_URL}/ccdAboutToStart",
+  "PostConditionState": "*",
+  "SecurityClassification": "Public"
   }
 ]
diff --git a/definitions/benefit/sheets/CaseEvent/CaseEvent.json b/definitions/benefit/sheets/CaseEvent/CaseEvent.json
@@ -3259,5 +3259,15 @@
     "PostConditionState": "*",
     "ShowEventNotes": "Y",
     "SecurityClassification": "Public"
+  },
+  {
+    "LiveFrom": "02/12/2024",
+    "CaseTypeID": "Benefit",
+    "ID": "caseOutcomeMigration",
+    "Name": "Case migrated automatically",
+    "DisplayOrder": 142,
+    "PreConditionState(s)": "*",
+    "PostConditionState": "*",
+    "SecurityClassification": "Public"
   }
 ]
diff --git a/definitions/benefit/sheets/CaseEventToFields/CaseEventToFields-nonprod.json b/definitions/benefit/sheets/CaseEventToFields/CaseEventToFields-nonprod.json
@@ -1 +1,37 @@
-[]
+[
+  {
+    "LiveFrom": "06/10/2022",
+    "CaseEventID": "updateListingRequirements",
+    "CaseFieldID": "isFqpmRequired",
+    "CaseTypeID": "Benefit",
+    "DisplayContext": "MANDATORY",
+    "PageDisplayOrder": 1,
+    "PageFieldDisplayOrder": 6,
+    "PageID": "1.0",
+    "ShowSummaryChangeOption": "Y"
+  },
+  {
+    "LiveFrom": "06/10/2022",
+    "CaseEventID": "updateListingRequirements",
+    "CaseFieldID": "appeal",
+    "CaseTypeID": "Benefit",
+    "DisplayContext": "READONLY",
+    "FieldShowCondition": "isFqpmRequired = \"DONOTSHOW\"",
+    "PageDisplayOrder": 1,
+    "PageFieldDisplayOrder": 6,
+    "PageID": "1.0",
+    "ShowSummaryChangeOption": "Y"
+  },
+  {
+    "LiveFrom": "06/10/2022",
+    "CaseEventID": "updateListingRequirements",
+    "CaseFieldID": "isMedicalMemberRequired",
+    "CaseTypeID": "Benefit",
+    "DisplayContext": "MANDATORY",
+    "PageDisplayOrder": 1,
+    "PageFieldDisplayOrder": 7,
+    "PageID": "1.0",
+    "ShowSummaryChangeOption": "Y",
+    "FieldShowCondition": "appeal.benefitType.code = \"infectedBloodCompensation\""
+  }
+]
diff --git a/definitions/benefit/sheets/CaseEventToFields/CaseEventToFields.json b/definitions/benefit/sheets/CaseEventToFields/CaseEventToFields.json
@@ -249,41 +249,6 @@
     "PageID": "1.0",
     "ShowSummaryChangeOption": "Y"
   },
-  {
-    "LiveFrom": "06/10/2022",
-    "CaseEventID": "updateListingRequirements",
-    "CaseFieldID": "isFqpmRequired",
-    "CaseTypeID": "Benefit",
-    "DisplayContext": "MANDATORY",
-    "PageDisplayOrder": 1,
-    "PageFieldDisplayOrder": 6,
-    "PageID": "1.0",
-    "ShowSummaryChangeOption": "Y"
-  },
-  {
-    "LiveFrom": "06/10/2022",
-    "CaseEventID": "updateListingRequirements",
-    "CaseFieldID": "appeal",
-    "CaseTypeID": "Benefit",
-    "DisplayContext": "READONLY",
-    "FieldShowCondition": "isFqpmRequired = \"DONOTSHOW\"",
-    "PageDisplayOrder": 1,
-    "PageFieldDisplayOrder": 6,
-    "PageID": "1.0",
-    "ShowSummaryChangeOption": "Y"
-  },
-  {
-    "LiveFrom": "06/10/2022",
-    "CaseEventID": "updateListingRequirements",
-    "CaseFieldID": "isMedicalMemberRequired",
-    "CaseTypeID": "Benefit",
-    "DisplayContext": "MANDATORY",
-    "PageDisplayOrder": 1,
-    "PageFieldDisplayOrder": 7,
-    "PageID": "1.0",
-    "ShowSummaryChangeOption": "Y",
-    "FieldShowCondition": "appeal.benefitType.code = \"infectedBloodCompensation\""
-  },
   {
     "CaseEventID": "adminUpdateEvent",
     "CaseFieldID": "urgentCase",