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

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

30 Nov '22

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) 30 Nov '22

30 Nov '22

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

[Git][ultreiaio/ird-observe][develop-9.0.x] Le temps de pêche est doublé par rapport à sa valeur AVDTH - Closes #2547
by Tony CHEMIT (＠tchemit) 30 Nov '22

30 Nov '22

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 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 - - - - - 1 changed file: - core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/RouteReader.java Changes: ===================================== core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/RouteReader.java ===================================== @@ -67,7 +67,7 @@ public class RouteReader extends DataReader<Route> { } Object fishingTime = resultSet.getObject(12); if (fishingTime != null) { - entity.setFishingTime(entity.getTimeAtSea() + (int) fishingTime); + entity.setFishingTime(entity.getFishingTime() + (int) fishingTime); } } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/992d29c70a93c9a85bcaab446… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/992d29c70a93c9a85bcaab446… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Le temps de pêche est doublé par rapport à sa valeur AVDTH - Closes #2547
by Tony CHEMIT (＠tchemit) 30 Nov '22

30 Nov '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: dcb91076 by Tony Chemit at 2022-11-30T17:06:53+01:00 Le temps de pêche est doublé par rapport à sa valeur AVDTH - Closes #2547 - - - - - 1 changed file: - core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/RouteReader.java Changes: ===================================== core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/RouteReader.java ===================================== @@ -67,7 +67,7 @@ public class RouteReader extends DataReader<Route> { } Object fishingTime = resultSet.getObject(12); if (fishingTime != null) { - entity.setFishingTime(entity.getTimeAtSea() + (int) fishingTime); + entity.setFishingTime(entity.getFishingTime() + (int) fishingTime); } } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/dcb91076b72a0a704e48278f8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/dcb91076b72a0a704e48278f8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Quelques inexactitudes sur la persistence (découvert en voulant migrer vers...
by Tony CHEMIT (＠tchemit) 29 Nov '22

29 Nov '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2ed99f8e by Tony Chemit at 2022-11-29T17:00:47+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 - - - - - 31adbe03 by Tony Chemit at 2022-11-29T17:00:47+01:00 Remove projection to map in entity mapping - - - - - a6bc6049 by Tony Chemit at 2022-11-29T17:00:47+01:00 Bug sur report Observations - Dénombrement des captures par devenir, filtrés par groupe (sur une base postgresql) - Closes #2545 - - - - - 673d2cbd by Tony Chemit at 2022-11-29T17:00:47+01:00 Problème d'ouverture de base de donnée (centrale), lié à l'état précédent de l'arbre - Closes #2544 - - - - - 30 changed files: - core/api/dto/src/main/resources/observe-reports.properties - 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 - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/CatchImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/FloatlinesCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/HooksCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/SampleImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/SamplePartImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/SetImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/ActivityImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/BaitsCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/BasketImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/BranchlineImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/BranchlinesCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/CatchImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/EncounterImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/FloatlinesCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/HooksCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/SectionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/SensorUsedImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/SetImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/SizeMeasureImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/TdrImpl.hbm.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c945f4d5f566a9016196f18b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c945f4d5f566a9016196f18b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] 4 commits: Quelques inexactitudes sur la persistence (découvert en voulant migrer vers...
by Tony CHEMIT (＠tchemit) 29 Nov '22

29 Nov '22

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 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 - - - - - 30 changed files: - core/api/dto/src/main/resources/observe-reports.properties - 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 - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/CatchImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/FloatlinesCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/HooksCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/SampleImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/SamplePartImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/SetImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/ActivityImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/BaitsCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/BasketImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/BranchlineImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/BranchlinesCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/CatchImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/EncounterImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/FloatlinesCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/HooksCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/SectionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/SensorUsedImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/SetImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/SizeMeasureImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/TdrImpl.hbm.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b7a08acbe0270c6c841f5511… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b7a08acbe0270c6c841f5511… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: Quelques inexactitudes sur la persistence (découvert en voulant migrer vers...
by Tony CHEMIT (＠tchemit) 29 Nov '22

29 Nov '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2bc2f05d by Tony Chemit at 2022-11-29T03:24:31+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 - - - - - 7fe5037d by Tony Chemit at 2022-11-29T03:24:31+01:00 Remove projection to map in entity mapping - - - - - 11ba7894 by Tony Chemit at 2022-11-29T03:24:31+01:00 Bug sur report Observations - Dénombrement des captures par devenir, filtrés par groupe (sur une base postgresql) - Closes #2545 - - - - - c945f4d5 by Tony Chemit at 2022-11-29T03:24:31+01:00 Problème d'ouverture de base de donnée (centrale), lié à l'état précédent de l'arbre - Closes #2544 - - - - - 30 changed files: - core/api/dto/src/main/resources/observe-reports.properties - 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 - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/CatchImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/FloatlinesCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/HooksCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/SampleImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/SamplePartImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/SetImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/ActivityImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/BaitsCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/BasketImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/BranchlineImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/BranchlinesCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/CatchImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/EncounterImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/FloatlinesCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/HooksCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/SectionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/SensorUsedImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/SetImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/SizeMeasureImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/TdrImpl.hbm.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/838d004c8733a8c23d2040f0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/838d004c8733a8c23d2040f0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] Problème d'ouverture de base de donnée (centrale), lié à l'état précédent de...
by Tony CHEMIT (＠tchemit) 29 Nov '22

29 Nov '22

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: b7a08acb by Tony Chemit at 2022-11-29T02:37:39+01:00 Problème d'ouverture de base de donnée (centrale), lié à l'état précédent de l'arbre - Closes #2544 - - - - - 1 changed file: - toolkit/persistence/src/main/java/fr/ird/observe/spi/context/RootOpenableDtoEntityContext.java Changes: ===================================== toolkit/persistence/src/main/java/fr/ird/observe/spi/context/RootOpenableDtoEntityContext.java ===================================== @@ -188,8 +188,8 @@ public abstract class RootOpenableDtoEntityContext< NativeQuery<Object[]> query = dao.getSqlQuery(definition.getCountAllQueryName(request)); Stream<Object[]> stream = query.stream(); List<DataGroupByValue> result = stream.map(DataGroupByValue::of).collect(Collectors.toList()); - if (request.isLoadNullGroupBy()) { - // add null count + if (request.isLoadNullGroupBy() && result.stream().noneMatch(d -> d.getValue() == null)) { + // add null count (if not already found) NativeQuery<Number> nullQuery = dao.getSqlQuery(definition.getCountOneQueryName(request.getGroupByFlavor(), false)); long nullCount = nullQuery.uniqueResultOptional().map(Number::longValue).orElse(0L); if (nullCount > 0) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b7a08acbe0270c6c841f55112… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b7a08acbe0270c6c841f55112… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Problème d'ouverture de base de donnée (centrale), lié à l'état précédent de...
by Tony CHEMIT (＠tchemit) 29 Nov '22

29 Nov '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 838d004c by Tony Chemit at 2022-11-29T02:37:52+01:00 Problème d'ouverture de base de donnée (centrale), lié à l'état précédent de l'arbre - Closes #2544 - - - - - 1 changed file: - toolkit/persistence/src/main/java/fr/ird/observe/spi/context/RootOpenableDtoEntityContext.java Changes: ===================================== toolkit/persistence/src/main/java/fr/ird/observe/spi/context/RootOpenableDtoEntityContext.java ===================================== @@ -188,8 +188,8 @@ public abstract class RootOpenableDtoEntityContext< NativeQuery<Object[]> query = dao.getSqlQuery(definition.getCountAllQueryName(request)); Stream<Object[]> stream = query.stream(); List<DataGroupByValue> result = stream.map(DataGroupByValue::of).collect(Collectors.toList()); - if (request.isLoadNullGroupBy()) { - // add null count + if (request.isLoadNullGroupBy() && result.stream().noneMatch(d -> d.getValue() == null)) { + // add null count (if not already found) NativeQuery<Number> nullQuery = dao.getSqlQuery(definition.getCountOneQueryName(request.getGroupByFlavor(), false)); long nullCount = nullQuery.uniqueResultOptional().map(Number::longValue).orElse(0L); if (nullCount > 0) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/838d004c8733a8c23d2040f0d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/838d004c8733a8c23d2040f0d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Persistence Model - Remove sqlType tagValue and compute it from attribute type
by Tony CHEMIT (＠tchemit) 28 Nov '22

28 Nov '22

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: fc2e1781 by Tony Chemit at 2022-11-29T00:14:05+01:00 Persistence Model - Remove sqlType tagValue and compute it from attribute type - - - - - 763cbe72 by Tony Chemit at 2022-11-29T00:14:05+01:00 Remove projection to map in entity mapping - - - - - 115e609b by Tony Chemit at 2022-11-29T00:15:22+01:00 Bug sur report Observations - Dénombrement des captures par devenir, filtrés par groupe (sur une base postgresql) - Closes #2545 - - - - - 30 changed files: - core/api/dto/src/main/resources/observe-reports.properties - 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 - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/CatchImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/FloatlinesCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/HooksCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/SampleImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/SamplePartImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/logbook/SetImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/ActivityImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/BaitsCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/BasketImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/BranchlineImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/BranchlinesCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/CatchImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/EncounterImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/FloatlinesCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/HooksCompositionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/SectionImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/SensorUsedImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/SetImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/SizeMeasureImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/observation/TdrImpl.hbm.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/95f7e20be2db1606357fdeda… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/95f7e20be2db1606357fdeda… You're receiving this email because of your account on gitlab.com.

1 0