Refactor: Update authentication and product retrieval logic with improved error handling and response structure

src/actions/auth/finishMailVerify/index.ts

@@ -43,6 +43,7 @@ const finishMailVerify = async (input: FinishMailVerifyInput, context: { userID:
         await User.findByIdAndUpdate(userID, {
             isMailVerified: true
         });
+        
         await redis.del(`mail-verify-${userID}`);
 
         return {

src/actions/auth/login/index.ts

@@ -32,20 +32,20 @@ const login = async (input: LoginInput): Promise<LoginResult> => {
         };
     }
 
-    if (!user.isApproved) {
-        if (!user.isPhoneVerified) {
-            return {
-                message: "please-verify-your-phone-first",
-                code: 403,
-                payload: {
-                    userID: user._id.toString()
-                }
-            };
-        }
-
+    if (!user.isPhoneVerified) {
         return {
-            message: "account-under-review",
+            message: "please-verify-your-phone-first",
             code: 403,
+            payload: {
+                userID: user._id.toString()
+            }
+        };
+    }
+
+    if (!user.isApproved) {
+        return {
+            message: "account-under-review", // TODO buraya da mesaj olarak onay sürecindesiniz gibisinde mesaj verilecek fronttan kullanmak için
+            code: 200, // TODO BUNUN YERİNE HTTPSTATUS CODE ŞEKLİNDE BAKILACAK
         };
     }
 

src/actions/auth/register/index.ts

@@ -55,7 +55,7 @@ const register = async (input: RegisterInput): Promise<RegisterResult> => {
 
         const slug = generateSlug(companyName);
         const existingSlug = await User.findOne({
-            slug 
+            slug
         });
 
         if (existingSlug) {
@@ -75,8 +75,9 @@ const register = async (input: RegisterInput): Promise<RegisterResult> => {
             slug,
             mail
         });
+
         await smsSend({
-            userID: newUser._id.toString() 
+            userID: newUser._id.toString()
         });
 
         return {

src/actions/menu/getProducts/index.ts

@@ -12,7 +12,7 @@ const getProducts = async (query: GetProductsInput, context: { userID: string })
         const {
             userID
         } = context;
-        
+
         const {
             categoryID
         } = query;
@@ -23,7 +23,7 @@ const getProducts = async (query: GetProductsInput, context: { userID: string })
 
         if (categoryID) {
             matchStage.categoryID = {
-                $in: [new mongoose.Types.ObjectId(categoryID)] 
+                $in: [new mongoose.Types.ObjectId(categoryID)]
             };
         }
 
@@ -36,7 +36,7 @@ const getProducts = async (query: GetProductsInput, context: { userID: string })
                     from: "categories",
                     localField: "categoryID",
                     foreignField: "_id",
-                    as: "categoryID"
+                    as: "categoryIDs"
                 }
             },
             {
@@ -46,12 +46,19 @@ const getProducts = async (query: GetProductsInput, context: { userID: string })
             }
         ]);
 
+        const payload = products.map((product) => {
+            return {
+                ...product,
+                categoryIDs: product.categoryID.map((cat: any) => {
+                    return cat._id.toString();
+                })
+            };
+        });
+
         return {
             message: "products-retrieved-successfully",
-            code: 200,
-            payload: {
-                products
-            }
+            payload: payload,
+            code: 200
         };
     } catch (error) {
         console.error("GetProducts action error:", error);

src/routes/authRoutes.ts

@@ -38,7 +38,7 @@ router.post("/register", validateBody(RegisterInput), register);
 router.post("/login", validateBody(LoginInput), login);
 router.post("/logout", authMiddleware, logout);
 
-router.post("/smsSend", validateBody(SmsSendInput), smsSend);
+// router.post("/smsSend", validateBody(SmsSendInput), smsSend);
 router.post("/smsOTP", validateBody(SmsOTPInput), smsOTP);
 
 router.get("/validateToken", authMiddleware, (req: AuthRequest, res) => {