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

@@ -0,0 +1,140 @@
+import * as joi from "joi";
+import { Role, Gender, FitnessLevel, FitnessGoal, WorkoutPlace, PreferredDay, PreferredEquipment, Injurie } from "../enums/roles.enum";
+
+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().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",
+    }),
+    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().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",
+    }),
+    preferences: joi
+      .object()
+      .optional()
+      .keys({
+        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",
+        }),
+        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()
+          .valid(...Object.values(PreferredDay))
+          .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().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(
+            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()
+      .valid(...Object.values(Injurie))
+      .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",
+    }),
+    role: joi
+      .string()
+      .valid(...Object.values(Role))
+      .optional().messages({
+        "string.base": "please enter a valid role",
+        "string.empty": "role cannot be empty"
+      }),
+  });

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();