add user-registered-workout.model and update workout.model

src/common/enums/place.enum.ts

@@ -0,0 +1,4 @@
+export enum Place {
+  GYM = "gym",
+  HOME = "home",
+}

src/{modules/users/common → common}/models/user-registered-workout.model.ts

@@ -4,17 +4,20 @@ const { Schema } = mongoose;
 export interface IUserRegisteredWorkout {
     user: mongoose.Types.ObjectId,
     workout: mongoose.Types.ObjectId,
-    isActive: Boolean,
+    is_active: Boolean,
     weeks: [
         {
-            weekNumber: number,
-            name: string,
-            description: string,
+            week_number: number,
+            week_name: string,
+            week_description: string,
+            is_done: boolean,
             days: [
                 {
-                    dayNumber: number,
+                    day_number: number,
+                    total_number_exercises: number,
+                    day_type: string,
                     exercises: [mongoose.Types.ObjectId],
-                    isDone: Boolean
+                    is_done: boolean
                 },
             ],
         },
@@ -24,16 +27,22 @@ export interface IUserRegisteredWorkout {
 const userRegisteredWorkoutSchema = new Schema({
     user: { type: mongoose.Types.ObjectId, ref: "users" },
     workout: { type: mongoose.Types.ObjectId, ref: "workouts" },
-    isActive: { type: Boolean, default: false },
+    is_active: { type: Boolean, default: false },
     weeks: [
         {
+            week_number: { type: Number },
+            week_name: { type: String, required: true, },
+            week_description: { type: String, required: true, },
+            is_done: { type: Boolean, default: false },
             days: [
                 {
-                    day: Number,
+                    day_number: { type: Number, required: true, },
+                    total_number_exercises: { type: Number, required: true, },
+                    day_type: { type: String, required: true, },
                     exercises: [
                         { type: mongoose.Types.ObjectId, ref: "exercises" },
                     ],
-                    isDone: { type: Boolean, default: false }
+                    is_done: { type: Boolean, default: false }
                 },
             ],
         },

src/common/models/user.model.ts

@@ -15,13 +15,13 @@ export interface IUser {
   name: string;
   email: string;
   password: string;
-  image: object;
+  image: string;
   role: AuthenticatableType;
   gender: string;
   dob: Date;
   height: number;
   weight: number;
-  fitness_level: string;
+  fitness_level: FitnessLevel;
   preferences: {
     fitness_goal: FitnessGoal;
     target_weight: number;
@@ -37,7 +37,7 @@ const userSchema = new Schema({
   name: { type: String, required: true },
   email: { type: String, required: true },
   password: { type: String, required: true },
-  image: { type: Object },
+  image: { type: String },
   gender: {
     type: String,
     enum: Gender,

src/common/models/workout.model.ts

@@ -1,4 +1,8 @@
 import mongoose from "mongoose";
+import { FitnessGoal } from "@common/enums/fitness-goal.enum";
+import { FitnessLevel } from "@common/enums/fitness-level.enum";
+import { Place } from "@common/enums/place.enum";
+
 const { Schema } = mongoose;
 
 export interface IWorkout {
@@ -6,15 +10,22 @@ export interface IWorkout {
     description: string;
     type: string;
     created_by: mongoose.Types.ObjectId;
-    image: object;
-    templateWeeks: [
+    image: string;
+    fitness_level: FitnessLevel;
+    fitness_goal: FitnessGoal;
+    place: [Place];
+    min_per_day: number;
+    total_number_days: number;
+    template_weeks: [
         {
-            weekNumber: number;
-            name: string,
-            description: string,
+            week_number: number;
+            week_name: string,
+            week_description: string,
             days: [
                 {
-                    dayNumber: number,
+                    day_number: number,
+                    total_number_exercises: number,
+                    day_type: string,
                     exercises: [mongoose.Types.ObjectId],
                 },
             ],
@@ -24,14 +35,25 @@ export interface IWorkout {
 
 const workoutSchema = new Schema({
     name: { type: String, required: true, unique: true, dropDups: true },
+    description: { type: String, required: true },
     type: { type: String, required: true },
     created_by: { type: mongoose.Types.ObjectId, ref: "admins" },
-    image: { type: Object },
-    templateWeeks: [
+    image: { type: String },
+    fitness_level: { type: String, enum: FitnessLevel, required: true, },
+    fitness_goal: { type: String, enum: FitnessGoal, required: true, },
+    place: [{ type: String, enum: Place, required: true, }],
+    min_per_day: { type: Number, required: true, },
+    total_number_days: { type: Number, required: true, },
+    template_weeks: [
         {
+            week_number: { type: Number, required: true, },
+            week_name: { type: String, required: true, },
+            week_description: { type: String, required: true, },
             days: [
                 {
-                    day: Number,
+                    day_number: { type: Number, required: true, enum: [1, 2, 3, 4, 5, 6, 7] },
+                    total_number_exercises: { type: Number, required: true, },
+                    day_type: { type: String, required: true, },
                     exercises: [
                         { type: mongoose.Types.ObjectId, ref: "exercises" },
                     ],

src/common/serializers/exercise.serialization.ts

@@ -1,4 +1,23 @@
 import { Expose, Transform } from "class-transformer";
+import { serialize } from "@helpers/serialize";
+
+
+
+class ExpectedDurationRange {
+  @Expose()
+  min: number;
+
+  @Expose()
+  max: number;
+}
+
+class Media {
+  @Expose()
+  type: string;
+
+  @Expose()
+  url: string;
+}
 
 export class ExerciseSerialization {
   @Expose({ name: "_id" })
@@ -6,4 +25,40 @@ export class ExerciseSerialization {
 
   @Expose()
   name: string;
+
+  @Expose()
+  category: string;
+
+  @Expose()
+  duration: number | null;
+
+  @Expose({ name: "expectedDurationRange" })
+  @Transform(
+    ({ value }) => serialize(value, ExpectedDurationRange)
+  )
+  expectedDurationRange: object;
+
+  @Expose()
+  reps: number;
+
+  @Expose()
+  sets: number;
+
+  @Expose()
+  instructions: string;
+
+  @Expose()
+  benefits: string;
+
+  @Expose()
+  targetMuscles: any;
+
+  @Expose()
+  equipments: any;
+
+  @Expose({ name: "media" })
+  @Transform(
+    ({ value }) => serialize(value, Media)
+  )
+  media: object;
 }

src/{modules/users/common → common}/serializers/user-registered-workout.serialization.ts

@@ -2,25 +2,41 @@ import { Expose, Transform } from "class-transformer";
 import { serialize } from "@helpers/serialize";
 
 
-
 class Days {
   @Expose()
-  day: number;
+  day_number: number;
+
+  @Expose()
+  total_number_exercises: number;
+
+  @Expose()
+  day_type: string;
 
   @Expose({ name: "exercises" })
   exercises: any;
 
   @Expose()
-  isDone: Boolean
+  is_done: Boolean
 }
 
-
 class Weeks {
+  @Expose()
+  week_number: number;
+
+  @Expose()
+  week_name: string;
+
+  @Expose()
+  week_description: string;
+
   @Expose({ name: "days" })
   @Transform(
     ({ value }) => serialize(value, Days)
   )
   days: any;
+
+  @Expose()
+  is_done: Boolean
 }
 
 export class UserRegisteredWorkoutsSerialization {
@@ -34,7 +50,7 @@ export class UserRegisteredWorkoutsSerialization {
   workout: string;
 
   @Expose()
-  isActive: Boolean;
+  is_active: Boolean;
 
   @Expose({ name: "weeks" })
   @Transform(

src/common/serializers/user.serialization.ts

@@ -33,7 +33,7 @@ export class UserSerialization {
   email: string;
 
   @Expose()
-  image: object;
+  image: string;
 
   @Expose()
   role: string;

src/common/serializers/workout.serialization.ts

@@ -5,14 +5,28 @@ import { serialize } from "@helpers/serialize";
 
 class Days {
   @Expose()
-  day: number;
+  day_number: number;
+
+  @Expose()
+  total_number_exercises: number;
+
+  @Expose()
+  day_type: string;
 
   @Expose({ name: "exercises" })
   exercises: any;
 }
 
-
 class TemplateWeeks {
+  @Expose()
+  week_number: number;
+
+  @Expose()
+  week_name: string;
+
+  @Expose()
+  week_description: string;
+
   @Expose({ name: "days" })
   @Transform(
     ({ value }) => serialize(value, Days)
@@ -27,19 +41,37 @@ export class WorkoutSerialization {
   @Expose()
   name: string;
 
+  @Expose()
+  description: string;
+
   @Expose()
   type: string;
 
   @Expose()
-  image: object;
+  image: string;
 
   @Expose()
   created_by: string;
 
-  @Expose({ name: "templateWeeks" })
+  @Expose()
+  fitness_level: string;
+
+  @Expose()
+  fitness_goal: string;
+
+  @Expose()
+  place: any;
+
+  @Expose()
+  min_per_day: number;
+
+  @Expose()
+  total_number_days: number;
+
+  @Expose({ name: "template_weeks" })
   @Transform(
     ({ value }) => serialize(value, TemplateWeeks)
   )
-  templateWeeks: any;
+  template_weeks: any;
 
 }

src/modules/console/modules/workouts/validations/create-workout.validation.ts

@@ -1,13 +1,37 @@
 import * as joi from "joi";
 import { createSchema } from "@helpers/create-schema";
+import { FitnessGoal } from "@common/enums/fitness-goal.enum";
+import { FitnessLevel } from "@common/enums/fitness-level.enum";
+import { Place } from "@common/enums/place.enum";
 
-export interface ICreateWorkout {
-  name: string;
-  type: string;
-  created_by: string;
-  templateWeeks: object[];
-};
 
+export interface ICreateWorkout {
+    name: string;
+    description: string;
+    type: string;
+    created_by: string;
+    image?: string;
+    fitness_level: string;
+    fitness_goal: string;
+    place: [string];
+    min_per_day: number;
+    total_number_days: number;
+    template_weeks: [
+        {
+            week_number: number;
+            week_name: string,
+            week_description: string,
+            days: [
+                {
+                    day_number: number,
+                    total_number_exercises: number,
+                    day_type: string,
+                    exercises: [string],
+                },
+            ],
+        },
+    ]
+}
 
 export const createWorkoutSchema = createSchema<ICreateWorkout>({
     name: joi.string().empty().required().messages({
@@ -15,6 +39,11 @@ export const createWorkoutSchema = createSchema<ICreateWorkout>({
         "any.required": "name is required",
         "string.empty": "name can not be empty",
     }),
+    description: joi.string().empty().required().messages({
+        "string.base": "please enter a valid name",
+        "any.required": "name is required",
+        "string.empty": "name can not be empty",
+    }),
     type: joi.string().empty().required().messages({
         "string.base": "please enter a valid type",
         "any.required": "type is required",
@@ -25,7 +54,108 @@ export const createWorkoutSchema = createSchema<ICreateWorkout>({
         "any.required": "created_by is required",
         "string.empty": "created_by can not be empty",
     }),
-    templateWeeks: joi.array().empty().required().messages({
+    image: joi.string().empty().optional().messages({
+        "string.base": "please enter a valid image url",
+        "string.empty": "image url can not be empty",
+    }),
+    fitness_level: joi.string().valid(...Object.values(FitnessLevel)).empty().required().messages({
+        "string.base": "please enter a valid fitness level",
+        "any.required": "fitness level is required",
+        "string.empty": "fitness level can not be empty",
+        "any.only": `Fitness level must be one of the following values: ${FitnessLevel.ADVANCED}, ${FitnessLevel.BEGINNER} or ${FitnessLevel.INTERMEDIATE}`
+    }),
+    fitness_goal: joi.string().valid(...Object.values(FitnessGoal)).empty().required().messages({
+        "string.base": "please enter a valid fitness goal",
+        "any.required": "fitness goal is required",
+        "string.empty": "fitness goal can not be empty",
+        "any.only": `Fitness goal must be one of the following values: ${FitnessGoal.GAIN_MUSCLE}, ${FitnessGoal.GET_FITTER} or ${FitnessGoal.LOSE_WEIGHT}`
+    }),
+    place: joi.array().empty().required().items(
+        joi.string().empty().required().valid(...Object.values(Place)).messages({
+            "string.base": "please enter a valid place",
+            "any.required": "place is required",
+            "string.empty": "place can not be empty",
+            "any.only": `place must be one of the following values: ${Place.GYM} or ${Place.HOME}`
+        })
+    ).messages({
+        "array.base": "please enter a valid place array",
+        "any.required": "place array is required",
+        "array.empty": "place array can not be empty",
+    }),
+    min_per_day: joi.number().integer().empty().required().messages({
+        "number.base": "please enter a valid min per day",
+        "any.required": "min per day is required",
+        "number.empty": "min per day can not be empty",
+        "number.integer": "day number must be an integer",
+    }),
+    total_number_days: joi.number().integer().empty().required().messages({
+        "number.base": "please enter a valid total number days",
+        "any.required": "total number days is required",
+        "number.empty": "total number days can not be empty",
+        "number.integer": "day number must be an integer",
+    }),
+    template_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",
+            }),
+            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",
+                        }),
+                }).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 templateWeeks",
         "any.required": "templateWeeks is required",
         "array.empty": "templateWeeks can not be empty",

src/modules/console/modules/workouts/validations/update-workout.validation.ts

@@ -1,12 +1,38 @@
 import * as joi from "joi";
 import { createSchema } from "@helpers/create-schema";
+import { FitnessGoal } from "@common/enums/fitness-goal.enum";
+import { FitnessLevel } from "@common/enums/fitness-level.enum";
+import { Place } from "@common/enums/place.enum";
+
+
 
 export interface IUpdateWorkout {
     name?: string;
+    description?: string;
     type?: string;
     created_by?: string;
-    templateWeeks?: object[];
-};
+    image?: string;
+    fitness_level?: string;
+    fitness_goal?: string;
+    place?: [string];
+    min_per_day?: number;
+    total_number_days?: number;
+    template_weeks?: [
+        {
+            week_number?: number;
+            week_name?: string,
+            week_description?: string,
+            days?: [
+                {
+                    day_number?: number,
+                    total_number_exercises?: number,
+                    day_type?: string,
+                    exercises?: [string],
+                },
+            ],
+        },
+    ]
+}
 
 
 export const updateWorkoutSchema = createSchema<IUpdateWorkout>({
@@ -14,6 +40,10 @@ export const updateWorkoutSchema = createSchema<IUpdateWorkout>({
         "string.base": "please enter a valid name",
         "string.empty": "name can not be empty",
     }),
+    description: joi.string().empty().optional().messages({
+        "string.base": "please enter a valid name",
+        "string.empty": "name can not be empty",
+    }),
     type: joi.string().empty().optional().messages({
         "string.base": "please enter a valid type",
         "string.empty": "type can not be empty",
@@ -22,7 +52,92 @@ export const updateWorkoutSchema = createSchema<IUpdateWorkout>({
         "string.base": "please enter a valid created_by",
         "string.empty": "created_by can not be empty",
     }),
-    templateWeeks: joi.array().empty().optional().messages({
+    image: joi.string().empty().optional().messages({
+        "string.base": "please enter a valid image url",
+        "string.empty": "image url can not be empty",
+    }),
+    fitness_level: joi.string().valid(...Object.values(FitnessLevel)).empty().optional().messages({
+        "string.base": "please enter a valid fitness level",
+        "string.empty": "fitness level can not be empty",
+        "any.only": `Fitness level must be one of the following values: ${FitnessLevel.ADVANCED}, ${FitnessLevel.BEGINNER} or ${FitnessLevel.INTERMEDIATE}`
+    }),
+    fitness_goal: joi.string().valid(...Object.values(FitnessGoal)).empty().optional().messages({
+        "string.base": "please enter a valid fitness goal",
+        "string.empty": "fitness goal can not be empty",
+        "any.only": `Fitness goal must be one of the following values: ${FitnessGoal.GAIN_MUSCLE}, ${FitnessGoal.GET_FITTER} or ${FitnessGoal.LOSE_WEIGHT}`
+    }),
+    place: joi.array().empty().optional().items(
+        joi.string().empty().optional().valid(...Object.values(Place)).messages({
+            "string.base": "please enter a valid place",
+            "string.empty": "place can not be empty",
+            "any.only": `place must be one of the following values: ${Place.GYM} or ${Place.HOME}`
+        })
+    ).messages({
+        "array.base": "please enter a valid place array",
+        "array.empty": "place array can not be empty",
+    }),
+    min_per_day: joi.number().integer().empty().optional().messages({
+        "number.base": "please enter a valid min per day",
+        "number.empty": "min per day can not be empty",
+        "number.integer": "day number must be an integer",
+    }),
+    total_number_days: joi.number().integer().empty().optional().messages({
+        "number.base": "please enter a valid total number days",
+        "number.empty": "total number days can not be empty",
+        "number.integer": "day number must be an integer",
+    }),
+    template_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",
+            }),
+            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().required().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",
+                        }),
+                }).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 templateWeeks",
         "array.empty": "templateWeeks can not be empty",
     }),

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

@@ -7,7 +7,7 @@ import { asyncHandler } from "@helpers/async-handler";
 import { BaseController } from "@lib/controllers/controller.base";
 import { Prefix } from "@lib/decorators/prefix.decorator";
 import { serialize } from "@helpers/serialize";
-import { UserRegisteredWorkoutsSerialization } from "../../../common/serializers/user-registered-workout.serialization";
+import { UserRegisteredWorkoutsSerialization } from "@common/serializers/user-registered-workout.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";
@@ -23,28 +23,22 @@ export class userRegisteredWorkoutsController extends BaseController {
   private userRegisteredWorkoutsService = new UserRegisteredWorkoutsService();
 
   setRoutes(): void {
-    this.router.get("/get/:id", paramsValidator("id"), asyncHandler(this.get));
-    this.router.get("/list/:userId", paramsValidator("userId"), asyncHandler(this.list));
+    this.router.get("/:id", paramsValidator("id"), asyncHandler(this.get));
+    this.router.get("/", asyncHandler(this.list));
     this.router.post("/",
       bodyValidator(createUserRegisteredWorkoutsSchema),
       asyncHandler(this.create));
-
-    this.router.patch("/",
-      bodyValidator(updateUserRegisteredWorkoutsSchema),
-      asyncHandler(this.update));
   }
 
   list = async (req: userRequest, res: Response) => {
     const paginationQuery = parsePaginationQuery(req.query);
-    // if (req.jwtPayload.id != req.params.userId) console.log(req.jwtPayload);
-
     const { docs, paginationData } = await this.userRegisteredWorkoutsService.list(
-      { user: req.params.userId },
+      { user: req.jwtPayload.id },
       paginationQuery,
       {
         populateArray: [
           { path: "workout", select: "-templateWeeks -created_by" },
-          { path: "weeks.days.exercises" },
+          { path: "weeks.days.exercises", select: "name media reps sets" },
         ]
       }
     );
@@ -63,8 +57,8 @@ export class userRegisteredWorkoutsController extends BaseController {
       { _id: req.params.id },
       {
         populateArray: [
-          { path: "workout", select: "-templateWeeks -created_by" },
-          { path: "weeks.days.exercises" },
+          { path: "workout", select: "-template_weeks -created_by" },
+          { path: "weeks.days.exercises", select: "name media reps sets" },
         ]
       }
     );
@@ -87,16 +81,4 @@ export class userRegisteredWorkoutsController extends BaseController {
     );
   };
 
-  update = async (req: userRequest, res: Response) => {
-    const data = await this.userRegisteredWorkoutsService.updateOne(
-      { _id: req.params.id },
-      req.body
-    );
-    return JsonResponse.success(
-      {
-        data: serialize(data.toJSON(), UserRegisteredWorkoutsSerialization),
-      },
-      res
-    );
-  };
 }

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

@@ -1,4 +1,4 @@
-import { UserRegisteredWorkout } from "../../../common/models/user-registered-workout.model";
+import { UserRegisteredWorkout } from "@common/models/user-registered-workout.model";
 import { CrudService } from "@lib/services/crud.service";
 
 export class UserRegisteredWorkoutsService extends CrudService(UserRegisteredWorkout) {}

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

@@ -1,25 +1,29 @@
 import * as joi from "joi";
 import { createSchema } from "@helpers/create-schema";
 
-export interface IDays {
-    day: string;
-    exercises: string[];
-    isDone?: Boolean;
-};
-
-
-export interface IWeeks {
-    days: IDays[];
-};
-
 
 export interface ICreateUserRegisteredWorkouts {
     user: string;
     workout: string;
-    isActive: Boolean;
-    weeks: IWeeks[];
-};
-
+    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 createUserRegisteredWorkoutsSchema = createSchema<ICreateUserRegisteredWorkouts>({
     user: joi.string().empty().required().messages({
@@ -27,7 +31,7 @@ export const createUserRegisteredWorkoutsSchema = createSchema<ICreateUserRegist
         "any.required": "user id is required",
         "string.empty": "user id can not be empty",
     }),
-    isActive: joi.boolean().empty().optional().messages({
+    is_active: joi.boolean().empty().optional().messages({
         "boolean.base": "please enter a valid isActive",
         "boolean.empty": "isActive can not be empty",
     }),
@@ -38,12 +42,46 @@ export const createUserRegisteredWorkoutsSchema = createSchema<ICreateUserRegist
     }),
     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: joi.number().empty().required().messages({
-                        "number.base": "please enter a valid day number",
+                    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 can not be empty",
+                        "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({
@@ -55,7 +93,7 @@ export const createUserRegisteredWorkoutsSchema = createSchema<ICreateUserRegist
                             "any.required": "exercises array is required",
                             "array.empty": "exercises array can not be empty",
                         }),
-                    isDone: joi.boolean().empty().optional().messages({
+                    is_done: joi.boolean().empty().optional().messages({
                         "boolean.base": "please enter a valid isDone",
                         "boolean.empty": "isDone can not be empty",
                     }),

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

@@ -2,23 +2,29 @@ import * as joi from "joi";
 import { createSchema } from "@helpers/create-schema";
 
 
-export interface IDays {
-    day?: string;
-    exercises?: string[];
-    isDone?: Boolean;
-};
-
-
-export interface IWeeks {
-    days?: IDays[];
-};
 
 export interface IUpdateUserRegisteredWorkouts {
     user?: string;
     workout?: string;
-    isActive?: Boolean;
-    weeks?: IWeeks[];
-};
+    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>({
@@ -26,7 +32,7 @@ export const updateUserRegisteredWorkoutsSchema = createSchema<IUpdateUserRegist
         "string.base": "please enter a valid user id",
         "string.empty": "user id can not be empty",
     }),
-    isActive: joi.boolean().empty().optional().messages({
+    is_active: joi.boolean().empty().optional().messages({
         "boolean.base": "please enter a valid isActive",
         "boolean.empty": "isActive can not be empty",
     }),
@@ -36,11 +42,40 @@ export const updateUserRegisteredWorkoutsSchema = createSchema<IUpdateUserRegist
     }),
     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: joi.number().empty().optional().messages({
-                        "number.base": "please enter a valid day number",
-                        "number.empty": "day number can not be empty",
+                    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({
@@ -50,7 +85,7 @@ export const updateUserRegisteredWorkoutsSchema = createSchema<IUpdateUserRegist
                             "array.base": "please enter a valid exercises array",
                             "array.empty": "exercises array can not be empty",
                         }),
-                    isDone: joi.boolean().empty().optional().messages({
+                    is_done: joi.boolean().empty().optional().messages({
                         "boolean.base": "please enter a valid isDone",
                         "boolean.empty": "isDone can not be empty",
                     }),