update

src/common/enums/meal-type.enum.ts

@@ -3,7 +3,5 @@ export enum MealType {
   DINNER = "dinner",
   SNACKS = "snacks",
   DRINKS_BEVERAGES = 'drinks beverages',
-  CUSINES = 'cusines',
   LUNCH = "lunch",
-  BREAKFAST_DINNER= "breakfast, dinner"
 }

src/common/serializers/meal-plan.serialization.ts

@@ -15,8 +15,8 @@ class MealPlanDays {
 
 class MealPlanKeyFeatures {
   @Expose()
-  @SwaggerResponseProperty({ type: "number" })
-  day_number: number;
+  @SwaggerResponseProperty({ type: "string" })
+  title: string;
 
   @Expose({ name: "description" })
   @SwaggerResponseProperty({ type: "string" })

src/common/serializers/meal-planPopulate.serialization.ts

@@ -16,8 +16,8 @@ class MealPlanDaysPopulate {
 
 class MealPlanKeyFeaturesPopulate {
   @Expose()
-  @SwaggerResponseProperty({ type: "number" })
-  day_number: number;
+  @SwaggerResponseProperty({ type: "string" })
+  title: string;
 
   @Expose({ name: "description" })
   @SwaggerResponseProperty({ type: "string" })
@@ -63,4 +63,38 @@ export class MealPlanPopulateSerialization {
   )
   days: any;
 
+}
+
+export class ListMealPlanSerialization {
+  @Expose({ name: "_id" })
+  @SwaggerResponseProperty({ type: "string" })
+  id: string;
+
+  @Expose()
+  @SwaggerResponseProperty({ type: "string" })
+  image: string;
+
+  @Expose()
+  @SwaggerResponseProperty({ type: "string" })
+  description: string;
+
+  @Expose()
+  @SwaggerResponseProperty({ type: "string" })
+  duration: string;
+
+  @Expose()
+  @SwaggerResponseProperty({ type: "string" })
+  level: string;
+
+  @Expose()
+  @SwaggerResponseProperty({ type: "string" })
+  your_journey: string;
+
+  @Expose({ name: "key_features" })
+  @SwaggerResponseProperty({ type: [MealPlanKeyFeaturesPopulate] })
+  @Transform(
+    ({ value }) => serialize(value, MealPlanKeyFeaturesPopulate)
+  )
+  key_features: any;
+
 }

src/common/serializers/user-registered-meal-planPopulate.serialization.ts

@@ -1,6 +1,7 @@
 import { Expose, Transform } from "class-transformer";
 import { serialize } from "@helpers/serialize";
 import { SwaggerResponseProperty } from "@lib/decorators/swagger-response-property.decorator";
+import { ListMealPlanSerialization } from "./meal-planPopulate.serialization";
 import { MealSerialization } from "./meal.serialization";
 import { MealPlanSerialization } from "./meal-plan.serialization";
 
@@ -13,6 +14,9 @@ class MealDaysPopulate {
 
   @Expose({ name: "meals" })
   @SwaggerResponseProperty({ type: [MealSerialization] })
+  @Transform(
+    ({ value }) => serialize(value, MealSerialization)
+  )
   meals: any;
 
   @Expose()
@@ -32,6 +36,35 @@ export class UserRegisteredMealPlansPopulateSerialization {
 
   @Expose()
   @SwaggerResponseProperty({ type: MealPlanSerialization })
+  @Transform(
+    ({ value }) => serialize(value, MealPlanSerialization)
+  )
+  meal_plan: string;
+
+  @Expose()
+  @SwaggerResponseProperty({ type: "boolean" })
+  isActive: boolean;
+
+  @Expose({ name: "days" })
+  @SwaggerResponseProperty({ type: [MealDaysPopulate] })
+  @Transform(
+    ({ value }) => serialize(value, MealDaysPopulate)
+  )
+  days: any;
+
+}
+
+export class GetMyMealPlanSerialization {
+  @Expose({ name: "_id" })
+  @SwaggerResponseProperty({ type: "string" })
+  id: string;
+
+  @Expose()
+  @SwaggerResponseProperty({ type: "string" })
+  user: string;
+
+  @Expose()
+  @SwaggerResponseProperty({ type: ListMealPlanSerialization })
   meal_plan: string;
 
   @Expose()

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

@@ -6,26 +6,97 @@ 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 { SwaggerGet, SwaggerPatch } 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 { 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 { UserRegisteredMealPlansPopulateSerialization } 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";
 
 
 @Controller("/user/nutri-guide")
 @ControllerMiddleware(UsersGuardMiddleware())
 export class homeNutriGuideController extends BaseController {
   private userHomeService = new UserHomeService();
+  private userRegisteredMealPlansService = new UserRegisteredMealPlansService();
 
   setRoutes(): void {
     this.router.get("/todays-intake", asyncHandler(this.getHomePageYourDailyIntake));
     this.router.get("/daily-goals", asyncHandler(this.getHomePageDailyGoals));
+    this.router.get("/today-meals", asyncHandler(this.getTodayMeals));
+    this.router.patch(
+      "/:id/progress/:day",
+      asyncHandler(this.updateProgress)
+    );
   }
 
+  @SwaggerGet("/today-meals")
+  @SwaggerResponse(UserRegisteredMealPlansPopulateSerialization)
+  @SwaggerSummary("Get today's meals")
+  @SwaggerDescription("Get today's meals for the user.")
+  getTodayMeals = async (req: IUserRequest, res: Response): Promise<Response> => {
+    try {
+      const data = await this.userRegisteredMealPlansService.findOneOrFail(
+        {
+          user: req.jwtPayload.id, isActive: true},
+        {
+          populateArray: [
+            { path: "meal_plan", select: "-days" },
+            { path: "days.meals" }
+          ],
+        }
+      );
+      console.log(data);
+      
+
+      const dayToEat = data.days.find(day => day.is_eaten === false);
+
+      if (dayToEat) {
+        data.days = [dayToEat];
+        return JsonResponse.success(
+          {
+            data: serialize(data, UserRegisteredMealPlansPopulateSerialization),
+          },
+          res
+        );
+      } else {
+        return JsonResponse.success(
+          {
+            message: "All planned meals have been eaten.",
+          },
+          res
+        );
+      }
+    } catch (error) {
+      console.error(error);
+      return res.status(500).json({ error: "An error occurred." });
+    }
+  };
+
+  @SwaggerPatch('/:id/progress/:day')
+  @SwaggerResponse({})
+  @SwaggerSummary("Update MyMealPlan Progress")
+  @SwaggerDescription("Update the progress of a MyMealPlan")
+  updateProgress = async (req: IUserRequest, res: Response) => {
+    const urwId: string = req.params.id;
+    const dayNumber: number = Number(req.params.day);
+    await this.userRegisteredMealPlansService.updateForUser({
+      urwId, dayNumber
+    }, req.body, req.jwtPayload.id);
+    return JsonResponse.success(
+      {
+        message: "mealPlan updated successfully",
+      },
+      res
+    );
+  };
+
 
   @SwaggerGet('/todays-intake')
   @SwaggerResponse(UserHomeYourDailyIntakeSerialization)

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

@@ -1,5 +1,5 @@
 import { MealPlansService } from "../services/meal-plans.service";
-import { MealPlanPopulateSerialization } from "@common/serializers/meal-planPopulate.serialization";
+import { ListMealPlanSerialization } from "@common/serializers/meal-planPopulate.serialization";
 import { Request, Response } from "express";
 import { JsonResponse } from "@lib/responses/json-response";
 import { parsePaginationQuery } from "@helpers/pagination";
@@ -26,7 +26,7 @@ export class UsersMealPlansController extends BaseController {
   }
 
   @SwaggerGet()
-  @SwaggerResponse([MealPlanPopulateSerialization])
+  @SwaggerResponse([ListMealPlanSerialization])
   @SwaggerSummary("list meal plans")
   @SwaggerDescription("List all meal plans")
   @SwaggerQuery({
@@ -37,17 +37,12 @@ export class UsersMealPlansController extends BaseController {
     const paginationQuery = parsePaginationQuery(req.query);
     const { docs, paginationData } = await this.mealPlansService.list(
       {},
-      paginationQuery,
-      {
-        populateArray: [
-          { path: "days.meals" }
-        ],
-      }
+      paginationQuery
     );
 
     return JsonResponse.success(
       {
-        data: serialize(docs, MealPlanPopulateSerialization),
+        data: serialize(docs, ListMealPlanSerialization),
         meta: paginationData,
       },
       res

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

@@ -5,7 +5,7 @@ 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 { UserRegisteredMealPlansPopulateSerialization } from "@common/serializers/user-registered-meal-planPopulate.serialization";
+import { GetMyMealPlanSerialization } from "@common/serializers/user-registered-meal-planPopulate.serialization";
 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";
@@ -26,22 +26,22 @@ export class UsersRegisteredMealPlansController extends BaseController {
   }
 
   @SwaggerGet()
-  @SwaggerResponse(UserRegisteredMealPlansPopulateSerialization)
+  @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> => {
     const data = await this.userRegisteredMealPlansService.findOneOrFail(
-      { user: req.jwtPayload._id, isActive: true },
+      { user: req.jwtPayload.id, isActive: true },
       {
         populateArray: [
-          { path: "meal_plan" },
+          { path: "meal_plan", select: "-days"},
           { path: "days.meals"}
         ],
       });
 
     return JsonResponse.success(
       {
-        data: serialize(data, UserRegisteredMealPlansPopulateSerialization),
+        data: serialize(data, GetMyMealPlanSerialization),
       },
       res
     );

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

@@ -1,4 +1,29 @@
 import { UserRegisteredMealPlan } from "@common/models/user-registered-meal-plan.model";
 import { CrudService } from "@lib/services/crud.service";
+import { IUpdateUserRegisteredMealPlan } from "../validations/update-user-registered-meal-plan.validation";
+import { HttpError } from "@lib/error-handling/http-error";
 
-export class UserRegisteredMealPlansService extends CrudService(UserRegisteredMealPlan) {}
+
+export class UserRegisteredMealPlansService extends CrudService(UserRegisteredMealPlan) {
+    async updateForUser(mealPlanProps: {urwId: string; dayNumber: number}, data: any, userId: string) {
+        // find workout
+        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 and week
+        day.is_eaten = true;
+        mealPlan.days[dayIndex] = day;
+        
+        // save changes
+        mealPlan.markModified('days');
+        return mealPlan.save()
+      }
+}

src/seeder/seeders/10-mealPlan.seeder.ts

@@ -6,7 +6,30 @@ import { FitnessLevel } from "@common/enums/fitness-level.enum";
 export default seederWrapper(MealPlan, async () => {
   // 10 mealPlans
   await Promise.all(Array.from({ length: 10 }, (_, i) => i).map(async function (i) {
-    const meals = await Meal.find().limit(35).lean();
+    // Fetch all meals
+    const meals = await Meal.find().lean();
+
+    // Categorize meals by type
+    const categorizedMeals = {
+      'breakfast': [],
+      'dinner': [],
+      'snacks': [],
+      'lunch': [],
+    };
+
+
+    meals.forEach(meal => {
+      if (meal.type in categorizedMeals) {
+        categorizedMeals[meal.type].push(meal);
+      }
+    });
+
+    // Check if we have enough meals of each type
+    for (const type in categorizedMeals) {
+      if (categorizedMeals[type].length < 7) {
+        throw new Error(`Not enough meals of type ${type}`);
+      }
+    }
 
     let o = {
       image: `https://placehold.co/300x400`,
@@ -20,10 +43,15 @@ export default seederWrapper(MealPlan, async () => {
       ],
       days: Array.from({ length: 7 }, (_, i) => ({
         day_number: i + 1,
-        meals: meals.slice(i * 5, i * 5 + 5),
+        meals: [
+          categorizedMeals['breakfast'][i],
+          categorizedMeals['lunch'][i],
+          categorizedMeals['dinner'][i],
+          categorizedMeals['snacks'][i],
+        ],
       })),
     }
 
     await MealPlan.create(o);
-  }))
-})
+  }));
+});