This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 8bd2466f6556559993b76de3f465460b4434c15d Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 26 14:48:08 2015 +0100 Mise en place de la mise à jour de la date de dernière mise à jour lors de la sauvegarde ou suppression d'une entité (il faudra bien repasser sur chaque appel, car il me semble que cela n'est pas bien géré partout) (See #7470) --- .../ird/observe/services/ObserveServiceTopia.java | 74 ++++++++++++---------- .../services/service/ReferentialServiceTopia.java | 9 +-- .../ActivityLongLineEncouterServiceTopia.java | 9 +-- .../ActivityLongLineSensorUsedServiceTopia.java | 9 +-- .../longline/ActivityLonglineServiceTopia.java | 13 ++-- .../service/longline/BranchlineServiceTopia.java | 7 +- .../longline/SetLonglineCatchServiceTopia.java | 9 +-- .../SetLonglineDetailCompositionServiceTopia.java | 7 +- .../SetLonglineGlobalCompositionServiceTopia.java | 9 +-- .../service/longline/SetLonglineServiceTopia.java | 7 +- .../services/service/longline/TdrServiceTopia.java | 9 +-- .../longline/TripLonglineGearUseServiceTopia.java | 7 +- .../service/longline/TripLonglineServiceTopia.java | 9 ++- .../ActivitySeineObservedSystemServiceTopia.java | 9 +-- .../service/seine/ActivitySeineServiceTopia.java | 11 ++-- .../service/seine/FloatingObjectServiceTopia.java | 8 +-- .../service/seine/NonTargetCatchServiceTopia.java | 6 +- .../service/seine/NonTargetSampleServiceTopia.java | 6 +- .../seine/ObjectObservedSpeciesServiceTopia.java | 9 +-- .../seine/ObjectSchoolEstimateServiceTopia.java | 9 +-- .../services/service/seine/RouteServiceTopia.java | 13 ++-- .../service/seine/SchoolEstimateServiceTopia.java | 6 +- .../service/seine/SetSeineServiceTopia.java | 5 +- .../service/seine/TargetCatchServiceTopia.java | 6 +- .../service/seine/TargetSampleServiceTopia.java | 6 +- .../TransmittingBuoyOperationServiceTopia.java | 9 +-- .../seine/TripSeineGearUseServiceTopia.java | 13 +--- .../service/seine/TripSeineServiceTopia.java | 9 ++- 28 files changed, 93 insertions(+), 210 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java index fa44f55..822db49 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java @@ -31,7 +31,6 @@ import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.Entities; import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.ObserveEntity; -import fr.ird.observe.entities.ObserveEntityTopiaDao; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.binder.BinderEngine; @@ -52,6 +51,8 @@ import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefiniti import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; +import fr.ird.observe.services.dto.result.SaveResultDto; +import fr.ird.observe.services.dto.result.SaveResultDtos; import fr.ird.observe.services.service.ConcurrentModificationException; import fr.ird.observe.services.service.DataNotFoundException; import fr.ird.observe.services.service.DataSourceService; @@ -144,55 +145,64 @@ public abstract class ObserveServiceTopia implements ObserveService { return entities; } - protected <E extends ObserveEntity> Date saveFollowedEntity(E entity) { + protected <E extends ObserveEntity> Optional<Date> getLastUpdate(Class<E> entityType) { - Date lastUpdateDate = now(); - entity.setLastUpdateDate(lastUpdateDate); + ObserveTopiaPersistenceContext persistenceContext = serviceContext.getTopiaPersistenceContext(); + Date lastUpdateDate = persistenceContext.getLastUpdateDate(entityType); + Optional<Date> result = Optional.fromNullable(lastUpdateDate); - // on met à jour l'entité (cela permet de récupérer son topiaId si l'objet est créé) - TopiaDao<E> dao = getTopiaPersistenceContext().getDao(entity); - dao.update(entity); + return result; + } - return lastUpdateDate; + protected <D extends IdDto, E extends ObserveEntity> void deleteEntity(Class<D> dtoType, Class<E> entityType, Iterable<String> ids) { + ObserveTopiaPersistenceContext persistenceContext = serviceContext.getTopiaPersistenceContext(); + TopiaDao<E> dao = persistenceContext.getDao(entityType); + for (String id : ids) { + E entity = dao.forTopiaIdEquals(id).findUniqueOrNull(); + if (entity == null) { + throw new DataNotFoundException(dtoType, id); + } + dao.delete(entity); + } + + persistenceContext.updateLastUpdateDate(entityType, now()); } - //FIXME Remove this ? - @Deprecated - protected <P extends ObserveEntity, E extends ObserveEntity> Date saveFollowedEntity(P parentEntity, E entity) { + protected <E extends ObserveEntity> SaveResultDto saveEntity(E entity) { + + Date lastUpdateDate = now(); + entity.setLastUpdateDate(lastUpdateDate); + + ObserveTopiaPersistenceContext persistenceContext = getTopiaPersistenceContext(); // on met à jour l'entité (cela permet de récupérer son topiaId si l'objet est créé) - TopiaDao<E> dao = getTopiaPersistenceContext().getDao(entity); + TopiaDao<E> dao = persistenceContext.getDao(entity); dao.update(entity); - Date lastUpdateDate = now(); - parentEntity.setLastUpdateDate(lastUpdateDate); - entity.setLastUpdateDate(lastUpdateDate); + persistenceContext.updateLastUpdateDate(entity, lastUpdateDate); - return lastUpdateDate; + return SaveResultDtos.of(entity.getTopiaId(), lastUpdateDate); } - protected <E extends ObserveEntity> Optional<Date> getLastUpdate(Class<E> entityType) { + protected <P extends ObserveEntity, E extends ObserveEntity> SaveResultDto saveEntity(P parenEntity, E entity) { - ObserveTopiaPersistenceContext persistenceContext = serviceContext.getTopiaPersistenceContext(); - ObserveEntityTopiaDao dao = (ObserveEntityTopiaDao) persistenceContext.getDao(entityType); + Date lastUpdateDate = now(); - Optional<Date> result = Optional.fromNullable(dao.getLastUpdateDate()); + parenEntity.setLastUpdateDate(lastUpdateDate); + entity.setLastUpdateDate(lastUpdateDate); - return result; - } + ObserveTopiaPersistenceContext persistenceContext = getTopiaPersistenceContext(); + + // on met à jour l'entité (cela permet de récupérer son topiaId si l'objet est créé) + TopiaDao<E> dao = persistenceContext.getDao(entity); + dao.update(entity); + + persistenceContext.updateLastUpdateDate(entity, lastUpdateDate); + + return SaveResultDtos.of(entity.getTopiaId(), lastUpdateDate); - protected <D extends IdDto, E extends TopiaEntity> void deleteEntity(Class<D> dtoType, Class<E> entityType, Iterable<String> ids) { - ObserveTopiaPersistenceContext persistenceContext = serviceContext.getTopiaPersistenceContext(); - TopiaDao<E> dao = persistenceContext.getDao(entityType); - for (String id : ids) { - E entity = dao.forTopiaIdEquals(id).findUniqueOrNull(); - if (entity == null) { - throw new DataNotFoundException(dtoType, id); - } - dao.delete(entity); - } } protected <E extends TopiaEntity, D extends DataDto> Form<D> dataEntityToForm(Class<D> dtoType, diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java index c2a5831..4b6df57 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java @@ -45,7 +45,6 @@ import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.ReferentialReferenceSet; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.result.SaveResultDtos; import org.nuiton.topia.persistence.TopiaDao; import org.nuiton.topia.persistence.TopiaEntity; @@ -161,16 +160,10 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe } public <D extends ReferentialDto> SaveResultDto save(D dto) { - Class<D> dtoType = (Class<D>) dto.getClass(); - Class<ObserveReferentialEntity> entityType = getReferentialEntityType(dtoType); ObserveReferentialEntity entity = loadOrCreateEntityFromReferentialDto(dto); - copyReferentialDtoToEntity(dto, entity); - - Date lastUpdateDate = saveFollowedEntity(entity); - - return SaveResultDtos.of(entity.getTopiaId(), lastUpdateDate); + return saveEntity(entity); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterServiceTopia.java index 39cf17f..53fb1c4 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineEncouterServiceTopia.java @@ -28,9 +28,6 @@ import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.result.SaveResultDtos; - -import java.util.Date; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -55,12 +52,8 @@ public class ActivityLongLineEncouterServiceTopia extends ObserveServiceTopia im public SaveResultDto save(ActivityLonglineEncouterDto dto) { ActivityLongline entity = loadOrCreateEntityAndCheckLastUpdate(dto); - copyDataDtoToEntity(dto, entity); - - Date lastUpdateDate = saveFollowedEntity(entity); - - return SaveResultDtos.of(entity.getTopiaId(), lastUpdateDate); + return saveEntity(entity); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedServiceTopia.java index 649a9df..b4ad724 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLongLineSensorUsedServiceTopia.java @@ -28,9 +28,6 @@ import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.result.SaveResultDtos; - -import java.util.Date; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -54,12 +51,8 @@ public class ActivityLongLineSensorUsedServiceTopia extends ObserveServiceTopia public SaveResultDto save(ActivityLonglineSensorUsedDto dto) { ActivityLongline entity = loadOrCreateEntityAndCheckLastUpdate(dto); - copyDataDtoToEntity(dto, entity); - - Date lastUpdateDate = saveFollowedEntity(entity); - - return SaveResultDtos.of(entity.getTopiaId(), lastUpdateDate); + return saveEntity(entity); } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java index 460e63e..9d5524e 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineServiceTopia.java @@ -35,7 +35,9 @@ import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; +import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; +import fr.ird.observe.services.dto.result.TripChildSaveResultDtos; import fr.ird.observe.services.service.DataNotFoundException; import fr.ird.type.CoordinateHelper; @@ -159,18 +161,15 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements @Override public TripChildSaveResultDto save(String tripLonglineId, ActivityLonglineDto dto) { - TripChildSaveResultDto result = new TripChildSaveResultDto(); - TripLongline tripLongline = loadEntity(TripLonglineDto.class, tripLonglineId); ActivityLongline entity = loadOrCreateEntityAndCheckLastUpdate(dto); copyDataDtoToEntity(dto, entity); - Date lastUpdateDate = saveFollowedEntity(entity); + SaveResultDto saveResultDto = saveEntity(entity); - result.setId(entity.getTopiaId()); - result.setLastUpdate(lastUpdateDate); + TripChildSaveResultDto result = TripChildSaveResultDtos.of(saveResultDto); if (dto.isNotPersisted()) { @@ -215,7 +214,7 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements TripLongline tripLongline = loadEntity(TripLonglineDto.class, tripLonglineId); tripLongline.addActivityLongline(activityLongline); - saveFollowedEntity(tripLongline); + saveEntity(tripLongline); return getActivityLonglinePositionInTripLongline(tripLongline, activityLongline); @@ -235,7 +234,7 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements result.add(getActivityLonglinePositionInTripLongline(tripLongline, activityLongline)); } - saveFollowedEntity(tripLongline); + saveEntity(tripLongline); return result; diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/BranchlineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/BranchlineServiceTopia.java index 349756a..cb4e638 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/BranchlineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/BranchlineServiceTopia.java @@ -8,9 +8,6 @@ import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.result.SaveResultDtos; - -import java.util.Date; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -41,9 +38,7 @@ public class BranchlineServiceTopia extends ObserveServiceTopia implements Branc copyDataDtoToEntity(dto, entity); - Date lastUpdateDate = saveFollowedEntity(setLongline, entity); - - return SaveResultDtos.of(entity.getTopiaId(), lastUpdateDate); + return saveEntity(setLongline, entity); } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchServiceTopia.java index 3085880..76b3e04 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineCatchServiceTopia.java @@ -28,9 +28,6 @@ import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.result.SaveResultDtos; - -import java.util.Date; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -101,12 +98,8 @@ public class SetLonglineCatchServiceTopia extends ObserveServiceTopia implements public SaveResultDto save(SetLonglineCatchDto dto) { SetLongline entity = loadOrCreateEntityAndCheckLastUpdate(dto); - copyDataDtoToEntity(dto, entity); - - Date lastUpdateDate = saveFollowedEntity(entity); - - return SaveResultDtos.of(entity.getTopiaId(), lastUpdateDate); + return saveEntity(entity); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopia.java index 949b718..8476de2 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineDetailCompositionServiceTopia.java @@ -34,9 +34,6 @@ import fr.ird.observe.services.dto.longline.SectionDto; import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.result.SaveResultDtos; - -import java.util.Date; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -103,13 +100,13 @@ public class SetLonglineDetailCompositionServiceTopia extends ObserveServiceTopi copyDataDtoToEntity(dto, entity); - Date lastUpdateDate = saveFollowedEntity(entity); + SaveResultDto result = saveEntity(entity); for (Section section : entity.getSection()) { section.setSetLongline(entity); } - return SaveResultDtos.of(entity.getTopiaId(), lastUpdateDate); + return result; } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionServiceTopia.java index 6f99b5d..732a8d9 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineGlobalCompositionServiceTopia.java @@ -28,9 +28,6 @@ import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.result.SaveResultDtos; - -import java.util.Date; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -54,12 +51,8 @@ public class SetLonglineGlobalCompositionServiceTopia extends ObserveServiceTopi public SaveResultDto save(SetLonglineGlobalCompositionDto dto) { SetLongline entity = loadOrCreateEntityAndCheckLastUpdate(dto); - copyDataDtoToEntity(dto, entity); - - Date lastUpdateDate = saveFollowedEntity(entity); - - return SaveResultDtos.of(entity.getTopiaId(), lastUpdateDate); + return saveEntity(entity); } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java index 8e03be4..eb1095f 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/SetLonglineServiceTopia.java @@ -37,7 +37,6 @@ import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineStubDto; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.result.SaveResultDtos; import fr.ird.observe.services.service.DataNotFoundException; import org.apache.commons.lang3.time.DateUtils; @@ -136,15 +135,13 @@ public class SetLonglineServiceTopia extends ObserveServiceTopia implements SetL copyDataDtoToEntity(dto, entity); - Date lastUpdateDate = saveFollowedEntity(entity); + SaveResultDto result = saveEntity(entity); if (dto.isNotPersisted()) { - activityLongline.setSetLongline(entity); - } - return SaveResultDtos.of(entity.getTopiaId(), lastUpdateDate); + return result; } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TdrServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TdrServiceTopia.java index 01ccff0..c0ecda1 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TdrServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TdrServiceTopia.java @@ -28,9 +28,6 @@ import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.SetLonglineTdrDto; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.result.SaveResultDtos; - -import java.util.Date; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -102,12 +99,8 @@ public class TdrServiceTopia extends ObserveServiceTopia implements TdrService { public SaveResultDto save(SetLonglineTdrDto dto) { SetLongline entity = loadOrCreateEntityAndCheckLastUpdate(dto); - copyDataDtoToEntity(dto, entity); - - Date lastUpdateDate = saveFollowedEntity(entity); - - return SaveResultDtos.of(entity.getTopiaId(), lastUpdateDate); + return saveEntity(entity); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseServiceTopia.java index 5da1029..cb7770c 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineGearUseServiceTopia.java @@ -28,9 +28,6 @@ import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.TripLonglineGearUseDto; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.result.SaveResultDtos; - -import java.util.Date; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -58,14 +55,12 @@ public class TripLonglineGearUseServiceTopia extends ObserveServiceTopia impleme copyDataDtoToEntity(dto, entity); - Date lastUpdateDate = saveFollowedEntity(entity); + return saveEntity(entity); //FIXME Quel est le lien avec les mises en oeuvre d'un engin, ne serait-ce qu'un jolie copier-coller // TripLonglineTopiaDao dao = getTopiaPersistenceContext().getTripLonglineDao(); // dao.updateEndDate(entity); - return SaveResultDtos.of(entity.getTopiaId(), lastUpdateDate); - } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java index 7a31e8c..e526d16 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java @@ -37,7 +37,6 @@ import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.result.SaveResultDtos; import org.nuiton.util.DateUtil; import java.util.ArrayList; @@ -163,12 +162,12 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri copyDataDtoToEntity(dto, entity); - Date lastUpdateDate = saveFollowedEntity(entity); + SaveResultDto result = saveEntity(entity); TripLonglineTopiaDao dao = getTopiaPersistenceContext().getTripLonglineDao(); dao.updateEndDate(entity); - return SaveResultDtos.of(entity.getTopiaId(), lastUpdateDate); + return result; } @@ -185,7 +184,7 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri Program program = loadEntity(ProgramDto.class, programId); tripLongline.setProgram(program); - saveFollowedEntity(tripLongline); + saveEntity(tripLongline); ObserveTopiaPersistenceContext persistenceContext = serviceContext.getTopiaPersistenceContext(); persistenceContext.flush(); @@ -207,7 +206,7 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri TripLongline tripLongline = loadEntity(TripLonglineDto.class, tripLonglineId); tripLongline.setProgram(program); - saveFollowedEntity(tripLongline); + saveEntity(tripLongline); persistenceContext.flush(); result.add(getTripLonglinePositionInProgram(programId, tripLonglineId)); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemServiceTopia.java index a1edbab..9a3f757 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemServiceTopia.java @@ -27,11 +27,8 @@ import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.result.SaveResultDtos; import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; -import java.util.Date; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -53,12 +50,8 @@ public class ActivitySeineObservedSystemServiceTopia extends ObserveServiceTopia public SaveResultDto save(ActivitySeineObservedSystemDto dto) { ActivitySeine entity = loadOrCreateEntityAndCheckLastUpdate(dto); - copyDataDtoToEntity(dto, entity); - - Date lastUpdateDate = saveFollowedEntity(entity); - - return SaveResultDtos.of(entity.getTopiaId(), lastUpdateDate); + return saveEntity(entity); } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java index 5416d8e..ff31660 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineServiceTopia.java @@ -35,7 +35,6 @@ import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.result.SaveResultDtos; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.service.DataNotFoundException; @@ -181,15 +180,13 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac copyDataDtoToEntity(dto, entity); - Date lastUpdateDate = saveFollowedEntity(entity); + SaveResultDto result = saveEntity(entity); if (dto.isNotPersisted()) { - route.addActivitySeine(entity); - } - return SaveResultDtos.of(entity.getTopiaId(), lastUpdateDate); + return result; } @@ -215,7 +212,7 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac Route route = loadEntity(RouteDto.class, routeId); route.addActivitySeine(activitySeine); - saveFollowedEntity(route); + saveEntity(route); return getActivitySeinePositionInRoute(route, activitySeine); @@ -235,7 +232,7 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac result.add(getActivitySeinePositionInRoute(routeId, activityId)); } - saveFollowedEntity(route); + saveEntity(route); return result; diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java index ab7235e..2632952 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectServiceTopia.java @@ -32,12 +32,10 @@ import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.result.SaveResultDtos; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.service.DataNotFoundException; -import java.util.Date; import java.util.List; /** @@ -108,15 +106,13 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F copyDataDtoToEntity(dto, entity); - Date lastUpdateDate = saveFollowedEntity(entity); + SaveResultDto result = saveEntity(entity); if (dto.isNotPersisted()) { - activitySeine.addFloatingObject(entity); - } - return SaveResultDtos.of(entity.getTopiaId(), lastUpdateDate); + return result; } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java index 267503a..57b91b1 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetCatchServiceTopia.java @@ -37,13 +37,11 @@ import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.result.SaveResultDtos; import fr.ird.observe.services.dto.seine.NonTargetCatchDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import org.nuiton.topia.persistence.TopiaEntities; -import java.util.Date; import java.util.Set; /** @@ -144,9 +142,7 @@ public class NonTargetCatchServiceTopia extends ObserveServiceTopia implements N } } - Date lastUpdateDate = saveFollowedEntity(entity); - - return SaveResultDtos.of(entity.getTopiaId(), lastUpdateDate); + return saveEntity(entity); } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleServiceTopia.java index 039633c..c93f36e 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/NonTargetSampleServiceTopia.java @@ -32,12 +32,10 @@ import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.result.SaveResultDtos; import fr.ird.observe.services.dto.seine.NonTargetSampleDto; import fr.ird.observe.services.dto.seine.SetSeineDto; import java.util.Collection; -import java.util.Date; import java.util.Set; /** @@ -128,9 +126,7 @@ public class NonTargetSampleServiceTopia extends ObserveServiceTopia implements } - Date lastUpdateDate = saveFollowedEntity(setSeine, entity); - - return SaveResultDtos.of(setSeine.getTopiaId(), lastUpdateDate); + return saveEntity(setSeine, entity); } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesServiceTopia.java index 024ae98..dbd4b07 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectObservedSpeciesServiceTopia.java @@ -27,11 +27,8 @@ import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.result.SaveResultDtos; import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; -import java.util.Date; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -56,12 +53,8 @@ public class ObjectObservedSpeciesServiceTopia extends ObserveServiceTopia imple public SaveResultDto save(FloatingObjectObservedSpeciesDto dto) { FloatingObject entity = loadOrCreateEntityAndCheckLastUpdate(dto); - copyDataDtoToEntity(dto, entity); - - Date lastUpdateDate = saveFollowedEntity(entity); - - return SaveResultDtos.of(entity.getTopiaId(), lastUpdateDate); + return saveEntity(entity); } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateServiceTopia.java index 579266c..87dac72 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/ObjectSchoolEstimateServiceTopia.java @@ -27,11 +27,8 @@ import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.result.SaveResultDtos; import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto; -import java.util.Date; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -57,12 +54,8 @@ public class ObjectSchoolEstimateServiceTopia extends ObserveServiceTopia implem public SaveResultDto save(FloatingObjectSchoolEstimateDto dto) { FloatingObject entity = loadOrCreateEntityAndCheckLastUpdate(dto); - copyDataDtoToEntity(dto, entity); - - Date lastUpdateDate = saveFollowedEntity(entity); - - return SaveResultDtos.of(entity.getTopiaId(), lastUpdateDate); + return saveEntity(entity); } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java index 9b2eafd..4f298be 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/RouteServiceTopia.java @@ -38,6 +38,7 @@ import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.constants.ReferentialLocale; +import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineStubDto; import fr.ird.observe.services.dto.seine.RouteDto; @@ -198,16 +199,16 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi copyDataDtoToEntity(dto, entity); - Date lastUpdateDate = saveFollowedEntity(entity); + SaveResultDto saveResultDto = saveEntity(entity); - result.setId(entity.getTopiaId()); - result.setLastUpdate(lastUpdateDate); + result.setId(saveResultDto.getId()); + result.setLastUpdate(saveResultDto.getLastUpdate()); if (dto.isNotPersisted()) { tripSeine.addRoute(entity); - saveFollowedEntity(tripSeine); + saveEntity(tripSeine); } else { Date oldDate = DateUtil.getDay(oldRouteDate); @@ -255,7 +256,7 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi Route route = loadEntity(RouteDto.class, routeId); TripSeine tripSeine = loadEntity(TripSeineDto.class, tripSeineId); tripSeine.addRoute(route); - saveFollowedEntity(tripSeine); + saveEntity(tripSeine); ObserveTopiaPersistenceContext persistenceContext = serviceContext.getTopiaPersistenceContext(); persistenceContext.flush(); @@ -276,7 +277,7 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi result.add(getRoutePositionInTripSeine(tripSeine, route)); } - saveFollowedEntity(tripSeine); + saveEntity(tripSeine); return result; } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateServiceTopia.java index c0f5694..65adbeb 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SchoolEstimateServiceTopia.java @@ -30,12 +30,9 @@ import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.result.SaveResultDtos; import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import java.util.Date; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -71,8 +68,7 @@ public class SchoolEstimateServiceTopia extends ObserveServiceTopia implements S schoolEstimate.setSetSeine(entity); } - Date lastUpdateDate = saveFollowedEntity(entity); - return SaveResultDtos.of(entity.getTopiaId(), lastUpdateDate); + return saveEntity(entity); } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java index 6e516dd..c2b0bce 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/SetSeineServiceTopia.java @@ -31,7 +31,6 @@ import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.result.SaveResultDtos; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.SetSeineDto; @@ -127,7 +126,7 @@ public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSein copyDataDtoToEntity(dto, entity); - Date lastUpdateDate = saveFollowedEntity(entity); + SaveResultDto result = saveEntity(entity); if (dto.isNotPersisted()) { @@ -135,7 +134,7 @@ public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSein } - return SaveResultDtos.of(entity.getTopiaId(), lastUpdateDate); + return result; } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetCatchServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetCatchServiceTopia.java index a27ef1f..4e26028 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetCatchServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetCatchServiceTopia.java @@ -17,7 +17,6 @@ import fr.ird.observe.services.binder.data.DataBinderSupport; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.result.SaveResultDtos; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; import fr.ird.observe.services.dto.seine.TargetCatchDto; import fr.ird.observe.services.dto.seine.TargetCatchDtos; @@ -25,7 +24,6 @@ import fr.ird.observe.services.dto.seine.TripSeineDto; import org.nuiton.topia.persistence.TopiaEntities; import java.util.Collection; -import java.util.Date; import java.util.List; import java.util.Set; @@ -148,9 +146,7 @@ public class TargetCatchServiceTopia extends ObserveServiceTopia implements Targ Optional<TargetCatch> targetCatchDiscardedOptional = Iterables.tryFind(entity.getTargetCatch(), TargetCatchs.newDiscardedPredicate(true)); entity.setTargetDiscarded(targetCatchDiscardedOptional.isPresent()); - Date lastUpdateDate = saveFollowedEntity(entity); - - return SaveResultDtos.of(entity.getTopiaId(), lastUpdateDate); + return saveEntity(entity); } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java index 8697d4d..0934319 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TargetSampleServiceTopia.java @@ -32,13 +32,11 @@ import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.result.SaveResultDtos; import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.TargetSampleDto; import org.apache.commons.lang3.BooleanUtils; import java.util.Collection; -import java.util.Date; import java.util.Set; /** @@ -132,9 +130,7 @@ public class TargetSampleServiceTopia extends ObserveServiceTopia implements Tar } - Date lastUpdateDate = saveFollowedEntity(setSeine, entity); - - return SaveResultDtos.of(setSeine.getTopiaId(), lastUpdateDate); + return saveEntity(setSeine, entity); } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationServiceTopia.java index 821e03f..8e29444 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TransmittingBuoyOperationServiceTopia.java @@ -27,11 +27,8 @@ import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.result.SaveResultDtos; import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; -import java.util.Date; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -57,12 +54,8 @@ public class TransmittingBuoyOperationServiceTopia extends ObserveServiceTopia i public SaveResultDto save(FloatingObjectTransmittingBuoyDto dto) { FloatingObject entity = loadOrCreateEntityAndCheckLastUpdate(dto); - copyDataDtoToEntity(dto, entity); - - Date lastUpdateDate = saveFollowedEntity(entity); - - return SaveResultDtos.of(entity.getTopiaId(), lastUpdateDate); + return saveEntity(entity); } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopia.java index 4fd50ae..0fd9082 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineGearUseServiceTopia.java @@ -27,11 +27,8 @@ import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.result.SaveResultDtos; import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; -import java.util.Date; - /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -55,16 +52,8 @@ public class TripSeineGearUseServiceTopia extends ObserveServiceTopia implements public SaveResultDto save(TripSeineGearUseDto dto) { TripSeine entity = loadOrCreateEntityAndCheckLastUpdate(dto); - copyDataDtoToEntity(dto, entity); - - Date lastUpdateDate = saveFollowedEntity(entity); - - //FIXME Quel est le lien avec les mises en oeuvre d'un engin, ne serait-ce qu'un jolie copier-coller -// TripSeineTopiaDao dao = getTopiaPersistenceContext().getTripSeineDao(); -// dao.updateEndDate(entity); - - return SaveResultDtos.of(entity.getTopiaId(), lastUpdateDate); + return saveEntity(entity); } } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java index 8649932..f7a3812 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java @@ -36,7 +36,6 @@ import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.result.SaveResultDto; -import fr.ird.observe.services.dto.result.SaveResultDtos; import fr.ird.observe.services.dto.seine.TripSeineDto; import org.nuiton.util.DateUtil; @@ -169,12 +168,12 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe copyDataDtoToEntity(dto, entity); - Date lastUpdateDate = saveFollowedEntity(entity); + SaveResultDto result = saveEntity(entity); TripSeineTopiaDao dao = getTopiaPersistenceContext().getTripSeineDao(); dao.updateEndDate(entity); - return SaveResultDtos.of(entity.getTopiaId(), lastUpdateDate); + return result; } @@ -191,7 +190,7 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe TripSeine tripSeine = loadEntity(TripSeineDto.class, tripSeineId); Program program = loadEntity(ProgramDto.class, programId); tripSeine.setProgram(program); - saveFollowedEntity(tripSeine); + saveEntity(tripSeine); getTopiaPersistenceContext().flush(); @@ -211,7 +210,7 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe TripSeine tripSeine = loadEntity(TripSeineDto.class, tripSeineId); tripSeine.setProgram(program); - saveFollowedEntity(tripSeine); + saveEntity(tripSeine); getTopiaPersistenceContext().flush(); result.add(getTripSeinePositionInProgram(programId, tripSeineId)); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.