fix: handle create/edit subscriber when target DG does not exist (#716)

canonical · Jan 27, 2025 · 3f6bb50 · 3f6bb50
1 parent e51146f
commit 3f6bb50
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/utils/createSubscriber.tsx b/utils/createSubscriber.tsx
@@ -34,16 +34,17 @@ export const createSubscriber = async ({
       throw new Error("Subscriber already exists.");
     }
 
+    const existingDeviceGroupResponse = await apiGetDeviceGroup(deviceGroupName, token);
+    var existingDeviceGroupData = await existingDeviceGroupResponse.json();
+    if (!existingDeviceGroupData){
+      throw new Error(`Device group ${deviceGroupName} cannot be found`);
+    }
     const updateSubscriberResponse = await apiPostSubscriber(imsi, subscriberData, token);
     if (!updateSubscriberResponse.ok) {
       throw new Error(
         `Error creating subscriber. Error code: ${updateSubscriberResponse.status}`,
       );
     }
-
-    const existingDeviceGroupResponse = await apiGetDeviceGroup(deviceGroupName, token);
-    var existingDeviceGroupData = await existingDeviceGroupResponse.json();
-
     if (!existingDeviceGroupData["imsis"]) {
       existingDeviceGroupData["imsis"] = [];
     }

diff --git a/utils/editSubscriber.tsx b/utils/editSubscriber.tsx
@@ -29,13 +29,20 @@ export const editSubscriber = async ({
   };
 
   try {
+    var newDeviceGroupData = await getDeviceGroupData(newDeviceGroupName, token);
+    if (!newDeviceGroupData){
+      throw new Error(`Device group ${newDeviceGroupName} cannot be found`);
+    }
     await updateSubscriber(subscriberData, token);
     if (oldDeviceGroupName != newDeviceGroupName) {
-      var oldDeviceGroupData = await getDeviceGroupData(oldDeviceGroupName, token);
-      const index = oldDeviceGroupData["imsis"].indexOf(imsi);
-      oldDeviceGroupData["imsis"].splice(index, 1);
-      await updateDeviceGroupData(oldDeviceGroupName, oldDeviceGroupData, token);
-      var newDeviceGroupData = await getDeviceGroupData(newDeviceGroupName, token);
+      if (oldDeviceGroupName){
+        var oldDeviceGroupData = await getDeviceGroupData(oldDeviceGroupName, token);
+        if (oldDeviceGroupData){
+          const index = oldDeviceGroupData["imsis"].indexOf(imsi);
+          oldDeviceGroupData["imsis"].splice(index, 1);
+          await updateDeviceGroupData(oldDeviceGroupName, oldDeviceGroupData, token);
+        }
+      }
       newDeviceGroupData["imsis"].push(imsi);
       await updateDeviceGroupData(newDeviceGroupName, newDeviceGroupData, token);
     }
@@ -83,7 +90,7 @@ const getDeviceGroupData = async (deviceGroupName: string, token: string) => {
     const existingDeviceGroupResponse = await apiGetDeviceGroup(deviceGroupName, token);
     var existingDeviceGroupData = await existingDeviceGroupResponse.json();
 
-    if (!existingDeviceGroupData["imsis"]) {
+    if (existingDeviceGroupData && !existingDeviceGroupData["imsis"]) {
       existingDeviceGroupData["imsis"] = [];
     }
     return existingDeviceGroupData;