refactor(#410): (#411)

- implement codebase refactoring

Author: Yvan-David

src/models/profile.model.ts

@@ -15,24 +15,6 @@ const ActivitySchema = new mongoose.Schema({
 
 const profileSchema = new Schema(
   {
-    firstName: {
-      type: String,
-    },
-    lastName: {
-      type: String,
-    },
-    address: {
-      type: String,
-    },
-    city: {
-      type: String,
-    },
-    country: {
-      type: String,
-    },
-    phoneNumber: {
-      type: String,
-    },
     biography: {
       type: String,
     },
@@ -42,12 +24,6 @@ const profileSchema = new Schema(
     cover: {
       type: String,
     },
-    gender: {
-      type: String,
-    },
-    dateOfBirth: {
-      type: Date,
-    },
     activity: [ActivitySchema],
     user: {
       type: mongoose.Types.ObjectId,
@@ -68,9 +44,5 @@ const profileSchema = new Schema(
   }
 )
 
-profileSchema.virtual('name').get(function () {
-  return this.firstName + ' ' + this.lastName
-})
-
 const Profile = mongoose.model('Profile', profileSchema)
 export { Profile }

src/models/user.ts

@@ -7,23 +7,34 @@ export interface UserStatus {
   reason?: string
   date?: Date
 }
-
-export interface UserInterface {
+export interface OrgUserDataInterface{
   _id: mongoose.Types.ObjectId;
-  email: string;
-  password: string;
+  orgId: mongoose.Types.ObjectId;
   role: string;
   team?: mongoose.Types.ObjectId;
   status: UserStatus;
   cohort?: mongoose.Types.ObjectId;
   program?: mongoose.Types.ObjectId;
-  organizations: string[];
+  phase?: mongoose.Types.ObjectId;
   pushNotifications: boolean;
   emailNotifications: boolean;
-  profile?: mongoose.Types.ObjectId;
   ratings?: mongoose.Types.ObjectId[];
 }
 
+export interface UserInterface {
+  _id: mongoose.Types.ObjectId;
+  email: string;
+  password: string;
+  organizations: mongoose.Types.ObjectId[];
+  firstName: String;
+  lastName: String;
+  name: String;
+  address: String;
+  city: String;
+  country: String;
+  phoneNumber: String;
+}
+
 export enum RoleOfUser {
   TRAINEE = 'trainee',
   COORDINATOR = 'coordinator',
@@ -40,6 +51,56 @@ mongoose.set('toJSON', {
   },
 })
 
+const orgUserDataSchema = new Schema({
+  orgId: {
+    type: mongoose.Types.ObjectId,
+    required: true,
+    ref: 'Organization',
+  },
+  role: {
+    type: String,
+    default: 'user',
+  },
+  team: {
+    type: mongoose.Types.ObjectId,
+    required: false,
+    ref: 'Team',
+  },
+  status: {
+    status: {
+      type: String,
+      enum: ['active', 'drop', 'suspended'],
+      default: 'active',
+    },
+    reason: String,
+    date: {
+      type: Date,
+    },
+  },
+  cohort: {
+    type: mongoose.Types.ObjectId,
+    required: false,
+    ref: 'Cohort',
+  },
+  program: {
+    type: mongoose.Types.ObjectId,
+    required: false,
+    ref: 'Program',
+  },
+  phase: {
+    type: mongoose.Types.ObjectId,
+    required: false,
+    ref: 'Phase',
+  },
+  pushNotifications: {
+    type: Boolean,
+    default: true,
+  },
+  emailNotifications: {
+    type: Boolean,
+    default: true,
+  },
+})
 const userSchema = new Schema(
   {
     email: {
@@ -51,47 +112,33 @@ const userSchema = new Schema(
       type: String,
       required: true,
     },
-    role: {
+    organizations: {
+      type: [orgUserDataSchema],
+      required: true,
+    },
+    firstName: {
       type: String,
-      default: 'user',
     },
-    team: {
-      type: mongoose.Types.ObjectId,
-      required: false,
-      ref: 'Team',
+    lastName: {
+      type: String,
     },
-    status: {
-      status: {
-        type: String,
-        enum: ['active', 'drop', 'suspended'],
-        default: 'active',
-      },
-      reason: String,
-      date: {
-        type: Date,
-      },
+    address: {
+      type: String,
     },
-    cohort: {
-      type: mongoose.Types.ObjectId,
-      required: false,
-      ref: 'Cohort',
+    city: {
+      type: String,
     },
-    program: {
-      type: mongoose.Types.ObjectId,
-      required: false,
-      ref: 'Program',
+    country: {
+      type: String,
     },
-    organizations: {
-      type: [String],
-      required: true,
+    phoneNumber: {
+      type: String,
     },
-    pushNotifications: {
-      type: Boolean,
-      default: true,
+    gender: {
+      type: String,
     },
-    emailNotifications: {
-      type: Boolean,
-      default: true,
+    dateOfBirth: {
+      type: Date,
     },
   },
 
@@ -101,6 +148,10 @@ const userSchema = new Schema(
   }
 )
 
+userSchema.virtual('name').get(function () {
+  return this.firstName + ' ' + this.lastName
+})
+
 userSchema.virtual('profile', {
   ref: 'Profile',
   foreignField: 'user',
@@ -149,5 +200,6 @@ const UserRole = mongoose.model(
 )
 
 const User = model('User', userSchema)
+const OrgUserData = model('OrgUserData', orgUserDataSchema)
 
-export { User, UserRole }
+export { User, UserRole, OrgUserData }

src/schema/index.ts

@@ -69,18 +69,16 @@ const Schema = gql`
   }
   type User {
     id: ID!
-    role: String!
     email: String!
     password: String!
-    profile: Profile
-    team: Team
-    cohort: Cohort
-    program: Program
-    organizations: [String!]!
-    pushNotifications: Boolean!
-    emailNotifications: Boolean!
-    status: StatusType
-    ratings: [Rating]
+    organizations: [OrgUserData!]!
+    firstName: String
+    lastName: String
+    name: String
+    address: String
+    city: String
+    country: String
+    phoneNumber: String
   }
   input RegisterInput {
     email: String!
@@ -112,13 +110,6 @@ const Schema = gql`
     id: ID!
     user: User!
     activity: [Activity]
-    firstName: String
-    lastName: String
-    name: String
-    address: String
-    city: String
-    country: String
-    phoneNumber: String
     biography: String
     avatar: String
     cover: String
@@ -166,6 +157,21 @@ const Schema = gql`
     activeRepos: [String]
   }
 
+  type OrgUserData {
+    id: ID!
+    orgId: Organization!
+    role: String!
+    profile: Profile
+    program: Program
+    phase: Phase
+    cohort: Cohort
+    team: Team
+    status: StatusType
+    ratings: [Rating]
+    pushNotifications: Boolean!
+    emailNotifications: Boolean!
+  }
+
   type GitHubActivity {
     totalCommits: String!
     pullRequest: pullRequest!