January 2024 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe] Pushed new branch release/9.2.2
by Tony CHEMIT (＠tchemit) 22 Jan '24

22 Jan '24

Tony CHEMIT pushed new branch release/9.2.2 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/release/9.2.2 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.2.x] [jgitflow-maven-plugin]updating poms for 9.2.3-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 22 Jan '24

22 Jan '24

Tony CHEMIT pushed to branch develop-9.2.x at ultreiaio / ird-observe Commits: cceae42a by Tony Chemit at 2024-01-22T12:29:43+01:00 [jgitflow-maven-plugin]updating poms for 9.2.3-SNAPSHOT development[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - core/api/dto-consolidation/pom.xml - core/api/dto-decoration/pom.xml - core/api/dto-validation/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/avdth/pom.xml - core/persistence/consolidation/pom.xml - core/persistence/decoration/pom.xml - core/persistence/java/pom.xml - core/persistence/migration/pom.xml - core/persistence/pom.xml - core/persistence/report/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/cceae42a8960f4f3b0bb620d5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/cceae42a8960f4f3b0bb620d5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.2.x] Update changelog for v.9.2.2 [skip CI]
by Tony CHEMIT (＠tchemit) 22 Jan '24

22 Jan '24

Tony CHEMIT pushed to branch develop-9.2.x at ultreiaio / ird-observe Commits: 3e12db5e by Tony Chemit at 2024-01-22T12:29:20+01:00 Update changelog for v.9.2.2 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,18 +1,30 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2023-11-14 16:47. + * Last generated at 2024-01-22 12:28. + +## Version [9.2.2](https://gitlab.com/ultreiaio/ird-observe/-/milestones/273) + +**Closed at 2024-01-22.** + +### Download +* [Client (observe-9.2.2-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) +* [Serveur (observe-9.2.2.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9…) +* [Serveur (observe-9.2.2-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) + +### Issues + * [[Type::Anomalie 2825]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2825) **Sur l'écran de définition Non déclenchement du bouton Enregistrer** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2832]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2832) **Impossibilité de déplacer une activité PS observation sur une autre route en mode serveur** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ## Version [9.2.1](https://gitlab.com/ultreiaio/ird-observe/-/milestones/272) +**Closed at 2023-11-14.** + ### Download * [Client (observe-9.2.1-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) * [Serveur (observe-9.2.1.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9…) * [Serveur (observe-9.2.1-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) -**Closed at 2023-11-14.** - - ### Issues * [[Type::Anomalie 2798]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2798) **Souci de décalage de lignes sur le rapport Vérification des plans de cuve** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2800]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2800) **Erreur de migration sur bases AZTI locales** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3e12db5e98d242c9d820839e5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3e12db5e98d242c9d820839e5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.2.x] 2 commits: update pom
by Tony CHEMIT (＠tchemit) 22 Jan '24

22 Jan '24

Tony CHEMIT pushed to branch develop-9.2.x at ultreiaio / ird-observe Commits: 85d5435a by Tony Chemit at 2024-01-22T12:24:16+01:00 update pom - - - - - 039baf2c by Tony Chemit at 2024-01-22T12:24:16+01:00 Sur l'écran de définition Non déclenchement du bouton Enregistrer - Closes #2825 - - - - - 4 changed files: - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/FloatingObjectUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUI.jaxx - client/datasource/editor/spi/pom.xml - pom.xml Changes: ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/FloatingObjectUI.jaxx ===================================== @@ -67,6 +67,7 @@ <field name="transmittingBuoyOwnership" component="transmittingBuoyOwnership1"/> <field name="code" component="code1"/> <field name="country" component="country1"/> + <field name="vessel" component="vessel1"/> <field name='longitude' component='coordinate1'/> <field name='latitude' component='coordinate1'/> <field name='quadrant' component='coordinate1'/> @@ -80,6 +81,7 @@ <field name="transmittingBuoyOwnership" component="transmittingBuoyOwnership2"/> <field name="code" component="code2"/> <field name="country" component="country2"/> + <field name="vessel" component="vessel2"/> <field name='comment' component='comment2'/> </BeanValidator> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUI.jaxx ===================================== @@ -68,6 +68,7 @@ <field name="transmittingBuoyOwnership" component="transmittingBuoyOwnership1"/> <field name="code" component="code1"/> <field name="country" component="country1"/> + <field name="vessel" component="vessel1"/> <field name='longitude' component='coordinate1'/> <field name='latitude' component='coordinate1'/> <field name='quadrant' component='coordinate1'/> @@ -81,6 +82,7 @@ <field name="transmittingBuoyOwnership" component="transmittingBuoyOwnership2"/> <field name="code" component="code2"/> <field name="country" component="country2"/> + <field name="vessel" component="vessel2"/> <field name='comment' component='comment2'/> </BeanValidator> @@ -229,7 +231,7 @@ <JLabel id='vessel1Label'/> </cell> <cell anchor='east' weightx="1" fill="both"> - <FilterableComboBox id='vessel1' genericType='VesselReference'/> + <FilterableComboBox id='vessel1' genericType='VesselReference' beanScope="transmittingBuoy1"/> </cell> </row> <row> ===================================== client/datasource/editor/spi/pom.xml ===================================== @@ -154,6 +154,18 @@ <scope>test</scope> </dependency> </dependencies> + <build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <configuration> + <goalPrefix>client-datasource-editor-spi</goalPrefix> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> <profiles> <profile> <id>reporting</id> ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2023.47</version> + <version>2024.02</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> @@ -129,6 +129,7 @@  <lib.version.hsqldb>2.7.0</lib.version.hsqldb>  + <lib.version.java4all.http>1.0.47</lib.version.java4all.http>  <license.licenseName>gpl_v3</license.licenseName> <license.organizationName>IRD, Ultreia.io</license.organizationName> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/73f18317513427da98da10fe… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/73f18317513427da98da10fe… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch master-9.2.x
by Tony CHEMIT (＠tchemit) 22 Jan '24

22 Jan '24

Tony CHEMIT pushed new branch master-9.2.x at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/master-9.2.x You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.2.x] 2 commits: Impossibilité de déplacer une activité PS observation sur une autre route en...
by Tony CHEMIT (＠tchemit) 22 Jan '24

22 Jan '24

Tony CHEMIT pushed to branch develop-9.2.x at ultreiaio / ird-observe Commits: ae5b4119 by Tony Chemit at 2024-01-22T11:29:53+01:00 Impossibilité de déplacer une activité PS observation sur une autre route en mode serveur - Closes #2832 - - - - - 73f18317 by Tony Chemit at 2024-01-22T11:29:53+01:00 update pom - - - - - 5 changed files: - client/datasource/editor/spi/pom.xml - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlDeletePlanModel.json - pom.xml - toolkit/api-services/src/main/java/fr/ird/observe/services/service/data/MoveRequest.java - toolkit/templates/src/main/java/org/nuiton/topia/templates/sql/plan/SqlHelper.java Changes: ===================================== client/datasource/editor/spi/pom.xml ===================================== @@ -154,6 +154,18 @@ <scope>test</scope> </dependency> </dependencies> + <build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <configuration> + <goalPrefix>client-datasource-editor-spi</goalPrefix> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> <profiles> <profile> <id>reporting</id> ===================================== core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlDeletePlanModel.json ===================================== @@ -120,23 +120,23 @@ "ll_observation.set→DELETE FROM ll_observation.set WHERE set.activity %s;", "ll_observation.sensorUsed→DELETE FROM ll_observation.sensorUsed WHERE sensorUsed.activity %s;", "ll_observation.encounter→DELETE FROM ll_observation.encounter WHERE encounter.activity %s;", - "ll_logbook.activity→UPDATE ll_logbook.activity activity SET activity.relatedObservedActivity = NULL WHERE activity.relatedObservedActivity %s", + "ll_logbook.activity→UPDATE ll_logbook.activity SET relatedObservedActivity = NULL WHERE activity.relatedObservedActivity %s", "ll_observation.activity→DELETE FROM ll_observation.activity WHERE activity.topiaId %s;" ], "fr.ird.observe.entities.data.ll.observation.BaitsComposition": [ "ll_observation.baitsComposition→DELETE FROM ll_observation.baitsComposition WHERE baitsComposition.topiaId %s;" ], "fr.ird.observe.entities.data.ll.observation.Basket": [ - "ll_observation.catch→UPDATE ll_observation.catch catch SET catch.branchline = NULL WHERE catch.branchline IN ( SELECT branchline.topiaId FROM ll_observation.branchline branchline WHERE branchline.basket %s )", - "ll_observation.tdr→UPDATE ll_observation.tdr tdr SET tdr.branchline = NULL WHERE tdr.branchline IN ( SELECT branchline.topiaId FROM ll_observation.branchline branchline WHERE branchline.basket %s )", + "ll_observation.catch→UPDATE ll_observation.catch SET branchline = NULL WHERE catch.branchline IN ( SELECT branchline.topiaId FROM ll_observation.branchline branchline WHERE branchline.basket %s )", + "ll_observation.tdr→UPDATE ll_observation.tdr SET branchline = NULL WHERE tdr.branchline IN ( SELECT branchline.topiaId FROM ll_observation.branchline branchline WHERE branchline.basket %s )", "ll_observation.branchline→DELETE FROM ll_observation.branchline WHERE branchline.basket %s;", - "ll_observation.catch→UPDATE ll_observation.catch catch SET catch.basket = NULL WHERE catch.basket %s", - "ll_observation.tdr→UPDATE ll_observation.tdr tdr SET tdr.basket = NULL WHERE tdr.basket %s", + "ll_observation.catch→UPDATE ll_observation.catch SET basket = NULL WHERE catch.basket %s", + "ll_observation.tdr→UPDATE ll_observation.tdr SET basket = NULL WHERE tdr.basket %s", "ll_observation.basket→DELETE FROM ll_observation.basket WHERE basket.topiaId %s;" ], "fr.ird.observe.entities.data.ll.observation.Branchline": [ - "ll_observation.catch→UPDATE ll_observation.catch catch SET catch.branchline = NULL WHERE catch.branchline %s", - "ll_observation.tdr→UPDATE ll_observation.tdr tdr SET tdr.branchline = NULL WHERE tdr.branchline %s", + "ll_observation.catch→UPDATE ll_observation.catch SET branchline = NULL WHERE catch.branchline %s", + "ll_observation.tdr→UPDATE ll_observation.tdr SET branchline = NULL WHERE tdr.branchline %s", "ll_observation.branchline→DELETE FROM ll_observation.branchline WHERE branchline.topiaId %s;" ], "fr.ird.observe.entities.data.ll.observation.BranchlinesComposition": [ @@ -158,14 +158,14 @@ "ll_observation.hooksComposition→DELETE FROM ll_observation.hooksComposition WHERE hooksComposition.topiaId %s;" ], "fr.ird.observe.entities.data.ll.observation.Section": [ - "ll_observation.catch→UPDATE ll_observation.catch catch SET catch.branchline = NULL WHERE catch.branchline IN ( SELECT catch.branchline FROM ll_observation.branchline branchline INNER JOIN ll_observation.catch catch_ ON catch_.branchline = branchline.topiaId INNER JOIN ll_observation.basket basket ON basket.topiaId = branchline.basket WHERE basket.section %s )", - "ll_observation.tdr→UPDATE ll_observation.tdr tdr SET tdr.branchline = NULL WHERE tdr.branchline IN ( SELECT tdr.branchline FROM ll_observation.branchline branchline INNER JOIN ll_observation.tdr tdr_ ON tdr_.branchline = branchline.topiaId INNER JOIN ll_observation.basket basket ON basket.topiaId = branchline.basket WHERE basket.section %s )", + "ll_observation.catch→UPDATE ll_observation.catch SET branchline = NULL WHERE catch.branchline IN ( SELECT catch.branchline FROM ll_observation.branchline branchline INNER JOIN ll_observation.catch catch_ ON catch_.branchline = branchline.topiaId INNER JOIN ll_observation.basket basket ON basket.topiaId = branchline.basket WHERE basket.section %s )", + "ll_observation.tdr→UPDATE ll_observation.tdr SET branchline = NULL WHERE tdr.branchline IN ( SELECT tdr.branchline FROM ll_observation.branchline branchline INNER JOIN ll_observation.tdr tdr_ ON tdr_.branchline = branchline.topiaId INNER JOIN ll_observation.basket basket ON basket.topiaId = branchline.basket WHERE basket.section %s )", "ll_observation.branchline→DELETE FROM ll_observation.branchline WHERE branchline.topiaId IN (SELECT branchline.topiaId FROM ll_observation.branchline branchline INNER JOIN ll_observation.basket basket ON basket.topiaId = branchline.basket WHERE basket.section %s);", - "ll_observation.catch→UPDATE ll_observation.catch catch SET catch.basket = NULL WHERE catch.basket IN ( SELECT basket.topiaId FROM ll_observation.basket basket WHERE basket.section %s )", - "ll_observation.tdr→UPDATE ll_observation.tdr tdr SET tdr.basket = NULL WHERE tdr.basket IN ( SELECT basket.topiaId FROM ll_observation.basket basket WHERE basket.section %s )", + "ll_observation.catch→UPDATE ll_observation.catch SET basket = NULL WHERE catch.basket IN ( SELECT basket.topiaId FROM ll_observation.basket basket WHERE basket.section %s )", + "ll_observation.tdr→UPDATE ll_observation.tdr SET basket = NULL WHERE tdr.basket IN ( SELECT basket.topiaId FROM ll_observation.basket basket WHERE basket.section %s )", "ll_observation.basket→DELETE FROM ll_observation.basket WHERE basket.section %s;", - "ll_observation.catch→UPDATE ll_observation.catch catch SET catch.section = NULL WHERE catch.section %s", - "ll_observation.tdr→UPDATE ll_observation.tdr tdr SET tdr.section = NULL WHERE tdr.section %s", + "ll_observation.catch→UPDATE ll_observation.catch SET section = NULL WHERE catch.section %s", + "ll_observation.tdr→UPDATE ll_observation.tdr SET section = NULL WHERE tdr.section %s", "ll_observation.section→DELETE FROM ll_observation.section WHERE section.topiaId %s;" ], "fr.ird.observe.entities.data.ll.observation.SensorUsed": [ @@ -268,7 +268,7 @@ ], "fr.ird.observe.entities.data.ps.localmarket.Survey": [ "ps_localmarket.surveyPart→DELETE FROM ps_localmarket.surveyPart WHERE surveyPart.survey %s;", - "ps_localmarket.batch→UPDATE ps_localmarket.batch batch SET batch.survey = NULL WHERE batch.survey %s", + "ps_localmarket.batch→UPDATE ps_localmarket.batch SET survey = NULL WHERE batch.survey %s", "ps_localmarket.survey→DELETE FROM ps_localmarket.survey WHERE survey.topiaId %s;" ], "fr.ird.observe.entities.data.ps.localmarket.SurveyPart": [ @@ -353,7 +353,7 @@ "ps_observation.floatingObject→DELETE FROM ps_observation.floatingObject WHERE floatingObject.activity %s;", "ps_observation.catch→DELETE FROM ps_observation.catch WHERE catch.topiaId IN (SELECT catch.topiaId FROM ps_observation.catch catch INNER JOIN ps_observation.set set ON set.topiaId = catch.set WHERE set.activity %s);", "ps_observation.set→DELETE FROM ps_observation.set WHERE set.activity %s;", - "ps_logbook.activity→UPDATE ps_logbook.activity activity SET activity.relatedObservedActivity = NULL WHERE activity.relatedObservedActivity %s", + "ps_logbook.activity→UPDATE ps_logbook.activity SET relatedObservedActivity = NULL WHERE activity.relatedObservedActivity %s", "ps_observation.activity→DELETE FROM ps_observation.activity WHERE activity.topiaId %s;" ], "fr.ird.observe.entities.data.ps.observation.Catch": [ @@ -391,7 +391,7 @@ "ps_observation.floatingObject→DELETE FROM ps_observation.floatingObject WHERE floatingObject.topiaId IN (SELECT floatingObject.topiaId FROM ps_observation.floatingObject floatingObject INNER JOIN ps_observation.activity activity ON activity.topiaId = floatingObject.activity WHERE activity.route %s);", "ps_observation.catch→DELETE FROM ps_observation.catch WHERE catch.topiaId IN (SELECT catch.topiaId FROM ps_observation.catch catch INNER JOIN ps_observation.set set ON set.topiaId = catch.set INNER JOIN ps_observation.activity activity ON activity.topiaId = set.activity WHERE activity.route %s);", "ps_observation.set→DELETE FROM ps_observation.set WHERE set.topiaId IN (SELECT set.topiaId FROM ps_observation.set set INNER JOIN ps_observation.activity activity ON activity.topiaId = set.activity WHERE activity.route %s);", - "ps_logbook.activity→UPDATE ps_logbook.activity activity SET activity.relatedObservedActivity = NULL WHERE activity.relatedObservedActivity IN ( SELECT activity.topiaId FROM ps_observation.activity activity WHERE activity.route %s )", + "ps_logbook.activity→UPDATE ps_logbook.activity SET relatedObservedActivity = NULL WHERE activity.relatedObservedActivity IN ( SELECT activity.topiaId FROM ps_observation.activity activity WHERE activity.route %s )", "ps_observation.activity→DELETE FROM ps_observation.activity WHERE activity.route %s;", "ps_observation.route→DELETE FROM ps_observation.route WHERE route.topiaId %s;" ], ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2023.47</version> + <version>2024.01</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> @@ -129,6 +129,7 @@  <lib.version.hsqldb>2.7.0</lib.version.hsqldb>  + <lib.version.java4all.http>1.0.47</lib.version.java4all.http>  <license.licenseName>gpl_v3</license.licenseName> <license.organizationName>IRD, Ultreia.io</license.organizationName> ===================================== toolkit/api-services/src/main/java/fr/ird/observe/services/service/data/MoveRequest.java ===================================== @@ -25,6 +25,7 @@ package fr.ird.observe.services.service.data; import fr.ird.observe.dto.BusinessDto; import fr.ird.observe.dto.ToolkitIdDtoBean; import fr.ird.observe.dto.data.RootOpenableDto; +import io.ultreia.java4all.util.json.JsonAware; import java.util.Set; import java.util.StringJoiner; @@ -35,7 +36,7 @@ import java.util.StringJoiner; * @author Tony Chemit - dev(a)tchemit.fr * @since 8.0.1 */ -public class MoveRequest { +public class MoveRequest implements JsonAware { /** * Id of parent data to move. ===================================== toolkit/templates/src/main/java/org/nuiton/topia/templates/sql/plan/SqlHelper.java ===================================== @@ -41,7 +41,7 @@ public class SqlHelper { public static final String FROM_SQL = "%s WHERE %s"; public static final String FROM_SQL_NO_WHERE = "%s"; public static final String SQL_WHERE_CLAUSE_ALIAS = "%1$s.%2$s"; - public static final String DELETE_REVERSE_ASSOCIATION_STATEMENT = "UPDATE %1$s.%2$s %2$s SET %2$s.%3$s = NULL WHERE %4$s"; + public static final String DELETE_REVERSE_ASSOCIATION_STATEMENT = "UPDATE %1$s.%2$s SET %3$s = NULL WHERE %4$s"; public static final String DELETE_FROM_SELECTOR_STATEMENT = "DELETE FROM %1$s.%2$s WHERE %2$s.%3$s IN (%4$s);"; public static final String DELETE_FROM_SELECTOR_SIMPLIFIED_STATEMENT = "DELETE FROM %1$s.%2$s WHERE %3$s;"; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/51e6c2e47ab5bba430f67cf3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/51e6c2e47ab5bba430f67cf3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch develop-9.2.x
by Tony CHEMIT (＠tchemit) 22 Jan '24

22 Jan '24

Tony CHEMIT pushed new branch develop-9.2.x at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/develop-9.2.x You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/issue-2830] 10 commits: [toolkit-persistence] Add MapBuilder in QuerySupport to be able to build map of list from rows
by Tony CHEMIT (＠tchemit) 19 Jan '24

19 Jan '24

Tony CHEMIT pushed to branch feature/issue-2830 at ultreiaio / ird-observe Commits: 7767badf by Tony Chemit at 2024-01-19T15:16:46+01:00 [toolkit-persistence] Add MapBuilder in QuerySupport to be able to build map of list from rows - - - - - c3334545 by Tony Chemit at 2024-01-19T15:17:35+01:00 [services-test] Update validation fixture - See #2044 - - - - - 4a66a6b6 by Tony Chemit at 2024-01-19T15:17:35+01:00 [persistence] Add new queries to get activities for pairing action - - - - - 620c9f4a by Tony Chemit at 2024-01-19T15:17:35+01:00 [api-dto] Rethink activities pairing code (to used new pairing dto instead of massive calls to services which is very slow...) - - - - - 44834d17 by Tony Chemit at 2024-01-19T15:17:35+01:00 [api-persistence] Adapt code to fill activities pairing code - - - - - 19bfc202 by Tony Chemit at 2024-01-19T15:17:35+01:00 [api-services] Get new dto for activities pairing actions (and remove previous code with PairingContext which is replace by PairingEngine) - - - - - 882c9b99 by Tony Chemit at 2024-01-19T15:17:35+01:00 [server] Update mapping - - - - - 9239a198 by Tony Chemit at 2024-01-19T15:17:35+01:00 [client-actions] Use new Activities pairing API - - - - - fbc2690c by Tony Chemit at 2024-01-19T15:17:35+01:00 [client-editor] Use new Activities pairing API and review to states code - - - - - 51b20dd2 by Tony Chemit at 2024-01-19T15:17:35+01:00 [client-actions] Pouvoir rejourer l'assistant d'appairement des activités - Closes #2831 - - - - - 30 changed files: - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ActivityPairingUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/RootNodeBuilder.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ps/RootNodeBuilder.java - client/datasource/editor/ll/pom.xml - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIModelStates.java - + core/api/dto/src/main/java/fr/ird/observe/dto/data/ll/pairing/ActivityPairingDto.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ll/pairing/TripPairingContext.java → core/api/dto/src/main/java/fr/ird/observe/dto/data/ll/pairing/ActivityPairingEngine.java - + core/api/dto/src/main/java/fr/ird/observe/dto/data/ll/pairing/TriActivitiesPairingEngine.java - + core/api/dto/src/main/java/fr/ird/observe/dto/data/ll/pairing/TripActivitiesPairingDto.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ll/pairing/TripPairingResult.java → core/api/dto/src/main/java/fr/ird/observe/dto/data/ll/pairing/TripActivitiesPairingResult.java - + core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/pairing/RoutePairingDto.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/pairing/RoutePairingContext.java → core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/pairing/RoutePairingEngine.java - + core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/pairing/TripActivitiesPairingDto.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/pairing/RoutePairingContextRequest.java → core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/pairing/TripActivitiesPairingEngine.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/pairing/TripPairingResult.java → core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/pairing/TripActivitiesPairingResult.java - − core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/pairing/TripPairingContext.java - core/api/services/src/main/java/fr/ird/observe/services/service/data/ll/ActivityPairingService.java - core/api/services/src/main/java/fr/ird/observe/services/service/data/ps/ActivityPairingService.java - core/persistence/java/src/main/java/fr/ird/observe/entities/Entities.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/common/TripSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/common/TripTopiaDao.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/RouteSpi.java - + core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/logbook/RouteTopiaDao.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/RouteSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/RouteTopiaDao.java - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/common/TripImpl.hbm.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f5b6f1f12032571a2fff49b9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f5b6f1f12032571a2fff49b9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [toolkit-persistence] Add MapBuilder in QuerySupport to be able to build map of list from rows
by Tony CHEMIT (＠tchemit) 19 Jan '24

19 Jan '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7767badf by Tony Chemit at 2024-01-19T15:16:46+01:00 [toolkit-persistence] Add MapBuilder in QuerySupport to be able to build map of list from rows - - - - - 1 changed file: - toolkit/persistence/src/main/java/org/nuiton/topia/persistence/support/QuerySupport.java Changes: ===================================== toolkit/persistence/src/main/java/org/nuiton/topia/persistence/support/QuerySupport.java ===================================== @@ -23,6 +23,7 @@ package org.nuiton.topia.persistence.support; */ import fr.ird.observe.datasource.SqlHelper; +import fr.ird.observe.dto.ToolkitId; import fr.ird.observe.entities.Entity; import fr.ird.observe.spi.context.DataDtoEntityContext; import org.hibernate.query.NativeQuery; @@ -31,14 +32,18 @@ import org.hibernate.query.QueryParameter; import javax.persistence.Parameter; import java.sql.Timestamp; +import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.function.BiConsumer; +import java.util.function.BiFunction; import java.util.function.Function; import java.util.stream.Collectors; +import java.util.stream.Stream; /** @@ -119,4 +124,36 @@ public interface QuerySupport { default int execute(NativeQuery<?> sqlQuery) { return sqlQuery.executeUpdate(); } + + class MapBuilder<K extends ToolkitId, V> { + + private final Map<K, List<V>> result; + + private final Map<String, K> keysById; + private final BiFunction<K, Object[], V> valueCreator; + + private K currentKey; + private List<V> currentList; + + public MapBuilder(Map<K, List<V>> result, Collection<K> keys, BiFunction<K, Object[], V> valueCreator) { + this.result = result; + this.keysById = keys.stream().collect(Collectors.toMap(ToolkitId::getId, Function.identity())); + this.valueCreator = valueCreator; + keysById.values().forEach(r -> result.put(r, new LinkedList<>())); + } + + public void addRow(Object[] row) { + String keyId = (String) row[0]; + if (currentKey == null || !Objects.equals(currentKey.getId(), keyId)) { + currentKey = keysById.get(keyId); + currentList = result.get(currentKey); + } + currentList.add(valueCreator.apply(currentKey, row)); + } + + public Map<K, List<V>> build(Stream<Object[]> data) { + data.forEach(this::addRow); + return result; + } + } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7767badf24bb8810654ff46d2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/7767badf24bb8810654ff46d2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch feature/issue-2830
by Tony CHEMIT (＠tchemit) 19 Jan '24

19 Jan '24

Tony CHEMIT pushed new branch feature/issue-2830 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/feature/issue-2830 You're receiving this email because of your account on gitlab.com.

1 0