feat-#301: Removed extra db call

krishnaacharyaa · May 19, 2024 · 32feccd · 32feccd
1 parent c65df71
commit 32feccd
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/backend/controllers/auth-controller.js b/backend/controllers/auth-controller.js
@@ -17,14 +17,17 @@ export const signUpWithEmail = asyncHandler(async (req, res) => {
     throw new ApiError(HTTP_STATUS.BAD_REQUEST, RESPONSE_MESSAGES.COMMON.REQUIRED_FIELDS)
   }
 
-  const existingUserByUserName= await User.findOne({ userName });
-  if(existingUserByUserName){
-    throw new ApiError(HTTP_STATUS.BAD_REQUEST, RESPONSE_MESSAGES.USERS.USER_USERNAME_EXISTS)
-  }
+  const existingUser = await User.findOne({ 
+    $or: [{ userName }, { email }] 
+  });
 
-  const existingUserByEmail = await User.findOne({ email });
-  if(existingUserByEmail){
-    throw new ApiError(HTTP_STATUS.BAD_REQUEST, RESPONSE_MESSAGES.USERS.USER_EMAIL_EXISTS)
+  if (existingUser) {
+    if (existingUser.userName === userName) {
+      throw new ApiError(HTTP_STATUS.BAD_REQUEST, RESPONSE_MESSAGES.USERS.USER_USERNAME_EXISTS);
+    }
+    if (existingUser.email === email) {
+      throw new ApiError(HTTP_STATUS.BAD_REQUEST, RESPONSE_MESSAGES.USERS.USER_EMAIL_EXISTS);
+    }
   }
 
   const user = new User({