From 61cc3c19f3fc2f492147728761e875a0ef91e895 Mon Sep 17 00:00:00 2001 From: alexm Date: Thu, 9 Jun 2022 07:13:54 +0200 Subject: [PATCH] refactor(client): creditInsuarnce change creditClassification for creditClassificationFk --- db/changes/10480-june/00-creditInsurance.sql | 10 +++++----- db/changes/10480-june/01-creditInsuranceTriggers.sql | 11 +++++++++++ db/dump/fixtures.sql | 2 +- .../credit-classification/createWithInsurance.js | 2 +- modules/client/back/models/credit-classification.json | 2 +- modules/client/back/models/credit-insurance.js | 2 +- modules/client/back/models/credit-insurance.json | 2 +- .../front/credit-insurance/insurance/index/index.html | 2 +- 8 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 db/changes/10480-june/01-creditInsuranceTriggers.sql diff --git a/db/changes/10480-june/00-creditInsurance.sql b/db/changes/10480-june/00-creditInsurance.sql index 705761b99d..e1fc6e6bdd 100644 --- a/db/changes/10480-june/00-creditInsurance.sql +++ b/db/changes/10480-june/00-creditInsurance.sql @@ -1,8 +1,8 @@ -ALTER TABLE vn.creditInsurance ADD creditClassificationFk int(11) NULL; +ALTER TABLE `vn`.`creditInsurance` ADD creditClassificationFk int(11) NULL; UPDATE `vn`.`creditInsurance` AS `destiny` - SET `destiny`.`creditClassificationFk`=(SELECT creditClassification FROM `vn`.`creditInsurance` AS `origin` WHERE `origin`.id=`destiny`.id); + SET `destiny`.`creditClassificationFk`= (SELECT creditClassification FROM `vn`.`creditInsurance` AS `origin` WHERE `origin`.id = `destiny`.id); - ALTER TABLE `vn`.`creditInsurance` -ADD CONSTRAINT `creditInsurance_creditClassificationFk` FOREIGN KEY (`creditClassificationFk`) -REFERENCES `creditClassification` (`id`) ON DELETE CASCADE ON UPDATE CASCADE; \ No newline at end of file +ALTER TABLE `vn`.`creditInsurance` + ADD CONSTRAINT `creditInsurance_creditClassificationFk` FOREIGN KEY (`creditClassificationFk`) + REFERENCES `creditClassification` (`id`) ON DELETE CASCADE ON UPDATE CASCADE; \ No newline at end of file diff --git a/db/changes/10480-june/01-creditInsuranceTriggers.sql b/db/changes/10480-june/01-creditInsuranceTriggers.sql new file mode 100644 index 0000000000..53ba3ba11e --- /dev/null +++ b/db/changes/10480-june/01-creditInsuranceTriggers.sql @@ -0,0 +1,11 @@ +DELIMITER $$ +$$ +CREATE DEFINER=`root`@`localhost` TRIGGER `vn`.`creditInsurance_beforeInsert` + BEFORE INSERT ON `creditInsurance` + FOR EACH ROW +BEGIN + IF NEW.creditClassificationFk THEN + SET NEW.creditClassification = NEW.creditClassificationFk; + END IF; +END$$ +DELIMITER ; \ No newline at end of file diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index c91ba71c28..341245add7 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -458,7 +458,7 @@ INSERT INTO `vn`.`creditClassification`(`id`, `client`, `dateStart`, `dateEnd`) (4, 1104, CURDATE(), CURDATE()), (5, 1105, CURDATE(), CURDATE()); -INSERT INTO `vn`.`creditInsurance`(`id`, `creditClassification`, `credit`, `creationDate`, `grade`) +INSERT INTO `vn`.`creditInsurance`(`id`, `creditClassificationFk`, `credit`, `creationDate`, `grade`) VALUES (1, 1, 3000, DATE_ADD(CURDATE(), INTERVAL -1 MONTH), NULL), (2, 2, 6000, DATE_ADD(CURDATE(), INTERVAL -2 MONTH), NULL), diff --git a/modules/client/back/methods/credit-classification/createWithInsurance.js b/modules/client/back/methods/credit-classification/createWithInsurance.js index fb0a7222b8..d4110676cb 100644 --- a/modules/client/back/methods/credit-classification/createWithInsurance.js +++ b/modules/client/back/methods/credit-classification/createWithInsurance.js @@ -38,7 +38,7 @@ module.exports = Self => { }, myOptions); await models.CreditInsurance.create({ - creditClassification: newClassification.id, + creditClassificationFk: newClassification.id, credit: data.credit, grade: data.grade }, myOptions); diff --git a/modules/client/back/models/credit-classification.json b/modules/client/back/models/credit-classification.json index 543f8359e1..c38d5cd45b 100644 --- a/modules/client/back/models/credit-classification.json +++ b/modules/client/back/models/credit-classification.json @@ -36,7 +36,7 @@ "insurances": { "type": "hasMany", "model": "CreditInsurance", - "foreignKey": "creditClassification" + "foreignKey": "creditClassificationFk" } } } \ No newline at end of file diff --git a/modules/client/back/models/credit-insurance.js b/modules/client/back/models/credit-insurance.js index a2e8091e1b..6f656d3829 100644 --- a/modules/client/back/models/credit-insurance.js +++ b/modules/client/back/models/credit-insurance.js @@ -24,7 +24,7 @@ module.exports = function(Self) { let filter = { fields: ['grade'], where: { - creditClassification: this.creditClassification + creditClassificationFk: this.creditClassificationFk }, order: 'created DESC' }; diff --git a/modules/client/back/models/credit-insurance.json b/modules/client/back/models/credit-insurance.json index db4154978f..08b2e3d603 100644 --- a/modules/client/back/models/credit-insurance.json +++ b/modules/client/back/models/credit-insurance.json @@ -30,7 +30,7 @@ "classification": { "type": "belongsTo", "model": "CreditClassification", - "foreignKey": "creditClassification" + "foreignKey": "creditClassificationFk" } }, "scope": { diff --git a/modules/client/front/credit-insurance/insurance/index/index.html b/modules/client/front/credit-insurance/insurance/index/index.html index 69f1830cb8..a3a4478bcc 100644 --- a/modules/client/front/credit-insurance/insurance/index/index.html +++ b/modules/client/front/credit-insurance/insurance/index/index.html @@ -1,7 +1,7 @@