update

src/modules/common/users/models/user.model.ts

@@ -1,53 +1,31 @@
 import mongoose from "mongoose";
 import bcrypt from "bcrypt";
 export const saltrounds = 5;
+import { Role, Gender, FitnessLevel, FitnessGoal, WorkoutPlace, PreferredDay, PreferredEquipment, Injurie } from "../enums/roles.enum";
 const { Schema } = mongoose;
-enum Role {
-    USER = "user"
-}
-enum Gender {
-    MALE = "male",
-    FEMALE = "female"
-}
-enum FitnessLevel {
-    BEGINNER = "beginner",
-    INTERMEDIATE = "intermediate",
-    ADVANCED = "advanced"
-}
-enum FitnessGoal {
-    LOSE_WEIGHT = "lose weight",
-    GAIN_MUSCLE = "gain muscle",
-    GET_FITTER = "get fitter"
-}
-enum WorkoutPlace {
-    GYM = "gym",
-    HOME = "home",
-    BOTH = "both"
-}
-enum PreferredDay {
-    SATURDAY = "saturday",
-    SUNDAY = "sunday",
-    MONDAY = "monday",
-    TUESDAY = "tuesday",
-    WEDNESDAY = "wednesday",
-    THURSDAY = "thursday",
-    FRIDAY = "friday"
-}
-enum PreferredEquipment {
-    BARBELLS = "barbells",
-    DUMBBELLS = "dumbbells",
-    GYM_MACHINES = "gym machines",
-    RESISTANCE_BAND = "resistance band",
-    BODYWEIGHT = "bodyweight"
-}
-enum Injurie {
-    NECK = "neck",
-    SHOULDERS = "shoulders",
-    BACK = "back",
-    ARMS = "arms",
-    KNEES = "knees"
-}
 
+export interface IUser {
+    name: string;
+    email: string;
+    password: string;
+    image: object;
+    role: Role;
+    gender: string;
+    dob: Date;
+    height: number;
+    weight: number;
+    fitness_level: string;
+    preferences: {
+        fitness_goal: FitnessGoal;
+        target_weight: number;
+        workout_frequency: number;
+        preferred_days: [PreferredDay];
+        workout_place: WorkoutPlace;
+        preferred_equipment: [PreferredEquipment];
+    };
+    injuries: [Injurie];
+  }
+  
 const userSchema = new Schema({
     name: { type: String, required: true },
     email: { type: String, required: true, unique: true, dropDups: true },
@@ -107,4 +85,4 @@ userSchema.pre("save", async function (next) {
     next();
 });
 
-export const userModel = mongoose.model("users", userSchema);
+export const userModel = mongoose.model<IUser>("users", userSchema);

src/modules/common/users/validation/user.baseValidation.ts

@@ -1,129 +0,0 @@
-import joi from "joi";
-
-export const userRegisterValidation = joi
-  .object()
-  .required()
-  .keys({
-    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",
-    }),
-    email: joi
-      .string()
-      .required()
-      .email({
-        minDomainSegments: 2,
-        tlds: { allow: ["com", "net", "org", "eg", "io"] },
-      })
-      .empty()
-      .messages({
-        "string.email": "please enter a valid email",
-        "any.required": "email must be entered",
-        "string.empty": "email can not be empty",
-      }),
-    password: joi.string().empty().min(8).required().messages({
-      "string.base": "please enter a valid password",
-      "any.required": "password must be entered",
-      "string.empty": "password cannot be empty",
-      "string.min": "password must be at least 8 characters",
-    }),
-    confirmPassword: joi.string().empty().min(8).required().messages({
-      "string.base": "please enter a valid password",
-      "any.required": "password must be entered",
-      "string.empty": "password cannot be empty",
-      "string.min": "password must be at least 8 characters",
-    }),
-    image: joi
-      .object()
-      .optional()
-      .keys({
-        url: joi.string().optional().messages({
-          "string.base": "please enter a valid url",
-        }),
-        public_id: joi.string().optional().messages({
-          "string.base": "please enter a valid public_id",
-        }),
-      }),
-    gender: joi.string().empty().required().messages({
-      "string.base": "please enter a valid gender",
-      "any.required": "gender must be entered",
-      "string.empty": "gender cannot be empty",
-    }),
-    height: joi.number().empty().required().messages({
-      "number.base": "please enter a valid height number",
-      "any.required": "height must be entered",
-      "number.empty": "height cannot be empty",
-    }),
-    weight: joi.number().empty().required().messages({
-      "number.base": "please enter a valid weight number",
-      "any.required": "weight must be entered",
-      "number.empty": "weight cannot be empty",
-    }),
-    fitness_level: joi.string().empty().required().messages({
-      "string.base": "please enter a valid fitness_level",
-      "any.required": "fitness_level must be entered",
-      "string.empty": "fitness_level cannot be empty",
-    }),
-    preferences: joi
-      .object()
-      .optional()
-      .keys({
-        fitness_goal: joi.string().empty().required().messages({
-          "string.base": "please enter a valid fitness_goal",
-          "any.required": "fitness_goal must be entered",
-          "string.empty": "fitness_goal cannot be empty",
-        }),
-        target_weight: joi.number().empty().required().messages({
-          "number.base": "please enter a valid target_weight number",
-          "any.required": "target_weight must be entered",
-          "number.empty": "target_weight cannot be empty",
-        }),
-        workout_frequency: joi.number().empty().required().messages({
-          "number.base": "please enter a valid workout_frequency number",
-          "any.required": "workout_frequency must be entered",
-          "number.empty": "workout_frequency cannot be empty",
-        }),
-        preferred_days: joi
-          .array()
-          .empty()
-          .required()
-          .items(
-            joi.string().empty().required().messages({
-              "string.base": "please enter a valid preferred_days",
-              "any.required": "preferred_days must be entered",
-              "string.empty": "preferred_days cannot be empty",
-            })
-          ),
-        workout_place: joi.string().empty().required().messages({
-          "string.base": "please enter a valid workout_place",
-          "any.required": "workout_place must be entered",
-          "string.empty": "workout_place cannot be empty",
-        }),
-        preferred_equipment: joi
-          .array()
-          .empty()
-          .required()
-          .items(
-            joi.string().empty().required().messages({
-              "string.base": "please enter a valid preferred_equipment",
-              "any.required": "preferred_equipment must be entered",
-              "string.empty": "preferred_equipment cannot be empty",
-            })
-          ),
-      }),
-    injuries: joi
-      .array()
-      .empty()
-      .required()
-      .items(
-        joi.string().empty().required().messages({
-          "string.base": "please enter a valid injuries",
-          "any.required": "injuries must be entered",
-          "string.empty": "injuries cannot be empty",
-        })
-      ),
-    dob: joi.date().empty().optional().messages({
-      "date.base": "please enter a valid date",
-    }),
-  });

src/modules/console/admins/validations/create-admin.validation.ts

@@ -35,6 +35,13 @@ export const createAdminSchema = joi
     role: joi
       .string()
       .valid(...Object.values(Role))
-      .required(),
-    gender: joi.string().empty().required(),
+      .optional().messages({
+        "string.base": "please enter a valid role",
+        "string.empty": "role cannot be empty"
+      }),
+    gender: joi.string().empty().required().messages({
+      "string.base": "please enter a valid gender",
+      "any.required": "gender must be entered",
+      "string.empty": "gender cannot be empty"
+    })
   });

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

@@ -2,7 +2,7 @@ import { jwtHelper } from "../../../../helpers/jwt.helper";
 import { bodyValidator } from "../../../../helpers/validation.helper";
 import { BaseController } from "../../../../lib/controllers/controller.base";
 import { Prefix } from "../../../common/decorators/prefix.decorator";
-import { userRegisterValidation } from "../../../common/users/validation/user.baseValidation";
+import { userRegisterValidation } from "../../../common/users/validation/user-register.validation";
 import { UsersService } from "../services/users.service";
 
 const allowedRoles = ["superAdmin", "admin"];

src/modules/console/users/validation/admin.userValidation.ts

@@ -1,5 +0,0 @@
-import { userBaseValidation } from '../../../common/users/validation/user.baseValidation';
-
-export class adminUserValidation extends userBaseValidation {
-
-}

src/modules/user/auth/controllers/auth.controller.ts

@@ -3,7 +3,7 @@ import { jwtHelper } from "../../../../helpers/jwt.helper";
 import { BaseController } from "../../../../lib/controllers/controller.base";
 import { Prefix } from "../../../common/decorators/prefix.decorator";
 import { bodyValidator } from "../../../../helpers/validation.helper";
-import { userRegisterValidation } from "../../../common/users/validation/user.baseValidation";
+import { userRegisterValidation } from "../../../common/users/validation/user-register.validation";
 import { loginValidation } from "../validation/user.Validation";
 
 @Prefix("/user/auth")