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

[Git][ultreiaio/ird-observe][develop-9.0.x] [jgitflow-maven-plugin]updating poms for 9.0.25-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) 25 Jan '23

25 Jan '23

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 169c174d by Tony Chemit at 2023-01-25T14:59:03+01:00 [jgitflow-maven-plugin]updating poms for 9.0.25-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-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/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 - core/pom.xml - core/services/client/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/169c174d27e5fa8d80831dc2d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/169c174d27e5fa8d80831dc2d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/9.0.24
by Tony CHEMIT (＠tchemit) 25 Jan '23

25 Jan '23

Tony CHEMIT pushed new branch release/9.0.24 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/release/9.0.24 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.24 [skip CI]
by Tony CHEMIT (＠tchemit) 25 Jan '23

25 Jan '23

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 4b2a0cf7 by Tony Chemit at 2023-01-25T14:57:57+01:00 Update changelog for v.9.0.24 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,11 +1,11 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2023-01-15 20:16. + * Last generated at 2023-01-25 14:57. ## Version [9.0.24](https://gitlab.com/ultreiaio/ird-observe/-/milestones/254) -**Closed at 2023-01-15.** +**Closed at 2023-01-25.** ### Download * [Client (observe-9.0.24-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) @@ -14,7 +14,12 @@ ### Issues * [[Type::Anomalie 2573]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2573) **Revoir le calcul et la mise à jour du type de banc de la calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2615]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2615) **Procédure de calcul qui ne détecte pas les données modifiées** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2457]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2457) **La création d'un objet sur une activité n'ajoute pas le système observé 20/FOB comme attendu** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Type::Evolution 2485]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2485) **Revue de migration de Activity.schoolType** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2570]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2570) **Gestion du flag AVDTH F_DCP_ECO** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2575]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2575) **Revue de la migration des DCP depuis AVDTH** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2610]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2610) **Revue du remplissage de activity.setCount** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Tâche 2499]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2499) **Interrogations sur la localisation de certaines tables de ps_common** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Tâche 2596]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2596) **Réduire la taille du livrable server-zip** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4b2a0cf719bd18e6922221e4a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4b2a0cf719bd18e6922221e4a… 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.24 [skip CI]
by Tony CHEMIT (＠tchemit) 25 Jan '23

25 Jan '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 47a1289c by Tony Chemit at 2023-01-25T14:58:12+01:00 Update changelog for v.9.0.24 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,11 +1,11 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2023-01-15 20:16. + * Last generated at 2023-01-25 14:57. ## Version [9.0.24](https://gitlab.com/ultreiaio/ird-observe/-/milestones/254) -**Closed at 2023-01-15.** +**Closed at 2023-01-25.** ### Download * [Client (observe-9.0.24-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/o…) @@ -14,7 +14,12 @@ ### Issues * [[Type::Anomalie 2573]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2573) **Revoir le calcul et la mise à jour du type de banc de la calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2615]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2615) **Procédure de calcul qui ne détecte pas les données modifiées** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2457]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2457) **La création d'un objet sur une activité n'ajoute pas le système observé 20/FOB comme attendu** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Type::Evolution 2485]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2485) **Revue de migration de Activity.schoolType** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2570]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2570) **Gestion du flag AVDTH F_DCP_ECO** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2575]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2575) **Revue de la migration des DCP depuis AVDTH** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2610]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2610) **Revue du remplissage de activity.setCount** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Tâche 2499]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2499) **Interrogations sur la localisation de certaines tables de ps_common** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Tâche 2596]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2596) **Réduire la taille du livrable server-zip** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/47a1289cac6f3e0960872515f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/47a1289cac6f3e0960872515f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] 4 commits: Procédure de calcul qui ne détecte pas les données modifiées - Closes #2615
by Tony CHEMIT (＠tchemit) 25 Jan '23

25 Jan '23

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 118fdb99 by Tony Chemit at 2023-01-25T11:39:02+01:00 Procédure de calcul qui ne détecte pas les données modifiées - Closes #2615 - - - - - 56d21588 by Tony Chemit at 2023-01-25T11:39:02+01:00 Avdth - Review some Floating Object mappings (sort them and re-add some removed ones...) - See #2612 - - - - - e04df8f4 by Tony Chemit at 2023-01-25T11:39:02+01:00 Avdth - Improve code around adding observed system 102 on activity with at least on catch on baits - - - - - 123ae78e by Tony Chemit at 2023-01-25T11:47:47+01:00 Avdth - update documentation - - - - - 6 changed files: - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportEngineExecution.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripConsolidateEngine.java - src/site/markdown/avdth/logbook.md - src/site/markdown/avdth/referential.md Changes: ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportEngineExecution.java ===================================== @@ -22,7 +22,6 @@ package fr.ird.observe.persistence.avdth.data; * #L% */ -import fr.ird.observe.services.service.data.ps.AvdthDataImportConfiguration; import fr.ird.observe.entities.ObserveTopiaApplicationContext; import fr.ird.observe.entities.data.ps.common.Trip; import fr.ird.observe.entities.data.ps.localmarket.Survey; @@ -36,10 +35,11 @@ import fr.ird.observe.entities.data.ps.logbook.WellPlan; import fr.ird.observe.persistence.avdth.Query; import fr.ird.observe.persistence.avdth.data.common.TripReader; import fr.ird.observe.persistence.avdth.data.logbook.ActivityReader; +import fr.ird.observe.services.service.data.ps.AvdthDataImportConfiguration; import io.ultreia.java4all.util.TimeLog; +import io.ultreia.java4all.util.sql.SqlScriptWriter; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import io.ultreia.java4all.util.sql.SqlScriptWriter; import java.io.IOException; import java.sql.ResultSet; @@ -191,18 +191,19 @@ public class ImportEngineExecution extends ImportEngine { protected void loadCatch(Activity activity, String activityId, List<Object> activityPrimaryKey) throws SQLException { int catchesCount = 0; tables.catchTableReader.setPrimaryKey(activityPrimaryKey); - boolean baitsFishingOnly = false; + // If one catch is on baits, then will add observed system 102 on activity + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/1883#note_617802311 + boolean addBaitsFishingOnlyObservedSystem = false; while (tables.catchTableReader.hasNext()) { ResultSet catchRow = tables.catchTableReader.next(); int speciesCode = catchRow.getInt(6); if (speciesCode >= 700 && speciesCode < 720) { - baitsFishingOnly = true; + addBaitsFishingOnlyObservedSystem = true; } catchWriter.intercept(catchRow, activityId, catchesCount++); } - if (baitsFishingOnly) { - // See #1883 - context.addBaitOnlyObservedSystem(activity); + if (addBaitsFishingOnlyObservedSystem) { + activity.addObservedSystem(context.getObservedSystem102()); } } ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java ===================================== @@ -24,7 +24,6 @@ package fr.ird.observe.persistence.avdth.data; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; -import fr.ird.observe.entities.data.ps.logbook.Activity; import fr.ird.observe.entities.referential.common.DataQuality; import fr.ird.observe.entities.referential.common.FpaZone; import fr.ird.observe.entities.referential.common.Harbour; @@ -134,6 +133,7 @@ public class ImportReferentialContext { private ObservedSystem observedSystem0; private SpeciesCache speciesCache; private ObservedSystem observedSystem20; + private ObservedSystem observedSystem102; private ObservedSystem observedSystem103; private ObservedSystem observedSystem110; private VesselActivity vesselActivity6; @@ -207,6 +207,7 @@ public class ImportReferentialContext { observedSystem0 = observedSystem.get("0"); observedSystem20 = observedSystem.get("20"); observedSystem103 = observedSystem.get("103"); + observedSystem102 = observedSystem.get("102"); observedSystem110 = observedSystem.get("110"); // dcp @@ -502,6 +503,10 @@ public class ImportReferentialContext { return observedSystem0; } + public ObservedSystem getObservedSystem102() { + return observedSystem102; + } + public ObservedSystem getObservedSystem103() { return observedSystem103; } @@ -550,10 +555,6 @@ public class ImportReferentialContext { return code == null ? null : fpaZone.get(code); } - public void addBaitOnlyObservedSystem(Activity entity) { - entity.addObservedSystem(getObservedSystem("102")); - } - public ObjectOperation getObjectOperation(String objectOperationCode) { return objectOperation.get(objectOperationCode); } ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java ===================================== @@ -67,19 +67,21 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { .put("0", "99") .put("1", "99") .put("2", "99") - .put("3", "99") - .put("4", "99") - .put("10", "99") - .put("14", "99") + + .put("3", "2") + .put("4", "2") + .put("5", "1") + .put("6", "4") + .put("7", "99") .put("8", "99") .put("9", "99") + .put("10", "99") .put("12", "99") .put("13", "99") + .put("14", "99") .put("15", "99") - .put("5", "1") - .put("6", "4") .put("22", "4") .put("23", "1") .put("24", "4") @@ -101,8 +103,16 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { * If for a given {@code ACTIVITE.C_OPERA}, no value is found here, this means that there is no buoy to create. */ public static final Map<String, String> TRANSMITTING_BUOY_OPERATION_CODE_MAPPING = ImmutableMap.<String, String>builder() + .put("3", "1") // Visite | Visite + .put("4", "1") // Visite | Visite .put("5", "3") // Mise à l'eau | null ou 3 Mise à l'eau .put("6", "2") // Retrait | null ou 2 Récupération + .put("7", "1") // Visite | Visite + .put("10", "1")// Visite | Visite + .put("12", "1")// Visite | Visite + .put("13", "1")// Visite | Visite + .put("14", "1")// Visite | Visite + .put("15", "1")// Visite | Visite .put("23", "3") // Mise à l'eau | 3 Mise à l'eau .put("24", "2") // Retrait | 2 Récupération .put("25", "3") // Visite | 3 Mise à l'eau @@ -128,15 +138,15 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { "2", "3", "4", + "6", + "7", + "8", "9", "10", "12", + "13", "14", "15", - "7", - "8", - "13", - "6", "22", "24", "25", ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripConsolidateEngine.java ===================================== @@ -38,7 +38,6 @@ import fr.ird.observe.dto.data.ps.observation.consolidate.ActivityConsolidateRes import fr.ird.observe.dto.data.ps.observation.consolidate.FloatingObjectConsolidateRequest; import fr.ird.observe.dto.referential.I18nReferentialHelper; import fr.ird.observe.dto.referential.ReferentialLocale; -import fr.ird.observe.dto.referential.ps.common.VesselActivityReference; import fr.ird.observe.entities.ObserveTopiaDaoSupplier; import fr.ird.observe.entities.ToolkitTopiaPersistenceContextSupport; import fr.ird.observe.entities.data.ps.localmarket.Batch; @@ -178,9 +177,8 @@ public class TripConsolidateEngine { String activityPrefix = String.format("%s - Activity [%s/%s] ", routePrefix, ++activityIndex, activityMax); - boolean floatingObjectEmpty = activity.isFloatingObjectEmpty(); - if (!VesselActivityReference.isSetOperation(activity) && floatingObjectEmpty) { - log.debug(String.format("%s Skip activity (No set nor dcp found): %s", activityPrefix, activity.getTopiaId())); + if (activity.getSetSize() == 0 && activity.isFloatingObjectEmpty()) { + log.info(String.format("%s Skip activity (No set nor floating object found): %s", activityPrefix, activity.getTopiaId())); continue; } ===================================== src/site/markdown/avdth/logbook.md ===================================== @@ -69,11 +69,13 @@ On effecute la somme pour toutes les activités AVDTH du jour * Note 4 ### <a name="n_0_4"></a> -Voir mapping [REF_VESSEL_ACTIVITY_TYPE](./referential.html#REF_VESSEL_ACTIVITY_TYPE) si code 13 (dans ObServe) alors on ajoute un dcp +Voir mapping [REF_VESSEL_ACTIVITY_TYPE](./referential.html#REF_VESSEL_ACTIVITY_TYPE) * Note 5 ### <a name="n_0_5"></a> -Voir mapping [REF_SCHOOL_TYPE](./referential.html#REF_SCHOOL_TYPE) +Voir mapping [REF_SCHOOL_TYPE](./referential.html#REF_SCHOOL_TYPE). + +**À noter que cette donée est renseigné uniquement si ```ACTIVITE_C_OPERA in (0, 1, 2, 14)```** * Note 6 ### <a name="n_0_6"></a> @@ -103,6 +105,36 @@ Donnée non persistée dans ObServe, (voir https://gitlab.com/ultreiaio/ird-obse ### <a name="n_0_12"></a> Mapping sur le code. +### Cas des activités de pêche à partir de ```ACTIVITE.C_OPERA``` + +Pour les activités de pêche, on rajoute des données sur l'activité pour décrire la calée. + +| ACTIVITE.C_OPERA | SetSuccessStatus [1](#n_5_1) | ReasonForNullSet [1](#n_5_1) | SetCount | SchoolType | +|-----------------:|-----------------------------:|------------------------------:|:---------|:-----------| +| 0 | 0 | 0 | (1) | (2) | +| 1 | 1 | non renseigné | (1) | (2) | +| 2 | 2 | non renseigné | (1) | (2) | +| 14 (3) | 2 | non renseigné | (1) | (2) | + +* Note 1 +#### <a name="n_5_1"></a> + +On utilise le code du réferentiel ObServe + +* Note 2 +#### <a name="n_5_2"></a> + +* Note 3 +#### <a name="n_5_3"></a> + +* Note 4 +#### <a name="n_5_4"></a> + +0. +1. calculé depuis ```ACTIVITE.V_NB_OP``` +2. calculé depuis ```ACTIVITE.C_TBANC``` +3. dans ce cas on rajoute aussi le système observé ***110** + ### Ajout d'un DCP On ajoute un DCP uniquement pour une activité avec **vesselActivity.code == 13**. ===================================== src/site/markdown/avdth/referential.md ===================================== @@ -223,8 +223,8 @@ Mapping type d'activité | 1 | 6 (1) | | 2 | 6 (1) | | 14 | 6 (1) (3) | -| 3 | 2 | -| 4 | 1 | +| 3 | 2 (ou 102) (4) | +| 4 | 1 (ou 101) (4) | | 5 | 13 (2) | | 6 | 13 (2) | | 22 | 13 (2) | @@ -251,11 +251,13 @@ Mapping type d'activité | 19 | 29 | | 20 | 30 | | 35 | 31 | -| 36 | 99 **FIXME** | +| 36 | 36 (5) | 1. **Seule une activité de code 6 permet la création de captures**. 2. **Seule une activité de code 13 permet la création de DCP**.. 3. On ajoute en plus un système observé **110** et **setSuccessStatus** à **2**. +4. Si un dcp est trouvé alors on utilise un type d'activité introduit en version *9.1.0* qui permet l'ajout de dcp. +5. Le type d'activité a été ajouté lors de la migration de la version *9.1.0* (avant on utilisait *99*) ### REF_SCHOOL_TYPE View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a16389e169267c82132b980a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a16389e169267c82132b980a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Procédure de calcul qui ne détecte pas les données modifiées - Closes #2615
by Tony CHEMIT (＠tchemit) 25 Jan '23

25 Jan '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 788f7b86 by Tony Chemit at 2023-01-25T11:49:52+01:00 Procédure de calcul qui ne détecte pas les données modifiées - Closes #2615 - - - - - f086b9ef by Tony Chemit at 2023-01-25T11:49:52+01:00 Avdth - Review some Floating Object mappings (sort them and re-add some removed ones...) - See #2612 - - - - - c26a5fdf by Tony Chemit at 2023-01-25T11:49:52+01:00 Avdth - update documentation - - - - - 4 changed files: - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripConsolidateEngine.java - src/site/markdown/avdth/logbook.md - src/site/markdown/avdth/referential.md Changes: ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java ===================================== @@ -76,19 +76,21 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { .put("0", "99") .put("1", "99") .put("2", "99") - .put("3", "99") - .put("4", "99") - .put("10", "99") - .put("14", "99") + + .put("3", "2") + .put("4", "2") + .put("5", "1") + .put("6", "4") + .put("7", "99") .put("8", "99") .put("9", "99") + .put("10", "99") .put("12", "99") .put("13", "99") + .put("14", "99") .put("15", "99") - .put("5", "1") - .put("6", "4") .put("22", "4") .put("23", "1") .put("24", "4") @@ -110,8 +112,16 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { * If for a given {@code ACTIVITE.C_OPERA}, no value is found here, this means that there is no buoy to create. */ public static final Map<String, String> TRANSMITTING_BUOY_OPERATION_CODE_MAPPING = ImmutableMap.<String, String>builder() + .put("3", "1") // Visite | Visite + .put("4", "1") // Visite | Visite .put("5", "3") // Mise à l'eau | null ou 3 Mise à l'eau .put("6", "2") // Retrait | null ou 2 Récupération + .put("7", "1") // Visite | Visite + .put("10", "1")// Visite | Visite + .put("12", "1")// Visite | Visite + .put("13", "1")// Visite | Visite + .put("14", "1")// Visite | Visite + .put("15", "1")// Visite | Visite .put("23", "3") // Mise à l'eau | 3 Mise à l'eau .put("24", "2") // Retrait | 2 Récupération .put("25", "3") // Visite | 3 Mise à l'eau @@ -137,15 +147,15 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { "2", "3", "4", + "6", + "7", + "8", "9", "10", "12", + "13", "14", "15", - "7", - "8", - "13", - "6", "22", "24", "25", ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripConsolidateEngine.java ===================================== @@ -38,7 +38,6 @@ import fr.ird.observe.dto.data.ps.observation.consolidate.ActivityConsolidateRes import fr.ird.observe.dto.data.ps.observation.consolidate.FloatingObjectConsolidateRequest; import fr.ird.observe.dto.referential.I18nReferentialHelper; import fr.ird.observe.dto.referential.ReferentialLocale; -import fr.ird.observe.dto.referential.ps.common.VesselActivityReference; import fr.ird.observe.entities.ObserveTopiaDaoSupplier; import fr.ird.observe.entities.ToolkitTopiaPersistenceContextSupport; import fr.ird.observe.entities.data.ps.localmarket.Batch; @@ -178,9 +177,8 @@ public class TripConsolidateEngine { String activityPrefix = String.format("%s - Activity [%s/%s] ", routePrefix, ++activityIndex, activityMax); - boolean floatingObjectEmpty = activity.isFloatingObjectEmpty(); - if (!VesselActivityReference.isSetOperation(activity) && floatingObjectEmpty) { - log.debug(String.format("%s Skip activity (No set nor dcp found): %s", activityPrefix, activity.getTopiaId())); + if (activity.getSetSize() == 0 && activity.isFloatingObjectEmpty()) { + log.debug(String.format("%s Skip activity (No set nor floating object found): %s", activityPrefix, activity.getTopiaId())); continue; } ===================================== src/site/markdown/avdth/logbook.md ===================================== @@ -69,11 +69,13 @@ On effecute la somme pour toutes les activités AVDTH du jour * Note 4 ### <a name="n_0_4"></a> -Voir mapping [REF_VESSEL_ACTIVITY_TYPE](./referential.html#REF_VESSEL_ACTIVITY_TYPE) si code 13 (dans ObServe) alors on ajoute un dcp +Voir mapping [REF_VESSEL_ACTIVITY_TYPE](./referential.html#REF_VESSEL_ACTIVITY_TYPE) * Note 5 ### <a name="n_0_5"></a> -Voir mapping [REF_SCHOOL_TYPE](./referential.html#REF_SCHOOL_TYPE) +Voir mapping [REF_SCHOOL_TYPE](./referential.html#REF_SCHOOL_TYPE). + +**À noter que cette donée est renseigné uniquement si ```ACTIVITE_C_OPERA in (0, 1, 2, 14)```** * Note 6 ### <a name="n_0_6"></a> @@ -103,6 +105,36 @@ Donnée non persistée dans ObServe, (voir https://gitlab.com/ultreiaio/ird-obse ### <a name="n_0_12"></a> Mapping sur le code. +### Cas des activités de pêche à partir de ```ACTIVITE.C_OPERA``` + +Pour les activités de pêche, on rajoute des données sur l'activité pour décrire la calée. + +| ACTIVITE.C_OPERA | SetSuccessStatus [1](#n_5_1) | ReasonForNullSet [1](#n_5_1) | SetCount | SchoolType | +|-----------------:|-----------------------------:|------------------------------:|:---------|:-----------| +| 0 | 0 | 0 | (1) | (2) | +| 1 | 1 | non renseigné | (1) | (2) | +| 2 | 2 | non renseigné | (1) | (2) | +| 14 (3) | 2 | non renseigné | (1) | (2) | + +* Note 1 +#### <a name="n_5_1"></a> + +On utilise le code du réferentiel ObServe + +* Note 2 +#### <a name="n_5_2"></a> + +* Note 3 +#### <a name="n_5_3"></a> + +* Note 4 +#### <a name="n_5_4"></a> + +0. +1. calculé depuis ```ACTIVITE.V_NB_OP``` +2. calculé depuis ```ACTIVITE.C_TBANC``` +3. dans ce cas on rajoute aussi le système observé ***110** + ### Ajout d'un DCP On ajoute un DCP uniquement pour une activité avec **vesselActivity.code == 13**. ===================================== src/site/markdown/avdth/referential.md ===================================== @@ -223,8 +223,8 @@ Mapping type d'activité | 1 | 6 (1) | | 2 | 6 (1) | | 14 | 6 (1) (3) | -| 3 | 2 | -| 4 | 1 | +| 3 | 2 (ou 102) (4) | +| 4 | 1 (ou 101) (4) | | 5 | 13 (2) | | 6 | 13 (2) | | 22 | 13 (2) | @@ -251,11 +251,13 @@ Mapping type d'activité | 19 | 29 | | 20 | 30 | | 35 | 31 | -| 36 | 36 | +| 36 | 36 (5) | 1. **Seule une activité de code 6 permet la création de captures**. 2. **Seule une activité de code 13 permet la création de DCP**.. 3. On ajoute en plus un système observé **110** et **setSuccessStatus** à **2**. +4. Si un dcp est trouvé alors on utilise un type d'activité introduit en version *9.1.0* qui permet l'ajout de dcp. +5. Le type d'activité a été ajouté lors de la migration de la version *9.1.0* (avant on utilisait *99*) ### REF_SCHOOL_TYPE View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/02e11b305141de38f7517168… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/02e11b305141de38f7517168… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] 2 commits: Procédure de calcul qui ne détecte pas les données modifiées - Closes #2615
by Tony CHEMIT (＠tchemit) 25 Jan '23

25 Jan '23

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: 75eae88d by Tony Chemit at 2023-01-25T09:20:14+01:00 Procédure de calcul qui ne détecte pas les données modifiées - Closes #2615 - - - - - a16389e1 by Tony Chemit at 2023-01-25T09:35:15+01:00 Avdth - Review some Floating Object mappings (sort them and re-add some removed ones...) - See #2612 - - - - - 2 changed files: - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripConsolidateEngine.java Changes: ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java ===================================== @@ -67,19 +67,21 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { .put("0", "99") .put("1", "99") .put("2", "99") - .put("3", "99") - .put("4", "99") - .put("10", "99") - .put("14", "99") + + .put("3", "2") + .put("4", "2") + .put("5", "1") + .put("6", "4") + .put("7", "99") .put("8", "99") .put("9", "99") + .put("10", "99") .put("12", "99") .put("13", "99") + .put("14", "99") .put("15", "99") - .put("5", "1") - .put("6", "4") .put("22", "4") .put("23", "1") .put("24", "4") @@ -101,8 +103,16 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { * If for a given {@code ACTIVITE.C_OPERA}, no value is found here, this means that there is no buoy to create. */ public static final Map<String, String> TRANSMITTING_BUOY_OPERATION_CODE_MAPPING = ImmutableMap.<String, String>builder() + .put("3", "1") // Visite | Visite + .put("4", "1") // Visite | Visite .put("5", "3") // Mise à l'eau | null ou 3 Mise à l'eau .put("6", "2") // Retrait | null ou 2 Récupération + .put("7", "1") // Visite | Visite + .put("10", "1")// Visite | Visite + .put("12", "1")// Visite | Visite + .put("13", "1")// Visite | Visite + .put("14", "1")// Visite | Visite + .put("15", "1")// Visite | Visite .put("23", "3") // Mise à l'eau | 3 Mise à l'eau .put("24", "2") // Retrait | 2 Récupération .put("25", "3") // Visite | 3 Mise à l'eau @@ -128,15 +138,15 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { "2", "3", "4", + "6", + "7", + "8", "9", "10", "12", + "13", "14", "15", - "7", - "8", - "13", - "6", "22", "24", "25", ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripConsolidateEngine.java ===================================== @@ -38,7 +38,6 @@ import fr.ird.observe.dto.data.ps.observation.consolidate.ActivityConsolidateRes import fr.ird.observe.dto.data.ps.observation.consolidate.FloatingObjectConsolidateRequest; import fr.ird.observe.dto.referential.I18nReferentialHelper; import fr.ird.observe.dto.referential.ReferentialLocale; -import fr.ird.observe.dto.referential.ps.common.VesselActivityReference; import fr.ird.observe.entities.ObserveTopiaDaoSupplier; import fr.ird.observe.entities.ToolkitTopiaPersistenceContextSupport; import fr.ird.observe.entities.data.ps.localmarket.Batch; @@ -178,9 +177,8 @@ public class TripConsolidateEngine { String activityPrefix = String.format("%s - Activity [%s/%s] ", routePrefix, ++activityIndex, activityMax); - boolean floatingObjectEmpty = activity.isFloatingObjectEmpty(); - if (!VesselActivityReference.isSetOperation(activity) && floatingObjectEmpty) { - log.debug(String.format("%s Skip activity (No set nor dcp found): %s", activityPrefix, activity.getTopiaId())); + if (activity.getSetSize() == 0) { + log.info(String.format("%s Skip activity (No set found): %s", activityPrefix, activity.getTopiaId())); continue; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c1e15bcdaa8b84ba74ed851c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c1e15bcdaa8b84ba74ed851c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Procédure de calcul qui ne détecte pas les données modifiées - Closes #2615
by Tony CHEMIT (＠tchemit) 25 Jan '23

25 Jan '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7c66455f by Tony Chemit at 2023-01-25T09:36:04+01:00 Procédure de calcul qui ne détecte pas les données modifiées - Closes #2615 - - - - - 02e11b30 by Tony Chemit at 2023-01-25T09:36:34+01:00 Avdth - Review some Floating Object mappings (sort them and re-add some removed ones...) - See #2612 - - - - - 2 changed files: - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripConsolidateEngine.java Changes: ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java ===================================== @@ -76,19 +76,21 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { .put("0", "99") .put("1", "99") .put("2", "99") - .put("3", "99") - .put("4", "99") - .put("10", "99") - .put("14", "99") + + .put("3", "2") + .put("4", "2") + .put("5", "1") + .put("6", "4") + .put("7", "99") .put("8", "99") .put("9", "99") + .put("10", "99") .put("12", "99") .put("13", "99") + .put("14", "99") .put("15", "99") - .put("5", "1") - .put("6", "4") .put("22", "4") .put("23", "1") .put("24", "4") @@ -110,8 +112,16 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { * If for a given {@code ACTIVITE.C_OPERA}, no value is found here, this means that there is no buoy to create. */ public static final Map<String, String> TRANSMITTING_BUOY_OPERATION_CODE_MAPPING = ImmutableMap.<String, String>builder() + .put("3", "1") // Visite | Visite + .put("4", "1") // Visite | Visite .put("5", "3") // Mise à l'eau | null ou 3 Mise à l'eau .put("6", "2") // Retrait | null ou 2 Récupération + .put("7", "1") // Visite | Visite + .put("10", "1")// Visite | Visite + .put("12", "1")// Visite | Visite + .put("13", "1")// Visite | Visite + .put("14", "1")// Visite | Visite + .put("15", "1")// Visite | Visite .put("23", "3") // Mise à l'eau | 3 Mise à l'eau .put("24", "2") // Retrait | 2 Récupération .put("25", "3") // Visite | 3 Mise à l'eau @@ -137,15 +147,15 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { "2", "3", "4", + "6", + "7", + "8", "9", "10", "12", + "13", "14", "15", - "7", - "8", - "13", - "6", "22", "24", "25", ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripConsolidateEngine.java ===================================== @@ -38,7 +38,6 @@ import fr.ird.observe.dto.data.ps.observation.consolidate.ActivityConsolidateRes import fr.ird.observe.dto.data.ps.observation.consolidate.FloatingObjectConsolidateRequest; import fr.ird.observe.dto.referential.I18nReferentialHelper; import fr.ird.observe.dto.referential.ReferentialLocale; -import fr.ird.observe.dto.referential.ps.common.VesselActivityReference; import fr.ird.observe.entities.ObserveTopiaDaoSupplier; import fr.ird.observe.entities.ToolkitTopiaPersistenceContextSupport; import fr.ird.observe.entities.data.ps.localmarket.Batch; @@ -178,9 +177,8 @@ public class TripConsolidateEngine { String activityPrefix = String.format("%s - Activity [%s/%s] ", routePrefix, ++activityIndex, activityMax); - boolean floatingObjectEmpty = activity.isFloatingObjectEmpty(); - if (!VesselActivityReference.isSetOperation(activity) && floatingObjectEmpty) { - log.debug(String.format("%s Skip activity (No set nor dcp found): %s", activityPrefix, activity.getTopiaId())); + if (activity.getSetSize() == 0) { + log.info(String.format("%s Skip activity (No set found): %s", activityPrefix, activity.getTopiaId())); continue; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fe1373e03bd6db2515f690b5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fe1373e03bd6db2515f690b5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Migration - Add VesselActivity 101 and 102
by Tony CHEMIT (＠tchemit) 24 Jan '23

24 Jan '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 05efd969 by Tony Chemit at 2023-01-24T13:14:47+01:00 Migration - Add VesselActivity 101 and 102 - - - - - 6b441c82 by Tony Chemit at 2023-01-24T13:14:47+01:00 Avdth - use new vessel activity for activity that does not allow fad - - - - - fe1373e0 by Tony Chemit at 2023-01-24T14:02:59+01:00 Merge branch 'feature/issue_2612' into develop Gestion des FAD sur OPERA AVDTH non mappées vers VesselActivity avec allowFad=TRUE - Closes #2612 - - - - - 9 changed files: - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportEngineExecution.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/ActivityWriter.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_1.java - + core/persistence/migration/src/main/resources/db/migration/v9/9.1/05_add_referential_ps_common_VesselActivity_101-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.1/05_add_referential_ps_common_VesselActivity_102-common.sql - core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties - model/src/main/resources/fixtures/global.properties Changes: ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportEngineExecution.java ===================================== @@ -178,6 +178,9 @@ public class ImportEngineExecution extends ImportEngine { context.addDefaultObservedSystemOrSanitizeFloatingObjectOnes(activity); // write activity observed systems activityWriter.writeObservedSystems(activity); + // while loading Floating objects, we may have change the vessel activity of the activity + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2612 + activityWriter.updateVesselActivity(activity); // get another activity ? if (tables.activityTableReader.hasNext()) { ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java ===================================== @@ -137,6 +137,8 @@ public class ImportReferentialContext { private ObservedSystem observedSystem103; private ObservedSystem observedSystem110; private VesselActivity vesselActivity6; + private VesselActivity vesselActivity101; + private VesselActivity vesselActivity102; private SchoolType schoolType0; private SchoolType schoolType1; private SchoolType schoolType2; @@ -189,6 +191,8 @@ public class ImportReferentialContext { // activity vesselActivity = Maps.uniqueIndex(referential.getVesselActivity(), VesselActivity::getCode); vesselActivity6 = vesselActivity.get("6"); + vesselActivity101 = vesselActivity.get("101"); + vesselActivity102 = vesselActivity.get("102"); schoolType = Maps.uniqueIndex(referential.getSchoolType(), SchoolType::getCode); schoolType0 = schoolType.get("0"); schoolType1 = schoolType.get("1"); @@ -587,4 +591,11 @@ public class ImportReferentialContext { return vesselActivity6; } + public VesselActivity getVesselActivity101() { + return vesselActivity101; + } + + public VesselActivity getVesselActivity102() { + return vesselActivity102; + } } ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/ActivityWriter.java ===================================== @@ -156,6 +156,24 @@ public class ActivityWriter extends DataWriter<Activity, ActivityReader> { } } + /** + * To update the activity sql code if vessel activity was changed while floating object import. + * <p> + * See <a href="https://gitlab.com/ultreiaio/ird-observe/-/issues/2612">Issue 2612</a> + * + * @param entity activity to process + */ + public void updateVesselActivity(Activity entity) { + if (FloatingObjectReader.CHANGED_VESSEL_ACTIVITY_CODE_BY_FLOATING_OBJECT.containsValue(entity.getVesselActivity().getCode())) { + String id = entity.getId(); + String vesselActivityId = entity.getVesselActivity().getId(); + String sql = String.format("UPDATE ps_logbook.activity SET vesselActivity = %1$s WHERE topiaId = %2$s;", + escapeString(vesselActivityId), + escapeString(id)); + writer().writeSql(sql); + } + } + @Override public void toResult(Map<String, Integer> resultBuilder) { super.toResult(resultBuilder); ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java ===================================== @@ -59,6 +59,15 @@ import java.util.TreeSet; */ @SuppressWarnings("SpellCheckingInspection") public class FloatingObjectReader extends DataReader<FloatingObject> { + /** + * To map ObServe vessel activity when in Avdth we found a Floating object to persist. + * <p> + * Keys are current ObServe vessel activity code used, values are the real vessel activity code to use (which allow fad) + * <p> + * See <a href="https://gitlab.com/ultreiaio/ird-observe/-/issues/2612">Issue 2612</a> + */ + public static final Map<String, String> CHANGED_VESSEL_ACTIVITY_CODE_BY_FLOATING_OBJECT = Map.of("1", "101", + "2", "102"); private static final Logger log = LogManager.getLogger(FloatingObjectReader.class); /** * To get FloatingObject.objectOperation code from avdth ACTIVITE.C_OPERA. @@ -275,21 +284,42 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { } if (!vesselActivityAllowFad) { - // If ObServe veseel activity does not support Floating object, reject import - List<Object> activityPrimaryKey = ActivityReader.getActivityPk(resultSet); - String activityPk = Query.primaryKeyString(activityPrimaryKey); - String message = String.format("On activity %s (ACTIVITE.C_OPERA %s), can not add Floating object since ObServe Vessel activity with code : %s does not allow FAD (floatingObjectExistsInAvdth? %b, floatingObjectCreatedByObservedSystem? %b).", - activityPk, - vesselActivityCode, - vesselActivity.getCode(), - floatingObjectExistsInAvdth, - floatingObjectCreatedByObservedSystem); - log.warn(message); - badVesselActivityCodes.computeIfAbsent(vesselActivityCode, MutableInt::new).increment(); + + String observeVesselActivityCode = activity.getVesselActivity().getCode(); + String realObserveVesselActivityCode = CHANGED_VESSEL_ACTIVITY_CODE_BY_FLOATING_OBJECT.get(observeVesselActivityCode); + if (realObserveVesselActivityCode == null) { + + // If ObServe veseel activity does not support Floating object, reject import + List<Object> activityPrimaryKey = ActivityReader.getActivityPk(resultSet); + String activityPk = Query.primaryKeyString(activityPrimaryKey); + String message = String.format("For AVDTH activity %s (ACTIVITE.C_OPERA %s), the ObServe vessel activity (code: %s, label: %s) does not allow FAD, we still import it... (floatingObjectExistsInAvdth? %b, floatingObjectCreatedByObservedSystem? %b).", + activityPk, + vesselActivityCode, + vesselActivity.getCode(), + vesselActivity.getLabel1(), + floatingObjectExistsInAvdth, + floatingObjectCreatedByObservedSystem); + log.warn(message); + badVesselActivityCodes.computeIfAbsent(vesselActivityCode, MutableInt::new).increment(); // // do not create the floating object // reset(dataContext); // return null; + + } else { + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2612 + switch (realObserveVesselActivityCode) { + case "101": + // Use vessel activity 101 + activity.setVesselActivity(dataContext.getVesselActivity101()); + break; + case "102": + // Use vessel activity 102 + activity.setVesselActivity(dataContext.getVesselActivity102()); + break; + } + } + } FloatingObject entity = newEntity(FloatingObject.SPI); @@ -474,7 +504,7 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { return dataContext.getObjectOperation(Objects.requireNonNull(objectOperationCode, String.format("Can't find objectOperation with ACTIVITE.C_OPERA: %s", vesselActivityCode))); } - private ObservedSystem getObservedSystem(ImportDataContext dataContext, String objectTypeCode, boolean floatingObjectExistsInAvdth,boolean buoyExistsInAvdth) { + private ObservedSystem getObservedSystem(ImportDataContext dataContext, String objectTypeCode, boolean floatingObjectExistsInAvdth, boolean buoyExistsInAvdth) { if (!floatingObjectExistsInAvdth) { if (!buoyExistsInAvdth) { return dataContext.getObservedSystem0(); ===================================== core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_1.java ===================================== @@ -275,16 +275,16 @@ public class DataSourceMigrationForVersion_9_1 extends ByMajorMigrationVersionRe executor.addScript("04", "drop_ll_common_weightDeterminationMethod"); if (withIds) { - addVesselActivity36(executor); + addVesselActivities(executor); } // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2435 addNewTable(executor, withIds, "06", "table-common_sizemeasuremethod"); } - private void addVesselActivity36(MigrationVersionResourceExecutor executor) { + private void addVesselActivities(MigrationVersionResourceExecutor executor) { Set<String> existingCodes = executor.findMultipleResultAstSet(SqlQuery.wrap("SELECT CODE FROM ps_common.VesselActivity", resultSet -> resultSet.getString(1))); Set<String> newCodes = new LinkedHashSet<>(); - Stream.of("36").forEach(code -> { + Stream.of("36", "101", "102").forEach(code -> { if (!existingCodes.contains(code)) { executor.addScript("05", "add_referential_ps_common_VesselActivity_" + code); newCodes.add(code); ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.1/05_add_referential_ps_common_VesselActivity_101-common.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2023 IRD, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- +INSERT INTO ps_common.vesselActivity(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8, allowFad) VALUES ('fr.ird.referential.ps.common.VesselActivity#${REFERENTIAL_PREFIX}101', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '101', null, null, FALSE, 0, '[déprécié] Transit (route sans recherche)', '[deprecated] Transit (steaming without searching)', '[deprecated] Transit (steaming without searching) TODO', null, null, null, null, null, TRUE); ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.1/05_add_referential_ps_common_VesselActivity_102-common.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2023 IRD, Ultreia.io +-- %% +-- This program is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as +-- published by the Free Software Foundation, either version 3 of the +-- License, or (at your option) any later version. +-- +-- This program is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public +-- License along with this program. If not, see +-- <http://www.gnu.org/licenses/gpl-3.0.html>. +-- #L% +--- +INSERT INTO ps_common.vesselActivity(topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8, allowFad) VALUES ('fr.ird.referential.ps.common.VesselActivity#${REFERENTIAL_PREFIX}102', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '102', null, null, FALSE, 0, '[deprecated] Searching (in general)', '[déprécié] Recherche (général)', '[deprecated] Searching (in general) TODO', null, null, null, null, null, TRUE); ===================================== core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties ===================================== @@ -89,7 +89,7 @@ ps_common.speciesFate=15 ps_common.transmittingBuoyOperation=5 ps_common.transmittingBuoyOwnership=5 ps_common.transmittingBuoyType=62 -ps_common.vesselActivity=37 +ps_common.vesselActivity=39 ps_common.weightCategory=137 ps_landing.destination=28 ps_landing.fate=2 ===================================== model/src/main/resources/fixtures/global.properties ===================================== @@ -25,4 +25,4 @@ REFERENCE_DATA_COUNT=68 ENTITIES_LIMIT_SIZE=100 # fr.ird.observe.services.service.referential.ReferentialService # fr.ird.observe.services.local.service.referential.DifferentialModelTest -REFERENTIAL_COUNT=4094 +REFERENTIAL_COUNT=4096 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ac810ae19e72c394093bd8b7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/ac810ae19e72c394093bd8b7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Avdth - fix merge from v9.0.x
by Tony CHEMIT (＠tchemit) 24 Jan '23

24 Jan '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 52968fb9 by Tony Chemit at 2023-01-24T09:48:57+01:00 Avdth - fix merge from v9.0.x - - - - - 89565bf9 by Tony Chemit at 2023-01-24T13:13:11+01:00 Avdth - Remove comment in AvdthDataImportResult (move it to test) - - - - - ac810ae1 by Tony Chemit at 2023-01-24T13:14:39+01:00 Avdth test - show export Result if not empty + improve code - - - - - 5 changed files: - core/api/services/src/main/java/fr/ird/observe/services/service/data/ps/AvdthDataImportResult.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/DataReader.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectWriter.java - core/persistence/test/src/test/java/fr/ird/observe/persistence/avdth/data/AvdthDataBuilderTestSupport.java - core/persistence/test/src/test/resources/log4j2.xml Changes: ===================================== core/api/services/src/main/java/fr/ird/observe/services/service/data/ps/AvdthDataImportResult.java ===================================== @@ -87,10 +87,6 @@ public class AvdthDataImportResult implements ObserveDto { this.notReadResult = notReadResult; this.exportResult = exportResult; this.sqlResultPath = sqlResultPath; - // Used for debugging... -// if (!exportResult.isEmpty()) { -// System.out.println(exportResult.entrySet().stream().map(e -> e.getKey() + "=" + e.getValue()).collect(Collectors.joining("\n"))); -// } } public Path getMessageFile() { ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/DataReader.java ===================================== @@ -64,10 +64,6 @@ public abstract class DataReader<E extends DataEntity> { return context; } - public void addMessage(String message) { - context.addMessage(message); - } - public abstract E read(ImportDataContext dataContext, ResultSet resultSet) throws SQLException; public final int getCount() { ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectWriter.java ===================================== @@ -192,9 +192,7 @@ public class FloatingObjectWriter extends DataWriter<FloatingObject, FloatingObj super.toResult(resultBuilder); toResult(resultBuilder, FloatingObjectPart.class, getReader().getFloatingObjectPartCount()); toResult(resultBuilder, TransmittingBuoy.class, getReader().getTransmittingBuoyCount()); -// getReader().getBadVesselActivityCodes().forEach((k,v)-> { -// resultBuilder.put(String.format("Bad Vessel activity used to build FAD from ACTIVITY.C_OPERA %s used but ObServe not allow fad.", k), v.getValue()); -// }); + getReader().getBadVesselActivityCodes().forEach((k,v)-> resultBuilder.put(String.format("Bad Vessel activity used to build FAD from ACTIVITE.C_OPERA %s used but this vessel activity does not allow fad in ObServe.", k), v.getValue())); } } ===================================== core/persistence/test/src/test/java/fr/ird/observe/persistence/avdth/data/AvdthDataBuilderTestSupport.java ===================================== @@ -26,19 +26,21 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import fr.ird.observe.dto.ObserveUtil; import fr.ird.observe.dto.ProgressionModel; -import fr.ird.observe.services.service.data.ps.AvdthDataImportConfiguration; -import fr.ird.observe.services.service.data.ps.AvdthDataImportResult; -import fr.ird.observe.services.service.data.ps.MissingReferentialException; import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.entities.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.data.ps.common.Trip; import fr.ird.observe.persistence.avdth.AvdthFixtures; import fr.ird.observe.persistence.test.PersistenceTestSupportWrite; +import fr.ird.observe.services.service.data.ps.AvdthDataImportConfiguration; +import fr.ird.observe.services.service.data.ps.AvdthDataImportResult; +import fr.ird.observe.services.service.data.ps.MissingReferentialException; import fr.ird.observe.test.DatabaseName; import fr.ird.observe.test.IgnoreTestClassRule; import fr.ird.observe.test.spi.CopyDatabaseConfiguration; import fr.ird.observe.test.spi.DatabaseNameConfiguration; import io.ultreia.java4all.util.SortedProperties; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Assume; @@ -56,6 +58,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import java.util.stream.Stream; /** * Created on 24/05/2021. @@ -65,7 +68,7 @@ import java.util.stream.Collectors; */ @RunWith(Parameterized.class) public abstract class AvdthDataBuilderTestSupport extends PersistenceTestSupportWrite { - + private static final Logger log = LogManager.getLogger(AvdthDataBuilderTestSupport.class); @ClassRule public static final IgnoreTestClassRule IGNORE2 = new IgnoreTestClassRule("Persistence Avdth", "persistence.avdth.test.skip"); @@ -95,8 +98,8 @@ public abstract class AvdthDataBuilderTestSupport extends PersistenceTestSupport } public static List<String> allDatabases(Path path) { - try { - List<String> collect = Files.find(path, 1, (p, b) -> p.toFile().getName().endsWith(".mdb")).map(p -> p.toFile().getName()).sorted().collect(Collectors.toList()); + try (Stream<Path> pathStream = Files.find(path, 1, (p, b) -> p.toFile().getName().endsWith(".mdb"))) { + List<String> collect = pathStream.map(p -> p.toFile().getName()).sorted().collect(Collectors.toList()); Collections.reverse(collect); return collect; } catch (IOException e) { @@ -142,8 +145,12 @@ public abstract class AvdthDataBuilderTestSupport extends PersistenceTestSupport try { result = ImportEngine.run(configuration, localTestMethodResource.getTopiaApplicationContext()); String resultAsGson = gson.toJson(result); - log.info(String.format("Import result:\n%s", resultAsGson)); - log.info(String.format("Import messages:\n%s", result.getMessageFile())); + log.debug(String.format("Import result:\n%s", resultAsGson)); + // Used for debugging... + Map<String, Integer> exportResult = result.getExportResult(); + if (!exportResult.isEmpty()) { + log.info(String.format("Export result:\n%s", exportResult.entrySet().stream().map(e -> e.getKey() + "=" + e.getValue()).collect(Collectors.joining("\n")))); + } } finally { ObserveUtil.cleanMemory(); } ===================================== core/persistence/test/src/test/resources/log4j2.xml ===================================== @@ -46,6 +46,9 @@ <Logger name="org.nuiton.topia.persistence.security.SecurityScriptHelper" level="info" additivity="false"> <AppenderRef ref="console"/> </Logger> + <Logger name="fr.ird.observe.persistence.avdth.data.AvdthDataBuilderTestSupport" level="info" additivity="false"> + <AppenderRef ref="console"/> + </Logger> <Logger name="fr.ird.observe.persistence.test" level="info" additivity="false"> <AppenderRef ref="console"/> </Logger> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c1fb83d2883489e3ed424577… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/c1fb83d2883489e3ed424577… You're receiving this email because of your account on gitlab.com.

1 0