chore: Update controllers and serializers for user-registered-workout and user-registered-meal-plan

src/common/serializers/home.serialization.ts

@@ -0,0 +1,135 @@
+import { Expose, Transform } from "class-transformer";
+import { serialize } from "@helpers/serialize";
+import { SwaggerResponseProperty } from "@lib/decorators/swagger-response-property.decorator";
+
+
+class DaysInHome {
+  @Expose()
+  @SwaggerResponseProperty({ type: "number" })
+  day_number: number;
+
+  @Expose()
+  @SwaggerResponseProperty({ type: "number" })
+  total_number_exercises: number;
+
+  @Expose()
+  @SwaggerResponseProperty({ type: "string" })
+  day_type: string;
+
+  @Expose()
+  @SwaggerResponseProperty({ type: "boolean" })
+  is_done: Boolean;
+
+
+}
+
+class weeksInHome {
+  @Expose()
+  @SwaggerResponseProperty({ type: "number" })
+  week_number: number;
+
+  @Expose()
+  @SwaggerResponseProperty({ type: "boolean" })
+  is_done: Boolean;
+
+  @Expose({ name: "days" })
+  @SwaggerResponseProperty({ type: [DaysInHome] })
+  @Transform(({ value }) => serialize(value, DaysInHome))
+  days: any;
+}
+
+class WorkoutInHome {
+  @Expose({ name: "_id" })
+  @SwaggerResponseProperty({ type: "string" })
+  id: string;
+
+  @Expose()
+  @SwaggerResponseProperty({ type: "string" })
+  name: string;
+
+  @Expose()
+  @SwaggerResponseProperty({ type: "number" })
+  min_per_day: number;
+}
+
+class MyWorkoutHome {
+  @Expose({ name: "_id" })
+  @SwaggerResponseProperty({ type: "string" })
+  id: string;
+
+  @Expose()
+  @SwaggerResponseProperty({ type: WorkoutInHome })
+  @Transform(({ value }) => serialize(value, WorkoutInHome))
+  workout: any;
+
+  @Expose()
+  @SwaggerResponseProperty({ type: "boolean" })
+  is_active: boolean;
+
+  @Expose()
+  @SwaggerResponseProperty({ type: weeksInHome })
+  @Transform(({ value }) => serialize(value, weeksInHome))
+  weeks: any;
+}
+
+class PreferencesUserHome {
+  @Expose()
+  @SwaggerResponseProperty({ type: "string" })
+  fitness_goal: string;
+
+  @Expose()
+  @SwaggerResponseProperty({ type: "number" })
+  target_weight: number;
+
+  @Expose()
+  @SwaggerResponseProperty({ type: "number" })
+  workout_frequency: number;
+
+  @Expose({ name: "preferred_days" })
+  @SwaggerResponseProperty({ type: ["string"] })
+  preferred_days: any;
+
+  @Expose()
+  @SwaggerResponseProperty({ type: "string" })
+  workout_place: string;
+
+  @Expose()
+  @SwaggerResponseProperty({ type: ["string"] })
+  preferred_equipment: any;
+}
+
+class UserHome {
+  @Expose({ name: "_id" })
+  @SwaggerResponseProperty({ type: "string" })
+  id: string;
+
+  @Expose()
+  @SwaggerResponseProperty({ type: "string" })
+  name: string;
+
+  @Expose({ name: "preferences" })
+  @SwaggerResponseProperty({ type: PreferencesUserHome })
+  @Transform(({ value }) => serialize(value, PreferencesUserHome))
+  preferences: any;
+
+  @Expose()
+  @SwaggerResponseProperty({ type: ["string"] })
+  injuries: any;
+}
+
+export class HomeSerialization {
+
+  @Expose()
+  @SwaggerResponseProperty({ type: UserHome })
+  @Transform(({ value }) => serialize(value, UserHome))
+  user: any;
+
+  @Expose()
+  @SwaggerResponseProperty({ type: MyWorkoutHome })
+  @Transform(({ value }) => serialize(value, MyWorkoutHome))
+  myWorkout: any;
+
+  @Expose({ name: "myMealPlan" })
+  @SwaggerResponseProperty({ type: {} })
+  myMealPlan: any;
+}

src/common/serializers/user-registered-workoutPopulate.serialization.ts

@@ -2,8 +2,6 @@ import { Expose, Transform } from "class-transformer";
 import { serialize } from "@helpers/serialize";
 import { SwaggerResponseProperty } from "@lib/decorators/swagger-response-property.decorator";
 import { ExerciseSerialization } from "./exercise.serialization";
-import { WorkoutSerialization } from "./workout.serialization";
-import { UserSerialization } from "./user.serialization";
 
 
 class MyWorkoutDaysPopulate {
@@ -51,42 +49,65 @@ class MyWorkoutWeeksPopulate {
   is_done: Boolean;
 }
 
-export class UserRegisteredWorkoutsPopulateSerialization {
+class Workout {
   @Expose({ name: "_id" })
   @SwaggerResponseProperty({ type: "string" })
   id: string;
 
   @Expose()
   @SwaggerResponseProperty({ type: "string" })
-  user: string;
+  name: string;
 
   @Expose()
-  @SwaggerResponseProperty({ type: WorkoutSerialization })
-  workout: string;
+  @SwaggerResponseProperty({ type: "string" })
+  description: string;
 
   @Expose()
-  @SwaggerResponseProperty({ type: "boolean" })
-  is_active: Boolean;
+  @SwaggerResponseProperty({ type: "string" })
+  type: string;
 
-  @Expose({ name: "weeks" })
-  @SwaggerResponseProperty({ type: [MyWorkoutWeeksPopulate] })
-  @Transform(({ value }) => serialize(value, MyWorkoutWeeksPopulate))
-  weeks: any;
-}
+  @Expose()
+  @SwaggerResponseProperty({ type: "string" })
+  image: string;
+
+  @Expose()
+  @SwaggerResponseProperty({ type: "string" })
+  created_by: string;
+
+  @Expose()
+  @SwaggerResponseProperty({ type: "string" })
+  fitness_level: string;
+
+  @Expose()
+  @SwaggerResponseProperty({ type: "string" })
+  fitness_goal: string;
+
+  @Expose()
+  @SwaggerResponseProperty({ type: "string" })
+  place: any;
+
+  @Expose()
+  @SwaggerResponseProperty({ type: "number" })
+  min_per_day: number;
 
+  @Expose()
+  @SwaggerResponseProperty({ type: "number" })
+  total_number_days: number;
 
+}
 
-export class UserRegisteredWorkoutsPopulateUserSerialization {
+export class UserRegisteredWorkoutsPopulateSerialization {
   @Expose({ name: "_id" })
   @SwaggerResponseProperty({ type: "string" })
   id: string;
 
   @Expose()
-  @SwaggerResponseProperty({ type: UserSerialization })
-  user: any;
+  @SwaggerResponseProperty({ type: "string" })
+  user: string;
 
   @Expose()
-  @SwaggerResponseProperty({ type: WorkoutSerialization })
+  @SwaggerResponseProperty({ type: Workout })
+  @Transform(({ value }) => serialize(value, Workout))
   workout: string;
 
   @Expose()
@@ -97,4 +118,4 @@ export class UserRegisteredWorkoutsPopulateUserSerialization {
   @SwaggerResponseProperty({ type: [MyWorkoutWeeksPopulate] })
   @Transform(({ value }) => serialize(value, MyWorkoutWeeksPopulate))
   weeks: any;
-}
+}

src/lib/services/crud.service.ts

@@ -123,12 +123,14 @@ export const CrudService = <ModelDoc extends Document>(
     async findOneOrFail(
       filter: FilterQuery<ModelDoc>,
       options?: {
-        populateArray: any
+        populateArray?: any,
+        selectArray?: any
       }
     ): Promise<ModelDoc> {
       await this.existsOrThrow(filter);
       const queryInstruction = this.model.findOne(filter);
       if (options?.populateArray) queryInstruction.populate(options.populateArray);
+      if (options?.selectArray) queryInstruction.select(options.selectArray);
       const document = await queryInstruction;
       return document;
     }

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

@@ -33,7 +33,6 @@ export class UsersExerciseController extends BaseController {
   @SwaggerDescription("List all exercises")
   @SwaggerQuery({
     limit: "number",
-    
   })
   list = async (req: Request, res: Response): Promise<Response> => {
     const paginationQuery = parsePaginationQuery(req.query);
@@ -60,7 +59,7 @@ export class UsersExerciseController extends BaseController {
 
   @SwaggerGet("/:id")
   @SwaggerResponse(ExercisePopulateSerialization)
-  @SwaggerSummary("Get exercise")
+  @SwaggerSummary("instructions-workout && target muscle-workout")
   @SwaggerDescription("Get a single exercise")
   get = async (req: Request, res: Response): Promise<Response> => {
     const data = await this.exercisesService.findOneOrFail(

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

@@ -0,0 +1,69 @@
+import { UserRegisteredWorkoutsService } from "../../user-registered-workouts/services/user-registered-workouts.service";
+import { UserRegisteredMealPlansService } from "../../user-registered-meal-plans/services/user-registered-meal-plans.service";
+import { UserService } from "../../users/services/users.service";
+import { Request, Response } from "express";
+import { JsonResponse } from "@lib/responses/json-response";
+import { asyncHandler } from "@helpers/async-handler";
+import { BaseController } from "@lib/controllers/controller.base";
+import { Controller } from "@lib/decorators/controller.decorator";
+import { serialize } from "@helpers/serialize";
+import { ControllerMiddleware } from "@lib/decorators/controller-middleware.decorator";
+import { UsersGuardMiddleware } from "modules/users/common/guards/users.guard";
+import { SwaggerGet } from "@lib/decorators/swagger-routes.decorator";
+import { SwaggerSummary } from "@lib/decorators/swagger-summary.decorator";
+import { SwaggerDescription } from "@lib/decorators/swagger-description.decorator";
+import { SwaggerResponse } from "@lib/decorators/swagger-response.decorator";
+import { HomeSerialization } from "common/serializers/home.serialization";
+
+
+interface userRequest extends Request {
+  jwtPayload?: any;
+}
+
+@Controller("/user/homePage")
+@ControllerMiddleware(UsersGuardMiddleware())
+export class homePageController extends BaseController {
+  private userRegisteredWorkoutsService = new UserRegisteredWorkoutsService();
+  private userRegisteredMealPlansService = new UserRegisteredMealPlansService();
+  private userService = new UserService();
+
+  setRoutes(): void {
+    this.router.get("/", asyncHandler(this.getHomePage));
+  }
+
+
+  @SwaggerGet()
+  @SwaggerResponse(HomeSerialization)
+  @SwaggerSummary("Home")
+  @SwaggerDescription("Get home page")
+  getHomePage = async (req: userRequest, res: Response) => {
+
+    const user = await this.userService.findOneOrFail(
+      { _id: req.jwtPayload.id },
+      { selectArray: ["preferences", "name", "fitness_level", "injuries"] }
+    )
+
+    const myWorkout = await this.userRegisteredWorkoutsService.findOneOrFail(
+      { user: req.jwtPayload.id, is_active: true },
+      {
+        populateArray: [
+          { path: "workout", select: ["name", "min_per_day"] },
+        ],
+        selectArray: ["-weeks.week_description", "-weeks.week_name", "-weeks.days.exercises", "-user"],
+      },
+    )
+    const data = {
+      user: user,
+      myWorkout: myWorkout,
+      myMealPlan: {}
+    }
+
+    return JsonResponse.success(
+      {
+        data: serialize(data, HomeSerialization)
+      },
+      res
+    );
+  };
+
+}

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

@@ -43,7 +43,7 @@ export class templateController extends BaseController {
 
   @SwaggerGet()
   @SwaggerResponse([TemplatePopulateSerialization])
-  @SwaggerSummary("List my custom plans")
+  @SwaggerSummary("my trainer --> custom workout")
   @SwaggerDescription("List all custom plans created by the user logged in")
   list = async (req: userRequest, res: Response): Promise<Response> => {
     const paginationQuery = parsePaginationQuery(req.query);

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

@@ -8,7 +8,7 @@ import { BaseController } from "@lib/controllers/controller.base";
 import { Controller } from "@lib/decorators/controller.decorator";
 import { serialize } from "@helpers/serialize";
 import { UserRegisteredWorkoutsSerialization } from "@common/serializers/user-registered-workout.serialization";
-import { UserRegisteredWorkoutsPopulateSerialization, UserRegisteredWorkoutsPopulateUserSerialization } from "@common/serializers/user-registered-workoutPopulate.serialization";
+import { UserRegisteredWorkoutsPopulateSerialization } from "@common/serializers/user-registered-workoutPopulate.serialization";
 import { ControllerMiddleware } from "@lib/decorators/controller-middleware.decorator";
 import { UsersGuardMiddleware } from "modules/users/common/guards/users.guard";
 import { createUserRegisteredWorkoutsSchema } from "../validations/create-user-registered-workouts.validation";
@@ -19,7 +19,7 @@ import {
 import { SwaggerSummary } from "@lib/decorators/swagger-summary.decorator";
 import { SwaggerDescription } from "@lib/decorators/swagger-description.decorator";
 import { SwaggerResponse } from "@lib/decorators/swagger-response.decorator";
-import { SwaggerRequest } from "@lib/decorators/swagger-request.decorator";4
+import { SwaggerRequest } from "@lib/decorators/swagger-request.decorator"; 4
 
 
 interface userRequest extends Request {
@@ -32,57 +32,52 @@ export class userRegisteredWorkoutsController extends BaseController {
   private userRegisteredWorkoutsService = new UserRegisteredWorkoutsService();
 
   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(
-      "/",
-      bodyValidator(createUserRegisteredWorkoutsSchema),
-      asyncHandler(this.create)
-    );
+    this.router.get("/:id", asyncHandler(this.get));
+    // this.router.get("/", asyncHandler(this.list));
+    // this.router.post(
+    //   "/",
+    //   bodyValidator(createUserRegisteredWorkoutsSchema),
+    //   asyncHandler(this.create)
+    // );
   }
 
-  @SwaggerGet()
-  @SwaggerResponse([UserRegisteredWorkoutsPopulateSerialization])
-  @SwaggerSummary("List my workouts")
-  @SwaggerDescription("List all user registered workouts (workouts that the user had started)")
-  list = async (req: userRequest, res: Response) => {
-    const paginationQuery = parsePaginationQuery(req.query);
-    const { docs, paginationData } =
-      await this.userRegisteredWorkoutsService.list(
-        { user: req.jwtPayload.id, is_active: true },
-        paginationQuery,
-        {
-          populateArray: [
-            { path: "workout" },
-            { path: "weeks.days.exercises" },
-          ],
-        }
-      );
+  // @SwaggerGet()
+  // @SwaggerResponse([UserRegisteredWorkoutsPopulateSerialization])
+  // @SwaggerSummary("List my workouts")
+  // @SwaggerDescription("List all user registered workouts (workouts that the user had started)")
+  // list = async (req: userRequest, res: Response) => {
+  //   const paginationQuery = parsePaginationQuery(req.query);
+  //   const { docs, paginationData } =
+  //     await this.userRegisteredWorkoutsService.list(
+  //       { user: req.jwtPayload.id, is_active: true },
+  //       paginationQuery,
+  //       {
+  //         populateArray: [
+  //           { path: "workout" },
+  //           { path: "weeks.days.exercises" },
+  //         ],
+  //       }
+  //     );
 
-    return JsonResponse.success(
-      {
-        data: serialize(docs, UserRegisteredWorkoutsPopulateSerialization),
-        meta: paginationData,
-      },
-      res
-    );
-  };
+  //   return JsonResponse.success(
+  //     {
+  //       data: serialize(docs, UserRegisteredWorkoutsPopulateSerialization),
+  //       meta: paginationData,
+  //     },
+  //     res
+  //   );
+  // };
 
   @SwaggerGet("/:id")
   @SwaggerResponse(UserRegisteredWorkoutsPopulateSerialization)
-  @SwaggerSummary("Get a workout")
+  @SwaggerSummary("today's workout && my trainer --> my plan && weekly")
   @SwaggerDescription("Get a single workout from user registered workouts (workouts that the user had started)")
   get = async (req: userRequest, res: Response) => {
     const data = await this.userRegisteredWorkoutsService.findOneOrFail(
       { _id: req.params.id },
       {
         populateArray: [
-          { path: "workout" },
+          { path: "workout", select: ["-weeks"] },
           { path: "weeks.days.exercises" },
         ],
       }
@@ -95,43 +90,20 @@ export class userRegisteredWorkoutsController extends BaseController {
     );
   };
 
-  @SwaggerGet("/home/:userId")
-  @SwaggerResponse(UserRegisteredWorkoutsPopulateUserSerialization)
-  @SwaggerSummary("Get home page")
-  @SwaggerDescription("Get the home page for the user")
-  getHomePage = async (req: userRequest, res: Response) => {
-    
-    const data = await this.userRegisteredWorkoutsService.findOneOrFail(
-      { user: req.params.userId },
-      {
-        populateArray: [
-          { path: "workout" },
-          { path: "weeks.days.exercises" },
-          { path: "user" },
-        ],
-      }
-    );
-    return JsonResponse.success(
-      {
-        data: serialize(data.toJSON(), UserRegisteredWorkoutsPopulateUserSerialization),
-      },
-      res
-    );
-  };
 
-  @SwaggerPost()
-  @SwaggerResponse(UserRegisteredWorkoutsSerialization)
-  @SwaggerRequest(createUserRegisteredWorkoutsSchema)
-  @SwaggerSummary("Create workout")
-  @SwaggerDescription("Create a new workout for the user")
-  create = async (req: userRequest, res: Response) => {
-    const data = await this.userRegisteredWorkoutsService.create(req.body);
-    return JsonResponse.success(
-      {
-        status: 201,
-        data: serialize(data.toJSON(), UserRegisteredWorkoutsSerialization),
-      },
-      res
-    );
-  };
+  // @SwaggerPost()
+  // @SwaggerResponse(UserRegisteredWorkoutsSerialization)
+  // @SwaggerRequest(createUserRegisteredWorkoutsSchema)
+  // @SwaggerSummary("Create workout")
+  // @SwaggerDescription("Create a new workout for the user")
+  // create = async (req: userRequest, res: Response) => {
+  //   const data = await this.userRegisteredWorkoutsService.create(req.body);
+  //   return JsonResponse.success(
+  //     {
+  //       status: 201,
+  //       data: serialize(data.toJSON(), UserRegisteredWorkoutsSerialization),
+  //     },
+  //     res
+  //   );
+  // };
 }