Amend diagnostic messages for the validation failures

NHSDigital · May 29, 2024 · 60f1472 · 60f1472
1 parent 1f37f50
commit 60f1472
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 11 deletions.
diff --git a/packages/updatePrescriptionStatus/src/validation/content.ts b/packages/updatePrescriptionStatus/src/validation/content.ts
@@ -138,9 +138,15 @@ export function statuses(task: Task): string | undefined {
   const lowercaseCode = code.toLowerCase()
 
   if (status === "completed" && IN_PROGRESS_BUSINESS_STATUSES.includes(lowercaseCode)) {
-    return "Completed state indicated for a prescription status requiring patient action."
+    return (
+      "Task.status field set to 'completed' but Task.businessStatus value of '" + code + "' requires follow up action."
+    )
   } else if (status === "in-progress" && COMPLETED_BUSINESS_STATUSES.includes(lowercaseCode)) {
-    return "In-progress state indicated for a prescription status that should be completed."
+    return (
+      "Task.status field set to 'in-progress' but Task.businessStatus value of '" +
+      code +
+      "' has no possible follow up action."
+    )
   }
 }
 

diff --git a/packages/updatePrescriptionStatus/tests/validation/testRequestContentValidation.test.ts b/packages/updatePrescriptionStatus/tests/validation/testRequestContentValidation.test.ts
@@ -220,32 +220,38 @@ describe("Unit tests for validation of status against business status", () => {
     generateTestCase(
       "completed",
       "With Pharmacy",
-      "Completed state indicated for a prescription status requiring patient action."
+      "Task.status field set to 'completed' but Task.businessStatus value of 'With Pharmacy' " +
+        "requires follow up action."
     ),
     generateTestCase(
       "completed",
       "With Pharmacy - preparing remainder",
-      "Completed state indicated for a prescription status requiring patient action."
+      "Task.status field set to 'completed' but Task.businessStatus value of 'With Pharmacy - preparing remainder' " +
+        "requires follow up action."
     ),
     generateTestCase(
       "completed",
       "Ready to collect",
-      "Completed state indicated for a prescription status requiring patient action."
+      "Task.status field set to 'completed' but Task.businessStatus value of 'Ready to collect' " +
+        "requires follow up action."
     ),
     generateTestCase(
       "completed",
       "ReAdY tO cOlLeCt",
-      "Completed state indicated for a prescription status requiring patient action."
+      "Task.status field set to 'completed' but Task.businessStatus value of 'ReAdY tO cOlLeCt' " +
+        "requires follow up action."
     ),
     generateTestCase(
       "completed",
       "Ready to collect - partial",
-      "Completed state indicated for a prescription status requiring patient action."
+      "Task.status field set to 'completed' but Task.businessStatus value of 'Ready to collect - partial' " +
+        "requires follow up action."
     ),
     generateTestCase(
       "completed",
       "rEaDy To ColLEcT - pArtIAl",
-      "Completed state indicated for a prescription status requiring patient action."
+      "Task.status field set to 'completed' but Task.businessStatus value of 'rEaDy To ColLEcT - pArtIAl' " +
+        "requires follow up action."
     ),
     generateTestCase("in-progress", "With Pharmacy", undefined),
     generateTestCase("in-progress", "With Pharmacy - preparing remainder", undefined),
@@ -254,17 +260,20 @@ describe("Unit tests for validation of status against business status", () => {
     generateTestCase(
       "in-progress",
       "Collected",
-      "In-progress state indicated for a prescription status that should be completed."
+      "Task.status field set to 'in-progress' but Task.businessStatus value of 'Collected' " +
+        "has no possible follow up action."
     ),
     generateTestCase(
       "in-progress",
       "Not dispensed",
-      "In-progress state indicated for a prescription status that should be completed."
+      "Task.status field set to 'in-progress' but Task.businessStatus value of 'Not dispensed' " +
+        "has no possible follow up action."
     ),
     generateTestCase(
       "in-progress",
       "Dispatched",
-      "In-progress state indicated for a prescription status that should be completed."
+      "Task.status field set to 'in-progress' but Task.businessStatus value of 'Dispatched' " +
+        "has no possible follow up action."
     ),
     generateTestCase("completed", "Collected", undefined),
     generateTestCase("completed", "Not dispensed", undefined),