update(swagger-request): read nested

src/common/models/exercise.model.ts

@@ -18,6 +18,7 @@ export interface IExercise {
     secondary: ObjectId;
   }
   equipments: ObjectId[];
+  coverImage: string;
   media: {
     type: "image" | "video";
     url: string;
@@ -41,6 +42,7 @@ const exerciseSchema = new Schema({
     secondary: { type: Schema.Types.ObjectId, ref: "muscles" },
   },
   equipments: [{ type: Schema.Types.ObjectId, ref: "equipments" }],
+  coverImage: { type: String, required: true },
   media: {
     type: {
       type: String,

src/common/serializers/exercise.serialization.ts

@@ -77,9 +77,13 @@ export class ExerciseSerialization {
   @Expose()
   @SwaggerResponseProperty({ type: ["string"] })
   equipments: any;
+  
+  @Expose()
+  @SwaggerResponseProperty('string')
+  coverImage: string;
 
   @Expose({ name: "media" })
   @SwaggerResponseProperty({ type: Media })
   @Transform(({ value }) => serialize(value, Media))
-  media: object;
+  media: Media;
 }

src/common/serializers/exercisePopulate.serialization.ts

@@ -80,6 +80,10 @@ export class ExercisePopulateSerialization {
   @SwaggerResponseProperty({ type: [EquipmentSerialization] })
   equipments: any;
 
+  @Expose()
+  @SwaggerResponseProperty('string')
+  coverImage: string;
+
   @Expose({ name: "media" })
   @SwaggerResponseProperty({ type: MediaPopulate })
   @Transform(({ value }) => serialize(value, MediaPopulate))

src/lib/decorators/swagger-request.decorator.ts

@@ -1,6 +1,28 @@
 import { swaggerRegistry } from "@lib/swagger/swagger";
 import { getCallingFileName } from "@lib/utils/calling-file.helper";
 
+const parseToSchema = (schema: any, joiSchema: any) => {
+  joiSchema = joiSchema.describe && joiSchema.describe().keys || joiSchema.keys || joiSchema;
+  let properties: any;
+  try {
+    properties = Object.getOwnPropertyNames(joiSchema);
+  } catch (error) {
+    console.log(joiSchema)
+  }
+  properties.forEach((property) => {
+    const type = joiSchema[property].type;
+    if (type === "object") {
+      schema.properties[property] = {
+        type: "object",
+        properties: {},
+      };
+      parseToSchema(schema.properties[property], joiSchema[property]);
+    } else {
+      schema.properties[property] = {type};
+    }
+  });
+}
+
 export const SwaggerRequest = (joiSchema: any) => {
   return (target: any, propertyKey: string) => {
     const schema: any = {
@@ -8,12 +30,7 @@ export const SwaggerRequest = (joiSchema: any) => {
       properties: {},
     };
 
-    const properties = Object.getOwnPropertyNames(joiSchema.describe().keys);
-    properties.forEach((property) => {
-      schema.properties[property] = {
-        type: joiSchema.describe().keys[property].type,
-      };
-    });
+    parseToSchema(schema, joiSchema)
 
     target.constructor['targetName'] = target.constructor.name + getCallingFileName();
     swaggerRegistry.updateRoute(target.constructor['targetName'], {

src/lib/decorators/swagger-response.decorator.ts

@@ -54,10 +54,15 @@ const responseToSwaggerSchema = (response: any) => {
         );
         schema.properties[property].type = "array";
       } else {
-        schema.properties[property].items = {
-          type: schema.properties[property].type[0],
-        };
-        schema.properties[property].type = "array";
+        if(Array.isArray(schema.properties[property].type[0])){
+          schema.properties[property].enum = schema.properties[property].type[0]
+          schema.properties[property].type = "string";
+        }else{
+          schema.properties[property].items = {
+            type: schema.properties[property].type[0],
+          };
+          schema.properties[property].type = "array";
+        }
       }
     }
 

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

@@ -63,7 +63,7 @@ export class ExercisesController extends BaseController {
         populateArray: [
           { path: "targetMuscles.primary" },
           { path: "targetMuscles.secondary" },
-          { path: "equipment" },
+          { path: "equipments" },
         ],
       }
     );

src/modules/console/modules/exercises/validations/create-excercise.validation.ts

@@ -13,8 +13,12 @@ export interface ICreateExercise {
   sets: number;
   instructions: string;
   benefits: string;
-  targetMuscles: string[]; // refs
+  targetMuscles: {
+    primary: string;
+    secondary: string;
+  };
   equipments: string[]; // refs
+  coverImage: string,
   media: {
     type: "image" | "video";
     url: string;

src/modules/console/modules/exercises/validations/update-excercise.validation.ts

@@ -13,8 +13,12 @@ export interface IUpdateExercise {
   sets?: number;
   instructions?: string;
   benefits?: string;
-  targetMuscles?: string[]; // refs
+  targetMuscles?: {
+    primary: string;
+    secondary: string;
+  };
   equipments?: string[]; // refs
+  coverImage?: string,
   media?: {
     type: "image" | "video";
     url: string;
@@ -63,14 +67,25 @@ export const updateExerciseSchema = createSchema<IUpdateExercise>({
     "any.required": "benefits is required",
     "string.empty": "benefits can not be empty",
   }),
-  targetMuscles: joi.array().items(joi.string()).empty().optional().messages({
-    "array.base": "please enter a valid target muscles",
-    "any.required": "target muscles is required",
+  targetMuscles: joi.object().keys({
+    primary: joi.string().empty().optional().messages({
+      "string.base": "please enter a valid primary muscle",
+      "any.required": "primary muscle is required",
+    }),
+    secondary: joi.string().empty().optional().messages({
+      "string.base": "please enter a valid secondary muscle",
+      "any.required": "secondary muscle is required",
+    }),
   }),
   equipments: joi.array().items(joi.string()).empty().optional().messages({
     "array.base": "please enter a valid equipments",
     "any.required": "equipments is required",
   }),
+  coverImage: joi.string().empty().optional().messages({
+    "string.base": "please enter a valid cover image",
+    "any.required": "cover image is required",
+    "string.empty": "cover image can not be empty",
+  }),
   media: joi.object().keys({
     type: joi.string().valid("image", "video").optional().messages({
       "string.base": "please enter a valid media type",