fix(inventory): Se restructura el catalogo completo de inventarios y se corrige el formato de cost y comillas invertidas

muke78 · muke78 · commit 24ad0944ab31 · 2025-07-24T07:21:52.000-06:00
diff --git a/NOTES.md b/NOTES.md
@@ -2,26 +2,11 @@
 
 ## Cambios importantes
 
-- Hacer el cambio para el catalogo de insumos por medio de la modularizacionm de funciones
-- Hacer un catalogo de Aulas
-
-- Hacer dos nuevas tablas una llamada asset_conditions y supply_units para administrar esos catalogos de forma mejor eficiente a la hora de quererlos incluir como listas para insercion o como selectores de busqueda
-
-- Hacer un catalogo de proveedores que seria el campo de supplier en catsupplies
-
-- asset_conditions va ser para la condicion del activo condition_id 
-
-- supply_units va ser para la unidades de los suministros unit_id 
-
-- Verificar las funciones de la carpeta helpers para poder reutilizar unas funciones 
-(sobre todo la de cuando se elimina un registro como el de usuarios en su modelo, esto aplica para todas las tablas)
 - Verificar testeos del catalogo de activos y de usuarios juntos y hacerlos
 - Busar una forma mas segura de pasarle el token a los test
 - Probar la funcion de token para el refresco del mismo, y hacer la docuemntacion en postman
 - Excluir por aparte el controlador de google para el login, y tenerlo aparte (Sacarlo de los usuario y que tenga su propio espacio)
 
--
-
 ## Cambios que se puedan ir haciendo
 
 - Ir adecuando el codigo poco a poco el codigo en ingles
diff --git a/src/models/inventory/functions/delete.models.js b/src/models/inventory/functions/delete.models.js
@@ -1,12 +1,12 @@
 import { connectionQuery } from "../../../helpers/connection.helpers.js";
 
 export const deleteInventoryModel = async (inventoryId) => {
-  const query = `DELETE FROM catinventory WHERE ID = ?`;
+  const query = `DELETE FROM cat_inventory WHERE inventory_id = ?`;
   const params = [inventoryId];
   return await connectionQuery(query, params);
 };
 
 export const deleteInventoryBulk = async (placeholders, batch) => {
-  const query = `DELETE FROM catinventory WHERE ID IN (${placeholders})`;
+  const query = `DELETE FROM cat_inventory WHERE inventory_id IN (${placeholders})`;
   return await connectionQuery(query, batch);
 };
diff --git a/src/models/inventory/functions/insert.models.js b/src/models/inventory/functions/insert.models.js
@@ -1,31 +1,79 @@
 import { connectionQuery } from "../../../helpers/connection.helpers.js";
 
+export const extractForeignKeysInventoryModel = async (
+  condition,
+  location,
+  status,
+) => {
+  const query = `SELECT 
+    (SELECT 
+            condition_id
+        FROM
+            asset_conditions
+        WHERE
+            name = ?) AS 'condition',
+    (SELECT 
+            location_id
+        FROM
+            cat_classrooms
+        WHERE
+            name = ?) AS location,
+    (SELECT 
+            status_id
+        FROM
+            cat_status
+        WHERE
+            name = ?) AS status;`;
+  const result = await connectionQuery(query, [condition, location, status]);
+  return result;
+};
+
 export const insertInventoryModel = async ({
-  itemCode,
+  condition,
+  location,
+  item_code,
+  serial_number,
   name,
   description,
   quantity,
   weight,
   width,
   height,
-  location,
-  condition,
-  purchaseDate,
+  purchase_date,
+  cost,
+  last_maintenance_date,
+  warranty_end_date,
+  status,
 }) => {
-  const query = `INSERT INTO catinventory (ID, ItemCode, Name, Description, Quantity, Weight, Width, Height, Location, \`Condition\`, PurchaseDate)
-    VALUES (UUID(), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);`;
+  const query = `INSERT INTO cat_inventory (
+  inventory_id, condition_id, location_id, item_code, 
+  serial_number, name, description, 
+  quantity, weight, width, height, purchase_date,
+  cost, last_maintenance_date, warranty_end_date,
+  status_id
+) 
+VALUES 
+  (
+    UUID(), ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?
+  );
+`;
 
   const params = [
-    itemCode,
+    condition,
+    location,
+    item_code,
+    serial_number,
     name,
     description,
     quantity,
     weight,
     width,
     height,
-    location,
-    condition,
-    purchaseDate,
+    purchase_date,
+    cost,
+    last_maintenance_date,
+    warranty_end_date,
+    status,
   ];
 
   return await connectionQuery(query, params);
diff --git a/src/models/inventory/functions/update.models.js b/src/models/inventory/functions/update.models.js
@@ -3,31 +3,59 @@ import { connectionQuery } from "../../../helpers/connection.helpers.js";
 export const updateInventoryModel = async (
   inventoryId,
   {
-    itemCode,
+    condition,
+    location,
+    item_code,
+    serial_number,
     name,
     description,
     quantity,
     weight,
     width,
     height,
-    location,
-    condition,
-    purchaseDate,
+    purchase_date,
+    cost,
+    last_maintenance_date,
+    warranty_end_date,
     status,
   },
 ) => {
-  const query = `UPDATE catinventory SET ItemCode = ?, Name = ?, Description = ?, Quantity = ?, Weight = ?, Width = ?, Height = ?, Location = ?, \`Condition\` = ?, PurchaseDate = ?, Status = ? WHERE ID = ?`;
+  const query = `UPDATE 
+                cat_inventory 
+              SET 
+                condition_id = ?, 
+                location_id = ?, 
+                item_code = ?, 
+                serial_number = ?, 
+                name = ?, 
+                description = ?, 
+                quantity = ?, 
+                weight = ?, 
+                width = ?, 
+                height = ?, 
+                purchase_date = ?, 
+                cost = ?,
+                last_maintenance_date = ?,
+                warranty_end_date = ?,
+                status_id = ? 
+              WHERE 
+                inventory_id = ?;`;
+
   const params = [
-    itemCode,
+    condition,
+    location,
+    item_code,
+    serial_number,
     name,
     description,
     quantity,
     weight,
     width,
     height,
-    location,
-    condition,
-    purchaseDate,
+    purchase_date,
+    cost,
+    last_maintenance_date,
+    warranty_end_date,
     status,
     inventoryId,
   ];
diff --git a/src/models/inventory/functions/vault.models.js b/src/models/inventory/functions/vault.models.js
@@ -1,7 +1,7 @@
 import { connectionQuery } from "../../../helpers/connection.helpers.js";
 
 export const vaultInventoryModel = async (inventoryId) => {
-  const query = `UPDATE catinventory SET Status = 'Inactivo' WHERE ID = ?`;
+  const query = `UPDATE cat_inventory SET status_id = "cefdb296-61f5-11f0-a977-d843ae0db894" WHERE inventory_id = ?`;
   const params = [inventoryId];
   await connectionQuery(query, params);
 };
diff --git a/src/routes/catInventory.routes.js b/src/routes/catInventory.routes.js
@@ -121,8 +121,8 @@ apiCatInventory.delete(
       methodOK(
         request,
         response,
-        result,
-        "El inventario fue eliminado correctamente",
+        undefined,
+        `El inventario ${result.name} fue eliminado correctamente`,
       );
     } catch (error) {
       next(error);
diff --git a/src/services/assets/functions/list.services.js b/src/services/assets/functions/list.services.js
@@ -24,7 +24,7 @@ export const listAssetsService = async ({
   }
 
   if (condition && condition !== "All") {
-    where += " AND `asset_conditions.name` = ?";
+    where += " AND asset_conditions.name = ?";
     values.push(condition);
   }
 
@@ -41,7 +41,7 @@ export const listAssetsService = async ({
                       cat_assets.name,
                       cat_assets.description,
                       purchase_date,
-                      cost,
+                      FORMAT(cost, 2) AS cost,
                       last_maintenance_date,
                       warranty_end_date,
                       created,
diff --git a/src/services/inventory/functions/delete.services.js b/src/services/inventory/functions/delete.services.js
@@ -1,3 +1,4 @@
+import { validateFoundToEliminated } from "../../../helpers/delete.helpers.js";
 import {
   deleteInventoryBulk,
   deleteInventoryModel,
@@ -13,6 +14,22 @@ export const deleteInventoryService = async (inventoryId) => {
     };
   }
 
+  const foundInventoryToEliminated = await validateFoundToEliminated(
+    inventoryId,
+    "inventory_id",
+    "name",
+    "cat_inventory",
+  );
+
+  if (foundInventoryToEliminated.length === 0) {
+    throw {
+      statusCode: 404,
+      message: "No se proporcionó un ID válido o el inventario no existe",
+      code: "INVENTORY_NOT_FOUND",
+      details: "El inventario con el ID proporcionado no fue encontrado",
+    };
+  }
+
   const result = await deleteInventoryModel(inventoryId);
 
   if (result.affectedRows === 0) {
@@ -24,6 +41,8 @@ export const deleteInventoryService = async (inventoryId) => {
         "Hubo un error al intentar borrar el inventario en la base de datos",
     };
   }
+
+  return foundInventoryToEliminated[0];
 };
 
 export const deleteInventoryBulkService = async (ids) => {
diff --git a/src/services/inventory/functions/insert.services.js b/src/services/inventory/functions/insert.services.js
@@ -1,17 +1,41 @@
-import { insertInventoryModel } from "../../../models/inventory/index.js";
+import {
+  extractForeignKeysInventoryModel,
+  insertInventoryModel,
+} from "../../../models/inventory/index.js";
 
-export const insertInventoryService = async (inventory) => {
+export const insertInventoryService = async ({
+  condition,
+  location,
+  item_code,
+  serial_number,
+  name,
+  description,
+  quantity,
+  weight,
+  width,
+  height,
+  purchase_date,
+  cost,
+  last_maintenance_date,
+  warranty_end_date,
+  status,
+}) => {
   if (
-    !inventory.itemCode ||
-    !inventory.name ||
-    !inventory.description ||
-    !inventory.quantity ||
-    !inventory.weight ||
-    !inventory.width ||
-    !inventory.height ||
-    !inventory.location ||
-    !inventory.condition ||
-    !inventory.purchaseDate
+    !condition ||
+    !location ||
+    !item_code ||
+    !serial_number ||
+    !name ||
+    !description ||
+    !quantity ||
+    !weight ||
+    !width ||
+    !height ||
+    !purchase_date ||
+    !cost ||
+    !last_maintenance_date ||
+    !warranty_end_date ||
+    !status
   ) {
     throw {
       statusCode: 400,
@@ -21,7 +45,29 @@ export const insertInventoryService = async (inventory) => {
     };
   }
 
-  const result = await insertInventoryModel(inventory);
+  const extract = await extractForeignKeysInventoryModel(
+    condition,
+    location,
+    status,
+  );
+
+  const result = await insertInventoryModel({
+    condition: extract[0].condition,
+    location: extract[0].location,
+    item_code,
+    serial_number,
+    name,
+    description,
+    quantity,
+    weight,
+    width,
+    height,
+    purchase_date,
+    cost,
+    last_maintenance_date,
+    warranty_end_date,
+    status: extract[0].status,
+  });
 
   if (!result.affectedRows > 0) {
     throw {
diff --git a/src/services/inventory/functions/list.services.js b/src/services/inventory/functions/list.services.js
diff --git a/src/services/inventory/functions/search.services.js b/src/services/inventory/functions/search.services.js
diff --git a/src/services/inventory/functions/update.services.js b/src/services/inventory/functions/update.services.js
diff --git a/src/services/supply/functions/list.services.js b/src/services/supply/functions/list.services.js
