This is an automated email from the git hooks/post-receive script. New commit to branch feature/7531 in repository observe. See http://git.codelutin.com/observe.git commit 4bdd03de068edfbd15e76a527823734abf075a0b Author: Kevin Morin <morin@codelutin.com> Date: Tue Sep 29 11:08:43 2015 +0200 fix des services pour recuperer les stubsdto (refs #7531) --- .../longline/ActivityLonglineServiceTopia.java | 16 +++++++++++++++- .../service/longline/TripLonglineServiceTopia.java | 16 +++++++++++++++- .../service/seine/ActivitySeineServiceTopia.java | 20 ++++++++++++++++++-- .../services/service/seine/RouteServiceTopia.java | 10 ++++++++-- .../service/seine/TripSeineServiceTopia.java | 16 +++++++++++++++- 5 files changed, 71 insertions(+), 7 deletions(-) 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 a2291e9..25776a3 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 @@ -24,6 +24,7 @@ package fr.ird.observe.services.service.longline; import com.google.common.base.Optional; import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.longline.ActivityLongline; @@ -33,6 +34,7 @@ import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; @@ -62,7 +64,19 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements for (ActivityLongline activityLongline : tripLongline.getActivityLongline()) { - ReferenceDto<ActivityLonglineStubDto> stub = entityToReferenceDto(ActivityLonglineStubDto.class, activityLongline); + ReferenceDto<ActivityLonglineStubDto> stub = + ReferenceDtos.newReferenceDto(ActivityLonglineStubDto.class, + Lists.newArrayList(ActivityLonglineStubDto.PROPERTY_TIME_STAMP, + ActivityLonglineStubDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE_LABEL, + ActivityLonglineStubDto.PROPERTY_HAS_SET_LONGLINE)); + + stub.setId(activityLongline.getTopiaId()); + stub.setPropertyValue(ActivityLonglineStubDto.PROPERTY_TIME_STAMP, activityLongline.getTimeStamp()); + stub.setPropertyValue(ActivityLonglineStubDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE_LABEL, + referenceLocale.getLabel(activityLongline.getVesselActivityLongline())); + stub.setPropertyValue(ActivityLonglineStubDto.PROPERTY_HAS_SET_LONGLINE, + activityLongline.getSetLongline() != null); + stubs.add(stub); } 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 50a70f8..10a2e0f 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 @@ -23,6 +23,7 @@ package fr.ird.observe.services.service.longline; */ import com.google.common.base.Optional; +import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.longline.TripLongline; @@ -31,6 +32,7 @@ import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.longline.TripLonglineDto; @@ -63,7 +65,19 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri for (TripLongline tripLongline : tripLonglines) { - ReferenceDto<TripLonglineStubDto> stub = entityToReferenceDto(TripLonglineStubDto.class, tripLongline); + ReferenceDto<TripLonglineStubDto> stub = + ReferenceDtos.newReferenceDto(TripLonglineStubDto.class, + Lists.newArrayList(TripLonglineStubDto.PROPERTY_START_DATE, + TripLonglineStubDto.PROPERTY_END_DATE, + TripLonglineStubDto.PROPERTY_VESSEL_LABEL, + TripLonglineStubDto.PROPERTY_OBSERVER_LABEL)); + + stub.setId(tripLongline.getTopiaId()); + stub.setPropertyValue(TripLonglineStubDto.PROPERTY_START_DATE, tripLongline.getStartDate()); + stub.setPropertyValue(TripLonglineStubDto.PROPERTY_END_DATE, tripLongline.getEndDate()); + stub.setPropertyValue(TripLonglineStubDto.PROPERTY_VESSEL_LABEL, referenceLocale.getLabel(tripLongline.getVessel())); + stub.setPropertyValue(TripLonglineStubDto.PROPERTY_OBSERVER_LABEL, tripLongline.getObserverLabel()); + stubs.add(stub); } 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 9e730e8..9f45ff4 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 @@ -24,13 +24,16 @@ package fr.ird.observe.services.service.seine; import com.google.common.base.Optional; import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.referentiel.FpaZone; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.Route; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.seine.ActivitySeineDto; @@ -54,13 +57,26 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac Route route = loadEntity(RouteDto.class, Route.class, routeId); + ReferenceLocale referenceLocale = getReferenceLocale(); + LinkedHashSet<ReferenceDto<ActivitySeineStubDto>> stubs = Sets.newLinkedHashSet(); for (ActivitySeine activitySeine : route.getActivitySeine()) { - ReferenceDto<ActivitySeineStubDto> stub = entityToReferenceDto(ActivitySeineStubDto.class, activitySeine); - stubs.add(stub); + ReferenceDto<ActivitySeineStubDto> stub = + ReferenceDtos.newReferenceDto(ActivitySeineStubDto.class, + Lists.newArrayList(ActivitySeineStubDto.PROPERTY_TIME, + ActivitySeineStubDto.PROPERTY_VESSEL_ACTIVITY_SEINE_LABEL, + ActivitySeineStubDto.PROPERTY_HAS_SET_SEINE)); + stub.setId(activitySeine.getTopiaId()); + stub.setPropertyValue(ActivitySeineStubDto.PROPERTY_TIME, activitySeine.getTime()); + stub.setPropertyValue(ActivitySeineStubDto.PROPERTY_VESSEL_ACTIVITY_SEINE_LABEL, + referenceLocale.getLabel(activitySeine.getVesselActivitySeine())); + stub.setPropertyValue(ActivitySeineStubDto.PROPERTY_HAS_SET_SEINE, + activitySeine.getSetSeine() != null); + + stubs.add(stub); } Optional<Date> lastUpdateOptional = getLastUpdate(ActivitySeine.class); 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 d80de13..49e7bf6 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 @@ -24,6 +24,7 @@ package fr.ird.observe.services.service.seine; import com.google.common.base.Optional; import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.Route; @@ -33,6 +34,7 @@ import fr.ird.observe.entities.seine.TripSeineTopiaDao; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; @@ -60,9 +62,13 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi for (Route route : tripSeine.getRoute()) { - ReferenceDto<RouteStubDto> stub = entityToReferenceDto(RouteStubDto.class, route); - stubs.add(stub); + ReferenceDto<RouteStubDto> stub = ReferenceDtos.newReferenceDto(RouteStubDto.class, + Lists.newArrayList(RouteStubDto.PROPERTY_DATE)); + + stub.setId(route.getTopiaId()); + stub.setPropertyValue(RouteStubDto.PROPERTY_DATE, route.getDate()); + stubs.add(stub); } Optional<Date> lastUpdateOptional = getLastUpdate(ActivitySeine.class); 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 41c8980..0a7f6cf 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 @@ -23,6 +23,7 @@ package fr.ird.observe.services.service.seine; */ import com.google.common.base.Optional; +import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.referentiel.Program; @@ -31,6 +32,7 @@ import fr.ird.observe.entities.seine.TripSeineTopiaDao; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; +import fr.ird.observe.services.dto.ReferenceDtos; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.referential.ProgramDto; @@ -66,7 +68,19 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe for (TripSeine tripSeine : tripSeines) { - ReferenceDto<TripSeineStubDto> stub = entityToReferenceDto(TripSeineStubDto.class, tripSeine); + ReferenceDto<TripSeineStubDto> stub = + ReferenceDtos.newReferenceDto(TripSeineStubDto.class, + Lists.newArrayList(TripSeineStubDto.PROPERTY_START_DATE, + TripSeineStubDto.PROPERTY_END_DATE, + TripSeineStubDto.PROPERTY_VESSEL_LABEL, + TripSeineStubDto.PROPERTY_OBSERVER_LABEL)); + + stub.setId(tripSeine.getTopiaId()); + stub.setPropertyValue(TripSeineStubDto.PROPERTY_START_DATE, tripSeine.getStartDate()); + stub.setPropertyValue(TripSeineStubDto.PROPERTY_END_DATE, tripSeine.getEndDate()); + stub.setPropertyValue(TripSeineStubDto.PROPERTY_VESSEL_LABEL, referenceLocale.getLabel(tripSeine.getVessel())); + stub.setPropertyValue(TripSeineStubDto.PROPERTY_OBSERVER_LABEL, tripSeine.getObserverLabel()); + stubs.add(stub); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.