Use /users instead of /users/search

cornellh4i · Jun 2, 2024 · 27fbcbd · 27fbcbd
1 parent 3e19f20
commit 27fbcbd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/backend/src/events/controllers.ts b/backend/src/events/controllers.ts
@@ -361,7 +361,7 @@ const addAttendee = async (eventID: string, userID: string) => {
       textBody
     );
     const userPreferences = await userController.getUserPreferences(userID);
-    if (userPreferences?.preferences?.sendEmailNotification == true) {
+    if (userPreferences?.preferences?.sendEmailNotification === true) {
       await sendEmail(
         userEmail,
         "Your registration was successful.",
@@ -421,7 +421,7 @@ const deleteAttendee = async (
       textBody
     );
     const userPreferences = await userController.getUserPreferences(userID);
-    if (userPreferences?.preferences?.sendEmailNotification == true) {
+    if (userPreferences?.preferences?.sendEmailNotification === true) {
       await sendEmail(
         userEmail,
         "Your event cancellation was successful.",
@@ -510,11 +510,11 @@ const confirmUser = async (eventID: string, userID: string) => {
       textBody
     );
     const userPreferences = await userController.getUserPreferences(userID);
-    if (userPreferences?.preferences?.sendEmailNotification == true) {
+    if (userPreferences?.preferences?.sendEmailNotification === true) {
       await sendEmail(
-      userEmail,
-      "Your attendance has been confirmed",
-      updatedHtml
+        userEmail,
+        "Your attendance has been confirmed",
+        updatedHtml
       );
     }
   }

diff --git a/backend/src/users/controllers.ts b/backend/src/users/controllers.ts
@@ -231,6 +231,7 @@ const getUsers = async (
     },
     include: {
       profile: true,
+      preferences: true,
       events: eventId
         ? {
             where: {
@@ -351,7 +352,6 @@ const getSearchedUser = async (
     },
     include: {
       profile: true,
-      preferences: true,
     },
   });
 };
@@ -607,7 +607,7 @@ const editRole = async (userId: string, role: string) => {
 
   if (process.env.NODE_ENV != "test") {
     const userPreferences = await userController.getUserPreferences(userId);
-    if (userPreferences?.preferences?.sendEmailNotification == true) {
+    if (userPreferences?.preferences?.sendEmailNotification === true) {
       if (prevUserRole === "SUPERVISOR" && role === "ADMIN") {
         const updatedHtml = replaceUserInputs(
           stringUserUpdate,

diff --git a/frontend/src/pages/profile.tsx b/frontend/src/pages/profile.tsx
@@ -20,8 +20,8 @@ const Profile = () => {
   const { data, isLoading, isError } = useQuery({
     queryKey: ["profile", user?.email],
     queryFn: async () => {
-      const { data } = await api.get(`/users/search/?email=${user?.email}`);
-      return data["data"][0];
+      const { data } = await api.get(`/users?email=${user?.email}`);
+      return data["data"]["result"][0];
     },
   });
 

diff --git a/frontend/src/utils/helpers.ts b/frontend/src/utils/helpers.ts
@@ -17,8 +17,8 @@ import {
  * @returns the userid
  */
 export const fetchUserIdFromDatabase = async (email: string) => {
-  const { data } = await api.get(`/users/search/?email=${email}`);
-  return data["data"][0]["id"];
+  const { data } = await api.get(`/users?email=${email}`);
+  return data["data"]["result"][0]["id"];
 };
 
 /**