Merge branch 'main' into models-server

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

@@ -0,0 +1,3 @@
+export enum ActivityType {
+  EAT_CUSTOM_MEAL = "eat-custom-meal",
+}

src/common/models/activity.model.ts

@@ -0,0 +1,62 @@
+import mongoose, { Types } from "mongoose";
+import { MealDocument } from "./meal.model";
+import { MealPlanDocument } from "./meal-plan.model";
+import { WorkoutDocument } from "./workout.model";
+import { ExerciseDocument } from "./exercise.model";
+import { ActivityType } from "@common/enums/activity-type.enum";
+const { Schema } = mongoose;
+
+export type RelatedItem = | MealDocument 
+                          | MealPlanDocument 
+                          | WorkoutDocument
+                          | ExerciseDocument 
+                          | { 
+                              ingredients: {
+                                id: string,
+                                noServings: number
+                              }[];
+                            }
+export type AMetaData = {};
+
+export interface IActivity {
+  related_item?: RelatedItem;
+  meta_data?: AMetaData;
+  activity_type: ActivityType;
+  related_id?: string | Types.ObjectId;
+  user_id: string | Types.ObjectId;
+  created_at?: Date;
+}
+
+const activitySchema = new Schema({
+  related_item: {
+    type: Schema.Types.Mixed,
+    required: false,
+  },
+  meta_data: {
+    type: Schema.Types.Mixed,
+    default: {},
+  },
+  activity_type: {
+    type: String,
+    enum: Object.values(ActivityType),
+  },
+  related_id: {
+    type: Schema.Types.ObjectId,
+    required: false,
+  },
+  user_id: {
+    type: Schema.Types.ObjectId,
+    required: true,
+  },
+  created_at: {
+    type: Date,
+    default: Date.now,
+  },
+});
+
+export type ActivityDocument = IActivity & mongoose.Document;
+
+export const Activity = mongoose.model<ActivityDocument>(
+  "activities",
+  activitySchema
+);

src/common/models/meal.model.ts

@@ -4,6 +4,7 @@ import { MealType } from "@common/enums/meal-type.enum";
 export interface IMeal {
   name: string;
   created_at: Date;
+  image: string;
   ingredients: string[];
   calories: number;
   carbs: number;
@@ -15,6 +16,7 @@ export interface IMeal {
 const mealSchema = new Schema({
   name: { type: String, required: true, unique: true, dropDups: true },
   created_at: { type: Date, default: Date.now() },
+  image: { type: String, required: true },
   type: {
     type: String,
     enum: MealType,

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

@@ -97,4 +97,15 @@ export class ListMealPlanSerialization {
   )
   key_features: any;
 
+}
+
+
+export class MSerialization {
+  @Expose({ name: "_id" })
+  @SwaggerResponseProperty({ type: "string" })
+  id: string;
+
+  @Expose()
+  @SwaggerResponseProperty({ type: "string" })
+  image: string;
 }

src/common/serializers/meal.serialization.ts

@@ -15,6 +15,10 @@ export class MealSerialization {
   @SwaggerResponseProperty({ type: "string" })
   created_at: Date;
 
+  @Expose()
+  @SwaggerResponseProperty({ type: "string" })
+  image: string;
+
   @Expose()
   @SwaggerResponseProperty({ type: ["string"] })
   ingredients: any;

src/common/serializers/mealPopulate.serialization.ts

@@ -17,6 +17,10 @@ export class MealPopulateSerialization {
   @SwaggerResponseProperty({ type: "string" })
   created_at: Date;
 
+  @Expose()
+  @SwaggerResponseProperty({ type: "string" })
+  image: string;
+
   @Expose()
   @SwaggerResponseProperty({ type: [IngredientSerialization] })
   @Transform(

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

@@ -1,8 +1,8 @@
 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 { ListMealPlanSerialization } from "@common/serializers/meal-planPopulate.serialization";
+import { MealPopulateSerialization } from "./mealPopulate.serialization";
 import { MealPlanSerialization } from "./meal-plan.serialization";
 
 
@@ -13,9 +13,9 @@ class MealDaysPopulate {
   day_number: number;
 
   @Expose({ name: "meals" })
-  @SwaggerResponseProperty({ type: [MealSerialization] })
+  @SwaggerResponseProperty({ type: [MealPopulateSerialization] })
   @Transform(
-    ({ value }) => serialize(value, MealSerialization)
+    ({ value }) => serialize(value, MealPopulateSerialization)
   )
   meals: any;
 
@@ -65,7 +65,7 @@ export class GetMyMealPlanSerialization {
 
   @Expose()
   @SwaggerResponseProperty({ type: ListMealPlanSerialization })
-  meal_plan: string;
+  meal_plan: any;
 
   @Expose()
   @SwaggerResponseProperty({ type: "boolean" })

src/lib/events/events-manager.ts

@@ -0,0 +1,72 @@
+import { asyncHandler } from '@helpers/async-handler';
+import EventEmitter from 'node:events';
+
+/**
+ * EventsManager is a singleton class that manages events.
+ * It uses the EventEmitter class from Node.js to handle events.
+ */
+export class EventsManager {
+  private static instance: EventsManager;
+  private emitter: EventEmitter;
+
+  private constructor() {
+    this.emitter = new EventEmitter();
+  }
+
+  public static getInstance(): EventsManager {
+    if (!EventsManager.instance) {
+      EventsManager.instance = new EventsManager();
+    }
+
+    return EventsManager.instance;
+  }
+
+  /**
+   * Register an event listener.
+   * @param event The event name.
+   * @param listener The listener function.
+   */
+  public static on(event: string, listener: (...args: any[]) => void | Promise<void>): void {
+    try {
+      EventsManager.getInstance().emitter.on(event, asyncHandler(listener));
+    } catch (error) {
+      console.error(error);
+    }
+  }
+
+  /**
+   * Remove an event listener.
+   * @param event The event name.
+   * @param listener The listener function.
+   */
+  public static emit(event: string, ...args: any[]): void {
+    EventsManager.getInstance().emitter.emit(event, ...args);
+  }
+
+  /**
+   * Create a queue to store events.
+   * @returns An EventsQueue object.
+   * @see EventsQueue
+   */
+  public createQueue() {
+    return new class EventsQueue {
+      private queue: any[] = [];
+
+      public add(event: string, ...args: any[]): void {
+        this.queue.push({ event, args });
+      }
+
+      public clear() {
+        this.queue = [];
+      }
+
+      public process() {
+        this.queue.forEach((item) => {
+          EventsManager.emit(item.event, ...item.args);
+        });
+
+        this.clear();
+      }
+    }
+  }
+}

src/modules/console/modules/meals/validations/create-meals.validation.ts

@@ -5,6 +5,7 @@ import { MealType } from "@common/enums/meal-type.enum";
 export interface ICreateMeal {
   name: string;
   created_at?: Date;
+  image: string;
   ingredients: string[];
   calories: number;
   carbs: number;
@@ -24,6 +25,12 @@ export const createMealSchema = createSchema<ICreateMeal>({
     "date.empty": "created_at can not be empty",
   }),
 
+  image: joi.string().empty().required().messages({
+    "string.base": "please enter a valid image",
+    "any.required": "image is required",
+    "string.empty": "image can not be empty",
+  }),
+
   calories: joi.number().empty().required().messages({
     "number.base": "please enter a valid calories",
     "any.required": "calories is required",

src/modules/console/modules/meals/validations/update-meals.validation.ts

@@ -5,6 +5,7 @@ import { MealType } from "@common/enums/meal-type.enum";
 export interface IUpdateMeal {
   name?: string;
   created_at?: Date;
+  image?: string;
   ingredients?: [string];
   calories?: number;
   carbs?: number;
@@ -22,6 +23,10 @@ export const updateMealSchema = createSchema<IUpdateMeal>({
     "date.base": "please enter a valid created_at",
     "date.empty": "created_at can not be empty",
   }),
+  image: joi.string().empty().optional().messages({
+    "string.base": "please enter a valid image",
+    "string.empty": "image can not be empty",
+  }),
   ingredients: joi.array().items(joi.string()).optional().messages({
     "array.base": "please enter a valid ingredients",
   }),

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

@@ -15,7 +15,7 @@ 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 { 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";
 
@@ -37,7 +37,7 @@ export class homeNutriGuideController extends BaseController {
   }
 
   @SwaggerGet("/today-meals")
-  @SwaggerResponse(UserRegisteredMealPlansPopulateSerialization)
+  @SwaggerResponse(GetMyMealPlanSerialization)
   @SwaggerSummary("Get today's meals")
   @SwaggerDescription("Get today's meals for the user.")
   getTodayMeals = async (req: IUserRequest, res: Response): Promise<Response> => {
@@ -48,11 +48,13 @@ export class homeNutriGuideController extends BaseController {
         {
           populateArray: [
             { path: "meal_plan", select: "-days" },
-            { path: "days.meals" }
+            {
+              path: "days.meals",
+              populate: { path: "ingredients" }
+            }
           ],
         }
       );
-      console.log(data);
       
 
       const dayToEat = data.days.find(day => day.is_eaten === false);
@@ -61,7 +63,7 @@ export class homeNutriGuideController extends BaseController {
         data.days = [dayToEat];
         return JsonResponse.success(
           {
-            data: serialize(data, UserRegisteredMealPlansPopulateSerialization),
+            data: serialize(data, GetMyMealPlanSerialization),
           },
           res
         );

src/modules/users/modules/meals/controller/meals.controller.ts

@@ -9,11 +9,15 @@ 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, SwaggerPost } from "@lib/decorators/swagger-routes.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";
 import { SwaggerQuery } from "@lib/decorators/swagger-query.decorator";
+import { IUserRequest } from "@common/interfaces/user-request.interface";
+import { IEatCustomMeal, eatCustomMealSchema } from "../validations/eat-custom-meal.validation";
+import { bodyValidator } from "@helpers/validation.helper";
+import { SwaggerRequest } from "@lib/decorators/swagger-request.decorator";
 
 
 @Controller("/user/meals")
@@ -23,6 +27,7 @@ export class UsersMealsController extends BaseController {
 
   setRoutes(): void {
     this.router.get("/", asyncHandler(this.list));
+    this.router.post("/eat-custom-meal", bodyValidator(eatCustomMealSchema), asyncHandler(this.eatCustomMeal));
   }
 
   @SwaggerGet()
@@ -52,4 +57,21 @@ export class UsersMealsController extends BaseController {
       res
     );
   };
+
+  @SwaggerPost('/eat-custom-meal')
+  @SwaggerResponse({})
+  @SwaggerRequest(eatCustomMealSchema)
+  @SwaggerSummary("Eat custom meal")
+  @SwaggerDescription("Eat custom meal")
+  eatCustomMeal = async (req: IUserRequest, res: Response) => {
+    await this.mealsService.eatCustomMeal(req.jwtPayload.id, req.body as IEatCustomMeal);
+
+    return JsonResponse.success(
+      {
+        message: "Meal created successfully",
+      },
+      res
+    );
+  };
 }
+

src/modules/users/modules/meals/events/eat-custom-meal.event.ts

@@ -0,0 +1,18 @@
+import { ActivityType } from "@common/enums/activity-type.enum";
+import { Activity, IActivity } from "@common/models/activity.model";
+import { EventsManager } from "@lib/events/events-manager";
+import { IEatCustomMeal } from "../validations/eat-custom-meal.validation";
+
+export class EatCustomMealEvent {
+  constructor(public userId: string, public ingredients: IEatCustomMeal['ingredients']) {}
+}
+
+EventsManager.on(ActivityType.EAT_CUSTOM_MEAL, (event: EatCustomMealEvent) => {
+  console.log(`User with id ${event.userId} ate a custom meal with ingredients: ${event.ingredients.map(i => i.id).join(", ")}`);
+
+  Activity.create({
+    user_id: event.userId,
+    activity_type: ActivityType.EAT_CUSTOM_MEAL,
+    related_item: { ingredients: event.ingredients },
+  } satisfies IActivity).catch(console.error);
+});

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

@@ -1,4 +1,27 @@
 import { Meal } from "@common/models/meal.model";
 import { CrudService } from "@lib/services/crud.service";
+import { IEatCustomMeal } from "../validations/eat-custom-meal.validation";
+import { EventsManager } from "@lib/events/events-manager";
+import { Ingredient } from "@common/models/ingredient.model";
+import { HttpError } from "@lib/error-handling/http-error";
+import { ActivityType } from "@common/enums/activity-type.enum";
+import { EatCustomMealEvent } from "../events/eat-custom-meal.event";
+import { Types } from "mongoose";
 
-export class MealsService extends CrudService(Meal) {}
+export class MealsService extends CrudService(Meal) {
+    async eatCustomMeal(id: string, body: IEatCustomMeal) {
+      // Validate ingredients
+      await Promise.all(
+        body.ingredients.map(async i => {
+          const ing = await Ingredient.findOne({ _id: new Types.ObjectId(i.id) });
+          if(!ing) throw new HttpError(404, `Ingredient with id ${i} not found`);
+          return {
+            ingredient: ing,
+            noServings: i.noServings,
+          };
+        })
+      )
+
+      EventsManager.emit(ActivityType.EAT_CUSTOM_MEAL, new EatCustomMealEvent(id, body.ingredients));
+    }
+}

src/modules/users/modules/meals/validations/eat-custom-meal.validation.ts

@@ -0,0 +1,18 @@
+import * as joi from "joi";
+import { createSchema } from "@helpers/create-schema";
+
+export interface IEatCustomMeal {
+  ingredients: {
+    id: string;
+    noServings: number;
+  }[];
+}
+
+export const eatCustomMealKeys = {
+  ingredients: joi.array().items(joi.object({
+    id: joi.string().required(),
+    noServings: joi.number().required(),
+  })).required(),
+};
+
+export const eatCustomMealSchema = createSchema<IEatCustomMeal>(eatCustomMealKeys);

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

@@ -9,6 +9,8 @@ import { GetMyMealPlanSerialization } from "@common/serializers/user-registered-
 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 { SwaggerPost } from "@lib/decorators/swagger-routes.decorator";
+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";
@@ -23,6 +25,10 @@ export class UsersRegisteredMealPlansController extends BaseController {
 
   setRoutes(): void {
     this.router.get("/", asyncHandler(this.get));
+    this.router.post(
+      "/",
+      asyncHandler(this.create)
+    );
   }
 
   @SwaggerGet()
@@ -34,8 +40,8 @@ export class UsersRegisteredMealPlansController extends BaseController {
       { user: req.jwtPayload.id, isActive: true },
       {
         populateArray: [
-          { path: "meal_plan", select: "-days"},
-          { path: "days.meals"}
+          { path: "meal_plan", select: "-days" },
+          { path: "days.meals", populate: { path: "ingredients" } }
         ],
       });
 
@@ -46,4 +52,21 @@ export class UsersRegisteredMealPlansController extends BaseController {
       res
     );
   };
+
+
+  @SwaggerPost()
+  @SwaggerResponse(GetMyMealPlanSerialization)
+  @SwaggerRequest({ mealPlan: "string" })
+  @SwaggerSummary("create my meal plan")
+  @SwaggerDescription("Create a new meal plan for the user")
+  create = async (req: userRequest, res: Response) => {
+    const data = await this.userRegisteredMealPlansService.createForUser(req.body, req.jwtPayload.id);
+    return JsonResponse.success(
+      {
+        status: 201,
+        data: serialize(data.toJSON(), GetMyMealPlanSerialization),
+      },
+      res
+    );
+  };
 }

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

@@ -1,10 +1,35 @@
 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 { MealPlansService } from "../../meal-plans/services/meal-plans.service";
 import { HttpError } from "@lib/error-handling/http-error";
 
 
 export class UserRegisteredMealPlansService extends CrudService(UserRegisteredMealPlan) {
+  private mealPlansService: MealPlansService = new MealPlansService();
+
+  async unregisterCurrentMealPlan(userId: string) {
+    return await this.updateMany({
+      user: userId,
+      isActive: true,
+    }, {
+      isActive: false,
+    });
+  }
+
+  async createForUser(data: any, userId: string) {
+    const mealPlan = await this.mealPlansService.findOneOrFail({
+      _id: data.mealPlan,
+    });
+
+    await this.unregisterCurrentMealPlan(userId);
+    
+    return await this.create({
+      ...data,
+      user: userId,
+      days: mealPlan.days,
+      isActive: true,
+    });
+  }
     async updateForUser(mealPlanProps: {urwId: string; dayNumber: number}, data: any, userId: string) {
         // find workout
         const mealPlan = await this.findOneOrFail({

src/seeder/seeders/9-meals.seeder.ts

@@ -21,6 +21,8 @@ export default seederWrapper(Meal, async () => {
   console.log('preping meals data...')
   const data = await Promise.all(dbStore.mealsDataset.map(async (mealJson) => ({
     name: mealJson.Name,
+    created_at: new Date(),
+    image: `https://placehold.co/300x400`,
     ingredients: mealJson.RecipeIngredientParts.map(name => ingredientsIds.find(i => i.name === name)._id),
     calories: mealJson.Calories,
     carbs: mealJson.CarbohydrateContent,