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

4873-zone.delivery-day #1248

Merged
vicent merged 8 commits from 4873-zone.delivery-day into dev 2023-02-03 12:28:36 +00:00
Conversation 0 Commits 8 Files Changed 2 +16 -12
vicent commented 2023-01-10 13:13:15 +00:00
Contributor
Copy Link
No description provided.
vicent added the
CR / Tests passed
 label 2023-01-10 13:13:15 +00:00
vicent added 1 commit 2023-01-10 13:13:17 +00:00
gitea/salix/pipeline/head This commit looks good Details
484b8d42e1 fix: corregido sql
vicent changed title from fix: corregido sql to 4873-zone.delivery-day 2023-01-10 13:13:49 +00:00
vicent requested review from joan 2023-01-10 13:14:01 +00:00
vicent added 1 commit 2023-01-10 13:14:20 +00:00
gitea/salix/pipeline/head This commit looks good Details
ae3b26b202 Merge branch 'dev' into 4873-zone.delivery-day
joan added 1 commit 2023-01-12 06:18:18 +00:00
gitea/salix/pipeline/head This commit looks good Details
3f7dee63ac Merge branch 'dev' into 4873-zone.delivery-day
joan requested review from juan 2023-01-12 06:25:10 +00:00
joan refused to review 2023-01-12 06:25:13 +00:00
juan requested changes 2023-01-19 20:33:01 +00:00
modules/zone/back/methods/zone/getZoneClosing.js Outdated
@ -30,8 +30,11 @@ module.exports = Self => {
if (typeof options == 'object')
Object.assign(myOptions, options);
const dated = new Date(date);
juan commented 2023-01-19 20:10:00 +00:00
Owner
Copy Link

Esto es necesario? Si se define el argumento como tipo Date debería llegar una fecha

Esto es necesario? Si se define el argumento como tipo Date debería llegar una fecha
vicent marked this conversation as resolved
modules/zone/back/methods/zone/getZoneClosing.js Outdated
@ -31,2 +31,4 @@
Object.assign(myOptions, options);
const dated = new Date(date);
const dayName = dated.toString().split(' ')[0];
juan commented 2023-01-19 20:31:31 +00:00
Owner
Copy Link

No nesario si se pasa directamente date a la función

No nesario si se pasa directamente date a la función
vicent marked this conversation as resolved
modules/zone/back/methods/zone/getZoneClosing.js Outdated
@ -49,1 +50,3 @@
OR INSTR(weekDays, SUBSTRING(DAYNAME(?), 1, 3) ) > 0
dated = ?
OR ? BETWEEN started AND ended
OR weekDays LIKE ?
juan commented 2023-01-19 20:30:18 +00:00
Owner
Copy Link

Pasar la fecha directamnte y comparar así: ze.weekDays & (1 << WEEKDAY(?))

Además hay que tener en cuenta el tipo de evento type.

Todas las columnas de la consulta debería llevar el alias de la tabla.

Pasar la fecha directamnte y comparar así: `ze.weekDays & (1 << WEEKDAY(?))` Además hay que tener en cuenta el tipo de evento `type`. Todas las columnas de la consulta debería llevar el alias de la tabla.
vicent marked this conversation as resolved
modules/zone/back/methods/zone/getZoneClosing.js Outdated
@ -53,3 +56,3 @@
GROUP BY z.id`;
return Self.rawSql(query, [date, date, date, zoneIds], myOptions);
return Self.rawSql(query, [date, date, dayName, zoneIds], myOptions);
juan commented 2023-01-19 20:31:45 +00:00
Owner
Copy Link

Pasar date en lugar de dayName

Pasar `date` en lugar de `dayName`
vicent marked this conversation as resolved
vicent added 1 commit 2023-01-20 07:17:11 +00:00
gitea/salix/pipeline/head This commit looks good Details
5d19da48e2 refactor: actualizada consulta sql
vicent requested review from juan 2023-01-20 07:21:53 +00:00
juan requested changes 2023-01-26 16:41:12 +00:00
modules/zone/back/methods/zone/getZoneClosing.js Outdated
@ -54,0 +46,4 @@
(
ze.dated = ?
OR ? BETWEEN ze.started AND ze.ended
OR ze.weekDays & (1 << WEEKDAY(?))
juan commented 2023-01-26 16:41:00 +00:00
Owner
Copy Link

S'ha de tindre en compte tambe la columna type de zoneEvent, mira el WHERE del procediment vn.zone_getOptionsForLanding

S'ha de tindre en compte tambe la columna `type` de `zoneEvent`, mira el WHERE del procediment `vn.zone_getOptionsForLanding`
vicent commented 2023-01-27 07:30:37 +00:00
Author
Contributor
Copy Link

Pero aixo ja ho fa:

 WHERE
                        (
                            ze.dated = ?
                            OR ? BETWEEN ze.started AND ze.ended
                            OR ze.weekDays & (1 << WEEKDAY(?))
                        )

pq depen del camps q tinga rellenats es un type o altre.

Pero aixo ja ho fa: ``` WHERE ( ze.dated = ? OR ? BETWEEN ze.started AND ze.ended OR ze.weekDays & (1 << WEEKDAY(?)) ) ``` pq depen del camps q tinga rellenats es un type o altre.
vicent commented 2023-01-27 07:58:14 +00:00
Author
Contributor
Copy Link

Vale res, he vist q pot tindre started, ended y weekDays rellenat. Pensava q eren exclusius.

Vale res, he vist q pot tindre started, ended y weekDays rellenat. Pensava q eren exclusius.
vicent marked this conversation as resolved
modules/zone/back/methods/zone/getZoneClosing.js Outdated
@ -54,0 +50,4 @@
)
AND z.id IN (?)
ORDER BY type='day' DESC, type='range' DESC, type='indefinitely' DESC) z
GROUP BY z.id;`;
juan commented 2023-01-26 16:38:05 +00:00
Owner
Copy Link

N'hi ha una tabulació de mes en tota la consulta, punt i coma no fa falta al final si nomes es una consulta.

N'hi ha una tabulació de mes en tota la consulta, punt i coma no fa falta al final si nomes es una consulta.
vicent marked this conversation as resolved
vicent added 1 commit 2023-01-27 08:00:44 +00:00
gitea/salix/pipeline/head This commit looks good Details
f7969c616c fix: tiene el cuenta zonEvent.type
vicent requested review from juan 2023-01-27 08:00:49 +00:00
vicent added 1 commit 2023-01-27 08:01:14 +00:00
juan approved these changes 2023-02-03 12:10:07 +00:00
vicent added 2 commits 2023-02-03 12:26:05 +00:00
gitea/salix/pipeline/head This commit looks good Details
e69a6ae0dc add changelog
vicent requested review from alexm 2023-02-03 12:26:28 +00:00
alexm approved these changes 2023-02-03 12:28:25 +00:00
vicent merged commit 065f91afcf into dev 2023-02-03 12:28:36 +00:00
vicent deleted branch 4873-zone.delivery-day 2023-02-03 12:28:37 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
juan
alexm
Labels
Clear labels   
CR / Tests passed

Unit tests and e2e passed

  
e2e

Implement e2e

  
Missing tests

Missing tests

  
Needs refactor

   
Simple

Simple check / No CR needed

No Label
CR / Tests passed
e2e
Missing tests
Needs refactor
Simple
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
4 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix#1248
No description provided.
Delete Branch "4873-zone.delivery-day"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?