#5858 - zoneCollisions #1853

Merged
jsegarra merged 78 commits from 5858-zone_Collisions into dev 2024-03-15 12:36:38 +00:00
Member
No description provided.
jsegarra added 5 commits 2023-11-22 08:31:37 +00:00
jsegarra added 1 commit 2023-11-22 11:48:52 +00:00
gitea/salix/pipeline/head This commit looks good Details
b453abdb3a
refs #5858 feat: new event in vn
jsegarra added 4 commits 2023-11-24 11:30:55 +00:00
jsegarra changed title from WIP: 5858-zoneCollisions to WIP: #5858 - zoneCollisions 2023-11-24 11:49:06 +00:00
jsegarra added 3 commits 2023-12-01 08:40:05 +00:00
jsegarra added 1 commit 2023-12-19 05:55:44 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
e3379b42a1
refs #5858 test: bad test calls
jsegarra added 4 commits 2023-12-19 06:55:03 +00:00
jsegarra added 1 commit 2023-12-19 07:02:48 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
dbc3fc8007
refs #5858 perf: remove bad comments
jsegarra added 1 commit 2023-12-19 07:04:22 +00:00
gitea/salix/pipeline/head Build queued... Details
2d4fb9d2f8
refs #5858 perf: remove unused methods
jsegarra changed title from WIP: #5858 - zoneCollisions to #5858 - zoneCollisions 2023-12-19 07:04:36 +00:00
jsegarra added 1 commit 2023-12-19 07:04:50 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
72e9b69d7e
Merge branch 'dev' into 5858-zone_Collisions
jsegarra added 3 commits 2023-12-19 11:58:15 +00:00
jsegarra requested review from juan 2023-12-19 11:59:05 +00:00
jsegarra added 1 commit 2023-12-21 12:05:34 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
100936d40b
Merge branch 'dev' into 5858-zone_Collisions
jsegarra added 1 commit 2023-12-22 08:27:19 +00:00
jsegarra added 1 commit 2023-12-22 10:53:45 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
8c3d940987
Merge branch 'dev' into 5858-zone_Collisions
jsegarra added 1 commit 2024-01-02 11:04:00 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
b11b0642f8
Merge branch 'dev' into 5858-zone_Collisions
juan requested review from jgallego 2024-01-22 09:00:35 +00:00
juan refused to review 2024-01-22 09:00:39 +00:00
jgallego changed title from #5858 - zoneCollisions to WIP: #5858 - zoneCollisions 2024-01-23 07:10:31 +00:00
jsegarra added 1 commit 2024-02-12 07:52:31 +00:00
jsegarra added 1 commit 2024-02-12 07:54:27 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
995a99c661
refs #5858 feat: removeZoneIncludedCheck
jsegarra added 2 commits 2024-02-12 09:13:32 +00:00
jsegarra added 2 commits 2024-02-12 09:15:53 +00:00
jsegarra added 4 commits 2024-02-12 09:35:45 +00:00
jsegarra added 1 commit 2024-02-12 10:37:40 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
0a398fdd6c
refs #5858 feat: comments
jsegarra added 1 commit 2024-02-12 12:15:15 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
e8c783ca68
refs #5858 feat: comments
jsegarra added 1 commit 2024-02-12 12:19:12 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
05d685c86b
refs #5858 feat: comments
jsegarra added 2 commits 2024-02-12 14:14:06 +00:00
jgallego refused to review 2024-02-15 08:52:11 +00:00
jsegarra added 4 commits 2024-02-20 13:28:01 +00:00
jsegarra added 1 commit 2024-02-20 13:41:13 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
be0e835a37
refs #5878 feat: remove vn_event_getCollisions
jsegarra added 3 commits 2024-02-21 13:22:55 +00:00
jsegarra added 1 commit 2024-02-21 13:27:41 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
7bf89cd448
Merge branch 'dev' into 5858-zone_Collisions
jsegarra added 2 commits 2024-02-21 13:30:04 +00:00
jsegarra requested review from jgallego 2024-02-21 13:32:02 +00:00
jsegarra changed title from WIP: #5858 - zoneCollisions to #5858 - zoneCollisions 2024-02-21 13:32:04 +00:00
jgallego requested changes 2024-02-21 13:54:55 +00:00
Dismissed
@ -7,0 +7,4 @@
-- Inserta en vn_schedules para ejecutar el procedure de 'zone_getCollisions'
INSERT IGNORE INTO `util`.`vn_schedules`(`schema`, `procedure`)
Owner

estamos generando una dependencia en util de vn.
Util no tiene que conocer vn.
Simplemente crea el schedule que se ejecute todas las noches en vn, ya està.

estamos generando una dependencia en util de vn. Util no tiene que conocer vn. Simplemente crea el schedule que se ejecute todas las noches en vn, ya està.
jsegarra marked this conversation as resolved
jsegarra added 1 commit 2024-02-21 14:06:16 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
cc90b13668
refs #5858 feat: remove unnecesary update
jsegarra reviewed 2024-02-21 14:11:36 +00:00
Author
Member

Para gestionar los métodos de notificaciones, sin embargo, esto, como ya no se gestiona mediante métodos, debería ir fuera. De hecho pone obsoleto porque pertenece al fixtures anterior.
Ya lo he eliminado

Para gestionar los métodos de notificaciones, sin embargo, esto, como ya no se gestiona mediante métodos, debería ir fuera. De hecho pone obsoleto porque pertenece al fixtures anterior. Ya lo he eliminado
jsegarra marked this conversation as resolved
jsegarra added 1 commit 2024-02-21 14:18:47 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
838effadc0
refs #5858 feat: move change to vnx
jsegarra reviewed 2024-02-21 14:19:18 +00:00
Author
Member

Le puse el campo id y el select, porque sin esto, me inserta como id 0.
Lo hice para que sea dinámico al insertar en la bd de prod.
Lo he movido a 838effadc0/db/versions/10881-greenHydrangea/01-notification.vnx.sql

Le puse el campo id y el select, porque sin esto, me inserta como id 0. Lo hice para que sea dinámico al insertar en la bd de prod. Lo he movido a https://gitea.verdnatura.es/verdnatura/salix/src/commit/838effadc03f99e3e994584a1c320c0f35226146/db/versions/10881-greenHydrangea/01-notification.vnx.sql
jsegarra marked this conversation as resolved
jsegarra reviewed 2024-02-21 14:20:03 +00:00
Author
Member

DEPRECATED

DEPRECATED
jsegarra marked this conversation as resolved
jsegarra reviewed 2024-02-21 14:20:17 +00:00
Author
Member

DEPRECATED

DEPRECATED
jsegarra marked this conversation as resolved
jsegarra added 1 commit 2024-02-26 05:49:37 +00:00
jsegarra added 2 commits 2024-02-29 08:29:06 +00:00
jsegarra added 1 commit 2024-02-29 12:49:53 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
95fa776e41
refs 5858 feat: sql files
jsegarra added 2 commits 2024-03-04 10:57:57 +00:00
jgallego requested changes 2024-03-06 08:37:15 +00:00
Dismissed
@ -324,4 +324,5 @@ INSERT INTO mysql.roles_mapping (`User`, `Host`, `Role`, `Admin_option`)
FROM mysql.roles_mapping
WHERE `User` LIKE @prefixedLike AND `Host` = @genRoleHost;
Owner

quitar salto

quitar salto
jsegarra marked this conversation as resolved
@ -9,2 +9,4 @@
`changedModelId` = OLD.zoneFk,
`userFk` = account.myUser_getId();
Owner

no ponemos dos saltos de linea nunca

no ponemos dos saltos de linea nunca
jsegarra marked this conversation as resolved
@ -0,0 +1,12 @@
SET @MaxId = (SELECT MAX(id)+1 from util.notification n);
Owner

dile a chatgpt que te cambie esta linea y que quieres usar el last_insert_id de forma que primero insertas y luego ya usas el id otorgado.

dile a chatgpt que te cambie esta linea y que quieres usar el last_insert_id de forma que primero insertas y luego ya usas el id otorgado.
Author
Member

No hace falta ir tan lejos...tonto de mi por no haber revisado el resto del proyecto.

Basta con usar LAST_INSERT_ID()

No hace falta ir tan lejos...tonto de mi por no haber revisado el resto del proyecto. Basta con usar LAST_INSERT_ID()
Author
Member

Revisamos porque esta tabla empieza por 0.
Devuelve 0 LAST_INSERT_ID();

Revisamos porque esta tabla empieza por 0. Devuelve 0 LAST_INSERT_ID();
Author
Member

Solved, he modificado la propiedad auto_increment de la columna id de util.notification

Solved, he modificado la propiedad auto_increment de la columna id de util.notification
jgallego marked this conversation as resolved
@ -0,0 +5,4 @@
INSERT IGNORE INTO util.notificationSubscription (notificationFk,userFk)
VALUES(
@MaxId, 100);
Owner

que es este 100? el usuario 100 en prod es icef...no me cuadra.
Busca la forma de usar codes para no poner numeros.

que es este 100? el usuario 100 en prod es icef...no me cuadra. Busca la forma de usar codes para no poner numeros.
Author
Member

INSERT IGNORE INTO util.notificationSubscription (notificationFk,userFk)
VALUES(
@MaxId, (SELECT id from account.user where name = "system"));

La solución estaba mas abajo

INSERT IGNORE INTO util.notificationSubscription (notificationFk,userFk) VALUES( @MaxId, (SELECT id from `account`.`user` where name = "system")); La solución estaba mas abajo
jgallego marked this conversation as resolved
jsegarra added 3 commits 2024-03-06 10:42:58 +00:00
jsegarra requested review from jgallego 2024-03-07 12:51:52 +00:00
jgallego requested changes 2024-03-08 14:30:21 +00:00
Dismissed
@ -0,0 +1,12 @@
SET @MaxId = (SELECT MAX(id)+1 from util.notification n);
INSERT IGNORE INTO util.notification (`id`, `name`,`description`)
VALUES
(@MaxId, 'zone-included','An email to notify zoneCollisions');
Owner

pongo esto para descartar y que cuando tengas el nuevo pr me puedas pedir revision de nuevo

pongo esto para descartar y que cuando tengas el nuevo pr me puedas pedir revision de nuevo
Author
Member

Corregido: 4994a836c7

Corregido: 4994a836c7119a6c894e3600a78ba71438ecb410
jgallego marked this conversation as resolved
jsegarra added 2 commits 2024-03-09 10:28:46 +00:00
jsegarra requested review from jgallego 2024-03-09 10:29:32 +00:00
jgallego requested changes 2024-03-12 06:12:41 +00:00
Dismissed
@ -0,0 +4,4 @@
SET @MaxId = LAST_INSERT_ID();
INSERT IGNORE INTO util.notificationSubscription (notificationFk,userFk)
VALUES(
@MaxId, (SELECT id from `account`.`user` where name = "system"));
Owner

porque se la añades al usuario system? deberia de ser el que solicita la tarea no?

porque se la añades al usuario system? deberia de ser el que solicita la tarea no?
Author
Member

Es un evento el que dispara el procedure de zone_getCollisions, por tanto no hay usuario que haga la operación manual, si no que es el systema.

Me basé en los datos de producción util.notification where id=6

Si las especificaciones no son las correctas, hay algún sitio donde pueda tomar la referencia?

Es un evento el que dispara el procedure de zone_getCollisions, por tanto no hay usuario que haga la operación manual, si no que es el systema. Me basé en los datos de producción util.notification where id=6 Si las especificaciones no son las correctas, hay algún sitio donde pueda tomar la referencia?
Author
Member

@jgallego Tras juntarme con Pablo, he cambiado el usuario de systema a root, porque por lo que me ha comentado, si el procedimiento se ejecuta en la BD es root y en salix es system

@jgallego Tras juntarme con Pablo, he cambiado el usuario de systema a root, porque por lo que me ha comentado, si el procedimiento se ejecuta en la BD es root y en salix es system
jgallego marked this conversation as resolved
jsegarra added 2 commits 2024-03-12 08:41:25 +00:00
jsegarra added 1 commit 2024-03-12 09:21:24 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
e7f6e61ea1
refs #5858: change notification owner
jsegarra requested review from jgallego 2024-03-12 10:19:43 +00:00
jsegarra added 1 commit 2024-03-13 10:54:42 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
8276765225
refs #5858 perf: destinationFk to pepe
jsegarra added 1 commit 2024-03-13 10:59:07 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
172e7566b5
refs #5858 perf: improve insert
jgallego approved these changes 2024-03-13 13:44:40 +00:00
Dismissed
jsegarra added 2 commits 2024-03-13 14:44:59 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
f09283b9c9
refs #5858 perf: html
jsegarra requested review from jgallego 2024-03-13 14:45:06 +00:00
jsegarra added 1 commit 2024-03-13 14:45:16 +00:00
gitea/salix/pipeline/pr-dev There was a failure building this commit Details
f18e90d6f3
Merge branch 'dev' into 5858-zone_Collisions
jgallego approved these changes 2024-03-14 06:39:28 +00:00
Dismissed
jsegarra added 2 commits 2024-03-15 11:23:45 +00:00
jgallego approved these changes 2024-03-15 11:45:13 +00:00
Dismissed
jsegarra requested review from jgallego 2024-03-15 11:56:05 +00:00
jgallego approved these changes 2024-03-15 11:56:18 +00:00
jsegarra added 1 commit 2024-03-15 12:33:02 +00:00
gitea/salix/pipeline/pr-dev This commit looks good Details
0f4377ff5d
refs #5858 test: fixtures
jsegarra merged commit 6e045868c3 into dev 2024-03-15 12:36:38 +00:00
jsegarra deleted branch 5858-zone_Collisions 2024-03-15 12:36:38 +00:00
Sign in to join this conversation.
No reviewers
No Milestone
No Assignees
2 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#1853
No description provided.