deleteUser, updateUserRole, requestOrganization, types, validations, fixed helpers

Author: shema-surge

package-lock.json

@@ -88,7 +88,8 @@
     "ts-node-dev": "^2.0.0",
     "tslog": "^4.9.2",
     "ws": "^8.11.0",
-    "xlsx": "^0.18.5"
+    "xlsx": "^0.18.5",
+    "zod": "^3.23.8"
   },
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.1",

package.json

@@ -1,7 +1,8 @@
 import { GraphQLError } from 'graphql'
 import 'dotenv/config'
 import { JwtPayload, verify } from 'jsonwebtoken'
-import { Organization } from '../models/organization.model'
+import { IOrganization, Organization } from '../models/organization.model'
+import { OrgUserDataInterface, UserInterface } from '../models/user'
 
 export async function checkLoggedInOrganization(token?: string) {
   const SECRET = process.env.SECRET as string
@@ -50,3 +51,15 @@ export async function checkLoggedInOrganization(token?: string) {
     }
   }
 }
+
+export function isPartOfOrganization(user: UserInterface, org: IOrganization): OrgUserDataInterface{
+  const orgUserData = user.organizations.find(data=>data.orgId.toString()===org._id.toString())
+  if(!orgUserData){
+    throw new GraphQLError(`User ${user.email} is not part of ${org.name}`,{
+      extensions: {
+        code: "FORBIDDEN"
+      }
+    })
+  }
+  return orgUserData
+}

src/helpers/organization.helper.ts

@@ -27,7 +27,7 @@ export const emailExpression =
 export async function checkUserLoggedIn(
   org: IOrganization,
   context: Context
-): Promise<(a?: Array<string>) => {user: UserInterface, orgUserData: OrgUserDataInterface}> {
+): Promise<(a?: Array<string>) => UserInterface> {
   const { userId, role } = context
 
   if (!userId) {
@@ -76,6 +76,6 @@ export async function checkUserLoggedIn(
       )
     }
 
-    return {user, orgUserData}
+    return user
   }
 }

src/helpers/user.helpers.ts

@@ -1,9 +1,9 @@
-import mongoose, { Schema } from 'mongoose'
+import mongoose, { Schema, Document } from 'mongoose'
 import { User } from './user'
 import { PhaseInterface } from './phase.model';
 
-export interface CohortInterface {
-  _id: mongoose.Types.ObjectId;
+export interface CohortInterface extends Document {
+  id?: string;
   name: string;
   phase: PhaseInterface;
   coordinator: mongoose.Types.ObjectId;
@@ -24,21 +24,20 @@ const cohortSchema = new Schema(
       required: true,
     },
     phase: {
-      type: mongoose.Types.ObjectId,
+      type: Schema.Types.ObjectId,
       required: true,
       ref: 'Phase',
     },
     coordinator: {
-      type: mongoose.Types.ObjectId,
+      type: Schema.Types.ObjectId,
       ref: 'User',
-      required: true,
     },
     members: {
-      type: [mongoose.Types.ObjectId],
+      type: [Schema.Types.ObjectId],
       ref: 'User',
     },
     program: {
-      type: mongoose.Types.ObjectId,
+      type: Schema.Types.ObjectId,
       required: true,
       ref: 'Program',
     },
@@ -59,7 +58,7 @@ const cohortSchema = new Schema(
       type: Date,
     },
     organization: {
-      type: mongoose.Types.ObjectId,
+      type: Schema.Types.ObjectId,
       ref: 'Organization',
       required: true,
     },

src/models/cohort.model.ts

@@ -16,6 +16,7 @@ interface IActivity extends mongoose.Types.Subdocument{
 
 export interface IProfile extends Document{
   id?: string,
+  orgId: mongoose.Types.ObjectId,
   biography?: string,
   avatar?: string,
   cover?: string,
@@ -40,6 +41,11 @@ const ActivitySchema = new mongoose.Schema({
 
 const profileSchema = new Schema(
   {
+    orgId: {
+      type: Schema.Types.ObjectId,
+      ref: 'Organization',
+      required: true,
+    },
     biography: {
       type: String,
     },
@@ -51,7 +57,7 @@ const profileSchema = new Schema(
     },
     activity: [ActivitySchema],
     user: {
-      type: mongoose.Types.ObjectId,
+      type: Schema.Types.ObjectId,
       ref: 'User',
       required: true,
     },

src/models/profile.model.ts

@@ -15,7 +15,6 @@ const programSchema = new Schema(
     manager: {
       type: mongoose.Types.ObjectId,
       ref: 'User',
-      required: true,
     },
     organization: {
       type: mongoose.Types.ObjectId,

src/models/program.model.ts

@@ -4,7 +4,7 @@ import { CohortInterface } from './cohort.model';
 import { PhaseInterface } from './phase.model';
 
 export interface TeamInterface {
-  _id: mongoose.Types.ObjectId;
+  id?: string;
   name: string;
   cohort?: CohortInterface;
   phase?: PhaseInterface;
@@ -23,15 +23,15 @@ const teamSchema = new Schema(
       required: true,
     },
     cohort: {
-      type: mongoose.Types.ObjectId,
+      type: Schema.Types.ObjectId,
       ref: 'Cohort',
     },
     ttl: {
-      type: mongoose.Types.ObjectId,
+      type: Schema.Types.ObjectId,
       ref: 'User',
     },
     members: {
-      type: [mongoose.Types.ObjectId],
+      type: [Schema.Types.ObjectId],
       ref: 'User',
     },
     startingPhase: {
@@ -44,20 +44,20 @@ const teamSchema = new Schema(
       default: true,
     },
     organization: {
-      type: mongoose.Types.ObjectId,
+      type: Schema.Types.ObjectId,
       ref: 'Organization',
       required: true,
     },
     manager: {
-      type: mongoose.Types.ObjectId,
+      type: Schema.Types.ObjectId,
       ref: 'User',
     },
     phase: {
-      type: mongoose.Types.ObjectId,
+      type: Schema.Types.ObjectId,
       ref: 'Phase',
     },
     program: {
-      type: mongoose.Types.ObjectId,
+      type: Schema.Types.ObjectId,
       ref: 'Program',
     },
     isJobActive: {

src/models/team.model.ts

@@ -2,14 +2,14 @@ import bcrypt from 'bcryptjs'
 import mongoose, { model, Schema, Document } from 'mongoose'
 import { Profile } from './profile.model'
 
-enum STATUS_ENUM{
+export enum USER_STATUS_ENUM{
   ACTIVE="active",
   DROP="drop",
   SUSPENDED="suspended"
 }
 
 export interface UserStatus {
-  status: STATUS_ENUM,
+  status: USER_STATUS_ENUM,
   reason?: string,
   date?: Date,
 }
@@ -77,8 +77,8 @@ const orgUserDataSchema = new Schema({
   status: {
     status: {
       type: String,
-      enum: Object.values(STATUS_ENUM),
-      default: STATUS_ENUM.ACTIVE,
+      enum: Object.values(USER_STATUS_ENUM),
+      default: USER_STATUS_ENUM.ACTIVE,
     },
     reason: String,
     date: {