fix: Cambio de nombres de archivos sobre su extension

server.js

@@ -5,9 +5,9 @@ import morgan from "morgan";
 import { createServer } from "node:http";
 
 import { setupSwagger } from "./src/config/swaggerConfig.js";
-import { corsOptions } from "./src/middleware/cors.js";
-import { errorHandler } from "./src/middleware/errorHandler.js";
-import { router } from "./src/router/index.js";
+import { corsOptions } from "./src/middleware/cors.middleware.js";
+import { errorHandler } from "./src/middleware/errorHandler.middleware.js";
+import { router } from "./src/routes/index.js";
 
 // Datos del proyecto
 const projectInfo = {

src/__tests__/users/apiCreateUser.test.js

@@ -1,6 +1,6 @@
 require("dotenv").config();
 const frisby = require("frisby");
-const { createTokenTesting } = require("../../helpers/apiCreateToken");
+const { createTokenTesting } = require("../../helpers/apiCreateToken.helpers");
 
 const BASE_URL = process.env.BASE_URL;
 

src/__tests__/users/apiDeleteUser.test.js

@@ -1,6 +1,6 @@
 require("dotenv").config();
 const frisby = require("frisby");
-const { createTokenTesting } = require("../../helpers/apiCreateToken");
+const { createTokenTesting } = require("../../helpers/apiCreateToken.helpers");
 const { randomUUID } = require("node:crypto");
 
 const BASE_URL = process.env.BASE_URL;

src/__tests__/users/apiListUsers.test.js

@@ -1,6 +1,6 @@
 require("dotenv").config();
 const frisby = require("frisby");
-const { createTokenTesting } = require("../../helpers/apiCreateToken");
+const { createTokenTesting } = require("../../helpers/apiCreateToken.helpers");
 const Joi = frisby.Joi;
 
 const BASE_URL = process.env.BASE_URL;

src/__tests__/users/apiRegisterUser.test.js

@@ -1,6 +1,6 @@
 require("dotenv").config();
 const frisby = require("frisby");
-const { createTokenTesting } = require("../../helpers/apiCreateToken");
+const { createTokenTesting } = require("../../helpers/apiCreateToken.helpers");
 
 const BASE_URL = process.env.BASE_URL;
 

src/__tests__/users/apiSearchUser.test.js

@@ -1,6 +1,6 @@
 require("dotenv").config();
 const frisby = require("frisby");
-const { createTokenTesting } = require("../../helpers/apiCreateToken");
+const { createTokenTesting } = require("../../helpers/apiCreateToken.helpers");
 const Joi = frisby.Joi;
 
 const BASE_URL = process.env.BASE_URL;

src/__tests__/users/apiUpdateUser.test.js

@@ -1,6 +1,6 @@
 require("dotenv").config();
 const frisby = require("frisby");
-const { createTokenTesting } = require("../../helpers/apiCreateToken");
+const { createTokenTesting } = require("../../helpers/apiCreateToken.helpers");
 
 const BASE_URL = process.env.BASE_URL;
 

src/config/swaggerConfig.js

@@ -42,7 +42,7 @@ const swaggerDefinition = {
 
 const options = {
   swaggerDefinition,
-  apis: [resolve(__dirname, "../router/*.js")],
+  apis: [resolve(__dirname, "../routes/*.js")],
 };
 
 export const swaggerDocument = swaggerJsdoc(options);

src/controllers/catAssetsControllers.js

@@ -1,4 +1,4 @@
-import { connectionQuery } from "../helpers/connection.helper.js";
+import { connectionQuery } from "../helpers/connection.helpers.js";
 import {
   methodCreated,
   methodError,

src/controllers/catInventarioControllers.js

@@ -1,4 +1,4 @@
-import { connectionQuery } from "../helpers/connection.helper.js";
+import { connectionQuery } from "../helpers/connection.helpers.js";
 import {
   methodCreated,
   methodError,

src/controllers/catSuppliesControllers.js

@@ -1,4 +1,4 @@
-import { connectionQuery } from "../helpers/connection.helper.js";
+import { connectionQuery } from "../helpers/connection.helpers.js";
 import {
   methodCreated,
   methodError,

src/controllers/maestrosControllers.js

@@ -1,4 +1,4 @@
-import { connectionQuery } from "../helpers/connection.helper.js";
+import { connectionQuery } from "../helpers/connection.helpers.js";
 // import { deleteUserByTeacherID } from "../helpers/teachersEliminatedStatus.js";
 import {
   methodConflicts,

src/controllers/padresControllers.js

@@ -1,4 +1,4 @@
-import { connectionQuery } from "../helpers/connection.helper.js";
+import { connectionQuery } from "../helpers/connection.helpers.js";
 import {
   methodConflicts,
   methodCreated,

src/controllers/studentsController.js

@@ -1,4 +1,4 @@
-import { connectionQuery } from "../helpers/connection.helper.js";
+import { connectionQuery } from "../helpers/connection.helpers.js";
 import {
   methodError,
   methodNotFound,

src/controllers/token/functions/token.controller.js → src/controllers/token/functions/token.controllers.js

@@ -1,4 +1,4 @@
-import { refreshToken } from "../../../helpers/jwt.js";
+import { refreshToken } from "../../../helpers/jwt.helpers.js";
 
 export const RefreshToken = async (token) => {
   const refresh = await refreshToken(token);

src/controllers/token/index.js

@@ -1 +1 @@
-export * from "./functions/token.controller.js";
+export * from "./functions/token.controllers.js";

src/controllers/users/index.js

@@ -1,8 +1,9 @@
-export * from "./functions/deleteUser.controller.js";
-export * from "./functions/editUser.controller.js";
-export * from "./functions/insertUsers.controller.js";
-export * from "./functions/listUsers.controller.js";
-export * from "./functions/login.controller.js";
-export * from "./functions/loginGoogle.controller.js";
-export * from "./functions/registerUser.controller.js";
-export * from "./functions/searchUser.controller.js";
+export * from "./functions/deleteUser.controllers.js";
+export * from "./functions/editUser.controllers.js";
+export * from "./functions/insertUsers.controllers.js";
+export * from "./functions/listUsers.controllers.js";
+export * from "./functions/login.controllers.js";
+export * from "./functions/loginGoogle.controllers.js";
+export * from "./functions/registerUser.controllers.js";
+export * from "./functions/searchUser.controllers.js";
+export * from "./index.js";

src/helpers/findUserByEmail.js → src/helpers/findUserByEmail.helpers.js

@@ -1,4 +1,4 @@
-import { connectionQuery } from "./connection.helper.js";
+import { connectionQuery } from "./connection.helpers.js";
 
 // Esta funcion se ocupa para verificar si un correo ya se ha ingresado anteriormente y si es asi, va mandar un error que el correo ya se ingreso
 // y fallara la insercion regresando un estado Conflict

src/helpers/getUserByEmail.js → src/helpers/getUserByEmail.helpers.js

@@ -1,7 +1,7 @@
-import { connectionQuery } from "./connection.helper.js";
+import { connectionQuery } from "./connection.helpers.js";
 
 // Esta funcion es para regresar en la peticion de la solicitud cuando es exitosa,
-// regresa los campos seleccioandos en la consulta
+// regresa los campos seleccionados en la consulta
 export const getUserByEmail = async (email) => {
   const query = `SELECT NameUser, Email, Role, AccountStatus FROM users WHERE Email = ?`;
   const result = await connectionQuery(query, [email]);

src/helpers/getUserByEmailAndId.js → src/helpers/getUserByEmailAndId.helpers.js

@@ -1,4 +1,4 @@
-import { connectionQuery } from "./connection.helper.js";
+import { connectionQuery } from "./connection.helpers.js";
 
 // Esta funcion se ocupa para verificar si un correo ya se ha ingresado anteriormente cuando se edita a un usuario y si es asi,
 // va mandar un error que el correo ya se ingreso

src/helpers/userLastLogin.js → src/helpers/userLastLogin.helpers.js

@@ -1,4 +1,4 @@
-import { connectionQuery } from "./connection.helper.js";
+import { connectionQuery } from "./connection.helpers.js";
 
 export const lastLogin = (userId) => {
   const updateUserLastLogin = `UPDATE users SET LastLogin = CURRENT_TIMESTAMP WHERE id = ?`;

src/helpers/usersHelpers/rateLimitRequestUsers.js

@@ -1,4 +1,4 @@
-import { rateLimitRequest } from "../../middleware/rateLimitRequest.js";
+import { rateLimitRequest } from "../../middleware/rateLimitRequest.middleware.js";
 
 // Example
 // rateLimitRequest(time to try again, limit each IP request per windows, messageRequest response)

src/models/users/functions/authGoogle.model.js → src/models/users/functions/authGoogle.models.js

@@ -1,4 +1,4 @@
-import { connectionQuery } from "../../../helpers/connection.helper.js";
+import { connectionQuery } from "../../../helpers/connection.helpers.js";
 
 export const checkUser = async (email) => {
   const queryCheckUser = `SELECT * FROM users WHERE Email = ?`;

src/models/users/functions/delete.model.js → src/models/users/functions/delete.models.js

@@ -1,4 +1,4 @@
-import { connectionQuery } from "../../../helpers/connection.helper.js";
+import { connectionQuery } from "../../../helpers/connection.helpers.js";
 
 export const validateFoundUserToEliminated = async (userId) => {
   const query = `SELECT NameUser FROM users WHERE id = ?`;

src/models/users/functions/insert.model.js → src/models/users/functions/insert.models.js

@@ -1,4 +1,4 @@
-import { connectionQuery } from "../../../helpers/connection.helper.js";
+import { connectionQuery } from "../../../helpers/connection.helpers.js";
 
 export const insertUser = async (
   nameUser,

src/models/users/functions/list.model.js → src/models/users/functions/list.models.js

@@ -1,4 +1,4 @@
-import { connectionQuery } from "../../../helpers/connection.helper.js";
+import { connectionQuery } from "../../../helpers/connection.helpers.js";
 
 export const listUsersModel = async (query, params) => {
   const result = await connectionQuery(query, params);

src/models/users/functions/register.model.js → src/models/users/functions/register.models.js

@@ -1,4 +1,4 @@
-import { connectionQuery } from "../../../helpers/connection.helper.js";
+import { connectionQuery } from "../../../helpers/connection.helpers.js";
 
 export const registerUser = async (nameUser, email, hashedPassword) => {
   const query = `

src/models/users/functions/update.model.js → src/models/users/functions/update.models.js

@@ -1,4 +1,4 @@
-import { connectionQuery } from "../../../helpers/connection.helper.js";
+import { connectionQuery } from "../../../helpers/connection.helpers.js";
 
 export const findUserById = async (userId) => {
   const query = `SELECT * FROM users WHERE ID = ?`;

src/models/users/index.js

@@ -1,7 +1,7 @@
-export * from "./functions/authGoogle.model.js";
-export * from "./functions/delete.model.js";
-export * from "./functions/insert.model.js";
-export * from "./functions/list.model.js";
-export * from "./functions/register.model.js";
-export * from "./functions/update.model.js";
+export * from "./functions/authGoogle.models.js";
+export * from "./functions/delete.models.js";
+export * from "./functions/insert.models.js";
+export * from "./functions/list.models.js";
+export * from "./functions/register.models.js";
+export * from "./functions/update.models.js";
 export * from "./index.js";

src/router/catAssetsRouter.js → src/routes/catAssetsRouter.js

@@ -1,7 +1,7 @@
 import express from "express";
 
 import CatActivosControllers from "../controllers/catAssetsControllers.js";
-import { verificarToken } from "../middleware/verificarToken.js";
+import { verificarToken } from "../middleware/verificarToken.middleware.js";
 
 const apiCatActivos = express.Router();
 

src/router/catInventarioRouter.js → src/routes/catInventarioRouter.js

@@ -1,7 +1,7 @@
 import express from "express";
 
 import CatInventarioControllers from "../controllers/catInventarioControllers.js";
-import { verificarToken } from "../middleware/verificarToken.js";
+import { verificarToken } from "../middleware/verificarToken.middleware.js";
 
 const apiCatInventario = express.Router();
 

src/router/catSuppliesRouter.js → src/routes/catSuppliesRouter.js

@@ -1,7 +1,7 @@
 import express from "express";
 
 import CatInsumosControllers from "../controllers/catSuppliesControllers.js";
-import { verificarToken } from "../middleware/verificarToken.js";
+import { verificarToken } from "../middleware/verificarToken.middleware.js";
 
 const apiCatInsumos = express.Router();
 

src/router/maestrosRouter.js → src/routes/maestrosRouter.js

@@ -1,7 +1,7 @@
 import express from "express";
 
 import MaestrosControllers from "../controllers/maestrosControllers.js";
-import { verificarToken } from "../middleware/verificarToken.js";
+import { verificarToken } from "../middleware/verificarToken.middleware.js";
 
 const apiMaestros = express.Router();
 

src/router/padresRouter.js → src/routes/padresRouter.js

@@ -1,7 +1,7 @@
 import express from "express";
 
 import PadresControllers from "../controllers/padresControllers.js";
-import { verificarToken } from "../middleware/verificarToken.js";
+import { verificarToken } from "../middleware/verificarToken.middleware.js";
 
 const apiPadres = express.Router();
 

src/router/studentsRouter.js → src/routes/studentsRouter.js

@@ -1,7 +1,7 @@
 import express from "express";
 
 import EstudiantesControllers from "../controllers/studentsController.js";
-import { verificarToken } from "../middleware/verificarToken.js";
+import { verificarToken } from "../middleware/verificarToken.middleware.js";
 
 const apiEstudiantes = express.Router();
 

src/router/token.routes.js → src/routes/token.routes.js

@@ -1,7 +1,7 @@
 import express from "express";
 
 import { RefreshToken } from "../controllers/token/index.js";
-import { verificarToken } from "../middleware/verificarToken.js";
+import { verificarToken } from "../middleware/verificarToken.middleware.js";
 import { methodOK } from "../server/serverMethods.js";
 
 const apiToken = express.Router();

src/router/users.routes.js → src/routes/users.routes.js

@@ -21,7 +21,7 @@ import {
   searchUsersRateLimiter,
   updateUserRateLimiter,
 } from "../helpers/usersHelpers/rateLimitRequestUsers.js";
-import { verificarToken } from "../middleware/verificarToken.js";
+import { verificarToken } from "../middleware/verificarToken.middleware.js";
 import { methodCreated, methodOK } from "../server/serverMethods.js";
 
 const apiUsuarios = express.Router();

src/services/users/functions/auth.service.js → src/services/users/functions/auth.services.js

@@ -1,8 +1,8 @@
 import hashedArg from "argon2";
 
-import { findUserByEmail } from "../../../helpers/findUserByEmail.js";
-import { createToken } from "../../../helpers/jwt.js";
-import { lastLogin } from "../../../helpers/userLastLogin.js";
+import { findUserByEmail } from "../../../helpers/findUserByEmail.helpers.js";
+import { createToken } from "../../../helpers/jwt.helpers.js";
+import { lastLogin } from "../../../helpers/userLastLogin.helpers.js";
 
 export const loginService = async ({ email, password }) => {
   const user = await findUserByEmail(email);

src/services/users/functions/authGoogle.service.js → src/services/users/functions/authGoogle.services.js

@@ -1,9 +1,9 @@
 import dotenv from "dotenv";
 import crypto from "node:crypto";
 
-import { createTokenGoogle } from "../../../helpers/jwtGoogle.js";
-import { lastLogin } from "../../../helpers/userLastLogin.js";
-import { googleClient } from "../../../lib/clientGoogle.js";
+import { createTokenGoogle } from "../../../helpers/jwtGoogle.helpers.js";
+import { lastLogin } from "../../../helpers/userLastLogin.helpers.js";
+import { googleClient } from "../../../lib/clientGoogle.lib.js";
 import {
   checkUser,
   createUser,

src/services/users/functions/insert.service.js → src/services/users/functions/insert.services.js

@@ -1,8 +1,8 @@
 import { faker } from "@faker-js/faker";
 import hashedArg from "argon2";
 
-import { findUserByEmail } from "../../../helpers/findUserByEmail.js";
-import { getUserByEmail } from "../../../helpers/getUserByEmail.js";
+import { findUserByEmail } from "../../../helpers/findUserByEmail.helpers.js";
+import { getUserByEmail } from "../../../helpers/getUserByEmail.helpers.js";
 import { insertUser } from "../../../models/users/index.js";
 
 export const insertUserService = async ({

src/services/users/functions/register.service.js → src/services/users/functions/register.services.js

@@ -1,9 +1,9 @@
 import { de } from "@faker-js/faker";
 import hashedArg from "argon2";
 
-import { findUserByEmail } from "../../../helpers/findUserByEmail.js";
-import { getUserByEmail } from "../../../helpers/getUserByEmail.js";
-import { registerUser } from "../../../models/users/functions/register.model.js";
+import { findUserByEmail } from "../../../helpers/findUserByEmail.helpers.js";
+import { getUserByEmail } from "../../../helpers/getUserByEmail.helpers.js";
+import { registerUser } from "../../../models/users/functions/register.models.js";
 
 export const registerUserService = async ({ nameUser, email, password }) => {
   if (!nameUser || !email || !password) {

src/services/users/functions/search.service.js → src/services/users/functions/search.services.js

@@ -1,4 +1,4 @@
-import { connectionQuery } from "../../../helpers/connection.helper.js";
+import { connectionQuery } from "../../../helpers/connection.helpers.js";
 
 export const searchUserService = async (email) => {
   let querySearchUsers = `SELECT * FROM users WHERE 1=1`;

src/services/users/functions/update.service.js → src/services/users/functions/update.services.js

@@ -1,6 +1,6 @@
 import hashedArg from "argon2";
 
-import { findEmailInOtherUser } from "../../../helpers/getUserByEmailAndId.js";
+import { findEmailInOtherUser } from "../../../helpers/getUserByEmailAndId.helpers.js";
 import {
   findUserById,
   updateUserWithPassword,

src/services/users/index.js

@@ -1,9 +1,9 @@
-export * from "./functions/auth.service.js";
-export * from "./functions/authGoogle.service.js";
-export * from "./functions/delete.service.js";
-export * from "./functions/insert.service.js";
-export * from "./functions/list.service.js";
-export * from "./functions/register.service.js";
-export * from "./functions/search.service.js";
-export * from "./functions/update.service.js";
+export * from "./functions/auth.services.js";
+export * from "./functions/authGoogle.services.js";
+export * from "./functions/delete.services.js";
+export * from "./functions/insert.services.js";
+export * from "./functions/list.services.js";
+export * from "./functions/register.services.js";
+export * from "./functions/search.services.js";
+export * from "./functions/update.services.js";
 export * from "./index.js";