Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0d5a7baa by Tony Chemit at 2022-09-01T11:55:46+02:00 Erreur de type de mesure sur les échantillons AVDTH migrés - Closes #2427 - - - - - 1 changed file: - core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java Changes: ===================================== core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java ===================================== @@ -149,13 +149,13 @@ public class ImportReferentialContext { speciesCache = referential.getSpeciesCache(); speciesCache.init(Maps.uniqueIndex(referential.getSpecies(), Species::getFaoCode)); - Map<String, SizeMeasureType> sizeMeasureType = Maps.uniqueIndex(referential.getSizeMeasureType(), SizeMeasureType::getCode); - sizeMeasureTypeFL = sizeMeasureType.get("FL"); - sizeMeasureTypeDL = sizeMeasureType.get("DL"); + Map<String, SizeMeasureType> sizeMeasureType = Maps.uniqueIndex(referential.getSizeMeasureType(), SizeMeasureType::getId); + sizeMeasureTypeFL = sizeMeasureType.get("fr.ird.referential.common.SizeMeasureType#1433499465700#0.0902433863375336"); // FL + sizeMeasureTypeDL = sizeMeasureType.get("fr.ird.referential.common.SizeMeasureType#1433499466774#0.529249255312607"); // PD1 - Map<String, DataQuality> dataQuality = Maps.uniqueIndex(referential.getDataQuality(), DataQuality::getCode); - dataQualityA = dataQuality.get("A"); - dataQualityE = dataQuality.get("E"); + Map<String, DataQuality> dataQuality = Maps.uniqueIndex(referential.getDataQuality(), DataQuality::getId); + dataQualityA = dataQuality.get("fr.ird.referential.common.DataQuality#0#1"); // A + dataQualityE = dataQuality.get("fr.ird.referential.common.DataQuality#0#5"); // E // trip Map<String, Ocean> ocean = Maps.uniqueIndex(referential.getOcean(), Ocean::getId); @@ -172,9 +172,9 @@ public class ImportReferentialContext { vessel = Maps.uniqueIndex(referential.getVessel(), Vessel::getCode); wellContentStatus = Maps.uniqueIndex(referential.getWellContentStatus(), WellContentStatus::getCode); - Map<String, AcquisitionStatus> acquisitionStatus = Maps.uniqueIndex(referential.getAcquisitionStatus(), AcquisitionStatus::getCode); - acquisitionStatus1 = acquisitionStatus.get("1"); - acquisitionStatus99 = acquisitionStatus.get("99"); + Map<String, AcquisitionStatus> acquisitionStatus = Maps.uniqueIndex(referential.getAcquisitionStatus(), AcquisitionStatus::getId); + acquisitionStatus1 = acquisitionStatus.get("fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#001"); // 1 + acquisitionStatus99 = acquisitionStatus.get("fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#999"); //99 // landing landingCategories = Maps.uniqueIndex(referential.getWeightCategory(), WeightCategory::getCode); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0d5a7baa5292d12395407f2283... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0d5a7baa5292d12395407f2283... You're receiving this email because of your account on gitlab.com.