From f4d3bb9a1c91ee1e73686d8b2976631bca4feb83 Mon Sep 17 00:00:00 2001 From: "fergus.oshea" Date: Fri, 14 Jul 2023 16:28:32 +0100 Subject: [PATCH 1/2] RET-2501: tseRespond --- ...1b-AmendPartyDetails-shouldCreateTask.json | 2 +- ...1d-AmendPartyDetails-shouldCreateTask.json | 13 +++++- ...alWithAnApplication-shouldCreateTask.json} | 0 ...alWithAnApplication-shouldCreateTask.json} | 0 ...alWithAnApplication-shouldCreateTask.json} | 0 ...alWithAnApplication-shouldCreateTask.json} | 40 +++++-------------- 6 files changed, 23 insertions(+), 32 deletions(-) rename src/functionalTest/resources/scenarios/employment/{ET-RET-3188a-ContactTribunalWithanApplication-shouldCreateTask.json => ET-RET-3188a-ContactTribunalWithAnApplication-shouldCreateTask.json} (100%) rename src/functionalTest/resources/scenarios/employment/{ET-RET-3188b-ContactTribunalWithanApplication-shouldCreateTask.json => ET-RET-3188b-ContactTribunalWithAnApplication-shouldCreateTask.json} (100%) rename src/functionalTest/resources/scenarios/employment/{ET-RET-3188c-ContactTribunalWithanApplication-shouldCreateTask.json => ET-RET-3188c-ContactTribunalWithAnApplication-shouldCreateTask.json} (100%) rename src/functionalTest/resources/scenarios/employment/{ET-RET-3188d-ContactTribunalWithanApplication-shouldCreateTask.json => ET-RET-3188d-ContactTribunalWithAnApplication-shouldCreateTask.json} (73%) diff --git a/src/functionalTest/resources/scenarios/employment/ET-RET-2501b-AmendPartyDetails-shouldCreateTask.json b/src/functionalTest/resources/scenarios/employment/ET-RET-2501b-AmendPartyDetails-shouldCreateTask.json index 071ccc26..59a77733 100644 --- a/src/functionalTest/resources/scenarios/employment/ET-RET-2501b-AmendPartyDetails-shouldCreateTask.json +++ b/src/functionalTest/resources/scenarios/employment/ET-RET-2501b-AmendPartyDetails-shouldCreateTask.json @@ -1,5 +1,5 @@ { - "description": "ET CLAIMANT_TSE_RESPOND event should create a AmendPartyDetails task", + "description": "ET CLAIMANT_TSE_RESPOND event should create a AmendPartyDetails and a ContactTribunalWithAnApplication task", "enabled": true, "jurisdiction": "EMPLOYMENT", "caseType": "ET_EnglandWales", diff --git a/src/functionalTest/resources/scenarios/employment/ET-RET-2501d-AmendPartyDetails-shouldCreateTask.json b/src/functionalTest/resources/scenarios/employment/ET-RET-2501d-AmendPartyDetails-shouldCreateTask.json index 78f80c08..d297d32a 100644 --- a/src/functionalTest/resources/scenarios/employment/ET-RET-2501d-AmendPartyDetails-shouldCreateTask.json +++ b/src/functionalTest/resources/scenarios/employment/ET-RET-2501d-AmendPartyDetails-shouldCreateTask.json @@ -1,5 +1,5 @@ { - "description": "ET tseRespond event should create a AmendPartyDetails task", + "description": "ET tseRespond event should create a AmendPartyDetails and a ContactTribunalWithAnApplication task", "enabled": true, "jurisdiction": "EMPLOYMENT", "caseType": "ET_EnglandWales", @@ -28,7 +28,16 @@ "template": "ccd-event-message.json", "replacements": { "EventId": "tseRespond", - "NewStateId": "Accepted" + "NewStateId": "Accepted", + "AdditionalData": { + "Data": { + "tseRespondSelectApplication": { + "value": { + "label": "20 Change personal details" + } + } + } + } } } ] diff --git a/src/functionalTest/resources/scenarios/employment/ET-RET-3188a-ContactTribunalWithanApplication-shouldCreateTask.json b/src/functionalTest/resources/scenarios/employment/ET-RET-3188a-ContactTribunalWithAnApplication-shouldCreateTask.json similarity index 100% rename from src/functionalTest/resources/scenarios/employment/ET-RET-3188a-ContactTribunalWithanApplication-shouldCreateTask.json rename to src/functionalTest/resources/scenarios/employment/ET-RET-3188a-ContactTribunalWithAnApplication-shouldCreateTask.json diff --git a/src/functionalTest/resources/scenarios/employment/ET-RET-3188b-ContactTribunalWithanApplication-shouldCreateTask.json b/src/functionalTest/resources/scenarios/employment/ET-RET-3188b-ContactTribunalWithAnApplication-shouldCreateTask.json similarity index 100% rename from src/functionalTest/resources/scenarios/employment/ET-RET-3188b-ContactTribunalWithanApplication-shouldCreateTask.json rename to src/functionalTest/resources/scenarios/employment/ET-RET-3188b-ContactTribunalWithAnApplication-shouldCreateTask.json diff --git a/src/functionalTest/resources/scenarios/employment/ET-RET-3188c-ContactTribunalWithanApplication-shouldCreateTask.json b/src/functionalTest/resources/scenarios/employment/ET-RET-3188c-ContactTribunalWithAnApplication-shouldCreateTask.json similarity index 100% rename from src/functionalTest/resources/scenarios/employment/ET-RET-3188c-ContactTribunalWithanApplication-shouldCreateTask.json rename to src/functionalTest/resources/scenarios/employment/ET-RET-3188c-ContactTribunalWithAnApplication-shouldCreateTask.json diff --git a/src/functionalTest/resources/scenarios/employment/ET-RET-3188d-ContactTribunalWithanApplication-shouldCreateTask.json b/src/functionalTest/resources/scenarios/employment/ET-RET-3188d-ContactTribunalWithAnApplication-shouldCreateTask.json similarity index 73% rename from src/functionalTest/resources/scenarios/employment/ET-RET-3188d-ContactTribunalWithanApplication-shouldCreateTask.json rename to src/functionalTest/resources/scenarios/employment/ET-RET-3188d-ContactTribunalWithAnApplication-shouldCreateTask.json index 74562b9b..6e8f216f 100644 --- a/src/functionalTest/resources/scenarios/employment/ET-RET-3188d-ContactTribunalWithanApplication-shouldCreateTask.json +++ b/src/functionalTest/resources/scenarios/employment/ET-RET-3188d-ContactTribunalWithAnApplication-shouldCreateTask.json @@ -28,7 +28,16 @@ "template": "ccd-event-message.json", "replacements": { "EventId": "tseRespond", - "NewStateId": "Accepted" + "NewStateId": "Accepted", + "AdditionalData": { + "Data": { + "tseRespondSelectApplication": { + "value": { + "label": "3 Amend my claim" + } + } + } + } } } ] @@ -38,39 +47,12 @@ { "credentials": "WaSystemUser", "status": 200, - "numberOfTasksAvailable": 2, + "numberOfTasksAvailable": 1, "numberOfRolesAvailable": 4, "taskData": { "template": "task-response.json", "replacements": { "tasks": [ - { - "id": "{$VERIFIER-UUID}", - "name": "Amend Party Details", - "type": "AmendPartyDetails", - "task_state": "unassigned", - "task_system": "SELF", - "security_classification": "PUBLIC", - "task_title": "Amend Party Details", - "created_date": "{$VERIFIER-ZONED_DATETIME_TODAY}", - "due_date": "{$VERIFIER-ZONED_DATETIME_TODAY+1_WORKING_DAYS}", - "execution_type": "Case Management Task", - "jurisdiction": "EMPLOYMENT", - "case_type_id": "ET_EnglandWales", - "case_id": "{$GENERATED_CASE_ID}", - "case_category": "Employment", - "case_name": "George Jetson v Cosmo Spacely", - "auto_assigned": false, - "warnings": false, - "warning_list": { - "values": [] - }, - "case_management_category": "Employment", - "work_type_id": "applications", - "work_type_label": "Applications", - "description": "[Update Claimant Details](cases/case-details/${[CASE_REFERENCE]}/trigger/amendClaimantDetails/amendClaimantDetails1) [OR Respondent Details](cases/case-details/${[CASE_REFERENCE]}/trigger/amendClaimantDetails/amendClaimantDetails1)[,as instructed]", - "role_category": "ADMIN" - }, { "id": "{$VERIFIER-UUID}", "name": "Contact Tribunal With An Application", From 30c5d32cddf1b750c90329988a2b0cd2f79a27b8 Mon Sep 17 00:00:00 2001 From: "fergus.oshea" Date: Thu, 20 Jul 2023 10:49:58 +0100 Subject: [PATCH 2/2] RET-2501: Update for Response, and redo Applications --- ...1a-AmendPartyDetails-shouldCreateTask.json | 32 +------------ ...1b-AmendPartyDetails-shouldCreateTask.json | 46 +++++++------------ ...1c-AmendPartyDetails-shouldCreateTask.json | 35 ++------------ ...1d-AmendPartyDetails-shouldCreateTask.json | 43 ++++------------- ...nalWithAnApplication-shouldCreateTask.json | 45 +++++++----------- ...nalWithAnApplication-shouldCreateTask.json | 5 +- ...nalWithAnApplication-shouldCreateTask.json | 13 ++++-- 7 files changed, 62 insertions(+), 157 deletions(-) diff --git a/src/functionalTest/resources/scenarios/employment/ET-RET-2501a-AmendPartyDetails-shouldCreateTask.json b/src/functionalTest/resources/scenarios/employment/ET-RET-2501a-AmendPartyDetails-shouldCreateTask.json index 10dc8b71..4ecf3b91 100644 --- a/src/functionalTest/resources/scenarios/employment/ET-RET-2501a-AmendPartyDetails-shouldCreateTask.json +++ b/src/functionalTest/resources/scenarios/employment/ET-RET-2501a-AmendPartyDetails-shouldCreateTask.json @@ -1,5 +1,5 @@ { - "description": "ET SUBMIT_CLAIMANT_TSE event should create a AmendPartyDetails and a ContactTribunalWithAnApplication task", + "description": "ET SUBMIT_CLAIMANT_TSE event should create an AmendPartyDetails task", "enabled": true, "jurisdiction": "EMPLOYMENT", "caseType": "ET_EnglandWales", @@ -46,7 +46,7 @@ { "credentials": "WaSystemUser", "status": 200, - "numberOfTasksAvailable": 2, + "numberOfTasksAvailable": 1, "numberOfRolesAvailable": 4, "taskData": { "template": "task-response.json", @@ -78,34 +78,6 @@ "work_type_label": "Applications", "description": "[Update Claimant Details](cases/case-details/${[CASE_REFERENCE]}/trigger/amendClaimantDetails/amendClaimantDetails1) [OR Respondent Details](cases/case-details/${[CASE_REFERENCE]}/trigger/amendClaimantDetails/amendClaimantDetails1)[,as instructed]", "role_category": "ADMIN" - }, - { - "id": "{$VERIFIER-UUID}", - "name": "Contact Tribunal With An Application", - "type": "ContactTribunalWithAnApplication", - "task_state": "unassigned", - "task_system": "SELF", - "security_classification": "PUBLIC", - "task_title": "Contact Tribunal With An Application", - "created_date": "{$VERIFIER-ZONED_DATETIME_TODAY}", - "due_date": "{$VERIFIER-ZONED_DATETIME_TODAY+2_WORKING_DAYS}", - "execution_type": "Case Management Task", - "jurisdiction": "EMPLOYMENT", - "case_type_id": "ET_EnglandWales", - "case_id": "{$GENERATED_CASE_ID}", - "case_category": "Employment", - "case_name": "George Jetson v Cosmo Spacely", - "auto_assigned": false, - "warnings": false, - "warning_list": { - "values": [] - }, - "case_management_category": "Employment", - "work_type_id": "applications", - "work_type_label": "Applications", - "description": "[Review Application and refer to judge](cases/case-details/${[CASE_REFERENCE]}/trigger/createReferral/createReferral1)", - "minor_priority": 500, - "major_priority": 5000 } ] } diff --git a/src/functionalTest/resources/scenarios/employment/ET-RET-2501b-AmendPartyDetails-shouldCreateTask.json b/src/functionalTest/resources/scenarios/employment/ET-RET-2501b-AmendPartyDetails-shouldCreateTask.json index 59a77733..bf4251f0 100644 --- a/src/functionalTest/resources/scenarios/employment/ET-RET-2501b-AmendPartyDetails-shouldCreateTask.json +++ b/src/functionalTest/resources/scenarios/employment/ET-RET-2501b-AmendPartyDetails-shouldCreateTask.json @@ -28,7 +28,21 @@ "template": "ccd-event-message.json", "replacements": { "EventId": "CLAIMANT_TSE_RESPOND", - "NewStateId": "Accepted" + "NewStateId": "Accepted", + "AdditionalData": { + "Data": { + "genericTseApplicationCollection": [ + { + "value": { + "type": "Change personal details", + "respondCollection": [ + {"value": {"from": "Claimant"}} + ] + } + } + ] + } + } } } ] @@ -38,7 +52,7 @@ { "credentials": "WaSystemUser", "status": 200, - "numberOfTasksAvailable": 2, + "numberOfTasksAvailable": 1, "numberOfRolesAvailable": 4, "taskData": { "template": "task-response.json", @@ -70,34 +84,6 @@ "work_type_label": "Applications", "description": "[Update Claimant Details](cases/case-details/${[CASE_REFERENCE]}/trigger/amendClaimantDetails/amendClaimantDetails1) [OR Respondent Details](cases/case-details/${[CASE_REFERENCE]}/trigger/amendClaimantDetails/amendClaimantDetails1)[,as instructed]", "role_category": "ADMIN" - }, - { - "id": "{$VERIFIER-UUID}", - "name": "Contact Tribunal With An Application", - "type": "ContactTribunalWithAnApplication", - "task_state": "unassigned", - "task_system": "SELF", - "security_classification": "PUBLIC", - "task_title": "Contact Tribunal With An Application", - "created_date": "{$VERIFIER-ZONED_DATETIME_TODAY}", - "due_date": "{$VERIFIER-ZONED_DATETIME_TODAY+2_WORKING_DAYS}", - "execution_type": "Case Management Task", - "jurisdiction": "EMPLOYMENT", - "case_type_id": "ET_EnglandWales", - "case_id": "{$GENERATED_CASE_ID}", - "case_category": "Employment", - "case_name": "George Jetson v Cosmo Spacely", - "auto_assigned": false, - "warnings": false, - "warning_list": { - "values": [] - }, - "case_management_category": "Employment", - "work_type_id": "applications", - "work_type_label": "Applications", - "description": "[Review Application and refer to judge](cases/case-details/${[CASE_REFERENCE]}/trigger/createReferral/createReferral1)", - "minor_priority": 500, - "major_priority": 5000 } ] } diff --git a/src/functionalTest/resources/scenarios/employment/ET-RET-2501c-AmendPartyDetails-shouldCreateTask.json b/src/functionalTest/resources/scenarios/employment/ET-RET-2501c-AmendPartyDetails-shouldCreateTask.json index 7e3e49ca..a5ed0072 100644 --- a/src/functionalTest/resources/scenarios/employment/ET-RET-2501c-AmendPartyDetails-shouldCreateTask.json +++ b/src/functionalTest/resources/scenarios/employment/ET-RET-2501c-AmendPartyDetails-shouldCreateTask.json @@ -31,7 +31,10 @@ "NewStateId": "Accepted", "AdditionalData": { "Data": { - "resTseSelectApplication": "Change personal details" + "genericTseApplicationCollection": [ + {"value": {"type": "Amend response"}}, + {"value": {"type": "Change personal details"}} + ] } } } @@ -43,7 +46,7 @@ { "credentials": "WaSystemUser", "status": 200, - "numberOfTasksAvailable": 2, + "numberOfTasksAvailable": 1, "numberOfRolesAvailable": 4, "taskData": { "template": "task-response.json", @@ -75,34 +78,6 @@ "work_type_label": "Applications", "description": "[Update Claimant Details](cases/case-details/${[CASE_REFERENCE]}/trigger/amendClaimantDetails/amendClaimantDetails1) [OR Respondent Details](cases/case-details/${[CASE_REFERENCE]}/trigger/amendClaimantDetails/amendClaimantDetails1)[,as instructed]", "role_category": "ADMIN" - }, - { - "id": "{$VERIFIER-UUID}", - "name": "Contact Tribunal With An Application", - "type": "ContactTribunalWithAnApplication", - "task_state": "unassigned", - "task_system": "SELF", - "security_classification": "PUBLIC", - "task_title": "Contact Tribunal With An Application", - "created_date": "{$VERIFIER-ZONED_DATETIME_TODAY}", - "due_date": "{$VERIFIER-ZONED_DATETIME_TODAY+2_WORKING_DAYS}", - "execution_type": "Case Management Task", - "jurisdiction": "EMPLOYMENT", - "case_type_id": "ET_EnglandWales", - "case_id": "{$GENERATED_CASE_ID}", - "case_category": "Employment", - "case_name": "George Jetson v Cosmo Spacely", - "auto_assigned": false, - "warnings": false, - "warning_list": { - "values": [] - }, - "case_management_category": "Employment", - "work_type_id": "applications", - "work_type_label": "Applications", - "description": "[Review Application and refer to judge](cases/case-details/${[CASE_REFERENCE]}/trigger/createReferral/createReferral1)", - "minor_priority": 500, - "major_priority": 5000 } ] } diff --git a/src/functionalTest/resources/scenarios/employment/ET-RET-2501d-AmendPartyDetails-shouldCreateTask.json b/src/functionalTest/resources/scenarios/employment/ET-RET-2501d-AmendPartyDetails-shouldCreateTask.json index d297d32a..3b46390a 100644 --- a/src/functionalTest/resources/scenarios/employment/ET-RET-2501d-AmendPartyDetails-shouldCreateTask.json +++ b/src/functionalTest/resources/scenarios/employment/ET-RET-2501d-AmendPartyDetails-shouldCreateTask.json @@ -31,11 +31,16 @@ "NewStateId": "Accepted", "AdditionalData": { "Data": { - "tseRespondSelectApplication": { - "value": { - "label": "20 Change personal details" + "genericTseApplicationCollection": [ + { + "value": { + "type": "Change my personal details", + "respondCollection": [ + {"value": {"from": "Respondent"}} + ] + } } - } + ] } } } @@ -47,7 +52,7 @@ { "credentials": "WaSystemUser", "status": 200, - "numberOfTasksAvailable": 2, + "numberOfTasksAvailable": 1, "numberOfRolesAvailable": 4, "taskData": { "template": "task-response.json", @@ -79,34 +84,6 @@ "work_type_label": "Applications", "description": "[Update Claimant Details](cases/case-details/${[CASE_REFERENCE]}/trigger/amendClaimantDetails/amendClaimantDetails1) [OR Respondent Details](cases/case-details/${[CASE_REFERENCE]}/trigger/amendClaimantDetails/amendClaimantDetails1)[,as instructed]", "role_category": "ADMIN" - }, - { - "id": "{$VERIFIER-UUID}", - "name": "Contact Tribunal With An Application", - "type": "ContactTribunalWithAnApplication", - "task_state": "unassigned", - "task_system": "SELF", - "security_classification": "PUBLIC", - "task_title": "Contact Tribunal With An Application", - "created_date": "{$VERIFIER-ZONED_DATETIME_TODAY}", - "due_date": "{$VERIFIER-ZONED_DATETIME_TODAY+2_WORKING_DAYS}", - "execution_type": "Case Management Task", - "jurisdiction": "EMPLOYMENT", - "case_type_id": "ET_EnglandWales", - "case_id": "{$GENERATED_CASE_ID}", - "case_category": "Employment", - "case_name": "George Jetson v Cosmo Spacely", - "auto_assigned": false, - "warnings": false, - "warning_list": { - "values": [] - }, - "case_management_category": "Employment", - "work_type_id": "applications", - "work_type_label": "Applications", - "description": "[Review Application and refer to judge](cases/case-details/${[CASE_REFERENCE]}/trigger/createReferral/createReferral1)", - "minor_priority": 500, - "major_priority": 5000 } ] } diff --git a/src/functionalTest/resources/scenarios/employment/ET-RET-3188b-ContactTribunalWithAnApplication-shouldCreateTask.json b/src/functionalTest/resources/scenarios/employment/ET-RET-3188b-ContactTribunalWithAnApplication-shouldCreateTask.json index 4fb55fe6..5e5a1422 100644 --- a/src/functionalTest/resources/scenarios/employment/ET-RET-3188b-ContactTribunalWithAnApplication-shouldCreateTask.json +++ b/src/functionalTest/resources/scenarios/employment/ET-RET-3188b-ContactTribunalWithAnApplication-shouldCreateTask.json @@ -28,7 +28,21 @@ "template": "ccd-event-message.json", "replacements": { "EventId": "CLAIMANT_TSE_RESPOND", - "NewStateId": "Accepted" + "NewStateId": "Accepted", + "AdditionalData": { + "Data": { + "genericTseApplicationCollection": [ + { + "value": { + "type": "Amend response", + "respondCollection": [ + {"value": {"from": "Claimant"}} + ] + } + } + ] + } + } } } ] @@ -38,39 +52,12 @@ { "credentials": "WaSystemUser", "status": 200, - "numberOfTasksAvailable": 2, + "numberOfTasksAvailable": 1, "numberOfRolesAvailable": 4, "taskData": { "template": "task-response.json", "replacements": { "tasks": [ - { - "id": "{$VERIFIER-UUID}", - "name": "Amend Party Details", - "type": "AmendPartyDetails", - "task_state": "unassigned", - "task_system": "SELF", - "security_classification": "PUBLIC", - "task_title": "Amend Party Details", - "created_date": "{$VERIFIER-ZONED_DATETIME_TODAY}", - "due_date": "{$VERIFIER-ZONED_DATETIME_TODAY+1_WORKING_DAYS}", - "execution_type": "Case Management Task", - "jurisdiction": "EMPLOYMENT", - "case_type_id": "ET_EnglandWales", - "case_id": "{$GENERATED_CASE_ID}", - "case_category": "Employment", - "case_name": "George Jetson v Cosmo Spacely", - "auto_assigned": false, - "warnings": false, - "warning_list": { - "values": [] - }, - "case_management_category": "Employment", - "work_type_id": "applications", - "work_type_label": "Applications", - "description": "[Update Claimant Details](cases/case-details/${[CASE_REFERENCE]}/trigger/amendClaimantDetails/amendClaimantDetails1) [OR Respondent Details](cases/case-details/${[CASE_REFERENCE]}/trigger/amendClaimantDetails/amendClaimantDetails1)[,as instructed]", - "role_category": "ADMIN" - }, { "id": "{$VERIFIER-UUID}", "name": "Contact Tribunal With An Application", diff --git a/src/functionalTest/resources/scenarios/employment/ET-RET-3188c-ContactTribunalWithAnApplication-shouldCreateTask.json b/src/functionalTest/resources/scenarios/employment/ET-RET-3188c-ContactTribunalWithAnApplication-shouldCreateTask.json index cbeceb3f..16c5f9b0 100644 --- a/src/functionalTest/resources/scenarios/employment/ET-RET-3188c-ContactTribunalWithAnApplication-shouldCreateTask.json +++ b/src/functionalTest/resources/scenarios/employment/ET-RET-3188c-ContactTribunalWithAnApplication-shouldCreateTask.json @@ -31,7 +31,10 @@ "NewStateId": "Accepted", "AdditionalData": { "Data": { - "resTseSelectApplication": "Amend response" + "genericTseApplicationCollection": [ + {"value": {"type": "Change personal details"}}, + {"value": {"type": "Amend response"}} + ] } } } diff --git a/src/functionalTest/resources/scenarios/employment/ET-RET-3188d-ContactTribunalWithAnApplication-shouldCreateTask.json b/src/functionalTest/resources/scenarios/employment/ET-RET-3188d-ContactTribunalWithAnApplication-shouldCreateTask.json index 6e8f216f..bba72387 100644 --- a/src/functionalTest/resources/scenarios/employment/ET-RET-3188d-ContactTribunalWithAnApplication-shouldCreateTask.json +++ b/src/functionalTest/resources/scenarios/employment/ET-RET-3188d-ContactTribunalWithAnApplication-shouldCreateTask.json @@ -31,11 +31,16 @@ "NewStateId": "Accepted", "AdditionalData": { "Data": { - "tseRespondSelectApplication": { - "value": { - "label": "3 Amend my claim" + "genericTseApplicationCollection": [ + { + "value": { + "type": "Amend my claim", + "respondCollection": [ + {"value": {"from": "Respondent"}} + ] + } } - } + ] } } }