♻️ Use single query to find user email

staart · Apr 19, 2020 · a0167ee · a0167ee
1 parent c1f3868
commit a0167ee
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/src/rest/auth.ts b/src/rest/auth.ts
@@ -73,6 +73,7 @@ export const login = async (
           emails: {
             some: {
               email,
+              isVerified: false,
             },
           },
         },
@@ -153,7 +154,7 @@ export const register = async (
         : {}),
     })
   ).id;
-  if (email) await createEmail(userId, email, emailVerified);
+  if (email) await createEmail(userId, email, !emailVerified);
   if (locals) await addApprovedLocation(userId, locals.ipAddress);
   return { userId };
 };

diff --git a/src/services/user.service.ts b/src/services/user.service.ts
@@ -102,13 +102,19 @@ export const createUser = async (
  * Get the details of a user by their email
  */
 export const getUserByEmail = async (email: string, secureOrigin = false) => {
-  const emailObject = await prisma.emails.findMany({
-    where: { email, isVerified: true },
+  const users = await prisma.users.findMany({
+    where: {
+      emails: {
+        some: {
+          email,
+          isVerified: true,
+        },
+      },
+    },
   });
-  if (!emailObject.length) throw new Error(USER_NOT_FOUND);
-  const user = await getUserById(emailObject[0].id);
-  if (!secureOrigin) return deleteSensitiveInfoUser(user);
-  return user;
+  if (!users.length) throw new Error(USER_NOT_FOUND);
+  if (!secureOrigin) return deleteSensitiveInfoUser(users[0]);
+  return users[0];
 };
 
 /**