From 628b2b71fdd864017b8b4e483ec831a9b78a1943 Mon Sep 17 00:00:00 2001
From: Robert Bond <Robert.Bond@test.gov.wales>
Date: Thu, 11 Jun 2026 13:04:21 +0000
Subject: [PATCH] Merged PR 2385: update unsubscribe

update unsubscribe

Related work items: #23796
---
 pages/unsubscribe/[watchlistid].js | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/pages/unsubscribe/[watchlistid].js b/pages/unsubscribe/[watchlistid].js
index 08cee74b..eba43738 100644
--- a/pages/unsubscribe/[watchlistid].js
+++ b/pages/unsubscribe/[watchlistid].js
@@ -102,16 +102,31 @@ const deleteWatchedCases = async (watchedCaseID) => {
     return axios(config)
         .then(({ data }) => {
             console.log("deleted watched case - " + watchedCaseID);
-            res.status(200).json(data);
+            // Return a JSON object for success
+            return {
+                success: true,
+                message: "Case deleted successfully",
+                data: data
+            };
         })
         .catch((error) => {
             console.log("err----:", error);
+
             if (error.response && error.response.status === 404) {
                 console.warn("Record not found — nothing to delete.");
-                return { success: false, caseRef: "Not found" };
+                return {
+                    success: false,
+                    error: "Not found",
+                    caseRef: "Not found"
+                };
             } else {
                 consoleLogger(error);
-                //res.status(400).json(error);
+                // Return a JSON object for general errors
+                return {
+                    success: false,
+                    error: error.message || "An error occurred during deletion",
+                    details: error.response ? error.response.data : null
+                };
             }
         });
 };
@@ -133,11 +148,11 @@ export const getServerSideProps = wrapper.getServerSideProps(
 
         console.log("is there a caseObj", hasUnsubscribed);
 
-        //const deleteCase = await deleteWatchedCases(query.watchlistid);
+        const deleteCase = await deleteWatchedCases(query.watchlistid);
 
-        hasUnsubscribed && (await deleteWatchedCases(query.watchlistid));
+        //hasUnsubscribed && (await deleteWatchedCases(query.watchlistid));
 
-        //console.log(deleteCase);
+        console.log(deleteCase);
         return {
             props: {
                 caseRef: hasUnsubscribed