Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cot 519 fpl add extra roles #1576

Merged
merged 8 commits into from
Sep 18, 2023
Merged

Cot 519 fpl add extra roles #1576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a0ea70a
COT-519 - Add extra roles/rules to AM role mapping - JOH and Roles Dr…
mikebrownccd Sep 13, 2023
8a2bb8f
JOH Drools rules reordered and renumbered to better and Appointment n…
mikebrownccd Sep 13, 2023
941a0a5
duplicate JOH rule publiclaw_district_judge_mc_sptw_joh removed, refe…
mikebrownccd Sep 14, 2023
646128f
hearing-manager role rule refactored to only exclude Magistrate from …
mikebrownccd Sep 14, 2023
e43f550
comment added
mikebrownccd Sep 14, 2023
33c5263
Merge branch 'master' into COT-519_FPL_Add_Extra_Roles
mikebrownccd Sep 14, 2023
4517603
more hearing flags plus assertions added
mikebrownccd Sep 14, 2023
126d3e1
service_name in db scripts correct to publiclaw
mikebrownccd Sep 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/uk/gov/hmcts/reform/orgrolemapping/domain/model/enums/FeatureFlagEnum.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
7 changes: 7 additions & 0 deletions ...ain/resources/db/migration/V20230912_519__COT-519_PUBLICLAW_WA_1_1_base_flag_addition.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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');
11 changes: 2 additions & 9 deletions src/main/resources/validationrules/core/hearing-role-judicial-global.drl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
Expand Down
Loading