Merge pull request #6 from Modarb-Ai-Trainer/test

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

@@ -2,25 +2,95 @@ import mongoose from "mongoose";
 import bcrypt from "bcrypt";
 export const saltrounds = 5;
 const { Schema } = mongoose;
+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"
+}
 
 const userSchema = new Schema({
     name: { type: String, required: true },
     email: { type: String, required: true, unique: true, dropDups: true },
     password: { type: String, required: true },
-    image: { type: Object, default: {} },
-    gender: { type: String, required: true },
+    image: { type: String },
+    gender: {
+        type: String,
+        enum: Gender,
+        required: true
+    },
     height: { type: Number, required: true },
     weight: { type: Number, required: true },
-    fitness_level: { type: Number, required: true },
-    preferences: { 
-        fitness_goal: { type: Number, required: true },
+    fitness_level: {
+        type: String,
+        enum: FitnessLevel,
+        required: true
+    },
+    preferences: {
+        fitness_goal: {
+            type: String,
+            enum: FitnessGoal,
+            required: true
+        },
         target_weight: { type: Number, required: true },
         workout_frequency: { type: Number, required: true },
-        preferred_days: [{ type: String, required: true }],
-        workout_place: { type: String, required: true },
-        preferred_equipments: { type: String, required: true }
+        preferred_days: [{
+            type: String,
+            enum: PreferredDay,
+            required: true
+        }],
+        workout_place: {
+            type: String,
+            enum: WorkoutPlace,
+            required: true
+        },
+        preferred_equipment: [{
+            type: String,
+            enum: PreferredEquipment,
+            required: true
+        }]
     },
-    injuries: [{ type: String, required: true }],
+    injuries: [{
+        type: String,
+        enum: Injurie,
+        required: true
+    }],
     dob: { type: Date }
 });
 

src/modules/common/User/services/user.base.service.ts

@@ -0,0 +1,88 @@
+import { userModel, } from '../models/user.model'
+
+
+export class UserBaseService {
+  static async find(filterObject) {
+    try {
+      const resultObject = await userModel.findOne(filterObject).lean();
+
+      if (!resultObject)
+        return {
+          success: false,
+          code: 404,
+          error: "No Matching Result Found.",
+        };
+
+      return {
+        success: true,
+        code: 200,
+        result: resultObject,
+      };
+    } catch (err) {
+      console.log(`err.message`, err.message);
+      return {
+        success: false,
+        code: 500,
+        error: "Unexpected Error Happened.",
+      };
+    }
+  }
+
+  static async get(filterObject) {
+    try {
+      const resultObject = await userModel.findOne(filterObject).lean().select("-password");
+      if (!resultObject)
+        return {
+          success: false,
+          code: 404,
+          error: "No Matching Result Found.",
+        };
+      return {
+        success: true,
+        code: 200,
+        result: resultObject,
+      };
+    } catch (err) {
+      console.log(`err.message`, err.message);
+      return {
+        success: false,
+        code: 500,
+        error: "Unexpected Error Happened.",
+      };
+    }
+  }
+
+  static async list(filterObject) {
+    try {
+      const resultArray = await userModel
+        .find(filterObject)
+        .lean()
+        .select("-password");
+
+      if (!resultArray)
+        return {
+          success: false,
+          code: 404,
+          error: "No Matching Result Found.",
+        };
+      const count = await userModel.countDocuments(filterObject);
+      return {
+        success: true,
+        code: 200,
+        result: resultArray,
+        count,
+      };
+    } catch (err) {
+      console.log(`err.message`, err.message);
+      return {
+        success: false,
+        code: 500,
+        error: "Unexpected Error Happened.",
+      };
+    }
+  }
+
+}
+
+
+

src/modules/console/Admin/models/admin.model.ts

@@ -2,16 +2,19 @@ import mongoose from "mongoose";
 import bcrypt from "bcrypt";
 export const saltrounds = 5;
 const { Schema } = mongoose;
-
+enum Role {
+    SUPER_ADMIN= "superAdmin",
+    ADMIN= "admin"
+}
 const adminSchema = new Schema({
     name: { type: String, required: true },
     email: { type: String, required: true, unique: true, dropDups: true },
     password: { type: String, required: true },
     image: { type: Object, default: {} },
+    permission: { type: Object, required: true },
     role: {
         type: String,
-        enum: ["superAdmin", "admin"],
-        default: "admin"
+        enum: Role
     },
     gender: { type: String, required: true },
     dob: { type: Date }

src/modules/console/Admin/services/admin.service.ts

@@ -31,7 +31,7 @@ export class AdminService {
 
   static async get(filterObject) {
     try {
-      const resultObject = await adminModel.findOne(filterObject).lean();
+      const resultObject = await adminModel.findOne(filterObject).lean().select("-password");
       if (!resultObject)
         return {
           success: false,

src/modules/console/User/services/user.service.ts

@@ -0,0 +1,10 @@
+import { UserBaseService } from "../../../common/User/services/user.base.service";
+
+
+
+export class userService extends UserBaseService {
+
+}
+
+
+