From 5722af213c4d96c2e0626d5c6ba96d54131c6d83 Mon Sep 17 00:00:00 2001 From: Sibunnayak Date: Fri, 2 Aug 2024 10:27:01 +0530 Subject: [PATCH] update --- middlewares/SalesCoOrdinatorAuth.js | 2 +- middlewares/TerritoryManagerAuth.js | 2 +- resources/Attendance/AttendanceModel.js | 2 +- resources/Leaves/LeaveModel.js | 33 ++++++++++++++----------- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/middlewares/SalesCoOrdinatorAuth.js b/middlewares/SalesCoOrdinatorAuth.js index 3907929..3aa7eb6 100644 --- a/middlewares/SalesCoOrdinatorAuth.js +++ b/middlewares/SalesCoOrdinatorAuth.js @@ -22,7 +22,7 @@ export const isAuthenticatedSalesCoOrdinator = async (req, res, next) => { const salescoordinator = await SalesCoOrdinator.findById(decoded.id); if (salescoordinator) { req.user = salescoordinator; - req.userType = "SalesCoOrdinator"; + req.userType = "Sales Coordinator"; return next(); } else { return res.status(401).json({ diff --git a/middlewares/TerritoryManagerAuth.js b/middlewares/TerritoryManagerAuth.js index ab6771e..983e2cc 100644 --- a/middlewares/TerritoryManagerAuth.js +++ b/middlewares/TerritoryManagerAuth.js @@ -22,7 +22,7 @@ export const isAuthenticatedTerritoryManager = async (req, res, next) => { const territorymanager = await TerritoryManager.findById(decoded.id); if (territorymanager) { req.user = territorymanager; - req.userType = 'TerritoryManager'; + req.userType = 'Territory Manager'; return next(); } else { return res.status(401).json({ diff --git a/resources/Attendance/AttendanceModel.js b/resources/Attendance/AttendanceModel.js index ec7e7fb..77de613 100644 --- a/resources/Attendance/AttendanceModel.js +++ b/resources/Attendance/AttendanceModel.js @@ -29,7 +29,7 @@ const attendanceSchema = new mongoose.Schema({ userType: { type: String, required: true, - enum: ['SalesCoOrdinator', 'TerritoryManager'], + enum: ["Sales Coordinator", "Territory Manager"], }, records: [attendanceRecordSchema], }, { timestamps: true, versionKey: false }); diff --git a/resources/Leaves/LeaveModel.js b/resources/Leaves/LeaveModel.js index 6a84dbb..a92bf27 100644 --- a/resources/Leaves/LeaveModel.js +++ b/resources/Leaves/LeaveModel.js @@ -1,4 +1,4 @@ -import mongoose from 'mongoose'; +import mongoose from "mongoose"; // Define leave record schema const leaveRecordSchema = new mongoose.Schema({ @@ -21,23 +21,26 @@ const leaveRecordSchema = new mongoose.Schema({ leaveType: { type: String, required: true, - enum: ['Sick Leave', 'Casual Leave'], + enum: ["Sick Leave", "Casual Leave"], }, }); // Define main leave schema -const leaveSchema = new mongoose.Schema({ - userId: { - type: mongoose.Schema.Types.ObjectId, - refPath: 'userType', - required: true, +const leaveSchema = new mongoose.Schema( + { + userId: { + type: mongoose.Schema.Types.ObjectId, + refPath: "userType", + required: true, + }, + userType: { + type: String, + required: true, + enum: ["Sales Coordinator", "Territory Manager"], + }, + records: [leaveRecordSchema], }, - userType: { - type: String, - required: true, - enum: ['SalesCoOrdinator', 'TerritoryManager'], - }, - records: [leaveRecordSchema], -}, { timestamps: true, versionKey: false }); + { timestamps: true, versionKey: false } +); -export const Leave = mongoose.model('Leave', leaveSchema); +export const Leave = mongoose.model("Leave", leaveSchema);