[Observe-commits] 02/15: chargement des tripseine dans l'arbre (refs #7553)

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit f5228128f058c6a2707619c29a8d31322ab8ea91 Author: Kevin Morin <morin@codelutin.com> Date: Wed Sep 30 15:50:48 2015 +0200 chargement des tripseine dans l'arbre (refs #7553) --- .../observe/ObserveSwingApplicationContext.java | 7 +- .../java/fr/ird/observe/ui/DecoratorService.java | 145 +++++++++++---------- .../ird/observe/ui/tree/ProgramLonglineNode.java | 25 +++- .../java/fr/ird/observe/ui/tree/TripSeineNode.java | 28 ++++ .../tree/loadors/ProgramSeineNodeChildLoador.java | 14 +- .../v1/seine/TripSeineServiceController.java | 3 +- .../services/service/seine/TripSeineService.java | 3 +- .../service/seine/TripSeineServiceRestTest.java | 44 +++---- .../service/seine/TripSeineServiceTopia.java | 33 ++--- .../service/seine/TripSeineServiceTopiaTest.java | 29 ++--- 10 files changed, 188 insertions(+), 143 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java index 450870e..46518fc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java @@ -80,10 +80,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; -import javax.swing.ActionMap; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import java.awt.Component; +import javax.swing.*; +import java.awt.*; import java.io.File; import java.util.Arrays; import java.util.List; @@ -753,6 +751,7 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext { + " " + tripSeine.getPropertyValue(TripSeineStubDto.PROPERTY_START_DATE) + " - " + tripSeine.getPropertyValue(TripSeineStubDto.PROPERTY_END_DATE)); } + } else if (ProgramDtos.isProgramLongline(programDtoRef)) { ReferenceSetDto<TripLonglineStubDto> tripLonglines = tripLonglineService.getTripLonglineStubByProgram(programDtoRef.getId()); for (ReferenceDto tripLongline : tripLonglines.getReference()) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java index edcab67..95939d3 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/DecoratorService.java @@ -21,18 +21,11 @@ */ package fr.ird.observe.ui; -import fr.ird.observe.ui.util.decorator.LengthWeightParameterDecorator; -import fr.ird.observe.ui.util.decorator.NonTargetCatchDecorator; -import fr.ird.observe.ui.util.decorator.NonTargetLengthDecorator; -import fr.ird.observe.ui.util.decorator.ObjectObservedSpeciesDecorator; -import fr.ird.observe.ui.util.decorator.ReferenceDecorator; -import fr.ird.observe.ui.util.decorator.SpeciesDecorator; -import fr.ird.observe.ui.util.decorator.TripLonglineDecorator; -import fr.ird.observe.ui.util.decorator.TripSeineDecorator; import fr.ird.observe.business.gps.GPSPoint; import fr.ird.observe.business.gps.GPSPointInterval; import fr.ird.observe.entities.longline.SectionTemplate; import fr.ird.observe.services.dto.AbstractObserveDto; +import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.BasketDto; @@ -51,7 +44,6 @@ import fr.ird.observe.services.dto.referential.OceanDto; import fr.ird.observe.services.dto.referential.OrganismDto; import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.ProgramDto; -import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.dto.referential.SpeciesGroupDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; @@ -108,6 +100,15 @@ import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.TargetCatchDto; import fr.ird.observe.services.dto.seine.TargetLengthDto; import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; +import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.ui.util.decorator.LengthWeightParameterDecorator; +import fr.ird.observe.ui.util.decorator.NonTargetCatchDecorator; +import fr.ird.observe.ui.util.decorator.NonTargetLengthDecorator; +import fr.ird.observe.ui.util.decorator.ObjectObservedSpeciesDecorator; +import fr.ird.observe.ui.util.decorator.ReferenceDecorator; +import fr.ird.observe.ui.util.decorator.SpeciesDecorator; +import fr.ird.observe.ui.util.decorator.TripLonglineDecorator; +import fr.ird.observe.ui.util.decorator.TripSeineDecorator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; @@ -402,7 +403,7 @@ public class DecoratorService extends DecoratorProvider { registerJXPathDecorator(ProgramDto.class, t("observe.common.program") + " ${" + libelle + "}$s"); - registerReferentialDtoDecorator(ProgramDto.class, t("observe.common.program") + " ${label}$s"); + registerReferenceDtoDecorator(ProgramDto.class, t("observe.common.program") + " ${label}$s"); registerJXPathDecorator(RouteDto.class, "${date}$td/%1$tm/%1$tY"); registerMultiJXPathDecorator( @@ -414,19 +415,19 @@ public class DecoratorService extends DecoratorProvider { "${timeStamp}$td/%1$tm/%1$tY %1$tH:%1$tM##${vesselActivityLongline/" + libelle + "}$s", "##", " - "); registerMultiJXPathDecorator(PersonDto.class, "${lastName}$s##${firstName}$s", "##", " "); - registerDefaultReferentialDtoDecorator(SexDto.class, libelle); + registerDefaultReferenceDtoDecorator(SexDto.class, libelle); //FIXME Use startDate - endDate - registerDefaultReferentialDtoDecorator(FpaZoneDto.class, libelle); - registerDefaultReferentialDtoDecorator(OceanDto.class, libelle); - registerDefaultReferentialDtoDecorator(DetectionModeDto.class, libelle); - registerDefaultReferentialDtoDecorator(VesselDto.class, libelle); - registerDefaultReferentialDtoDecorator(CountryDto.class, libelle); - registerReferentialDtoDecorator(VesselSizeCategoryDto.class, "${code}$s##${gaugeLabel}$s##${capacityLabel}$s"); - registerDefaultReferentialDtoDecorator(VesselTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(VesselActivitySeineDto.class, libelle); - registerDefaultReferentialDtoDecorator(SurroundingActivityDto.class, libelle); - registerDefaultReferentialDtoDecorator(ObservedSystemDto.class, libelle); - registerReferentialDtoDecorator(WindDto.class, "${code}$s##${" + libelle + "}$s##${speedRange}$s"); + registerDefaultReferenceDtoDecorator(FpaZoneDto.class, libelle); + registerDefaultReferenceDtoDecorator(OceanDto.class, libelle); + registerDefaultReferenceDtoDecorator(DetectionModeDto.class, libelle); + registerDefaultReferenceDtoDecorator(VesselDto.class, libelle); + registerDefaultReferenceDtoDecorator(CountryDto.class, libelle); + registerReferenceDtoDecorator(VesselSizeCategoryDto.class, "${code}$s##${gaugeLabel}$s##${capacityLabel}$s"); + registerDefaultReferenceDtoDecorator(VesselTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(VesselActivitySeineDto.class, libelle); + registerDefaultReferenceDtoDecorator(SurroundingActivityDto.class, libelle); + registerDefaultReferenceDtoDecorator(ObservedSystemDto.class, libelle); + registerReferenceDtoDecorator(WindDto.class, "${code}$s##${" + libelle + "}$s##${speedRange}$s"); registerMultiJXPathDecorator( FloatingObjectDto.class, "DCP ${objectType/" + libelle + "}$s", "##", " - "); @@ -434,51 +435,51 @@ public class DecoratorService extends DecoratorProvider { registerJXPathDecorator(SetSeineDto.class, t("observe.common.setSeine")); //FIXME Remove this registerJXPathDecorator(SetLonglineDto.class, t("observe.common.setLongline")); - registerDefaultReferentialDtoDecorator(ObjectFateDto.class, libelle); - registerDefaultReferentialDtoDecorator(OrganismDto.class, libelle); - registerDefaultReferentialDtoDecorator(ObjectTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(ObjectOperationDto.class, libelle); - registerDefaultReferentialDtoDecorator(SpeciesStatusDto.class, libelle); - registerDefaultReferentialDtoDecorator(TransmittingBuoyTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(TransmittingBuoyOperationDto.class, libelle); - registerDefaultReferentialDtoDecorator(ReasonForNullSetDto.class, libelle); - registerDefaultReferentialDtoDecorator(ReasonForNoFishingDto.class, libelle); - registerDefaultReferentialDtoDecorator(WeightCategoryDto.class, libelle); - registerDefaultReferentialDtoDecorator(ReasonForDiscardDto.class, libelle); - registerDefaultReferentialDtoDecorator(SpeciesFateDto.class, libelle); - registerDefaultReferentialDtoDecorator(SpeciesGroupDto.class, libelle); - registerDefaultReferentialDtoDecorator(SpeciesListDto.class, libelle); - - registerDefaultReferentialDtoDecorator(BaitHaulingStatusDto.class, libelle); - registerDefaultReferentialDtoDecorator(BaitSettingStatusDto.class, libelle); - registerDefaultReferentialDtoDecorator(BaitTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(CatchFateLonglineDto.class, libelle); - registerDefaultReferentialDtoDecorator(EncounterTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(HealthnessDto.class, libelle); - registerDefaultReferentialDtoDecorator(HookPositionDto.class, libelle); - registerDefaultReferentialDtoDecorator(HookSizeDto.class, libelle); - registerDefaultReferentialDtoDecorator(HookTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(ItemVerticalPositionDto.class, libelle); - registerDefaultReferentialDtoDecorator(ItemHorizontalPositionDto.class, libelle); - registerDefaultReferentialDtoDecorator(LightsticksColorDto.class, libelle); - registerDefaultReferentialDtoDecorator(LightsticksTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(LineTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(MaturityStatusDto.class, libelle); - registerDefaultReferentialDtoDecorator(MitigationTypeDto.class, libelle); - registerReferentialDtoDecorator(SensorBrandDto.class, "${code}$s##${brandName}$s"); - registerDefaultReferentialDtoDecorator(SensorDataFormatDto.class, libelle); - registerDefaultReferentialDtoDecorator(SensorTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(SettingShapeDto.class, libelle); - registerDefaultReferentialDtoDecorator(SizeMeasureTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(StomacFullnessDto.class, libelle); - registerDefaultReferentialDtoDecorator(TripTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(VesselActivityLonglineDto.class, libelle); - registerDefaultReferentialDtoDecorator(WeightMeasureTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(GearCaracteristicTypeDto.class, libelle); - registerDefaultReferentialDtoDecorator(GearCaracteristicDto.class, libelle); - registerDefaultReferentialDtoDecorator(GearDto.class, libelle); - - registerReferentialDtoDecorator(HarbourDto.class, "${code}$s##${name}$s##${locode}$s"); + registerDefaultReferenceDtoDecorator(ObjectFateDto.class, libelle); + registerDefaultReferenceDtoDecorator(OrganismDto.class, libelle); + registerDefaultReferenceDtoDecorator(ObjectTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(ObjectOperationDto.class, libelle); + registerDefaultReferenceDtoDecorator(SpeciesStatusDto.class, libelle); + registerDefaultReferenceDtoDecorator(TransmittingBuoyTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(TransmittingBuoyOperationDto.class, libelle); + registerDefaultReferenceDtoDecorator(ReasonForNullSetDto.class, libelle); + registerDefaultReferenceDtoDecorator(ReasonForNoFishingDto.class, libelle); + registerDefaultReferenceDtoDecorator(WeightCategoryDto.class, libelle); + registerDefaultReferenceDtoDecorator(ReasonForDiscardDto.class, libelle); + registerDefaultReferenceDtoDecorator(SpeciesFateDto.class, libelle); + registerDefaultReferenceDtoDecorator(SpeciesGroupDto.class, libelle); + registerDefaultReferenceDtoDecorator(SpeciesListDto.class, libelle); + + registerDefaultReferenceDtoDecorator(BaitHaulingStatusDto.class, libelle); + registerDefaultReferenceDtoDecorator(BaitSettingStatusDto.class, libelle); + registerDefaultReferenceDtoDecorator(BaitTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(CatchFateLonglineDto.class, libelle); + registerDefaultReferenceDtoDecorator(EncounterTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(HealthnessDto.class, libelle); + registerDefaultReferenceDtoDecorator(HookPositionDto.class, libelle); + registerDefaultReferenceDtoDecorator(HookSizeDto.class, libelle); + registerDefaultReferenceDtoDecorator(HookTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(ItemVerticalPositionDto.class, libelle); + registerDefaultReferenceDtoDecorator(ItemHorizontalPositionDto.class, libelle); + registerDefaultReferenceDtoDecorator(LightsticksColorDto.class, libelle); + registerDefaultReferenceDtoDecorator(LightsticksTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(LineTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(MaturityStatusDto.class, libelle); + registerDefaultReferenceDtoDecorator(MitigationTypeDto.class, libelle); + registerReferenceDtoDecorator(SensorBrandDto.class, "${code}$s##${brandName}$s"); + registerDefaultReferenceDtoDecorator(SensorDataFormatDto.class, libelle); + registerDefaultReferenceDtoDecorator(SensorTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(SettingShapeDto.class, libelle); + registerDefaultReferenceDtoDecorator(SizeMeasureTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(StomacFullnessDto.class, libelle); + registerDefaultReferenceDtoDecorator(TripTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(VesselActivityLonglineDto.class, libelle); + registerDefaultReferenceDtoDecorator(WeightMeasureTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(GearCaracteristicTypeDto.class, libelle); + registerDefaultReferenceDtoDecorator(GearCaracteristicDto.class, libelle); + registerDefaultReferenceDtoDecorator(GearDto.class, libelle); + + registerReferenceDtoDecorator(HarbourDto.class, "${code}$s##${name}$s##${locode}$s"); registerMultiJXPathDecorator( ObjectSchoolEstimateDto.class, @@ -520,6 +521,10 @@ public class DecoratorService extends DecoratorProvider { // TripSeine decorator registerDecorator(new TripSeineDecorator(libelle)); + registerReferenceDtoDecorator(TripSeineDto.class, + "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vessel/" + + libelle + "}$s##${observerLabel}$s"); + // TripLongline decorator registerDecorator(new TripLonglineDecorator(libelle)); @@ -562,11 +567,11 @@ public class DecoratorService extends DecoratorProvider { } - protected <T extends ReferentialDto> void registerDefaultReferentialDtoDecorator(Class<T> referenceType, String libelle) { - registerReferentialDtoDecorator(referenceType, "${code}$s##${" + libelle + "}$s"); + protected <T extends IdDto> void registerDefaultReferenceDtoDecorator(Class<T> referenceType, String libelle) { + registerReferenceDtoDecorator(referenceType, "${code}$s##${" + libelle + "}$s"); } - protected <T extends ReferentialDto> void registerReferentialDtoDecorator(Class<T> referenceType, String expression) { + protected <T extends IdDto> void registerReferenceDtoDecorator(Class<T> referenceType, String expression) { registerDecorator(referenceType.getSimpleName(), new ReferenceDecorator(expression)); } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java index 3ee6500..7bd5c7d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java @@ -22,9 +22,15 @@ package fr.ird.observe.ui.tree; * #L% */ +import com.google.common.collect.Lists; +import fr.ird.observe.ObserveSwingApplicationContext; +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.constants.GearType; import fr.ird.observe.services.dto.referential.ProgramDto; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; +import fr.ird.observe.services.service.ReferentialService; import fr.ird.observe.ui.tree.loadors.ProgramLonglineNodeChildLoador; /** @@ -45,10 +51,19 @@ public class ProgramLonglineNode extends DtoNodeSupport<ProgramDto> { setEntity(entity); } - //FIXME -// @Override -// protected Program getEntity(DataService dataService, DataSource source) throws DataSourceException { -// return dataService.getProgramStub(source, id); -// } + @Override + protected ReferenceDto<ProgramDto> fetchEntity() { + FormDto<ProgramDto> formDto = ObserveSwingApplicationContext.get().newService(ReferentialService.class).loadToRead(ProgramDto.class, id); + ReferenceDto<ProgramDto> referenceDto = + ReferenceDtos.newReferenceDto(ProgramDto.class, Lists.newArrayList(ProgramDto.PROPERTY_ID, + ProgramDto.PROPERTY_CODE, + ProgramDto.PROPERTY_GEAR_TYPE, + ReferentialReferenceDto.PROPERTY_LABEL)); + referenceDto.setPropertyValue(ProgramDto.PROPERTY_ID, formDto.getForm().getId()); + referenceDto.setPropertyValue(ProgramDto.PROPERTY_CODE, formDto.getForm().getCode()); + referenceDto.setPropertyValue(ProgramDto.PROPERTY_GEAR_TYPE, formDto.getForm().getGearType()); + referenceDto.setPropertyValue(ReferentialReferenceDto.PROPERTY_LABEL, formDto.getForm().getLabel2()); + return referenceDto; + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java index 0a508af..ff3e2f7 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java @@ -22,8 +22,13 @@ package fr.ird.observe.ui.tree; * #L% */ +import com.google.common.collect.Lists; +import fr.ird.observe.ObserveSwingApplicationContext; +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.seine.TripSeineDto; +import fr.ird.observe.services.service.seine.TripSeineService; /** * Created on 4/9/15. @@ -44,4 +49,27 @@ public class TripSeineNode extends DtoNodeSupport<TripSeineDto> { // return dataService.getTripSeineStub(source, id); // } + + @Override + protected ReferenceDto<TripSeineDto> fetchEntity() { + TripSeineService tripSeineService = ObserveSwingApplicationContext.get().newService(TripSeineService.class); + FormDto<TripSeineDto> formDto = tripSeineService.loadToRead(entity.getId()); + +// "${startDate}$td/%1$tm/%1$tY##${endDate}$td/%2$tm/%2$tY##${vessel/" +// + libelle + "}$s##${observerLabel}$s" + + ReferenceDto<TripSeineDto> referenceDto = + ReferenceDtos.newReferenceDto(TripSeineDto.class, Lists.newArrayList(TripSeineDto.PROPERTY_ID, + TripSeineDto.PROPERTY_START_DATE, + TripSeineDto.PROPERTY_END_DATE, + TripSeineDto.PROPERTY_VESSEL, + TripSeineDto.PROPERTY_OBSERVER)); + referenceDto.setPropertyValue(TripSeineDto.PROPERTY_ID, formDto.getForm().getId()); + referenceDto.setPropertyValue(TripSeineDto.PROPERTY_START_DATE, formDto.getForm().getStartDate()); + referenceDto.setPropertyValue(TripSeineDto.PROPERTY_END_DATE, formDto.getForm().getEndDate()); + referenceDto.setPropertyValue(TripSeineDto.PROPERTY_VESSEL, formDto.getForm().getVessel()); + referenceDto.setPropertyValue(TripSeineDto.PROPERTY_OBSERVER, formDto.getForm().getObserver()); + + return referenceDto; + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java index a9190c1..8f3f563 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/tree/loadors/ProgramSeineNodeChildLoador.java @@ -21,14 +21,19 @@ */ package fr.ird.observe.ui.tree.loadors; +import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.db.ObserveSwingDataSource; 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.seine.TripSeineDto; +import fr.ird.observe.services.service.seine.TripSeineService; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.TripSeineNode; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.tree.NavTreeBridge; +import java.util.ArrayList; import java.util.List; import static org.nuiton.i18n.I18n.n; @@ -79,8 +84,6 @@ public class ProgramSeineNodeChildLoador extends AbstractNodeChildLoador<TripSei // DataService service = getDataService(); // DataSelectionModel selectionModel = getSelectionModel(dataProvider); - List<TripSeineDto> result; - //FIXME // if (selectionModel != null) { // result = new ArrayList<TripSeine>(); @@ -93,11 +96,14 @@ public class ProgramSeineNodeChildLoador extends AbstractNodeChildLoador<TripSei // } else { // // result = service.getTripSeineStubByProgram(dataSource, parentId); -// + // } // return result; - return null; + TripSeineService tripSeineService = ObserveSwingApplicationContext.get().newService(TripSeineService.class); + ReferenceSetDto<TripSeineDto> tripSeineByProgram = tripSeineService.getTripSeineByProgram(parentId); + + return new ArrayList<>(ReferenceDtos.castToCollectionOfReferenceDto(tripSeineByProgram.getReference())); } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java index 29a4387..b11b6a7 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java @@ -27,7 +27,6 @@ import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.dto.seine.TripSeineStubDto; import fr.ird.observe.services.service.seine.TripSeineService; /** @@ -40,7 +39,7 @@ public class TripSeineServiceController extends ObserveAuthenticatedServiceContr } @Override - public ReferenceSetDto<TripSeineStubDto> getTripSeineByProgram(String programId) { + public ReferenceSetDto<TripSeineDto> getTripSeineByProgram(String programId) { return service.getTripSeineByProgram(programId); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java index 7837185..6a01421 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java @@ -27,7 +27,6 @@ import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.dto.seine.TripSeineStubDto; import fr.ird.observe.services.spi.DeleteRequest; import fr.ird.observe.services.spi.PostRequest; import fr.ird.observe.services.spi.ReadDataPermission; @@ -40,7 +39,7 @@ import fr.ird.observe.services.spi.WriteDataPermission; public interface TripSeineService extends ObserveService { @ReadDataPermission - ReferenceSetDto<TripSeineStubDto> getTripSeineByProgram(String programId); + ReferenceSetDto<TripSeineDto> getTripSeineByProgram(String programId); @ReadDataPermission TripMapDto getTripSeineMap(String tripSeineId); diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceRestTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceRestTest.java index b5a246e..0b01c17 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceRestTest.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceRestTest.java @@ -27,6 +27,7 @@ import com.google.common.collect.Iterables; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDtos; 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.HarbourDto; @@ -35,7 +36,6 @@ import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.dto.seine.TripSeineStubDto; import fr.ird.observe.services.service.AbstractServiceRestTest; import org.junit.Assert; import org.junit.Ignore; @@ -63,38 +63,38 @@ public class TripSeineServiceRestTest extends AbstractServiceRestTest{ @Test public void getTripSeineByProgramTest() { - ReferenceSetDto<TripSeineStubDto> stubDtos = service.getTripSeineByProgram(PROGRAM_ID); + ReferenceSetDto<TripSeineDto> stubDtos = service.getTripSeineByProgram(PROGRAM_ID); Assert.assertNotNull(stubDtos); Assert.assertEquals(135, stubDtos.sizeReference()); - LinkedHashSet<ReferenceDto> referenceDtos = stubDtos.getReference(); - ReferenceDto tripSeineStub1Dto = Iterables.find(referenceDtos, IdDtos.newIdPredicate(TRIP_SEINE_ID_1)); + ReferenceDto<TripSeineDto> tripSeineStub1Dto = Iterables.find(stubDtos.getReference(), + ReferenceDtos.newIdPredicate(TRIP_SEINE_ID_1)); Assert.assertEquals(TRIP_SEINE_ID_1, tripSeineStub1Dto.getId()); - Assert.assertEquals(DateUtil.createDate(25, 1, 2013), tripSeineStub1Dto.getPropertyValue(TripSeineStubDto.PROPERTY_START_DATE)); - Assert.assertEquals(DateUtil.createDate(27, 2, 2013), tripSeineStub1Dto.getPropertyValue(TripSeineStubDto.PROPERTY_END_DATE)); - Assert.assertEquals("BERNICA", tripSeineStub1Dto.getPropertyValue(TripSeineStubDto.PROPERTY_VESSEL_LABEL)); - Assert.assertEquals("Varenne Fanchon", tripSeineStub1Dto.getPropertyValue(TripSeineStubDto.PROPERTY_OBSERVER_LABEL)); + Assert.assertEquals(DateUtil.createDate(25, 1, 2013), tripSeineStub1Dto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE)); + Assert.assertEquals(DateUtil.createDate(27, 2, 2013), tripSeineStub1Dto.getPropertyValue(TripSeineDto.PROPERTY_END_DATE)); + Assert.assertEquals("BERNICA", tripSeineStub1Dto.getPropertyValue(TripSeineDto.PROPERTY_VESSEL)); + Assert.assertEquals("Varenne Fanchon", tripSeineStub1Dto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); + ReferenceDto<TripSeineDto> tripSeineStub2Dto = Iterables.find(stubDtos.getReference(), + ReferenceDtos.newIdPredicate(TRIP_SEINE_ID_2)); - ReferenceDto tripSeineStu2Dto = Iterables.find(referenceDtos, IdDtos.newIdPredicate(TRIP_SEINE_ID_2)); + Assert.assertEquals(TRIP_SEINE_ID_2, tripSeineStub2Dto.getId()); + Assert.assertEquals(DateUtil.createDate(26, 1, 2013), tripSeineStub2Dto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE)); + Assert.assertEquals(DateUtil.createDate(12, 3, 2013), tripSeineStub2Dto.getPropertyValue(TripSeineDto.PROPERTY_END_DATE)); + Assert.assertEquals("VIA EUROS", tripSeineStub2Dto.getPropertyValue(TripSeineDto.PROPERTY_VESSEL)); + Assert.assertEquals("Protat Martin", tripSeineStub2Dto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); - Assert.assertEquals(TRIP_SEINE_ID_2, tripSeineStu2Dto.getId()); - Assert.assertEquals(DateUtil.createDate(26, 1, 2013), tripSeineStu2Dto.getPropertyValue(TripSeineStubDto.PROPERTY_START_DATE)); - Assert.assertEquals(DateUtil.createDate(12, 3, 2013), tripSeineStu2Dto.getPropertyValue(TripSeineStubDto.PROPERTY_END_DATE)); - Assert.assertEquals("VIA EUROS", tripSeineStu2Dto.getPropertyValue(TripSeineStubDto.PROPERTY_VESSEL_LABEL)); - Assert.assertEquals("Protat Martin", tripSeineStu2Dto.getPropertyValue(TripSeineStubDto.PROPERTY_OBSERVER_LABEL)); - - - ReferenceDto tripSeineStub3Dto = Iterables.find(referenceDtos, IdDtos.newIdPredicate(TRIP_SEINE_ID_3)); + ReferenceDto<TripSeineDto> tripSeineStub3Dto = Iterables.find(stubDtos.getReference(), + ReferenceDtos.newIdPredicate(TRIP_SEINE_ID_3)); Assert.assertEquals(TRIP_SEINE_ID_3, tripSeineStub3Dto.getId()); - Assert.assertEquals(DateUtil.createDate(1, 2, 2013), tripSeineStub3Dto.getPropertyValue(TripSeineStubDto.PROPERTY_START_DATE)); - Assert.assertEquals(DateUtil.createDate(17, 3, 2013), tripSeineStub3Dto.getPropertyValue(TripSeineStubDto.PROPERTY_END_DATE)); - Assert.assertEquals("GUERIDEN", tripSeineStub3Dto.getPropertyValue(TripSeineStubDto.PROPERTY_VESSEL_LABEL)); - Assert.assertEquals("Le Bourdonnec Pierre", tripSeineStub3Dto.getPropertyValue(TripSeineStubDto.PROPERTY_OBSERVER_LABEL)); + Assert.assertEquals(DateUtil.createDate(1, 2, 2013), tripSeineStub3Dto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE)); + Assert.assertEquals(DateUtil.createDate(17, 3, 2013), tripSeineStub3Dto.getPropertyValue(TripSeineDto.PROPERTY_END_DATE)); + Assert.assertEquals("GUERIDEN", tripSeineStub3Dto.getPropertyValue(TripSeineDto.PROPERTY_VESSEL)); + Assert.assertEquals("Le Bourdonnec Pierre", tripSeineStub3Dto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); } @@ -286,7 +286,7 @@ public class TripSeineServiceRestTest extends AbstractServiceRestTest{ service.delete(TRIP_SEINE_ID_1); - ReferenceSetDto<TripSeineStubDto> tripSeineByProgram = service.getTripSeineByProgram(PROGRAM_ID); + ReferenceSetDto<TripSeineDto> tripSeineByProgram = service.getTripSeineByProgram(PROGRAM_ID); Assert.assertEquals(2, tripSeineByProgram.sizeReference()); 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 48f02c9..c8fe1f3 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 @@ -39,7 +39,6 @@ import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.TripMapPointDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.dto.seine.TripSeineStubDto; import org.nuiton.util.DateUtil; import java.util.Collections; @@ -57,7 +56,7 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe } @Override - public ReferenceSetDto<TripSeineStubDto> getTripSeineByProgram(String programId) { + public ReferenceSetDto<TripSeineDto> getTripSeineByProgram(String programId) { ReferenceLocale referenceLocale = getReferenceLocale(); @@ -66,32 +65,28 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe List<TripSeine> tripSeines = getDao().findAllStubByProgramId(programId, referenceLocale); - LinkedHashSet<ReferenceDto<TripSeineStubDto>> stubs = Sets.newLinkedHashSet(); + LinkedHashSet<ReferenceDto<TripSeineDto>> stubs = Sets.newLinkedHashSet(); for (TripSeine tripSeine : tripSeines) { - 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)); - + ReferenceDto<TripSeineDto> stub = ReferenceDtos.newReferenceDto(TripSeineDto.class, + Lists.newArrayList(TripSeineDto.PROPERTY_ID, + TripSeineDto.PROPERTY_START_DATE, + TripSeineDto.PROPERTY_END_DATE, + TripSeineDto.PROPERTY_VESSEL, + TripSeineDto.PROPERTY_OBSERVER)); 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()); + stub.setPropertyValue(TripSeineDto.PROPERTY_START_DATE, tripSeine.getStartDate()); + stub.setPropertyValue(TripSeineDto.PROPERTY_END_DATE, tripSeine.getEndDate()); + stub.setPropertyValue(TripSeineDto.PROPERTY_VESSEL, referenceLocale.getLabel(tripSeine.getVessel())); + stub.setPropertyValue(TripSeineDto.PROPERTY_OBSERVER, tripSeine.getObserverLabel()); stubs.add(stub); } - Optional<Date> lastUpdateOptional = getLastUpdate(TripSeine.class); - ReferenceSetDto<TripSeineStubDto> stubReferences = - ReferenceSetDtos.newReferenceSetDto(TripSeineStubDto.class, stubs, lastUpdateOptional.orNull()); - - return stubReferences; + ReferenceSetDto<TripSeineDto> result = ReferenceSetDtos.newReferenceSetDto(TripSeineDto.class, stubs, null); + return result; } @Override diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java index 3d597b3..7fec8b0 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java @@ -36,7 +36,6 @@ import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.seine.TripSeineDto; -import fr.ird.observe.services.dto.seine.TripSeineStubDto; import fr.ird.observe.services.service.AbstractServiceTopiaTest; import fr.ird.observe.services.service.ConcurrentModificationException; import fr.ird.observe.services.service.ReferentialService; @@ -84,7 +83,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { @Test public void getTripSeineByProgramTest() { - ReferenceSetDto<TripSeineStubDto> stubDtos = service.getTripSeineByProgram(PROGRAM_ID); + ReferenceSetDto<TripSeineDto> stubDtos = service.getTripSeineByProgram(PROGRAM_ID); Assert.assertNotNull(stubDtos); @@ -94,28 +93,28 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID_1); Assert.assertEquals(tripSeine.getTopiaId(), tripSeineStubDto.getId()); - Assert.assertEquals(0, tripSeine.getStartDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_START_DATE))); - Assert.assertEquals(0, tripSeine.getEndDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_END_DATE))); - Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_VESSEL_LABEL)); - Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_OBSERVER_LABEL)); + Assert.assertEquals(0, tripSeine.getStartDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE))); + Assert.assertEquals(0, tripSeine.getEndDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_END_DATE))); + Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_VESSEL)); + Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); tripSeineStubDto = stubDtos.getReference(1); tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID_2); Assert.assertEquals(tripSeine.getTopiaId(), tripSeineStubDto.getId()); - Assert.assertEquals(0, tripSeine.getStartDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_START_DATE))); - Assert.assertEquals(0, tripSeine.getEndDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_END_DATE))); - Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_VESSEL_LABEL)); - Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_OBSERVER_LABEL)); + Assert.assertEquals(0, tripSeine.getStartDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE))); + Assert.assertEquals(0, tripSeine.getEndDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_END_DATE))); + Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_VESSEL)); + Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); tripSeineStubDto = stubDtos.getReference(2); tripSeine = dataSourceResource.findById(TripSeine.class, TRIP_SEINE_ID_3); Assert.assertEquals(tripSeine.getTopiaId(), tripSeineStubDto.getId()); - Assert.assertEquals(0, tripSeine.getStartDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_START_DATE))); - Assert.assertEquals(0, tripSeine.getEndDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_END_DATE))); - Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_VESSEL_LABEL)); - Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getPropertyValue(TripSeineStubDto.PROPERTY_OBSERVER_LABEL)); + Assert.assertEquals(0, tripSeine.getStartDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE))); + Assert.assertEquals(0, tripSeine.getEndDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_END_DATE))); + Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_VESSEL)); + Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); } @@ -392,7 +391,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { service.delete(TRIP_SEINE_ID_1); - ReferenceSetDto<TripSeineStubDto> tripSeineByProgram = service.getTripSeineByProgram(PROGRAM_ID); + ReferenceSetDto<TripSeineDto> tripSeineByProgram = service.getTripSeineByProgram(PROGRAM_ID); Assert.assertEquals(2, tripSeineByProgram.sizeReference()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.