Merge pull request #90 from Modarb-Ai-Trainer/search

src/modules/users/modules/exercises/controllers/exercises.controller.ts

@@ -99,6 +99,8 @@ export class UsersExerciseController extends BaseController {
   @SwaggerSummary("Search for exercises")
   @SwaggerDescription("You can use filters in search like category")
   @SwaggerQuery({
+    limit: "number",
+    skip: "number",
     searchTerm: "string",
     filter: "string"
   })
@@ -108,6 +110,8 @@ export class UsersExerciseController extends BaseController {
     let searchTerm = req.query.searchTerm;
     let isNum = !isNaN(parseInt(String(searchTerm)));
 
+    let filterVal = req.query.filter;
+
     if (isNum) {
       query =
       {
@@ -120,19 +124,15 @@ export class UsersExerciseController extends BaseController {
     }
 
     else {
-      if (req.query.filter === "category") {
-        query = { category: { $regex: searchTerm, $options: "i" } };
+      if (filterVal) {
+        query = {
+          category: filterVal,
+          name: { $regex: searchTerm, $options: "i" }
+        };
       }
       else {
         query = {
-          $or: [
-            { name: { $regex: searchTerm, $options: "i" } },
-            { category: { $regex: searchTerm, $options: "i" } },
-            { benefits: { $regex: searchTerm, $options: "i" } },
-            { description: { $regex: searchTerm, $options: "i" } },
-            { instructions: { $regex: searchTerm, $options: "i" } },
-            { url: { $regex: searchTerm, $options: "i" } }
-          ],
+          name: { $regex: searchTerm, $options: "i" }
         };
       }
     }

src/modules/users/modules/ingredients/controller/ingredients.controller.ts

@@ -24,6 +24,7 @@ export class UsersIngredientsController extends BaseController {
 
   setRoutes(): void {
     this.router.get("/", asyncHandler(this.list));
+    this.router.get("/search", asyncHandler(this.search));
   }
 
   @SwaggerGet()
@@ -59,4 +60,55 @@ export class UsersIngredientsController extends BaseController {
       res
     );
   };
+
+  @SwaggerGet('/search')
+  @SwaggerResponse([IngredientSerialization])
+  @SwaggerSummary("Search for Ingredients")
+  @SwaggerDescription("You can search for ingredients by entering characters or numbers.")
+  @SwaggerQuery({
+    limit: "number",
+    skip: "number",
+    searchTerm: "string",
+  })
+  search = async (req: Request, res: Response): Promise<Response> => {
+    const paginationQuery = parsePaginationQuery(req.query);
+    let query = {};
+    let searchTerm = req.query.searchTerm;
+    let isNum = !isNaN(parseInt(String(searchTerm)));
+
+
+    if (isNum) {
+      query =
+      {
+        $or: [
+          { fats: { $eq: searchTerm } },
+          { proteins: { $eq: searchTerm } },
+          { proteins: { $eq: searchTerm } },
+          { carbs: { $eq: searchTerm } },
+          { calories: { $eq: searchTerm } },
+          { serving_size: { $eq: searchTerm } },
+          { servings_count: { $eq: searchTerm } }
+        ]
+      };
+    }
+
+    else {
+      query = {
+        name: { $regex: searchTerm, $options: "i" }
+      }
+    }
+
+    const { docs, paginationData } = await this.ingredientsService.search(
+      query,
+      paginationQuery,
+    );
+
+    return JsonResponse.success(
+      {
+        data: serialize(docs, IngredientSerialization),
+        meta: paginationData,
+      },
+      res
+    );
+  };
 }