diff --git a/server.js b/server.js index 9a2b812..b5e41a2 100644 --- a/server.js +++ b/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 = { diff --git a/src/__tests__/users/apiCreateUser.test.js b/src/__tests__/users/apiCreateUser.test.js index 98a821f..2531288 100644 --- a/src/__tests__/users/apiCreateUser.test.js +++ b/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; diff --git a/src/__tests__/users/apiDeleteUser.test.js b/src/__tests__/users/apiDeleteUser.test.js index f53d15f..a798e84 100644 --- a/src/__tests__/users/apiDeleteUser.test.js +++ b/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; diff --git a/src/__tests__/users/apiListUsers.test.js b/src/__tests__/users/apiListUsers.test.js index a833761..c886cba 100644 --- a/src/__tests__/users/apiListUsers.test.js +++ b/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; diff --git a/src/__tests__/users/apiRegisterUser.test.js b/src/__tests__/users/apiRegisterUser.test.js index 554c59f..07da6f6 100644 --- a/src/__tests__/users/apiRegisterUser.test.js +++ b/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; diff --git a/src/__tests__/users/apiSearchUser.test.js b/src/__tests__/users/apiSearchUser.test.js index 5dd6657..8633807 100644 --- a/src/__tests__/users/apiSearchUser.test.js +++ b/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; diff --git a/src/__tests__/users/apiUpdateUser.test.js b/src/__tests__/users/apiUpdateUser.test.js index f4a72c0..c7ca770 100644 --- a/src/__tests__/users/apiUpdateUser.test.js +++ b/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; diff --git a/src/config/swaggerConfig.js b/src/config/swaggerConfig.js index 46f976b..e0bc127 100644 --- a/src/config/swaggerConfig.js +++ b/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); diff --git a/src/controllers/catAssetsControllers.js b/src/controllers/catAssetsControllers.js index 5cb3dbc..e3e1ae9 100644 --- a/src/controllers/catAssetsControllers.js +++ b/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, diff --git a/src/controllers/catInventarioControllers.js b/src/controllers/catInventarioControllers.js index 99317f8..d3ee599 100644 --- a/src/controllers/catInventarioControllers.js +++ b/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, diff --git a/src/controllers/catSuppliesControllers.js b/src/controllers/catSuppliesControllers.js index ba6bd53..3acb6ed 100644 --- a/src/controllers/catSuppliesControllers.js +++ b/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, diff --git a/src/controllers/maestrosControllers.js b/src/controllers/maestrosControllers.js index a0146b4..4572e04 100644 --- a/src/controllers/maestrosControllers.js +++ b/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, diff --git a/src/controllers/padresControllers.js b/src/controllers/padresControllers.js index e21ea29..537f6ca 100644 --- a/src/controllers/padresControllers.js +++ b/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, diff --git a/src/controllers/studentsController.js b/src/controllers/studentsController.js index c47b2f0..73516ca 100644 --- a/src/controllers/studentsController.js +++ b/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, diff --git a/src/controllers/token/functions/token.controller.js b/src/controllers/token/functions/token.controllers.js similarity index 64% rename from src/controllers/token/functions/token.controller.js rename to src/controllers/token/functions/token.controllers.js index 2ca0613..b700849 100644 --- a/src/controllers/token/functions/token.controller.js +++ b/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); diff --git a/src/controllers/token/index.js b/src/controllers/token/index.js index 22b03d7..6e238ba 100644 --- a/src/controllers/token/index.js +++ b/src/controllers/token/index.js @@ -1 +1 @@ -export * from "./functions/token.controller.js"; +export * from "./functions/token.controllers.js"; diff --git a/src/controllers/users/functions/deleteUser.controller.js b/src/controllers/users/functions/deleteUser.controllers.js similarity index 100% rename from src/controllers/users/functions/deleteUser.controller.js rename to src/controllers/users/functions/deleteUser.controllers.js diff --git a/src/controllers/users/functions/editUser.controller.js b/src/controllers/users/functions/editUser.controllers.js similarity index 100% rename from src/controllers/users/functions/editUser.controller.js rename to src/controllers/users/functions/editUser.controllers.js diff --git a/src/controllers/users/functions/insertUsers.controller.js b/src/controllers/users/functions/insertUsers.controllers.js similarity index 100% rename from src/controllers/users/functions/insertUsers.controller.js rename to src/controllers/users/functions/insertUsers.controllers.js diff --git a/src/controllers/users/functions/listUsers.controller.js b/src/controllers/users/functions/listUsers.controllers.js similarity index 100% rename from src/controllers/users/functions/listUsers.controller.js rename to src/controllers/users/functions/listUsers.controllers.js diff --git a/src/controllers/users/functions/login.controller.js b/src/controllers/users/functions/login.controllers.js similarity index 100% rename from src/controllers/users/functions/login.controller.js rename to src/controllers/users/functions/login.controllers.js diff --git a/src/controllers/users/functions/loginGoogle.controller.js b/src/controllers/users/functions/loginGoogle.controllers.js similarity index 100% rename from src/controllers/users/functions/loginGoogle.controller.js rename to src/controllers/users/functions/loginGoogle.controllers.js diff --git a/src/controllers/users/functions/registerUser.controller.js b/src/controllers/users/functions/registerUser.controllers.js similarity index 100% rename from src/controllers/users/functions/registerUser.controller.js rename to src/controllers/users/functions/registerUser.controllers.js diff --git a/src/controllers/users/functions/searchUser.controller.js b/src/controllers/users/functions/searchUser.controllers.js similarity index 100% rename from src/controllers/users/functions/searchUser.controller.js rename to src/controllers/users/functions/searchUser.controllers.js diff --git a/src/controllers/users/index.js b/src/controllers/users/index.js index 364b769..c73f8fe 100644 --- a/src/controllers/users/index.js +++ b/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"; diff --git a/src/helpers/apiCreateToken.js b/src/helpers/apiCreateToken.helpers.js similarity index 100% rename from src/helpers/apiCreateToken.js rename to src/helpers/apiCreateToken.helpers.js diff --git a/src/helpers/connection.helper.js b/src/helpers/connection.helpers.js similarity index 100% rename from src/helpers/connection.helper.js rename to src/helpers/connection.helpers.js diff --git a/src/helpers/findUserByEmail.js b/src/helpers/findUserByEmail.helpers.js similarity index 87% rename from src/helpers/findUserByEmail.js rename to src/helpers/findUserByEmail.helpers.js index 97219a3..df6e5bd 100644 --- a/src/helpers/findUserByEmail.js +++ b/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 diff --git a/src/helpers/getUserByEmail.js b/src/helpers/getUserByEmail.helpers.js similarity index 73% rename from src/helpers/getUserByEmail.js rename to src/helpers/getUserByEmail.helpers.js index a5053a2..f54106a 100644 --- a/src/helpers/getUserByEmail.js +++ b/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]); diff --git a/src/helpers/getUserByEmailAndId.js b/src/helpers/getUserByEmailAndId.helpers.js similarity index 88% rename from src/helpers/getUserByEmailAndId.js rename to src/helpers/getUserByEmailAndId.helpers.js index a9c7df6..f7782d8 100644 --- a/src/helpers/getUserByEmailAndId.js +++ b/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 diff --git a/src/helpers/jwt.js b/src/helpers/jwt.helpers.js similarity index 100% rename from src/helpers/jwt.js rename to src/helpers/jwt.helpers.js diff --git a/src/helpers/jwtGoogle.js b/src/helpers/jwtGoogle.helpers.js similarity index 100% rename from src/helpers/jwtGoogle.js rename to src/helpers/jwtGoogle.helpers.js diff --git a/src/helpers/userLastLogin.js b/src/helpers/userLastLogin.helpers.js similarity index 76% rename from src/helpers/userLastLogin.js rename to src/helpers/userLastLogin.helpers.js index 373ab61..dadc4d1 100644 --- a/src/helpers/userLastLogin.js +++ b/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 = ?`; diff --git a/src/helpers/usersHelpers/rateLimitRequestUsers.js b/src/helpers/usersHelpers/rateLimitRequestUsers.js index 9b82c7a..4388d1c 100644 --- a/src/helpers/usersHelpers/rateLimitRequestUsers.js +++ b/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) diff --git a/src/lib/clientGoogle.js b/src/lib/clientGoogle.lib.js similarity index 100% rename from src/lib/clientGoogle.js rename to src/lib/clientGoogle.lib.js diff --git a/src/middleware/cors.js b/src/middleware/cors.middleware.js similarity index 100% rename from src/middleware/cors.js rename to src/middleware/cors.middleware.js diff --git a/src/middleware/errorHandler.js b/src/middleware/errorHandler.middleware.js similarity index 100% rename from src/middleware/errorHandler.js rename to src/middleware/errorHandler.middleware.js diff --git a/src/middleware/rateLimitRequest.js b/src/middleware/rateLimitRequest.middleware.js similarity index 100% rename from src/middleware/rateLimitRequest.js rename to src/middleware/rateLimitRequest.middleware.js diff --git a/src/middleware/verificarToken.js b/src/middleware/verificarToken.middleware.js similarity index 100% rename from src/middleware/verificarToken.js rename to src/middleware/verificarToken.middleware.js diff --git a/src/models/users/functions/authGoogle.model.js b/src/models/users/functions/authGoogle.models.js similarity index 98% rename from src/models/users/functions/authGoogle.model.js rename to src/models/users/functions/authGoogle.models.js index 584cd33..8a99947 100644 --- a/src/models/users/functions/authGoogle.model.js +++ b/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 = ?`; diff --git a/src/models/users/functions/delete.model.js b/src/models/users/functions/delete.models.js similarity index 98% rename from src/models/users/functions/delete.model.js rename to src/models/users/functions/delete.models.js index c159c3a..d071f75 100644 --- a/src/models/users/functions/delete.model.js +++ b/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 = ?`; diff --git a/src/models/users/functions/insert.model.js b/src/models/users/functions/insert.models.js similarity index 97% rename from src/models/users/functions/insert.model.js rename to src/models/users/functions/insert.models.js index 210e090..627d134 100644 --- a/src/models/users/functions/insert.model.js +++ b/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, diff --git a/src/models/users/functions/list.model.js b/src/models/users/functions/list.models.js similarity index 95% rename from src/models/users/functions/list.model.js rename to src/models/users/functions/list.models.js index 7e280c9..76bfd9b 100644 --- a/src/models/users/functions/list.model.js +++ b/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); diff --git a/src/models/users/functions/register.model.js b/src/models/users/functions/register.models.js similarity index 97% rename from src/models/users/functions/register.model.js rename to src/models/users/functions/register.models.js index a8dafd9..f96f9a9 100644 --- a/src/models/users/functions/register.model.js +++ b/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 = ` diff --git a/src/models/users/functions/update.model.js b/src/models/users/functions/update.models.js similarity index 98% rename from src/models/users/functions/update.model.js rename to src/models/users/functions/update.models.js index f8954d4..7980eca 100644 --- a/src/models/users/functions/update.model.js +++ b/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 = ?`; diff --git a/src/models/users/index.js b/src/models/users/index.js index f3bb34f..e109b91 100644 --- a/src/models/users/index.js +++ b/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"; diff --git a/src/router/catAssetsRouter.js b/src/routes/catAssetsRouter.js similarity index 99% rename from src/router/catAssetsRouter.js rename to src/routes/catAssetsRouter.js index 3b55a80..5f011a1 100644 --- a/src/router/catAssetsRouter.js +++ b/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(); diff --git a/src/router/catInventarioRouter.js b/src/routes/catInventarioRouter.js similarity index 99% rename from src/router/catInventarioRouter.js rename to src/routes/catInventarioRouter.js index effd9a5..bb24775 100644 --- a/src/router/catInventarioRouter.js +++ b/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(); diff --git a/src/router/catSuppliesRouter.js b/src/routes/catSuppliesRouter.js similarity index 99% rename from src/router/catSuppliesRouter.js rename to src/routes/catSuppliesRouter.js index 4aafec0..42973bd 100644 --- a/src/router/catSuppliesRouter.js +++ b/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(); diff --git a/src/router/google.route.js b/src/routes/google.route.js similarity index 100% rename from src/router/google.route.js rename to src/routes/google.route.js diff --git a/src/router/index.js b/src/routes/index.js similarity index 100% rename from src/router/index.js rename to src/routes/index.js diff --git a/src/router/maestrosRouter.js b/src/routes/maestrosRouter.js similarity index 99% rename from src/router/maestrosRouter.js rename to src/routes/maestrosRouter.js index 53cd734..119673d 100644 --- a/src/router/maestrosRouter.js +++ b/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(); diff --git a/src/router/padresRouter.js b/src/routes/padresRouter.js similarity index 99% rename from src/router/padresRouter.js rename to src/routes/padresRouter.js index 7e11c76..0cfb591 100644 --- a/src/router/padresRouter.js +++ b/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(); diff --git a/src/router/studentsRouter.js b/src/routes/studentsRouter.js similarity index 78% rename from src/router/studentsRouter.js rename to src/routes/studentsRouter.js index 17e7870..f760864 100644 --- a/src/router/studentsRouter.js +++ b/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(); diff --git a/src/router/token.routes.js b/src/routes/token.routes.js similarity index 97% rename from src/router/token.routes.js rename to src/routes/token.routes.js index 0d68c4b..81bf9f6 100644 --- a/src/router/token.routes.js +++ b/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(); diff --git a/src/router/users.routes.js b/src/routes/users.routes.js similarity index 99% rename from src/router/users.routes.js rename to src/routes/users.routes.js index 23fb92f..de920da 100644 --- a/src/router/users.routes.js +++ b/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(); diff --git a/src/services/users/functions/auth.service.js b/src/services/users/functions/auth.services.js similarity index 91% rename from src/services/users/functions/auth.service.js rename to src/services/users/functions/auth.services.js index 9f8889d..424d5c0 100644 --- a/src/services/users/functions/auth.service.js +++ b/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); diff --git a/src/services/users/functions/authGoogle.service.js b/src/services/users/functions/authGoogle.services.js similarity index 94% rename from src/services/users/functions/authGoogle.service.js rename to src/services/users/functions/authGoogle.services.js index 92b1e82..33d5ff6 100644 --- a/src/services/users/functions/authGoogle.service.js +++ b/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, diff --git a/src/services/users/functions/delete.service.js b/src/services/users/functions/delete.services.js similarity index 100% rename from src/services/users/functions/delete.service.js rename to src/services/users/functions/delete.services.js diff --git a/src/services/users/functions/insert.service.js b/src/services/users/functions/insert.services.js similarity index 98% rename from src/services/users/functions/insert.service.js rename to src/services/users/functions/insert.services.js index e1d3172..6d29217 100644 --- a/src/services/users/functions/insert.service.js +++ b/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 ({ diff --git a/src/services/users/functions/list.service.js b/src/services/users/functions/list.services.js similarity index 100% rename from src/services/users/functions/list.service.js rename to src/services/users/functions/list.services.js diff --git a/src/services/users/functions/register.service.js b/src/services/users/functions/register.services.js similarity index 96% rename from src/services/users/functions/register.service.js rename to src/services/users/functions/register.services.js index c1f9158..8a27901 100644 --- a/src/services/users/functions/register.service.js +++ b/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) { diff --git a/src/services/users/functions/search.service.js b/src/services/users/functions/search.services.js similarity index 98% rename from src/services/users/functions/search.service.js rename to src/services/users/functions/search.services.js index 9710f25..6422ca7 100644 --- a/src/services/users/functions/search.service.js +++ b/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`; diff --git a/src/services/users/functions/update.service.js b/src/services/users/functions/update.services.js similarity index 98% rename from src/services/users/functions/update.service.js rename to src/services/users/functions/update.services.js index 806f2a2..d2c25e5 100644 --- a/src/services/users/functions/update.service.js +++ b/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, diff --git a/src/services/users/index.js b/src/services/users/index.js index be6c00b..024930d 100644 --- a/src/services/users/index.js +++ b/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";