verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 62 Releases Wiki Activity

change idWorker from to users and fix back unit test

This commit is contained in:
Bernat 2018-08-01 13:24:38 +02:00
parent 25d7bf09c5
commit 0c6ae08d4a
2 changed files with 66 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,24 +13,24 @@ DELETE FROM `vn`.`worker` where name ='customer';
INSERT INTO `account`.`user`(`id`,`name`,`password`,`role`,`active`,`email`) INSERT INTO `account`.`user`(`id`,`name`,`password`,`role`,`active`,`email`)
VALUES VALUES
(101, 'BruceWayne', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'BruceWayne@verdnatura.es'), (101, 'BruceWayne', 'ac754a330530832ba1bf7687f577da91', 2 , 1, 'BruceWayne@verdnatura.es'),
(102, 'PetterParker', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'PetterParker@verdnatura.es'), (102, 'PetterParker', 'ac754a330530832ba1bf7687f577da91', 2 , 1, 'PetterParker@verdnatura.es'),
(103, 'ClarkKent', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'ClarkKent@verdnatura.es'), (103, 'ClarkKent', 'ac754a330530832ba1bf7687f577da91', 2 , 1, 'ClarkKent@verdnatura.es'),
(104, 'TonyStark', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'TonyStark@verdnatura.es'), (104, 'TonyStark', 'ac754a330530832ba1bf7687f577da91', 2 , 1, 'TonyStark@verdnatura.es'),
(105, 'MaxEisenhardt', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'MaxEisenhardt@verdnatura.es'), (105, 'MaxEisenhardt', 'ac754a330530832ba1bf7687f577da91', 2 , 1, 'MaxEisenhardt@verdnatura.es'),
(106, 'DavidCharlesHaller', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'DavidCharlesHaller@verdnatura.es'), (106, 'DavidCharlesHaller', 'ac754a330530832ba1bf7687f577da91', 2 , 1, 'DavidCharlesHaller@verdnatura.es'),
(107, 'HankPym', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'HankPym@verdnatura.es'), (107, 'HankPym', 'ac754a330530832ba1bf7687f577da91', 2 , 1, 'HankPym@verdnatura.es'),
(108, 'CharlesXavier', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'CharlesXavier@verdnatura.es'), (108, 'CharlesXavier', 'ac754a330530832ba1bf7687f577da91', 20, 1, 'CharlesXavier@verdnatura.es'),
(109, 'BruceBanner', 'ac754a330530832ba1bf7687f577da91', 2, 1, 'BruceBanner@verdnatura.es'), (109, 'BruceBanner', 'ac754a330530832ba1bf7687f577da91', 2 , 1, 'BruceBanner@verdnatura.es'),
(110, 'JessicaJones', 'ac754a330530832ba1bf7687f577da91' , 2, 1, 'JessicaJones@verdnatura.es'); (110, 'JessicaJones', 'ac754a330530832ba1bf7687f577da91', 1 , 1, 'JessicaJones@verdnatura.es');
INSERT INTO `vn`.`worker`(`workerCode`, `id`, `firstName`, `name`, `userFk`) INSERT INTO `vn`.`worker`(`workerCode`, `id`, `firstName`, `name`, `userFk`)
VALUES VALUES
('LGN', 106, 'David Charles', 'Haller', 106), ('LGN', 106, 'David Charles', 'Haller', 106),
('ANT', 107, 'Hank' , 'Pym' , 107), ('ANT', 107, 'Hank' , 'Pym' , 107),
('DCX', 108, 'Charles' , 'Xavier', 108), ('DCX', 110, 'Charles' , 'Xavier', 108),
('HLK', 109, 'Bruce' , 'Banner', 109), ('HLK', 109, 'Bruce' , 'Banner', 109),
('JJJ', 110, 'Jessica' , 'Jones' , 110); ('JJJ', 108, 'Jessica' , 'Jones' , 110);
INSERT INTO `vn`.`country`(`id`, `country`, `isUeeMember`, `code`, `currencyFk`) INSERT INTO `vn`.`country`(`id`, `country`, `isUeeMember`, `code`, `currencyFk`)
VALUES VALUES
@ -227,21 +227,21 @@ INSERT INTO `vn`.`address`(`id`, `nickname`, `street`, `city`, `postalCode`, `pr
INSERT INTO `vn`.`clientCredit`(`id`, `clientFk`, `workerFk`, `amount`, `created`) INSERT INTO `vn`.`clientCredit`(`id`, `clientFk`, `workerFk`, `amount`, `created`)
VALUES VALUES
(1, 101, 5, 300, DATE_ADD(CURDATE(), INTERVAL -1 MONTH)), (1 , 101, 5, 300, DATE_ADD(CURDATE(), INTERVAL -1 MONTH)),
(2, 101, 5, 900, DATE_ADD(CURDATE(), INTERVAL -2 MONTH)), (2 , 101, 5, 900, DATE_ADD(CURDATE(), INTERVAL -2 MONTH)),
(3, 101, 5, 800, DATE_ADD(CURDATE(), INTERVAL -3 MONTH)), (3 , 101, 5, 800, DATE_ADD(CURDATE(), INTERVAL -3 MONTH)),
(4, 101, 5, 700, DATE_ADD(CURDATE(), INTERVAL -4 MONTH)), (4 , 101, 5, 700, DATE_ADD(CURDATE(), INTERVAL -4 MONTH)),
(5, 101, 5, 600, DATE_ADD(CURDATE(), INTERVAL -5 MONTH)), (5 , 101, 5, 600, DATE_ADD(CURDATE(), INTERVAL -5 MONTH)),
(6, 101, 5, 500, DATE_ADD(CURDATE(), INTERVAL -6 MONTH)), (6 , 101, 5, 500, DATE_ADD(CURDATE(), INTERVAL -6 MONTH)),
(7, 101, 5, 400, DATE_ADD(CURDATE(), INTERVAL -7 MONTH)), (7 , 101, 5, 400, DATE_ADD(CURDATE(), INTERVAL -7 MONTH)),
(8, 101, 9, 300, DATE_ADD(CURDATE(), INTERVAL -8 MONTH)), (8 , 101, 9, 300, DATE_ADD(CURDATE(), INTERVAL -8 MONTH)),
(9, 101, 9, 200, DATE_ADD(CURDATE(), INTERVAL -9 MONTH)), (9 , 101, 9, 200, DATE_ADD(CURDATE(), INTERVAL -9 MONTH)),
(10, 101, 9, 100, DATE_ADD(CURDATE(), INTERVAL -10 MONTH)), (10, 101, 9, 100, DATE_ADD(CURDATE(), INTERVAL -10 MONTH)),
(11, 101, 9, 50, DATE_ADD(CURDATE(), INTERVAL -11 MONTH)), (11, 101, 9, 50 , DATE_ADD(CURDATE(), INTERVAL -11 MONTH)),
(12, 102, 9, 800, CURDATE()), (12, 102, 9, 800, CURDATE()),
(13, 103, 9, 200, CURDATE()), (13, 103, 9, 200, CURDATE()),
(14, 104, 9, 90, CURDATE()), (14, 104, 9, 90 , CURDATE()),
(15, 105, 9, 90, CURDATE()); (15, 105, 9, 90 , CURDATE());
INSERT INTO `vn`.`clientCreditLimit`(`id`, `maxAmount`, `roleFk`) INSERT INTO `vn`.`clientCreditLimit`(`id`, `maxAmount`, `roleFk`)
VALUES VALUES
@ -312,11 +312,11 @@ INSERT INTO `vn`.`bankEntity`(`id`, `countryFk`, `name`, `bic`)
INSERT INTO `vn`.`company`(`id`, `code`, `supplierAccountFk`, `workerManagerFk`, `companyCode`, `sage200Company`) INSERT INTO `vn`.`company`(`id`, `code`, `supplierAccountFk`, `workerManagerFk`, `companyCode`, `sage200Company`)
VALUES VALUES
( 69, 'CCs', NULL, 30, NULL, 1), ( 69 , 'CCs', NULL, 30, NULL, 1),
(442, 'VNL', 241, 30, 2, 2), ( 442 , 'VNL', 241, 30, 2 , 2),
( 567, 'VNH', NULL, 30, NULL, 3), ( 567 , 'VNH', NULL, 30, NULL, 3),
( 791, 'FTH', NULL, 30, NULL, 4), ( 791 , 'FTH', NULL, 30, NULL, 4),
( 1381, 'ORN', NULL, 30, NULL,5); ( 1381, 'ORN', NULL, 30, NULL, 5);
INSERT INTO `vn`.`invoiceOut`(`id`, `ref`, `serial`, `amount`, `issued`,`clientFk`, `created`, `companyFk`, `dued`, `booked`, `bankFk`, `pdf`) INSERT INTO `vn`.`invoiceOut`(`id`, `ref`, `serial`, `amount`, `issued`,`clientFk`, `created`, `companyFk`, `dued`, `booked`, `bankFk`, `pdf`)
VALUES VALUES
@ -428,14 +428,14 @@ INSERT INTO `vn`.`mandate`(`id`, `clientFk`, `companyFk`, `code`, `created`, `ma
INSERT INTO `vn`.`itemCategory`(`id`, `name`, `display`, `color`) INSERT INTO `vn`.`itemCategory`(`id`, `name`, `display`, `color`)
VALUES VALUES
(1, 'Plant', 1, 'B92A26'), (1, 'Plant' , 1, 'B92A26'),
(2, 'Flower', 2, 'dcf711'); (2, 'Flower', 2, 'dcf711');
INSERT INTO `vn`.`itemType`(`id`, `code`, `name`, `categoryFk`, `life`,`workerFk`) INSERT INTO `vn`.`itemType`(`id`, `code`, `name`, `categoryFk`, `life`,`workerFk`)
VALUES VALUES
(1, 'CRI', 'Crisantemo', 2, 15, 5), (1, 'CRI', 'Crisantemo' , 2, 15, 5),
(2, 'ITG', 'Anthurium', 1, 30, 5), (2, 'ITG', 'Anthurium' , 1, 30, 5),
(3, 'WPN', 'Paniculata', 2, 30, 5), (3, 'WPN', 'Paniculata' , 2, 30, 5),
(4, 'PRT', 'Delivery ports', 2, 30, 5); (4, 'PRT', 'Delivery ports', 2, 30, 5);
INSERT INTO `vn`.`ink`(`id`, `name`, `picture`, `showOrder`) INSERT INTO `vn`.`ink`(`id`, `name`, `picture`, `showOrder`)
@ -457,14 +457,14 @@ INSERT INTO `vn`.`producer`(`id`, `name`)
INSERT INTO `vn`.`taxType`(`id`, `nickname`, `isAccrued`, `serial`, `TIPOOPE`, `description`, `countryFk`) INSERT INTO `vn`.`taxType`(`id`, `nickname`, `isAccrued`, `serial`, `TIPOOPE`, `description`, `countryFk`)
VALUES VALUES
(1, 'National', 1, 'R', 'I', 'national VAT',1), (1, 'National', 1, 'R', 'I', 'national VAT', 1),
(2, 'European', 0, 'E', 'I', 'europe VAT', 1); (2, 'European', 0, 'E', 'I', 'europe VAT' , 1);
INSERT INTO `vn`.`taxCode`(`id`, `dated`, `code`, `taxTypeFk`, `rate`, `equalizationTax`, `type`, `link`, `isActive`, `updated`, `transactionCode`) INSERT INTO `vn`.`taxCode`(`id`, `dated`, `code`, `taxTypeFk`, `rate`, `equalizationTax`, `type`, `link`, `isActive`, `updated`, `transactionCode`)
VALUES VALUES
(1, CURDATE() , '1111111111', 1, 7.0 , 0.0, 'R', 1, 1, CURDATE(), 1), (1 , CURDATE(), '1111111111', 1, 7.0 , 0.0, 'R', 1, 1, CURDATE(), 1),
(2, CURDATE() , '2222222222', 2, 16.0, 0.0, 'G', 2, 1, CURDATE(), 1), (2 , CURDATE(), '2222222222', 2, 16.0, 0.0, 'G', 2, 1, CURDATE(), 1),
(21, CURDATE() , '3333333333', 1, 18.0, 0.0, 'R', 3, 1, CURDATE(), 1), (21 , CURDATE(), '3333333333', 1, 18.0, 0.0, 'R', 3, 1, CURDATE(), 1),
(108, CURDATE(), '4444444444', 2, 8.0 , 0.0, 'R', 4, 1, CURDATE(), 1); (108, CURDATE(), '4444444444', 2, 8.0 , 0.0, 'R', 4, 1, CURDATE(), 1);
INSERT INTO `vn`.`taxClass`(`id`, `description`, `code`) INSERT INTO `vn`.`taxClass`(`id`, `description`, `code`)
@ -474,7 +474,7 @@ INSERT INTO `vn`.`taxClass`(`id`, `description`, `code`)
INSERT INTO `vn`.`intrastat`(`id`, `description`, `taxClassFk`, `taxCodeFk`) INSERT INTO `vn`.`intrastat`(`id`, `description`, `taxClassFk`, `taxCodeFk`)
VALUES VALUES
(05080000, 'Coral y materiales similares' , 2, 2), (05080000, 'Coral y materiales similares' , 2, 2),
(06021010, 'Plantas vivas: Esqueje/injerto, Vid', 1, 1); (06021010, 'Plantas vivas: Esqueje/injerto, Vid', 1, 1);
INSERT INTO `vn`.`item`(`id`, `name`,`typeFk`,`size`,`inkFk`,`category`,`stems`,`originFk`,`description`,`producerFk`,`intrastatFk`,`isOnOffer`,`expenceFk`,`isBargain`,`comment`,`relevancy`,`image`,`taxClassFk`,`longName`,`subName`,`tag5`,`value5`,`tag6`,`value6`,`tag7`,`value7`,`tag8`,`value8`) INSERT INTO `vn`.`item`(`id`, `name`,`typeFk`,`size`,`inkFk`,`category`,`stems`,`originFk`,`description`,`producerFk`,`intrastatFk`,`isOnOffer`,`expenceFk`,`isBargain`,`comment`,`relevancy`,`image`,`taxClassFk`,`longName`,`subName`,`tag5`,`value5`,`tag6`,`value6`,`tag7`,`value7`,`tag8`,`value8`)
@ -484,7 +484,7 @@ INSERT INTO `vn`.`item`(`id`, `name`,`typeFk`,`size`,`inkFk`,`category`,`stems`,
(3, 'Iron Patriot', 1, 60, 'AMR', 'EXT', 1 , 3, 'Rhodeys armor' , 1 , 05080000, 0, 4751000000, 0, NULL, 0, 61692, 1, 'Iron Patriot', NULL, 'Medida', '60', 'Color', 'Rosa/Amarillo', 'Categoria', 'EXT', 'Tallos', '1'), (3, 'Iron Patriot', 1, 60, 'AMR', 'EXT', 1 , 3, 'Rhodeys armor' , 1 , 05080000, 0, 4751000000, 0, NULL, 0, 61692, 1, 'Iron Patriot', NULL, 'Medida', '60', 'Color', 'Rosa/Amarillo', 'Categoria', 'EXT', 'Tallos', '1'),
(4, 'Mark I', 1, 60, 'AMR', 'EXT', 1 , 1, 'Iron Mans first armor' , 1 , 05080000, 1, 4751000000, 0, NULL, 0, 66090, 2, 'Mark I' , NULL, 'Medida', '60', 'Color', 'Rosa/Amarillo', 'Categoria', 'EXT', 'Tallos', '1'), (4, 'Mark I', 1, 60, 'AMR', 'EXT', 1 , 1, 'Iron Mans first armor' , 1 , 05080000, 1, 4751000000, 0, NULL, 0, 66090, 2, 'Mark I' , NULL, 'Medida', '60', 'Color', 'Rosa/Amarillo', 'Categoria', 'EXT', 'Tallos', '1'),
(5, 'Mjolnir', 3, 30, 'AZL', 'EXT', 1 , 2, 'Thors hammer!' , 2 , 06021010, 1, 4751000000, 0, NULL, 0, 67350, 2, 'Mjolnir' , NULL, 'Medida', '30', 'Color', 'Azul' , 'Categoria', 'EXT', 'Tallos', '1'), (5, 'Mjolnir', 3, 30, 'AZL', 'EXT', 1 , 2, 'Thors hammer!' , 2 , 06021010, 1, 4751000000, 0, NULL, 0, 67350, 2, 'Mjolnir' , NULL, 'Medida', '30', 'Color', 'Azul' , 'Categoria', 'EXT', 'Tallos', '1'),
(6, 'ShippingCost', 4, NULL, NULL, NULL, NULL, 2, NULL , NULL, 06021010, 1, 4751000000, 0, NULL, 0, 67350, 2, 'ShippingCost', NULL, 'Medida', NULL, 'Color', NULL , 'Categoria', NULL, 'Tallos', NULL); (6, 'ShippingCost', 4, NULL, NULL, NULL, NULL, 2, NULL , NULL, 06021010, 1, 4751000000, 0, NULL, 0, 67350, 2, 'ShippingCost', NULL, 'Medida', NULL, 'Color', NULL , 'Categoria', NULL , 'Tallos', NULL);
INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `isBox`, `created`, `itemFk`, `counter`, `checked`, `workerFk`) INSERT INTO `vn`.`expedition`(`id`, `agencyModeFk`, `ticketFk`, `isBox`, `created`, `itemFk`, `counter`, `checked`, `workerFk`)
VALUES VALUES
@ -614,7 +614,30 @@ INSERT INTO `vn`.`tag`(`id`,`name`,`isFree`,`isQuantitatif`,`sourceTable`,`unit`
(3, 'Shape', 0, 0, null, null), (3, 'Shape', 0, 0, null, null),
(4, 'Location', 1, 0, null, null), (4, 'Location', 1, 0, null, null),
(5, 'Owner', 1, 1, null, null); (5, 'Owner', 1, 1, null, null);
/*
INSERT INTO `vn`.`itemTag`(`id`,`itemFk`,`tagFk`,`value`,`priority`)
VALUES
(1, 1, 1, 'Yellow', 5),
(2, 1, 2, 'Manipulates time', 4),
(3, 1, 3, 'round', 3),
(4, 1, 4, 'Gamoras hideout', 2),
(5, 1, 5, 'Gamora', 1),
(6, 2, 1, 'Red', 5),
(7, 2, 2, 'Manipulates mind', 4),
(8, 2, 3, 'square', 3),
(9, 2, 4, 'unknown location', 2),
(10, 2, 5, 'Thanos', 1),
(11, 3, 1, 'Green', 5),
(12, 3, 2, 'Save the children', 4),
(13, 3, 3, 'human shape', 3),
(14, 3, 4, 'Stark tower', 2),
(15, 3, 5, 'Tony Stark', 1),
(16, 4, 1, 'Blue', 5),
(17, 4, 2, 'Protect the citizen', 4),
(18, 4, 3, 'human shape', 3),
(19, 4, 4, 'Manhattan', 2),
(20, 4, 5, 'Tony Stark', 1);
*/
INSERT INTO `vn`.`itemTag`(`id`,`itemFk`,`tagFk`,`value`,`priority`) INSERT INTO `vn`.`itemTag`(`id`,`itemFk`,`tagFk`,`value`,`priority`)
VALUES VALUES
(1, 1, 1, 'Yellow', 5), (1, 1, 1, 'Yellow', 5),

2
services/loopback/common/methods/client/specs/listWorkers.spec.js
View File

@ -7,7 +7,7 @@ describe('Client listWorkers', () => {
.then(result => { .then(result => {
let amountOfEmployees = Object.keys(result).length; let amountOfEmployees = Object.keys(result).length;
expect(amountOfEmployees).toEqual(39); expect(amountOfEmployees).toEqual(41);
done(); done();
}) })
.catch(catchErrors(done)); .catch(catchErrors(done));