This is an automated email from the git hooks/post-receive script. New commit to branch feature/7595_deux_activites_peuvent_avoir_la_meme_heure in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit ad2b05f70da9b999650189623c982356d46a1049 Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Wed Jul 13 19:07:53 2016 +0200 Corrige le controle de validation concernant les heures d'observation des activités senne refs #7595 --- .../services/dto/seine/ActivitySeineStubDto.java | 14 ++++++++++++++ .../fr/ird/observe/services/dto/seine/RouteDto.java | 18 +++++++++++------- .../binder/data/ActivitySeineStubDtoBinder.java | 2 +- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineStubDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineStubDto.java new file mode 100644 index 0000000..6190b3a --- /dev/null +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/ActivitySeineStubDto.java @@ -0,0 +1,14 @@ +package fr.ird.observe.services.dto.seine; + +import org.nuiton.util.DateUtil; + +import java.util.Date; + +public class ActivitySeineStubDto extends AbstractActivitySeineStubDto { + + private static final long serialVersionUID = 4062867418771566898L; + + public Date getTimeSecond() { + return DateUtil.getTime(time, false, false); + } +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/RouteDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/RouteDto.java index 095f342..daaa0f4 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/RouteDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/RouteDto.java @@ -1,13 +1,13 @@ package fr.ird.observe.services.dto.seine; -import com.google.common.base.Optional; -import com.google.common.base.Predicates; import com.google.common.collect.Iterables; import fr.ird.observe.services.dto.IdDtos; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.DateUtil; import java.util.Date; +import java.util.Objects; public class RouteDto extends AbstractRouteDto { @@ -24,11 +24,15 @@ public class RouteDto extends AbstractRouteDto { } public boolean isTimeAvailable(String activitySeineId, Date time) { - Optional<ActivitySeineStubDto> optional = Iterables.tryFind(getActivitySeine(), - Predicates.and(ActivitySeineStubDtos.newTimePredicate(time), - Predicates.not(IdDtos.newIdPredicate(activitySeineId)))); - - return ! optional.isPresent(); + final Date $tmp = DateUtil.getTime(time, false, false); + + return ! getActivitySeine() + .stream() + .filter(activity -> + Objects.equals($tmp, activity.getTimeSecond()) && + ! Objects.equals(activitySeineId, activity.getId())) + .findAny() + .isPresent(); } public ActivitySeineStubDto getPreviousActivity(String activitySeineId) { diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineStubDtoBinder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineStubDtoBinder.java index 94ebb92..10e4a46 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineStubDtoBinder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/binder/data/ActivitySeineStubDtoBinder.java @@ -26,7 +26,7 @@ public class ActivitySeineStubDtoBinder extends DataBinderSupport<ActivitySeine, copyEntityDataFieldsToDto(entity, dto); dto.setTime(entity.getTime()); - dto.setTime(entity.getLastUpdateDate()); + dto.setLastUpdateDate(entity.getLastUpdateDate()); dto.setLatitude(entity.getLatitude()); dto.setLongitude(entity.getLongitude()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.