Merge branch 'main' into docs

src/lib/services/crud.service.ts

@@ -1,7 +1,7 @@
 import { HttpError } from "@lib/error-handling/http-error";
-import { populate } from "dotenv";
 import { AnyKeys, Document, FilterQuery, Model } from "mongoose";
 
+
 export const CrudService = <ModelDoc extends Document>(
   model: Model<ModelDoc>
 ) => {
@@ -42,11 +42,11 @@ export const CrudService = <ModelDoc extends Document>(
         skip?: number;
       } = {
           limit: 10,
-          skip: 0,
+          skip: 1,
         },
       options?: {
         populateArray: any
-      }
+      },
     ): Promise<{
       docs: ModelDoc[];
       paginationData: {
@@ -58,10 +58,10 @@ export const CrudService = <ModelDoc extends Document>(
       const queryInstruction = this.model
         .find(filter)
         .limit(paginationOptions.limit)
-        .skip(paginationOptions.skip)
+        .skip(paginationOptions.skip);
       if (options?.populateArray) queryInstruction.populate(options.populateArray);
 
-      const docs = await queryInstruction
+      const docs = await queryInstruction;
       const total = await this.model.countDocuments(filter);
       const paginationData = {
         total: total,
@@ -90,8 +90,9 @@ export const CrudService = <ModelDoc extends Document>(
       }
     ): Promise<ModelDoc> {
       await this.existsOrThrow(filter);
-      let optionsObject = options ? options : { populateArray: [{}] }
-      const document = await this.findOne(filter, optionsObject);
+      const queryInstruction = this.model.findOne(filter);
+      if (options?.populateArray) queryInstruction.populate(options.populateArray);
+      const document = await queryInstruction;
       return document;
     }
 

src/modules/users/modules/user-registered-workouts/controllers/user-registered-workouts.controller.ts

@@ -30,6 +30,7 @@ export class userRegisteredWorkoutsController extends BaseController {
 
   setRoutes(): void {
     this.router.get("/:id", paramsValidator("id"), asyncHandler(this.get));
+    this.router.get("/home/:userId", paramsValidator("userId"), asyncHandler(this.getHomePage));
     this.router.get("/", asyncHandler(this.list));
     this.router.post(
       "/",
@@ -42,17 +43,16 @@ export class userRegisteredWorkoutsController extends BaseController {
   @SwaggerResponse([UserRegisteredWorkoutsSerialization])
   list = async (req: userRequest, res: Response) => {
     const paginationQuery = parsePaginationQuery(req.query);
-    const { docs, paginationData } =
-      await this.userRegisteredWorkoutsService.list(
-        { user: req.jwtPayload.id },
-        paginationQuery,
-        {
-          populateArray: [
-            { path: "workout", select: "-templateWeeks -created_by" },
-            { path: "weeks.days.exercises", select: "name media reps sets" },
-          ],
-        }
-      );
+    const { docs, paginationData } = await this.userRegisteredWorkoutsService.list(
+      { user: req.jwtPayload.id, is_active: true },
+      paginationQuery,
+      {
+        populateArray: [
+          { path: "workout", select: "-templateWeeks -created_by" },
+          { path: "weeks.days.exercises", select: "name media reps sets" },
+        ]
+      }
+    );
 
     return JsonResponse.success(
       {
@@ -72,7 +72,26 @@ export class userRegisteredWorkoutsController extends BaseController {
         populateArray: [
           { path: "workout", select: "-template_weeks -created_by" },
           { path: "weeks.days.exercises", select: "name media reps sets" },
-        ],
+        ]
+      }
+    );
+    return JsonResponse.success(
+      {
+        data: serialize(data.toJSON(), UserRegisteredWorkoutsSerialization),
+      },
+      res
+    );
+  };
+
+  getHomePage = async (req: userRequest, res: Response) => {
+    const data = await this.userRegisteredWorkoutsService.findOneOrFail(
+      { user: req.params.userId },
+      {
+        populateArray: [
+          { path: "workout", select: "-template_weeks -created_by" },
+          { path: "weeks.days.exercises", select: "name media reps sets" },
+          { path: "user", select: "name preferences" }
+        ]
       }
     );
     return JsonResponse.success(