From 2a994ce2a3a0ccd28779be930eb31c38bfc33cd6 Mon Sep 17 00:00:00 2001 From: Anthony Dummer Date: Wed, 10 Jan 2024 15:55:17 +0000 Subject: [PATCH] COT-694 region to be handeled in the same was as primary location if not present in booking, use joh value. --- .../validationrules/sscs/sscs-judicial-org-role-mapping.drl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/validationrules/sscs/sscs-judicial-org-role-mapping.drl b/src/main/resources/validationrules/sscs/sscs-judicial-org-role-mapping.drl index 96daf06f8..f16411023 100644 --- a/src/main/resources/validationrules/sscs/sscs-judicial-org-role-mapping.drl +++ b/src/main/resources/validationrules/sscs/sscs-judicial-org-role-mapping.drl @@ -107,7 +107,8 @@ then attribute.put("contractType", JacksonUtils.convertObjectIntoJsonNode("Fee-Paid")); attribute.put("workTypes", JacksonUtils.convertObjectIntoJsonNode("pre_hearing,hearing_work,post_hearing," + "decision_making_work,routine_work,priority")); - attribute.put("region", JacksonUtils.convertObjectIntoJsonNode($bk.getRegionId())); + attribute.put("region", JacksonUtils.convertObjectIntoJsonNode($bk.getRegionId() != null ? + $bk.getRegionId():$joh.getRegionId())); insert( RoleAssignment.builder() .actorIdType(ActorIdType.IDAM)