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

1781-zoneHoliday #994

Merged
joan merged 49 commits from 1781-zoneHoliday into dev 2022-08-03 06:41:31 +00:00
Conversation 1 Commits 49 Files Changed 20 +8 -8
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4076f2908e - Show all commits

6
modules/zone/back/methods/zone/exclusionGeo.js
View File

@ -17,7 +17,7 @@ module.exports = Self => {
}, },
{ {
arg: 'geoIds', arg: 'geoIds',
type: 'any', type: ['number'],
vicent marked this conversation as resolved Outdated
carlosjr commented 2022-07-22 10:45:58 +00:00
Outdated
Review
Copy Link

geoIds a mi entender son Identificadores de geo por ejemplo: [1, 2, 3, 4]

pero poner un nombre que reprensentaria una coleccion de ids y darle de tipo "any" no es buena practica resultando en un manejo de datos confuso.

refactoriza los argumentos para que reciba lo que necesita que aparentemente son ids a secas en una array.

geoIds a mi entender son Identificadores de geo por ejemplo: [1, 2, 3, 4] pero poner un nombre que reprensentaria una coleccion de ids y darle de tipo "any" no es buena practica resultando en un manejo de datos confuso. refactoriza los argumentos para que reciba lo que necesita que aparentemente son ids a secas en una array.
description: 'The geos id' description: 'The geos id'
} }
@ -48,10 +48,10 @@ module.exports = Self => {
const promises = []; const promises = [];
for (let geoId of geoIds) { for (const geoId of geoIds) {
const newZoneExclusionGeo = await models.ZoneExclusionGeo.create({ const newZoneExclusionGeo = await models.ZoneExclusionGeo.create({
zoneExclusionFk: newZoneExclusion.id, zoneExclusionFk: newZoneExclusion.id,
geoFk: geoId.id geoFk: geoId
}, myOptions); }, myOptions);
promises.push(newZoneExclusionGeo); promises.push(newZoneExclusionGeo);

2
modules/zone/back/methods/zone/specs/exclusionGeo.spec.js
View File

@ -27,7 +27,7 @@ describe('zone exclusionGeo()', () => {
try { try {
const options = {transaction: tx}; const options = {transaction: tx};
const geoIds = [{id: 1}, {id: 2}]; const geoIds = [1, 2];
vicent marked this conversation as resolved Outdated
carlosjr commented 2022-07-22 10:46:57 +00:00
Outdated
Review
Copy Link

const geoIds = [1, 2]

const geoIds = [1, 2]
const result = await models.Zone.exclusionGeo(zoneId, today, geoIds, options); const result = await models.Zone.exclusionGeo(zoneId, today, geoIds, options);
expect(result.length).toEqual(2); expect(result.length).toEqual(2);

2
modules/zone/back/methods/zone/specs/updateExclusionGeo.spec.js
View File

@ -26,7 +26,7 @@ describe('zone updateExclusionGeo()', () => {
try { try {
const options = {transaction: tx}; const options = {transaction: tx};
const zoneId = 2; const zoneId = 2;
const geoIds = [{id: 1}, {id: 2}]; const geoIds = [1, 2];
vicent marked this conversation as resolved Outdated
carlosjr commented 2022-07-22 10:47:32 +00:00
Outdated
Review
Copy Link

mas de lo mismo

mas de lo mismo
const result = await models.Zone.updateExclusionGeo(zoneId, geoIds, options); const result = await models.Zone.updateExclusionGeo(zoneId, geoIds, options);
expect(result.length).toEqual(2); expect(result.length).toEqual(2);

4
modules/zone/back/methods/zone/updateExclusionGeo.js
View File

@ -11,7 +11,7 @@ module.exports = Self => {
}, },
{ {
arg: 'geoIds', arg: 'geoIds',
type: 'any', type: ['number'],
vicent marked this conversation as resolved Outdated
carlosjr commented 2022-07-22 10:47:54 +00:00
Outdated
Review
Copy Link

mala practica

mala practica
description: 'The geos id' description: 'The geos id'
} }
@ -44,7 +44,7 @@ module.exports = Self => {
for (const geoId of geoIds) { for (const geoId of geoIds) {
const params = { const params = {
zoneExclusionFk: zoneExclusionFk, zoneExclusionFk: zoneExclusionFk,
geoFk: geoId.id geoFk: geoId
}; };
const deletedZoneExclusionGeos = models.ZoneExclusionGeo.create(params, myOptions); const deletedZoneExclusionGeos = models.ZoneExclusionGeo.create(params, myOptions);
promises.push(deletedZoneExclusionGeos); promises.push(deletedZoneExclusionGeos);

2
modules/zone/front/events/index.js
View File

@ -215,7 +215,7 @@ class Controller extends Section {
const excludeSelected = this.excludeSelected; const excludeSelected = this.excludeSelected;
let req; let req;
const geoIds = []; const geoIds = [];
this.exclusionGeos.forEach(id => geoIds.push({id})); this.exclusionGeos.forEach(id => geoIds.push(id));
if (this.isNew) { if (this.isNew) {
const params = { const params = {