Merge pull request #55 from Modarb-Ai-Trainer:template

src/common/models/template.model.ts

@@ -1,16 +1,19 @@
+import { date } from "joi";
 import mongoose from "mongoose";
 const { Schema } = mongoose;
 
 export interface ITemplate {
-    name: string;
-    user: string;
-    exercises: string[];
+  name: string;
+  user: string;
+  creationDate: Date;
+  exercises: string[];
 }
 
 const templateSchema = new Schema({
-    name: { type: String, required: true, unique: true, dropDups: true },
-    user: { type: mongoose.Types.ObjectId, ref: "users" },
-    exercises: [{ type: mongoose.Types.ObjectId, ref: "exercises" }],
+  name: { type: String, required: true, unique: true, dropDups: true },
+  user: { type: mongoose.Types.ObjectId, ref: "users" },
+  creationDate: { type: Date, default: Date.now() },
+  exercises: [{ type: mongoose.Types.ObjectId, ref: "exercises" }],
 });
 
 

src/common/serializers/template.serialization.ts

@@ -14,6 +14,10 @@ export class TemplateSerialization {
   @SwaggerResponseProperty({ type: "string" })
   user: string;
 
+  @Expose()
+  @SwaggerResponseProperty({ type: "Date" })
+  creationDate: Date;
+
   @Expose()
   @SwaggerResponseProperty({ type: ["string"] })
   exercises: string[];

src/modules/users/modules/templates/controllers/templates.controller.ts

@@ -45,7 +45,12 @@ export class templateController extends BaseController {
     const paginationQuery = parsePaginationQuery(req.query);
     const { docs, paginationData } = await this.templatesService.list(
       { user: req.jwtPayload.id },
-      paginationQuery
+      paginationQuery,
+      {
+        populateArray: [
+          { path: "exercises", select: "name duration reps sets" },
+        ],
+      }
     );
 
     return JsonResponse.success(
@@ -60,10 +65,16 @@ export class templateController extends BaseController {
   @SwaggerGet("/:id")
   @SwaggerResponse(TemplateSerialization)
   get = async (req: userRequest, res: Response): Promise<Response> => {
-    const data = await this.templatesService.findOneOrFail({
-      _id: req.params.id,
-      user: req.jwtPayload.id
-    });
+    const data = await this.templatesService.findOneOrFail(
+      {
+        _id: req.params.id,
+        user: req.jwtPayload.id
+      },
+      {
+        populateArray: [
+          { path: "exercises", select: "name duration reps sets" },
+        ],
+      });
 
     return JsonResponse.success(
       {

src/modules/users/modules/templates/validations/create-templates.validation.ts

@@ -5,6 +5,7 @@ import { createSchema } from "@helpers/create-schema";
 export interface ICreateTemplates {
     name: string;
     user: string;
+    creationDate?: Date;
     exercises: string[];
 }
 
@@ -19,6 +20,9 @@ export const createTemplatesSchema = createSchema<ICreateTemplates>({
         "any.required": "user id is required",
         "string.empty": "user id can not be empty",
     }),
+    creationDate: joi.date().optional().messages({
+        "date.base": "please enter a valid creation date",
+    }),
     exercises: joi.array().empty().required().items(
         joi.string().empty().required().messages({
             "string.base": "please enter a valid exercise id",

src/modules/users/modules/templates/validations/update-templates.validation.ts

@@ -6,6 +6,7 @@ import { createSchema } from "@helpers/create-schema";
 export interface IUpdateTemplates {
     name?: string;
     user?: string;
+    creationDate?: Date;
     exercises?: string[];
 }
 
@@ -19,6 +20,9 @@ export const updateTemplatesSchema = createSchema<IUpdateTemplates>({
         "string.base": "please enter a valid user id",
         "string.empty": "user id can not be empty",
     }),
+    creationDate: joi.date().optional().messages({
+        "date.base": "please enter a valid creation date",
+    }),
     exercises: joi.array().empty().optional().items(
         joi.string().empty().optional().messages({
             "string.base": "please enter a valid exercise id",