fix: crud user

controllers/users.controller.js

@@ -1,6 +1,6 @@
-const UserService = require('../services/user.service');
-const { setResponse, setResponsePaging, checkValidate } = require('../helpers/utils');
-const { userSchema, newPasswordSchema } = require('../validate/user.schema');
+const UserService = require("../services/user.service");
+const { setResponse, setResponsePaging, checkValidate } = require("../helpers/utils");
+const { userSchema, updateUserSchema, newPasswordSchema } = require("../validate/user.schema");
 
 class UserController {
   // Get all users
@@ -8,7 +8,7 @@ class UserController {
     const queryParams = req.query;
 
     const results = await UserService.getAllUsers(queryParams);
-    const response = await setResponsePaging(queryParams, results, 'Users retrieved successfully');
+    const response = await setResponsePaging(queryParams, results, 'Users found');
 
     res.status(response.statusCode).json(response);
   }
@@ -18,7 +18,7 @@ class UserController {
     const { id } = req.params;
 
     const results = await UserService.getUserById(id);
-    const response = await setResponse(results, 'User retrieved successfully');
+    const response = await setResponse(results, 'User found');
 
     res.status(response.statusCode).json(response);
   }
@@ -42,13 +42,14 @@ class UserController {
   // Update user
   static async update(req, res) {
     const { id } = req.params;
-    const { error, value } = await checkValidate(userSchema, req);
+
+    const { error, value } = await checkValidate(updateUserSchema, req);
 
     if (error) {
       return res.status(400).json(setResponse(error, 'Validation failed', 400));
     }
 
-    value.updated_by = req.user.user_id;
+    value.userId = req.user.user_id;
 
     const results = await UserService.updateUser(id, value);
     const response = await setResponse(results, 'User updated successfully');
@@ -56,6 +57,17 @@ class UserController {
     res.status(response.statusCode).json(response);
   }
 
+  // Approve user
+  static async approve(req, res) {
+    const { id } = req.params;
+    const approverId = req.user.user_id;
+
+    const updatedUser = await UserService.approveUser(id, approverId);
+    const response = await setResponse(updatedUser, 'User approved successfully');
+
+    return res.status(response.statusCode).json(response);
+  }
+
   // Soft delete user
   static async delete(req, res) {
     const { id } = req.params;
@@ -66,7 +78,7 @@ class UserController {
     res.status(response.statusCode).json(response);
   }
 
-  // Change user password
+  // Change password
   static async changePassword(req, res) {
     const { id } = req.params;
     const { error, value } = await checkValidate(newPasswordSchema, req);
@@ -80,25 +92,6 @@ class UserController {
 
     res.status(response.statusCode).json(response);
   }
-
-  // Get all status users
-  static async getAllStatus(req, res) {
-    const results = await UserService.getAllStatusUsers();
-    const response = await setResponse(results, 'Status list retrieved successfully');
-
-    res.status(response.statusCode).json(response);
-  }
-
-  // Approve user
-  static async approve(req, res) {
-    const { id } = req.params;
-    const approverId = req.user?.user_id || null;
-
-    const results = await UserService.approveUser(id, approverId);
-    const response = await setResponse(results, 'User approved successfully');
-
-    res.status(response.statusCode).json(response);
-  }
 }
 
 module.exports = UserController;