verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 61 Releases Wiki Activity

Merge branch 'dev' of https://git.verdnatura.es/salix into dev

This commit is contained in:
Daniel Herrero 2018-04-30 12:31:04 +02:00
parent 50011bff8e 09a731c812
commit aa1797d137
16 changed files with 94 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gulpfile.js
View File

@ -472,7 +472,7 @@ gulp.task('docker-run', async () => {
await execP('docker run -d --name dblocal -p 3306:3306 dblocal');
await runSequenceP('docker-wait');
} catch (err) {
await runSequenceP('docker-image');
await runSequenceP('docker-build');
}
});

3
services/db/Dockerfile
View File

@ -4,8 +4,7 @@ WORKDIR /docker-entrypoint-initdb.d
COPY install/ ./
RUN chmod -R 777 .
RUN ./install.sh
USER mysql
CMD ["mysqld"]
CMD ./boot.sh
#HEALTHCHECK --interval=5s --timeout=10s --retries=200 \
# CMD mysqladmin ping -h 127.0.0.1 -u root || exit 1
EXPOSE 3306

2
services/db/export-data.cmd
View File

@ -6,7 +6,7 @@ mysqldump --defaults-file=connect.ini --no-create-info salix ACL >> install/dump
echo USE `vn`; >> install/dump/03-dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info vn cplusInvoiceType477 cplusSubjectOp cplusTaxBreak bookingPlanner pgc >> install/dump/03-dumpedFixtures.sql
echo USE `vn2008`; >> install/dump/03-dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info vn2008 accion_dits Gastos Tintas tarifa_componentes tarifa_componentes_series state bionic_updating_options >> install/dump/03-dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info vn2008 accion_dits Gastos Tintas tarifa_componentes tarifa_componentes_series state bionic_updating_options Grupos >> install/dump/03-dumpedFixtures.sql
echo USE `bi`; >> install/dump/03-dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info bi tarifa_componentes tarifa_componentes_series >> install/dump/03-dumpedFixtures.sql
echo USE `cache`; >> install/dump/03-dumpedFixtures.sql

2
services/db/export-data.sh
View File

@ -7,7 +7,7 @@ mysqldump --defaults-file=connect.ini --no-create-info salix ACL >> install/dump
echo "USE \`vn\`;" >> install/dump/03-dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info vn cplusInvoiceType477 cplusSubjectOp cplusTaxBreak bookingPlanner pgc >> install/dump/03-dumpedFixtures.sql
echo "USE \`vn2008\`;" >> install/dump/03-dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info vn2008 accion_dits Gastos Tintas tarifa_componentes tarifa_componentes_series state bionic_updating_options >> install/dump/03-dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info vn2008 accion_dits Gastos Tintas tarifa_componentes tarifa_componentes_series state bionic_updating_options Grupos>> install/dump/03-dumpedFixtures.sql
echo "USE \`bi\`;" >> install/dump/03-dumpedFixtures.sql
mysqldump --defaults-file=connect.ini --no-create-info bi tarifa_componentes tarifa_componentes_series >> install/dump/03-dumpedFixtures.sql
echo "USE \`cache\`;" >> install/dump/03-dumpedFixtures.sql

8
services/db/install/boot.sh Normal file
View File

@ -0,0 +1,8 @@
#!/bin/bash
find /var/lib/mysql -type f -exec touch {} \; && service mysql start
# Disable SQL strict mode
mysql -u root -proot -e "SET GLOBAL sql_mode='NO_ENGINE_SUBSTITUTION';"
sleep infinity

10
services/db/install/changes/1.0.3/05-workerMana.sql Normal file
View File

@ -0,0 +1,10 @@
USE `bs`;
CREATE
OR REPLACE ALGORITHM = UNDEFINED
DEFINER = `root`@`%`
SQL SECURITY DEFINER
VIEW `bs`.`workerMana` AS
SELECT
`m`.`Id_Trabajador` AS `workerFk`, `m`.`used` AS `amount`
FROM
`bs`.`mana_spellers` `m`;

24
services/db/install/dump/03-dumpedFixtures.sql
View File

File diff suppressed because one or more lines are too long

8
services/db/install/dump/fixtures.sql
View File

@ -574,3 +574,11 @@ INSERT INTO `cache`.`cache_calc`(`id`, `cache_id`, `cacheName`, `params`, `last_
( 1, 2, 'available', CONCAT_WS('/',1,CURDATE()), CURRENT_TIMESTAMP(), DATE_ADD(CURRENT_TIMESTAMP(),INTERVAL 15 MINUTE), CURDATE(), NULL),
( 2, 4, 'last_buy', CONCAT_WS('/',1,CURDATE()), CURRENT_TIMESTAMP(), DATE_ADD(CURRENT_TIMESTAMP(),INTERVAL 15 MINUTE), CURDATE(), NULL),
( 3, 8, 'visible', CONCAT_WS('/',1,CURDATE()), CURRENT_TIMESTAMP(), DATE_ADD(CURRENT_TIMESTAMP(),INTERVAL 15 MINUTE), CURDATE(), NULL);
INSERT INTO `bs`.`workerMana`(`workerFk`, `amount`)
VALUES
( 1, -500),
( 3, 0),
( 5, 250),
( 6, 1000),
( 9, 1500);

6
services/db/install/install.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
# Start MySQL service
service mysql start
find /var/lib/mysql -type f -exec touch {} \; && service mysql start
# Disable SQL strict mode
mysql -u root -proot -e "SET GLOBAL sql_mode='NO_ENGINE_SUBSTITUTION';"
@ -15,7 +15,7 @@ done
# Import changes
for file in changes/*/*.sql; do
echo "Imported $file" >> log.txt
mysql -u root -proot < $file
mysql -u root -proot < $file
done
# Import fixtures
@ -23,6 +23,6 @@ echo "Imported fixtures.sql" >> log.txt
mysql -u root -proot < dump/fixtures.sql >> log.txt
# Remove installation
#rm -rf /docker-entrypoint-initdb.d
rm -rf changes dump install.sh

2
services/loopback/common/methods/item-tag/specs/filterItemTags.spec.js
View File

@ -4,6 +4,6 @@ describe('item filterItemTags()', () => {
it('should call the filterItemTags method', async() => {
let [result] = await app.models.ItemTag.filterItemTags(1);
expect(result.name).toEqual('Yellow');
expect(result.name).toEqual('Blue');
});
});

2
services/loopback/common/methods/ticket/specs/get-taxes.spec.js
View File

@ -4,7 +4,7 @@ describe('ticket getTaxes()', () => {
it('should call the getTaxes method', done => {
app.models.Ticket.getTaxes(1)
.then(response => {
expect(response[0].tax).toEqual(1.05);
expect(response[0].tax).toEqual(6.05);
done();
});
});

2
services/loopback/common/methods/ticket/specs/get-total.spec.js
View File

@ -4,7 +4,7 @@ describe('ticket getTotal()', () => {
it('should call the getTotal method and return the response', done => {
app.models.Ticket.getTotal(1)
.then(response => {
expect(response).toEqual(11.55);
expect(response).toEqual(248.05);
done();
});
});

2
services/loopback/common/methods/ticket/summary.js
View File

@ -78,7 +78,7 @@ module.exports = Self => {
where: {
ticketFk: ticketFk
},
order: 'concept ASC',
order: 'itemFk ASC',
include: [{
relation: 'item',
scope: {

25
services/loopback/common/models/workerMana.json Normal file
View File

@ -0,0 +1,25 @@
{
"name": "WorkerMana",
"base": "VnModel",
"options": {
"mysql": {
"table": "workerMana"
}
},
"properties": {
"amount": {
"type": "String"
},
"workerFk": {
"id": true,
"type": "String"
}
},
"relations": {
"worker": {
"type": "belongsTo",
"model": "Worker",
"foreignKey": "workerFk"
}
}
}

11
services/loopback/server/datasources.json
View File

@ -45,5 +45,16 @@
"password": "${salixPassword}",
"connectTimeout": 20000,
"acquireTimeout": 20000
},
"bs": {
"connector": "mysql",
"database": "bs",
"debug": false,
"host": "${salixHost}",
"port": "${salixPort}",
"username": "${salixUser}",
"password": "${salixPassword}",
"connectTimeout": 20000,
"acquireTimeout": 20000
}
}

3
services/loopback/server/model-config.json
View File

@ -104,5 +104,8 @@
},
"Message": {
"dataSource": "vn"
},
"WorkerMana": {
"dataSource": "bs"
}
}