Merge pull request #76 from Modarb-Ai-Trainer:requestSchema

feat: Add validation for target muscles and cover image in create exercise API

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

@@ -6,14 +6,21 @@ const parseToSchema = (schema: any, joiSchema: any) => {
   const properties = Object.getOwnPropertyNames(joiSchema);
   properties.forEach((property) => {
     const type = joiSchema[property].type;
-    if (type === "object") {
+    if (type === "array") {
+      schema.properties[property] = {
+        type: "array",
+        items: {
+          type: joiSchema[property].items.type,
+        },
+      };
+    } else if (type === "object") {
       schema.properties[property] = {
         type: "object",
         properties: {},
       };
       parseToSchema(schema.properties[property], joiSchema[property]);
     } else {
-      schema.properties[property] = {type};
+      schema.properties[property] = { type };
     }
   });
 }

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

@@ -67,14 +67,27 @@ export const createExerciseSchema = createSchema<ICreateExercise>({
     "any.required": "benefits is required",
     "string.empty": "benefits can not be empty",
   }),
-  targetMuscles: joi.object().empty().required().messages({
-    "array.base": "please enter a valid target muscles",
-    "any.required": "target muscles is required",
+  targetMuscles: joi.object().keys({
+    primary: joi.string().empty().required().messages({
+      "string.base": "please enter a valid primary target muscle",
+      "any.required": "primary target muscle is required",
+      "string.empty": "primary target muscle can not be empty",
+    }),
+    secondary: joi.string().empty().required().messages({
+      "string.base": "please enter a valid secondary target muscle",
+      "any.required": "secondary target muscle is required",
+      "string.empty": "secondary target muscle can not be empty",
+    }),
   }),
   equipments: joi.array().items(joi.string()).empty().required().messages({
     "array.base": "please enter a valid equipments",
     "any.required": "equipments is required",
   }),
+  coverImage: joi.string().empty().required().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").required().messages({
       "string.base": "please enter a valid media type",

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

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