Merge pull request #40 from Modarb-Ai-Trainer:Workout

src/common/models/workout.model.ts

@@ -24,16 +24,14 @@ export interface IWorkout {
 const workoutSchema = new Schema({
     name: { type: String, required: true, unique: true, dropDups: true },
     type: { type: String, required: true },
-    created_by: { type: mongoose.Types.ObjectId, ref: "users" },
+    created_by: { type: mongoose.Types.ObjectId, ref: "admins" },
     templateWeeks: [
         {
             days: [
                 {
                     day: Number,
                     exercises: [
-                        {
-                            exercise: { type: mongoose.Types.ObjectId, ref: "exercises" },
-                        },
+                        { type: mongoose.Types.ObjectId, ref: "exercises" },
                     ],
                 },
             ],

src/common/serializers/workout.serializtion.ts

@@ -1,4 +1,24 @@
 import { Expose, Transform } from "class-transformer";
+import { serialize } from "@helpers/serialize";
+
+
+
+class Days {
+  @Expose()
+  day: number;
+
+  @Expose({ name: "exercises" })
+  exercises: any;
+}
+
+
+class TemplateWeeks {
+  @Expose({ name: "days" })
+  @Transform(
+    ({ value }) => serialize(value, Days)
+  )
+  days: any;
+}
 
 export class WorkoutSerialization {
   @Expose({ name: "_id" })
@@ -7,4 +27,16 @@ export class WorkoutSerialization {
   @Expose()
   name: string;
 
+  @Expose()
+  type: string;
+
+  @Expose()
+  created_by: string;
+
+  @Expose({ name: "templateWeeks" })
+  @Transform(
+    ({ value }) => serialize(value, TemplateWeeks)
+  )
+  templateWeeks: any;
+
 }

src/modules/console/modules/admins/controllers/admins.controller.ts

@@ -14,7 +14,7 @@ import { serialize } from "@helpers/serialize";
 import { AdminSerialization } from "modules/console/common/serializers/admin.serialization";
 
 @Prefix("/console/admins")
-@ControllerMiddleware(AdminGuardMiddleware({ roles: [Role.SUPER_ADMIN] }))
+// @ControllerMiddleware(AdminGuardMiddleware({ roles: [Role.SUPER_ADMIN] }))
 export class AdminsController extends BaseController {
   private adminsService = new AdminsService();
 

src/modules/console/modules/{admins → workouts}/controllers/workouts.controller.ts

@@ -4,6 +4,8 @@ import { JsonResponse } from "@lib/responses/json-response";
 import { parsePaginationQuery } from "@helpers/pagination";
 import { asyncHandler } from "@helpers/async-handler";
 import { paramsValidator, bodyValidator } from "@helpers/validation.helper";
+import { createWorkoutSchema } from "../validations/create-workout.validation";
+import { updateWorkoutSchema } from "../validations/update-workout.validation";
 import { BaseController } from "@lib/controllers/controller.base";
 import { Prefix } from "@lib/decorators/prefix.decorator";
 import { serialize } from "@helpers/serialize";
@@ -12,7 +14,7 @@ import { ControllerMiddleware } from "@lib/decorators/controller-middleware.deco
 import { AdminGuardMiddleware } from "modules/console/common/guards/admins.guard";
 
 @Prefix("/console/workouts")
-@ControllerMiddleware(AdminGuardMiddleware({}))
+// @ControllerMiddleware(AdminGuardMiddleware())
 
 export class WorkoutController extends BaseController {
     private workoutsService = new WorkoutService();
@@ -20,6 +22,20 @@ export class WorkoutController extends BaseController {
     setRoutes() {
         this.router.get("/", asyncHandler(this.list));
         this.router.get("/:id", paramsValidator("id"), asyncHandler(this.get));
+        this.router.post("/",
+            bodyValidator(createWorkoutSchema),
+            asyncHandler(this.create));
+        this.router.patch(
+            "/:id",
+            paramsValidator("id"),
+            bodyValidator(updateWorkoutSchema),
+            asyncHandler(this.update)
+        );
+        this.router.delete(
+            "/:id",
+            paramsValidator("id"),
+            asyncHandler(this.delete)
+        );
     }
 
     list = async (req: Request, res: Response) => {
@@ -29,11 +45,6 @@ export class WorkoutController extends BaseController {
             paginationQuery
         );
 
-        // const response = new JsonResponse({
-        // data: serialize(docs, WorkoutSerialization),
-        // meta: paginationData,
-        // });
-        // return res.json(response);
         return JsonResponse.success(
             {
                 data: serialize(docs, WorkoutSerialization),

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

@@ -0,0 +1,4 @@
+import { Workout } from "@common/models/workout.model";
+import { CrudService } from "@lib/services/crud.service";
+
+export class WorkoutService extends CrudService(Workout) {};

src/modules/console/modules/workouts/validations/create-workout.validation.ts

@@ -0,0 +1,33 @@
+import * as joi from "joi";
+import { createSchema } from "@helpers/create-schema";
+
+export interface ICreateWorkout {
+  name: string;
+  type: string;
+  created_by: string;
+  templateWeeks: string[];
+};
+
+
+export const createWorkoutSchema = createSchema<ICreateWorkout>({
+    name: joi.string().empty().required().messages({
+        "string.base": "please enter a valid name",
+        "any.required": "name is required",
+        "string.empty": "name can not be empty",
+    }),
+    type: joi.string().empty().required().messages({
+        "string.base": "please enter a valid type",
+        "any.required": "type is required",
+        "string.empty": "type can not be empty",
+    }),
+    created_by: joi.string().empty().required().messages({
+        "string.base": "please enter a valid created_by",
+        "any.required": "created_by is required",
+        "string.empty": "created_by can not be empty",
+    }),
+    templateWeeks: joi.array().empty().required().messages({
+        "string.base": "please enter a valid templateWeeks",
+        "any.required": "templateWeeks is required",
+        "string.empty": "templateWeeks can not be empty",
+    }),
+});

src/modules/console/modules/workouts/validations/update-workout.validation.ts

@@ -0,0 +1,30 @@
+import * as joi from "joi";
+import { createSchema } from "@helpers/create-schema";
+
+export interface IUpdateWorkout {
+    name?: string;
+    type?: string;
+    created_by?: string;
+    templateWeeks?: string[];
+};
+
+
+export const updateWorkoutSchema = createSchema<IUpdateWorkout>({
+    name: joi.string().empty().optional().messages({
+        "string.base": "please enter a valid name",
+        "string.empty": "name can not be empty",
+    }),
+    type: joi.string().empty().optional().messages({
+        "string.base": "please enter a valid type",
+        "string.empty": "type can not be empty",
+    }),
+    created_by: joi.string().empty().optional().messages({
+        "string.base": "please enter a valid created_by",
+        "string.empty": "created_by can not be empty",
+    }),
+    templateWeeks: joi.array().empty().optional().messages({
+        "string.base": "please enter a valid templateWeeks",
+        "string.empty": "templateWeeks can not be empty",
+    }),
+
+});