Merge pull request #57 from Modarb-Ai-Trainer/searchUpdate

src/lib/services/crud.service.ts

@@ -72,6 +72,43 @@ export const CrudService = <ModelDoc extends Document>(
       return { docs, paginationData };
     }
 
+    async search(
+      filter: FilterQuery<ModelDoc>,
+      paginationOptions: {
+        limit?: number;
+        skip?: number;
+      } = {
+          limit: 10,
+          skip: 1,
+        },
+      options?: {
+        populateArray: any
+      },
+    ): Promise<{
+      docs: ModelDoc[];
+      paginationData: {
+        total: number;
+        page: number;
+        perPage: number;
+      };
+    }> {
+      const queryInstruction = this.model
+        .find(filter)
+        .limit(paginationOptions.limit)
+        .skip(paginationOptions.skip);
+      if (options?.populateArray) queryInstruction.populate(options.populateArray);
+
+      const docs = await queryInstruction;
+      const total = await this.model.countDocuments(filter);
+      const paginationData = {
+        total: total,
+        page: paginationOptions.skip,
+        perPage: paginationOptions.limit,
+      };
+
+      return { docs, paginationData };
+    }
+
     async findOne(
       filter: FilterQuery<ModelDoc>,
       options?: {

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

@@ -19,6 +19,7 @@ export class ExerciseController extends BaseController {
   private exercisesService = new ExerciseService();
 
   setRoutes(): void {
+    this.router.get("/search", asyncHandler(this.search));
     this.router.get("/", asyncHandler(this.list));
     this.router.get("/:id", paramsValidator("id"), asyncHandler(this.get));
   }
@@ -55,4 +56,56 @@ export class ExerciseController extends BaseController {
       res
     );
   };
+
+  @SwaggerGet()
+  @SwaggerResponse([ExerciseSerialization])
+  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: [
+          { reps: { $eq: searchTerm } },
+          { sets: { $eq: searchTerm } },
+          { duration: { $eq: searchTerm } }
+        ]
+      };
+    }
+
+    else {
+      if (req.query.filter === "category") {
+        query = { category: { $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" } }
+          ],
+        };
+      }
+    }
+
+    const { docs, paginationData } = await this.exercisesService.search(
+      query,
+      paginationQuery
+    );
+
+    return JsonResponse.success(
+      {
+        data: serialize(docs, ExerciseSerialization),
+        meta: paginationData,
+      },
+      res
+    );
+  };
 }