Diet filter

Code/backend/.env

@@ -1,4 +1,4 @@
-RECIPES_DB_URI=mongodb+srv://atharvajoshi067:ZgSvdar14OnteUZx@cluster0.9zuebnu.mongodb.net/?retryWrites=true&w=majority
+RECIPES_DB_URI=mongodb+srv://Kaustubh:Kaustubh@cluster0.4qoax.mongodb.net/?retryWrites=true&w=majority&appName=Cluster0
 RECIPES_NS=recipe_recommender
 PORT=5000
-GMAIL= atharva.joshi17@siesgst.ac.in
+GMAIL= ksonawa@ncsu.edu

Code/backend/__tests__/testGetRecipes.js

@@ -1,3 +1,4 @@
+
 const request = require("supertest")("http://localhost:5000/api/v1");
 const expect = require("chai").expect;
 
@@ -68,4 +69,4 @@ describe("GET /recipes", function () {
 
     expect(response.text.includes("Andhra")).true;
   });
-});
+});

Code/backend/api/recipes.controller.js

@@ -2,56 +2,55 @@ import RecipesDAO from "../dao/recipesDAO.js";
 
 export default class RecipesController {
   static async apiAuthLogin(req, res) {
-    let filters = {}
-    filters.userName = req.query.userName
-    filters.password = req.query.password
+    let filters = {};
+    filters.userName = req.query.userName;
+    filters.password = req.query.password;
     const { success, user } = await RecipesDAO.getUser({
-      filters
-    })
+      filters,
+    });
     res.json({ success, user });
   }
+
   static async apiAuthSignup(req, res) {
     if (req.body) {
-      let data = {}
-      data.userName = req.body.userName
-      data.password = req.body.password
+      let data = {};
+      data.userName = req.body.userName;
+      data.password = req.body.password;
       const { success, user } = await RecipesDAO.addUser({
-        data
-      })
+        data,
+      });
       res.json({ success, user });
     }
   }
 
   static async apiGetBookmarks(req, res) {
     if (req.query.userName) {
-      const bookmarks = await RecipesDAO.getBookmarks(req.query.userName)
-      console.log(bookmarks)
+      const bookmarks = await RecipesDAO.getBookmarks(req.query.userName);
+      console.log(bookmarks);
       res.json({ bookmarks });
     } else {
-      res.json("Username not given")
+      res.json("Username not given");
     }
   }
 
   static async apiPostRecipeToProfile(req, res) {
     if (req.body) {
       const { userName, recipe } = req.body;
       try {
-        const response = RecipesDAO.addRecipeToProfile(userName, recipe)
-        res.json(response)
+        const response = await RecipesDAO.addRecipeToProfile(userName, recipe);
+        res.json(response);
       } catch (e) {
-        console.log(`error: ${e}`)
+        console.log(`error: ${e}`);
       }
-
     } else {
-      res.json({ success: false })
+      res.json({ success: false });
     }
-
   }
-  
+
   static async apiGetRecipeByName(req, res) {
     let filters = {};
     //Checking the query to find the required results
-    console.log(req.query)
+    console.log(req.query);
     if (req.query.recipeName) {
       filters.recipeName = req.query.recipeName;
     }
@@ -61,7 +60,7 @@ export default class RecipesController {
     });
 
     let response = {
-      recipes: recipesList
+      recipes: recipesList,
     };
     res.json(response);
   }
@@ -82,6 +81,21 @@ export default class RecipesController {
       filters.Flag = req.query.Flag;
     }
 
+    // New filter for TotalTimeInMins
+    if (req.query.TotalTimeInMins) {
+      filters.TotalTimeInMins = parseInt(req.query.TotalTimeInMins, 10);
+    }
+
+    // New filter for diet_type
+    if (req.query.diet_type) {
+      const allowedDietTypes = ["Vegan", "Vegetarian", "Non-Vegetarian"];
+      if (allowedDietTypes.includes(req.query.diet_type)) {
+        filters.diet_type = req.query.diet_type;
+      } else {
+        return res.status(400).json({ error: "Invalid diet_type value" });
+      }
+    }
+
     const { recipesList, totalNumRecipes } = await RecipesDAO.getRecipes({
       filters,
       page,
@@ -97,6 +111,7 @@ export default class RecipesController {
     };
     res.json(response);
   }
+
   //Function to get the cuisines
   static async apiGetRecipeCuisines(req, res, next) {
     try {
@@ -112,7 +127,7 @@ export default class RecipesController {
     try {
       let response = await RecipesDAO.addRecipe(req.body);
       res.json(response);
-    } catch(e) {
+    } catch (e) {
       console.log(`api, ${e}`);
       res.status(500).json({ error: e });
     }
@@ -122,10 +137,8 @@ export default class RecipesController {
     try {
       let ingredients = await RecipesDAO.getIngredients();
       res.json(ingredients);
-    } catch(e) {
+    } catch (e) {
       res.status(500).json({ error: e });
     }
   }
 }
-
-

Code/backend/api/recipes.route.js

@@ -3,14 +3,14 @@ import RecipesCtrl from "./recipes.controller.js";
 import RecipesDAO from "../dao/recipesDAO.js";
 
 const router = express.Router();
-//URl to get the recipes
+//URL to get the recipes
 router.route("/").get(RecipesCtrl.apiGetRecipes);
 
 router.route("/cuisines").get(RecipesCtrl.apiGetRecipeCuisines);
 
 router.route("/addRecipe").post(RecipesCtrl.apiPostRecipe);
 
-router.route('/callIngredients').get(RecipesCtrl.apiGetIngredients);
+router.route("/callIngredients").get(RecipesCtrl.apiGetIngredients);
 
 router.route("/signup").post(RecipesCtrl.apiAuthSignup);