Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
40106e1
DFPL-2778: Judicial Messages collection update
AlistairEdwinOsborne Aug 26, 2025
2b0bc04
Merge branch 'master' into DFPL-2778
AlistairEdwinOsborne Aug 27, 2025
245dbc5
Merge branch 'master' into DFPL-2778
AlistairEdwinOsborne Aug 28, 2025
84d3e16
Merge branch 'master' into DFPL-2778
AlistairEdwinOsborne Sep 1, 2025
62aba8f
Merge branch 'master' into DFPL-2778
AlistairEdwinOsborne Sep 3, 2025
de42184
don't update old message history and add method to concat message his…
AlistairEdwinOsborne Sep 9, 2025
33907c1
update existing tests with new formatting for history/replies
AlistairEdwinOsborne Sep 10, 2025
0c0de6b
fix send new messages tests for new reply collection
AlistairEdwinOsborne Sep 10, 2025
f09b88c
checkstyle
AlistairEdwinOsborne Sep 11, 2025
a6728bf
Merge branch 'master' into DFPL-2778
AlistairEdwinOsborne Sep 15, 2025
91651ed
remove super builder and to string tag
AlistairEdwinOsborne Sep 15, 2025
5e14661
Merge branch 'master' into DFPL-2778
AlistairEdwinOsborne Sep 15, 2025
9a50ac0
checkstyle
AlistairEdwinOsborne Sep 15, 2025
e496c11
Merge remote-tracking branch 'origin/DFPL-2778' into DFPL-2778
AlistairEdwinOsborne Sep 15, 2025
8994a19
Merge branch 'master' into DFPL-2778
AlistairEdwinOsborne Sep 22, 2025
8a2c20a
Merge branch 'master' into DFPL-2778
AlistairEdwinOsborne Sep 22, 2025
888f7e3
Merge branch 'master' into DFPL-2778
AlistairEdwinOsborne Sep 24, 2025
c347aa0
Merge branch 'master' into DFPL-2778
AlistairEdwinOsborne Sep 24, 2025
d84a316
Merge branch 'master' into DFPL-2778
AlistairEdwinOsborne Sep 30, 2025
ee467fd
Merge branch 'master' into DFPL-2778
AlistairEdwinOsborne Oct 7, 2025
3daa612
fix null pointer
AlistairEdwinOsborne Oct 16, 2025
dee444f
Merge branch 'master' into DFPL-2778
AlistairEdwinOsborne Oct 17, 2025
20cd519
DFPL 2003 Judicial Message prioritisation WA task priority (#6107)
chak-shing-lo-justice Oct 16, 2025
f391ddf
use null for old message history
AlistairEdwinOsborne Oct 17, 2025
535efeb
Merge branch 'master' into DFPL-2778
AlistairEdwinOsborne Oct 22, 2025
8273927
remove string utils from interim fix
AlistairEdwinOsborne Oct 22, 2025
4a9304c
remove duplicated field from bad merge
AlistairEdwinOsborne Oct 23, 2025
7b3f607
Merge branch 'master' into DFPL-2778
prabhamuthu15 Oct 31, 2025
3e97f27
Merge branch 'master' into DFPL-2778
prabhamuthu15 Oct 31, 2025
81391ec
Merge branch 'master' into DFPL-2778
prabhamuthu15 Nov 3, 2025
3396147
add check for old system replies
AlistairEdwinOsborne Nov 3, 2025
7d0aecb
add check for old system replies in seperate else if statement
AlistairEdwinOsborne Nov 3, 2025
8181de2
checkstyle
AlistairEdwinOsborne Nov 3, 2025
b00c3e7
swap to null check
AlistairEdwinOsborne Nov 4, 2025
ae040cd
JudicialMessageUITest
prabhamuthu15 Nov 4, 2025
e9e854a
removeOnlyTag
prabhamuthu15 Nov 4, 2025
a12994c
Merge branch 'master' into DFPL-2914-test-index
chak-shing-lo-justice Nov 4, 2025
f1b5357
Merge branch 'master' into DFPL-2778
prabhamuthu15 Nov 5, 2025
e2b4125
Merge branch 'refs/heads/DFPL-2778' into DFPL-2778_UITestUpdate
prabhamuthu15 Nov 5, 2025
7bf2d9d
fix after resolving conflict
chak-shing-lo-justice Nov 5, 2025
44f5c6d
change wa urgency field name to avoid index clash
chak-shing-lo-justice Nov 5, 2025
0feb017
Merge branch 'DFPL-2778_UITestUpdate' into DFPL-2914-UITest
prabhamuthu15 Nov 5, 2025
3e200fb
updateJudicialMessageUITest
prabhamuthu15 Nov 5, 2025
2460443
rollbackAccidentlymerge
prabhamuthu15 Nov 5, 2025
19f7c3c
merge latest DFPL-2778 changes
chak-shing-lo-justice Nov 6, 2025
457fca3
removeOnlyTag
prabhamuthu15 Nov 6, 2025
50d28ed
Merge branch 'DFPL-2914-test-index' into DFPL-2914-UITest
prabhamuthu15 Nov 6, 2025
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
2 changes: 1 addition & 1 deletion Jenkinsfile_CNP
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ def deployWADmns() {

def waStandaloneBranch = "master"
// For testing DMNs, change this to the branch on the DMN repo, but ensure it is changed back to master before merging
def dmnBranch = "master"
def dmnBranch = "DFPL-2003"

echo "Checking if we should use WA"
if (githubApi.checkForLabel(env.BRANCH_NAME, 'pr-values:wa')) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7075,5 +7075,12 @@
"CaseFieldID": "markListingActionReviewed",
"UserRole": "caseworker-publiclaw-courtadmin",
"CRUD": "CRUD"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "waTaskUrgencyLevel",
"UserRole": "caseworker-publiclaw-courtadmin",
"CRUD": "CRUD"
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -5920,5 +5920,12 @@
"CaseFieldID": "guardians",
"UserRole": "caseworker-publiclaw-gatekeeper",
"CRUD": "R"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "waTaskUrgencyLevel",
"UserRole": "caseworker-publiclaw-gatekeeper",
"CRUD": "CRUD"
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -6606,5 +6606,12 @@
"CaseFieldID": "guardians",
"UserRole": "caseworker-publiclaw-judiciary",
"CRUD": "R"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "waTaskUrgencyLevel",
"UserRole": "caseworker-publiclaw-judiciary",
"CRUD": "CRUD"
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -4543,5 +4543,12 @@
"CaseFieldID": "respondentsConfirmPR",
"UserRole": "caseworker-publiclaw-systemupdate",
"CRUD": "CRU"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "waTaskUrgencyLevel",
"UserRole": "caseworker-publiclaw-systemupdate",
"CRUD": "CRUD"
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,12 @@
"CaseFieldID": "listingRequests",
"UserRole": "caseworker-wa-task-configuration",
"CRUD": "R"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"CaseFieldID": "waTaskUrgencyLevel",
"UserRole": "caseworker-wa-task-configuration",
"CRUD": "R"
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,9 @@
"ID": "JudicialMessageMetaData",
"CaseEventID": "messageJudgeOrLegalAdviser",
"CaseFieldID": "judicialMessageMetaData",
"ListElementCode": "urgency",
"ListElementCode": "isJudicialMessageUrgent",
"EventElementLabel": "Is this urgent? (is there any action that needs to be taken within 24 hours?)",
"FieldDisplayOrder": 7,
"DisplayContext": "OPTIONAL"
"DisplayContext": "MANDATORY"
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"ID": "JudicialMessageReply",
"CaseEventID": "replyToMessageJudgeOrLegalAdviser",
"CaseFieldID": "judicialMessageReply",
"ListElementCode": "messageHistory",
"ListElementCode": "messageHistoryTemp",
"FieldDisplayOrder": 5,
"DisplayContext": "READONLY",
"EventElementLabel": "Message history",
Expand All @@ -80,7 +80,7 @@
"CaseEventID": "replyToMessageJudgeOrLegalAdviser",
"CaseFieldID": "judicialMessageReply",
"ListElementCode": "isReplying",
"FieldDisplayOrder": 6,
"FieldDisplayOrder": 7,
"DisplayContext": "MANDATORY",
"EventElementLabel": "Do you need to reply?"
},
Expand All @@ -90,7 +90,7 @@
"CaseEventID": "replyToMessageJudgeOrLegalAdviser",
"CaseFieldID": "judicialMessageReply",
"ListElementCode": "senderType",
"FieldDisplayOrder": 7,
"FieldDisplayOrder": 8,
"DisplayContext": "MANDATORY",
"EventElementLabel": "Sender",
"FieldShowCondition": "judicialMessageReply.isReplying=\"DO_NOT_SHOW\""
Expand All @@ -101,7 +101,7 @@
"CaseEventID": "replyToMessageJudgeOrLegalAdviser",
"CaseFieldID": "judicialMessageReply",
"ListElementCode": "replyFrom",
"FieldDisplayOrder": 8,
"FieldDisplayOrder": 9,
"DisplayContext": "MANDATORY",
"EventElementLabel": "Sender's email address",
"FieldShowCondition": "judicialMessageReply.isReplying=\"DO_NOT_SHOW\""
Expand All @@ -112,7 +112,7 @@
"CaseEventID": "replyToMessageJudgeOrLegalAdviser",
"CaseFieldID": "judicialMessageReply",
"ListElementCode": "recipientType",
"FieldDisplayOrder": 9,
"FieldDisplayOrder": 10,
"DisplayContext": "MANDATORY",
"EventElementLabel": "Recipient",
"FieldShowCondition": "judicialMessageReply.isReplying=\"DO_NOT_SHOW\""
Expand All @@ -123,7 +123,7 @@
"CaseEventID": "replyToMessageJudgeOrLegalAdviser",
"CaseFieldID": "judicialMessageReply",
"ListElementCode": "recipientDynamicList",
"FieldDisplayOrder": 9,
"FieldDisplayOrder": 11,
"DisplayContext": "MANDATORY",
"FieldShowCondition": "judicialMessageReply.isReplying=\"Yes\""
},
Expand All @@ -133,7 +133,7 @@
"CaseEventID": "replyToMessageJudgeOrLegalAdviser",
"CaseFieldID": "judicialMessageReply",
"ListElementCode": "otherJudgeWarningLabel",
"FieldDisplayOrder": 10,
"FieldDisplayOrder": 12,
"FieldShowCondition": "judicialMessageReply.recipientDynamicList = \"OTHER\" AND isSendingEmailsInCourt = \"NO\" AND judicialMessageReply.isReplying=\"Yes\"",
"DisplayContext": "MANDATORY"
},
Expand All @@ -143,18 +143,29 @@
"CaseEventID": "replyToMessageJudgeOrLegalAdviser",
"CaseFieldID": "judicialMessageReply",
"ListElementCode": "replyTo",
"FieldDisplayOrder": 12,
"FieldDisplayOrder": 13,
"DisplayContext": "MANDATORY",
"EventElementLabel": "Recipient's email address",
"FieldShowCondition": "(judicialMessageReply.recipientDynamicList=\"LOCAL_COURT_ADMIN\" OR judicialMessageReply.recipientDynamicList=\"OTHER\") AND isSendingEmailsInCourt = \"YES\" AND judicialMessageReply.isReplying=\"Yes\""
},
{
"LiveFrom": "01/01/2017",
"ID": "JudicialMessageReply",
"CaseEventID": "replyToMessageJudgeOrLegalAdviser",
"CaseFieldID": "judicialMessageReply",
"ListElementCode": "isJudicialMessageUrgent",
"EventElementLabel": "Is this urgent? (is there any action that needs to be taken within 24 hours?)",
"FieldDisplayOrder": 14,
"DisplayContext": "MANDATORY",
"FieldShowCondition": "judicialMessageReply.isReplying=\"Yes\""
},
{
"LiveFrom": "01/01/2017",
"ID": "JudicialMessageReply",
"CaseEventID": "replyToMessageJudgeOrLegalAdviser",
"CaseFieldID": "judicialMessageReply",
"ListElementCode": "latestMessage",
"FieldDisplayOrder": 13,
"FieldDisplayOrder": 15,
"DisplayContext": "MANDATORY",
"EventElementLabel": "Reply",
"FieldShowCondition": "judicialMessageReply.isReplying=\"Yes\""
Expand All @@ -166,7 +177,7 @@
"CaseFieldID": "judicialMessageReply",
"ListElementCode": "closureNote",
"EventElementLabel": "Add closure note",
"FieldDisplayOrder": 12,
"FieldDisplayOrder": 16,
"DisplayContext": "OPTIONAL",
"FieldShowCondition": "judicialMessageReply.isReplying=\"No\""
},
Expand All @@ -177,7 +188,7 @@
"CaseFieldID": "judicialMessageReply",
"ListElementCode": "closeMessageLabel",
"EventElementLabel": "This message will now be marked as closed",
"FieldDisplayOrder": 13,
"FieldDisplayOrder": 17,
"DisplayContext": "READONLY",
"FieldShowCondition": "judicialMessageReply.isReplying=\"No\""
}
Expand Down
10 changes: 10 additions & 0 deletions ccd-definition/CaseField/CareSupervision/workAllocation.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,15 @@
"Label": "Last upload draft order event resulted in a review order task",
"SecurityClassification": "Public",
"Searchable": "N"
},
{
"LiveFrom": "01/01/2017",
"CaseTypeID": "CARE_SUPERVISION_EPO",
"ID": "waTaskUrgencyLevel",
"Label": " ",
"FieldType": "Text",
"SecurityClassification": "Public",
"Searchable": "N",
"Comment": "Field to store the task urgency value for WA task going to be created"
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"TabLabel": "Judicial messages",
"TabDisplayOrder": 11,
"CaseFieldID": "judicialMessages",
"DisplayContextParameter": "#TABLE(dateSent, senderType, recipientType, isJudicialMessageUrgent, status, requestedBy)",
"TabFieldDisplayOrder": 4,
"FieldShowCondition": "judicialMessages!=\"\""
},
Expand All @@ -71,6 +72,7 @@
"TabLabel": "Closed messages",
"TabDisplayOrder": 13,
"CaseFieldID": "closedJudicialMessages",
"DisplayContextParameter": "#TABLE(dateSent, senderType, recipientType, isJudicialMessageUrgent, status, requestedBy)",
"TabFieldDisplayOrder": 6
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -203,27 +203,35 @@
"ID": "JudicialMessage",
"ListElementCode": "messageHistory",
"FieldType": "TextArea",
"ElementLabel": "Message history",
"ElementLabel": "Message history (old)",
"SecurityClassification": "Public"
},
{
"LiveFrom": "01/01/2017",
"ID": "JudicialMessage",
"ListElementCode": "closeMessageLabel",
"FieldType": "Label",
"ElementLabel": "This message will now be marked as closed",
"SecurityClassification": "Public",
"FieldShowCondition": "closeMessageLabel=\"DO_NOT_SHOW\""
"ListElementCode": "judicialMessageReplies",
"FieldType": "Collection",
"FieldTypeParameter": "JudicialMessageReply",
"ElementLabel": "Message history",
"SecurityClassification": "Public"
},
{
"LiveFrom": "01/01/2017",
"ID": "JudicialMessage",
"ListElementCode": "judicialMessageReplies",
"FieldType": "Collection",
"FieldTypeParameter": "JudicialMessageReply",
"ListElementCode": "messageHistoryTemp",
"FieldType": "TextArea",
"ElementLabel": "Message history",
"SecurityClassification": "Public"
},
{
"LiveFrom": "01/01/2017",
"ID": "JudicialMessage",
"ListElementCode": "closeMessageLabel",
"FieldType": "Label",
"ElementLabel": "This message will now be marked as closed",
"SecurityClassification": "Public",
"FieldShowCondition": "closeMessageLabel=\"DO_NOT_SHOW\""
},
{
"LiveFrom": "01/01/2017",
"ID": "JudicialMessage",
Expand Down
39 changes: 20 additions & 19 deletions playwright-e2e/caseData/caseWithJudgeMessage.json
Original file line number Diff line number Diff line change
Expand Up @@ -212,30 +212,31 @@
},
"judicialMessages": [
{
"id": "c09eb60e-facc-4af6-9761-3e23f6748673",
"id": "a285ed58-eb62-44a6-baea-38c67e16ebca",
"value": {
"applicationType": "C2, 25 March 2021, 3:16pm",
"dateSent": "16 November 2023 at 4:51pm",
"latestMessage": "Some note",
"messageHistory": "FamilyPublicLaw+ctsc@gmail.com - Some note",
"recipient": "recipient@fpla.com",
"recipientType": "HEARING_JUDGE",
"relatedDocumentFileNames": "Test.txt",
"relatedDocuments": [
"sender": "FamilyPublicLaw+ctsc@gmail.com",
"status": "OPEN",
"toLabel": "Other Judge/Legal Adviser",
"urgency": "Not urgent",
"dateSent": "4 November 2025 at 10:38am",
"fromLabel": "CTSC",
"senderType": "CTSC",
"requestedBy": "Hearing urgency -reg",
"updatedTime": "2025-11-04T10:38:10.814408516",
"latestMessage": "Clarification need about the urgency of the hearing. The interpreter requested by the applicant is not yet arranged",
"recipientType": "OTHER",
"judicialMessageReplies": [
{
"id": "156f8d6d-7be5-4417-9d5c-81d6dd7f6cdd",
"id": "88c5a28f-55a0-4714-a551-663a9e7d3034",
"value": {
"document_binary_url": "${TEST_DOCUMENT_BINARY_URL}",
"document_filename": "Test.txt",
"document_url": "${TEST_DOCUMENT_URL}"
"message": "Clarification need about the urgency of the hearing. The interpreter requested by the applicant is not yet arranged",
"replyTo": "Other Judge/Legal Adviser",
"dateSent": "4 November 2025 at 10:38am",
"replyFrom": "CTSC",
"updatedTime": "2025-11-04T10:38:10.814384839"
}
}
],
"requestedBy": "Subject 1",
"sender": "FamilyPublicLaw+ctsc@gmail.com",
"senderType": "CTSC",
"status": "OPEN",
"urgency": "High"
]
}
}
],
Expand Down
43 changes: 21 additions & 22 deletions playwright-e2e/caseData/caseWithJudicialMessageReply.json
Original file line number Diff line number Diff line change
Expand Up @@ -210,34 +210,33 @@
"judgeLastName": "Moley",
"judgeEmailAddress": "moley@example.com"
},
"judicialMessages":
[
"judicialMessages": [
{
"id": "65d197bb-d8f1-4ae0-94b4-e793a812be95",
"id": "a285ed58-eb62-44a6-baea-38c67e16ebca",
"value": {
"updatedTime": "2023-12-01T14:41:54.989344849",
"applicationType": "C2, 25 March 2021, 3:16pm",
"requestedBy": "Subject 1",
"recipientType": "CTSC",
"sender": "judiciary-only@mailnesia.com",
"urgency": "High",
"relatedDocumentFileNames": "Test.txt",
"messageHistory": "FamilyPublicLaw+ctsc@gmail.com - Some note\n \njudiciary-only@mailnesia.com - This is a reply",
"recipient": "FamilyPublicLaw+ctsc@gmail.com",
"relatedDocuments": [
"sender": "FamilyPublicLaw+ctsc@gmail.com",
"status": "OPEN",
"toLabel": "Other Judge/Legal Adviser",
"urgency": "Not urgent",
"dateSent": "4 November 2025 at 10:38am",
"fromLabel": "CTSC",
"senderType": "CTSC",
"requestedBy": "Hearing urgency -reg",
"updatedTime": "2025-11-04T10:38:10.814408516",
"latestMessage": "Clarification need about the urgency of the hearing. The interpreter requested by the applicant is not yet arranged",
"recipientType": "OTHER",
"judicialMessageReplies": [
{
"id": "8ec0d7b4-914c-4c7a-996f-317759d1d0fe",
"id": "88c5a28f-55a0-4714-a551-663a9e7d3034",
"value": {
"document_binary_url":"${TEST_DOCUMENT_BINARY_URL}",
"document_filename": "Test.txt",
"document_url": "${TEST_DOCUMENT_URL}"
"message": "Clarification need about the urgency of the hearing. The interpreter requested by the applicant is not yet arranged",
"replyTo": "Other Judge/Legal Adviser",
"dateSent": "4 November 2025 at 10:38am",
"replyFrom": "CTSC",
"updatedTime": "2025-11-04T10:38:10.814384839"
}
}
],
"senderType": "JUDICIARY",
"latestMessage": "This is a reply",
"dateSent": "1 December 2023 at 2:41pm",
"status": "OPEN"
]
}
}
],
Expand Down
Loading