add filters in list

src/lib/services/crud.service.ts

@@ -36,7 +36,7 @@ export const CrudService = <ModelDoc extends Document>(
     }
 
     async list(
-      filter: FilterQuery<ModelDoc>,
+      filter: FilterQuery<ModelDoc>, 
       paginationOptions: {
         limit?: number;
         skip?: number;
@@ -45,7 +45,8 @@ export const CrudService = <ModelDoc extends Document>(
           skip: 1,
         },
       options?: {
-        populateArray: any
+        populateArray?: any,
+        filterOptions?: any
       },
     ): Promise<{
       docs: ModelDoc[];
@@ -55,6 +56,7 @@ export const CrudService = <ModelDoc extends Document>(
         perPage: number;
       };
     }> {
+      if (options?.filterOptions) filter = { ...filter, ...options.filterOptions };
       const queryInstruction = this.model
         .find(filter)
         .limit(paginationOptions.limit)

src/modules/console/modules/admins/controllers/admins.controller.ts

@@ -26,6 +26,7 @@ import { SwaggerResponse } from "@lib/decorators/swagger-response.decorator";
 import { SwaggerRequest } from "@lib/decorators/swagger-request.decorator";
 import { SwaggerSummary } from "@lib/decorators/swagger-summary.decorator";
 import { SwaggerDescription } from "@lib/decorators/swagger-description.decorator";
+import { SwaggerQuery } from "@lib/decorators/swagger-query.decorator";
 
 @Controller("/console/admins")
 @ControllerMiddleware(AdminGuardMiddleware({ roles: [Role.SUPER_ADMIN] }))
@@ -57,6 +58,10 @@ export class AdminsController extends BaseController {
   @SwaggerResponse([AdminSerialization])
   @SwaggerSummary("List admins")
   @SwaggerDescription("List all admins in the system")
+  @SwaggerQuery({
+    limit: "number",
+    skip: "number",
+  })
   list = async (
     req: Request,
     res: Response<IJSONSuccessResponse<AdminSerialization[]>>

src/modules/console/modules/equipments/controllers/equipments.controller.ts

@@ -22,6 +22,7 @@ import { SwaggerResponse } from "@lib/decorators/swagger-response.decorator";
 import { SwaggerRequest } from "@lib/decorators/swagger-request.decorator";
 import { SwaggerSummary } from "@lib/decorators/swagger-summary.decorator";
 import { SwaggerDescription } from "@lib/decorators/swagger-description.decorator";
+import { SwaggerQuery } from "@lib/decorators/swagger-query.decorator";
 @Controller("/console/equipments")
 @ControllerMiddleware(AdminGuardMiddleware({}))
 export class EquipmentsController extends BaseController {
@@ -52,6 +53,10 @@ export class EquipmentsController extends BaseController {
   @SwaggerResponse([EquipmentSerialization])
   @SwaggerSummary("List equipments")
   @SwaggerDescription("List all equipments in the system")
+  @SwaggerQuery({
+    limit: "number",
+    skip: "number",
+  })
   list = async (req: Request, res: Response) => {
     const paginationQuery = parsePaginationQuery(req.query);
     const { docs, paginationData } = await this.equipmentsService.list(

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

@@ -18,6 +18,7 @@ import { SwaggerResponse } from "@lib/decorators/swagger-response.decorator";
 import { SwaggerRequest } from "@lib/decorators/swagger-request.decorator";
 import { SwaggerSummary } from "@lib/decorators/swagger-summary.decorator";
 import { SwaggerDescription } from "@lib/decorators/swagger-description.decorator";
+import { SwaggerQuery } from "@lib/decorators/swagger-query.decorator";
 
 @Controller("/console/exercises")
 @ControllerMiddleware(AdminGuardMiddleware({}))
@@ -49,6 +50,10 @@ export class ExercisesController extends BaseController {
   @SwaggerResponse([ExercisePopulateSerialization])
   @SwaggerSummary("List exercises")
   @SwaggerDescription("List all exercises in the system")
+  @SwaggerQuery({
+    limit: "number",
+    skip: "number",
+  })
   list = async (req: Request, res: Response) => {
     const paginationQuery = parsePaginationQuery(req.query);
     const { docs, paginationData } = await this.exercisesService.list(

src/modules/console/modules/ingredients/controller/ingredients.controller.ts

@@ -17,6 +17,7 @@ import { SwaggerResponse } from "@lib/decorators/swagger-response.decorator";
 import { SwaggerGet, SwaggerPost, SwaggerPatch, SwaggerDelete } from "@lib/decorators/swagger-routes.decorator";
 import { SwaggerSummary } from "@lib/decorators/swagger-summary.decorator";
 import { SwaggerDescription } from "@lib/decorators/swagger-description.decorator";
+import { SwaggerQuery } from "@lib/decorators/swagger-query.decorator";
 
 @Controller("/console/ingredients")
 @ControllerMiddleware(AdminGuardMiddleware({}))
@@ -46,6 +47,10 @@ export class AdminsIngredientsController extends BaseController {
     @SwaggerResponse([IngredientSerialization])
     @SwaggerSummary("List ingredients")
     @SwaggerDescription("List all ingredients in the system")
+    @SwaggerQuery({
+        limit: "number",
+        skip: "number",
+      })
     list = async (req: Request, res: Response) => {
         const paginationQuery = parsePaginationQuery(req.query);
         const { docs, paginationData } = await this.ingredientsService.list(

src/modules/console/modules/meal-plans/controller/meal-plans.controller.ts

@@ -18,6 +18,7 @@ import { SwaggerResponse } from "@lib/decorators/swagger-response.decorator";
 import { SwaggerGet, SwaggerPost, SwaggerPatch, SwaggerDelete } from "@lib/decorators/swagger-routes.decorator";
 import { SwaggerSummary } from "@lib/decorators/swagger-summary.decorator";
 import { SwaggerDescription } from "@lib/decorators/swagger-description.decorator";
+import { SwaggerQuery } from "@lib/decorators/swagger-query.decorator";
 
 @Controller("/console/mealPlans")
 @ControllerMiddleware(AdminGuardMiddleware({}))
@@ -47,6 +48,10 @@ export class AdminsMealPlansController extends BaseController {
     @SwaggerResponse([MealPlanPopulateSerialization])
     @SwaggerSummary("List meal plans")
     @SwaggerDescription("List all meal plans in the system")
+    @SwaggerQuery({
+        limit: "number",
+        skip: "number",
+      })
     list = async (req: Request, res: Response) => {
         const paginationQuery = parsePaginationQuery(req.query);
         const { docs, paginationData } = await this.mealPlansService.list(

src/modules/console/modules/meals/controller/meals.controller.ts

@@ -18,6 +18,7 @@ import { SwaggerResponse } from "@lib/decorators/swagger-response.decorator";
 import { SwaggerGet, SwaggerPost, SwaggerPatch, SwaggerDelete } from "@lib/decorators/swagger-routes.decorator";
 import { SwaggerSummary } from "@lib/decorators/swagger-summary.decorator";
 import { SwaggerDescription } from "@lib/decorators/swagger-description.decorator";
+import { SwaggerQuery } from "@lib/decorators/swagger-query.decorator";
 
 @Controller("/console/meals")
 @ControllerMiddleware(AdminGuardMiddleware({}))
@@ -47,6 +48,10 @@ export class AdminsMealsController extends BaseController {
     @SwaggerResponse([MealPopulateSerialization])
     @SwaggerSummary("List meals")
     @SwaggerDescription("List all meals in the system")
+    @SwaggerQuery({
+        limit: "number",
+        skip: "number",
+      })
     list = async (req: Request, res: Response) => {
         const paginationQuery = parsePaginationQuery(req.query);
         const { docs, paginationData } = await this.mealsService.list(

src/modules/console/modules/muscles/controllers/muscles.controller.ts

@@ -17,6 +17,7 @@ import { SwaggerResponse } from "@lib/decorators/swagger-response.decorator";
 import { SwaggerGet, SwaggerPost, SwaggerPatch, SwaggerDelete } from "@lib/decorators/swagger-routes.decorator";
 import { SwaggerSummary } from "@lib/decorators/swagger-summary.decorator";
 import { SwaggerDescription } from "@lib/decorators/swagger-description.decorator";
+import { SwaggerQuery } from "@lib/decorators/swagger-query.decorator";
 
 @Controller("/console/muscles")
 @ControllerMiddleware(AdminGuardMiddleware({}))
@@ -46,6 +47,10 @@ export class MusclesController extends BaseController {
     @SwaggerResponse([MuscleSerialization])
     @SwaggerSummary("List muscles")
     @SwaggerDescription("List all muscles in the system")
+    @SwaggerQuery({
+        limit: "number",
+        skip: "number",
+      })
     list = async (req: Request, res: Response) => {
         const paginationQuery = parsePaginationQuery(req.query);
         const { docs, paginationData } = await this.musclesService.list(

src/modules/console/modules/workouts/controllers/workouts.controller.ts

@@ -23,6 +23,7 @@ import { SwaggerResponse } from "@lib/decorators/swagger-response.decorator";
 import { SwaggerRequest } from "@lib/decorators/swagger-request.decorator";
 import { SwaggerSummary } from "@lib/decorators/swagger-summary.decorator";
 import { SwaggerDescription } from "@lib/decorators/swagger-description.decorator";
+import { SwaggerQuery } from "@lib/decorators/swagger-query.decorator";
 
 @Controller("/console/workouts")
 @ControllerMiddleware(AdminGuardMiddleware({}))
@@ -54,6 +55,10 @@ export class WorkoutController extends BaseController {
   @SwaggerResponse([WorkoutSerializationPopulate])
   @SwaggerSummary("List workouts")
   @SwaggerDescription("List all workouts in the system")
+  @SwaggerQuery({
+    limit: "number",
+    skip: "number",
+  })
   list = async (req: Request, res: Response) => {
     const paginationQuery = parsePaginationQuery(req.query);
     const { docs, paginationData } = await this.workoutsService.list(

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

@@ -33,6 +33,7 @@ export class UsersExerciseController extends BaseController {
   @SwaggerDescription("List all exercises")
   @SwaggerQuery({
     limit: "number",
+    skip: "number",
   })
   list = async (req: Request, res: Response): Promise<Response> => {
     const paginationQuery = parsePaginationQuery(req.query);
@@ -91,7 +92,6 @@ export class UsersExerciseController extends BaseController {
     const paginationQuery = parsePaginationQuery(req.query);
     let query = {};
     let searchTerm = req.query.searchTerm;
-
     let isNum = !isNaN(parseInt(String(searchTerm)));
 
     if (isNum) {
@@ -106,6 +106,8 @@ export class UsersExerciseController extends BaseController {
     }
 
     else {
+      console.log(req.query);
+      
       if (req.query.filter === "category") {
         query = { category: { $regex: searchTerm, $options: "i" } };
       }

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

@@ -14,6 +14,7 @@ import { SwaggerGet } from "@lib/decorators/swagger-routes.decorator";
 import { SwaggerResponse } from "@lib/decorators/swagger-response.decorator";
 import { SwaggerSummary } from "@lib/decorators/swagger-summary.decorator";
 import { SwaggerDescription } from "@lib/decorators/swagger-description.decorator";
+import { SwaggerQuery } from "@lib/decorators/swagger-query.decorator";
 
 
 @Controller("/user/ingredients")
@@ -29,6 +30,10 @@ export class UsersIngredientsController extends BaseController {
   @SwaggerResponse([IngredientSerialization])
   @SwaggerSummary("list ingredients")
   @SwaggerDescription("List all ingredients")
+  @SwaggerQuery({
+    limit: "number",
+    skip: "number",
+  })
   list = async (req: Request, res: Response) => {
     const paginationQuery = parsePaginationQuery(req.query);
     const { docs, paginationData } = await this.ingredientsService.list(

src/modules/users/modules/meal-plans/controller/meal-plans.controller.ts

@@ -13,6 +13,7 @@ import { SwaggerGet } from "@lib/decorators/swagger-routes.decorator";
 import { SwaggerResponse } from "@lib/decorators/swagger-response.decorator";
 import { SwaggerSummary } from "@lib/decorators/swagger-summary.decorator";
 import { SwaggerDescription } from "@lib/decorators/swagger-description.decorator";
+import { SwaggerQuery } from "@lib/decorators/swagger-query.decorator";
 
 
 @Controller("/user/mealPlans")
@@ -28,6 +29,10 @@ export class UsersMealPlansController extends BaseController {
   @SwaggerResponse([MealPlanPopulateSerialization])
   @SwaggerSummary("list meal plans")
   @SwaggerDescription("List all meal plans")
+  @SwaggerQuery({
+    limit: "number",
+    skip: "number",
+  })
   list = async (req: Request, res: Response) => {
     const paginationQuery = parsePaginationQuery(req.query);
     const { docs, paginationData } = await this.mealPlansService.list(

src/modules/users/modules/meals/controller/meals.controller.ts

@@ -13,6 +13,7 @@ import { SwaggerGet } from "@lib/decorators/swagger-routes.decorator";
 import { SwaggerResponse } from "@lib/decorators/swagger-response.decorator";
 import { SwaggerSummary } from "@lib/decorators/swagger-summary.decorator";
 import { SwaggerDescription } from "@lib/decorators/swagger-description.decorator";
+import { SwaggerQuery } from "@lib/decorators/swagger-query.decorator";
 
 
 @Controller("/user/meals")
@@ -28,6 +29,10 @@ export class UsersMealsController extends BaseController {
   @SwaggerResponse([MealPopulateSerialization])
   @SwaggerSummary("list meals")
   @SwaggerDescription("List all meals")
+  @SwaggerQuery({
+    limit: "number",
+    skip: "number",
+  })
   list = async (req: Request, res: Response) => {
     const paginationQuery = parsePaginationQuery(req.query);
     const { docs, paginationData } = await this.mealsService.list(

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

@@ -20,6 +20,7 @@ import { SwaggerResponse } from "@lib/decorators/swagger-response.decorator";
 import { SwaggerRequest } from "@lib/decorators/swagger-request.decorator";
 import { createTemplatesSchema } from "../validations/create-templates.validation";
 import { SwaggerDescription } from "@lib/decorators/swagger-description.decorator";
+import { SwaggerQuery } from "@lib/decorators/swagger-query.decorator";
 
 
 interface userRequest extends Request {
@@ -45,6 +46,10 @@ export class templateController extends BaseController {
   @SwaggerResponse([TemplatePopulateSerialization])
   @SwaggerSummary("my trainer --> custom workout")
   @SwaggerDescription("List all custom plans created by the user logged in")
+  @SwaggerQuery({
+    limit: "number",
+    skip: "number",
+  })
   list = async (req: userRequest, res: Response): Promise<Response> => {
     const paginationQuery = parsePaginationQuery(req.query);
     const { docs, paginationData } = await this.templatesService.list(

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

@@ -14,6 +14,7 @@ import { SwaggerGet } from "@lib/decorators/swagger-routes.decorator";
 import { SwaggerResponse } from "@lib/decorators/swagger-response.decorator";
 import { SwaggerSummary } from "@lib/decorators/swagger-summary.decorator";
 import { SwaggerDescription } from "@lib/decorators/swagger-description.decorator";
+import { SwaggerQuery } from "@lib/decorators/swagger-query.decorator";
 
 
 @Controller("/user/workouts")
@@ -30,6 +31,10 @@ export class UsersWorkoutController extends BaseController {
   @SwaggerResponse([WorkoutSerializationPopulate])
   @SwaggerSummary("List workouts")
   @SwaggerDescription("List all workouts in the system")
+  @SwaggerQuery({
+    limit: "number",
+    skip: "number",
+  })
   list = async (req: Request, res: Response): Promise<Response> => {
     const paginationQuery = parsePaginationQuery(req.query);
     const { docs, paginationData } = await this.workoutsService.list(