Merge pull request #96 from Modarb-Ai-Trainer/models

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

@@ -10,14 +10,13 @@ import { SwaggerGet, SwaggerPatch } from "@lib/decorators/swagger-routes.decorat
 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 { SwaggerQuery } from "@lib/decorators/swagger-query.decorator";
 import { UserHomeService } from "../services/user-home.service";
 import { IUserRequest } from "@common/interfaces/user-request.interface";
 import { UserHomeYourDailyIntakeSerialization } from "../responses/user-home-your-daily-intake.serialization";
 import { UserNutriHomeDailyGoalsSerialization } from "../responses/user-nutri-home-daily-goals.serialization";
 import { GetMyMealPlanSerialization } from "@common/serializers/user-registered-meal-planPopulate.serialization";
 import { UserRegisteredMealPlansService } from "../../user-registered-meal-plans/services/user-registered-meal-plans.service";
-import { SwaggerRequest } from "@lib/decorators/swagger-request.decorator";
+import { MealPlansProgressService } from "../../user-registered-meal-plans/services/meal-plans-progress.service";
 
 
 @Controller("/user/nutri-guide")
@@ -25,6 +24,7 @@ import { SwaggerRequest } from "@lib/decorators/swagger-request.decorator";
 export class homeNutriGuideController extends BaseController {
   private userHomeService = new UserHomeService();
   private userRegisteredMealPlansService = new UserRegisteredMealPlansService();
+  private mealPlansProgressService = new MealPlansProgressService();
 
   setRoutes(): void {
     this.router.get("/todays-intake", asyncHandler(this.getHomePageYourDailyIntake));
@@ -88,7 +88,7 @@ export class homeNutriGuideController extends BaseController {
   updateProgress = async (req: IUserRequest, res: Response) => {
     const urwId: string = req.params.id;
     const dayNumber: number = Number(req.params.day);
-    await this.userRegisteredMealPlansService.updateForUser({
+    await this.mealPlansProgressService.updateForUser({
       urwId, dayNumber
     }, req.body, req.jwtPayload.id);
     return JsonResponse.success(

src/modules/users/modules/meal-plans/services/meal-plans.service.ts

@@ -5,12 +5,19 @@ import { calcAge } from "@lib/utils/age";
 import { MealsService } from "../../meals/services/meals.service";
 import { UserRegisteredMealPlansService } from "../../user-registered-meal-plans/services/user-registered-meal-plans.service";
 import { UserDocument } from "@common/models/user.model";
+import { UsersService } from "modules/console/modules/users/services/users.service";
+import { Types } from "mongoose";
 
 export class MealPlansService extends CrudService(MealPlan) {
     private mealsService = new MealsService();
     private userRegisteredMealPlansService = new UserRegisteredMealPlansService();
+    private usersService = new UsersService();
+
+    public async createModelMealPlan(userOrId: UserDocument | string) {
+        const user: UserDocument = typeof userOrId === 'string' ?
+                                  await this.usersService.findOneOrFail({_id: new Types.ObjectId(userOrId)}) :
+                                  userOrId;
 
-    public async createModelMealPlan(user: UserDocument) {
         let caloriesPerDay = 0;
         if (user.gender === "male") {
             caloriesPerDay = 10 * user.weight + 6.25 * user.height - 5 * calcAge(user.dob) + 5;

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

@@ -1,5 +1,5 @@
 import { UserRegisteredMealPlansService } from "../services/user-registered-meal-plans.service";
-import { Request, Response } from "express";
+import { Response } from "express";
 import { JsonResponse } from "@lib/responses/json-response";
 import { asyncHandler } from "@helpers/async-handler";
 import { BaseController } from "@lib/controllers/controller.base";
@@ -14,9 +14,7 @@ import { SwaggerRequest } from "@lib/decorators/swagger-request.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";
-interface userRequest extends Request {
-  jwtPayload?: any;
-}
+import { IUserRequest } from "@common/interfaces/user-request.interface";
 
 @Controller("/user/myMealPlan")
 @ControllerMiddleware(UsersGuardMiddleware())
@@ -35,7 +33,7 @@ export class UsersRegisteredMealPlansController extends BaseController {
   @SwaggerResponse(GetMyMealPlanSerialization)
   @SwaggerSummary("get my meal plan")
   @SwaggerDescription("Get the meal plan that the user is currently using")
-  get = async (req: userRequest, res: Response): Promise<Response> => {
+  get = async (req: IUserRequest, res: Response): Promise<Response> => {
     const data = await this.userRegisteredMealPlansService.findOneOrFail(
       { user: req.jwtPayload.id, isActive: true },
       {
@@ -59,7 +57,7 @@ export class UsersRegisteredMealPlansController extends BaseController {
   @SwaggerRequest({ meal_plan: "string" })
   @SwaggerSummary("create my meal plan")
   @SwaggerDescription("Create a new meal plan for the user")
-  create = async (req: userRequest, res: Response) => {
+  create = async (req: IUserRequest, res: Response) => {
     const data = await this.userRegisteredMealPlansService.createForUser(req.body, req.jwtPayload.id);
     return JsonResponse.success(
       {

src/modules/users/modules/user-registered-meal-plans/services/meal-plans-progress.service.ts

@@ -0,0 +1,38 @@
+import { UserRegisteredMealPlan } from "@common/models/user-registered-meal-plan.model";
+import { CrudService } from "@lib/services/crud.service";
+import { HttpError } from "@lib/error-handling/http-error";
+import { MealPlansService } from "../../meal-plans/services/meal-plans.service";
+
+export class MealPlansProgressService extends CrudService(UserRegisteredMealPlan) {
+  private mealPlansService = new MealPlansService()
+
+  async updateForUser(mealPlanProps: { urwId: string; dayNumber: number }, _data: any, userId: string) {
+    // find mealPlan
+    const mealPlan = await this.findOneOrFail({
+      _id: mealPlanProps.urwId,
+      user: userId,
+    });
+    
+    // find day
+    const day = mealPlan.days.find(d => d.day_number === mealPlanProps.dayNumber);
+    if (!day) throw new HttpError(404, 'Workout Day Not Found');
+    const dayIndex = mealPlan.days.indexOf(day)
+
+    // update day
+    day.is_eaten = true;
+    mealPlan.days[dayIndex] = day;
+
+    // save changes
+    mealPlan.markModified('days');
+
+    const updatedMealPlan = await mealPlan.save();
+
+    // check if it's the last day
+    const lastDay = mealPlan.days[mealPlan.days.length - 1];
+    if (lastDay.day_number === mealPlanProps.dayNumber) {
+      this.mealPlansService.createModelMealPlan(userId)
+    }
+
+    return updatedMealPlan;
+  }
+}

src/modules/users/modules/user-registered-meal-plans/services/user-registered-meal-plans.service.ts

@@ -1,7 +1,5 @@
 import { UserRegisteredMealPlan } from "@common/models/user-registered-meal-plan.model";
 import { CrudService } from "@lib/services/crud.service";
-import { MealPlansService } from "../../meal-plans/services/meal-plans.service";
-import { HttpError } from "@lib/error-handling/http-error";
 import { MealPlan } from "@common/models/meal-plan.model";
 
 
@@ -32,34 +30,4 @@ export class UserRegisteredMealPlansService extends CrudService(UserRegisteredMe
       isActive: true,
     });
   }
-  async updateForUser(mealPlanProps: { urwId: string; dayNumber: number }, data: any, userId: string) {
-    // find mealPlan
-    
-    const mealPlan = await this.findOneOrFail({
-      _id: mealPlanProps.urwId,
-      user: userId,
-    });
-    
-    // find day
-    const day = mealPlan.days.find(d => d.day_number === mealPlanProps.dayNumber);
-    if (!day) throw new HttpError(404, 'Workout Day Not Found');
-    const dayIndex = mealPlan.days.indexOf(day)
-
-    // update day
-    day.is_eaten = true;
-    mealPlan.days[dayIndex] = day;
-
-    // save changes
-    mealPlan.markModified('days');
-
-    const updatedMealPlan = await mealPlan.save();
-
-    // check if it's the last day
-    const lastDay = mealPlan.days[mealPlan.days.length - 1];
-    if (lastDay.day_number === mealPlanProps.dayNumber) {
-      console.log('This is the last day that was updated.');
-    }
-
-    return updatedMealPlan;
-  }
-}
+}

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

@@ -22,6 +22,7 @@ import { SwaggerDescription } from "@lib/decorators/swagger-description.decorato
 import { SwaggerResponse } from "@lib/decorators/swagger-response.decorator";
 import { SwaggerRequest } from "@lib/decorators/swagger-request.decorator";import { updateUserRegisteredWorkoutsSchema } from "../validations/update-user-registered-workouts.validation";
 import { IUserRequest } from "@common/interfaces/user-request.interface";
+import { WorkoutsProgressService } from "../services/workouts-progress.service";
  4
 
 
@@ -29,6 +30,7 @@ import { IUserRequest } from "@common/interfaces/user-request.interface";
 @ControllerMiddleware(UsersGuardMiddleware())
 export class userRegisteredWorkoutsController extends BaseController {
   private userRegisteredWorkoutsService = new UserRegisteredWorkoutsService();
+  private workoutsProgressService = new WorkoutsProgressService();
 
   setRoutes(): void {
     this.router.get("/:id", asyncHandler(this.get));
@@ -124,7 +126,7 @@ export class userRegisteredWorkoutsController extends BaseController {
     const urwId: string = req.params.id;
     const weekNumber: number = Number(req.params.week);
     const dayNumber: number = Number(req.params.day);
-    await this.userRegisteredWorkoutsService.updateForUser({
+    await this.workoutsProgressService.updateForUser({
       urwId, weekNumber, dayNumber
     }, req.body, req.jwtPayload.id);
     return JsonResponse.success(

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

@@ -1,8 +1,6 @@
 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 { IUpdateUserRegisteredWorkouts } from "../validations/update-user-registered-workouts.validation";
-import { HttpError } from "@lib/error-handling/http-error";
 import { Workout } from "@common/models/workout.model";
 
 export class UserRegisteredWorkoutsService extends CrudService(UserRegisteredWorkout, {
@@ -35,32 +33,4 @@ export class UserRegisteredWorkoutsService extends CrudService(UserRegisteredWor
       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/services/workouts-progress.service.ts

@@ -0,0 +1,46 @@
+import { UserRegisteredWorkout } from "@common/models/user-registered-workout.model";
+import { CrudService } from "@lib/services/crud.service";
+import { IUpdateUserRegisteredWorkouts } from "../validations/update-user-registered-workouts.validation";
+import { HttpError } from "@lib/error-handling/http-error";
+import { WorkoutService } from "../../workouts/services/workouts.service";
+
+export class WorkoutsProgressService extends CrudService(UserRegisteredWorkout, {
+  defaultFilter: {
+    is_active: true,
+  },
+}) {
+  private workoutsService = new WorkoutService();
+
+  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;
+
+    // if last week
+    if(weekIndex === workout.weeks.length - 1) {
+      await this.workoutsService.createModelWorkout(userId)
+    }
+    
+    // save changes
+    workout.markModified('weeks');
+    return workout.save()
+  }
+}

src/modules/users/modules/workouts/services/workouts.service.ts

@@ -6,12 +6,19 @@ import { CrudService } from "@lib/services/crud.service";
 import { calcAge } from "@lib/utils/age";
 import { ExerciseService } from "../../exercises/services/exercises.service";
 import { UserRegisteredWorkoutsService } from "../../user-registered-workouts/services/user-registered-workouts.service";
+import { UserService } from "../../users/services/users.service";
+import { Types } from "mongoose";
 
 export class WorkoutService extends CrudService(Workout) {
   private exerciseService = new ExerciseService();
   private userRegisteredWorkoutsService = new UserRegisteredWorkoutsService();
+  private usersService = new UserService()
+
+  public async createModelWorkout(userOrId: UserDocument | string) {
+    const user: UserDocument = typeof userOrId === 'string' ?
+                              await this.usersService.findOneOrFail({_id: new Types.ObjectId(userOrId)}) :
+                              userOrId;
 
-  public async createModelWorkout(user: UserDocument) {
     const params: IFWParams = {
       home_or_gym: user.preferences.workout_place === WorkoutPlace.GYM ? 1 : 0,
       level: user.fitness_level,