Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/controllers/department.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,12 @@ export const createDepartment = async (req, res, next) => {
const manager = await prisma.user.findFirst({
where: {
id: managerId,
organizationId, // this line checks the manager is in the same org
deletedAt: null,
},
});
//TODO: Check if the manager belongs to the same organization

// Check if the manager is already assigned to another department
Comment thread
Kimoo193 marked this conversation as resolved.
if (!manager) {
return res.status(404).json({
message: 'Manager not found or does not belong to this organization',
Expand Down Expand Up @@ -258,7 +260,7 @@ export const updateDepartment = async (req, res, next) => {
const userInOrg = await prisma.user.findFirst({
where: {
id: userId,
departmentId: department.id, // Fixed this line
organizationId: department.organizationId, // Fixed this line
deletedAt: null,
},
select: {
Expand Down
14 changes: 7 additions & 7 deletions src/routes/department.routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,46 +19,46 @@ const router = express.Router();

// Admin, OWNER, or MANAGER can access these
router.get(
'/api/department/all',
'/api/departments/all',
verifyAccessToken,
verifyManagerPermission,
getAllDepartments,
);

router.post(
'/api/department/create',
'/api/departments/create',
verifyAccessToken,
verifyManagerPermission,
validateCreateDepartment,
createDepartment,
);

router.get(
'/api/department/:id',
'/api/departments/:id',
verifyAccessToken,
verifyManagerPermission,
getDepartmentById,
);

router.put(
'/api/department/:id',
'/api/departments/:id',
verifyAccessToken,
verifyManagerPermission,
validateUpdateDepartment,
updateDepartment,
);

router.delete(
'/api/department/:id',
'/api/departments/:id',
verifyAccessToken,
verifyOwnerOrAdmin,
softDeleteDepartment,
);

router.patch(
'/api/department/:id/restore',
'/api/departments/:id/restore',
verifyAccessToken,
verifyOwnerOrAdmin, // Use your existing middleware
verifyOwnerOrAdmin,
restoreDepartment,
);
export default router;