Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 532c68b7 by Tony Chemit at 2022-02-21T16:49:29+01:00 Correction des lastUpdateDate non mis à jour sur les formulaires de type tableau - Closes ultreiaio/ird-observe#2173 - - - - - 4 changed files: - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/common/TripGearUseFeaturesSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripBatchSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripGearUseFeaturesSpi.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SampleSpi.java Changes: ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ll/common/TripGearUseFeaturesSpi.java ===================================== @@ -23,17 +23,14 @@ package fr.ird.observe.entities.data.ll.common; */ import java.util.Date; -import java.util.function.BiConsumer; public class TripGearUseFeaturesSpi extends GeneratedTripGearUseFeaturesSpi { @Override - public BiConsumer<Trip, Date> saveCallback() { - return (e, lastUpdateDate) -> { - for (GearUseFeatures features : e.getGearUseFeatures()) { - features.setLastUpdateDate(lastUpdateDate); - features.getGearUseFeaturesMeasurement().forEach(measurement -> measurement.setLastUpdateDate(lastUpdateDate)); - } - }; + public void saveCallback(Trip entity, Date lastUpdateDate) { + for (GearUseFeatures features : entity.getGearUseFeatures()) { + features.setLastUpdateDate(lastUpdateDate); + features.getGearUseFeaturesMeasurement().forEach(measurement -> measurement.setLastUpdateDate(lastUpdateDate)); + } } } ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripBatchSpi.java ===================================== @@ -31,7 +31,6 @@ import fr.ird.observe.spi.service.ServiceContext; import java.util.Date; import java.util.LinkedHashSet; -import java.util.function.BiConsumer; import java.util.stream.Collectors; public class TripBatchSpi extends GeneratedTripBatchSpi { @@ -42,11 +41,6 @@ public class TripBatchSpi extends GeneratedTripBatchSpi { form.getObject().setAvailablePackagings(availablePackaging); } - @Override - public BiConsumer<Trip, Date> saveCallback() { - return (e, lastUpdateDate) -> e.getLocalmarketBatch().forEach(c -> c.setLastUpdateDate(lastUpdateDate)); - } - protected LinkedHashSet<PackagingReference> getPackaging(ServiceContext context, Trip trip) { Harbour landingHarbour = trip.getLandingHarbour(); Date date = trip.getEndDate(); ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripGearUseFeaturesSpi.java ===================================== @@ -23,17 +23,14 @@ package fr.ird.observe.entities.data.ps.common; */ import java.util.Date; -import java.util.function.BiConsumer; public class TripGearUseFeaturesSpi extends GeneratedTripGearUseFeaturesSpi { @Override - public BiConsumer<Trip, Date> saveCallback() { - return (e, lastUpdateDate) -> { - for (GearUseFeatures features : e.getGearUseFeatures()) { - features.setLastUpdateDate(lastUpdateDate); - features.getGearUseFeaturesMeasurement().forEach(measurement -> measurement.setLastUpdateDate(lastUpdateDate)); - } - }; + public void saveCallback(Trip entity, Date lastUpdateDate) { + for (GearUseFeatures features : entity.getGearUseFeatures()) { + features.setLastUpdateDate(lastUpdateDate); + features.getGearUseFeaturesMeasurement().forEach(measurement -> measurement.setLastUpdateDate(lastUpdateDate)); + } } } ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/observation/SampleSpi.java ===================================== @@ -29,6 +29,7 @@ import fr.ird.observe.entities.referential.common.Species; import fr.ird.observe.entities.referential.ps.common.SpeciesFate; import fr.ird.observe.spi.service.ServiceContext; +import java.util.Date; import java.util.Objects; import java.util.stream.Collectors; @@ -48,6 +49,11 @@ public class SampleSpi extends GeneratedSampleSpi { return form; } + @Override + public void saveCallback(Sample entity, Date lastUpdateDate) { + entity.getSampleMeasure().forEach(c -> c.setLastUpdateDate(lastUpdateDate)); + } + @Override public SaveResultDto save(ServiceContext context, SampleDto dto) { // this is a trick we always use id as parent id... View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/532c68b7cd157738c8964b282b... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/532c68b7cd157738c8964b282b... You're receiving this email because of your account on gitlab.com.