Merge pull request #17 from Modarb-Ai-Trainer/update

package-lock.json

@@ -1143,6 +1143,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
       "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "dev": true,
       "engines": {
         "node": ">=4"
       }
@@ -1777,6 +1778,7 @@
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
       "integrity": "sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==",
+      "dev": true,
       "dependencies": {
         "abbrev": "1"
       },
@@ -5009,6 +5011,7 @@
       "version": "5.5.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
       "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dev": true,
       "dependencies": {
         "has-flag": "^3.0.0"
       },

src/modules/common/users/enums/roles.enum.ts

@@ -0,0 +1,45 @@
+export enum Role {
+  USER = "user"
+}
+export enum Gender {
+  MALE = "male",
+  FEMALE = "female"
+}
+export enum FitnessLevel {
+  BEGINNER = "beginner",
+  INTERMEDIATE = "intermediate",
+  ADVANCED = "advanced"
+}
+export enum FitnessGoal {
+  LOSE_WEIGHT = "lose weight",
+  GAIN_MUSCLE = "gain muscle",
+  GET_FITTER = "get fitter"
+}
+export enum WorkoutPlace {
+  GYM = "gym",
+  HOME = "home",
+  BOTH = "both"
+}
+export enum PreferredDay {
+  SATURDAY = "saturday",
+  SUNDAY = "sunday",
+  MONDAY = "monday",
+  TUESDAY = "tuesday",
+  WEDNESDAY = "wednesday",
+  THURSDAY = "thursday",
+  FRIDAY = "friday"
+}
+export enum PreferredEquipment {
+  BARBELLS = "barbells",
+  DUMBBELLS = "dumbbells",
+  GYM_MACHINES = "gym machines",
+  RESISTANCE_BAND = "resistance band",
+  BODYWEIGHT = "bodyweight"
+}
+export enum Injurie {
+  NECK = "neck",
+  SHOULDERS = "shoulders",
+  BACK = "back",
+  ARMS = "arms",
+  KNEES = "knees"
+}

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 → user-register.validation.ts}

@@ -1,4 +1,5 @@
-import joi from "joi";
+import * as joi from "joi";
+import { Role, Gender, FitnessLevel, FitnessGoal, WorkoutPlace, PreferredDay, PreferredEquipment, Injurie } from "../enums/roles.enum";
 
 export const userRegisterValidation = joi
   .object()
@@ -45,7 +46,7 @@ export const userRegisterValidation = joi
           "string.base": "please enter a valid public_id",
         }),
       }),
-    gender: joi.string().empty().required().messages({
+    gender: joi.string().valid(...Object.values(Gender)).empty().required().messages({
       "string.base": "please enter a valid gender",
       "any.required": "gender must be entered",
       "string.empty": "gender cannot be empty",
@@ -60,7 +61,7 @@ export const userRegisterValidation = joi
       "any.required": "weight must be entered",
       "number.empty": "weight cannot be empty",
     }),
-    fitness_level: joi.string().empty().required().messages({
+    fitness_level: joi.string().valid(...Object.values(FitnessLevel)).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",
@@ -69,7 +70,7 @@ export const userRegisterValidation = joi
       .object()
       .optional()
       .keys({
-        fitness_goal: joi.string().empty().required().messages({
+        fitness_goal: joi.string().valid(...Object.values(FitnessGoal)).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",
@@ -86,6 +87,7 @@ export const userRegisterValidation = joi
         }),
         preferred_days: joi
           .array()
+          .valid(...Object.values(PreferredDay))
           .empty()
           .required()
           .items(
@@ -95,13 +97,14 @@ export const userRegisterValidation = joi
               "string.empty": "preferred_days cannot be empty",
             })
           ),
-        workout_place: joi.string().empty().required().messages({
+        workout_place: joi.string().valid(...Object.values(WorkoutPlace)).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()
+          .valid(...Object.values(PreferredEquipment))
           .empty()
           .required()
           .items(
@@ -114,6 +117,7 @@ export const userRegisterValidation = joi
       }),
     injuries: joi
       .array()
+      .valid(...Object.values(Injurie))
       .empty()
       .required()
       .items(
@@ -126,4 +130,11 @@ export const userRegisterValidation = joi
     dob: joi.date().empty().optional().messages({
       "date.base": "please enter a valid date",
     }),
+    role: joi
+      .string()
+      .valid(...Object.values(Role))
+      .optional().messages({
+        "string.base": "please enter a valid role",
+        "string.empty": "role cannot be empty"
+      }),
   });

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")

src/routes.ts

@@ -35,15 +35,19 @@ const setCustomRoutes = (router: Router) => {
 /* importing all controllers */
 
 const findControllerFiles = (): string[] => {
-  return glob.sync(path.join(__dirname, "**/*.controller.{ts,js}"));
+  return glob.sync("**/*.controller.ts", {}).map((file) => {
+    return path.resolve(file);
+  });
 };
 
 const importControllers = async (router: Router) => {
   const files = findControllerFiles();
 
+
   await Promise.all(
     files.map(async (file) => {
       const controllerClass = await importController(file);
+
       if (!controllerClass) return;
       const controller: BaseController = new (controllerClass as any)();
       controller.setRoutes();