From d2cd522842dbb024f9812b68ed8a58fff4e2fc99 Mon Sep 17 00:00:00 2001
From: sergiodt <sergiodt@verdnatura.es>
Date: Thu, 14 Sep 2023 07:47:10 +0200
Subject: [PATCH] refs #5652 modify:without fit

---
 db/changes/233801/00-item_setVisibleDiscard.sql     | 13 +++++--------
 db/changes/233801/00-ticketConfig.sql               | 11 -----------
 db/dump/fixtures.sql                                |  7 ++-----
 modules/client/back/methods/address/getAddress.js   | 13 ++++++++-----
 .../back/methods/address/specs/getAddress.spec.js   |  5 ++---
 5 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/db/changes/233801/00-item_setVisibleDiscard.sql b/db/changes/233801/00-item_setVisibleDiscard.sql
index 1b9bf0ffb3..e73a770465 100644
--- a/db/changes/233801/00-item_setVisibleDiscard.sql
+++ b/db/changes/233801/00-item_setVisibleDiscard.sql
@@ -14,9 +14,8 @@ BEGIN
 
 	SELECT barcodeToItem(vItemFk) INTO vItemFk;
 
-	SELECT companyDefaultFk INTO vCompanyVnlFk
-		FROM ticketConfig ;
-
+	SELECT DEFAULT(companyFk)  INTO vCompanyVnlFk 
+		FROM vn.ticket LIMIT 1;
 	SELECT c.id INTO vClientFk
 		FROM client c
 			JOIN address a ON a.clientFk = c.id 
@@ -26,10 +25,8 @@ BEGIN
 		FROM ticket t
 			JOIN address a ON a.id = t.addressFk
 		WHERE t.warehouseFk = vWarehouseFk
-			AND t.clientFk = vClientFk
-			AND DATE(t.shipped) = util.VN_CURDATE()
-			AND a.isDefaultAddress
-		LIMIT 1;
+			AND a.id = vAddressFk
+			AND DATE(t.shipped) = util.VN_CURDATE();
 
 	CALL cache.visible_refresh(vCalc, TRUE, vWarehouseFk);
 
@@ -39,7 +36,7 @@ BEGIN
 			util.VN_CURDATE(),
 			vWarehouseFk,
 			vCompanyVnlFk,
-			NULL,
+			vAddressFk,
 			NULL,
 			NULL,
 			util.VN_CURDATE(),
diff --git a/db/changes/233801/00-ticketConfig.sql b/db/changes/233801/00-ticketConfig.sql
index 5cef1ba5f3..5429878b4e 100644
--- a/db/changes/233801/00-ticketConfig.sql
+++ b/db/changes/233801/00-ticketConfig.sql
@@ -1,15 +1,4 @@
 
-ALTER TABLE `vn`.`ticketConfig` ADD companyDefaultFk int(10) unsigned DEFAULT 442 NOT NULL COMMENT 'Compañía por defecto para crear ticket';
-
-ALTER TABLE `vn`.`ticketConfig` ADD CONSTRAINT ticketConfig_FK FOREIGN KEY (companyDefaultFk) REFERENCES vn.company(id) ON DELETE CASCADE ON UPDATE CASCADE;
-
--- Se desactivan por utilizarse muy poco
-
-UPDATE vn.address
-	SET isDefaultAddress = 0, 
-        isActive = 0
-	WHERE id IN (6,47);
-
 	INSERT INTO `salix`.`ACL` (model, property, accessType, permission, principalType, principalId)
 	 VALUES('Item', 'setVisibleDiscard', 'WRITE', 'ALLOW', 'ROLE', 'employee');
 	 
diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index 7ce39287ed..4e56c83859 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -2959,11 +2959,8 @@ INSERT INTO `hedera`.`imageConfig` (`id`, `maxSize`, `useXsendfile`, `url`)
     VALUES
         (1, 0, 0, 'marvel.com');
 
---fixtures for getaddressLastYear
+--fixtures for getaddress
 UPDATE vn.client
 	SET typeFk='loses'
 	WHERE id=1101;
-	
-UPDATE vn.ticket
-	SET created='2023-08-01 00:00:00'
-	WHERE id=6;
\ No newline at end of file
+	
\ No newline at end of file
diff --git a/modules/client/back/methods/address/getAddress.js b/modules/client/back/methods/address/getAddress.js
index a15fb8abab..86a23674fe 100644
--- a/modules/client/back/methods/address/getAddress.js
+++ b/modules/client/back/methods/address/getAddress.js
@@ -1,6 +1,6 @@
 module.exports = Self => {
     Self.remoteMethod('getAddress', {
-        description: 'Get all activated address client active',
+        description: 'Get all activated address with loses client activated',
         accessType: 'READ',
         accepts: [],
         returns: {
@@ -12,10 +12,13 @@ module.exports = Self => {
             verb: 'GET'
         }
     });
-
     Self.getAddress = async() => {
-        const query = `CALL vn.address_getLoses()`;
-        const [result] = await Self.rawSql(query);
-        return result;
+        let getAddressQuery = `
+    SELECT a.id, a.nickname
+		FROM vn.address a
+			JOIN vn.client c ON a.clientFk = c.id AND c.isActive = 1
+		WHERE c.typeFk = 'loses' AND a.isActive = 1;`;
+
+        return result = await Self.rawSql(getAddressQuery);
     };
 };
diff --git a/modules/client/back/methods/address/specs/getAddress.spec.js b/modules/client/back/methods/address/specs/getAddress.spec.js
index d2b2194950..a86e1007c2 100644
--- a/modules/client/back/methods/address/specs/getAddress.spec.js
+++ b/modules/client/back/methods/address/specs/getAddress.spec.js
@@ -1,10 +1,9 @@
 const {models} = require('vn-loopback/server/server');
 
 describe('getAddress()', () => {
-    it('return list of address last year', async() => {
+    it('return list of activated address with loses client activated', async() => {
         let response = await models.Address.getAddress();
 
-        expect(response.length).toBeGreaterThan(0);
-        expect(response[0].addressFk).toEqual(1);
+        expect(response.length).toEqual(2);
     });
 });