db/dump/fixtures.before.sql

@@ -2573,18 +2573,18 @@ INSERT INTO `vn`.`rate`(`dated`, `warehouseFk`, `rate0`, `rate1`, `rate2`, `rate
         (DATE_ADD(util.VN_CURDATE(), INTERVAL -1 YEAR), 1, 10, 15, 20, 25),
         (util.VN_CURDATE(), 1, 12, 17, 22, 27);
 
-INSERT INTO `vn`.`dua` (id, code, awbFk__, issued, operated, booked, bookEntried, gestdocFk, customsValue, companyFk)
+INSERT INTO `vn`.`dua` (id, code, issued, operated, booked, bookEntried, gestdocFk, customsValue, companyFk)
     VALUES
-        (1,  '19ES0028013A481523', 1,  util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 1, 11276.95,   442),
+        (1,  '19ES0028013A481523', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 1, 11276.95,   442),
-        (2,  '21ES00280136115760', 2,  util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 1376.20,    442),
+        (2,  '21ES00280136115760', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 1376.20,    442),
-        (3,  '19ES00280131956004', 3,  util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 3, 14268.50,   442),
+        (3,  '19ES00280131956004', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 3, 14268.50,   442),
-        (4,  '19ES00280131955995', 4,  util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 1, 8242.50,    442),
+        (4,  '19ES00280131955995', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 1, 8242.50,    442),
-        (5,  '19ES00280132022070', 5,  util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 10012.49,   442),
+        (5,  '19ES00280132022070', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 10012.49,   442),
-        (6,  '19ES00280132032308', 6,  util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 19914.25,   442),
+        (6,  '19ES00280132032308', util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 19914.25,   442),
-        (7,  '19ES00280132025489', 7,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 1934.06,    442),
+        (7,  '19ES00280132025489', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 1934.06,    442),
-        (8,  '19ES00280132025490', 8,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 3618.52,    442),
+        (8,  '19ES00280132025490', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 3618.52,    442),
-        (9,  '19ES00280132025491', 9,  DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 7126.23,    442),
+        (9,  '19ES00280132025491', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 7126.23,    442),
-        (10, '19ES00280132025492', 10, DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 4631.45,    442);
+        (10, '19ES00280132025492', DATE_ADD(util.VN_CURDATE(), INTERVAL -1 MONTH), util.VN_CURDATE(), util.VN_CURDATE(), util.VN_CURDATE(), 2, 4631.45,    442);
 
 INSERT INTO `vn`.`duaEntry` (`duaFk`, `entryFk`, `value`, `customsValue`, `euroValue`)
     VALUES

db/routines/edi/events/floramondo.sql

@@ -1,8 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` EVENT `edi`.`floramondo`
-	ON SCHEDULE EVERY 6 MINUTE
-		STARTS '2022-01-28 09:52:45.000'
-	ON COMPLETION NOT PRESERVE
-	DISABLE
-DO CALL edi.floramondo_offerRefresh()$$
-DELIMITER ;

db/routines/edi/procedures/floramondo_offerRefresh.sql

@@ -1,522 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`root`@`localhost` PROCEDURE `edi`.`floramondo_offerRefresh`()
-proc: BEGIN
-	DECLARE vLanded DATETIME;
-	DECLARE vDone INT DEFAULT FALSE;
-	DECLARE vFreeId INT;
-	DECLARE vSupplyResponseFk INT;
-	DECLARE vLastInserted DATETIME;
-	DECLARE vIsAuctionDay BOOLEAN;
-	DECLARE vMaxNewItems INT DEFAULT 10000;
-	DECLARE vStartingTime DATETIME;
-	DECLARE vAalsmeerMarketPlaceID VARCHAR(13) DEFAULT '8713783439043';
-	DECLARE vDayRange INT;
-
-	DECLARE cur1 CURSOR FOR
-		SELECT id
-			FROM edi.item_free;
-
-	DECLARE cur2 CURSOR FOR
-		SELECT srId
-			FROM itemToInsert;
-
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET vDone = TRUE;
-	DECLARE EXIT HANDLER FOR SQLSTATE '45000'
-	BEGIN
-		ROLLBACK;
-		RESIGNAL;
-	END;
-
-	DECLARE CONTINUE HANDLER FOR SQLEXCEPTION
-	BEGIN
-		DO RELEASE_LOCK('edi.floramondo_offerRefresh');
-		SET @isTriggerDisabled = FALSE;
-		RESIGNAL;
-	END;
-
-	IF 'test' = (SELECT environment FROM util.config) THEN
-		LEAVE proc;
-	END IF;
-
-	IF !GET_LOCK('edi.floramondo_offerRefresh', 0) THEN
-		LEAVE proc;
-	END IF;
-
-	SELECT dayRange INTO vDayRange 
-		FROM offerRefreshConfig;
-
-	IF vDayRange IS NULL THEN
-		CALL util.throw("Variable vDayRange not declared");
-	END IF;
-
-	SET vStartingTime = util.VN_NOW();
-
-	TRUNCATE edi.offerList;
-
-	INSERT INTO edi.offerList(supplier, total)
-		SELECT v.name, COUNT(DISTINCT sr.ID) total
-			FROM edi.supplyResponse sr
-					JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID
-				WHERE sr.NumberOfUnits > 0
-					AND sr.EmbalageCode != 999
-				GROUP BY sr.vmpID;
-
-	UPDATE edi.offerList o
-		JOIN (SELECT v.name, COUNT(*) total
-			FROM edi.supplyOffer sr
-				JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID
-				GROUP BY sr.vmpID) sub ON o.supplier = sub.name
-		SET o.`filter` = sub.total;
-
-	-- Elimina de la lista de items libres aquellos que ya existen
-	DELETE itf.*
-		FROM edi.item_free itf
-			JOIN vn.item i ON i.id = itf.id;
-
-	CREATE OR REPLACE TEMPORARY TABLE tmp
-	(INDEX (`Item_ArticleCode`))
-	ENGINE = MEMORY
-		SELECT 	t.*
-			FROM (
-				SELECT *
-					FROM edi.supplyOffer
-					ORDER BY (MarketPlaceID = vAalsmeerMarketPlaceID) DESC,
-						NumberOfUnits DESC LIMIT 10000000000000000000) t
-		GROUP BY t.srId;
-
-	CREATE OR REPLACE TEMPORARY TABLE edi.offer (INDEX (`srID`), INDEX (`EmbalageCode`),
-		INDEX (`ef1`), INDEX (`ef2`), INDEX (`ef3`), INDEX (`ef4`),INDEX (`ef5`), INDEX (`ef6`),
-		INDEX (`s1Value`), INDEX (`s2Value`), INDEX (`s3Value`), INDEX (`s4Value`),INDEX (`s5Value`), INDEX (`s6Value`))
-	ENGINE = MEMORY
-		SELECT so.*,
-				ev1.type_description s1Value,
-				ev2.type_description s2Value,
-				ev3.type_description s3Value,
-				ev4.type_description s4Value,
-				ev5.type_description s5Value,
-				ev6.type_description s6Value,
-				eif1.feature ef1,
-				eif2.feature ef2,
-				eif3.feature ef3,
-				eif4.feature ef4,
-				eif5.feature ef5,
-				eif6.feature ef6
-			FROM tmp so
-				LEFT JOIN edi.item_feature eif1 ON eif1.item_id = so.Item_ArticleCode
-					AND eif1.presentation_order = 1
-					AND eif1.expiry_date IS NULL
-				LEFT JOIN edi.item_feature eif2 ON eif2.item_id = so.Item_ArticleCode
-					AND eif2.presentation_order = 2
-					AND eif2.expiry_date IS NULL
-				LEFT JOIN edi.item_feature eif3 ON eif3.item_id = so.Item_ArticleCode
-					AND eif3.presentation_order = 3
-					AND eif3.expiry_date IS NULL
-				LEFT JOIN edi.item_feature eif4 ON eif4.item_id = so.Item_ArticleCode
-					AND eif4.presentation_order = 4
-					AND eif4.expiry_date IS NULL
-				LEFT JOIN edi.item_feature eif5 ON eif5.item_id = so.Item_ArticleCode
-					AND eif5.presentation_order = 5
-					AND eif5.expiry_date IS NULL
-				LEFT JOIN edi.item_feature eif6 ON eif6.item_id = so.Item_ArticleCode
-					AND eif6.presentation_order = 6
-					AND eif6.expiry_date IS NULL
-				LEFT JOIN edi.`value` ev1 ON ev1.type_id = eif1.feature
-					AND so.s1 = ev1.type_value
-				LEFT JOIN edi.`value` ev2 ON ev2.type_id = eif2.feature
-					AND so.s2 = ev2.type_value
-				LEFT JOIN edi.`value` ev3 ON ev3.type_id = eif3.feature
-					AND so.s3 = ev3.type_value
-				LEFT JOIN edi.`value` ev4 ON ev4.type_id = eif4.feature
-					AND so.s4 = ev4.type_value
-				LEFT JOIN edi.`value` ev5 ON ev5.type_id = eif5.feature
-					AND so.s5 = ev5.type_value
-				LEFT JOIN edi.`value` ev6 ON ev6.type_id = eif6.feature
-					AND so.s6 = ev6.type_value
-			ORDER BY Price;
-
-	DROP TEMPORARY TABLE tmp;
-
-	DELETE o
-		FROM edi.offer o
-			LEFT JOIN vn.tag t1 ON t1.ediTypeFk = o.ef1 AND t1.overwrite = 'size'
-			LEFT JOIN vn.tag t2 ON t2.ediTypeFk = o.ef2 AND t2.overwrite = 'size'
-			LEFT JOIN vn.tag t3 ON t3.ediTypeFk = o.ef3 AND t3.overwrite = 'size'
-			LEFT JOIN vn.tag t4 ON t4.ediTypeFk = o.ef4 AND t4.overwrite = 'size'
-			LEFT JOIN vn.tag t5 ON t5.ediTypeFk = o.ef5 AND t5.overwrite = 'size'
-			LEFT JOIN vn.tag t6 ON t6.ediTypeFk = o.ef6 AND t6.overwrite = 'size'
-			JOIN vn.floramondoConfig fc ON TRUE
-		WHERE (t1.id IS NOT NULL AND CONVERT(s1Value, UNSIGNED) > fc.itemMaxSize)
-			OR (t2.id IS NOT NULL AND CONVERT(s2Value, UNSIGNED) > fc.itemMaxSize)
-			OR (t3.id IS NOT NULL AND CONVERT(s3Value, UNSIGNED) > fc.itemMaxSize)
-			OR (t4.id IS NOT NULL AND CONVERT(s4Value, UNSIGNED) > fc.itemMaxSize)
-			OR (t5.id IS NOT NULL AND CONVERT(s5Value, UNSIGNED) > fc.itemMaxSize)
-			OR (t6.id IS NOT NULL AND CONVERT(s6Value, UNSIGNED) > fc.itemMaxSize);
-
-	START TRANSACTION;
-
-	-- Actualizamos el campo supplyResponseFk para aquellos articulos que ya estan creados y reutilizamos
-	UPDATE IGNORE edi.offer o
-			JOIN vn.item i
-				ON i.name = o.product_name
-				AND i.subname <=> o.company_name
-				AND i.value5 <=> o.s1Value
-				AND i.value6 <=> o.s2Value
-				AND i.value7 <=> o.s3Value
-				AND i.value8 <=> o.s4Value
-				AND i.value9 <=> o.s5Value
-				AND i.value10 <=> o.s6Value
-				AND i.NumberOfItemsPerCask <=> o.NumberOfItemsPerCask
-				AND i.EmbalageCode <=> o.EmbalageCode
-				AND i.quality <=> o.Quality
-			JOIN vn.itemType it ON it.id = i.typeFk
-			LEFT JOIN vn.sale s ON s.itemFk = i.id
-			LEFT JOIN vn.ticket t ON t.id = s.ticketFk
-				AND t.shipped > (util.VN_CURDATE() - INTERVAL 1 WEEK)
-			LEFT JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
-			LEFT JOIN edi.deliveryInformation di ON di.supplyResponseID = sr.ID
-			LEFT JOIN edi.putOrder po ON po.supplyResponseID = i.supplyResponseFk
-				AND po.OrderTradeLineDateTime > (util.VN_CURDATE() - INTERVAL 1 WEEK)
-		SET i.supplyResponseFk = o.srID
-		WHERE (sr.ID IS NULL
-				OR sr.NumberOfUnits = 0
-				OR di.LatestOrderDateTime < util.VN_NOW()
-				OR di.ID IS NULL)
-			AND it.isInventory
-			AND t.id IS NULL
-			AND po.id IS NULL;
-
-	CREATE OR REPLACE TEMPORARY TABLE itemToInsert
-	ENGINE = MEMORY
-		SELECT o.*, CAST(NULL AS DECIMAL(6,0)) itemFk
-			FROM edi.offer o
-				LEFT JOIN vn.item i ON i.supplyResponseFk = o.srId
-		WHERE i.id IS NULL
-	LIMIT vMaxNewItems;
-
-	-- Reciclado de nº de item
-	OPEN cur1;
-	OPEN cur2;
-
-	read_loop: LOOP
-
-		FETCH cur2 INTO vSupplyResponseFk;
-		FETCH cur1 INTO vFreeId;
-
-		IF vDone THEN
-			LEAVE read_loop;
-		END IF;
-
-		UPDATE itemToInsert
-			SET itemFk = vFreeId
-			WHERE srId = vSupplyResponseFk;
-
-	END LOOP;
-
-	CLOSE cur1;
-	CLOSE cur2;
-
-	-- Insertamos todos los items en Articles de la oferta
-	INSERT INTO vn.item(id,
-					`name`,
-					longName,
-					subName,
-					expenseFk,
-					typeFk,
-					intrastatFk,
-					originFk,
-					supplyResponseFk,
-					numberOfItemsPerCask,
-					embalageCode,
-					quality,
-					isFloramondo)
-		SELECT iti.itemFk,
-				iti.product_name,
-				iti.product_name,
-				iti.company_name,
-				iti.expenseFk,
-				iti.itemTypeFk,
-				iti.intrastatFk,
-				iti.originFk,
-				iti.`srId`,
-				iti.NumberOfItemsPerCask,
-				iti.EmbalageCode,
-				iti.Quality,
-				TRUE
-		FROM itemToInsert iti;
-
-	-- Inserta la foto de los articulos nuevos (prioridad alta)
-	INSERT IGNORE INTO vn.itemImageQueue(itemFk, url)
-		SELECT i.id, PictureReference
-			FROM itemToInsert ii
-				JOIN vn.item i ON i.supplyResponseFk = ii.srId
-			WHERE PictureReference IS NOT NULL
-				AND i.image IS NULL;
-
-	INSERT INTO edi.`log`(tableName, fieldName,fieldValue)
-		SELECT 'itemImageQueue','NumImagenesPtes', COUNT(*)
-			FROM vn.itemImageQueue
-			WHERE attempts = 0;
-
-	-- Inserta si se añadiesen tags nuevos
-	INSERT IGNORE INTO vn.tag (name, ediTypeFk)
-		SELECT description, type_id FROM edi.type;
-
-	-- Desabilita el trigger para recalcular los tags al final
-	SET @isTriggerDisabled = TRUE;
-
-	-- Inserta los tags sólo en los articulos nuevos
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , ii.product_name, 1
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.`name` = 'Producto'
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE NOT ii.product_name IS NULL;
-			
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , ii.Quality, 3
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.`name` = 'Calidad'
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE NOT ii.Quality IS NULL;
-			
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , ii.company_name, 4
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.`name` = 'Productor'
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE NOT ii.company_name IS NULL;
-
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , s1Value, 5
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.ediTypeFk = ii.ef1
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE NOT s1Value IS NULL;
-
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , s2Value, 6
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.ediTypeFk = ii.ef2
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE NOT s2Value IS NULL;
-
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , s3Value, 7
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.ediTypeFk = ii.ef3
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE NOT s3Value IS NULL;
-
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , s4Value, 8
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.ediTypeFk = ii.ef4
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE NOT s4Value IS NULL;
-
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , s5Value, 9
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.ediTypeFk = ii.ef5
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE NOT s5Value IS NULL;
-
-	INSERT INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id , s6Value, 10
-			FROM itemToInsert ii
-				JOIN vn.tag t ON t.ediTypeFk = ii.ef6
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-			WHERE NOT s6Value IS NULL;
-
-	INSERT IGNORE INTO vn.itemTag(itemFk, tagFk, value, priority)
-		SELECT i.id, t.id, IFNULL(ink.name, ik.color), 11
-			FROM itemToInsert ii
-				JOIN vn.item i ON i.supplyResponseFk = ii.`srId`
-				JOIN vn.tag t ON t.`name` = 'Color'
-				LEFT JOIN edi.feature f ON f.item_id = ii.Item_ArticleCode
-				LEFT JOIN edi.`type` tp ON tp.type_id = f.feature_type_id
-					AND tp.`description` = 'Hoofdkleur 1'
-				LEFT JOIN vn.ink ON ink.dutchCode = f.feature_value
-				LEFT JOIN vn.itemInk ik ON ik.longName = i.longName
-			WHERE ink.name IS NOT NULL
-				OR ik.color IS NOT NULL;
-
-	CREATE OR REPLACE TABLE tmp.item
-		(PRIMARY KEY (id))
-		SELECT i.id FROM vn.item i
-			JOIN itemToInsert ii ON i.supplyResponseFk = ii.`srId`;
-
-	CALL vn.item_refreshTags();
-
-	DROP TABLE tmp.item;
-
-	SELECT MIN(LatestDeliveryDateTime) INTO vLanded
-		FROM edi.supplyResponse sr
-			JOIN edi.deliveryInformation di ON di.supplyResponseID = sr.ID
-			JOIN edi.marketPlace mp ON mp.id = sr.MarketPlaceID
-			JOIN vn.floramondoConfig fc
-		WHERE mp.isLatestOrderDateTimeRelevant
-			AND di.LatestOrderDateTime > IF(
-				fc.MaxLatestOrderHour > HOUR(util.VN_NOW()),
-				util.VN_CURDATE(),
-				util.VN_CURDATE() + INTERVAL 1 DAY);
-
-	UPDATE vn.floramondoConfig
-		SET nextLanded = vLanded
-		WHERE vLanded IS NOT NULL;
-
-	-- Elimina la oferta obsoleta
-	UPDATE vn.buy b
-			JOIN vn.entry e ON e.id = b.entryFk
-			JOIN vn.travel tr ON tr.id = e.travelFk
-			JOIN vn.agencyMode am ON am.id = tr.agencyModeFk
-			JOIN vn.item i ON i.id = b.itemFk
-			LEFT JOIN edi.supplyResponse sr ON i.supplyResponseFk = sr.ID
-			LEFT JOIN edi.deliveryInformation di ON di.ID = b.deliveryFk
-		SET b.quantity = 0
-		WHERE (IFNULL(di.LatestOrderDateTime,util.VN_NOW()) <= util.VN_NOW()
-			OR i.supplyResponseFk IS NULL
-			OR sr.NumberOfUnits = 0)
-			AND am.name = 'LOGIFLORA'
-			AND e.isRaid;
-
-	-- Localiza las entradas de cada almacen
-	UPDATE edi.warehouseFloramondo
-		SET entryFk = vn.entry_getForLogiflora(vLanded + INTERVAL travellingDays DAY, warehouseFk);
-
-	IF vLanded IS NOT NULL THEN
-		-- Actualiza la oferta existente
-		UPDATE vn.buy b
-				JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk
-				JOIN vn.item i ON i.id = b.itemFk
-				JOIN edi.offer o ON i.supplyResponseFk = o.`srId`
-			SET b.quantity = o.NumberOfUnits * o.NumberOfItemsPerCask,
-				b.buyingValue = o.price
-			WHERE (b.quantity <> o.NumberOfUnits * o.NumberOfItemsPerCask
-				OR b.buyingValue <> o.price);
-
-		-- Inserta el resto
-		SET vLastInserted := util.VN_NOW();
-
-		-- Inserta la oferta
-		INSERT INTO vn.buy (
-				entryFk,
-				itemFk,
-				quantity,
-				buyingValue,
-				stickers,
-				packing,
-				`grouping`,
-				groupingMode,
-				packagingFk,
-				deliveryFk)
-			SELECT wf.entryFk,
-					i.id,
-					o.NumberOfUnits * o.NumberOfItemsPerCask quantity,
-					o.Price,
-					o.NumberOfUnits etiquetas,
-					o.NumberOfItemsPerCask packing,
-					GREATEST(1, IFNULL(o.MinimumQuantity,0)) * o.NumberOfItemsPerCask `grouping`,
-					'packing',
-					o.embalageCode,
-					o.diId
-				FROM edi.offer o
-					JOIN vn.item i ON i.supplyResponseFk = o.srId
-					JOIN edi.warehouseFloramondo wf
-					JOIN vn.packaging p ON p.id
-						LIKE o.embalageCode
-					LEFT JOIN vn.buy b ON b.itemFk = i.id
-						AND b.entryFk = wf.entryFk
-				WHERE b.id IS NULL; -- Quitar esta linea y mirar de crear los packages a tiempo REAL
-
-			INSERT INTO vn.itemCost(
-					itemFk,
-					warehouseFk,
-					cm3,
-					cm3delivery)
-				SELECT b.itemFk,
-						wf.warehouseFk,
-						@cm3 := vn.buy_getUnitVolume(b.id),
-						IFNULL((vc.standardFlowerBox * 1000) / i.packingOut, @cm3)
-					FROM warehouseFloramondo wf
-						JOIN vn.volumeConfig vc
-						JOIN vn.buy b ON b.entryFk = wf.entryFk
-						JOIN vn.item i ON i.id = b.itemFk
-						LEFT JOIN vn.itemCost ic ON ic.itemFk = b.itemFk
-							AND ic.warehouseFk = wf.warehouseFk
-					WHERE (ic.cm3 IS NULL OR ic.cm3 = 0)
-						ON DUPLICATE KEY UPDATE cm3 = @cm3, cm3delivery = IFNULL((vc.standardFlowerBox * 1000) / i.packingOut, @cm3);
-
-			CREATE OR REPLACE TEMPORARY TABLE tmp.buyRecalc
-			SELECT b.id
-				FROM vn.buy b
-					JOIN warehouseFloramondo wf ON wf.entryFk = b.entryFk
-				WHERE b.created >= vLastInserted;
-		
-			CALL vn.buy_recalcPrices();
-
-			UPDATE edi.offerList o
-				JOIN (SELECT v.name, COUNT(DISTINCT b.itemFk) total
-						FROM vn.buy b
-							JOIN vn.item i ON i.id = b.itemFk
-							JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
-							JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID
-							JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk
-							JOIN vn.warehouse w ON w.id = wf.warehouseFk
-							WHERE w.name = 'VNH'
-								AND b.quantity > 0
-						GROUP BY sr.vmpID) sub ON o.supplier = sub.name
-				SET o.vnh = sub.total;
-		
-			UPDATE edi.offerList o
-				JOIN (SELECT v.name, COUNT(DISTINCT b.itemFk) total
-						FROM vn.buy b
-							JOIN vn.item i ON i.id = b.itemFk
-							JOIN edi.supplyResponse sr ON sr.ID = i.supplyResponseFk
-							JOIN edi.VMPSettings v ON v.VMPID = sr.vmpID
-							JOIN edi.warehouseFloramondo wf ON wf.entryFk = b.entryFk
-							JOIN vn.warehouse w ON w.id = wf.warehouseFk
-							WHERE w.name = 'ALGEMESI'
-								AND b.quantity > 0
-						GROUP BY sr.vmpID) sub ON o.supplier = sub.name
-				SET o.algemesi = sub.total;
-	END IF;
-
-	DROP TEMPORARY TABLE
-		edi.offer,
-		itemToInsert;
-
-	SET @isTriggerDisabled = FALSE;
-
-	COMMIT;
-
-	-- Esto habria que pasarlo a procesos programados o trabajar con tags y dejar las familias
-	UPDATE vn.item i
-		SET typeFk = 121
-		WHERE i.longName LIKE 'Rosa Garden %'
-			AND typeFk = 17;
-
-	UPDATE vn.item i
-		SET typeFk = 156
-		WHERE i.longName LIKE 'Rosa ec %'
-			AND typeFk = 17;
-		
-	-- Refresca las fotos de los items existentes que mostramos (prioridad baja)
-	INSERT IGNORE INTO vn.itemImageQueue(itemFk, url, priority)
-		SELECT i.id, sr.PictureReference, 100
-			FROM edi.supplyResponse sr
-				JOIN vn.item i ON i.supplyResponseFk = sr.ID
-				JOIN edi.supplyOffer so ON so.srId = sr.ID
-				JOIN hedera.image i2 ON i2.name = i.image 
-					AND i2.collectionFk = 'catalog'
-			WHERE i2.updated <= (UNIX_TIMESTAMP(util.VN_NOW()) - vDayRange)
-				AND sr.NumberOfUnits;
-
-	INSERT INTO edi.`log`
-		SET tableName = 'floramondo_offerRefresh',
-			fieldName = 'Tiempo de proceso',
-			fieldValue = TIMEDIFF(util.VN_NOW(), vStartingTime);
-
-	DO RELEASE_LOCK('edi.floramondo_offerRefresh');
-END$$
-DELIMITER ;

db/routines/vn/functions/entry_getForLogiflora.sql

@@ -1,64 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`entry_getForLogiflora`(vLanded DATE, vWarehouseFk INT)
-	RETURNS int(11)
-	NOT DETERMINISTIC
-	READS SQL DATA
-BEGIN
-	
-	/**
-	 * Devuelve una entrada para Logiflora. Si no existe la crea.
-	 * 
-	 * @param vLanded Fecha de llegada al almacén
-	 * @param vWarehouseFk Identificador de vn.warehouse
-	 */
-
-	DECLARE vTravelFk INT;
-	DECLARE vEntryFk INT;
-    	DECLARE previousEntryFk INT;
- 
-    SET vTravelFk = vn.travel_getForLogiflora(vLanded, vWarehouseFk);
-    
-    IF vLanded THEN
-    
-		SELECT IFNULL(MAX(id),0) INTO vEntryFk 
-			FROM vn.entry
-			WHERE travelFk = vTravelFk 
-				AND isRaid;
-
-		IF NOT vEntryFk THEN
-		
-			INSERT INTO vn.entry(travelFk, supplierFk, commission, companyFk, currencyFk, isRaid)
-				SELECT vTravelFk, s.id, 4, c.id, cu.id, TRUE
-					FROM vn.supplier s
-						JOIN vn.company c ON c.code = 'VNL'
-						JOIN vn.currency cu ON cu.code = 'EUR'
-					WHERE s.name = 'KONINKLIJE COOPERATIEVE BLOEMENVEILING FLORAHOLLAN';
-					
-			SELECT MAX(id) INTO vEntryFk 
-				FROM vn.entry
-				WHERE travelFk = vTravelFk;
-				
-		END IF;
-        
-	END IF;	
-
-	SELECT entryFk INTO previousEntryFk 
-		FROM edi.warehouseFloramondo wf
-        	WHERE wf.warehouseFk = vWarehouseFk;
-    
-	IF IFNULL(previousEntryFk,0) != vEntryFk THEN
-		
-		UPDATE buy b 
-			SET b.printedStickers = 0 
-			WHERE entryFk = previousEntryFk;
-
-		DELETE FROM buy WHERE entryFk = previousEntryFk;
-        
-		DELETE FROM entry WHERE id = previousEntryFk;
-  
-	END IF;
-	
-	RETURN vEntryFk;
-    
-END$$
-DELIMITER ;

db/routines/vn/functions/travel_getForLogiflora.sql

@@ -1,52 +0,0 @@
-DELIMITER $$
-CREATE OR REPLACE DEFINER=`vn`@`localhost` FUNCTION `vn`.`travel_getForLogiflora`(vLanded DATE, vWarehouseFk INT)
-	RETURNS int(11)
-	NOT DETERMINISTIC
-	READS SQL DATA
-BEGIN
-	
-	/**
-	 * Devuelve un número de travel para compras de Logiflora a partir de la fecha de llegada y del almacén.
-	 * Si no existe lo genera.
-	 * 
-	 * @param vLanded Fecha de llegada al almacén
-	 * @param vWarehouseFk Identificador de vn.warehouse
-	 */
-
-	DECLARE vTravelFk INT;
-
-	IF vLanded THEN
-	
-		SELECT IFNULL(MAX(tr.id),0) INTO vTravelFk 
-			FROM vn.travel tr
-				JOIN vn.warehouse wIn ON wIn.id = tr.warehouseInFk
-				JOIN vn.warehouse wOut ON wOut.id = tr.warehouseOutFk
-            		JOIN vn.agencyMode am ON am.id = tr.agencyModeFk
-			WHERE wIn.id = vWarehouseFk
-				AND wOut.name = 'Holanda'
-                	AND am.name = 'LOGIFLORA'
-				AND landed = vLanded;
-
-		IF NOT vTravelFk THEN
-		
-			INSERT INTO vn.travel(landed, shipped, warehouseInFk, warehouseOutFk, agencyModeFk)
-				SELECT vLanded, util.VN_CURDATE(), vWarehouseFk, wOut.id, am.id 
-					FROM vn.warehouse wOut 
-						JOIN vn.agencyMode am ON am.name = 'LOGIFLORA'
-					WHERE wOut.name = 'Holanda';
-					
-			SELECT MAX(tr.id) INTO vTravelFk 
-				FROM vn.travel tr
-					JOIN vn.warehouse wIn ON wIn.id = tr.warehouseInFk
-					JOIN vn.warehouse wOut ON wOut.id = tr.warehouseOutFk
-						WHERE wIn.id = vWarehouseFk
-							AND wOut.name = 'Holanda'
-							AND landed = vLanded;
-		END IF;
-        
-	END IF;
-    
-	RETURN vTravelFk;
-    
-END$$
-DELIMITER ;

db/routines/vn/procedures/supplier_statementWithEntries.sql

@@ -64,14 +64,14 @@ BEGIN
 						c.code,
 						'invoiceIn' statementType
 					FROM invoiceIn ii
-						JOIN invoiceInDueDay iid ON iid.invoiceInFk = ii.id
+						LEFT JOIN invoiceInDueDay iid ON iid.invoiceInFk = ii.id
 						JOIN currency c ON c.id = ii.currencyFk
 					WHERE ii.issued >= vBalanceStartingDate
 						AND ii.supplierFk = vSupplierFk
 						AND vCurrencyFk IN (ii.currencyFk, 0)
 						AND vCompanyFk IN (ii.companyFk, 0)
 						AND (vIsConciliated = ii.isBooked OR NOT vIsConciliated)
-					GROUP BY iid.id
+					GROUP BY iid.id, ii.id
 				UNION ALL
 				SELECT p.bankFk,
 						p.companyFk,

db/routines/vn2008/views/Articles.sql

@@ -41,7 +41,6 @@ AS SELECT `i`.`id` AS `Id_Article`,
 	`i`.`hasKgPrice` AS `hasKgPrice`,
 	`i`.`equivalent` AS `Equivalente`,
 	`i`.`isToPrint` AS `Imprimir`,
-	`i`.`family` AS `Familia__`,
 	`i`.`doPhoto` AS `do_photo`,
 	`i`.`created` AS `odbc_date`,
 	`i`.`isFloramondo` AS `isFloramondo`,

db/versions/11210-greenDendro/00-firstScript.sql

@@ -0,0 +1,8 @@
+ALTER TABLE util.config
+	CHANGE dbVersion dbVersion__ char(11) DEFAULT NULL COMMENT '@deprecated 2024-09-02 refs #7819';
+
+ALTER TABLE util.config
+	CHANGE hasTriggersDisabled hasTriggersDisabled__ tinyint(1) DEFAULT 0 NOT NULL COMMENT '@deprecated 2024-09-02 refs #7819';
+
+RENAME TABLE account.accountLog TO account.accountLog__;
+	ALTER TABLE account.accountLog__ COMMENT='@deprecated 2024-09-02 refs #7819';

db/versions/11210-greenDendro/01-firstScript.sql

@@ -0,0 +1 @@
+DROP DATABASE IF EXISTS `.mysqlworkbench`;

db/versions/11210-greenDendro/02-firstScript.sql

@@ -0,0 +1,84 @@
+ALTER TABLE bi.rutasBoard DROP COLUMN coste_bulto__;
+ALTER TABLE bi.rutasBoard DROP COLUMN Dia__;
+ALTER TABLE bi.rutasBoard DROP COLUMN km__;
+ALTER TABLE bi.rutasBoard DROP COLUMN m3__;
+ALTER TABLE bi.rutasBoard DROP COLUMN Matricula__;
+ALTER TABLE bi.rutasBoard DROP COLUMN month__;
+ALTER TABLE bi.rutasBoard DROP COLUMN Terceros__;
+ALTER TABLE bi.rutasBoard DROP COLUMN Tipo__;
+ALTER TABLE bi.rutasBoard DROP COLUMN warehouse_id__;
+ALTER TABLE bi.rutasBoard DROP COLUMN year__;
+
+ALTER TABLE bs.clientDied DROP COLUMN Boss__;
+ALTER TABLE bs.clientDied DROP COLUMN clientName__;
+ALTER TABLE bs.clientDied DROP COLUMN workerCode__;
+
+ALTER TABLE bs.salesByItemTypeDay DROP COLUMN netSale__;
+
+ALTER TABLE vn.agency DROP FOREIGN KEY agency_FK;
+ALTER TABLE vn.agency DROP COLUMN warehouseAliasFk__;
+
+ALTER TABLE vn.awbComponent DROP COLUMN dated__;
+
+ALTER TABLE vn.buy DROP COLUMN containerFk__;
+
+ALTER TABLE vn.chat DROP COLUMN status__;
+
+ALTER TABLE vn.claim DROP COLUMN rma__;
+
+ALTER TABLE vn.client DROP COLUMN clientTypeFk__;
+ALTER TABLE vn.client DROP COLUMN hasIncoterms__;
+
+ALTER TABLE vn.clientType DROP COLUMN id__;
+
+ALTER TABLE vn.cmr DROP FOREIGN KEY cmr_fk1;
+ALTER TABLE vn.cmr DROP COLUMN ticketFk__;
+
+ALTER TABLE vn.company DROP COLUMN sage200Company__;
+
+ALTER TABLE vn.country DROP FOREIGN KEY country_FK;
+ALTER TABLE vn.country DROP COLUMN politicalCountryFk__;
+
+ALTER TABLE vn.deliveryNote DROP FOREIGN KEY albaran_FK;
+ALTER TABLE vn.deliveryNote DROP COLUMN farmingFk__;
+
+ALTER TABLE vn.dmsType DROP COLUMN path__;
+
+ALTER TABLE vn.dua DROP COLUMN awbFk__;
+
+ALTER TABLE vn.entry DROP COLUMN isBlocked__;
+
+ALTER TABLE vn.expedition DROP COLUMN itemFk__;
+
+ALTER TABLE vn.item DROP COLUMN minQuantity__;
+ALTER TABLE vn.item DROP COLUMN packingShelve__;
+
+ALTER TABLE vn.itemType DROP COLUMN compression__;
+ALTER TABLE vn.itemType DROP COLUMN density__;
+ALTER TABLE vn.itemType DROP COLUMN hasComponents__;
+ALTER TABLE vn.itemType DROP COLUMN location__;
+ALTER TABLE vn.itemType DROP COLUMN maneuver__;
+ALTER TABLE vn.itemType DROP COLUMN profit__;
+ALTER TABLE vn.itemType DROP COLUMN target__;
+ALTER TABLE vn.itemType DROP COLUMN topMargin__;
+ALTER TABLE vn.itemType DROP COLUMN transaction__;
+ALTER TABLE vn.itemType DROP FOREIGN KEY warehouseFk5;
+ALTER TABLE vn.itemType DROP COLUMN warehouseFk__;
+
+ALTER TABLE vn.ledgerConfig DROP COLUMN lastBookEntry__;
+
+ALTER TABLE vn.saleTracking DROP FOREIGN KEY saleTracking_FK_1;
+ALTER TABLE vn.saleTracking DROP COLUMN actionFk__;
+
+ALTER TABLE vn.supplier DROP COLUMN isFarmer__;
+
+ALTER TABLE vn.supplierAccount DROP COLUMN description__;
+
+ALTER TABLE vn.ticketRequest DROP COLUMN buyerCode__;
+
+ALTER TABLE vn.travel DROP COLUMN agencyFk__;
+
+ALTER TABLE vn.warehouse DROP FOREIGN KEY warehouse_ibfk_2;
+ALTER TABLE vn.warehouse DROP COLUMN aliasFk__;
+
+ALTER TABLE vn.worker DROP COLUMN labelerFk__;

db/versions/11210-greenDendro/03-firstScript.sql

@@ -0,0 +1,21 @@
+DROP TABLE IF EXISTS account.mailClientAccess__;
+DROP TABLE IF EXISTS account.mailSenderAccess__;
+DROP TABLE IF EXISTS bi.analisis_ventas_familia_evolution__;
+DROP TABLE IF EXISTS bi.live_counter__;
+DROP TABLE IF EXISTS bi.partitioning_information__;
+DROP TABLE IF EXISTS bi.primer_pedido__;
+DROP TABLE IF EXISTS bi.tarifa_premisas__;
+DROP TABLE IF EXISTS bi.tarifa_warehouse__;
+DROP TABLE IF EXISTS bs.compradores__;
+DROP TABLE IF EXISTS bs.salesMonthlySnapshot___;
+DROP TABLE IF EXISTS bs.salesPerson__;
+DROP TABLE IF EXISTS bs.vendedores_evolution__;
+DROP TABLE IF EXISTS vn.botanicExport__;
+DROP TABLE IF EXISTS vn.claimRma__;
+DROP TABLE IF EXISTS vn.coolerPathDetail__;
+DROP TABLE IF EXISTS vn.forecastedBalance__;
+DROP TABLE IF EXISTS vn.routeLoadWorker__;
+DROP TABLE IF EXISTS vn.routeUserPercentage__;
+DROP TABLE IF EXISTS vn.ticketSms__;
+DROP TABLE IF EXISTS vn.ticketTrackingState__;
+DROP TABLE IF EXISTS vn.warehouseAlias__;

db/versions/11223-turquoiseLilium/00-firstScript.sql

@@ -0,0 +1,2 @@
+INSERT INTO salix.ACL  (model, property, accessType, permission, principalType, principalId) 
+VALUES( 'Device', 'handleUser', '*', 'ALLOW', 'ROLE', 'employee');

db/versions/11234-yellowRuscus/00-firstScript.sql

@@ -0,0 +1,13 @@
+ALTER TABLE `vn`.`payrollWorkCenter` DROP PRIMARY KEY;
+ALTER TABLE `vn`.`payrollWorkCenter` DROP COLUMN `empresa_id__`;
+ALTER TABLE `vn`.`payrollWorkCenter` DROP COLUMN `Centro__`;
+ALTER TABLE `vn`.`payrollWorkCenter` DROP COLUMN `nss_cotizacion__`;
+ALTER TABLE `vn`.`payrollWorkCenter` DROP COLUMN `domicilio__`;
+ALTER TABLE `vn`.`payrollWorkCenter` DROP COLUMN `poblacion__`;
+ALTER TABLE `vn`.`payrollWorkCenter` DROP COLUMN `cp__`;
+ALTER TABLE `vn`.`payrollWorker` DROP COLUMN `nss__`;
+ALTER TABLE `vn`.`payrollWorker` DROP COLUMN `codpuesto__`;
+ALTER TABLE `vn`.`payrollWorker` DROP COLUMN `codcontrato__`;
+ALTER TABLE `vn`.`payrollWorker` DROP COLUMN `FAntiguedad__`;
+ALTER TABLE `vn`.`payrollWorker` DROP COLUMN `codcategoria__`;
+ALTER TABLE `vn`.`payrollWorker` DROP COLUMN `ContratoTemporal__`;

modules/client/front/balance/create/index.js

@@ -33,7 +33,6 @@ class Controller extends Dialog {
             }
         };
 
-        this.getAmountPaid();
         this.$http.get(`Clients/findOne`, {filter})
             .then(res => {
                 this.receipt.email = res.data.email;
@@ -52,6 +51,7 @@ class Controller extends Dialog {
 
     set companyFk(value) {
         this.receipt.companyFk = value;
+        this.getAmountPaid();
     }
 
     set description(value) {

modules/entry/back/methods/entry/print.js

@@ -53,6 +53,13 @@ module.exports = Self => {
         }
 
         if (!merger._doc) throw new UserError('The entry not have stickers');
+
+        await Self.rawSql(`
+            UPDATE buy
+                SET printedStickers = stickers
+                WHERE entryFk = ?
+        `, [id], myOptions);
+
         return [await merger.saveAsBuffer(), 'application/pdf', `filename="entry-${id}.pdf"`];
     };
 };

modules/worker/back/methods/device/handle-user.js

@@ -0,0 +1,118 @@
+
+const UserError = require('vn-loopback/util/user-error');
+
+module.exports = Self => {
+    Self.remoteMethodCtx('handleUser', {
+        description: 'Manage various aspects related to a user with the app',
+        accepts: [
+            {
+                arg: 'androidId',
+                type: 'String',
+                description: 'Android id'
+            },
+            {
+                arg: 'deviceId',
+                type: 'String',
+                description: 'Device id'
+            },
+            {
+                arg: 'versionApp',
+                type: 'String',
+                description: 'Version app'
+            }, {
+                arg: 'nameApp',
+                type: 'String',
+                description: 'Version app'
+            },
+
+        ],
+        returns: {
+            type: 'object',
+            root: true
+        },
+        http: {
+            path: `/handleUser`,
+            verb: 'POST'
+        }
+    });
+
+    Self.handleUser = async(ctx, androidId, deviceId, versionApp, nameApp, options) => {
+        const models = Self.app.models;
+        const myOptions = {};
+
+        if (typeof options == 'object')
+            Object.assign(myOptions, options);
+
+        const accessToken = ctx.req.accessToken;
+        let user = await models.VnUser.findById(accessToken.userId);
+
+        const [[{vIsAuthorized, vMessage}]] =
+            await Self.rawSql('CALL vn.device_checkLogin(?, ?);',
+                [user.id, androidId], myOptions);
+
+        if (!vIsAuthorized)
+            throw new UserError('Not authorized');
+
+        const isUserInOperator = await models.Operator.findOne({
+            where: {
+                workerFk: user.id
+            }
+        }, myOptions);
+
+        if (!isUserInOperator) {
+            await models.Operator.create({
+                'workerFk': user.id,
+                'isOnReservationMode': false
+            });
+        }
+
+        const whereCondition = deviceId ? {id: deviceId} : {android_id: androidId};
+        const serialNumber =
+            (await models.DeviceProduction.findOne({where: whereCondition}, myOptions))?.serialNumber ?? '';
+
+        await models.DeviceLog.create({
+            'android_id': androidId,
+            'userFk': user.id,
+            'nameApp': nameApp,
+            'versionApp': versionApp,
+            'serialNumber': serialNumber
+        }, myOptions);
+        const getDataUser = await models.VnUser.getCurrentUserData(ctx);
+
+        const getDataOperator = await models.Operator.findOne({
+            where: {workerFk: user.id},
+            fields: ['numberOfWagons', 'warehouseFk', 'itemPackingTypeFk', 'sectorFk', 'sector',
+                'trainFk', 'train', 'labelerFk', 'printer'],
+            include: [
+                {
+                    relation: 'sector',
+                    scope: {
+                        fields: ['warehouseFk', 'description'],
+                    }
+                }, {
+                    relation: 'printer',
+                    scope: {
+                        fields: ['name'],
+                    }
+                }, {
+                    relation: 'train',
+                    scope: {
+                        fields: ['name'],
+                    }
+                }
+
+            ]
+        }, myOptions);
+
+        const getVersion = await models.MobileAppVersionControl.getVersion(ctx, nameApp);
+
+        const combinedResult = {
+            ...getDataOperator.toObject(),
+            ...getDataUser.toObject(),
+            ...getVersion,
+            message: vMessage,
+            serialNumber,
+        };
+        return combinedResult;
+    };
+};

modules/worker/back/methods/device/specs/handle-user.spec.js

@@ -0,0 +1,16 @@
+const {models} = require('vn-loopback/server/server');
+
+describe('Device handleUser()', () => {
+    const ctx = {req: {accessToken: {userId: 9}}};
+
+    it('should return  data from user', async() => {
+        const androidId = 'androidid11234567890';
+        const deviceId = 1;
+        const nameApp = 'warehouse';
+        const versionApp = '10';
+
+        const data = await models.Device.handleUser(ctx, androidId, deviceId, versionApp, nameApp);
+
+        expect(data.numberOfWagons).toBe(2);
+    });
+});

modules/worker/back/models/device.js

@@ -1,6 +1,7 @@
 const UserError = require('vn-loopback/util/user-error');
 
 module.exports = Self => {
+    require('../methods/device/handle-user')(Self);
     Self.rewriteDbError(function(err) {
         if (err.code === 'ER_DUP_ENTRY')
             return new UserError(``);