From d7b9a3ffd02a0571d7f3a014a33425e1c0827082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Mon, 22 Jul 2024 11:58:51 +0200
Subject: [PATCH] feat: refactor buyUltimate refs #7736

---
 db/routines/vn/procedures/buy_getUltimate.sql     |  3 +--
 .../vn/procedures/buy_getUltimateFromInterval.sql |  2 +-
 db/routines/vn/procedures/buy_updateGrouping.sql  | 10 +++++++---
 db/routines/vn/procedures/catalog_calculate.sql   |  2 +-
 db/routines/vn/procedures/item_getInfo.sql        | 15 +++++++++------
 modules/entry/back/methods/entry/addFromBuy.js    |  2 +-
 6 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/db/routines/vn/procedures/buy_getUltimate.sql b/db/routines/vn/procedures/buy_getUltimate.sql
index 66e92c50e..023e81774 100644
--- a/db/routines/vn/procedures/buy_getUltimate.sql
+++ b/db/routines/vn/procedures/buy_getUltimate.sql
@@ -15,8 +15,7 @@ BEGIN
  */
 	CALL cache.last_buy_refresh(FALSE);
 
-	DROP TEMPORARY TABLE IF EXISTS tmp.buyUltimate;
-	CREATE TEMPORARY TABLE tmp.buyUltimate
+	CREATE OR REPLACE TEMPORARY TABLE tmp.buyUltimate
 		(PRIMARY KEY (itemFk, warehouseFk),
 		INDEX(itemFk))
 		ENGINE = MEMORY
diff --git a/db/routines/vn/procedures/buy_getUltimateFromInterval.sql b/db/routines/vn/procedures/buy_getUltimateFromInterval.sql
index df0d6a20e..c340686ba 100644
--- a/db/routines/vn/procedures/buy_getUltimateFromInterval.sql
+++ b/db/routines/vn/procedures/buy_getUltimateFromInterval.sql
@@ -21,7 +21,7 @@ BEGIN
 	END IF;
 
 	IF vEnded < vStarted THEN
-		SET vStarted = TIMESTAMPADD(MONTH, -1, vEnded);
+		SET vStarted = vEnded - INTERVAL 1 MONTH;
 	END IF;
 
 	-- Item
diff --git a/db/routines/vn/procedures/buy_updateGrouping.sql b/db/routines/vn/procedures/buy_updateGrouping.sql
index 45a619262..0d97fd8bf 100644
--- a/db/routines/vn/procedures/buy_updateGrouping.sql
+++ b/db/routines/vn/procedures/buy_updateGrouping.sql
@@ -1,5 +1,9 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`buy_updateGrouping`(vWarehouseFk INT, vItemFk INT, vGrouping INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`buy_updateGrouping`(
+	vWarehouseFk INT, 
+	vItemFk INT, 
+	vGrouping INT
+)
 BEGIN
 /**
  * Actualiza el grouping de las últimas compras de un artículo
@@ -8,9 +12,9 @@ BEGIN
  * @param vItemFk Id del Artículo
  * @param vGrouping Cantidad de grouping
  */
-	CALL vn.buy_getUltimate (vItemFk, vWarehouseFk, util.VN_CURDATE());
+	CALL buy_getUltimate (vItemFk, vWarehouseFk, util.VN_CURDATE());
 
-	UPDATE vn.buy b
+	UPDATE buy b
 			JOIN tmp.buyUltimate bu ON b.id = bu.buyFk
 		SET b.`grouping` = vGrouping
 		WHERE bu.warehouseFk = vWarehouseFk
diff --git a/db/routines/vn/procedures/catalog_calculate.sql b/db/routines/vn/procedures/catalog_calculate.sql
index 887492b35..6c4affa9d 100644
--- a/db/routines/vn/procedures/catalog_calculate.sql
+++ b/db/routines/vn/procedures/catalog_calculate.sql
@@ -74,7 +74,7 @@ BEGIN
 
 		CALL `cache`.available_refresh (vAvailableCalc, FALSE, vWarehouseFk, vShipped);
 		CALL `cache`.availableNoRaids_refresh (vAvailableNoRaidsCalc, FALSE, vWarehouseFk, vShipped);
-		CALL vn.buy_getUltimate(NULL, vWarehouseFk, vShipped);
+		CALL buy_getUltimate(NULL, vWarehouseFk, vShipped);
 
 		INSERT INTO tmp.ticketLot (warehouseFk, itemFk, available, buyFk, zoneFk)
 			SELECT vWarehouseFk,
diff --git a/db/routines/vn/procedures/item_getInfo.sql b/db/routines/vn/procedures/item_getInfo.sql
index f569d235b..5cd4fb31e 100644
--- a/db/routines/vn/procedures/item_getInfo.sql
+++ b/db/routines/vn/procedures/item_getInfo.sql
@@ -1,5 +1,8 @@
 DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`item_getInfo`(IN `vBarcode` VARCHAR(22), IN `vWarehouseFk` INT)
+CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `vn`.`item_getInfo`(
+	`vBarcode` VARCHAR(22), 
+	`vWarehouseFk` INT
+)
 BEGIN
 /**
  * Devuelve información relativa al item correspondiente del vBarcode pasado
@@ -11,13 +14,13 @@ BEGIN
 	DECLARE vCacheAvailableFk INT;
 	DECLARE vVisibleItemShelving INT;
 	DECLARE vItemFk INT;
+	DECLARE vDated DATE;
+
+	SELECT barcodeToItem(vBarcode), util.VN_CURDATE() INTO vItemFk, vDated;
 
 	CALL cache.visible_refresh(vCacheVisibleFk, FALSE, vWarehouseFk);
-	CALL cache.available_refresh(vCacheAvailableFk, FALSE, vWarehouseFk, util.VN_CURDATE());
-	
-	SELECT barcodeToItem(vBarcode) INTO vItemFk;
-
-	CALL buy_getUltimate(vItemFk, vWarehouseFk, util.VN_CURDATE());
+	CALL cache.available_refresh(vCacheAvailableFk, FALSE, vWarehouseFk, vDated);
+	CALL buy_getUltimate(vItemFk, vWarehouseFk, vDated);
 	
 	SELECT SUM(visible) INTO vVisibleItemShelving
 		FROM itemShelvingStock
diff --git a/modules/entry/back/methods/entry/addFromBuy.js b/modules/entry/back/methods/entry/addFromBuy.js
index 212aed7ea..c75c1935a 100644
--- a/modules/entry/back/methods/entry/addFromBuy.js
+++ b/modules/entry/back/methods/entry/addFromBuy.js
@@ -52,7 +52,7 @@ module.exports = Self => {
             else {
                 const userConfig = await models.UserConfig.findById(userId, {fields: ['warehouseFk']}, myOptions);
                 await Self.rawSql(
-                    'CALL vn.buy_getUltimate(?,?,?)',
+                    'CALL buy_getUltimate(?, ?, ?)',
                     [args.item, userConfig.warehouseFk, null],
                     myOptions
                 );