Merge pull request #99 from hmcts/RET-4056-Refactor-State

RET-4056: Remove State consideration from Referrals
hmcts · Aug 4, 2023 · 1e02c65 · 1e02c65
2 parents 598f938 + 7c23773
commit 1e02c65
Show file tree

Hide file tree

Showing 5 changed files with 135 additions and 8 deletions.
diff --git a/...es/scenarios/employment/ET-RET-2350-ReviewReferralLegalOps-IsUrgent-shouldCreateTask.json b/...es/scenarios/employment/ET-RET-2350-ReviewReferralLegalOps-IsUrgent-shouldCreateTask.json
@@ -31,7 +31,7 @@
             "template": "ccd-event-message.json",
             "replacements": {
               "EventId": "createReferral",
-              "NewStateId": "Submitted",
+              "NewStateId": "Accepted",
               "AdditionalData": {
                 "Data": {
                   "referralCollection": [{

diff --git a/.../scenarios/employment/ET-RET-2353-ReviewReferralJudiciary-NotUrgent-shouldCreateTask.json b/.../scenarios/employment/ET-RET-2353-ReviewReferralJudiciary-NotUrgent-shouldCreateTask.json
@@ -29,7 +29,7 @@
             "template": "ccd-event-message.json",
             "replacements": {
               "EventId": "createReferral",
-              "NewStateId": "Submitted",
+              "NewStateId": "Accepted",
               "AdditionalData": {
                 "Data": {
                   "referralCollection": [{

diff --git a/...esources/scenarios/employment/ET-RET-2438-IssuePostHearingDirection-shouldCreateTask.json b/...esources/scenarios/employment/ET-RET-2438-IssuePostHearingDirection-shouldCreateTask.json
@@ -1,5 +1,5 @@
 {
-  "description": "ET createReferral should create a ReviewReferralAdmin task",
+  "description": "ET createReferral should create a IssuePostHearingDirection and a ReviewReferralAdmin task",
   "enabled": true,
   "jurisdiction": "EMPLOYMENT",
   "caseType": "ET_EnglandWales",
@@ -48,7 +48,7 @@
       {
         "credentials": "WaSystemUser",
         "status": 200,
-        "numberOfTasksAvailable": 1,
+        "numberOfTasksAvailable": 2,
         "numberOfRolesAvailable": 4,
         "taskData": {
           "template": "task-response.json",
@@ -96,6 +96,49 @@
                 "minor_priority": 500,
                 "major_priority": 5000,
                 "priority_date": "{$VERIFIER-ZONED_DATETIME_TODAY+5_WORKING_DAYS}"
+              },
+              {
+                "id": "{$VERIFIER-UUID}",
+                "name": "Review Referral - Hearings",
+                "type": "ReviewReferralAdmin",
+                "task_state": "unassigned",
+                "task_system": "SELF",
+                "security_classification": "PUBLIC",
+                "task_title": "Review Referral - Hearings",
+                "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": "routine_work",
+                "work_type_label": "Routine work",
+                "permissions": {
+                  "values": [
+                    "Read",
+                    "Own",
+                    "Manage",
+                    "Cancel",
+                    "Complete",
+                    "Claim",
+                    "Unclaim",
+                    "Assign",
+                    "Unassign"
+                  ]
+                },
+                "description": "[Review the Referral](/cases/case-details/${[CASE_REFERENCE]}/createReferral1)",
+                "role_category": "ADMIN,CTSC",
+                "minor_priority": 500,
+                "major_priority": 5000,
+                "priority_date": "{$VERIFIER-ZONED_DATETIME_TODAY+2_WORKING_DAYS}"
               }
             ]
           }

diff --git a/...st/resources/scenarios/employment/ET-RET-2444a-DraftAndSignJudgment-shouldCreateTask.json b/...st/resources/scenarios/employment/ET-RET-2444a-DraftAndSignJudgment-shouldCreateTask.json
@@ -1,5 +1,5 @@
 {
-  "description": "ET createReferral/updateHearing should create a DraftAndSignJudgment task",
+  "description": "ET createReferral/updateHearing should create a DraftAndSignJudgment and a ReviewReferralJudiciary task",
   "enabled": true,
   "jurisdiction": "EMPLOYMENT",
   "caseType": "ET_EnglandWales",
@@ -49,7 +49,7 @@
       {
         "credentials": "WaSystemUser",
         "status": 200,
-        "numberOfTasksAvailable": 1,
+        "numberOfTasksAvailable": 2,
         "numberOfRolesAvailable": 5,
         "taskData": {
           "template": "task-response.json",
@@ -96,6 +96,47 @@
                 "minor_priority": 500,
                 "major_priority": 5000,
                 "priority_date": "{$VERIFIER-ZONED_DATETIME_TODAY+28_WORKING_DAYS}"
+              },
+              {
+                "id": "{$VERIFIER-UUID}",
+                "name": "Review Referral - Rule 21",
+                "type": "ReviewReferralJudiciary",
+                "task_state": "unassigned",
+                "task_system": "SELF",
+                "security_classification": "PUBLIC",
+                "task_title": "Review Referral - Rule 21",
+                "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": "decision_making_work",
+                "work_type_label": "Decision-making work",
+                "permissions": {
+                  "values": [
+                    "Read",
+                    "Own",
+                    "Manage",
+                    "CompleteOwn",
+                    "CancelOwn",
+                    "Claim",
+                    "Unclaim",
+                    "UnclaimAssign"
+                  ]
+                },
+                "description": "[Review the Referral](/cases/case-details/${[CASE_REFERENCE]}/createReferral1)",
+                "minor_priority": 500,
+                "major_priority": 5000,
+                "priority_date": "{$VERIFIER-ZONED_DATETIME_TODAY+2_WORKING_DAYS}"
               }
             ]
           }

diff --git a/...tionalTest/resources/scenarios/employment/ET-RET-2450-IssueJudgment-shouldCreateTask.json b/...tionalTest/resources/scenarios/employment/ET-RET-2450-IssueJudgment-shouldCreateTask.json
@@ -1,5 +1,5 @@
 {
-  "description": "ET createReferral should create a IssueJudgment task",
+  "description": "ET createReferral should create a IssueJudgment and a ReviewReferralAdmin task",
   "enabled": true,
   "jurisdiction": "EMPLOYMENT",
   "caseType": "ET_EnglandWales",
@@ -53,7 +53,7 @@
       {
         "credentials": "WaSystemUser",
         "status": 200,
-        "numberOfTasksAvailable": 1,
+        "numberOfTasksAvailable": 2,
         "numberOfRolesAvailable": 4,
         "taskData": {
           "template": "task-response.json",
@@ -98,6 +98,49 @@
                 "role_category": "ADMIN",
                 "minor_priority": 500,
                 "major_priority": 5000
+              },
+              {
+                "id": "{$VERIFIER-UUID}",
+                "name": "Review Referral - Judgment",
+                "type": "ReviewReferralAdmin",
+                "task_state": "unassigned",
+                "task_system": "SELF",
+                "security_classification": "PUBLIC",
+                "task_title": "Review Referral - Judgment",
+                "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": "routine_work",
+                "work_type_label": "Routine work",
+                "permissions": {
+                  "values": [
+                    "Read",
+                    "Own",
+                    "Manage",
+                    "Cancel",
+                    "Complete",
+                    "Claim",
+                    "Unclaim",
+                    "Assign",
+                    "Unassign"
+                  ]
+                },
+                "description": "[Review the Referral](/cases/case-details/${[CASE_REFERENCE]}/createReferral1)",
+                "role_category": "ADMIN,CTSC",
+                "minor_priority": 500,
+                "major_priority": 5000,
+                "priority_date": "{$VERIFIER-ZONED_DATETIME_TODAY+2_WORKING_DAYS}"
               }
             ]
           }