Merge pull request #82 from Modarb-Ai-Trainer/updates

src/common/models/user.model.ts

@@ -26,11 +26,11 @@ export interface IUser {
     fitness_goal: FitnessGoal;
     target_weight: number;
     workout_frequency: number;
-    preferred_days: [PreferredDay];
+    preferred_days: PreferredDay[];
     workout_place: WorkoutPlace;
-    preferred_equipment: [PreferredEquipment];
+    preferred_equipment: PreferredEquipment[];
   };
-  injuries: [Injury];
+  injuries: Injury[];
 }
 
 const userSchema = new Schema({

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

@@ -2,7 +2,7 @@ import { UserRegisteredWorkoutsService } from "../services/user-registered-worko
 import { Request, Response } from "express";
 import { JsonResponse } from "@lib/responses/json-response";
 import { parsePaginationQuery } from "@helpers/pagination";
-import { paramsValidator, bodyValidator } from "@helpers/validation.helper";
+import { bodyValidator } from "@helpers/validation.helper";
 import { asyncHandler } from "@helpers/async-handler";
 import { BaseController } from "@lib/controllers/controller.base";
 import { Controller } from "@lib/decorators/controller.decorator";
@@ -14,12 +14,14 @@ import { UsersGuardMiddleware } from "modules/users/common/guards/users.guard";
 import { createUserRegisteredWorkoutsSchema } from "../validations/create-user-registered-workouts.validation";
 import {
   SwaggerGet,
+  SwaggerPatch,
   SwaggerPost,
 } 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 { SwaggerRequest } from "@lib/decorators/swagger-request.decorator"; 4
+import { SwaggerRequest } from "@lib/decorators/swagger-request.decorator";import { updateUserRegisteredWorkoutsSchema } from "../validations/update-user-registered-workouts.validation";
+ 4
 
 
 interface userRequest extends Request {
@@ -33,40 +35,45 @@ export class userRegisteredWorkoutsController extends BaseController {
 
   setRoutes(): void {
     this.router.get("/:id", asyncHandler(this.get));
-    // this.router.get("/", asyncHandler(this.list));
-    // this.router.post(
-    //   "/",
-    //   bodyValidator(createUserRegisteredWorkoutsSchema),
-    //   asyncHandler(this.create)
-    // );
+    this.router.get("/", asyncHandler(this.list));
+    this.router.post(
+      "/",
+      bodyValidator(createUserRegisteredWorkoutsSchema),
+      asyncHandler(this.create)
+    );
+    this.router.patch(
+      "/:id/progress/:week/:day",
+      bodyValidator(updateUserRegisteredWorkoutsSchema),
+      asyncHandler(this.updateProgress)
+    );
   }
 
-  // @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)
@@ -95,19 +102,39 @@ export class userRegisteredWorkoutsController extends BaseController {
   };
 
 
-  // @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.createForUser(req.body, req.jwtPayload.id);
+    return JsonResponse.success(
+      {
+        status: 201,
+        data: serialize(data.toJSON(), UserRegisteredWorkoutsSerialization),
+      },
+      res
+    );
+  };
+
+  @SwaggerPatch('/:id/progress/:week/:day')
+  @SwaggerResponse({})
+  @SwaggerRequest(updateUserRegisteredWorkoutsSchema)
+  @SwaggerSummary("Update Workout Progress")
+  @SwaggerDescription("Update the progress of a workout")
+  updateProgress = async (req: userRequest, res: Response) => {
+    const urwId: string = req.params.id;
+    const weekNumber: number = Number(req.params.week);
+    const dayNumber: number = Number(req.params.day);
+    await this.userRegisteredWorkoutsService.updateForUser({
+      urwId, weekNumber, dayNumber
+    }, req.body, req.jwtPayload.id);
+    return JsonResponse.success(
+      {
+        message: "Workout updated successfully",
+      },
+      res
+    );
+  };
 }

src/modules/users/modules/user-registered-workouts/services/user-registered-workouts.service.ts

@@ -1,4 +1,50 @@
 import { UserRegisteredWorkout } from "@common/models/user-registered-workout.model";
 import { CrudService } from "@lib/services/crud.service";
+import { ICreateUserRegisteredWorkouts } from "../validations/create-user-registered-workouts.validation";
+import { WorkoutService } from "../../workouts/services/workouts.service";
+import { IUpdateUserRegisteredWorkouts } from "../validations/update-user-registered-workouts.validation";
+import { HttpError } from "@lib/error-handling/http-error";
 
-export class UserRegisteredWorkoutsService extends CrudService(UserRegisteredWorkout) {}
+export class UserRegisteredWorkoutsService extends CrudService(UserRegisteredWorkout) {
+  private workoutsService: WorkoutService = new WorkoutService();
+  
+  async createForUser(data: ICreateUserRegisteredWorkouts, userId: string) {
+    const workout = await this.workoutsService.findOneOrFail({
+      _id: data.workout,
+    });
+    return await this.create({
+      ...data,
+      user: userId,
+      weeks: workout.template_weeks,
+      is_active: true,
+    });
+  }
+
+  async updateForUser(workoutProps: {urwId: string; weekNumber: number; dayNumber: number}, data: IUpdateUserRegisteredWorkouts, userId: string) {
+    // find workout
+    const workout = await this.findOneOrFail({
+      _id: workoutProps.urwId,
+      user: userId,
+    });
+
+    // find week
+    const week = workout.weeks.find(w => w.week_number === workoutProps.weekNumber);
+    if(!week) throw new HttpError(404, 'Workout Week Not Found');
+    const weekIndex = workout.weeks.indexOf(week);
+
+    // find day
+    const day = week.days.find(d => d.day_number === workoutProps.dayNumber);
+    if(!day) throw new HttpError(404, 'Workout Day Not Found');
+    const dayIndex = week.days.indexOf(day)
+
+    // update day and week
+    day.is_done = true;
+    week.days[dayIndex] = day;
+    week.is_done = week.days.every(d => d.is_done);
+    workout.weeks[weekIndex] = week;
+    
+    // save changes
+    workout.markModified('weeks');
+    return workout.save()
+  }
+}

src/modules/users/modules/user-registered-workouts/validations/create-user-registered-workouts.validation.ts

@@ -26,92 +26,9 @@ export interface ICreateUserRegisteredWorkouts {
 }
 
 export const createUserRegisteredWorkoutsSchema = createSchema<ICreateUserRegisteredWorkouts>({
-    user: joi.string().empty().required().messages({
-        "string.base": "please enter a valid user id",
-        "any.required": "user id is required",
-        "string.empty": "user id can not be empty",
-    }),
-    is_active: joi.boolean().empty().optional().messages({
-        "boolean.base": "please enter a valid isActive",
-        "boolean.empty": "isActive can not be empty",
-    }),
-    workout: joi.string().empty().required().messages({
-        "string.base": "please enter a valid workout id",
-        "any.required": "workout id is required",
-        "string.empty": "workout id can not be empty",
-    }),
-    weeks: joi.array().empty().required().items(
-        joi.object({
-            week_number: joi.number().integer().empty().required().messages({
-                "number.base": "please enter a valid week number",
-                "any.required": "week number is required",
-                "number.empty": "week number can not be empty",
-                "number.integer": "week number must be an integer",
-            }),
-            week_name: joi.string().empty().required().messages({
-                "string.base": "please enter a valid week name",
-                "any.required": "week name is required",
-                "string.empty": "week name can not be empty",
-            }),
-            week_description: joi.string().empty().required().messages({
-                "string.base": "please enter a valid week description",
-                "any.required": "week description is required",
-                "string.empty": "week description can not be empty",
-            }),
-            is_done: joi.boolean().empty().optional().messages({
-                "boolean.base": "please enter a valid isDone",
-                "boolean.empty": "isDone can not be empty",
-            }),
-            days: joi.array().required().items(
-                joi.object({
-                    day_number: joi.number().empty().integer().min(1).max(7).required().messages({
-                        "number.base": "Please enter a valid day number",
-                        "any.required": "day number is required",
-                        "number.empty": "day number cannot be empty",
-                        "number.integer": "day number must be an integer",
-                        "number.min": "day number must be between 1 and 7",
-                        "number.max": "day number must be between 1 and 7"
-                    }),
-                    total_number_exercises: joi.number().empty().integer().required().messages({
-                        "number.base": "Please enter a valid total number exercises",
-                        "any.required": "total number exercises is required",
-                        "number.empty": "total number exercises cannot be empty",
-                        "number.integer": "total number exercises must be an integer",
-                    }),
-                    day_type: joi.string().empty().required().messages({
-                        "string.base": "please enter a valid day type",
-                        "any.required": "day type is required",
-                        "string.empty": "day type can not be empty",
-                    }),
-                    exercises: joi.array().empty().required().items(
-                        joi.string().empty().required().messages({
-                            "string.base": "please enter a valid exercise id",
-                            "any.required": "exercise id is required",
-                            "string.empty": "exercise id can not be empty",
-                        }),).messages({
-                            "array.base": "please enter a valid exercises array",
-                            "any.required": "exercises array is required",
-                            "array.empty": "exercises array can not be empty",
-                        }),
-                    is_done: joi.boolean().empty().optional().messages({
-                        "boolean.base": "please enter a valid isDone",
-                        "boolean.empty": "isDone can not be empty",
-                    }),
-                }).empty().messages({
-                    "object.base": "please enter a valid day object",
-                    "any.required": "day object is required",
-                    "object.empty": "day object can not be empty",
-                })
-            ),
-        }).empty().messages({
-            "array.base": "please enter a valid days array",
-            "any.required": "days array is required",
-            "array.empty": "days array can not be empty",
-
-        })
-    ).messages({
-        "array.base": "please enter a valid weeks array",
-        "any.required": "weeks array is required",
-        "array.empty": "weeks array can not be empty",
-    }),
-});
+  workout: joi.string().empty().required().messages({
+      "string.base": "please enter a valid workout id",
+      "any.required": "workout id is required",
+      "string.empty": "workout id can not be empty",
+  }),
+});

src/modules/users/modules/user-registered-workouts/validations/update-user-registered-workouts.validation.ts

@@ -2,105 +2,8 @@ import * as joi from "joi";
 import { createSchema } from "@helpers/create-schema";
 
 
-
 export interface IUpdateUserRegisteredWorkouts {
-    user?: string;
-    workout?: string;
-    is_active?: Boolean;
-    weeks?: [
-        {
-            week_number?: number;
-            week_name?: string,
-            week_description?: string,
-            is_done?: boolean,
-            days?: [
-                {
-                    day_number?: number,
-                    total_number_exercises?: number,
-                    day_type?: string,
-                    exercises?: [string],
-                    is_done?: boolean,
-                },
-            ],
-        },
-    ]
 }
 
-
 export const updateUserRegisteredWorkoutsSchema = createSchema<IUpdateUserRegisteredWorkouts>({
-    user: joi.string().empty().optional().messages({
-        "string.base": "please enter a valid user id",
-        "string.empty": "user id can not be empty",
-    }),
-    is_active: joi.boolean().empty().optional().messages({
-        "boolean.base": "please enter a valid isActive",
-        "boolean.empty": "isActive can not be empty",
-    }),
-    workout: joi.string().empty().optional().messages({
-        "string.base": "please enter a valid workout id",
-        "string.empty": "workout id can not be empty",
-    }),
-    weeks: joi.array().empty().optional().items(
-        joi.object({
-            week_number: joi.number().integer().empty().optional().messages({
-                "number.base": "please enter a valid week number",
-                "number.empty": "week number can not be empty",
-                "number.integer": "week number must be an integer",
-            }),
-            week_name: joi.string().empty().optional().messages({
-                "string.base": "please enter a valid week name",
-                "string.empty": "week name can not be empty",
-            }),
-            week_description: joi.string().empty().optional().messages({
-                "string.base": "please enter a valid week description",
-                "string.empty": "week description can not be empty",
-            }),
-            is_done: joi.boolean().empty().optional().messages({
-                "boolean.base": "please enter a valid isDone",
-                "boolean.empty": "isDone can not be empty",
-            }),
-            days: joi.array().optional().items(
-                joi.object({
-                    day_number: joi.number().empty().integer().min(1).max(7).optional().messages({
-                        "number.base": "Please enter a valid day number",
-                        "number.empty": "day number cannot be empty",
-                        "number.integer": "day number must be an integer",
-                        "number.min": "day number must be between 1 and 7",
-                        "number.max": "day number must be between 1 and 7"
-                    }),
-                    total_number_exercises: joi.number().empty().integer().optional().messages({
-                        "number.base": "Please enter a valid total number exercises",
-                        "number.empty": "total number exercises cannot be empty",
-                        "number.integer": "total number exercises must be an integer",
-                    }),
-                    day_type: joi.string().empty().optional().messages({
-                        "string.base": "please enter a valid day type",
-                        "string.empty": "day type can not be empty",
-                    }),
-                    exercises: joi.array().empty().optional().items(
-                        joi.string().empty().optional().messages({
-                            "string.base": "please enter a valid exercise id",
-                            "string.empty": "exercise id can not be empty",
-                        }),).messages({
-                            "array.base": "please enter a valid exercises array",
-                            "array.empty": "exercises array can not be empty",
-                        }),
-                    is_done: joi.boolean().empty().optional().messages({
-                        "boolean.base": "please enter a valid isDone",
-                        "boolean.empty": "isDone can not be empty",
-                    }),
-                }).empty().messages({
-                    "object.base": "please enter a valid day object",
-                    "object.empty": "day object can not be empty",
-                })
-            ),
-        }).empty().messages({
-            "array.base": "please enter a valid days array",
-            "array.empty": "days array can not be empty",
-
-        })
-    ).messages({
-        "array.base": "please enter a valid weeks array",
-        "array.empty": "weeks array can not be empty",
-    }),
-});
+});

src/seeder/seeders/admins.seeder.ts

@@ -5,11 +5,11 @@ import { seederWrapper } from "seeder/helpers/seeder-wrapper";
 export default seederWrapper(Admin, async () => {
   // create super admin
   await Admin.create({
+    name: "Super Admin",
     email: "[email protected]",
     password: "super",
-    role: Role.SUPER_ADMIN,
+    image: `https://placehold.co/300x400`,
     gender: "M1 Abrams Tank",
-    name: "Super Admin",
-    dob: new Date(),
+    role: Role.SUPER_ADMIN,
   });
 });

src/seeder/seeders/users.seeder.ts

@@ -0,0 +1,39 @@
+import { AuthenticatableType } from "@common/enums/authenticatable-type.enum";
+import { FitnessGoal } from "@common/enums/fitness-goal.enum";
+import { FitnessLevel } from "@common/enums/fitness-level.enum";
+import { Injury } from "@common/enums/injury.enum";
+import { PreferredDay } from "@common/enums/preferred-day.enum";
+import { PreferredEquipment } from "@common/enums/preferred-equipment.enum";
+import { WorkoutPlace } from "@common/enums/workout-place.enum";
+import { IUser, User } from "@common/models/user.model";
+import { seederWrapper } from "seeder/helpers/seeder-wrapper";
+
+export default seederWrapper(User, async () => {
+  // 10 users
+  await Promise.all(Array.from({ length: 10 }, (_, i) => i).map(async function (i) {
+    const o: IUser = {
+      name: `User ${i}`,
+      email: `user-${i}@app.com`,
+      password: "password",
+      image: `https://placehold.co/300x400`,
+        gender: (i as number % 2 === 0) ?
+        'male' :
+        'female',
+      height: 170,
+      weight: 70,
+      fitness_level: [FitnessLevel.BEGINNER, FitnessLevel.INTERMEDIATE, FitnessLevel.ADVANCED][i % 3],
+      preferences: {
+        fitness_goal: [FitnessGoal.LOSE_WEIGHT, FitnessGoal.GAIN_MUSCLE, FitnessGoal.GET_FITTER][i % 3],
+        target_weight: 60,
+        workout_frequency: 3,
+        preferred_days: [PreferredDay.MONDAY, PreferredDay.TUESDAY, PreferredDay.WEDNESDAY],
+        workout_place: [WorkoutPlace.GYM, WorkoutPlace.HOME, WorkoutPlace.BOTH][i % 3],
+        preferred_equipment: [[PreferredEquipment.BARBELLS, PreferredEquipment.DUMBBELLS, PreferredEquipment.GYM_MACHINES, PreferredEquipment.RESISTANCE_BAND, PreferredEquipment.BODYWEIGHT][i % 5]],
+      },
+      injuries: [[Injury.ARMS, Injury.BACK, Injury.NECK, Injury.SHOULDERS, Injury.KNEES][i % 5]],
+      dob: new Date(1990, 1, 1),
+      role: AuthenticatableType.USER,
+    };
+    await User.create(o);
+  }))
+})