Merge pull request #1576 from hmcts/COT-519_FPL_Add_Extra_Roles

Cot 519 fpl add extra roles
hmcts · Sep 18, 2023 · ba092e1 · ba092e1
2 parents f734d0d + 126d3e1
commit ba092e1
Show file tree

Hide file tree

Showing 6 changed files with 351 additions and 46 deletions.
diff --git a/src/main/java/uk/gov/hmcts/reform/orgrolemapping/domain/model/enums/FeatureFlagEnum.java b/src/main/java/uk/gov/hmcts/reform/orgrolemapping/domain/model/enums/FeatureFlagEnum.java
@@ -13,7 +13,8 @@ public enum FeatureFlagEnum {
     PRIVATELAW_WA_1_1("privatelaw_wa_1_1"),
     EMPLOYMENT_WA_1_0("employment_wa_1_0"),
     PRIVATELAW_WA_1_2("privatelaw_wa_1_2"),
-    ST_CIC_WA_1_0("st_cic_wa_1_0");
+    ST_CIC_WA_1_0("st_cic_wa_1_0"),
+    PUBLICLAW_WA_1_1("publiclaw_wa_1_1");
 
     private final String value;
 

diff --git a/...ain/resources/db/migration/V20230912_519__COT-519_PUBLICLAW_WA_1_1_base_flag_addition.sql b/...ain/resources/db/migration/V20230912_519__COT-519_PUBLICLAW_WA_1_1_base_flag_addition.sql
@@ -0,0 +1,7 @@
+INSERT INTO flag_config (flag_name, env, service_name, status) VALUES ('publiclaw_wa_1_1', 'local', 'publiclaw', 'true');
+INSERT INTO flag_config (flag_name, env, service_name, status) VALUES ('publiclaw_wa_1_1', 'pr', 'publiclaw', 'true');
+INSERT INTO flag_config (flag_name, env, service_name, status) VALUES ('publiclaw_wa_1_1', 'aat', 'publiclaw', 'false');
+INSERT INTO flag_config (flag_name, env, service_name, status) VALUES ('publiclaw_wa_1_1', 'demo', 'publiclaw', 'false');
+INSERT INTO flag_config (flag_name, env, service_name, status) VALUES ('publiclaw_wa_1_1', 'perftest', 'publiclaw', 'false');
+INSERT INTO flag_config (flag_name, env, service_name, status) VALUES ('publiclaw_wa_1_1', 'ithc', 'publiclaw', 'false');
+INSERT INTO flag_config (flag_name, env, service_name, status) VALUES ('publiclaw_wa_1_1', 'prod', 'publiclaw', 'false');
diff --git a/src/main/resources/validationrules/core/hearing-role-judicial-global.drl b/src/main/resources/validationrules/core/hearing-role-judicial-global.drl
@@ -53,15 +53,8 @@ import function uk.gov.hmcts.reform.orgrolemapping.domain.service.RequestMapping
   rule "global_hearing_manager_judicial"
   when
     $f:  FeatureFlag(status && flagName == FeatureFlagEnum.SSCS_HEARING_1_0.getValue())
-    $joh: JudicialOfficeHolder(office in (
-    "PUBLICLAW District Judge - Salaried", "PUBLICLAW District Judge (MC) - SPTW",
-    "PUBLICLAW High Court Judge - Salaried", "PUBLICLAW Circuit Judge - Salaried",
-    "PUBLICLAW Deputy District Judge (MC) - Fee Paid", "PUBLICLAW Deputy District Judge (MC) - Sitting in Retirement",
-    "PUBLICLAW Deputy District Judge - Fee Paid", "PUBLICLAW Deputy District Judge - Sitting in Retirement - Fee Paid",
-    "PUBLICLAW Deputy District Judge - PRFD - Fee Paid", "PUBLICLAW Deputy High Court Judge - Fee Paid",
-    "PUBLICLAW High Court Judge - Sitting in Retirement - Fee Paid",
-    "PUBLICLAW Designated Family Judge - Salaried", "PUBLICLAW District Judge (MC) - Salaried",
-    "PUBLICLAW Deputy Circuit Judge - Fee Paid","PUBLICLAW Recorder - Fee Paid"))
+    $joh: JudicialOfficeHolder( jurisdiction in ("PUBLICLAW") &&
+                                office not in ("PUBLICLAW Magistrate - Voluntary"))
   then
      Map<String,JsonNode> attribute = new HashMap<>();
      attribute.put("jurisdiction", JacksonUtils.convertObjectIntoJsonNode($joh.getJurisdiction()));