From 10fceb6ff1aaa78e4f4446e80abd608169d5aac9 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Sat, 17 Aug 2024 09:50:52 -0700
Subject: [PATCH] refactord pagespeed slice

---
 .../PageSpeedMonitor/pageSpeedMonitorSlice.js | 81 ++++---------------
 Client/src/Utils/axiosConfig.js               | 27 ++++---
 2 files changed, 31 insertions(+), 77 deletions(-)

diff --git a/Client/src/Features/PageSpeedMonitor/pageSpeedMonitorSlice.js b/Client/src/Features/PageSpeedMonitor/pageSpeedMonitorSlice.js
index 6af825a37..9b3e7fa8c 100644
--- a/Client/src/Features/PageSpeedMonitor/pageSpeedMonitorSlice.js
+++ b/Client/src/Features/PageSpeedMonitor/pageSpeedMonitorSlice.js
@@ -13,32 +13,7 @@ export const createPageSpeed = createAsyncThunk(
   async (data, thunkApi) => {
     try {
       const { authToken, monitor } = data;
-
-      const res = await axiosInstance.post(`/monitors`, monitor, {
-        headers: {
-          Authorization: `Bearer ${authToken}`,
-          "Content-Type": "application/json",
-        },
-      });
-      return res.data;
-    } catch (error) {
-      if (error.response && error.response.data) {
-        return thunkApi.rejectWithValue(error.response.data);
-      }
-      const payload = {
-        status: false,
-        msg: error.message ? error.message : "Unknown error",
-      };
-      return thunkApi.rejectWithValue(payload);
-    }
-  }
-);
-
-export const getPageSpeedMonitors = createAsyncThunk(
-  "pageSpeedMonitors/getPageSpeedMonitors",
-  async (token, thunkApi) => {
-    try {
-      const res = await axiosInstance.get("/monitors");
+      const res = await axiosInstance.createMonitor(authToken, monitor);
       return res.data;
     } catch (error) {
       if (error.response && error.response.data) {
@@ -58,14 +33,15 @@ export const getPageSpeedByUserId = createAsyncThunk(
   async (token, thunkApi) => {
     const user = jwtDecode(token);
     try {
-      const res = await axiosInstance.get(
-        `/monitors/user/${user._id}?limit=25&type=pagespeed&sortOrder=desc`,
-        {
-          headers: {
-            Authorization: `Bearer ${token}`,
-          },
-        }
+      const res = await axiosInstance.getMonitorsByUserId(
+        token,
+        user._id,
+        25,
+        ["pagespeed"],
+        "desc",
+        false
       );
+
       return res.data;
     } catch (error) {
       if (error.response && error.response.data) {
@@ -91,15 +67,10 @@ export const updatePageSpeed = createAsyncThunk(
         interval: monitor.interval,
         // notifications: monitor.notifications,
       };
-      const res = await axiosInstance.put(
-        `/monitors/${monitor._id}`,
-        updatedFields,
-        {
-          headers: {
-            Authorization: `Bearer ${authToken}`,
-            "Content-Type": "application/json",
-          },
-        }
+      const res = await axiosInstance.updateMonitor(
+        authToken,
+        monitor._id,
+        updatedFields
       );
       return res.data;
     } catch (error) {
@@ -120,12 +91,7 @@ export const deletePageSpeed = createAsyncThunk(
   async (data, thunkApi) => {
     try {
       const { authToken, monitor } = data;
-      const res = await axiosInstance.delete(`/monitors/${monitor._id}`, {
-        headers: {
-          Authorization: `Bearer ${authToken}`,
-          "Content-Type": "application/json",
-        },
-      });
+      const res = await axiosInstance.deleteMonitorById(authToken, monitor._id);
       return res.data;
     } catch (error) {
       if (error.response && error.response.data) {
@@ -153,25 +119,6 @@ const pageSpeedMonitorSlice = createSlice({
   },
   extraReducers: (builder) => {
     builder
-      // *****************************************************
-      // All Monitors
-      // *****************************************************
-      .addCase(getPageSpeedMonitors.pending, (state) => {
-        state.isLoading = true;
-      })
-      .addCase(getPageSpeedMonitors.fulfilled, (state, action) => {
-        state.isLoading = false;
-        state.success = action.payload.success;
-        state.msg = action.payload.msg;
-        state.monitors = action.payload.data;
-      })
-      .addCase(getPageSpeedMonitors.rejected, (state, action) => {
-        state.isLoading = false;
-        state.success = false;
-        state.msg = action.payload
-          ? action.payload.msg
-          : "Getting montiors failed";
-      })
       // *****************************************************
       // Monitors by userId
       // *****************************************************
diff --git a/Client/src/Utils/axiosConfig.js b/Client/src/Utils/axiosConfig.js
index ca895709a..1d15c8ce1 100644
--- a/Client/src/Utils/axiosConfig.js
+++ b/Client/src/Utils/axiosConfig.js
@@ -43,16 +43,23 @@ axiosInstance.getMonitorsByUserId = async (
   sortOrder,
   normalize
 ) => {
-  const typeQuery = types.reduce((acc, type) => acc + `&type=${type}`, "");
-  return axiosInstance.get(
-    `/monitors/user/${userId}?limit=${limit}${typeQuery}&sortOrder=${sortOrder}&normalize=${normalize}`,
-    {
-      headers: {
-        Authorization: `Bearer ${authToken}`,
-        "Content-Type": "application/json",
-      },
-    }
-  );
+  const params = new URLSearchParams();
+
+  if (limit) params.append("limit", limit);
+  if (types) {
+    types.forEach((type) => {
+      params.append("type", type);
+    });
+  }
+  if (sortOrder) params.append("sortOrder", sortOrder);
+  if (normalize) params.append("normalize", normalize);
+
+  return axiosInstance.get(`/monitors/user/${userId}?${params.toString()}`, {
+    headers: {
+      Authorization: `Bearer ${authToken}`,
+      "Content-Type": "application/json",
+    },
+  });
 };
 
 // Updates a single monitor