Merge pull request #105 from Modarb-Ai-Trainer/updateProgress

chore: Add createdAt field to meal plan and user registered meal plan models

src/common/models/meal-plan.model.ts

@@ -18,6 +18,7 @@ export interface IMealPlan {
   }[];
   aiGenerated: boolean;
   isDeleted: boolean;
+  createdAt?: Date;
 }
 
 const mealPlanSchema = new Schema({
@@ -26,6 +27,7 @@ const mealPlanSchema = new Schema({
   duration: { type: Number, required: true },
   level: { type: String, enum: FitnessLevel, required: true },
   your_journey: { type: String, required: false },
+  createdAt: { type: Date, default: Date.now, required: false },
   key_features: [{
     title: { type: String, required: false },
     description: { type: String, required: false },

src/common/models/user-registered-meal-plan.model.ts

@@ -6,6 +6,7 @@ export interface IUserRegisteredMealPlan {
   user: string;
   isActive: boolean;
   meal_plan: string;
+  createdAt?: Date;
   days: {
     day_number: number;
     meals: string[];
@@ -17,6 +18,7 @@ const userRegisteredMealPlanSchema = new Schema({
   user: { type: mongoose.Types.ObjectId, ref: "users" },
   isActive: { type: Boolean, default: true },
   meal_plan: { type: mongoose.Types.ObjectId, ref: "mealPlans" },
+  createdAt: { type: Date, default: Date.now, required: false },
   days: [
     {
       day_number: { type: Number, required: true, },

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

@@ -17,6 +17,7 @@ import { UserNutriHomeDailyGoalsSerialization } from "../responses/user-nutri-ho
 import { GetMyMealPlanSerialization } from "@common/serializers/user-registered-meal-planPopulate.serialization";
 import { UserRegisteredMealPlansService } from "../../user-registered-meal-plans/services/user-registered-meal-plans.service";
 import { MealPlansProgressService } from "../../user-registered-meal-plans/services/meal-plans-progress.service";
+import moment from "moment";
 
 
 @Controller("/user/nutri-guide")
@@ -42,9 +43,10 @@ export class homeNutriGuideController extends BaseController {
   @SwaggerDescription("Get today's meals for the user.")
   getTodayMeals = async (req: IUserRequest, res: Response): Promise<Response> => {
     try {
-      const data = await this.userRegisteredMealPlansService.findOneOrFail(
+      let data = await this.userRegisteredMealPlansService.findOneOrFail(
         {
-          user: req.jwtPayload.id, isActive: true},
+          user: req.jwtPayload.id, isActive: true
+        },
         {
           populateArray: [
             { path: "meal_plan", select: "-days" },
@@ -55,8 +57,35 @@ export class homeNutriGuideController extends BaseController {
           ],
         }
       );
-      
 
+      const today = moment().startOf("day");
+      const planStartDay = moment(data.createdAt).startOf("day");
+      const daysSinceStart = today.diff(planStartDay, "days");
+      const daysToLoop = daysSinceStart > data.days.length - 1 ? data.days.length : daysSinceStart;
+      console.log("daysSinceStart", daysSinceStart);
+
+      for await (const i of Array.from({ length: daysToLoop }, (_, i) => i)){
+        if (data.days[i].is_eaten === false) {
+          await this.mealPlansProgressService.updateForUser({
+            urwId: data._id,
+            dayNumber: data.days[i].day_number
+          }, req.body, req.jwtPayload.id);
+        }
+      }
+      data = await this.userRegisteredMealPlansService.findOneOrFail(
+        {
+          user: req.jwtPayload.id, isActive: true
+        },
+        {
+          populateArray: [
+            { path: "meal_plan", select: "-days" },
+            {
+              path: "days.meals",
+              populate: { path: "ingredients" }
+            }
+          ],
+        }
+      );
       const dayToEat = data.days.find(day => day.is_eaten === false);
 
       if (dayToEat) {