Updated user interface and kodel

Author: Rahad-Ullah

src/DB/seedAdmin.ts

@@ -1,14 +1,14 @@
+import { USER_ROLES } from '../app/modules/user/user.constant';
 import { User } from '../app/modules/user/user.model';
 import config from '../config';
-import { USER_ROLES } from '../enums/user';
 import { logger } from '../shared/logger';
 
 const payload = {
   name: 'Administrator',
   email: config.super_admin.email,
   role: USER_ROLES.SUPER_ADMIN,
   password: config.super_admin.password,
-  verified: true,
+  isVerified: true,
 };
 
 export const seedSuperAdmin = async () => {

src/app/modules/auth/auth.route.ts

@@ -1,9 +1,9 @@
 import express from 'express';
-import { USER_ROLES } from '../../../enums/user';
 import auth from '../../middlewares/auth';
 import validateRequest from '../../middlewares/validateRequest';
 import { AuthController } from './auth.controller';
 import { AuthValidation } from './auth.validation';
+import { USER_ROLES } from '../user/user.constant';
 const router = express.Router();
 
 router.post(

src/app/modules/auth/auth.service.ts

@@ -16,6 +16,7 @@ import cryptoToken from '../../../util/cryptoToken';
 import generateOTP from '../../../util/generateOTP';
 import { ResetToken } from '../resetToken/resetToken.model';
 import { User } from '../user/user.model';
+import { USER_STATUS } from '../user/user.constant';
 
 //login
 const loginUserFromDB = async (payload: ILoginData) => {
@@ -26,15 +27,15 @@ const loginUserFromDB = async (payload: ILoginData) => {
   }
 
   //check verified and status
-  if (!isExistUser.verified) {
+  if (!isExistUser.isVerified) {
     throw new ApiError(
       StatusCodes.BAD_REQUEST,
       'Please verify your account, then try to login again'
     );
   }
 
   //check user status
-  if (isExistUser.status === 'delete') {
+  if (isExistUser.status !== USER_STATUS.ACTIVE) {
     throw new ApiError(
       StatusCodes.BAD_REQUEST,
       'You don’t have permission to access this content.It looks like your account has been deactivated.'
@@ -113,10 +114,13 @@ const verifyEmailToDB = async (payload: IVerifyEmail) => {
   let message;
   let data;
 
-  if (!isExistUser.verified) {
+  if (!isExistUser.isVerified) {
     await User.findOneAndUpdate(
       { _id: isExistUser._id },
-      { verified: true, authentication: { oneTimeCode: null, expireAt: null } }
+      {
+        isVerified: true,
+        authentication: { oneTimeCode: null, expireAt: null },
+      }
     );
     message = 'Email verify successfully';
   } else {

src/enums/user.ts renamed to src/app/modules/user/user.constant.ts

@@ -3,3 +3,8 @@ export enum USER_ROLES {
   ADMIN = 'ADMIN',
   USER = 'USER',
 }
+
+export enum USER_STATUS {
+  ACTIVE = 'ACTIVE',
+  INACTIVE = 'INACTIVE',
+}

src/app/modules/user/user.interface.ts

@@ -1,5 +1,5 @@
 import { Model } from 'mongoose';
-import { USER_ROLES } from '../../../enums/user';
+import { USER_ROLES, USER_STATUS } from './user.constant';
 
 export type IUser = {
   name: string;
@@ -9,8 +9,8 @@ export type IUser = {
   password: string;
   location: string;
   image?: string;
-  status: 'active' | 'delete';
-  verified: boolean;
+  status: USER_STATUS;
+  isVerified: boolean;
   authentication?: {
     isResetPassword: boolean;
     oneTimeCode: number;

src/app/modules/user/user.model.ts

@@ -2,9 +2,9 @@ import bcrypt from 'bcrypt';
 import { StatusCodes } from 'http-status-codes';
 import { model, Schema } from 'mongoose';
 import config from '../../../config';
-import { USER_ROLES } from '../../../enums/user';
 import ApiError from '../../../errors/ApiError';
 import { IUser, UserModal } from './user.interface';
+import { USER_ROLES, USER_STATUS } from './user.constant';
 
 const userSchema = new Schema<IUser, UserModal>(
   {
@@ -35,10 +35,10 @@ const userSchema = new Schema<IUser, UserModal>(
     },
     status: {
       type: String,
-      enum: ['active', 'delete'],
-      default: 'active',
+      enum: Object.values(USER_STATUS),
+      default: USER_STATUS.ACTIVE,
     },
-    verified: {
+    isVerified: {
       type: Boolean,
       default: false,
     },

src/app/modules/user/user.route.ts

@@ -1,10 +1,10 @@
 import express, { NextFunction, Request, Response } from 'express';
-import { USER_ROLES } from '../../../enums/user';
 import auth from '../../middlewares/auth';
 import validateRequest from '../../middlewares/validateRequest';
 import { UserController } from './user.controller';
 import { UserValidation } from './user.validation';
 import fileUploadHandler from '../../middlewares/fileUploadHandler';
+import { USER_ROLES } from './user.constant';
 const router = express.Router();
 
 router

src/app/modules/user/user.service.ts

@@ -1,13 +1,13 @@
 import { StatusCodes } from 'http-status-codes';
 import { JwtPayload } from 'jsonwebtoken';
-import { USER_ROLES } from '../../../enums/user';
 import ApiError from '../../../errors/ApiError';
 import { emailHelper } from '../../../helpers/emailHelper';
 import { emailTemplate } from '../../../shared/emailTemplate';
 import unlinkFile from '../../../shared/unlinkFile';
 import generateOTP from '../../../util/generateOTP';
 import { IUser } from './user.interface';
 import { User } from './user.model';
+import { USER_ROLES } from './user.constant';
 
 const createUserToDB = async (payload: Partial<IUser>): Promise<IUser> => {
   //set role

src/app/modules/user/user.validation.ts

@@ -1,4 +1,5 @@
 import { z } from 'zod';
+import { USER_ROLES, USER_STATUS } from './user.constant';
 
 const createUserZodSchema = z.object({
   body: z.object({
@@ -18,6 +19,8 @@ const updateUserZodSchema = z.object({
   password: z.string().optional(),
   location: z.string().optional(),
   image: z.string().optional(),
+  role: z.nativeEnum(USER_ROLES).optional(),
+  status: z.nativeEnum(USER_STATUS).optional(),
 });
 
 export const UserValidation = {