Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 970ba3e5 by Tony Chemit at 2021-11-24T00:12:22+01:00 Problème de transcodage des codes types activités PS logbook - Closes #2118 - - - - - 2 changed files: - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java Changes: ===================================== models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java ===================================== @@ -62,6 +62,7 @@ import fr.ird.observe.persistence.avdth.data.logbook.WellPlanReader; import fr.ird.observe.persistence.avdth.referential.AvdthReferentialImportResult; import fr.ird.observe.persistence.avdth.referential.SpeciesCache; import fr.ird.observe.persistence.avdth.referential.interceptors.SchoolTypeInterceptor; +import fr.ird.observe.persistence.avdth.referential.interceptors.VesselActivityInterceptor; import fr.ird.observe.persistence.avdth.referential.interceptors.WeightCategoryInterceptor; import java.util.List; @@ -502,7 +503,8 @@ public class ImportReferentialContext { } public VesselActivity getVesselActivity(String code) { - VesselActivity result = vesselActivity.get(code); + String observeVesselActivityCode = VesselActivityInterceptor.CODE_MAPPING.get(code); + VesselActivity result = vesselActivity.get(observeVesselActivityCode); return Objects.requireNonNull(result, String.format("Can't find vessel activity wth code: %s", code)); } ===================================== models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java ===================================== @@ -31,10 +31,10 @@ import fr.ird.observe.entities.referential.ps.common.ObjectOperation; import fr.ird.observe.entities.referential.ps.common.ObservedSystem; import fr.ird.observe.entities.referential.ps.common.TransmittingBuoyOperation; import fr.ird.observe.entities.referential.ps.common.TransmittingBuoyType; +import fr.ird.observe.entities.referential.ps.common.VesselActivity; 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.VesselActivityInterceptor; import org.apache.commons.lang3.mutable.MutableInt; import java.sql.ResultSet; @@ -211,9 +211,9 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { public FloatingObject read(ImportDataContext dataContext, ResultSet resultSet) throws SQLException { String vesselActivityCode = resultSet.getString(13); - String observeVesselActivityCode = VesselActivityInterceptor.CODE_MAPPING.get(vesselActivityCode); + VesselActivity vesselActivity = dataContext.getVesselActivity(vesselActivityCode); Set<String> observedSystemCodes = dataContext.getObservedSystemCodes(); - if (!Objects.equals(observeVesselActivityCode, "13")) { + if (!Objects.equals(vesselActivity.getCode(), "13")) { boolean noDcpInObservedSystems = observedSystemCodes.stream().noneMatch(OBSERVED_SYTEM_CODES_WITH_DCP::contains); if (noDcpInObservedSystems) { reset(dataContext); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/970ba3e58a86c5693fc2e2f004... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/970ba3e58a86c5693fc2e2f004... You're receiving this email because of your account on gitlab.com.