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

[Git][ultreiaio/ird-observe] Pushed new tag v9.0.21
by Tony CHEMIT (＠tchemit) Nov. 30, 2022

Nov. 30, 2022

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

1 0

[Git][ultreiaio/ird-observe][release/9.0.21] [jgitflow-maven-plugin]updating poms for branch'release/9.0.21' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) Nov. 30, 2022

Nov. 30, 2022

Tony CHEMIT pushed to branch release/9.0.21 at ultreiaio / ird-observe Commits: 0da0ecc3 by Tony Chemit at 2022-11-30T18:27:39+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.21' with non-snapshot versions[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/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/java/pom.xml - core/persistence/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml - core/pom.xml - core/services/client/pom.xml - core/services/i18n/pom.xml - core/services/local/pom.xml - core/services/pom.xml - core/services/test/pom.xml - model/pom.xml - observe/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0da0ecc343dc3e804a144635a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0da0ecc343dc3e804a144635a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master-9.0.x] 13 commits: [jgitflow-maven-plugin]updating poms for 9.0.21-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) Nov. 30, 2022

Nov. 30, 2022

Tony CHEMIT pushed to branch master-9.0.x at ultreiaio / ird-observe Commits: e940e4be by Tony Chemit at 2022-11-25T13:45:24+01:00 [jgitflow-maven-plugin]updating poms for 9.0.21-SNAPSHOT development[skip ci] - - - - - e3b52a5f by Tony Chemit at 2022-11-25T14:18:07+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - b9d529a0 by Tony Chemit at 2022-11-25T14:18:08+01:00 [jgitflow-maven-plugin]merging 'master-9.0.x' into 'develop-9.0.x' - - - - - f980c4ef by Tony Chemit at 2022-11-25T14:18:09+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 4125d0b3 by Tony Chemit at 2022-11-29T03:23:58+01:00 Quelques inexactitudes sur la persistence (découvert en voulant migrer vers Hibernate 6) - Closes #2546 Persistence Model - Remove sqlType tagValue and compute it from attribute type - - - - - 15de08a2 by Tony Chemit at 2022-11-29T03:23:58+01:00 Remove projection to map in entity mapping - - - - - 8e101988 by Tony Chemit at 2022-11-29T03:23:58+01:00 Bug sur report Observations - Dénombrement des captures par devenir, filtrés par groupe (sur une base postgresql) - Closes #2545 - - - - - 2757cfdf by Tony Chemit at 2022-11-29T03:23:58+01:00 Problème d'ouverture de base de donnée (centrale), lié à l'état précédent de l'arbre - Closes #2544 - - - - - 992d29c7 by Tony Chemit at 2022-11-30T17:05:58+01:00 Le temps de pêche est doublé par rapport à sa valeur AVDTH - Closes #2547 - - - - - e1803c5e by Tony Chemit at 2022-11-30T18:10:29+01:00 Gestion des assocoations (Observed Systems) par la migration AVDTH - Closes #2548 - - - - - 661379fa by Tony Chemit at 2022-11-30T18:26:17+01:00 Update changelog for v.9.0.21 [skip CI] - - - - - 0da0ecc3 by Tony Chemit at 2022-11-30T18:27:39+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.21' with non-snapshot versions[skip ci] - - - - - fcbe88fa by Tony Chemit at 2022-11-30T18:50:33+01:00 [jgitflow-maven-plugin]merging 'release/9.0.21' into 'master-9.0.x' - - - - - 30 changed files: - CHANGELOG.md - 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/pom.xml - core/api/dto/src/main/resources/observe-reports.properties - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/java/pom.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/LastUpdateDateImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/common/GearUseFeaturesImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/common/GearUseFeaturesMeasurementImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/common/TripImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/landing/LandingImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/landing/LandingPartImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/ActivityImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/BaitsCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/BranchlinesCompositionImpl.hbm.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/10eba424d580624574278879… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/10eba424d580624574278879… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/9.0.21' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) Nov. 30, 2022

Nov. 30, 2022

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 0da0ecc3 by Tony Chemit at 2022-11-30T18:27:39+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.21' with non-snapshot versions[skip ci] - - - - - fcbe88fa by Tony Chemit at 2022-11-30T18:50:33+01:00 [jgitflow-maven-plugin]merging 'release/9.0.21' into 'master-9.0.x' - - - - - 5ac7ef9f by Tony Chemit at 2022-11-30T18:50:39+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 7462ee61 by Tony Chemit at 2022-11-30T18:50:40+01:00 [jgitflow-maven-plugin]merging 'master-9.0.x' into 'develop-9.0.x' - - - - - a8764d8b by Tony Chemit at 2022-11-30T18:50:41+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/000c7b8380765ae3207ab962… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/000c7b8380765ae3207ab962… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] [jgitflow-maven-plugin]updating poms for 9.0.22-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) Nov. 30, 2022

Nov. 30, 2022

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 000c7b83 by Tony Chemit at 2022-11-30T18:27:19+01:00 [jgitflow-maven-plugin]updating poms for 9.0.22-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/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/java/pom.xml - core/persistence/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml - core/pom.xml - core/services/client/pom.xml - core/services/i18n/pom.xml - core/services/local/pom.xml - core/services/pom.xml - core/services/test/pom.xml - model/pom.xml - observe/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/000c7b8380765ae3207ab9628… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/000c7b8380765ae3207ab9628… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/9.0.21
by Tony CHEMIT (＠tchemit) Nov. 30, 2022

Nov. 30, 2022

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

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] Update changelog for v.9.0.21 [skip CI]
by Tony CHEMIT (＠tchemit) Nov. 30, 2022

Nov. 30, 2022

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 661379fa by Tony Chemit at 2022-11-30T18:26:17+01:00 Update changelog for v.9.0.21 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,22 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2022-11-25 12:37. + * Last generated at 2022-11-30 18:24. + +## Version [9.0.21](https://gitlab.com/ultreiaio/ird-observe/-/milestones/251) + +**Closed at 2022-11-30.** + +### Download +* [Client (observe-9.0.21-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) +* [Serveur (observe-9.0.21.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/…) +* [Serveur (observe-9.0.21-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) + +### Issues + * [[Type::Anomalie 2544]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2544) **Problème d'ouverture de base de donnée (centrale), lié à l'état précédent de l'arbre** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2545]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2545) **Bug sur report Observations - Dénombrement des captures par devenir, filtrés par groupe (sur une base postgresql)** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2547]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2547) **Le temps de pêche est doublé par rapport à sa valeur AVDTH** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2548]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2548) **Gestion des assocoations (Observed Systems) par la migration AVDTH** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) ## Version [9.0.20](https://gitlab.com/ultreiaio/ird-observe/-/milestones/250) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/661379fa37a4aa04819c49bf9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/661379fa37a4aa04819c49bf9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog for v.9.0.21 [skip CI]
by Tony CHEMIT (＠tchemit) Nov. 30, 2022

Nov. 30, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8db352bd by Tony Chemit at 2022-11-30T18:26:31+01:00 Update changelog for v.9.0.21 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,22 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2022-11-25 12:37. + * Last generated at 2022-11-30 18:24. + +## Version [9.0.21](https://gitlab.com/ultreiaio/ird-observe/-/milestones/251) + +**Closed at 2022-11-30.** + +### Download +* [Client (observe-9.0.21-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) +* [Serveur (observe-9.0.21.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/…) +* [Serveur (observe-9.0.21-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) + +### Issues + * [[Type::Anomalie 2544]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2544) **Problème d'ouverture de base de donnée (centrale), lié à l'état précédent de l'arbre** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2545]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2545) **Bug sur report Observations - Dénombrement des captures par devenir, filtrés par groupe (sur une base postgresql)** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2547]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2547) **Le temps de pêche est doublé par rapport à sa valeur AVDTH** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2548]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2548) **Gestion des assocoations (Observed Systems) par la migration AVDTH** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) ## Version [9.0.20](https://gitlab.com/ultreiaio/ird-observe/-/milestones/250) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8db352bdbbf43d5a47408b4c5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8db352bdbbf43d5a47408b4c5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] Gestion des assocoations (Observed Systems) par la migration AVDTH - Closes #2548
by Tony CHEMIT (＠tchemit) Nov. 30, 2022

Nov. 30, 2022

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: e1803c5e by Tony Chemit at 2022-11-30T18:10:29+01:00 Gestion des assocoations (Observed Systems) par la migration AVDTH - Closes #2548 - - - - - 3 changed files: - core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/ImportDataContext.java - core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/ImportEngineExecution.java - core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java Changes: ===================================== core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/ImportDataContext.java ===================================== @@ -26,7 +26,9 @@ import fr.ird.observe.entities.data.ps.common.Trip; import fr.ird.observe.entities.data.ps.logbook.Activity; import fr.ird.observe.entities.data.ps.logbook.Route; import fr.ird.observe.entities.referential.ps.common.ObservedSystem; +import fr.ird.observe.persistence.avdth.data.logbook.FloatingObjectReader; +import java.util.Iterator; import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; @@ -106,10 +108,37 @@ public class ImportDataContext extends ImportReferentialContext { this.observedSystemCodes = observedSystemCodes; } - public void addDefaultObservedSystem(Activity entity) { + public void addDefaultObservedSystemOrSanitizeFloatingObjectOnes(Activity entity) { if (entity.isObservedSystemEmpty()) { // add no observed system entity.addObservedSystem(getObservedSystem0()); + } else { + // Remove any observed system from code 21 to 25, and at last if one of them has been found + // add (if not already present the observed system 20, this case should never happen, but just in case...) + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2548 + boolean observedSystemsToRemoveFound = false; + boolean observedSystem20Found = false; + + Set<ObservedSystem> observedSystems = entity.getObservedSystem(); + Iterator<ObservedSystem> iterator = observedSystems.iterator(); + + while (iterator.hasNext()) { + ObservedSystem observedSystem = iterator.next(); + if (FloatingObjectReader.OBSERVED_SYTEM_CODES_TO_REMOVE.contains(observedSystem.getCode())) { + // remove this one + iterator.remove(); + observedSystemsToRemoveFound = true; + continue; + } + if ("20".equals(observedSystem.getCode())) { + observedSystem20Found = true; + } + } + if (observedSystemsToRemoveFound && !observedSystem20Found) { + // add the Observed system 20 (This cas should never happen, but I can not afford to check it now...) + ObservedSystem observedSystem20 = getObservedSystem20(); + observedSystems.add(observedSystem20); + } } } ===================================== core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/ImportEngineExecution.java ===================================== @@ -172,8 +172,8 @@ public class ImportEngineExecution extends ImportEngine { // load activity catches loadCatch(activity, activityId, tables.activityTableReader.lastPrimaryKey()); - // add default observed system (if none found) - context.addDefaultObservedSystem(activity); + // add default observed system (if none found) and sanitize some observed system coming from DCP + context.addDefaultObservedSystemOrSanitizeFloatingObjectOnes(activity); // write activity observed systems activityWriter.writeObservedSystems(activity); ===================================== core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java ===================================== @@ -200,6 +200,11 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { .put("13", "20") .build(); public static final Set<String> OBSERVED_SYTEM_CODES_WITH_DCP = Set.of("20", "21", "22", "23", "24", "25"); + /** + * We need to remove thoses observed system at the end when writing them to activity. + * See <a href="https://gitlab.com/ultreiaio/ird-observe/-/issues/2548">issue 2548</a> + */ + public static final Set<String> OBSERVED_SYTEM_CODES_TO_REMOVE = Set.of("21", "22", "23", "24", "25"); private final MutableInt floatingObjectPartCount = new MutableInt(); private final MutableInt transmittingBuoyCount = new MutableInt(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e1803c5e34a55f401cfd9b9ba… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/e1803c5e34a55f401cfd9b9ba… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Gestion des assocoations (Observed Systems) par la migration AVDTH - Closes #2548
by Tony CHEMIT (＠tchemit) Nov. 30, 2022

Nov. 30, 2022

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b43181a6 by Tony Chemit at 2022-11-30T18:10:43+01:00 Gestion des assocoations (Observed Systems) par la migration AVDTH - Closes #2548 - - - - - 3 changed files: - core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/ImportDataContext.java - core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/ImportEngineExecution.java - core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java Changes: ===================================== core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/ImportDataContext.java ===================================== @@ -26,7 +26,9 @@ import fr.ird.observe.entities.data.ps.common.Trip; import fr.ird.observe.entities.data.ps.logbook.Activity; import fr.ird.observe.entities.data.ps.logbook.Route; import fr.ird.observe.entities.referential.ps.common.ObservedSystem; +import fr.ird.observe.persistence.avdth.data.logbook.FloatingObjectReader; +import java.util.Iterator; import java.util.LinkedHashSet; import java.util.Map; import java.util.Set; @@ -106,10 +108,37 @@ public class ImportDataContext extends ImportReferentialContext { this.observedSystemCodes = observedSystemCodes; } - public void addDefaultObservedSystem(Activity entity) { + public void addDefaultObservedSystemOrSanitizeFloatingObjectOnes(Activity entity) { if (entity.isObservedSystemEmpty()) { // add no observed system entity.addObservedSystem(getObservedSystem0()); + } else { + // Remove any observed system from code 21 to 25, and at last if one of them has been found + // add (if not already present the observed system 20, this case should never happen, but just in case...) + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2548 + boolean observedSystemsToRemoveFound = false; + boolean observedSystem20Found = false; + + Set<ObservedSystem> observedSystems = entity.getObservedSystem(); + Iterator<ObservedSystem> iterator = observedSystems.iterator(); + + while (iterator.hasNext()) { + ObservedSystem observedSystem = iterator.next(); + if (FloatingObjectReader.OBSERVED_SYTEM_CODES_TO_REMOVE.contains(observedSystem.getCode())) { + // remove this one + iterator.remove(); + observedSystemsToRemoveFound = true; + continue; + } + if ("20".equals(observedSystem.getCode())) { + observedSystem20Found = true; + } + } + if (observedSystemsToRemoveFound && !observedSystem20Found) { + // add the Observed system 20 (This cas should never happen, but I can not afford to check it now...) + ObservedSystem observedSystem20 = getObservedSystem20(); + observedSystems.add(observedSystem20); + } } } ===================================== core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/ImportEngineExecution.java ===================================== @@ -174,8 +174,8 @@ public class ImportEngineExecution extends ImportEngine { // load activity catches loadCatch(activity, activityId, tables.activityTableReader.lastPrimaryKey()); - // add default observed system (if none found) - context.addDefaultObservedSystem(activity); + // add default observed system (if none found) and sanitize some observed system coming from DCP + context.addDefaultObservedSystemOrSanitizeFloatingObjectOnes(activity); // write activity observed systems activityWriter.writeObservedSystems(activity); ===================================== core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java ===================================== @@ -200,6 +200,11 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { .put("13", "20") .build(); public static final Set<String> OBSERVED_SYTEM_CODES_WITH_DCP = Set.of("20", "21", "22", "23", "24", "25"); + /** + * We need to remove thoses observed system at the end when writing them to activity. + * See <a href="https://gitlab.com/ultreiaio/ird-observe/-/issues/2548">issue 2548</a> + */ + public static final Set<String> OBSERVED_SYTEM_CODES_TO_REMOVE = Set.of("21", "22", "23", "24", "25"); private final MutableInt floatingObjectPartCount = new MutableInt(); private final MutableInt transmittingBuoyCount = new MutableInt(); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b43181a67708a5a67b5680eb9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b43181a67708a5a67b5680eb9… You're receiving this email because of your account on gitlab.com.

1 0