From a8a5d04b526a4f682b7d661f12e508ccbaf24843 Mon Sep 17 00:00:00 2001 From: "fergus.oshea" Date: Tue, 28 Nov 2023 10:54:12 +0000 Subject: [PATCH] RET-4515: Add ReferralNumber to Referral Task Names --- ...-initiation-employment-et_englandwales.dmn | 81 +++++++++++++++---- ...task-initiation-employment-et_scotland.dmn | 73 ++++++++++++++--- .../dmn/EmploymentTaskInitiationTestEW.java | 24 +++--- .../dmn/EmploymentTaskInitiationTestScot.java | 24 +++--- 4 files changed, 152 insertions(+), 50 deletions(-) diff --git a/src/main/resources/wa-task-initiation-employment-et_englandwales.dmn b/src/main/resources/wa-task-initiation-employment-et_englandwales.dmn index 845908ba..84d0c281 100644 --- a/src/main/resources/wa-task-initiation-employment-et_englandwales.dmn +++ b/src/main/resources/wa-task-initiation-employment-et_englandwales.dmn @@ -1,6 +1,12 @@ - + + + + + + + @@ -103,19 +109,19 @@ else null if(additionalData != null and additionalData.Data != null -and additionalData.Data.etInitialConsiderationRule27 != null +and additionalData.Data.etInitialConsiderationRule27 != null and additionalData.Data.etInitialConsiderationRule27.etICRule27ClaimToBe != null) then additionalData.Data.etInitialConsiderationRule27.etICRule27ClaimToBe else if (additionalData != null and additionalData.Data != null -and additionalData.Data.etInitialConsiderationRule28 != null +and additionalData.Data.etInitialConsiderationRule28 != null and additionalData.Data.etInitialConsiderationRule28.etICRule28ClaimToBe != null) then additionalData.Data.etInitialConsiderationRule28.etICRule28ClaimToBe else null - + @@ -203,8 +209,7 @@ else null "ReviewReferralAdmin" - "Review Referral - " -+ sort(additionalData.Data.referralCollection, function(x,y) number(x.value.referralNumber) > number(y.value.referralNumber)).value.referralSubject[1] + LATEST_REFERRAL_TASK_NAME @@ -345,8 +350,7 @@ else null "ReviewReferralJudiciary" - "Review Referral - " -+ sort(additionalData.Data.referralCollection, function(x,y) number(x.value.referralNumber) > number(y.value.referralNumber)).value.referralSubject[1] + LATEST_REFERRAL_TASK_NAME @@ -440,8 +444,7 @@ else null "ReviewReferralLegalOps" - "Review Referral - " -+ sort(additionalData.Data.referralCollection, function(x,y) number(x.value.referralNumber) > number(y.value.referralNumber)).value.referralSubject[1] + LATEST_REFERRAL_TASK_NAME @@ -488,8 +491,7 @@ else null "ReviewReferralResponseAdmin" - "Review Referral Response - " -+ sort(flatten(additionalData.Data.referralCollection[value.referralReplyCollection!=null].value.referralReplyCollection), function(x,y) date and time(if(x.value.replyDateTime!=null)then x.value.replyDateTime else "2023-01-01T00:00:00.000") > date and time(if(y.value.replyDateTime!=null)then y.value.replyDateTime else "2023-01-01T00:00:00.000")).value.referralSubject[1] + LATEST_REFERRAL_REPLY_TASK_NAME @@ -536,8 +538,7 @@ else null "ReviewReferralResponseJudiciary" - "Review Referral Response - " -+ sort(flatten(additionalData.Data.referralCollection[value.referralReplyCollection!=null].value.referralReplyCollection), function(x,y) date and time(if(x.value.replyDateTime!=null)then x.value.replyDateTime else "2023-01-01T00:00:00.000") > date and time(if(y.value.replyDateTime!=null)then y.value.replyDateTime else "2023-01-01T00:00:00.000")).value.referralSubject[1] + LATEST_REFERRAL_REPLY_TASK_NAME @@ -584,8 +585,7 @@ else null "ReviewReferralResponseLegalOps" - "Review Referral Response - " -+ sort(flatten(additionalData.Data.referralCollection[value.referralReplyCollection!=null].value.referralReplyCollection), function(x,y) date and time(if(x.value.replyDateTime!=null)then x.value.replyDateTime else "2023-01-01T00:00:00.000") > date and time(if(y.value.replyDateTime!=null)then y.value.replyDateTime else "2023-01-01T00:00:00.000")).value.referralSubject[1] + LATEST_REFERRAL_REPLY_TASK_NAME @@ -1545,10 +1545,57 @@ else null + + + + if(additionalData!=null +and additionalData.Data!=null +and additionalData.Data.referralCollection!=null +and count(additionalData.Data.referralCollection[count(value.referralReplyCollection)>0])>0) +then +"Review Referral #" ++ sort(flatten(additionalData.Data.referralCollection[value.referralReplyCollection!=null].value.referralReplyCollection), function(x,y) date and time(if(x.value.replyDateTime!=null)then x.value.replyDateTime else "2023-01-01T00:00:00.000") > date and time(if(y.value.replyDateTime!=null)then y.value.replyDateTime else "2023-01-01T00:00:00.000"))[1].value.referralNumber ++ " - " ++ sort(flatten(additionalData.Data.referralCollection[value.referralReplyCollection!=null].value.referralReplyCollection), function(x,y) date and time(if(x.value.replyDateTime!=null)then x.value.replyDateTime else "2023-01-01T00:00:00.000") > date and time(if(y.value.replyDateTime!=null)then y.value.replyDateTime else "2023-01-01T00:00:00.000"))[1].value.referralSubject ++ " Response" +else null + + + + + + if(additionalData!=null +and additionalData.Data!=null +and additionalData.Data.referralCollection!=null +and count(additionalData.Data.referralCollection) > 0) +then +"Review Referral #" ++ sort(additionalData.Data.referralCollection, function(x,y) number(x.value.referralNumber) > number(y.value.referralNumber))[1].value.referralNumber ++ " - " ++ sort(additionalData.Data.referralCollection, function(x,y) number(x.value.referralNumber) > number(y.value.referralNumber))[1].value.referralSubject +else null + + - + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/wa-task-initiation-employment-et_scotland.dmn b/src/main/resources/wa-task-initiation-employment-et_scotland.dmn index d0b06111..1a974006 100644 --- a/src/main/resources/wa-task-initiation-employment-et_scotland.dmn +++ b/src/main/resources/wa-task-initiation-employment-et_scotland.dmn @@ -1,6 +1,12 @@ - + + + + + + + @@ -203,8 +209,7 @@ else null "ReviewReferralAdmin" - "Review Referral - " -+ sort(additionalData.Data.referralCollection, function(x,y) number(x.value.referralNumber) > number(y.value.referralNumber)).value.referralSubject[1] + LATEST_REFERRAL_TASK_NAME @@ -345,8 +350,7 @@ else null "ReviewReferralJudiciary" - "Review Referral - " -+ sort(additionalData.Data.referralCollection, function(x,y) number(x.value.referralNumber) > number(y.value.referralNumber)).value.referralSubject[1] + LATEST_REFERRAL_TASK_NAME @@ -440,8 +444,7 @@ else null "ReviewReferralLegalOps" - "Review Referral - " -+ sort(additionalData.Data.referralCollection, function(x,y) number(x.value.referralNumber) > number(y.value.referralNumber)).value.referralSubject[1] + LATEST_REFERRAL_TASK_NAME @@ -488,8 +491,7 @@ else null "ReviewReferralResponseAdmin" - "Review Referral Response - " -+ sort(flatten(additionalData.Data.referralCollection[value.referralReplyCollection!=null].value.referralReplyCollection), function(x,y) date and time(if(x.value.replyDateTime!=null)then x.value.replyDateTime else "2023-01-01T00:00:00.000") > date and time(if(y.value.replyDateTime!=null)then y.value.replyDateTime else "2023-01-01T00:00:00.000")).value.referralSubject[1] + LATEST_REFERRAL_REPLY_TASK_NAME @@ -536,8 +538,7 @@ else null "ReviewReferralResponseJudiciary" - "Review Referral Response - " -+ sort(flatten(additionalData.Data.referralCollection[value.referralReplyCollection!=null].value.referralReplyCollection), function(x,y) date and time(if(x.value.replyDateTime!=null)then x.value.replyDateTime else "2023-01-01T00:00:00.000") > date and time(if(y.value.replyDateTime!=null)then y.value.replyDateTime else "2023-01-01T00:00:00.000")).value.referralSubject[1] + LATEST_REFERRAL_REPLY_TASK_NAME @@ -584,8 +585,7 @@ else null "ReviewReferralResponseLegalOps" - "Review Referral Response - " -+ sort(flatten(additionalData.Data.referralCollection[value.referralReplyCollection!=null].value.referralReplyCollection), function(x,y) date and time(if(x.value.replyDateTime!=null)then x.value.replyDateTime else "2023-01-01T00:00:00.000") > date and time(if(y.value.replyDateTime!=null)then y.value.replyDateTime else "2023-01-01T00:00:00.000")).value.referralSubject[1] + LATEST_REFERRAL_REPLY_TASK_NAME @@ -1545,11 +1545,58 @@ else null + + + + if(additionalData!=null +and additionalData.Data!=null +and additionalData.Data.referralCollection!=null +and count(additionalData.Data.referralCollection) > 0) +then +"Review Referral #" ++ sort(additionalData.Data.referralCollection, function(x,y) number(x.value.referralNumber) > number(y.value.referralNumber))[1].value.referralNumber ++ " - " ++ sort(additionalData.Data.referralCollection, function(x,y) number(x.value.referralNumber) > number(y.value.referralNumber))[1].value.referralSubject +else null + + + + + + if(additionalData!=null +and additionalData.Data!=null +and additionalData.Data.referralCollection!=null +and count(additionalData.Data.referralCollection[count(value.referralReplyCollection)>0])>0) +then +"Review Referral #" ++ sort(flatten(additionalData.Data.referralCollection[value.referralReplyCollection!=null].value.referralReplyCollection), function(x,y) date and time(if(x.value.replyDateTime!=null)then x.value.replyDateTime else "2023-01-01T00:00:00.000") > date and time(if(y.value.replyDateTime!=null)then y.value.replyDateTime else "2023-01-01T00:00:00.000"))[1].value.referralNumber ++ " - " ++ sort(flatten(additionalData.Data.referralCollection[value.referralReplyCollection!=null].value.referralReplyCollection), function(x,y) date and time(if(x.value.replyDateTime!=null)then x.value.replyDateTime else "2023-01-01T00:00:00.000") > date and time(if(y.value.replyDateTime!=null)then y.value.replyDateTime else "2023-01-01T00:00:00.000"))[1].value.referralSubject ++ " Response" +else null + + + + + + + + + + + + + + + + + + diff --git a/src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskInitiationTestEW.java b/src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskInitiationTestEW.java index 026480de..d4897375 100644 --- a/src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskInitiationTestEW.java +++ b/src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskInitiationTestEW.java @@ -69,7 +69,8 @@ class EmploymentTaskInitiationTestEW extends DmnDecisionTableBaseUnitTest { + "}"; public static final String REFERRALREPLY_COLLECTION = ",\"referralReplyCollection\": [%s]"; public static final String REFERRALREPLY = "{\"value\":" - + "{\"referralSubject\":\"%s\",\"directionTo\":\"%s\",\"isUrgentReply\":\"%s\",\"replyDateTime\":\"%s\"}" + + "{\"referralNumber\": \"%s\",\"referralSubject\":\"%s\",\"directionTo\":\"%s\"" + + ",\"isUrgentReply\":\"%s\",\"replyDateTime\":\"%s\"}" + "}"; public static final String REFERRAL_ADMIN = @@ -155,7 +156,7 @@ public static Stream scenarioProvider() { List.of( mapExpectedOutput( "ReviewReferralAdmin", - "Review Referral - Referral Subject 2", + "Review Referral #2 - Referral Subject 2", "Vetting" ) ) @@ -167,7 +168,7 @@ public static Stream scenarioProvider() { List.of( mapExpectedOutput( "ReviewReferralAdmin", - "Review Referral - Hearings", + "Review Referral #2 - Hearings", "Vetting" ), mapExpectedOutput( @@ -184,7 +185,7 @@ public static Stream scenarioProvider() { List.of( mapExpectedOutput( "ReviewReferralAdmin", - "Review Referral - Judgment", + "Review Referral #2 - Judgment", "Vetting" ), mapExpectedOutput( @@ -201,7 +202,7 @@ public static Stream scenarioProvider() { List.of( mapExpectedOutput( "ReviewReferralJudiciary", - "Review Referral - Referral Subject 2", + "Review Referral #2 - Referral Subject 2", "Vetting" ) ) @@ -213,7 +214,7 @@ public static Stream scenarioProvider() { List.of( mapExpectedOutput( "ReviewReferralJudiciary", - "Review Referral - Rule 21", + "Review Referral #2 - Rule 21", "Vetting" ), mapExpectedOutput( @@ -230,7 +231,7 @@ public static Stream scenarioProvider() { List.of( mapExpectedOutput( "ReviewReferralLegalOps", - "Review Referral - Referral Subject 2", + "Review Referral #2 - Referral Subject 2", "Vetting" ) ) @@ -242,7 +243,7 @@ public static Stream scenarioProvider() { List.of( mapExpectedOutput( "ReviewReferralResponseAdmin", - "Review Referral Response - Referral Subject 1", + "Review Referral #1 - Referral Subject 1 Response", "processing" ) ) @@ -254,7 +255,7 @@ public static Stream scenarioProvider() { List.of( mapExpectedOutput( "ReviewReferralResponseJudiciary", - "Review Referral Response - Referral Subject 1", + "Review Referral #1 - Referral Subject 1 Response", "processing" ) ) @@ -266,7 +267,7 @@ public static Stream scenarioProvider() { List.of( mapExpectedOutput( "ReviewReferralResponseLegalOps", - "Review Referral Response - Referral Subject 1", + "Review Referral #1 - Referral Subject 1 Response", "processing" ) ) @@ -605,16 +606,19 @@ private static String createReferrals( if (!referralDirectionTo.isEmpty()) { LocalDateTime now = LocalDateTime.now(); String reply1 = String.format(REFERRALREPLY, + "1", referralSubject1, referralDirectionTo, referralReplyUrgency, now.plusHours(1).format(OLD_DATE_TIME_PATTERN)); String reply2 = String.format(REFERRALREPLY, + "2", referralSubject2, referralDirectionTo, referralReplyUrgency, now.plusHours(2).format(OLD_DATE_TIME_PATTERN)); String reply3 = String.format(REFERRALREPLY, + "1", referralSubject1, referralDirectionTo, referralReplyUrgency, diff --git a/src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskInitiationTestScot.java b/src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskInitiationTestScot.java index bd69708e..343ed0bc 100644 --- a/src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskInitiationTestScot.java +++ b/src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskInitiationTestScot.java @@ -66,7 +66,8 @@ class EmploymentTaskInitiationTestScot extends DmnDecisionTableBaseUnitTest { + "}"; public static final String REFERRALREPLY_COLLECTION = ",\"referralReplyCollection\": [%s]"; public static final String REFERRALREPLY = "{\"value\":" - + "{\"referralSubject\":\"%s\",\"directionTo\":\"%s\",\"isUrgentReply\":\"%s\",\"replyDateTime\":\"%s\"}" + + "{\"referralNumber\": \"%s\",\"referralSubject\":\"%s\",\"directionTo\":\"%s\"" + + ",\"isUrgentReply\":\"%s\",\"replyDateTime\":\"%s\"}" + "}"; public static final String STRIKE_OUT_CLAIM = @@ -156,7 +157,7 @@ public static Stream scenarioProvider() { List.of( mapExpectedOutput( "ReviewReferralAdmin", - "Review Referral - Referral Subject 2", + "Review Referral #2 - Referral Subject 2", "Vetting" ) ) @@ -168,7 +169,7 @@ public static Stream scenarioProvider() { List.of( mapExpectedOutput( "ReviewReferralAdmin", - "Review Referral - Hearings", + "Review Referral #2 - Hearings", "Vetting" ), mapExpectedOutput( @@ -185,7 +186,7 @@ public static Stream scenarioProvider() { List.of( mapExpectedOutput( "ReviewReferralAdmin", - "Review Referral - Judgment", + "Review Referral #2 - Judgment", "Vetting" ), mapExpectedOutput( @@ -202,7 +203,7 @@ public static Stream scenarioProvider() { List.of( mapExpectedOutput( "ReviewReferralJudiciary", - "Review Referral - Referral Subject 2", + "Review Referral #2 - Referral Subject 2", "Vetting" ) ) @@ -214,7 +215,7 @@ public static Stream scenarioProvider() { List.of( mapExpectedOutput( "ReviewReferralJudiciary", - "Review Referral - Rule 21", + "Review Referral #2 - Rule 21", "Vetting" ), mapExpectedOutput( @@ -231,7 +232,7 @@ public static Stream scenarioProvider() { List.of( mapExpectedOutput( "ReviewReferralLegalOps", - "Review Referral - Referral Subject 2", + "Review Referral #2 - Referral Subject 2", "Vetting" ) ) @@ -243,7 +244,7 @@ public static Stream scenarioProvider() { List.of( mapExpectedOutput( "ReviewReferralResponseAdmin", - "Review Referral Response - Referral Subject 1", + "Review Referral #1 - Referral Subject 1 Response", "processing" ) ) @@ -255,7 +256,7 @@ public static Stream scenarioProvider() { List.of( mapExpectedOutput( "ReviewReferralResponseJudiciary", - "Review Referral Response - Referral Subject 1", + "Review Referral #1 - Referral Subject 1 Response", "processing" ) ) @@ -267,7 +268,7 @@ public static Stream scenarioProvider() { List.of( mapExpectedOutput( "ReviewReferralResponseLegalOps", - "Review Referral Response - Referral Subject 1", + "Review Referral #1 - Referral Subject 1 Response", "processing" ) ) @@ -606,16 +607,19 @@ private static String createReferrals( if (!referralDirectionTo.isEmpty()) { LocalDateTime now = LocalDateTime.now(); String reply1 = String.format(REFERRALREPLY, + "1", referralSubject1, referralDirectionTo, referralReplyUrgency, now.plusHours(1).format(OLD_DATE_TIME_PATTERN)); String reply2 = String.format(REFERRALREPLY, + "2", referralSubject2, referralDirectionTo, referralReplyUrgency, now.plusHours(2).format(OLD_DATE_TIME_PATTERN)); String reply3 = String.format(REFERRALREPLY, + "1", referralSubject1, referralDirectionTo, referralReplyUrgency,