Merge pull request #858 from bluewave-labs/feat/network-service-refactor

Refactor network service to use config objects for clarity
bluewave-labs · Sep 24, 2024 · 4b35811 · 4b35811
2 parents bd53ab1 + 41f59a2
commit 4b35811
Show file tree

Hide file tree

Showing 11 changed files with 328 additions and 283 deletions.
diff --git a/Client/src/Components/TabPanels/Account/TeamPanel.jsx b/Client/src/Components/TabPanels/Account/TeamPanel.jsx
@@ -55,7 +55,9 @@ const TeamPanel = () => {
   useEffect(() => {
     const fetchTeam = async () => {
       try {
-        const response = await networkService.getAllUsers(authToken);
+        const response = await networkService.getAllUsers({
+          authToken: authToken,
+        });
         setMembers(response.data.data);
       } catch (error) {
         createToast({
@@ -187,11 +189,11 @@ const TeamPanel = () => {
     }
 
     try {
-      await networkService.requestInvitationToken(
-        authToken,
-        toInvite.email,
-        toInvite.role
-      );
+      await networkService.requestInvitationToken({
+        authToken: authToken,
+        email: toInvite.email,
+        role: toInvite.role,
+      });
       closeInviteModal();
       createToast({
         body: "Member invited. They will receive an email with details on how to create their account.",

diff --git a/Client/src/Features/Auth/authSlice.js b/Client/src/Features/Auth/authSlice.js
@@ -66,8 +66,11 @@ export const update = createAsyncThunk(
       form.deleteProfileImage &&
         fd.append("deleteProfileImage", form.deleteProfileImage);
 
-      const res = await networkService.updateUser(token, user._id, fd);
-      console.log(res);
+      const res = await networkService.updateUser({
+        authToken: token,
+        userId: user._id,
+        form: fd,
+      });
       return res.data;
     } catch (error) {
       if (error.response && error.response.data) {
@@ -88,7 +91,10 @@ export const deleteUser = createAsyncThunk(
     const user = jwtDecode(data);
 
     try {
-      const res = await networkService.deleteUser(data, user._id);
+      const res = await networkService.deleteUser({
+        authToken: data,
+        userId: user._id,
+      });
       return res.data;
     } catch (error) {
       if (error.response && error.response.data) {
@@ -127,8 +133,11 @@ export const setNewPassword = createAsyncThunk(
   async (data, thunkApi) => {
     const { token, form } = data;
     try {
-      await networkService.validateRecoveryToken(token);
-      const res = await networkService.setNewPassword(token, form);
+      await networkService.validateRecoveryToken({ recoveryToken: token });
+      const res = await networkService.setNewPassword({
+        recoveryToken: token,
+        form: form,
+      });
       return res.data;
     } catch (error) {
       if (error.response.data) {

diff --git a/Client/src/Features/PageSpeedMonitor/pageSpeedMonitorSlice.js b/Client/src/Features/PageSpeedMonitor/pageSpeedMonitorSlice.js
@@ -13,7 +13,10 @@ export const createPageSpeed = createAsyncThunk(
   async (data, thunkApi) => {
     try {
       const { authToken, monitor } = data;
-      const res = await networkService.createMonitor(authToken, monitor);
+      const res = await networkService.createMonitor({
+        authToken: authToken,
+        monitor: monitor,
+      });
       return res.data;
     } catch (error) {
       if (error.response && error.response.data) {
@@ -33,7 +36,10 @@ export const getPagespeedMonitorById = createAsyncThunk(
   async (data, thunkApi) => {
     try {
       const { authToken, monitorId } = data;
-      const res = await networkService.getMonitorByid(authToken, monitorId);
+      const res = await networkService.getMonitorById({
+        authToken: authToken,
+        monitorId: monitorId,
+      });
       return res.data;
     } catch (error) {
       if (error.response && error.response.data) {
@@ -53,11 +59,11 @@ export const getPageSpeedByTeamId = createAsyncThunk(
   async (token, thunkApi) => {
     const user = jwtDecode(token);
     try {
-      const res = await networkService.getMonitorsAndSummaryByTeamId(
-        token,
-        user.teamId,
-        ["pagespeed"]
-      );
+      const res = await networkService.getMonitorsAndSummaryByTeamId({
+        authToken: token,
+        teamId: user.teamId,
+        types: ["pagespeed"],
+      });
 
       return res.data;
     } catch (error) {
@@ -84,11 +90,11 @@ export const updatePageSpeed = createAsyncThunk(
         interval: monitor.interval,
         // notifications: monitor.notifications,
       };
-      const res = await networkService.updateMonitor(
-        authToken,
-        monitor._id,
-        updatedFields
-      );
+      const res = await networkService.updateMonitor({
+        authToken: authToken,
+        monitorId: monitor._id,
+        updatedFields: updatedFields,
+      });
       return res.data;
     } catch (error) {
       if (error.response && error.response.data) {
@@ -108,10 +114,10 @@ export const deletePageSpeed = createAsyncThunk(
   async (data, thunkApi) => {
     try {
       const { authToken, monitor } = data;
-      const res = await networkService.deleteMonitorById(
-        authToken,
-        monitor._id
-      );
+      const res = await networkService.deleteMonitorById({
+        authToken: authToken,
+        monitorId: monitor._id,
+      });
       return res.data;
     } catch (error) {
       if (error.response && error.response.data) {
@@ -130,7 +136,10 @@ export const pausePageSpeed = createAsyncThunk(
   async (data, thunkApi) => {
     try {
       const { authToken, monitorId } = data;
-      const res = await networkService.pauseMonitorById(authToken, monitorId);
+      const res = await networkService.pauseMonitorById({
+        authToken: authToken,
+        monitorId: monitorId,
+      });
       return res.data;
     } catch (error) {
       if (error.response && error.response.data) {

diff --git a/Client/src/Features/UptimeMonitors/uptimeMonitorsSlice.js b/Client/src/Features/UptimeMonitors/uptimeMonitorsSlice.js
@@ -13,7 +13,10 @@ export const createUptimeMonitor = createAsyncThunk(
   async (data, thunkApi) => {
     try {
       const { authToken, monitor } = data;
-      const res = await networkService.createMonitor(authToken, monitor);
+      const res = await networkService.createMonitor({
+        authToken: authToken,
+        monitor: monitor,
+      });
       return res.data;
     } catch (error) {
       if (error.response && error.response.data) {
@@ -33,7 +36,10 @@ export const getUptimeMonitorById = createAsyncThunk(
   async (data, thunkApi) => {
     try {
       const { authToken, monitorId } = data;
-      const res = await networkService.getMonitorByid(authToken, monitorId);
+      const res = await networkService.getMonitorById({
+        authToken: authToken,
+        monitorId: monitorId,
+      });
       return res.data;
     } catch (error) {
       if (error.response && error.response.data) {
@@ -53,11 +59,11 @@ export const getUptimeMonitorsByTeamId = createAsyncThunk(
   async (token, thunkApi) => {
     const user = jwtDecode(token);
     try {
-      const res = await networkService.getMonitorsAndSummaryByTeamId(
-        token,
-        user.teamId,
-        ["http", "ping"]
-      );
+      const res = await networkService.getMonitorsAndSummaryByTeamId({
+        authToken: token,
+        teamId: user.teamId,
+        types: ["http", "ping"],
+      });
       return res.data;
     } catch (error) {
       if (error.response && error.response.data) {
@@ -83,11 +89,11 @@ export const updateUptimeMonitor = createAsyncThunk(
         interval: monitor.interval,
         notifications: monitor.notifications,
       };
-      const res = await networkService.updateMonitor(
-        authToken,
-        monitor._id,
-        updatedFields
-      );
+      const res = await networkService.updateMonitor({
+        authToken: authToken,
+        monitorId: monitor._id,
+        updatedFields: updatedFields,
+      });
       return res.data;
     } catch (error) {
       if (error.response && error.response.data) {
@@ -107,10 +113,10 @@ export const deleteUptimeMonitor = createAsyncThunk(
   async (data, thunkApi) => {
     try {
       const { authToken, monitor } = data;
-      const res = await networkService.deleteMonitorById(
-        authToken,
-        monitor._id
-      );
+      const res = await networkService.deleteMonitorById({
+        authToken: authToken,
+        monitorId: monitor._id,
+      });
       return res.data;
     } catch (error) {
       if (error.response && error.response.data) {
@@ -130,7 +136,10 @@ export const pauseUptimeMonitor = createAsyncThunk(
   async (data, thunkApi) => {
     try {
       const { authToken, monitorId } = data;
-      const res = await networkService.pauseMonitorById(authToken, monitorId);
+      const res = await networkService.pauseMonitorById({
+        authToken: authToken,
+        monitorId: monitorId,
+      });
       return res.data;
     } catch (error) {
       if (error.response && error.response.data) {
@@ -150,7 +159,10 @@ export const deleteMonitorChecksByTeamId = createAsyncThunk(
   async (data, thunkApi) => {
     try {
       const { authToken, teamId } = data;
-      const res = await networkService.deleteChecksByTeamId(authToken, teamId);
+      const res = await networkService.deleteChecksByTeamId({
+        authToken: authToken,
+        teamId: teamId,
+      });
       return res.data;
     } catch (error) {
       if (error.response && error.response.data) {
@@ -169,7 +181,9 @@ export const addDemoMonitors = createAsyncThunk(
   async (data, thunkApi) => {
     try {
       const { authToken } = data;
-      const res = await networkService.addDemoMonitors(authToken);
+      const res = await networkService.addDemoMonitors({
+        authToken: authToken,
+      });
       return res.data;
     } catch (error) {
       if (error.response && error.response.data) {
@@ -188,7 +202,9 @@ export const deleteAllMonitors = createAsyncThunk(
   async (data, thunkApi) => {
     try {
       const { authToken } = data;
-      const res = await networkService.deleteAllMonitors(authToken);
+      const res = await networkService.deleteAllMonitors({
+        authToken: authToken,
+      });
       return res.data;
     } catch (error) {
       if (error.response && error.response.data) {

diff --git a/Client/src/Pages/Incidents/IncidentTable/index.jsx b/Client/src/Pages/Incidents/IncidentTable/index.jsx
@@ -53,27 +53,27 @@ const IncidentTable = ({ monitors, selectedMonitor, filter }) => {
       try {
         let res;
         if (selectedMonitor === "0") {
-          res = await networkService.getChecksByTeam(
-            authToken,
-            user.teamId,
-            "desc",
-            null,
-            null,
-            filter,
-            paginationController.page,
-            paginationController.rowsPerPage
-          );
+          res = await networkService.getChecksByTeam({
+            authToken: authToken,
+            userId: user.teamId,
+            sortOrder: "desc",
+            limit: null,
+            dateRange: null,
+            filter: filter,
+            page: paginationController.page,
+            rowsPerPage: paginationController.rowsPerPage,
+          });
         } else {
-          res = await networkService.getChecksByMonitor(
-            authToken,
-            selectedMonitor,
-            "desc",
-            null,
-            null,
-            filter,
-            paginationController.page,
-            paginationController.rowsPerPage
-          );
+          res = await networkService.getChecksByMonitor({
+            authToken: authToken,
+            monitorId: selectedMonitor,
+            sortOrder: "desc",
+            limit: null,
+            dateRange: null,
+            sitler: filter,
+            page: paginationController.page,
+            rowsPerPage: paginationController.rowsPerPage,
+          });
         }
         setChecks(res.data.data.checks);
         setChecksCount(res.data.data.checksCount);

diff --git a/Client/src/Pages/Monitors/Details/PaginationTable/index.jsx b/Client/src/Pages/Monitors/Details/PaginationTable/index.jsx
@@ -40,16 +40,16 @@ const PaginationTable = ({ monitorId, dateRange }) => {
   useEffect(() => {
     const fetchPage = async () => {
       try {
-        const res = await networkService.getChecksByMonitor(
-          authToken,
-          monitorId,
-          "desc",
-          null,
-          dateRange,
-          null,
-          paginationController.page,
-          paginationController.rowsPerPage
-        );
+        const res = await networkService.getChecksByMonitor({
+          authToken: authToken,
+          monitoirId: monitorId,
+          sortOrder: "desc",
+          limit: null,
+          dateRange: dateRange,
+          filter: null,
+          page: paginationController.page,
+          rowsPerPage: paginationController.rowsPerPage,
+        });
         setChecks(res.data.data.checks);
         setChecksCount(res.data.data.checksCount);
       } catch (error) {

diff --git a/Client/src/Pages/Monitors/Details/index.jsx b/Client/src/Pages/Monitors/Details/index.jsx
@@ -63,15 +63,15 @@ const DetailsPage = ({ isAdmin }) => {
 
   const fetchMonitor = useCallback(async () => {
     try {
-      const res = await networkService.getStatsByMonitorId(
-        authToken,
-        monitorId,
-        null,
-        null,
-        dateRange,
-        50,
-        true
-      );
+      const res = await networkService.getStatsByMonitorId({
+        authToken: authToken,
+        monitorId: monitorId,
+        sortOrder: null,
+        limit: null,
+        dateRange: dateRange,
+        numToDisplay: 50,
+        normalize: true,
+      });
       setMonitor(res?.data?.data ?? {});
     } catch (error) {
       logger.error(error);
@@ -89,10 +89,10 @@ const DetailsPage = ({ isAdmin }) => {
         return;
       }
       try {
-        const res = await networkService.getCertificateExpiry(
-          authToken,
-          monitorId
-        );
+        const res = await networkService.getCertificateExpiry({
+          authToken: authToken,
+          monitorId: monitorId,
+        });
 
         if (res?.data?.data?.certificateDate) {
           let [month, day, year] = res.data.data.certificateDate.split("/");