From 95967a29dbb13869aabc76cdb5fa265830dcb150 Mon Sep 17 00:00:00 2001 From: alexandre Date: Tue, 13 Dec 2022 11:50:17 +0100 Subject: [PATCH 1/7] refs #4928 email template added and proc modified --- db/changes/224702/00-notificationProc.sql | 7 +-- db/changes/225001/.gitkeep | 1 - .../225001/00-supplier_beforeUpdate.sql | 48 +++++++++++++++++++ .../assets/css/import.js | 11 +++++ .../supplier-pay-method-update/locale/en.yml | 3 ++ .../supplier-pay-method-update/locale/es.yml | 3 ++ .../supplier-pay-method-update.html | 8 ++++ .../supplier-pay-method-update.js | 23 +++++++++ 8 files changed, 97 insertions(+), 7 deletions(-) delete mode 100644 db/changes/225001/.gitkeep create mode 100644 db/changes/225001/00-supplier_beforeUpdate.sql create mode 100644 print/templates/email/supplier-pay-method-update/assets/css/import.js create mode 100644 print/templates/email/supplier-pay-method-update/locale/en.yml create mode 100644 print/templates/email/supplier-pay-method-update/locale/es.yml create mode 100644 print/templates/email/supplier-pay-method-update/supplier-pay-method-update.html create mode 100755 print/templates/email/supplier-pay-method-update/supplier-pay-method-update.js diff --git a/db/changes/224702/00-notificationProc.sql b/db/changes/224702/00-notificationProc.sql index 475b2e389..2cf11b4f1 100644 --- a/db/changes/224702/00-notificationProc.sql +++ b/db/changes/224702/00-notificationProc.sql @@ -12,14 +12,9 @@ BEGIN * @param vAuthorFk The notification author or %NULL if there is no author * @return The notification id */ - DECLARE vNotificationFk INT; - - SELECT id INTO vNotificationFk - FROM `notification` - WHERE `name` = vNotificationName; INSERT INTO notificationQueue - SET notificationFk = vNotificationFk, + SET notificationFk = vNotificationName, params = vParams, authorFk = vAuthorFk; diff --git a/db/changes/225001/.gitkeep b/db/changes/225001/.gitkeep deleted file mode 100644 index 7a4187c02..000000000 --- a/db/changes/225001/.gitkeep +++ /dev/null @@ -1 +0,0 @@ -Delete this file diff --git a/db/changes/225001/00-supplier_beforeUpdate.sql b/db/changes/225001/00-supplier_beforeUpdate.sql new file mode 100644 index 000000000..857d3206f --- /dev/null +++ b/db/changes/225001/00-supplier_beforeUpdate.sql @@ -0,0 +1,48 @@ +DROP TRIGGER IF EXISTS vn.supplier_beforeUpdate; +USE vn; + +DELIMITER $$ +$$ +CREATE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplier_beforeUpdate` + BEFORE UPDATE ON `supplier` + FOR EACH ROW +BEGIN + DECLARE vHasChange BOOL DEFAULT FALSE; + DECLARE vPayMethodHasVerified BOOL; + DECLARE vParams JSON; + DECLARE vOldPayMethodName VARCHAR(20); + DECLARE vNewPayMethodName VARCHAR(20); + + SELECT hasVerified INTO vPayMethodHasVerified + FROM payMethod + WHERE id = NEW.payMethodFk; + + SET vHasChange = (NEW.payMethodFk <=> OLD.payMethodFk); + + IF !vHasChange THEN + SELECT name INTO vOldPayMethodName + FROM payMethod + WHERE id = OLD.payMethodFk; + SELECT name INTO vNewPayMethodName + FROM payMethod + WHERE id = NEW.payMethodFk; + SET vParams = JSON_OBJECT( + 'name', NEW.name, + 'oldPayMethod', vOldPayMethodName, + 'newPayMethod', vNewPayMethodName + ); + SELECT util.notification_send('supplier-pay-method-update', vParams, NULL) INTO @id; + END IF; + + SET vHasChange = (NEW.payDemFk <=> OLD.payDemFk) OR (NEW.payDay <=> OLD.payDay); + + IF vPayMethodHasVerified AND !vHasChange THEN + SET vHasChange = (NEW.payMethodFk <=> OLD.payMethodFk); + END IF; + + IF vHasChange THEN + SET NEW.isPayMethodChecked = FALSE; + END IF; + +END$$ +DELIMITER ; diff --git a/print/templates/email/supplier-pay-method-update/assets/css/import.js b/print/templates/email/supplier-pay-method-update/assets/css/import.js new file mode 100644 index 000000000..4b4bb7086 --- /dev/null +++ b/print/templates/email/supplier-pay-method-update/assets/css/import.js @@ -0,0 +1,11 @@ +const Stylesheet = require(`vn-print/core/stylesheet`); + +const path = require('path'); +const vnPrintPath = path.resolve('print'); + +module.exports = new Stylesheet([ + `${vnPrintPath}/common/css/spacing.css`, + `${vnPrintPath}/common/css/misc.css`, + `${vnPrintPath}/common/css/layout.css`, + `${vnPrintPath}/common/css/email.css`]) + .mergeStyles(); diff --git a/print/templates/email/supplier-pay-method-update/locale/en.yml b/print/templates/email/supplier-pay-method-update/locale/en.yml new file mode 100644 index 000000000..f04ccc5ce --- /dev/null +++ b/print/templates/email/supplier-pay-method-update/locale/en.yml @@ -0,0 +1,3 @@ +subject: Pay method updated +title: Pay method updated +description: The pay method of the supplier {0} has been updated from {1} to {2} diff --git a/print/templates/email/supplier-pay-method-update/locale/es.yml b/print/templates/email/supplier-pay-method-update/locale/es.yml new file mode 100644 index 000000000..59ee0e02f --- /dev/null +++ b/print/templates/email/supplier-pay-method-update/locale/es.yml @@ -0,0 +1,3 @@ +subject: Método de pago actualizado +title: Método de pago actualizado +description: Se ha actualizado el método de pago del proveedor {0} de {1} a {2} diff --git a/print/templates/email/supplier-pay-method-update/supplier-pay-method-update.html b/print/templates/email/supplier-pay-method-update/supplier-pay-method-update.html new file mode 100644 index 000000000..df8543cd9 --- /dev/null +++ b/print/templates/email/supplier-pay-method-update/supplier-pay-method-update.html @@ -0,0 +1,8 @@ + +
+
+

{{ $t('title') }}

+

+
+
+ diff --git a/print/templates/email/supplier-pay-method-update/supplier-pay-method-update.js b/print/templates/email/supplier-pay-method-update/supplier-pay-method-update.js new file mode 100755 index 000000000..283b2689c --- /dev/null +++ b/print/templates/email/supplier-pay-method-update/supplier-pay-method-update.js @@ -0,0 +1,23 @@ +const Component = require(`vn-print/core/component`); +const emailBody = new Component('email-body'); + +module.exports = { + name: 'supplier-pay-method-update', + components: { + 'email-body': emailBody.build(), + }, + props: { + name: { + type: String, + required: true + }, + oldPayMethod: { + type: String, + required: true + }, + newPayMethod: { + type: String, + required: true + } + } +}; From f00fdcff7cb20524141e9a704473c62ac2ea5abb Mon Sep 17 00:00:00 2001 From: alexandre Date: Wed, 14 Dec 2022 08:06:02 +0100 Subject: [PATCH 2/7] refactor sql --- .../225001/00-supplier_beforeUpdate.sql | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/db/changes/225001/00-supplier_beforeUpdate.sql b/db/changes/225001/00-supplier_beforeUpdate.sql index 857d3206f..08af8666b 100644 --- a/db/changes/225001/00-supplier_beforeUpdate.sql +++ b/db/changes/225001/00-supplier_beforeUpdate.sql @@ -1,5 +1,5 @@ -DROP TRIGGER IF EXISTS vn.supplier_beforeUpdate; -USE vn; +DROP TRIGGER IF EXISTS `vn`.`supplier_beforeUpdate`; +USE `vn`; DELIMITER $$ $$ @@ -7,7 +7,8 @@ CREATE DEFINER=`root`@`localhost` TRIGGER `vn`.`supplier_beforeUpdate` BEFORE UPDATE ON `supplier` FOR EACH ROW BEGIN - DECLARE vHasChange BOOL DEFAULT FALSE; + DECLARE vHasChange BOOL; + DECLARE vPayMethodChanged BOOL; DECLARE vPayMethodHasVerified BOOL; DECLARE vParams JSON; DECLARE vOldPayMethodName VARCHAR(20); @@ -17,15 +18,16 @@ BEGIN FROM payMethod WHERE id = NEW.payMethodFk; - SET vHasChange = (NEW.payMethodFk <=> OLD.payMethodFk); + SET vPayMethodChanged = NOT(NEW.payMethodFk <=> OLD.payMethodFk); - IF !vHasChange THEN + IF vPayMethodChanged THEN SELECT name INTO vOldPayMethodName FROM payMethod WHERE id = OLD.payMethodFk; SELECT name INTO vNewPayMethodName FROM payMethod WHERE id = NEW.payMethodFk; + SET vParams = JSON_OBJECT( 'name', NEW.name, 'oldPayMethod', vOldPayMethodName, @@ -34,13 +36,9 @@ BEGIN SELECT util.notification_send('supplier-pay-method-update', vParams, NULL) INTO @id; END IF; - SET vHasChange = (NEW.payDemFk <=> OLD.payDemFk) OR (NEW.payDay <=> OLD.payDay); + SET vHasChange = NOT(NEW.payDemFk <=> OLD.payDemFk AND NEW.payDay <=> OLD.payDay) OR vPayMethodChanged; - IF vPayMethodHasVerified AND !vHasChange THEN - SET vHasChange = (NEW.payMethodFk <=> OLD.payMethodFk); - END IF; - - IF vHasChange THEN + IF vHasChange AND vPayMethodHasVerified THEN SET NEW.isPayMethodChecked = FALSE; END IF; From 33196acac6b4ed31400ce63c38f4a30314744a8d Mon Sep 17 00:00:00 2001 From: alexandre Date: Thu, 15 Dec 2022 08:31:47 +0100 Subject: [PATCH 3/7] refs #4928 fixture notification, fix test supplier --- .../225001/00-supplier_beforeUpdate.sql | 3 + .../back/models/specs/supplier.spec.js | 127 +++++++++++------- 2 files changed, 84 insertions(+), 46 deletions(-) diff --git a/db/changes/225001/00-supplier_beforeUpdate.sql b/db/changes/225001/00-supplier_beforeUpdate.sql index 08af8666b..e87415659 100644 --- a/db/changes/225001/00-supplier_beforeUpdate.sql +++ b/db/changes/225001/00-supplier_beforeUpdate.sql @@ -44,3 +44,6 @@ BEGIN END$$ DELIMITER ; + +INSERT INTO `util`.`notification` (`id`, `name`,`description`) + VALUES (3, 'supplier-pay-method-update', 'A supplier pay method has been updated'); diff --git a/modules/supplier/back/models/specs/supplier.spec.js b/modules/supplier/back/models/specs/supplier.spec.js index 3140981c3..effb70e35 100644 --- a/modules/supplier/back/models/specs/supplier.spec.js +++ b/modules/supplier/back/models/specs/supplier.spec.js @@ -2,13 +2,7 @@ const models = require('vn-loopback/server/server').models; const LoopBackContext = require('loopback-context'); describe('loopback model Supplier', () => { - let supplierOne; - let supplierTwo; - beforeAll(async() => { - supplierOne = await models.Supplier.findById(1); - supplierTwo = await models.Supplier.findById(442); - const activeCtx = { accessToken: {userId: 9}, http: { @@ -23,71 +17,112 @@ describe('loopback model Supplier', () => { }); }); - afterAll(async() => { - await supplierOne.updateAttribute('payMethodFk', supplierOne.payMethodFk); - await supplierTwo.updateAttribute('payMethodFk', supplierTwo.payMethodFk); - }); - describe('payMethodFk', () => { it('should throw an error when attempting to set an invalid payMethod id in the supplier', async() => { - let error; - const expectedError = 'You can not select this payment method without a registered bankery account'; - const supplier = await models.Supplier.findById(1); + const tx = await models.Supplier.beginTransaction({}); + const options = {transaction: tx}; - await supplier.updateAttribute('payMethodFk', 8) - .catch(e => { - error = e; + try { + let error; + const expectedError = 'You can not select this payment method without a registered bankery account'; + const supplier = await models.Supplier.findOne({where: {id: 1}}, options); - expect(error.message).toContain(expectedError); - }); + await supplier.updateAttribute('payMethodFk', 8, options) + .catch(e => { + error = e; - expect(error).toBeDefined(); + expect(error.message).toContain(expectedError); + }); + + expect(error).toBeDefined(); + await tx.rollback(); + } catch (e) { + await tx.rollback(); + throw e; + } }); it('should not throw if the payMethod id is valid', async() => { - let error; - const supplier = await models.Supplier.findById(442); - await supplier.updateAttribute('payMethodFk', 4) - .catch(e => { - error = e; - }); + const tx = await models.Supplier.beginTransaction({}); + const options = {transaction: tx}; - expect(error).not.toBeDefined(); + try { + let error; + const supplier = await models.Supplier.findOne({where: {id: 442}}, options); + await supplier.updateAttribute('payMethodFk', 4, options) + .catch(e => { + error = e; + }); + + expect(error).not.toBeDefined(); + await tx.rollback(); + } catch (e) { + await tx.rollback(); + throw e; + } }); it('should have checked isPayMethodChecked for payMethod hasVerfified is false', async() => { - const supplier = await models.Supplier.findById(442); - await supplier.updateAttribute('isPayMethodChecked', true); - await supplier.updateAttribute('payMethodFk', 5); + const tx = await models.Supplier.beginTransaction({}); + const options = {transaction: tx}; - const result = await models.Supplier.findById(442); + try { + const supplier = await models.Supplier.findOne({where: {id: 442}}, options); + await supplier.updateAttribute('isPayMethodChecked', true, options); + await supplier.updateAttribute('payMethodFk', 5, options); - expect(result.isPayMethodChecked).toEqual(true); + const result = await models.Supplier.findOne({where: {id: 442}}, options); + + expect(result.isPayMethodChecked).toEqual(true); + await tx.rollback(); + } catch (e) { + await tx.rollback(); + throw e; + } }); it('should have unchecked isPayMethodChecked for payMethod hasVerfified is true', async() => { - const supplier = await models.Supplier.findById(442); - await supplier.updateAttribute('isPayMethodChecked', true); - await supplier.updateAttribute('payMethodFk', 2); + const tx = await models.Supplier.beginTransaction({}); + const options = {transaction: tx}; - const result = await models.Supplier.findById(442); + try { + const supplier = await models.Supplier.findOne({where: {id: 442}}, options); + await supplier.updateAttribute('isPayMethodChecked', true, options); + await supplier.updateAttribute('payMethodFk', 2, options); - expect(result.isPayMethodChecked).toEqual(false); + const result = await models.Supplier.findOne({where: {id: 442}}, options); + + expect(result.isPayMethodChecked).toEqual(false); + await tx.rollback(); + } catch (e) { + await tx.rollback(); + throw e; + } }); it('should have unchecked isPayMethodChecked for payDay and peyDemFk', async() => { - const supplier = await models.Supplier.findById(442); + const tx = await models.Supplier.beginTransaction({}); + const options = {transaction: tx}; - await supplier.updateAttribute('isPayMethodChecked', true); - await supplier.updateAttribute('payDay', 5); - const firstResult = await models.Supplier.findById(442); + try { + const supplier = await models.Supplier.findOne({where: {id: 442}}, options); + await supplier.updateAttribute('payMethodFk', 2, options); - await supplier.updateAttribute('isPayMethodChecked', true); - await supplier.updateAttribute('payDemFk', 1); - const secondResult = await models.Supplier.findById(442); + await supplier.updateAttribute('isPayMethodChecked', true, options); + await supplier.updateAttribute('payDay', 5, options); + const firstResult = await models.Supplier.findOne({where: {id: 442}}, options); - expect(firstResult.isPayMethodChecked).toEqual(false); - expect(secondResult.isPayMethodChecked).toEqual(false); + await supplier.updateAttribute('isPayMethodChecked', true, options); + await supplier.updateAttribute('payDemFk', 1, options); + const secondResult = await models.Supplier.findOne({where: {id: 442}}, options); + + expect(firstResult.isPayMethodChecked).toEqual(false); + expect(secondResult.isPayMethodChecked).toEqual(false); + await tx.rollback(); + } catch (e) { + await tx.rollback(); + throw e; + } }); }); }); From 522000cd04f06d05f19d3cc640df16960aaa77bb Mon Sep 17 00:00:00 2001 From: alexandre Date: Thu, 15 Dec 2022 09:52:34 +0100 Subject: [PATCH 4/7] refs #4928 fix fixtures --- .../225001/00-supplier_beforeUpdate.sql | 3 -- db/dump/fixtures.sql | 4 ++- .../back/models/specs/supplier.spec.js | 33 +++++++++---------- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/db/changes/225001/00-supplier_beforeUpdate.sql b/db/changes/225001/00-supplier_beforeUpdate.sql index e87415659..08af8666b 100644 --- a/db/changes/225001/00-supplier_beforeUpdate.sql +++ b/db/changes/225001/00-supplier_beforeUpdate.sql @@ -44,6 +44,3 @@ BEGIN END$$ DELIMITER ; - -INSERT INTO `util`.`notification` (`id`, `name`,`description`) - VALUES (3, 'supplier-pay-method-update', 'A supplier pay method has been updated'); diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index 5b37338e4..68e2f7a8b 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -2689,7 +2689,8 @@ INSERT INTO `util`.`notificationConfig` INSERT INTO `util`.`notification` (`id`, `name`, `description`) VALUES - (1, 'print-email', 'notification fixture one'); + (1, 'print-email', 'notification fixture one'), + (3, 'supplier-pay-method-update', 'A supplier pay method has been updated'); INSERT INTO `util`.`notificationAcl` (`notificationFk`, `roleFk`) VALUES @@ -2746,3 +2747,4 @@ INSERT INTO `salix`.`url` (`appName`, `environment`, `url`) INSERT INTO `vn`.`payDemDetail` (`id`, `detail`) VALUES (1, 1); + diff --git a/modules/supplier/back/models/specs/supplier.spec.js b/modules/supplier/back/models/specs/supplier.spec.js index effb70e35..1e8efb4b1 100644 --- a/modules/supplier/back/models/specs/supplier.spec.js +++ b/modules/supplier/back/models/specs/supplier.spec.js @@ -2,7 +2,12 @@ const models = require('vn-loopback/server/server').models; const LoopBackContext = require('loopback-context'); describe('loopback model Supplier', () => { + let supplierOne; + let supplierTwo; + beforeAll(async() => { + supplierOne = await models.Supplier.findById(1); + supplierTwo = await models.Supplier.findById(442); const activeCtx = { accessToken: {userId: 9}, http: { @@ -25,9 +30,8 @@ describe('loopback model Supplier', () => { try { let error; const expectedError = 'You can not select this payment method without a registered bankery account'; - const supplier = await models.Supplier.findOne({where: {id: 1}}, options); - await supplier.updateAttribute('payMethodFk', 8, options) + await supplierOne.updateAttribute('payMethodFk', 8, options) .catch(e => { error = e; @@ -48,8 +52,7 @@ describe('loopback model Supplier', () => { try { let error; - const supplier = await models.Supplier.findOne({where: {id: 442}}, options); - await supplier.updateAttribute('payMethodFk', 4, options) + await supplierTwo.updateAttribute('payMethodFk', 4, options) .catch(e => { error = e; }); @@ -67,9 +70,8 @@ describe('loopback model Supplier', () => { const options = {transaction: tx}; try { - const supplier = await models.Supplier.findOne({where: {id: 442}}, options); - await supplier.updateAttribute('isPayMethodChecked', true, options); - await supplier.updateAttribute('payMethodFk', 5, options); + await supplierTwo.updateAttribute('isPayMethodChecked', true, options); + await supplierTwo.updateAttribute('payMethodFk', 5, options); const result = await models.Supplier.findOne({where: {id: 442}}, options); @@ -86,9 +88,8 @@ describe('loopback model Supplier', () => { const options = {transaction: tx}; try { - const supplier = await models.Supplier.findOne({where: {id: 442}}, options); - await supplier.updateAttribute('isPayMethodChecked', true, options); - await supplier.updateAttribute('payMethodFk', 2, options); + await supplierTwo.updateAttribute('isPayMethodChecked', true, options); + await supplierTwo.updateAttribute('payMethodFk', 2, options); const result = await models.Supplier.findOne({where: {id: 442}}, options); @@ -105,15 +106,13 @@ describe('loopback model Supplier', () => { const options = {transaction: tx}; try { - const supplier = await models.Supplier.findOne({where: {id: 442}}, options); - await supplier.updateAttribute('payMethodFk', 2, options); - - await supplier.updateAttribute('isPayMethodChecked', true, options); - await supplier.updateAttribute('payDay', 5, options); + await supplierTwo.updateAttribute('payMethodFk', 2, options); + await supplierTwo.updateAttribute('isPayMethodChecked', true, options); + await supplierTwo.updateAttribute('payDay', 5, options); const firstResult = await models.Supplier.findOne({where: {id: 442}}, options); - await supplier.updateAttribute('isPayMethodChecked', true, options); - await supplier.updateAttribute('payDemFk', 1, options); + await supplierTwo.updateAttribute('isPayMethodChecked', true, options); + await supplierTwo.updateAttribute('payDemFk', 1, options); const secondResult = await models.Supplier.findOne({where: {id: 442}}, options); expect(firstResult.isPayMethodChecked).toEqual(false); From 5cc8764a3f5f710e7c039ef42baa7b79d4811108 Mon Sep 17 00:00:00 2001 From: alexm Date: Thu, 15 Dec 2022 13:54:17 +0100 Subject: [PATCH 5/7] acquireTimeout 10000 --- loopback/server/datasources.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loopback/server/datasources.json b/loopback/server/datasources.json index 00f6bf624..1e8e4820b 100644 --- a/loopback/server/datasources.json +++ b/loopback/server/datasources.json @@ -15,7 +15,7 @@ "legacyUtcDateProcessing": false, "timezone": "local", "connectTimeout": 40000, - "acquireTimeout": 20000, + "acquireTimeout": 10000, "waitForConnections": true }, "osticket": { From bab6fa0c9d2644b9fedd20331e590d44758e8fab Mon Sep 17 00:00:00 2001 From: alexm Date: Thu, 15 Dec 2022 14:02:18 +0100 Subject: [PATCH 6/7] acquireTimeout: 60000 --- loopback/server/datasources.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loopback/server/datasources.json b/loopback/server/datasources.json index 1e8e4820b..f5f277ffc 100644 --- a/loopback/server/datasources.json +++ b/loopback/server/datasources.json @@ -15,7 +15,7 @@ "legacyUtcDateProcessing": false, "timezone": "local", "connectTimeout": 40000, - "acquireTimeout": 10000, + "acquireTimeout": 60000, "waitForConnections": true }, "osticket": { From b72cb64bf8f4322284160cd9f241f7b9051fb5c0 Mon Sep 17 00:00:00 2001 From: alexandre Date: Fri, 16 Dec 2022 12:50:09 +0100 Subject: [PATCH 7/7] refs #4928 findById --- modules/supplier/back/models/specs/supplier.spec.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/supplier/back/models/specs/supplier.spec.js b/modules/supplier/back/models/specs/supplier.spec.js index 1e8efb4b1..f317f1fb9 100644 --- a/modules/supplier/back/models/specs/supplier.spec.js +++ b/modules/supplier/back/models/specs/supplier.spec.js @@ -73,7 +73,7 @@ describe('loopback model Supplier', () => { await supplierTwo.updateAttribute('isPayMethodChecked', true, options); await supplierTwo.updateAttribute('payMethodFk', 5, options); - const result = await models.Supplier.findOne({where: {id: 442}}, options); + const result = await models.Supplier.findById(442, null, options); expect(result.isPayMethodChecked).toEqual(true); await tx.rollback(); @@ -91,7 +91,7 @@ describe('loopback model Supplier', () => { await supplierTwo.updateAttribute('isPayMethodChecked', true, options); await supplierTwo.updateAttribute('payMethodFk', 2, options); - const result = await models.Supplier.findOne({where: {id: 442}}, options); + const result = await models.Supplier.findById(442, null, options); expect(result.isPayMethodChecked).toEqual(false); await tx.rollback(); @@ -109,11 +109,11 @@ describe('loopback model Supplier', () => { await supplierTwo.updateAttribute('payMethodFk', 2, options); await supplierTwo.updateAttribute('isPayMethodChecked', true, options); await supplierTwo.updateAttribute('payDay', 5, options); - const firstResult = await models.Supplier.findOne({where: {id: 442}}, options); + const firstResult = await models.Supplier.findById(442, null, options); await supplierTwo.updateAttribute('isPayMethodChecked', true, options); await supplierTwo.updateAttribute('payDemFk', 1, options); - const secondResult = await models.Supplier.findOne({where: {id: 442}}, options); + const secondResult = await models.Supplier.findById(442, null, options); expect(firstResult.isPayMethodChecked).toEqual(false); expect(secondResult.isPayMethodChecked).toEqual(false);