From f6a7efae0c6aac396701f3e9d961a7ebb2607c8c Mon Sep 17 00:00:00 2001 From: Bernat Date: Wed, 9 May 2018 07:20:30 +0200 Subject: [PATCH] update fixtures and schema --- services/db/.gitignore | 1 - services/db/install/boot.sh | 2 +- .../install/changes/1.0.4-cau6508/03-item.sql | 5 +-- .../1.0.4-cau6508/08-agencyProvince.sql | 14 ++++++++ .../1.0.4-cau6508/09-agencyModeZone.sql | 16 +++++++++ .../1.0.4-cau6508/10-agencyWeekdayBonus.sql | 15 +++++++++ .../11-preparationPercentaje.sql | 12 +++++++ .../1.0.4-cau6508/12-preparationException.sql | 12 +++++++ services/db/install/dump/fixtures.sql | 33 ++++++++++++++++++- 9 files changed, 105 insertions(+), 5 deletions(-) create mode 100644 services/db/install/changes/1.0.4-cau6508/08-agencyProvince.sql create mode 100644 services/db/install/changes/1.0.4-cau6508/09-agencyModeZone.sql create mode 100644 services/db/install/changes/1.0.4-cau6508/10-agencyWeekdayBonus.sql create mode 100644 services/db/install/changes/1.0.4-cau6508/11-preparationPercentaje.sql create mode 100644 services/db/install/changes/1.0.4-cau6508/12-preparationException.sql diff --git a/services/db/.gitignore b/services/db/.gitignore index ffb5ab46e7..f26f7a0a64 100644 --- a/services/db/.gitignore +++ b/services/db/.gitignore @@ -1,2 +1 @@ connect.ini -docker.log diff --git a/services/db/install/boot.sh b/services/db/install/boot.sh index 208b5e4bc2..c540286b24 100644 --- a/services/db/install/boot.sh +++ b/services/db/install/boot.sh @@ -19,7 +19,7 @@ else # Import fixtures echo "Imported fixtures.sql" - mysql -u root -proot < dump/fixtures.sql + mysql -u root -proot -f < dump/fixtures.sql # Copy dumpted data to volume cp -R /var/lib/mysql /data diff --git a/services/db/install/changes/1.0.4-cau6508/03-item.sql b/services/db/install/changes/1.0.4-cau6508/03-item.sql index 8dcdd28bea..188ead9703 100644 --- a/services/db/install/changes/1.0.4-cau6508/03-item.sql +++ b/services/db/install/changes/1.0.4-cau6508/03-item.sql @@ -23,8 +23,9 @@ VIEW `vn`.`item` AS `t`.`relevancy` AS `relevancy`, `t`.`Foto` AS `image`, `t`.`generic` AS `generic`, + `t`.`density` AS `density`, `t`.`iva_group_id` AS `taxClassFk`, - `t`.`pvp` AS `pvp`, - `t`.`min` AS `min` + `t`.`PVP` AS `minPrice`, + `t`.`Min` AS `hasMinPrice` FROM `vn2008`.`Articles` `t`; diff --git a/services/db/install/changes/1.0.4-cau6508/08-agencyProvince.sql b/services/db/install/changes/1.0.4-cau6508/08-agencyProvince.sql new file mode 100644 index 0000000000..15bb437f16 --- /dev/null +++ b/services/db/install/changes/1.0.4-cau6508/08-agencyProvince.sql @@ -0,0 +1,14 @@ +USE `vn`; +CREATE + OR REPLACE ALGORITHM = UNDEFINED + DEFINER = `root`@`%` + SQL SECURITY DEFINER +VIEW `vn`.`agencyProvince` AS + SELECT + `a`.`province_id` AS `provinceFk`, + `a`.`agency_id` AS `agencyFk`, + `a`.`zona` AS `zone`, + `a`.`warehouse_id` AS `warehouseFk`, + `a`.`route` AS `route` + FROM + `vn2008`.`Agencias_province` `a`; diff --git a/services/db/install/changes/1.0.4-cau6508/09-agencyModeZone.sql b/services/db/install/changes/1.0.4-cau6508/09-agencyModeZone.sql new file mode 100644 index 0000000000..9558a85380 --- /dev/null +++ b/services/db/install/changes/1.0.4-cau6508/09-agencyModeZone.sql @@ -0,0 +1,16 @@ +USE `vn`; +CREATE + OR REPLACE ALGORITHM = UNDEFINED + DEFINER = `root`@`%` + SQL SECURITY DEFINER +VIEW `vn`.`agencyModeZone` AS + SELECT + `a`.`Id_Agencia` AS `agencyModeFk`, + `a`.`zona` AS `zone`, + `a`.`price` AS `price`, + `a`.`Id_Article` AS `itemFk`, + `a`.`warehouse_id` AS `warehouseFk`, + `a`.`porte_minimo` AS `minimCost`, + `a`.`inflacion` AS `inflation` + FROM + `vn2008`.`Agencias_zonas` `a`; diff --git a/services/db/install/changes/1.0.4-cau6508/10-agencyWeekdayBonus.sql b/services/db/install/changes/1.0.4-cau6508/10-agencyWeekdayBonus.sql new file mode 100644 index 0000000000..ff616db01b --- /dev/null +++ b/services/db/install/changes/1.0.4-cau6508/10-agencyWeekdayBonus.sql @@ -0,0 +1,15 @@ +USE `vn`; +CREATE + OR REPLACE ALGORITHM = UNDEFINED + DEFINER = `root`@`%` + SQL SECURITY DEFINER +VIEW `vn`.`agencyWeekdayBonus` AS + SELECT + `a`.`id` AS `id`, + `a`.`warehouse_id` AS `warehouseFk`, + `a`.`agency_id` AS `agencyFk`, + `a`.`weekDay` AS `weekDay`, + `a`.`zona` AS `zone`, + `a`.`bonus` AS `bonus` + FROM + `vn2008`.`agency_weekday_bonus` `a`; diff --git a/services/db/install/changes/1.0.4-cau6508/11-preparationPercentaje.sql b/services/db/install/changes/1.0.4-cau6508/11-preparationPercentaje.sql new file mode 100644 index 0000000000..1b9dc6c3d2 --- /dev/null +++ b/services/db/install/changes/1.0.4-cau6508/11-preparationPercentaje.sql @@ -0,0 +1,12 @@ +USE `vn`; +CREATE + OR REPLACE ALGORITHM = UNDEFINED + DEFINER = `root`@`%` + SQL SECURITY DEFINER +VIEW `vn`.`preparationPercentage` AS + SELECT + `p`.`week_day` AS `weekDay`, + `p`.`warehouse_id` AS `warehouseFk`, + `p`.`percentage` AS `percentage` + FROM + `vn2008`.`preparation_percentage` `p`; diff --git a/services/db/install/changes/1.0.4-cau6508/12-preparationException.sql b/services/db/install/changes/1.0.4-cau6508/12-preparationException.sql new file mode 100644 index 0000000000..c51e13861b --- /dev/null +++ b/services/db/install/changes/1.0.4-cau6508/12-preparationException.sql @@ -0,0 +1,12 @@ +USE `vn`; +CREATE + OR REPLACE ALGORITHM = UNDEFINED + DEFINER = `root`@`%` + SQL SECURITY DEFINER +VIEW `vn`.`preparationException` AS + SELECT + `p`.`exception_day` AS `exceptionDay`, + `p`.`warehouse_id` AS `warehouseFk`, + `p`.`percentage` AS `percentage` + FROM + `vn2008`.`preparation_exception` `p`; diff --git a/services/db/install/dump/fixtures.sql b/services/db/install/dump/fixtures.sql index b47d121c77..0c45fd099a 100644 --- a/services/db/install/dump/fixtures.sql +++ b/services/db/install/dump/fixtures.sql @@ -612,4 +612,35 @@ INSERT INTO `vn`.`entry`(`id`, `supplierFk`, `created`, `travelFk`, `companyFk`) ( 1, 1, CURDATE(), 1, 442), ( 2, 2, CURDATE(), 2, 442), ( 3, 1, CURDATE(), 3, 442), - ( 4, 2, CURDATE(), 4, 69); \ No newline at end of file + ( 4, 2, CURDATE(), 4, 69); + +INSERT INTO `vn`.`agencyProvince`(`provinceFk`, `agencyFk`, `zone`, `warehouseFk`, `route`) + VALUES + ( 1, 1, 1, 1, 1), + ( 1, 1, 1, 2, 1), + ( 1, 1, 1, 3, 1), + ( 1, 2, 2, 2, 2), + ( 1, 2, 2, 3, 2); + +INSERT INTO `vn`.`agencyModeZone`(`agencyModeFk`, `zone`, `price`, `itemFk`, `warehouseFk`, `minimCost`, `inflation`) + VALUES + ( 1, 1, 10, 1, 1, 1, 1.00), + ( 1, 1, 20, 2, 1, 1, 1.00), + ( 2, 1, 10, 1, 1, 1, 1.00), + ( 2, 1, 20, 2, 1, 1, 2.00), + ( 2, 2, 10, 1, 1, 0, 2.00); + +INSERT INTO `vn`.`agencyWeekdayBonus`(`id`, `warehouseFk`, `agencyFk`, `weekDay`, `zone`, `bonus`) + VALUES + ( 1, 1, 1, 0, 1, -1.00), + ( 2, 1, 1, 1, 1, -1.00), + ( 3, 1, 1, 0, 2, -1.00), + ( 4, 1, 1, 1, 2, -1.00), + ( 5, 2, 2, 2, 3, 0); + +INSERT INTO `bi`.`claims_ratio`(`id_Cliente`, `Consumo`, `Reclamaciones`, `Ratio`, `recobro`, `inflacion`) + VALUES + ( 101, 500, NULL, 0.00, 0.00, 1.00), + ( 102, 1000, 2.00, 0.01, 0.05, 1.00), + ( 103, 2000, 0.00, 0.00, 0.02, 1.00), + ( 104, 2500, 150.00, 0.02, 0.10, 1.00); \ No newline at end of file