Merge pull request #28 from muke78/dev

muke78 · web-flow · commit d4f441f9cef1 · 2025-05-15T02:17:48.000-06:00
Deploy: Mejoramiento de errores de consistencia de modulos mejorados y respuestas http
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -4,9 +4,9 @@ name: Node.js CI
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
   pull_request:
-    branches: [ "main", "dev" ]
+    branches: ["main", "dev"]
 
 jobs:
   build:
@@ -25,7 +25,7 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
-          cache: 'yarn'
+          cache: "yarn"
 
       - name: 📦 Instalar dependencias
         run: yarn install
diff --git a/README.md b/README.md
@@ -16,6 +16,7 @@
 - **Google Auth Libary** 🔡 (Login con google)
 - **Argon2** 🔒 (Hash de contraseñas)
 - **JWT** 🔑 (Autenticación)
+- **Jest y Frisby** 🧪 (Pruebas de las API)
 - **Swagger & Swagger-UI** 📚 (Documentación de la API)
 - **Express Rate Limit** ⏱️ (Limitación de peticiones)
 - **Helmet** 🛡️ (Seguridad en headers HTTP)
diff --git a/server.js b/server.js
@@ -58,7 +58,7 @@ server.on("error", (error) => {
   }
 });
 
-server.listen(PORT, () => {
+server.listen(currentPort, () => {
   console.log(
     `🟢 Server is listening on port localhost:${server.address().port}`,
   );
diff --git a/src/__tests__/users/apiRegisterUser.test.js b/src/__tests__/users/apiRegisterUser.test.js
@@ -20,7 +20,6 @@ describe("✅ Prueba para registrar un usuario", () => {
         nameUser: "apiTESTRegister",
         email: uniqueEmail,
         password: "123456788u02kljfLK",
-        role: "user",
       })
       .then((res) => {
         // console.log("🔎 STATUS:", res.status);
diff --git a/src/controllers/users/functions/deleteUser.js b/src/controllers/users/functions/deleteUser.js
@@ -16,15 +16,9 @@ export const EliminarUsuario = async (req, res) => {
       message: `El usuario ${deletedUser.NameUser} fue eliminado correctamente`,
     });
   } catch (error) {
-    if (error.status === 400)
-      return methodIncorrect(req, res, "Faltan campos requeridos");
-    if (error.status === 404)
-      return methodNotFound(
-        req,
-        res,
-        "No se encontro el id del usuario que se quiere eliminar",
-      );
-    return methodError(req, res, error);
+    if (error.status === 400) return methodIncorrect(req, res, error.message);
+    if (error.status === 404) return methodNotFound(req, res, error.message);
+    return methodError(req, res, { message: error });
   }
 };
 
@@ -36,8 +30,7 @@ export const DeleteUserBulk = async (req, res) => {
       message: `Se eliminaron ${req.body.ids.length} usuarios correctamente`,
     });
   } catch (error) {
-    if (error.status === 400)
-      return methodIncorrect(req, res, "Faltan campos requeridos");
-    return methodError(req, res, error);
+    if (error.status === 400) return methodIncorrect(req, res, error.message);
+    return methodError(req, res, { message: error });
   }
 };
diff --git a/src/controllers/users/functions/editUser.js b/src/controllers/users/functions/editUser.js
@@ -21,17 +21,8 @@ export const EditarUsuario = async (req, res) => {
     }
   } catch (error) {
     if (error.status === 409)
-      return methodConflicts(
-        req,
-        res,
-        "El correo ya existe y no se puede actualziar",
-      );
-    if (error.status === 404)
-      return methodNotFound(
-        req,
-        res,
-        "No se proporcionó un ID válido o el usuario no existe",
-      );
-    return methodError(req, res, error);
+      return methodConflicts(req, res, { message: error.message });
+    if (error.status === 404) return methodNotFound(req, res, error.message);
+    return methodError(req, res, { message: error });
   }
 };
diff --git a/src/controllers/users/functions/insertUsers.js b/src/controllers/users/functions/insertUsers.js
@@ -14,11 +14,10 @@ export const InsertarUsario = async (req, res) => {
     const newuser = await insertUserService(req.body);
     return methodCreated(req, res, newuser);
   } catch (error) {
-    if (error.status === 400)
-      return methodIncorrect(req, res, "Faltan campos requeridos");
+    if (error.status === 400) return methodIncorrect(req, res, error.message);
     if (error.status === 409)
-      return methodConflicts(req, res, "El correo ya se encuentra registrado");
-    return methodError(req, res, error);
+      return methodConflicts(req, res, { message: error.message });
+    return methodError(req, res, { message: error });
   }
 };
 
@@ -32,10 +31,9 @@ export const InsertarUsuariosRunnerMasive = async (req, res) => {
       `Se insertaron correctamente ${newUserMasive.length} usuarios como prueba`,
     );
   } catch (error) {
-    if (error.status === 400)
-      return methodIncorrect(req, res, "Faltan campos requeridos");
+    if (error.status === 400) return methodIncorrect(req, res, error.message);
     if (error.status === 409)
-      return methodConflicts(req, res, "El correo ya se encuentra registrado");
-    return methodError(req, res, error);
+      return methodConflicts(req, res, { message: error.message });
+    return methodError(req, res, { message: error });
   }
 };
diff --git a/src/controllers/users/functions/listUsers.js b/src/controllers/users/functions/listUsers.js
@@ -12,6 +12,6 @@ export const ObtenerTodosLosUsuarios = async (req, res) => {
     methodOK(req, res, result);
   } catch (error) {
     if (error.status === 400) return methodNotFound(req, res);
-    return methodError(req, res, error);
+    return methodError(req, res, { message: error });
   }
 };
diff --git a/src/controllers/users/functions/login.js b/src/controllers/users/functions/login.js
@@ -13,21 +13,10 @@ export const Login = async (req, res) => {
 
     methodOK(req, res, token);
   } catch (error) {
-    if (error.status === 404)
-      return methodNotFound(req, res, "Usuario no encontrado");
-    if (error.status === 403)
-      return methodForbidden(
-        req,
-        res,
-        "El usuario está inactivo, pida la reactivación a un administrador",
-      );
-    if (error.status === 400)
-      return methodIncorrect(
-        req,
-        res,
-        "La contraseña es incorrecta o está mal escrita",
-      );
+    if (error.status === 404) return methodNotFound(req, res, error.message);
+    if (error.status === 403) return methodForbidden(req, res, error.message);
+    if (error.status === 400) return methodIncorrect(req, res, error.message);
 
-    methodError(req, res, error);
+    return methodError(req, res, { message: error });
   }
 };
diff --git a/src/controllers/users/functions/registerUser.js b/src/controllers/users/functions/registerUser.js
@@ -11,10 +11,9 @@ export const RegistrarUsuario = async (req, res) => {
     const newUser = await registerUserService(req.body);
     return methodCreated(req, res, newUser);
   } catch (error) {
-    if (error.status === 400)
-      return methodIncorrect(req, res, "Faltan campos requeridos");
+    if (error.status === 400) return methodIncorrect(req, res, error.message);
     if (error.status === 409)
-      return methodConflicts(req, res, "El correo ya se encuentra registrado");
-    return methodError(req, res, error);
+      return methodConflicts(req, res, { message: error.message });
+    return methodError(req, res, { message: error });
   }
 };
diff --git a/src/controllers/users/functions/searchUser.js b/src/controllers/users/functions/searchUser.js
@@ -11,12 +11,8 @@ export const BusquedaDeUsuarios = async (req, res) => {
 
     methodOK(req, res, resultSearch);
   } catch (error) {
-    if (error.status === 400)
-      return methodIncorrect(
-        req,
-        res,
-        `No se encontro el correo ${req.params.email}`,
-      );
-    return methodError(req, res, error);
+    console.log(error);
+    if (error.status === 400) return methodIncorrect(req, res, error.message);
+    return methodError(req, res, { message: error });
   }
 };
diff --git a/src/models/users/functions/registerUserModel.js b/src/models/users/functions/registerUserModel.js
@@ -1,10 +1,10 @@
 import { connectionQuery } from "../../../helpers/connection.helper.js";
 
-export const registerUser = async (nameUser, email, hashedPassword, role) => {
+export const registerUser = async (nameUser, email, hashedPassword) => {
   const query = `
     INSERT INTO users (ID, NameUser, Email, Password, Role, AccountType, AccountStatus, LastLogin)
-    VALUES (UUID(), ?, ?, ?, ?, "normal", "Inactivo", NULL)
+    VALUES (UUID(), ?, ?, ?, "user", "normal", "Inactivo", NULL)
   `;
-  const params = [nameUser, email, hashedPassword, role];
+  const params = [nameUser, email, hashedPassword];
   return await connectionQuery(query, params);
 };
diff --git a/src/services/users/functions/authService.js b/src/services/users/functions/authService.js
@@ -8,20 +8,27 @@ export const loginService = async ({ email, password }) => {
   const user = await findUserByEmail(email);
 
   if (!user) {
-    throw { status: 404 };
+    throw { status: 404, message: "El usuario no ha podidio ser encontrado" };
+  }
+
+  if (user.AccountType === "google") {
+    throw { status: 400, message: "El correo ya esta registrado con google" };
   }
 
   const isPasswordValid = await hashedArg.verify(user.Password, password);
 
   if (!isPasswordValid) {
     throw {
       status: 400,
+      message: "La contraseña es incorrecta o está mal escrita",
     };
   }
 
   if (user.AccountStatus === "Inactivo") {
     throw {
       status: 403,
+      message:
+        "El usuario está inactivo, pida la reactivación a un administrador",
     };
   }
 
diff --git a/src/services/users/functions/deleteUserService.js b/src/services/users/functions/deleteUserService.js
@@ -6,17 +6,20 @@ import {
 
 export const deleteUserService = async ({ id }) => {
   if (!id) {
-    throw { status: 400 };
+    throw { status: 400, message: "Faltan campos por completar" };
   }
 
   const foundUserToEliminated = await validateFoundUserToEliminated(id);
   if (foundUserToEliminated.length === 0) {
-    throw { status: 404 };
+    throw {
+      status: 404,
+      message: "No se encontro el id del usuario que se quiere eliminar",
+    };
   }
 
   const deleteUserFromID = await deleteUser(id);
   if (deleteUserFromID.affectedRows === 0) {
-    throw { status: 400 };
+    throw { status: 500 };
   }
 
   return foundUserToEliminated[0];
@@ -32,7 +35,7 @@ export const deleteUserBulkService = async ({ ids }) => {
 
   const MAX_IDS = 600;
   if (ids.length > MAX_IDS) {
-    throw { status: 400 };
+    throw { status: 400, message: "Faltan campos por completar" };
   }
 
   const batchSize = 100;
diff --git a/src/services/users/functions/insertUserService.js b/src/services/users/functions/insertUserService.js
@@ -13,12 +13,12 @@ export const insertUserService = async ({
   role,
 }) => {
   if (!nameUser || !email || !password || !accountStatus || !role) {
-    throw { status: 400 };
+    throw { status: 400, message: "Faltan campos por completar" };
   }
 
   const existingUser = await findUserByEmail(email);
   if (existingUser) {
-    throw { status: 409 };
+    throw { status: 409, message: "El correo ya se encuentra registrado" };
   }
 
   const hashedPassword = await hashedArg.hash(password);
@@ -40,7 +40,7 @@ export const insertUserService = async ({
 
 export const insertUserMasiveService = async ({ countInsert }) => {
   if (!countInsert || isNaN(countInsert)) {
-    throw { status: 400 };
+    throw { status: 400, message: "Faltan campos por completar" };
   }
 
   const insertados = [];
@@ -54,7 +54,7 @@ export const insertUserMasiveService = async ({ countInsert }) => {
 
     const existingUser = await findUserByEmail(email);
     if (existingUser) {
-      throw { status: 409 };
+      throw { status: 409, message: "El correo ya se encuentra registrado" };
     }
 
     const hashedPassword = await hashedArg.hash(password);
diff --git a/src/services/users/functions/registerUserService.js b/src/services/users/functions/registerUserService.js
@@ -4,29 +4,19 @@ import { findUserByEmail } from "../../../helpers/findUserByEmail.js";
 import { getUserByEmail } from "../../../helpers/getUserByEmail.js";
 import { registerUser } from "../../../models/users/functions/registerUserModel.js";
 
-export const registerUserService = async ({
-  nameUser,
-  email,
-  password,
-  role,
-}) => {
-  if (!nameUser || !email || !password || !role) {
-    throw { status: 400 };
+export const registerUserService = async ({ nameUser, email, password }) => {
+  if (!nameUser || !email || !password) {
+    throw { status: 400, message: "Faltan campos por completar" };
   }
 
   const existingUser = await findUserByEmail(email);
 
   if (existingUser) {
-    throw { status: 409 };
+    throw { status: 409, message: "El correo ya se encuentra registrado" };
   }
 
   const hashedPassword = await hashedArg.hash(password);
-  const insertResult = await registerUser(
-    nameUser,
-    email,
-    hashedPassword,
-    role,
-  );
+  const insertResult = await registerUser(nameUser, email, hashedPassword);
 
   if (insertResult.affectedRows > 0) {
     const newUser = await getUserByEmail(email);
diff --git a/src/services/users/functions/searchUserService.js b/src/services/users/functions/searchUserService.js
@@ -8,7 +8,7 @@ export const searchUserService = async ({ email }) => {
     querySearchUsers += ` AND Email LIKE ?`;
     queryParamsSearch.push(`%${email}%`);
   } else {
-    throw { status: 400 };
+    throw { status: 400, message: "Debe proporcionar un correo para buscar" };
   }
 
   const resultSearch = await connectionQuery(
@@ -17,7 +17,7 @@ export const searchUserService = async ({ email }) => {
   );
 
   if (resultSearch.length === 0) {
-    throw { status: 400 };
+    throw { status: 400, message: `No se encontro el correo ${email}` };
   }
 
   return resultSearch;
diff --git a/src/services/users/functions/updateUserService.js b/src/services/users/functions/updateUserService.js
@@ -18,14 +18,18 @@ export const updateUserService = async ({
   // Verificar si otro usuario ya usa ese correo
   const emailConflict = await findEmailInOtherUser(email, id);
   if (emailConflict) {
-    throw { status: 409 };
+    throw {
+      status: 409,
+      message: "El correo ya existe y no se puede actualizar",
+    };
   }
 
   // Verificar si el usuario existe
   const existingUser = await findUserById(id);
   if (!existingUser) {
     throw {
       status: 404,
+      message: "No se proporcionó un ID válido o el usuario no existe",
     };
   }
 

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ server.on("error", (error) => {`
`58`	`58`	`}`
`59`	`59`	`});`
`60`	`60`
`61`		`-server.listen(PORT, () => {`
	`61`	`+server.listen(currentPort, () => {`
`62`	`62`	`console.log(`
`63`	`63`	`🟢 Server is listening on port localhost:${server.address().port}`,
`64`	`64`	`);`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ export const ObtenerTodosLosUsuarios = async (req, res) => {`
`12`	`12`	`methodOK(req, res, result);`
`13`	`13`	`} catch (error) {`
`14`	`14`	`if (error.status === 400) return methodNotFound(req, res);`
`15`		`- return methodError(req, res, error);`
	`15`	`+ return methodError(req, res, { message: error });`
`16`	`16`	`}`
`17`	`17`	`};`