Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b3ffb6b8 by Tony Chemit at 2023-04-02T09:50:17+02:00 Vérifier les mappings de REF_OBSERVED_SYSTEM - Closes #2655 - - - - - 4 changed files: - 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/ActivityReader.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/ObservedSystemInterceptor.java - src/site/markdown/avdth/referential.md Changes: ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java ===================================== @@ -134,6 +134,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; @@ -210,6 +211,7 @@ public class ImportReferentialContext { observedSystem = Maps.uniqueIndex(referential.getObservedSystem(), ObservedSystem::getCode); observedSystem0 = observedSystem.get("0"); observedSystem20 = observedSystem.get("20"); + observedSystem102 = observedSystem.get("102"); observedSystem103 = observedSystem.get("103"); observedSystem110 = observedSystem.get("110"); @@ -506,6 +508,10 @@ public class ImportReferentialContext { return observedSystem0; } + public ObservedSystem getObservedSystem102() { + return observedSystem102; + } + public ObservedSystem getObservedSystem103() { return observedSystem103; } @@ -548,7 +554,7 @@ public class ImportReferentialContext { } public void addBaitOnlyObservedSystem(Activity entity) { - entity.addObservedSystem(getObservedSystem("102")); + entity.addObservedSystem(getObservedSystem102()); } public ObjectOperation getObjectOperation(String objectOperationCode) { ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/ActivityReader.java ===================================== @@ -32,6 +32,7 @@ import fr.ird.observe.persistence.avdth.data.DataQueryDefinition; import fr.ird.observe.persistence.avdth.data.DataReader; import fr.ird.observe.persistence.avdth.data.ImportDataContext; import fr.ird.observe.persistence.avdth.data.ImportEngine; +import fr.ird.observe.persistence.avdth.referential.interceptors.ObservedSystemInterceptor; import io.ultreia.java4all.util.Dates; import java.sql.ResultSet; @@ -353,6 +354,9 @@ public class ActivityReader extends DataReader<Activity> { ResultSet activityObservedSystemRow = activityObservedSystemTableReader.next(); String observedSystemCode = activityObservedSystemRow.getString(6); observedSystemCodes.add(observedSystemCode); + if (!ObservedSystemInterceptor.CODE_MAPPING.containsKey(observedSystemCode)) { + throw new IllegalStateException(String.format("Can't find observedSystem with code: %s from ad-hoc AVDTH to ObServe mapping", observedSystemCode)); + } ObservedSystem observedSystem = dataContext.getObservedSystem(observedSystemCode); observedSystems.add(observedSystem); } ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/ObservedSystemInterceptor.java ===================================== @@ -58,24 +58,58 @@ public class ObservedSystemInterceptor extends ReferentialInterceptor<ObservedSy * From avdth code to observe code. */ public static final Map<String, String> CODE_MAPPING = ImmutableMap.<String, String>builder() + .put("0", "0") .put("10", "18") .put("11", "23") .put("12", "24") .put("13", "25") .put("14", "26") + .put("20", "20") .put("21", "20") .put("22", "20") .put("23", "20") .put("24", "20") .put("25", "20") .put("26", "17") + .put("27", "27") + .put("28", "28") .put("29", "31") .put("30", "4") .put("31", "4") + .put("32", "32") + .put("33", "33") + .put("34", "34") + .put("35", "35") + .put("36", "36") + .put("37", "37") + .put("38", "38") + .put("40", "40") + .put("41", "41") + .put("42", "42") + .put("43", "43") + .put("50", "50") .put("51", "11") .put("52", "10") + .put("53", "53") .put("60", "12") .put("61", "13") + .put("62", "62") + .put("70", "70") + .put("71", "71") + .put("72", "72") + .put("73", "73") + .put("74", "74") + .put("80", "80") + .put("81", "81") + .put("90", "90") + .put("91", "91") + .put("92", "92") + .put("93", "93") + .put("94", "94") + .put("95", "95") + .put("96", "96") + .put("97", "97") + .put("98", "98") .put("99", "101") .build(); /** @@ -176,6 +210,6 @@ public class ObservedSystemInterceptor extends ReferentialInterceptor<ObservedSy @Override public void consume(AvdthReferentialImportResult result, List<ObservedSystem> newList) { - result.setObservedSystem(newList); + mergeNewReferential(result, newList, AvdthReferentialImportResult::getObservedSystem, ObservedSystem::getCode); } } ===================================== src/site/markdown/avdth/referential.md ===================================== @@ -142,24 +142,58 @@ Pour transposer tous les codes **ACT_ASSOC.C_ASSOC** en code **ps_common.Observe | **ACT_ASSOC.C_ASSOC** | **ps_common.ObservedSystem.code** | |:----------------------|:----------------------------------| +| 0 | 0 | | 10 | 18 | | 11 | 23 | | 12 | 24 | | 13 | 25 | | 14 | 26 | +| 20 | 20 | | 21 | 20 | | 22 | 20 | | 23 | 20 | | 24 | 20 | | 25 | 20 | | 26 | 17 | +| 27 | 27 | +| 28 | 28 | | 29 | 31 | | 30 | 4 | | 31 | 4 | +| 32 | 32 | +| 33 | 33 | +| 34 | 34 | +| 35 | 35 | +| 36 | 36 | +| 37 | 37 | +| 38 | 38 | +| 40 | 40 | +| 41 | 41 | +| 42 | 42 | +| 43 | 43 | +| 50 | 50 | | 51 | 11 | | 52 | 10 | +| 53 | 53 | | 60 | 12 | | 61 | 13 | +| 62 | 62 | +| 70 | 70 | +| 71 | 71 | +| 72 | 72 | +| 73 | 73 | +| 74 | 74 | +| 80 | 80 | +| 81 | 81 | +| 90 | 90 | +| 91 | 91 | +| 92 | 92 | +| 93 | 93 | +| 94 | 94 | +| 95 | 95 | +| 96 | 96 | +| 97 | 97 | +| 98 | 98 | | 99 | 101 | ### REF_VESSEL_ACTIVITY_TYPE View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b3ffb6b8afdedf4dca36d8ce89... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/b3ffb6b8afdedf4dca36d8ce89... You're receiving this email because of your account on gitlab.com.