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 @@ <!-- FIXME <lib.version.jts>1.18.2</lib.version.jts>--> <lib.version.hsqldb>2.7.0</lib.version.hsqldb> <!-- FIXME <lib.version.hsqldb>2.7.1</lib.version.hsqldb>--> + <lib.version.java4all.http>1.0.47</lib.version.java4all.http> <!-- license header configuration --> <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@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/51e6c2e47ab5bba430f67cf3e... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/51e6c2e47ab5bba430f67cf3e... You're receiving this email because of your account on gitlab.com.