add construct error func

usdot-fhwa-stol · Feb 14, 2024 · c7dcc78 · c7dcc78
1 parent f1ea0fa
commit c7dcc78
Show file tree

Hide file tree

Showing 24 changed files with 107 additions and 104 deletions.
diff --git a/telematic_system/telematic_apps/web_app/client/src/api/api-dashboards.js b/telematic_system/telematic_apps/web_app/client/src/api/api-dashboards.js
@@ -1,5 +1,6 @@
 import axios from 'axios';
 import {env } from "../env"
+import { constructError } from './api-utils';
 /**
  *@brief List all dashboards urls belong to the current user organization
  */
@@ -13,9 +14,8 @@ const searchDashboards = async (org_id, search_text) => {
         data: { org_id: org_id, search_text: search_text }
       }, { withCredentials: true });
     return data;
-  } catch (err) {
-
-    return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+  } catch (err) {    
+    return constructError(err)
   }
 }
 
@@ -32,9 +32,8 @@ const getDashboardsByOrg = async (org_id) => {
         data: { org_id: org_id }
       }, { withCredentials: true });
     return data;
-  } catch (err) {
-
-    return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+  } catch (err) {    
+    return constructError(err)
  }
 }
 
@@ -51,9 +50,8 @@ const listEventDashboards = async (event_id) => {
         data: { event_id: event_id }
       }, { withCredentials: true });
     return data;
-  } catch (err) {
-
-    return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+  } catch (err) {    
+    return constructError(err)
   }
 }
 
@@ -71,9 +69,8 @@ const updateEventDashboards = async (event_id, dashboard_id) => {
         data: { event_id: event_id, dashboard_id: dashboard_id }
       }, { withCredentials: true });
     return data;
-  } catch (err) {
-
-    return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+  } catch (err) {    
+    return constructError(err)
   }
 }
 
@@ -88,9 +85,8 @@ const deleteEventDashboards = async (event_id, dashboard_id) => {
   try {
     const { data } = await axios.delete(URL+"?event_id="+event_id+"&dashboard_id="+dashboard_id, { withCredentials: true });
     return data;
-  } catch (err) {
-
-    return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+  } catch (err) {    
+    return constructError(err)
   }
 }
 

diff --git a/telematic_system/telematic_apps/web_app/client/src/api/api-default-event-topics.js b/telematic_system/telematic_apps/web_app/client/src/api/api-default-event-topics.js
@@ -1,6 +1,7 @@
 
 import axios, { CanceledError } from 'axios';
 import {env} from "../env"
+import { constructError } from './api-utils';
 /**
  *@brief Save the default topics setting for the given list of event and unit combinations
  * @Param The list of events and units combinations
@@ -24,7 +25,7 @@ const createDefaultTopicsByEventUnits = async (seletedUnitsTopics, user_id) => {
     return data;
   } catch (err) {
 
-    return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+    return constructError(err)
   }
 }
 
@@ -52,7 +53,7 @@ const findAllDefaultTopicsByEventUnits = async (event_id, selectedUnitIdentifier
     return data;
   } catch (err) {
 
-    return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+    return constructError(err)
   }
 }
 

diff --git a/telematic_system/telematic_apps/web_app/client/src/api/api-events.js b/telematic_system/telematic_apps/web_app/client/src/api/api-events.js
@@ -1,5 +1,6 @@
 import axios from 'axios';
 import {env} from "../env"
+import { constructError } from './api-utils';
 
 /**
  *@brief Create an event in database (DB)
@@ -13,7 +14,7 @@ const createEvent = async (event) => {
         return data;
     } catch (err) {
 
-        return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+        return constructError(err)
     }
 }
 
@@ -38,7 +39,7 @@ const findAllEvents = async (criteria) => {
         return data;
     } catch (err) {
 
-        return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+        return constructError(err)
     }
 }
 
@@ -55,7 +56,7 @@ const editEvent = async (event) => {
         return data;
     } catch (err) {
 
-        return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+        return constructError(err)
     }
 }
 
@@ -71,7 +72,7 @@ const assignUnit2Event = async (assign_event_unit) => {
         return data;
     } catch (err) {
 
-        return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+        return constructError(err)
     }
 }
 
@@ -87,7 +88,7 @@ const unAssignUnit2Event = async (event_unit) => {
         return data;
     } catch (err) {
 
-          return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+          return constructError(err)
 
     }
 }
@@ -104,7 +105,7 @@ const deleteEvent = async (id) => {
         return data;
     } catch (err) {
 
-          return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+          return constructError(err)
 
     }
 }

diff --git a/telematic_system/telematic_apps/web_app/client/src/api/api-locations.js b/telematic_system/telematic_apps/web_app/client/src/api/api-locations.js
@@ -1,6 +1,7 @@
 
 import axios from 'axios';
 import {env} from "../env"
+import { constructError } from './api-utils';
 
 /**
  *@brief Create a location
@@ -14,7 +15,7 @@ const createLocation = async (location) => {
     return data;
   } catch (err) {
 
-      return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+      return constructError(err)
 
   }
 }
@@ -30,7 +31,7 @@ const findAllLocations = async () => {
     return data;
   } catch (err) {
 
-      return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+      return constructError(err)
 
   }
 }

diff --git a/telematic_system/telematic_apps/web_app/client/src/api/api-org.js b/telematic_system/telematic_apps/web_app/client/src/api/api-org.js
@@ -1,13 +1,14 @@
 import axios from 'axios';
 import {env} from "../env"
+import { constructError } from './api-utils';
 const listOrgs = async () => {
     const URL = `${env.REACT_APP_WEB_SERVER_URI}/api/org/all`
     try {
         const { data } = await axios.get(URL, { withCredentials: true });
         return data;
     } catch (err) {
 
-          return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+          return constructError(err)
 
     }
 }
@@ -19,7 +20,7 @@ const listOrgUsers = async () => {
         return data;
     } catch (err) {
 
-          return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+          return constructError(err)
 
     }
 }
@@ -34,7 +35,7 @@ const addOrgUser = async (reqData) => {
         return data;
     } catch (err) {
 
-          return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+          return constructError(err)
 
     }
 }
@@ -48,7 +49,7 @@ const getUserRole = async (reqData) => {
         return data;
     } catch (err) {
 
-          return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+          return constructError(err)
 
     }
 }
@@ -64,7 +65,7 @@ const getOrgsByUser = async (userId) => {
         return data;
     } catch (err) {
 
-          return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+          return constructError(err)
 
     }
 }
@@ -79,7 +80,7 @@ const updateOrgUser = async (reqData) => {
         return data;
     } catch (err) {
 
-          return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+          return constructError(err)
 
     }
 }
@@ -94,7 +95,7 @@ const deleteOrgUser = async (req) => {
         const { data } = await axios.delete(URL + "?org_id=" + req.org_id + "&user_id=" + req.user_id, { withCredentials: true });
         return data;
     } catch (err) {        
-          return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+          return constructError(err)
 
     }
 }

diff --git a/...web_app/client/src/api/api-ROS2-Rosbag.js → ...web_app/client/src/api/api-ros2-rosbag.js b/...web_app/client/src/api/api-ROS2-Rosbag.js → ...web_app/client/src/api/api-ros2-rosbag.js
@@ -1,5 +1,6 @@
 import axios from "axios";
 import { env } from "../env";
+import { constructError } from "./api-utils";
 const listROS2Rosbags = async () => {
   const URL = `${env.REACT_APP_FILE_UPLOAD_WEB_SERVER_URI}/api/upload/list/all`;
   try {
@@ -19,7 +20,6 @@ const updateROS2RosbagDescription = async (UpdatedFileInfo) => {
     const { data } = await axios.post(URL, formData);
     return data;
   } catch (err) {
-    console.log(err);
     return constructError(err);
   }
 };
@@ -42,7 +42,6 @@ const uploadROS2Rosbags = async (ROS2RosbagsFormData) => {
   const URL = `${env.REACT_APP_FILE_UPLOAD_WEB_SERVER_URI}/api/upload`;
   try {
     const { data } = await axios.post(URL, formData, config);
-    console.log(data);
     return data;
   } catch (err) {
     return constructError(err);
@@ -62,35 +61,6 @@ const sendROS2RosbagProcessRequest = async (fileInfo) => {
   }
 };
 
-const constructError = (err) => {
-  let error = {};
-  error["errCode"] = err.response !== undefined ? err.response.status : "";
-  let errMsg = "";
-
-  errMsg =
-    err.response !== undefined && err.response.statusText !== undefined
-      ? err.response.statusText
-      : errMsg;
-
-  errMsg = err.message !== undefined ? err.message : errMsg;
-
-  errMsg =
-    err.response !== undefined &&
-    err.response.data !== undefined &&
-    err.response.data.message !== undefined
-      ? err.response.data.message
-      : errMsg;
-
-  errMsg =
-    err.response !== undefined &&
-    err.response.data !== undefined &&
-    err.response.data.error !== undefined
-      ? err.response.data.error
-      : errMsg;
-
-  error["errMsg"] = errMsg;
-  return error;
-};
 
 export {
   listROS2Rosbags,

diff --git a/telematic_system/telematic_apps/web_app/client/src/api/api-states.js b/telematic_system/telematic_apps/web_app/client/src/api/api-states.js
@@ -1,5 +1,6 @@
 import axios from 'axios';
 import {env} from "../env"
+import { constructError } from './api-utils';
 
 /**
  *@brief Find all states in the US
@@ -12,7 +13,7 @@ const findAllStates = async () => {
     return data;
   } catch (err) {
 
-    return { errCode:  err.response!==undefined && err.response.status !== undefined && err.response.status, errMsg:  err.response !==undefined && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !==undefined ? err.response.statusText :"")}
+    return constructError(err)
   }
 }
 

diff --git a/telematic_system/telematic_apps/web_app/client/src/api/api-testing-types.js b/telematic_system/telematic_apps/web_app/client/src/api/api-testing-types.js
@@ -1,5 +1,6 @@
 import axios from 'axios';
 import {env} from "../env"
+import { constructError } from './api-utils';
 
 /**
  *@brief Find all testing types
@@ -12,7 +13,7 @@ const findAllTestingTypes= async (criteria) => {
         return data;
     } catch (err) {
 
-          return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+          return constructError(err)
 
     }
 }

diff --git a/telematic_system/telematic_apps/web_app/client/src/api/api-units.js b/telematic_system/telematic_apps/web_app/client/src/api/api-units.js
@@ -1,6 +1,7 @@
 
 import axios from 'axios';
 import {env} from "../env"
+import { constructError } from './api-utils';
 /**
  *@brief Create a unit
  * @Return Response status and message
@@ -12,7 +13,7 @@ const createUnit = async (unit) => {
         return data;
     } catch (err) {
 
-          return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+          return constructError(err)
 
     }
 };
@@ -28,7 +29,7 @@ const findAllUnits = async () => {
         return data;
     } catch (err) {
 
-          return { errCode: err.response!== undefined ? err.response.status: "", errMsg:  err.response !== undefined  && err.response.data !== undefined && err.response.data.message !== undefined ? err.response.data.message : (err.response !== undefined ? err.response.statusText : "")}
+          return constructError(err)
 
     }
 };