From 7ace4bef0e2682cfa99ba7a3027a0cd8cf6fafcb Mon Sep 17 00:00:00 2001 From: "fergus.oshea" Date: Thu, 9 Nov 2023 11:17:19 +0000 Subject: [PATCH] RET-4397: Add accommodation for old cases that have no datetime in reply fields --- ...task-configuration-employment-et_englandwales.dmn | 7 +++---- .../wa-task-configuration-employment-et_scotland.dmn | 7 +++---- ...wa-task-initiation-employment-et_englandwales.dmn | 12 ++++++------ .../wa-task-initiation-employment-et_scotland.dmn | 12 ++++++------ .../dmn/EmploymentTaskConfigurationTestEW.java | 1 - .../dmn/EmploymentTaskConfigurationTestScot.java | 1 - .../dmn/EmploymentTaskInitiationTestEW.java | 4 ++-- .../dmn/EmploymentTaskInitiationTestScot.java | 4 ++-- 8 files changed, 22 insertions(+), 26 deletions(-) diff --git a/src/main/resources/wa-task-configuration-employment-et_englandwales.dmn b/src/main/resources/wa-task-configuration-employment-et_englandwales.dmn index 5a1d94b1..007b4cf1 100644 --- a/src/main/resources/wa-task-configuration-employment-et_englandwales.dmn +++ b/src/main/resources/wa-task-configuration-employment-et_englandwales.dmn @@ -109,7 +109,6 @@ else caseData.claimantIndType.claimant_first_names + " " + caseData.claimantIndT "ET3Processing", "ReviewReferralResponseLegalOps", "ReviewReferralResponseAdmin", -"ET3Notification", "IssueInitialConsiderationDirections", "ReviewRule21Referral", "SendEt3Notification" @@ -674,7 +673,7 @@ else 5000 if (caseData != null and caseData.referralCollection != null and count(caseData.referralCollection[count(value.referralReplyCollection)>0])>0 -and sort(flatten(caseData.referralCollection.value.referralReplyCollection), function(x,y) date and time(x.value.replyDateTime) > date and time(y.value.replyDateTime))[1].value.isUrgentReply = "Yes") +and sort(flatten(caseData.referralCollection.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.isUrgentReply = "Yes") then 1000 else 5000 @@ -753,7 +752,7 @@ else 500 if (caseData!=null and caseData.referralCollection != null and count(caseData.referralCollection[count(value.referralReplyCollection)>0])>0 -and sort(flatten(caseData.referralCollection.value.referralReplyCollection), function(x,y) date and time(x.value.replyDateTime) > date and time(y.value.replyDateTime))[1].value.isUrgentReply = "Yes") +and sort(flatten(caseData.referralCollection.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.isUrgentReply = "Yes") then 100 else 500 @@ -920,7 +919,7 @@ else 2 if (caseData!=null and caseData.referralCollection != null and count(caseData.referralCollection[count(value.referralReplyCollection)>0])>0 -and sort(flatten(caseData.referralCollection.value.referralReplyCollection), function(x,y) date and time(x.value.replyDateTime) > date and time(y.value.replyDateTime))[1].value.isUrgentReply = "Yes") +and sort(flatten(caseData.referralCollection.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.isUrgentReply = "Yes") then 1 else 2 diff --git a/src/main/resources/wa-task-configuration-employment-et_scotland.dmn b/src/main/resources/wa-task-configuration-employment-et_scotland.dmn index e4cd04eb..b1513c36 100644 --- a/src/main/resources/wa-task-configuration-employment-et_scotland.dmn +++ b/src/main/resources/wa-task-configuration-employment-et_scotland.dmn @@ -109,7 +109,6 @@ else caseData.claimantIndType.claimant_first_names + " " + caseData.claimantIndT "ET3Processing", "ReviewReferralResponseLegalOps", "ReviewReferralResponseAdmin", -"ET3Notification", "IssueInitialConsiderationDirections", "ReviewRule21Referral", "SendEt3Notification" @@ -674,7 +673,7 @@ else 5000 if (caseData!=null and caseData.referralCollection != null and count(caseData.referralCollection[count(value.referralReplyCollection)>0])>0 -and sort(flatten(caseData.referralCollection.value.referralReplyCollection), function(x,y) date and time(x.value.replyDateTime) > date and time(y.value.replyDateTime))[1].value.isUrgentReply = "Yes") +and sort(flatten(caseData.referralCollection.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.isUrgentReply = "Yes") then 1000 else 5000 @@ -753,7 +752,7 @@ else 500 if (caseData!=null and caseData.referralCollection != null and count(caseData.referralCollection[count(value.referralReplyCollection)>0])>0 -and sort(flatten(caseData.referralCollection.value.referralReplyCollection), function(x,y) date and time(x.value.replyDateTime) > date and time(y.value.replyDateTime))[1].value.isUrgentReply = "Yes") +and sort(flatten(caseData.referralCollection.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.isUrgentReply = "Yes") then 100 else 500 @@ -920,7 +919,7 @@ else 2 if (caseData!=null and caseData.referralCollection != null and count(caseData.referralCollection[count(value.referralReplyCollection)>0])>0 -and sort(flatten(caseData.referralCollection.value.referralReplyCollection), function(x,y) date and time(x.value.replyDateTime) > date and time(y.value.replyDateTime))[1].value.isUrgentReply = "Yes") +and sort(flatten(caseData.referralCollection.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.isUrgentReply = "Yes") then 1 else 2 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 0b844bc7..ff202d50 100644 --- a/src/main/resources/wa-task-initiation-employment-et_englandwales.dmn +++ b/src/main/resources/wa-task-initiation-employment-et_englandwales.dmn @@ -38,7 +38,7 @@ else null and additionalData.Data!=null and additionalData.Data.referralCollection!=null and count(additionalData.Data.referralCollection[count(value.referralReplyCollection)>0])>0) -then sort(flatten(additionalData.Data.referralCollection[value.referralReplyCollection!=null].value.referralReplyCollection), function(x,y) date and time(x.value.replyDateTime) > date and time(y.value.replyDateTime)).value.directionTo[1] +then 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.directionTo[1] else null @@ -67,7 +67,7 @@ else null and additionalData.Data!=null and additionalData.Data.genericTseApplicationCollection!=null and count(additionalData.Data.genericTseApplicationCollection[value.respondCollection!=null])>0) -then sort(flatten(additionalData.Data.genericTseApplicationCollection[value.respondCollection!=null].value.respondCollection), function(x,y) date and time(x.value.dateTime) > date and time(y.value.dateTime))[1].value.from +then sort(flatten(additionalData.Data.genericTseApplicationCollection[value.respondCollection!=null].value.respondCollection), function(x,y) date and time(if(x.value.dateTime!=null)then x.value.dateTime else "2023-01-01T00:00:00.000") > date and time(if(y.value.dateTime!=null)then y.value.dateTime else "2023-01-01T00:00:00.000"))[1].value.from else null @@ -77,7 +77,7 @@ else null and additionalData.Data!=null and additionalData.Data.genericTseApplicationCollection!=null and count(additionalData.Data.genericTseApplicationCollection[value.respondCollection!=null])>0) -then sort(flatten(additionalData.Data.genericTseApplicationCollection[value.respondCollection!=null].value.respondCollection), function(x,y) date and time(x.value.dateTime) > date and time(y.value.dateTime))[1].value.applicationType +then sort(flatten(additionalData.Data.genericTseApplicationCollection[value.respondCollection!=null].value.respondCollection), function(x,y) date and time(if(x.value.dateTime!=null)then x.value.dateTime else "2023-01-01T00:00:00.000") > date and time(if(y.value.dateTime!=null)then y.value.dateTime else "2023-01-01T00:00:00.000"))[1].value.applicationType else null @@ -408,7 +408,7 @@ else null "Review Referral Response - " -+ sort(flatten(additionalData.Data.referralCollection[value.referralReplyCollection!=null].value.referralReplyCollection), function(x,y) date and time(x.value.replyDateTime) > date and time(y.value.replyDateTime)).value.referralSubject[1] ++ 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] @@ -450,7 +450,7 @@ else null "Review Referral Response - " -+ sort(flatten(additionalData.Data.referralCollection[value.referralReplyCollection!=null].value.referralReplyCollection), function(x,y) date and time(x.value.replyDateTime) > date and time(y.value.replyDateTime)).value.referralSubject[1] ++ 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] @@ -492,7 +492,7 @@ else null "Review Referral Response - " -+ sort(flatten(additionalData.Data.referralCollection[value.referralReplyCollection!=null].value.referralReplyCollection), function(x,y) date and time(x.value.replyDateTime) > date and time(y.value.replyDateTime)).value.referralSubject[1] ++ 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] 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 0a187cfc..7445ea0b 100644 --- a/src/main/resources/wa-task-initiation-employment-et_scotland.dmn +++ b/src/main/resources/wa-task-initiation-employment-et_scotland.dmn @@ -38,7 +38,7 @@ else null and additionalData.Data!=null and additionalData.Data.referralCollection!=null and count(additionalData.Data.referralCollection[count(value.referralReplyCollection)>0])>0) -then sort(flatten(additionalData.Data.referralCollection[value.referralReplyCollection!=null].value.referralReplyCollection), function(x,y) date and time(x.value.replyDateTime) > date and time(y.value.replyDateTime)).value.directionTo[1] +then 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.directionTo[1] else null @@ -67,7 +67,7 @@ else null and additionalData.Data!=null and additionalData.Data.genericTseApplicationCollection!=null and count(additionalData.Data.genericTseApplicationCollection[value.respondCollection!=null])>0) -then sort(flatten(additionalData.Data.genericTseApplicationCollection[value.respondCollection!=null].value.respondCollection), function(x,y) date and time(x.value.dateTime) > date and time(y.value.dateTime))[1].value.from +then sort(flatten(additionalData.Data.genericTseApplicationCollection[value.respondCollection!=null].value.respondCollection), function(x,y) date and time(if(x.value.dateTime!=null)then x.value.dateTime else "2023-01-01T00:00:00.000") > date and time(if(y.value.dateTime!=null)then y.value.dateTime else "2023-01-01T00:00:00.000"))[1].value.from else null @@ -77,7 +77,7 @@ else null and additionalData.Data!=null and additionalData.Data.genericTseApplicationCollection!=null and count(additionalData.Data.genericTseApplicationCollection[value.respondCollection!=null])>0) -then sort(flatten(additionalData.Data.genericTseApplicationCollection[value.respondCollection!=null].value.respondCollection), function(x,y) date and time(x.value.dateTime) > date and time(y.value.dateTime))[1].value.applicationType +then sort(flatten(additionalData.Data.genericTseApplicationCollection[value.respondCollection!=null].value.respondCollection), function(x,y) date and time(if(x.value.dateTime!=null)then x.value.dateTime else "2023-01-01T00:00:00.000") > date and time(if(y.value.dateTime!=null)then y.value.dateTime else "2023-01-01T00:00:00.000"))[1].value.applicationType else null @@ -408,7 +408,7 @@ else null "Review Referral Response - " -+ sort(flatten(additionalData.Data.referralCollection[value.referralReplyCollection!=null].value.referralReplyCollection), function(x,y) date and time(x.value.replyDateTime) > date and time(y.value.replyDateTime)).value.referralSubject[1] ++ 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] @@ -450,7 +450,7 @@ else null "Review Referral Response - " -+ sort(flatten(additionalData.Data.referralCollection[value.referralReplyCollection!=null].value.referralReplyCollection), function(x,y) date and time(x.value.replyDateTime) > date and time(y.value.replyDateTime)).value.referralSubject[1] ++ 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] @@ -492,7 +492,7 @@ else null "Review Referral Response - " -+ sort(flatten(additionalData.Data.referralCollection[value.referralReplyCollection!=null].value.referralReplyCollection), function(x,y) date and time(x.value.replyDateTime) > date and time(y.value.replyDateTime)).value.referralSubject[1] ++ 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] diff --git a/src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskConfigurationTestEW.java b/src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskConfigurationTestEW.java index 71db32d1..99126ac7 100644 --- a/src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskConfigurationTestEW.java +++ b/src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskConfigurationTestEW.java @@ -260,7 +260,6 @@ public static Stream workType_ScenarioProvider() { Arguments.of("ET3Processing", routineWork), Arguments.of("ReviewReferralResponseLegalOps", routineWork), Arguments.of("ReviewReferralResponseAdmin", routineWork), - Arguments.of("ET3Notification", routineWork), Arguments.of("IssueInitialConsiderationDirections", routineWork), Arguments.of("ReviewReferralJudiciary", decisionMakingWork), diff --git a/src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskConfigurationTestScot.java b/src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskConfigurationTestScot.java index 198b13b2..c1c0c292 100644 --- a/src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskConfigurationTestScot.java +++ b/src/test/java/uk/gov/hmcts/et/taskconfiguration/dmn/EmploymentTaskConfigurationTestScot.java @@ -259,7 +259,6 @@ public static Stream workType_ScenarioProvider() { Arguments.of("ET3Processing", routineWork), Arguments.of("ReviewReferralResponseLegalOps", routineWork), Arguments.of("ReviewReferralResponseAdmin", routineWork), - Arguments.of("ET3Notification", routineWork), Arguments.of("IssueInitialConsiderationDirections", routineWork), Arguments.of("ReviewReferralJudiciary", decisionMakingWork), 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 25c3f941..981429aa 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 @@ -461,7 +461,7 @@ private static Map mapExpectedOutput(String taskId, String name, private static String createApplications(String applicationType, String respondFrom) { String respondCollection = ""; - if (!"".equals(respondFrom)) { + if (!respondFrom.isEmpty()) { respondCollection = String.format(RESPOND_COLLECTION, applicationType, respondFrom); } @@ -478,7 +478,7 @@ private static String createReferrals( String replyCollection1 = ""; String replyCollection2 = ""; - if (!"".equals(referralDirectionTo)) { + if (!referralDirectionTo.isEmpty()) { LocalDateTime now = LocalDateTime.now(); String reply1 = String.format(REFERRALREPLY, referralSubject1, 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 45cfeb75..143e98e0 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 @@ -461,7 +461,7 @@ private static Map mapExpectedOutput(String taskId, String name, private static String createApplications(String applicationType, String respondFrom) { String respondCollection = ""; - if (!"".equals(respondFrom)) { + if (!respondFrom.isEmpty()) { respondCollection = String.format(RESPOND_COLLECTION, applicationType, respondFrom); } @@ -478,7 +478,7 @@ private static String createReferrals( String replyCollection1 = ""; String replyCollection2 = ""; - if (!"".equals(referralDirectionTo)) { + if (!referralDirectionTo.isEmpty()) { LocalDateTime now = LocalDateTime.now(); String reply1 = String.format(REFERRALREPLY, referralSubject1,