Merge pull request #80 from hmcts/CCD-5647_Mismatch

Ccd 5647 mismatch for CCD-5322
hmcts · Aug 23, 2024 · dce38a8 · dce38a8
2 parents e998be2 + 5246bb3
commit dce38a8
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 62 deletions.
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ plugins {
 
 apply plugin: 'java'
 
-def buildNumber = System.getenv("RELEASE_VERSION")?.replace("refs/tags/", "") ?: "7.22.3"
+def buildNumber = System.getenv("RELEASE_VERSION")?.replace("refs/tags/", "") ?: "7.23.0"
 
 group 'com.github.hmcts'
 

diff --git a/src/main/resources/uk/gov/hmcts/ccd/test_definitions/excel/BEFTA_Master_Definition.xlsx b/src/main/resources/uk/gov/hmcts/ccd/test_definitions/excel/BEFTA_Master_Definition.xlsx
diff --git a/src/main/resources/uk/gov/hmcts/ccd/test_definitions/excel/CCD_BEFTA_JURISDICTION1.xlsx b/src/main/resources/uk/gov/hmcts/ccd/test_definitions/excel/CCD_BEFTA_JURISDICTION1.xlsx
diff --git a/...main/resources/uk/gov/hmcts/ccd/test_definitions/excel/CCD_BEFTA_RM_CT_JURISDICTION1.xlsx b/...main/resources/uk/gov/hmcts/ccd/test_definitions/excel/CCD_BEFTA_RM_CT_JURISDICTION1.xlsx
diff --git a/...ain/resources/uk/gov/hmcts/ccd/test_definitions/valid/BEFTA_MASTER/common/AccessType.json b/...ain/resources/uk/gov/hmcts/ccd/test_definitions/valid/BEFTA_MASTER/common/AccessType.json
@@ -22,28 +22,4 @@
   "Description" : "BEFTA bulk Solicitor Respondent for Org description2",
   "HintText" : "BEFTA bulk Solicitor Respondent for Org hint2",
   "DisplayOrder" : 2
-}, {
-  "LiveFrom" : "01/01/2023",
-  "LiveTo" : "",
-  "CaseTypeID" : "FT_MasterCaseType",
-  "AccessTypeID" : "BEFTA_SOLICITOR_1",
-  "OrganisationProfileID" : "SOLICITOR_PROFILE",
-  "AccessMandatory" : "Yes",
-  "AccessDefault" : "Yes",
-  "Display" : "Yes",
-  "Description" : "BEFTA bulk Solicitor Respondent for Org description",
-  "HintText" : "BEFTA bulk Solicitor Respondent for Org hint",
-  "DisplayOrder" : 1
-}, {
-  "LiveFrom" : "01/01/2023",
-  "LiveTo" : "",
-  "CaseTypeID" : "FT_MasterCaseType",
-  "AccessTypeID" : "BEFTA_SOLICITOR_2",
-  "OrganisationProfileID" : "OGD_DWP_PROFILE",
-  "AccessMandatory" : "Yes",
-  "AccessDefault" : "Yes",
-  "Display" : "Yes",
-  "Description" : "BEFTA bulk Solicitor Respondent for Org description2",
-  "HintText" : "BEFTA bulk Solicitor Respondent for Org hint2",
-  "DisplayOrder" : 2
 } ]
diff --git a/...resources/uk/gov/hmcts/ccd/test_definitions/valid/BEFTA_MASTER/common/AccessTypeRole.json b/...resources/uk/gov/hmcts/ccd/test_definitions/valid/BEFTA_MASTER/common/AccessTypeRole.json
@@ -31,37 +31,4 @@
   "CaseAssignedRoleField" : "GroupRole2",
   "GroupAccessEnabled" : "Yes",
   "CaseAccessGroupIDTemplate" : ""
-}, {
-  "LiveFrom" : "01/01/2023",
-  "LiveTo" : "",
-  "CaseTypeID" : "FT_MasterCaseType",
-  "AccessTypeID" : "BEFTA_SOLICITOR_1",
-  "OrganisationProfileID" : "SOLICITOR_PROFILE",
-  "OrganisationalRoleName" : "Role1",
-  "GroupRoleName" : "Role1",
-  "CaseAssignedRoleField" : "GroupRole1",
-  "GroupAccessEnabled" : "Yes",
-  "CaseAccessGroupIDTemplate" : "BEFTA_MASTER:$ORGID$"
-}, {
-  "LiveFrom" : "01/01/2023",
-  "LiveTo" : "",
-  "CaseTypeID" : "FT_MasterCaseType",
-  "AccessTypeID" : "BEFTA_SOLICITOR_2",
-  "OrganisationProfileID" : "OGD_DWP_PROFILE",
-  "OrganisationalRoleName" : "Role1",
-  "GroupRoleName" : "Role1",
-  "CaseAssignedRoleField" : "GroupRole1",
-  "GroupAccessEnabled" : "Yes",
-  "CaseAccessGroupIDTemplate" : "BEFTA_MASTER:$ORGID$"
-}, {
-  "LiveFrom" : "01/01/2023",
-  "LiveTo" : "",
-  "CaseTypeID" : "FT_MasterCaseType",
-  "AccessTypeID" : "BEFTA_SOLICITOR_2",
-  "OrganisationProfileID" : "OGD_DWP_PROFILE",
-  "OrganisationalRoleName" : "Role1",
-  "GroupRoleName" : "",
-  "CaseAssignedRoleField" : "GroupRole2",
-  "GroupAccessEnabled" : "Yes",
-  "CaseAccessGroupIDTemplate" : ""
 } ]
diff --git a/...es/uk/gov/hmcts/ccd/test_definitions/valid/CCD_BEFTA_JURISDICTION1/common/AccessType.json b/...es/uk/gov/hmcts/ccd/test_definitions/valid/CCD_BEFTA_JURISDICTION1/common/AccessType.json
@@ -7,8 +7,8 @@
   "AccessMandatory" : "Yes",
   "AccessDefault" : "Yes",
   "Display" : "Yes",
-  "Description" : "BEFTA bulk Solicitor 2  Respondant for Org description2",
-  "HintText" : "BEFTA bulk Solicitor 2 Respondant for Org hint2",
+  "Description" : "BEFTA bulk Solicitor 2  Respondent for Org description2",
+  "HintText" : "BEFTA bulk Solicitor 2 Respondent for Org hint2",
   "DisplayOrder" : 1
 }, {
   "LiveFrom" : "01/01/2023",
@@ -19,7 +19,7 @@
   "AccessMandatory" : "Yes",
   "AccessDefault" : "Yes",
   "Display" : "Yes",
-  "Description" : "BEFTA Solicitor Profile  Respondant for Org description",
-  "HintText" : "BEFTA Solicitor Profile Respondant for Org hint",
+  "Description" : "BEFTA Solicitor Profile  Respondent for Org description",
+  "HintText" : "BEFTA Solicitor Profile Respondent for Org hint",
   "DisplayOrder" : 2
 } ]
diff --git a/...hmcts/ccd/test_definitions/valid/CCD_BEFTA_JURISDICTION1/common/RoleToAccessProfiles.json b/...hmcts/ccd/test_definitions/valid/CCD_BEFTA_JURISDICTION1/common/RoleToAccessProfiles.json
@@ -16,4 +16,13 @@
   "AccessProfiles" : "caseworker-befta_jurisdiction_1",
   "ReadOnly" : "No",
   "Disabled" : "No"
+}, {
+  "LiveFrom" : "01/01/2017",
+  "LiveTo" : "",
+  "RoleName" : "idam:caseworker-befta_jurisdiction_1",
+  "Authorisation" : "",
+  "CaseTypeID" : "CaseAccessGroups_Casetype",
+  "AccessProfiles" : "caseworker-befta_jurisdiction_1",
+  "ReadOnly" : "No",
+  "Disabled" : "No"
 } ]
diff --git a/...ccd/test_definitions/valid/CCD_BEFTA_RM_CT_JURISDICTION1/common/RoleToAccessProfiles.json b/...ccd/test_definitions/valid/CCD_BEFTA_RM_CT_JURISDICTION1/common/RoleToAccessProfiles.json
@@ -16,4 +16,13 @@
   "AccessProfiles" : "caseworker-befta_jurisdiction_1",
   "ReadOnly" : "No",
   "Disabled" : "No"
+}, {
+  "LiveFrom" : "01/01/2017",
+  "LiveTo" : "",
+  "RoleName" : "idam:caseworker-befta_jurisdiction_1",
+  "Authorisation" : "",
+  "CaseTypeID" : "CaseAccessGroups_Casetype",
+  "AccessProfiles" : "caseworker-befta_jurisdiction_1",
+  "ReadOnly" : "No",
+  "Disabled" : "No"
 } ]