This is an automated email from the git hooks/post-receive script. New commit to branch feature/refactor_reference in repository observe. See http://git.codelutin.com/observe.git commit a89286eb4960047b105e0a9683c41b229aa2001e Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 21 08:25:58 2015 +0100 Utilisation des requetes dans les formulaires (en fait juste passé le nom de la requete) et ne plus calculer les labels dans le formulaire --- .../ird/observe/services/ObserveServiceTopia.java | 94 +++++----------------- .../services/builder/EntityToDtoBuilder.java | 6 +- .../services/service/ReferentialServiceTopia.java | 10 +-- .../ActivityLongLineEncouterServiceTopia.java | 23 +----- .../ActivityLongLineSensorUsedServiceTopia.java | 29 ++----- .../longline/ActivityLonglineServiceTopia.java | 24 ++---- .../service/longline/BranchlineServiceTopia.java | 37 ++------- .../longline/SetLonglineCatchServiceTopia.java | 50 +----------- .../SetLonglineDetailCompositionServiceTopia.java | 32 +------- .../SetLonglineGlobalCompositionServiceTopia.java | 42 ++-------- .../service/longline/SetLonglineServiceTopia.java | 42 +++++----- .../services/service/longline/TdrServiceTopia.java | 35 ++------ .../longline/TripLonglineGearUseServiceTopia.java | 22 +---- .../service/longline/TripLonglineServiceTopia.java | 39 ++++----- .../ActivitySeineObservedSystemServiceTopia.java | 19 +---- .../service/seine/ActivitySeineServiceTopia.java | 25 ++---- .../service/seine/FloatingObjectServiceTopia.java | 23 +++--- .../service/seine/NonTargetCatchServiceTopia.java | 26 ++---- .../service/seine/NonTargetSampleServiceTopia.java | 29 ++----- .../seine/ObjectObservedSpeciesServiceTopia.java | 26 +----- .../seine/ObjectSchoolEstimateServiceTopia.java | 17 +--- .../services/service/seine/RouteServiceTopia.java | 18 +---- .../service/seine/SchoolEstimateServiceTopia.java | 23 ++---- .../service/seine/SetSeineServiceTopia.java | 23 +++--- .../service/seine/TargetCatchServiceTopia.java | 42 ++-------- .../service/seine/TargetSampleServiceTopia.java | 19 +---- .../TransmittingBuoyOperationServiceTopia.java | 25 +----- .../seine/TripSeineGearUseServiceTopia.java | 22 +---- .../service/seine/TripSeineServiceTopia.java | 25 +++--- 29 files changed, 178 insertions(+), 669 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 e3916d3..dd48a7a 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 @@ -69,6 +69,7 @@ import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.EncounterDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; @@ -78,7 +79,6 @@ import fr.ird.observe.services.dto.seine.SetSeineDto; import fr.ird.observe.services.dto.seine.TargetLengthDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.entity.EntitiesExtractor; -import fr.ird.observe.services.entity.EntitiesSetFactory; import fr.ird.observe.services.service.ConcurrentModificationException; import fr.ird.observe.services.service.DataNotFoundException; import fr.ird.observe.services.service.DataSourceService; @@ -299,31 +299,6 @@ public abstract class ObserveServiceTopia implements ObserveService { } } - protected <E extends TopiaEntity, D extends IdDto> FormDto<D> entityToReadFormDto(Class<D> dtoType, Class<E> entityType, E entity) { - try (EntityToDtoBuilder<E, D> dtoBuilder = EntityToDtoBuilder.create(entityType, dtoType)) { - - // copy entity - D dto = dtoBuilder.build(serviceContext.getReferentialLocale(), entity); - - // build label sets detected while copy - // For read form, we don't need to get any values in labelSet (since there is nothing to edit^^) - ImmutableSet.Builder<ReferenceSetDto> labels = ImmutableSet.builder(); - - for (ReferenceTypeName referenceDtoTypeName : dtoBuilder.getReferenceTypesNames()) { - - Class<? extends IdDto> childDtoType = referenceDtoTypeName.getType(); - String propertyName = referenceDtoTypeName.getProperty(); - - labels.add(ReferenceSetDtos.newEmptyReferenceSetDto(childDtoType, propertyName)); - - } - - FormDto<D> form = FormDtos.newFormDto(dtoType, dto, labels.build()); - return form; - - } - } - protected <E extends TopiaEntity, D extends IdDto> D entityToDto(Class<D> dtoType, Class<E> entityType, E entity) { try (EntityToDtoBuilder<E, D> dtoBuilder = EntityToDtoBuilder.create(entityType, dtoType)) { @@ -337,53 +312,19 @@ public abstract class ObserveServiceTopia implements ObserveService { protected <E extends TopiaEntity, D extends IdDto> FormDto<D> entityToEditFormDto( Class<D> dtoType, - Class<E> entityType, E entity, + ObserveReferenceSetRequestDefinitions referentialRequestDefinition, ReferenceTypeName... includeReferenceDtoTypesNames) { - return entityToEditFormDto(dtoType, entityType, entity, ImmutableMap.<String, Object>of(), includeReferenceDtoTypesNames); - - } - protected <E extends TopiaEntity, D extends IdDto> FormDto<D> entityToEditFormDto( - Class<D> dtoType, - Class<E> entityType, - E entity, - Map<String, Object> dataContext, - ReferenceTypeName... includeReferenceDtoTypesNames) { + Class<E> entityType = getEntityType(dtoType); try (EntityToDtoBuilder<E, D> dtoBuilder = EntityToDtoBuilder.create(entityType, dtoType)) { // copy entity - D dto = dtoBuilder.build(serviceContext.getReferentialLocale(), entity, includeReferenceDtoTypesNames); - - // build label sets detected while copy - ImmutableSet.Builder<ReferenceSetDto> labels = new ImmutableSet.Builder<>(); - - EntitiesSetFactory entityFilterFactory = serviceContext.getEntitiesSetFactory(); - - for (ReferenceTypeName referenceDtoTypeName : dtoBuilder.getReferenceTypesNames()) { - - Class<? extends IdDto> childDtoType = referenceDtoTypeName.getType(); - String propertyName = referenceDtoTypeName.getProperty(); - - Class<TopiaEntity> entityParentType = getEntityType(referenceDtoTypeName.getParentType()); - Class<TopiaEntity> entityChildType = getEntityType(childDtoType); - - EntitiesExtractor<TopiaEntity> entitiesExtractor = entityFilterFactory.newEntitiesSet(entityParentType, - entityChildType, - propertyName); - - ReferenceSetDto referenceSet = getReferenceSet(childDtoType, - propertyName, - entityChildType, - entitiesExtractor, - dataContext); - - labels.add(referenceSet); - - } + D dto = dtoBuilder.build(serviceContext.getReferentialLocale(), entity); - FormDto<D> form = FormDtos.newFormDto(dtoType, dto, labels.build()); + FormDto<D> form = FormDtos.newFormDto(dtoType, dto, referentialRequestDefinition == null ? null : + referentialRequestDefinition.name(), null); return form; } @@ -562,10 +503,10 @@ public abstract class ObserveServiceTopia implements ObserveService { ReferenceDto<TripLonglineDto> referenceDto = ReferenceDtos.newReferenceDto(TripLonglineDto.class, - Lists.newArrayList(TripLonglineDto.PROPERTY_START_DATE, - TripLonglineDto.PROPERTY_END_DATE, - TripLonglineDto.PROPERTY_VESSEL, - TripLonglineDto.PROPERTY_OBSERVER)); + Lists.newArrayList(TripLonglineDto.PROPERTY_START_DATE, + TripLonglineDto.PROPERTY_END_DATE, + TripLonglineDto.PROPERTY_VESSEL, + TripLonglineDto.PROPERTY_OBSERVER)); referenceDto.setId(entity.getTopiaId()); referenceDto.setPropertyValue(TripLonglineDto.PROPERTY_START_DATE, entity.getStartDate()); @@ -583,8 +524,8 @@ public abstract class ObserveServiceTopia implements ObserveService { ReferenceDto<ActivityLonglineDto> referenceDto = ReferenceDtos.newReferenceDto( ActivityLonglineDto.class, Lists.newArrayList(ActivityLonglineDto.PROPERTY_TIME_STAMP, - ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE, - ActivityLonglineDto.PROPERTY_SET_LONGLINE)); + ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE, + ActivityLonglineDto.PROPERTY_SET_LONGLINE)); referenceDto.setId(entity.getTopiaId()); referenceDto.setPropertyValue(ActivityLonglineDto.PROPERTY_TIME_STAMP, entity.getTimeStamp()); @@ -601,11 +542,11 @@ public abstract class ObserveServiceTopia implements ObserveService { ReferenceLocale referenceLocale = getReferenceLocale(); 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)); + Lists.newArrayList(TripSeineDto.PROPERTY_ID, + TripSeineDto.PROPERTY_START_DATE, + TripSeineDto.PROPERTY_END_DATE, + TripSeineDto.PROPERTY_VESSEL, + TripSeineDto.PROPERTY_OBSERVER)); referenceDto.setId(entity.getTopiaId()); referenceDto.setPropertyValue(TripSeineDto.PROPERTY_START_DATE, entity.getStartDate()); referenceDto.setPropertyValue(TripSeineDto.PROPERTY_END_DATE, entity.getEndDate()); @@ -846,6 +787,7 @@ public abstract class ObserveServiceTopia implements ObserveService { return dto; } + protected <E extends TopiaEntity> boolean existsEntity(Class<E> entityType, String id) { ObserveTopiaPersistenceContext persistenceContext = serviceContext.getTopiaPersistenceContext(); TopiaDao<E> dao = persistenceContext.getDao(entityType); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java index 32701b2..389e655 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java @@ -85,17 +85,13 @@ public class EntityToDtoBuilder<E extends TopiaEntity, D extends IdDto> implemen } - public D build(ReferentialLocale referentialLocale, E entity, ReferenceTypeName ... includeReferenceTypesNames) { + public D build(ReferentialLocale referentialLocale, E entity) { Preconditions.checkNotNull(referentialLocale, "'referentialLocale' can't be null."); Preconditions.checkNotNull(entity, "'entity' can't be null."); ImmutableSet.Builder<ReferenceTypeName> referenceTypesBuilder = new ImmutableSet.Builder<>(); - for (ReferenceTypeName includeReferenceDtoType : includeReferenceTypesNames) { - referenceTypesBuilder.add(includeReferenceDtoType); - } - Map<String, Object> entityProperties = binder.obtainProperties(entity, true); ImmutableMap.Builder<String, Object> dtoPropertiesBuilder = new ImmutableMap.Builder<>(); 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 3d7d59a..1f1e972 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 @@ -93,7 +93,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe public <D extends ReferentialDto> FormDto<D> loadToRead(Class<D> dtoType, String id) { Class<ReferenceEntity> entityType = getEntityType(dtoType); ReferenceEntity entity = loadEntity(dtoType, entityType, id); - FormDto<D> form = entityToReadFormDto(dtoType, entityType, entity); + FormDto<D> form = entityToEditFormDto(dtoType, entity, null); addTechnicalInformations(entity, form.getForm()); return form; } @@ -110,7 +110,8 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe public <D extends ReferentialDto> FormDto<D> loadToEdit(Class<D> dtoType, String id) { Class<ReferenceEntity> entityType = getEntityType(dtoType); ReferenceEntity entity = loadEntity(dtoType, entityType, id); - FormDto<D> form = entityToEditFormDto(dtoType, entityType, entity); + //TODO Voir selon le type d'entité si il y a des valeurs par défaut à utiliser + FormDto<D> form = entityToEditFormDto(dtoType, entity, null); addTechnicalInformations(entity, form.getForm()); return form; } @@ -120,7 +121,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe Class<ReferenceEntity> entityType = getEntityType(dtoType); ReferenceEntity entity = newEntity(entityType); //TODO Voir selon le type d'entité si il y a des valeurs par défaut à utiliser - FormDto<D> form = entityToEditFormDto(dtoType, entityType, entity); + FormDto<D> form = entityToEditFormDto(dtoType, entity, null); return form; } @@ -129,8 +130,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe Class<ReferenceEntity> entityType = getEntityType(dtoType); ReferenceEntity entity = dtoToEntity(dtoType, entityType, bean); entity = saveEntity(entityType, entity); - FormDto<D> model = entityToEditFormDto(dtoType, entityType, entity); - return model.getForm().getId(); + return entity.getTopiaId(); } @Override 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 8fc6cd7..cef70a1 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 @@ -25,11 +25,8 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceTypeName; import fr.ird.observe.services.dto.longline.ActivityLonglineEncouterDto; -import fr.ird.observe.services.dto.longline.EncounterDto; -import fr.ird.observe.services.dto.referential.SpeciesDto; -import fr.ird.observe.services.dto.referential.longline.EncounterTypeDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; @@ -39,27 +36,14 @@ import fr.ird.observe.services.dto.result.SaveResultDtos; public class ActivityLongLineEncouterServiceTopia extends ObserveServiceTopia implements ActivityLongLineEncouterService { @Override - public FormDto<ActivityLonglineEncouterDto> loadToRead(String activityLonglineId) { - - ActivityLongline activityLongline = loadEntity(ActivityLonglineEncouterDto.class, ActivityLongline.class, activityLonglineId); - - FormDto<ActivityLonglineEncouterDto> form = entityToReadFormDto(ActivityLonglineEncouterDto.class, ActivityLongline.class, activityLongline); - - return form; - - } - - @Override - public FormDto<ActivityLonglineEncouterDto> loadToEdit(String activityLonglineId) { + public FormDto<ActivityLonglineEncouterDto> loadForm(String activityLonglineId) { ActivityLongline activityLongline = loadEntity(ActivityLonglineEncouterDto.class, ActivityLongline.class, activityLonglineId); FormDto<ActivityLonglineEncouterDto> form = entityToEditFormDto( ActivityLonglineEncouterDto.class, - ActivityLongline.class, activityLongline, - new ReferenceTypeName(EncounterDto.class, EncounterTypeDto.class, EncounterDto.PROPERTY_ENCOUNTER_TYPE), - new ReferenceTypeName(EncounterDto.class, SpeciesDto.class, EncounterDto.PROPERTY_SPECIES)); + ObserveReferenceSetRequestDefinitions.ACTIVITY_LONGLINE_ENCOUTER_FORM); return form; @@ -76,5 +60,4 @@ public class ActivityLongLineEncouterServiceTopia extends ObserveServiceTopia im } - } 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 b4c6a88..26dc538 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 @@ -25,12 +25,8 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceTypeName; import fr.ird.observe.services.dto.longline.ActivityLonglineSensorUsedDto; -import fr.ird.observe.services.dto.longline.SensorUsedDto; -import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; -import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; -import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; @@ -40,28 +36,13 @@ import fr.ird.observe.services.dto.result.SaveResultDtos; public class ActivityLongLineSensorUsedServiceTopia extends ObserveServiceTopia implements ActivityLongLineSensorUsedService { @Override - public FormDto<ActivityLonglineSensorUsedDto> loadToRead(String activityLonglineId) { + public FormDto<ActivityLonglineSensorUsedDto> loadForm(String activityLonglineId) { ActivityLongline activityLongline = loadEntity(ActivityLonglineSensorUsedDto.class, ActivityLongline.class, activityLonglineId); - FormDto<ActivityLonglineSensorUsedDto> form = entityToReadFormDto(ActivityLonglineSensorUsedDto.class, ActivityLongline.class, activityLongline); - - return form; - - } - - @Override - public FormDto<ActivityLonglineSensorUsedDto> loadToEdit(String activityLonglineId) { - - ActivityLongline activityLongline = loadEntity(ActivityLonglineSensorUsedDto.class, ActivityLongline.class, activityLonglineId); - - FormDto<ActivityLonglineSensorUsedDto> form = entityToEditFormDto( - ActivityLonglineSensorUsedDto.class, - ActivityLongline.class, - activityLongline, - new ReferenceTypeName(SensorUsedDto.class, SensorTypeDto.class, SensorUsedDto.PROPERTY_SENSOR_TYPE), - new ReferenceTypeName(SensorUsedDto.class, SensorBrandDto.class, SensorUsedDto.PROPERTY_SENSOR_BRAND), - new ReferenceTypeName(SensorUsedDto.class, SensorDataFormatDto.class, SensorUsedDto.PROPERTY_SENSOR_DATA_FORMAT)); + FormDto<ActivityLonglineSensorUsedDto> form = entityToEditFormDto(ActivityLonglineSensorUsedDto.class, + activityLongline, + ObserveReferenceSetRequestDefinitions.ACTIVITY_LONGLINE_SENSOR_USED_FORM); return form; 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 69fd30b..d287981 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 @@ -39,6 +39,7 @@ import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.service.DataNotFoundException; import fr.ird.type.CoordinateHelper; @@ -91,19 +92,6 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements } @Override - public FormDto<ActivityLonglineDto> loadToRead(String activityLonglineId) { - - ActivityLongline activityLongline = loadEntity(ActivityLonglineDto.class, ActivityLongline.class, activityLonglineId); - - FormDto<ActivityLonglineDto> form = entityToReadFormDto(ActivityLonglineDto.class, ActivityLongline.class, activityLongline); - - form.getForm().setHasSetLongline(activityLongline.getSetLongline() != null); - - return form; - - } - - @Override public ReferenceDto<ActivityLonglineDto> loadReferenceToRead(String activityLonglineId) { ActivityLongline activityLongline = loadEntity(ActivityLonglineDto.class, ActivityLongline.class, activityLonglineId); @@ -125,11 +113,13 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements } @Override - public FormDto<ActivityLonglineDto> loadToEdit(String activityLonglineId) { + public FormDto<ActivityLonglineDto> loadForm(String activityLonglineId) { ActivityLongline activityLongline = loadEntity(ActivityLonglineDto.class, ActivityLongline.class, activityLonglineId); - FormDto<ActivityLonglineDto> form = entityToEditFormDto(ActivityLonglineDto.class, ActivityLongline.class, activityLongline); + FormDto<ActivityLonglineDto> form = entityToEditFormDto(ActivityLonglineDto.class, + activityLongline, + ObserveReferenceSetRequestDefinitions.ACTIVITY_LONGLINE_FORM); form.getForm().setHasSetLongline(activityLongline.getSetLongline() != null); @@ -176,7 +166,9 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements preCreated.setTimeStamp(timestamp); - FormDto<ActivityLonglineDto> form = entityToEditFormDto(ActivityLonglineDto.class, ActivityLongline.class, preCreated); + FormDto<ActivityLonglineDto> form = entityToEditFormDto(ActivityLonglineDto.class, + preCreated, + ObserveReferenceSetRequestDefinitions.ACTIVITY_LONGLINE_FORM); return form; 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 ebe6bfe..48f7b04 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 @@ -3,14 +3,8 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.entities.longline.Branchline; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceTypeName; import fr.ird.observe.services.dto.longline.BranchlineDto; -import fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto; -import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; -import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; -import fr.ird.observe.services.dto.referential.longline.HookSizeDto; -import fr.ird.observe.services.dto.referential.longline.HookTypeDto; -import fr.ird.observe.services.dto.referential.longline.LineTypeDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -18,34 +12,13 @@ import fr.ird.observe.services.dto.referential.longline.LineTypeDto; public class BranchlineServiceTopia extends ObserveServiceTopia implements BranchlineService { @Override - public FormDto<BranchlineDto> loadToRead(String branchlineId) { + public FormDto<BranchlineDto> loadForm(String branchlineId) { Branchline branchline = loadEntity(BranchlineDto.class, Branchline.class, branchlineId); - FormDto<BranchlineDto> form = entityToReadFormDto( - BranchlineDto.class, - Branchline.class, - branchline); - - return form; - } - - @Override - public FormDto<BranchlineDto> loadToEdit(String branchlineId) { - - Branchline branchline = loadEntity(BranchlineDto.class, Branchline.class, branchlineId); - - FormDto<BranchlineDto> form = entityToEditFormDto( - BranchlineDto.class, - Branchline.class, - branchline, - new ReferenceTypeName(BranchlineDto.class, LineTypeDto.class, BranchlineDto.PROPERTY_TOP_TYPE), - new ReferenceTypeName(BranchlineDto.class, LineTypeDto.class, BranchlineDto.PROPERTY_TRACELINE_TYPE), - new ReferenceTypeName(BranchlineDto.class, HookTypeDto.class, BranchlineDto.PROPERTY_HOOK_TYPE), - new ReferenceTypeName(BranchlineDto.class, HookSizeDto.class, BranchlineDto.PROPERTY_HOOK_SIZE), - new ReferenceTypeName(BranchlineDto.class, BaitTypeDto.class, BranchlineDto.PROPERTY_BAIT_TYPE), - new ReferenceTypeName(BranchlineDto.class, BaitSettingStatusDto.class, BranchlineDto.PROPERTY_BAIT_SETTING_STATUS), - new ReferenceTypeName(BranchlineDto.class, BaitHaulingStatusDto.class, BranchlineDto.PROPERTY_BAIT_HAULING_STATUS)); + FormDto<BranchlineDto> form = entityToEditFormDto(BranchlineDto.class, + branchline, + ObserveReferenceSetRequestDefinitions.BRANCHLINE_FORM); return form; } 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 2f9724d..560ee02 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 @@ -22,7 +22,6 @@ package fr.ird.observe.services.service.longline; * #L% */ -import com.google.common.collect.ImmutableMap; import fr.ird.observe.entities.longline.Basket; import fr.ird.observe.entities.longline.Branchline; import fr.ird.observe.entities.longline.Section; @@ -30,24 +29,11 @@ import fr.ird.observe.entities.longline.SetLongline; 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.ReferenceTypeName; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.longline.CatchLonglineDto; -import fr.ird.observe.services.dto.longline.SectionDto; import fr.ird.observe.services.dto.longline.SetLonglineCatchDto; -import fr.ird.observe.services.dto.longline.SizeMeasureDto; -import fr.ird.observe.services.dto.longline.WeightMeasureDto; -import fr.ird.observe.services.dto.referential.SexDto; -import fr.ird.observe.services.dto.referential.SpeciesDto; -import fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto; -import fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto; -import fr.ird.observe.services.dto.referential.longline.HealthnessDto; -import fr.ird.observe.services.dto.referential.longline.HookPositionDto; -import fr.ird.observe.services.dto.referential.longline.MaturityStatusDto; -import fr.ird.observe.services.dto.referential.longline.SizeMeasureTypeDto; -import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; -import fr.ird.observe.services.dto.referential.longline.WeightMeasureTypeDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; @@ -57,43 +43,15 @@ import fr.ird.observe.services.dto.result.SaveResultDtos; public class SetLonglineCatchServiceTopia extends ObserveServiceTopia implements SetLonglineCatchService { @Override - public FormDto<SetLonglineCatchDto> loadToRead(String setLonglineId) { - - SetLongline setLongline = loadEntity(SetLonglineCatchDto.class, SetLongline.class, setLonglineId); - - FormDto<SetLonglineCatchDto> form = entityToReadFormDto( - SetLonglineCatchDto.class, - SetLongline.class, - setLongline); - - return form; - } - - @Override - public FormDto<SetLonglineCatchDto> loadToEdit(String setLonglineId) { + public FormDto<SetLonglineCatchDto> loadForm(String setLonglineId) { SetLongline setLongline = loadEntity(SetLonglineCatchDto.class, SetLongline.class, setLonglineId); FormDto<SetLonglineCatchDto> form = entityToEditFormDto( SetLonglineCatchDto.class, - SetLongline.class, setLongline, - ImmutableMap.<String, Object>of(Section.PROPERTY_SET_LONGLINE, setLongline), - new ReferenceTypeName(CatchLonglineDto.class, SpeciesDto.class, CatchLonglineDto.PROPERTY_SPECIES_CATCH), - new ReferenceTypeName(CatchLonglineDto.class, HealthnessDto.class, CatchLonglineDto.PROPERTY_CATCH_HEALTHNESS), - new ReferenceTypeName(CatchLonglineDto.class, HookPositionDto.class, CatchLonglineDto.PROPERTY_HOOK_POSITION), - new ReferenceTypeName(CatchLonglineDto.class, CatchFateLonglineDto.class, CatchLonglineDto.PROPERTY_CATCH_FATE_LONGLINE), - new ReferenceTypeName(CatchLonglineDto.class, HealthnessDto.class, CatchLonglineDto.PROPERTY_DISCARD_HEALTHNESS), - new ReferenceTypeName(CatchLonglineDto.class, SpeciesDto.class, CatchLonglineDto.PROPERTY_PREDATOR), - new ReferenceTypeName(CatchLonglineDto.class, StomacFullnessDto.class, CatchLonglineDto.PROPERTY_STOMAC_FULLNESS), - new ReferenceTypeName(CatchLonglineDto.class, SexDto.class, CatchLonglineDto.PROPERTY_SEX), - new ReferenceTypeName(CatchLonglineDto.class, MaturityStatusDto.class, CatchLonglineDto.PROPERTY_MATURITY_STATUS), - new ReferenceTypeName(SizeMeasureDto.class, SizeMeasureTypeDto.class, SizeMeasureDto.PROPERTY_SIZE_MEASURE_TYPE), - new ReferenceTypeName(WeightMeasureDto.class, WeightMeasureTypeDto.class, WeightMeasureDto.PROPERTY_WEIGHT_MEASURE_TYPE), - new ReferenceTypeName(CatchLonglineDto.class, SectionDto.class, CatchLonglineDto.PROPERTY_SECTION), - new ReferenceTypeName(CatchLonglineDto.class, BasketDto.class, CatchLonglineDto.PROPERTY_BASKET), - new ReferenceTypeName(CatchLonglineDto.class, BranchlineDto.class, CatchLonglineDto.PROPERTY_BRANCHLINE), - new ReferenceTypeName(BranchlineDto.class, BaitHaulingStatusDto.class, BranchlineDto.PROPERTY_BAIT_HAULING_STATUS) // utilisé pour l'edition des l'anvançon + ObserveReferenceSetRequestDefinitions.SET_LONGLINE_CATCH_FORM + //ImmutableMap.<String, Object>of(Section.PROPERTY_SET_LONGLINE, setLongline), //FIXME context ); for(Section section : setLongline.getSection()) { 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 2ed5426..3a98607 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 @@ -28,17 +28,11 @@ import fr.ird.observe.entities.longline.Section; import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceTypeName; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.longline.SectionDto; import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto; -import fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto; -import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; -import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; -import fr.ird.observe.services.dto.referential.longline.HookSizeDto; -import fr.ird.observe.services.dto.referential.longline.HookTypeDto; -import fr.ird.observe.services.dto.referential.longline.LineTypeDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; @@ -48,34 +42,14 @@ import fr.ird.observe.services.dto.result.SaveResultDtos; public class SetLonglineDetailCompositionServiceTopia extends ObserveServiceTopia implements SetLonglineDetailCompositionService { @Override - public FormDto<SetLonglineDetailCompositionDto> loadToRead(String setLonglineId) { - - SetLongline setLongline = loadEntity(SetLonglineDetailCompositionDto.class, SetLongline.class, setLonglineId); - - FormDto<SetLonglineDetailCompositionDto> form = entityToReadFormDto( - SetLonglineDetailCompositionDto.class, - SetLongline.class, - setLongline); - - return form; - } - - @Override - public FormDto<SetLonglineDetailCompositionDto> loadToEdit(String setLonglineId) { + public FormDto<SetLonglineDetailCompositionDto> loadForm(String setLonglineId) { SetLongline setLongline = loadEntity(SetLonglineDetailCompositionDto.class, SetLongline.class, setLonglineId); FormDto<SetLonglineDetailCompositionDto> form = entityToEditFormDto( SetLonglineDetailCompositionDto.class, - SetLongline.class, setLongline, - new ReferenceTypeName(BranchlineDto.class, LineTypeDto.class, BranchlineDto.PROPERTY_TOP_TYPE), - new ReferenceTypeName(BranchlineDto.class, LineTypeDto.class, BranchlineDto.PROPERTY_TRACELINE_TYPE), - new ReferenceTypeName(BranchlineDto.class, HookTypeDto.class, BranchlineDto.PROPERTY_HOOK_TYPE), - new ReferenceTypeName(BranchlineDto.class, HookSizeDto.class, BranchlineDto.PROPERTY_HOOK_SIZE), - new ReferenceTypeName(BranchlineDto.class, BaitTypeDto.class, BranchlineDto.PROPERTY_BAIT_TYPE), - new ReferenceTypeName(BranchlineDto.class, BaitSettingStatusDto.class, BranchlineDto.PROPERTY_BAIT_SETTING_STATUS), - new ReferenceTypeName(BranchlineDto.class, BaitHaulingStatusDto.class, BranchlineDto.PROPERTY_BAIT_HAULING_STATUS)); + ObserveReferenceSetRequestDefinitions.SET_LONGLINE_DETAIL_COMPOSITION_FORM); return form; } 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 d8c5333..7deb7a5 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 @@ -25,18 +25,8 @@ package fr.ird.observe.services.service.longline; import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceTypeName; -import fr.ird.observe.services.dto.longline.BaitsCompositionDto; -import fr.ird.observe.services.dto.longline.BranchlinesCompositionDto; -import fr.ird.observe.services.dto.longline.FloatlinesCompositionDto; -import fr.ird.observe.services.dto.longline.HooksCompositionDto; import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto; -import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; -import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; -import fr.ird.observe.services.dto.referential.longline.HookSizeDto; -import fr.ird.observe.services.dto.referential.longline.HookTypeDto; -import fr.ird.observe.services.dto.referential.longline.LineTypeDto; -import fr.ird.observe.services.dto.referential.longline.MitigationTypeDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; @@ -46,35 +36,13 @@ import fr.ird.observe.services.dto.result.SaveResultDtos; public class SetLonglineGlobalCompositionServiceTopia extends ObserveServiceTopia implements SetLonglineGlobalCompositionService { @Override - public FormDto<SetLonglineGlobalCompositionDto> loadToRead(String setLonglineId) { + public FormDto<SetLonglineGlobalCompositionDto> loadForm(String setLonglineId) { SetLongline setLongline = loadEntity(SetLonglineGlobalCompositionDto.class, SetLongline.class, setLonglineId); - FormDto<SetLonglineGlobalCompositionDto> form = entityToReadFormDto( - SetLonglineGlobalCompositionDto.class, - SetLongline.class, - setLongline); - - return form; - } - - @Override - public FormDto<SetLonglineGlobalCompositionDto> loadToEdit(String setLonglineId) { - - SetLongline setLongline = loadEntity(SetLonglineGlobalCompositionDto.class, SetLongline.class, setLonglineId); - - FormDto<SetLonglineGlobalCompositionDto> form = entityToEditFormDto( - SetLonglineGlobalCompositionDto.class, - SetLongline.class, - setLongline, - new ReferenceTypeName(FloatlinesCompositionDto.class, LineTypeDto.class, FloatlinesCompositionDto.PROPERTY_LINE_TYPE), - new ReferenceTypeName(BranchlinesCompositionDto.class, LineTypeDto.class, BranchlinesCompositionDto.PROPERTY_TOP_TYPE), - new ReferenceTypeName(BranchlinesCompositionDto.class, LineTypeDto.class, BranchlinesCompositionDto.PROPERTY_TRACELINE_TYPE), - new ReferenceTypeName(HooksCompositionDto.class, HookTypeDto.class, HooksCompositionDto.PROPERTY_HOOK_TYPE), - new ReferenceTypeName(HooksCompositionDto.class, HookSizeDto.class, HooksCompositionDto.PROPERTY_HOOK_SIZE), - new ReferenceTypeName(BaitsCompositionDto.class, BaitSettingStatusDto.class, BaitsCompositionDto.PROPERTY_BAIT_SETTING_STATUS), - new ReferenceTypeName(BaitsCompositionDto.class, BaitTypeDto.class, BaitsCompositionDto.PROPERTY_BAIT_TYPE), - new ReferenceTypeName(SetLonglineGlobalCompositionDto.class, MitigationTypeDto.class, SetLonglineGlobalCompositionDto.PROPERTY_MITIGATION_TYPE)); + FormDto<SetLonglineGlobalCompositionDto> form = entityToEditFormDto(SetLonglineGlobalCompositionDto.class, + setLongline, + ObserveReferenceSetRequestDefinitions.SET_LONGLINE_GLOBAL_COMPOSITION_FORM); return form; } 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 c3cfa6f..723a5b0 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 @@ -34,6 +34,7 @@ import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineStubDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; import fr.ird.observe.services.service.DataNotFoundException; @@ -48,11 +49,19 @@ import java.util.Set; public class SetLonglineServiceTopia extends ObserveServiceTopia implements SetLonglineService { @Override - public FormDto<SetLonglineDto> loadToRead(String setLonglineId) { + public FormDto<SetLonglineDto> loadForm(String setLonglineId) { SetLongline setLongline = loadEntity(SetLonglineDto.class, SetLongline.class, setLonglineId); - FormDto<SetLonglineDto> form = entityToReadFormDto(SetLonglineDto.class, SetLongline.class, setLongline); + FormDto<SetLonglineDto> form = entityToEditFormDto(SetLonglineDto.class, + setLongline, + ObserveReferenceSetRequestDefinitions.SET_LONGLINE_FORM); + + ActivityLonglineTopiaDao activityLonglineDao = getTopiaPersistenceContext().getActivityLonglineDao(); + + ActivityLongline activityLongline = activityLonglineDao.forSetLonglineEquals(setLongline).findUnique(); + + form.getForm().setOtherSets(getOtherSetLonglineDtos(activityLongline, setLongline)); return form; @@ -79,23 +88,6 @@ public class SetLonglineServiceTopia extends ObserveServiceTopia implements SetL } @Override - public FormDto<SetLonglineDto> loadToEdit(String setLonglineId) { - - SetLongline setLongline = loadEntity(SetLonglineDto.class, SetLongline.class, setLonglineId); - - FormDto<SetLonglineDto> form = entityToEditFormDto(SetLonglineDto.class, SetLongline.class, setLongline); - - ActivityLonglineTopiaDao activityLonglineDao = getTopiaPersistenceContext().getActivityLonglineDao(); - - ActivityLongline activityLongline = activityLonglineDao.forSetLonglineEquals(setLongline).findUnique(); - - form.getForm().setOtherSets(getOtherSetLonglineDtos(activityLongline, setLongline)); - - return form; - - } - - @Override public FormDto<SetLonglineDto> preCreate(String activityLonglineId) { ActivityLongline activityLongline = loadEntity(ActivityLonglineDto.class, ActivityLongline.class, activityLonglineId); @@ -120,14 +112,16 @@ public class SetLonglineServiceTopia extends ObserveServiceTopia implements SetL preCreated.setSettingStartLatitude(latitude); preCreated.setSettingStartLongitude(longitude); - FormDto<SetLonglineDto> form = entityToEditFormDto(SetLonglineDto.class, SetLongline.class, preCreated); + FormDto<SetLonglineDto> form = entityToEditFormDto(SetLonglineDto.class, + preCreated, + ObserveReferenceSetRequestDefinitions.SET_LONGLINE_FORM); form.getForm().setOtherSets(getOtherSetLonglineDtos(activityLongline, preCreated)); return form; } - + @Override public SaveResultDto save(String activityLonglineId, SetLonglineDto setLonglineDto) { @@ -166,9 +160,9 @@ public class SetLonglineServiceTopia extends ObserveServiceTopia implements SetL } - protected Set<SetLonglineStubDto> getOtherSetLonglineDtos(ActivityLongline currentActivityLongline, SetLongline setLongline) { + protected Set<SetLonglineStubDto> getOtherSetLonglineDtos(ActivityLongline currentActivityLongline, SetLongline setLongline) { - Set<SetLonglineStubDto> otherSetLonglineDtos = Sets.newHashSet(); + Set<SetLonglineStubDto> otherSetLonglineDtos = Sets.newHashSet(); TripLonglineTopiaDao tripLonglineDao = getTopiaPersistenceContext().getTripLonglineDao(); @@ -178,7 +172,7 @@ public class SetLonglineServiceTopia extends ObserveServiceTopia implements SetL SetLongline otherSetLongline = activityLongline.getSetLongline(); - if (otherSetLongline != null && ! setLongline.equals(otherSetLongline)) { + if (otherSetLongline != null && !setLongline.equals(otherSetLongline)) { SetLonglineStubDto otherSetDto = new SetLonglineStubDto(); otherSetDto.setId(otherSetLongline.getTopiaId()); 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 a122222..5c817e3 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 @@ -22,7 +22,6 @@ package fr.ird.observe.services.service.longline; * #L% */ -import com.google.common.collect.ImmutableMap; import fr.ird.observe.entities.longline.Basket; import fr.ird.observe.entities.longline.Branchline; import fr.ird.observe.entities.longline.Section; @@ -30,16 +29,11 @@ import fr.ird.observe.entities.longline.SetLongline; 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.ReferenceTypeName; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; -import fr.ird.observe.services.dto.longline.SectionDto; import fr.ird.observe.services.dto.longline.SetLonglineTdrDto; import fr.ird.observe.services.dto.longline.TdrDto; -import fr.ird.observe.services.dto.referential.SpeciesDto; -import fr.ird.observe.services.dto.referential.longline.ItemHorizontalPositionDto; -import fr.ird.observe.services.dto.referential.longline.ItemVerticalPositionDto; -import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; @@ -49,35 +43,16 @@ import fr.ird.observe.services.dto.result.SaveResultDtos; public class TdrServiceTopia extends ObserveServiceTopia implements TdrService { @Override - public FormDto<SetLonglineTdrDto> loadToRead(String setLonglineId) { - - SetLongline setLongline = loadEntity(SetLonglineTdrDto.class, SetLongline.class, setLonglineId); - - FormDto<SetLonglineTdrDto> form = entityToReadFormDto( - SetLonglineTdrDto.class, - SetLongline.class, - setLongline); - - return form; - } - - @Override - public FormDto<SetLonglineTdrDto> loadToEdit(String setLonglineId) { + public FormDto<SetLonglineTdrDto> loadForm(String setLonglineId) { SetLongline setLongline = loadEntity(SetLonglineTdrDto.class, SetLongline.class, setLonglineId); FormDto<SetLonglineTdrDto> form = entityToEditFormDto( SetLonglineTdrDto.class, - SetLongline.class, setLongline, - ImmutableMap.<String, Object>of(Section.PROPERTY_SET_LONGLINE, setLongline), - new ReferenceTypeName(TdrDto.class, SensorBrandDto.class, TdrDto.PROPERTY_SENSOR_BRAND), - new ReferenceTypeName(TdrDto.class, ItemHorizontalPositionDto.class, TdrDto.PROPERTY_ITEM_HORIZONTAL_POSITION), - new ReferenceTypeName(TdrDto.class, ItemVerticalPositionDto.class, TdrDto.PROPERTY_ITEM_VERTICAL_POSITION), - new ReferenceTypeName(TdrDto.class, SpeciesDto.class, TdrDto.PROPERTY_SPECIES), - new ReferenceTypeName(TdrDto.class, SectionDto.class, TdrDto.PROPERTY_SECTION), - new ReferenceTypeName(TdrDto.class, BasketDto.class, TdrDto.PROPERTY_BASKET), - new ReferenceTypeName(TdrDto.class, BranchlineDto.class, TdrDto.PROPERTY_BRANCHLINE)); + ObserveReferenceSetRequestDefinitions.SET_LONGLINE_TDR_FORM + //ImmutableMap.<String, Object>of(Section.PROPERTY_SET_LONGLINE, setLongline), //FIXME context + ); for(Section section : setLongline.getSection()) { 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 fe89e0a..521d797 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 @@ -26,12 +26,8 @@ import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.longline.TripLonglineTopiaDao; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceTypeName; -import fr.ird.observe.services.dto.longline.GearUseFeaturesLonglineDto; -import fr.ird.observe.services.dto.longline.GearUseFeaturesMeasurementLonglineDto; import fr.ird.observe.services.dto.longline.TripLonglineGearUseDto; -import fr.ird.observe.services.dto.referential.GearCaracteristicDto; -import fr.ird.observe.services.dto.referential.GearDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; @@ -41,26 +37,14 @@ import fr.ird.observe.services.dto.result.SaveResultDtos; public class TripLonglineGearUseServiceTopia extends ObserveServiceTopia implements TripLonglineGearUseService { @Override - public FormDto<TripLonglineGearUseDto> loadToRead(String tripLonglineId) { - - TripLongline tripLongline = loadEntity(TripLonglineGearUseDto.class, TripLongline.class, tripLonglineId); - - FormDto<TripLonglineGearUseDto> form = entityToReadFormDto(TripLonglineGearUseDto.class, TripLongline.class, tripLongline); - - return form; - } - - @Override - public FormDto<TripLonglineGearUseDto> loadToEdit(String tripLonglineId) { + public FormDto<TripLonglineGearUseDto> loadForm(String tripLonglineId) { TripLongline tripLongline = loadEntity(TripLonglineGearUseDto.class, TripLongline.class, tripLonglineId); FormDto<TripLonglineGearUseDto> form = entityToEditFormDto( TripLonglineGearUseDto.class, - TripLongline.class, tripLongline, - new ReferenceTypeName(GearUseFeaturesLonglineDto.class, GearDto.class, GearUseFeaturesLonglineDto.PROPERTY_GEAR), - new ReferenceTypeName(GearUseFeaturesMeasurementLonglineDto.class, GearCaracteristicDto.class, GearUseFeaturesMeasurementLonglineDto.PROPERTY_GEAR_CARACTERISTIC)); + ObserveReferenceSetRequestDefinitions.TRIP_LONGLINE_GEAR_USE_FORM); return form; } 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 a7c7691..a9266f9 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 @@ -35,8 +35,10 @@ import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.TripMapDto; +import fr.ird.observe.services.dto.TripMapDtos; import fr.ird.observe.services.dto.TripMapPointDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; @@ -53,10 +55,6 @@ import java.util.List; */ public class TripLonglineServiceTopia extends ObserveServiceTopia implements TripLonglineService { - protected TripLonglineTopiaDao getDao() { - return (TripLonglineTopiaDao) serviceContext.getTopiaPersistenceContext().getDao(TripLongline.class); - } - @Override public ReferenceSetDto<TripLonglineDto> getAllTripLongline() { @@ -80,7 +78,6 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri return stubReferences; } - @Override public ReferenceSetDto<TripLonglineDto> getTripLonglineByProgram(String programId) { @@ -105,6 +102,7 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri return stubReferences; } + @Override public TripLonglineDto loadDto(String tripLonglineId) { return loadEntityToDto(TripLonglineDto.class, tripLonglineId); @@ -123,26 +121,11 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri LinkedHashSet<TripMapPointDto> points = getDao().extractTripMapActivityPoints(tripLonglineId); - TripMapDto tripMapDto = new TripMapDto(); - - tripMapDto.setId(tripLonglineId); - - tripMapDto.setPoints(points); - + TripMapDto tripMapDto = TripMapDtos.newTripMapDto(tripLonglineId, points); return tripMapDto; } @Override - public FormDto<TripLonglineDto> loadToRead(String tripLonglineId) { - - TripLongline tripLongline = loadEntity(TripLonglineDto.class, TripLongline.class, tripLonglineId); - - FormDto<TripLonglineDto> form = entityToReadFormDto(TripLonglineDto.class, TripLongline.class, tripLongline); - - return form; - } - - @Override public ReferenceDto<TripLonglineDto> loadReferenceToRead(String tripLonglineId) { TripLongline tripLongline = loadEntity(TripLonglineDto.class, TripLongline.class, tripLonglineId); @@ -158,11 +141,13 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri } @Override - public FormDto<TripLonglineDto> loadToEdit(String tripLonglineId) { + public FormDto<TripLonglineDto> loadForm(String tripLonglineId) { TripLongline tripLongline = loadEntity(TripLonglineDto.class, TripLongline.class, tripLonglineId); - FormDto<TripLonglineDto> form = entityToEditFormDto(TripLonglineDto.class, TripLongline.class, tripLongline); + FormDto<TripLonglineDto> form = entityToEditFormDto(TripLonglineDto.class, + tripLongline, + ObserveReferenceSetRequestDefinitions.TRIP_LONGLINE_FORM); TripLonglineDto tripLonglineDto = form.getForm(); @@ -189,7 +174,9 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri tripLongline.setProgram(program); - FormDto<TripLonglineDto> form = entityToEditFormDto(TripLonglineDto.class, TripLongline.class, tripLongline); + FormDto<TripLonglineDto> form = entityToEditFormDto(TripLonglineDto.class, + tripLongline, + ObserveReferenceSetRequestDefinitions.TRIP_LONGLINE_FORM); return form; } @@ -246,4 +233,8 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri return result; } + + protected TripLonglineTopiaDao getDao() { + return (TripLonglineTopiaDao) serviceContext.getTopiaPersistenceContext().getDao(TripLongline.class); + } } 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 215e882..a832f19 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 @@ -25,8 +25,7 @@ package fr.ird.observe.services.service.seine; 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.ReferenceTypeName; -import fr.ird.observe.services.dto.referential.seine.ObservedSystemDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; @@ -37,25 +36,13 @@ import fr.ird.observe.services.dto.seine.ActivitySeineObservedSystemDto; public class ActivitySeineObservedSystemServiceTopia extends ObserveServiceTopia implements ActivitySeineObservedSystemService { @Override - public FormDto<ActivitySeineObservedSystemDto> loadToRead(String activitySeineId) { + public FormDto<ActivitySeineObservedSystemDto> loadForm(String activitySeineId) { ActivitySeine activitySeine = loadEntity(ActivitySeineObservedSystemDto.class, ActivitySeine.class, activitySeineId); - FormDto<ActivitySeineObservedSystemDto> form = entityToReadFormDto(ActivitySeineObservedSystemDto.class, ActivitySeine.class, activitySeine); - - return form; - } - - @Override - public FormDto<ActivitySeineObservedSystemDto> loadToEdit(String activitySeineId) { - - ActivitySeine activitySeine = loadEntity(ActivitySeineObservedSystemDto.class, ActivitySeine.class, activitySeineId); - - //FIXME Voir s'il faut aussi le faire pour le read (je ne peux plus créer de base... donc pas finir de tester) FormDto<ActivitySeineObservedSystemDto> form = entityToEditFormDto(ActivitySeineObservedSystemDto.class, - ActivitySeine.class, activitySeine, - new ReferenceTypeName(ActivitySeineObservedSystemDto.class, ObservedSystemDto.class, ActivitySeineObservedSystemDto.PROPERTY_OBSERVED_SYSTEM)); + ObserveReferenceSetRequestDefinitions.ACTIVITY_SEINE_OBSERVED_SYSTEM_FORM); return form; } 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 c96e044..43ffc06 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 @@ -37,6 +37,7 @@ 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.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; import fr.ird.observe.services.dto.seine.ActivitySeineDto; @@ -56,7 +57,6 @@ import java.util.List; */ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements ActivitySeineService { - @Override public ReferenceSetDto<ActivitySeineDto> getActivitySeineByRoute(String routeId) { @@ -100,19 +100,6 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac } @Override - public FormDto<ActivitySeineDto> loadToRead(String activitySeineId) { - - ActivitySeine activitySeine = loadEntity(ActivitySeineDto.class, ActivitySeine.class, activitySeineId); - - FormDto<ActivitySeineDto> form = entityToReadFormDto(ActivitySeineDto.class, ActivitySeine.class, activitySeine); - - form.getForm().setObservedSystemEmpty(activitySeine.isObservedSystemEmpty()); - form.getForm().setFloatingObjectEmpty(activitySeine.isFloatingObjectEmpty()); - - return form; - } - - @Override public ReferenceDto<ActivitySeineDto> loadReferenceToRead(String activitySeineId) { ActivitySeine activitySeine = loadEntity(ActivitySeineDto.class, ActivitySeine.class, activitySeineId); @@ -132,11 +119,13 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac } @Override - public FormDto<ActivitySeineDto> loadToEdit(String activitySeineId) { + public FormDto<ActivitySeineDto> loadForm(String activitySeineId) { ActivitySeine activitySeine = loadEntity(ActivitySeineDto.class, ActivitySeine.class, activitySeineId); - FormDto<ActivitySeineDto> form = entityToEditFormDto(ActivitySeineDto.class, ActivitySeine.class, activitySeine); + FormDto<ActivitySeineDto> form = entityToEditFormDto(ActivitySeineDto.class, + activitySeine, + ObserveReferenceSetRequestDefinitions.ACTIVITY_SEINE_FORM); form.getForm().setObservedSystemEmpty(activitySeine.isObservedSystemEmpty()); form.getForm().setFloatingObjectEmpty(activitySeine.isFloatingObjectEmpty()); @@ -190,7 +179,9 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac preCreated.setTime(DateUtil.getTime(time, false, false)); preCreated.setCurrentFpaZone(currentFpaZone); - FormDto<ActivitySeineDto> form = entityToEditFormDto(ActivitySeineDto.class, ActivitySeine.class, preCreated); + FormDto<ActivitySeineDto> form = entityToEditFormDto(ActivitySeineDto.class, + preCreated, + ObserveReferenceSetRequestDefinitions.ACTIVITY_SEINE_FORM); form.getForm().setObservedSystemEmpty(preCreated.isObservedSystemEmpty()); form.getForm().setFloatingObjectEmpty(preCreated.isFloatingObjectEmpty()); 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 6674efc..6c8e3fa 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,6 +32,7 @@ import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.ReferenceSetDtos; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.FloatingObjectDtos; @@ -70,16 +71,6 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F } @Override - public FormDto<FloatingObjectDto> loadToRead(String floatingObjectId) { - - FloatingObject floatingObject = loadEntity(FloatingObjectDto.class, FloatingObject.class, floatingObjectId); - - FormDto<FloatingObjectDto> form = entityToReadFormDto(FloatingObjectDto.class, FloatingObject.class, floatingObject); - - return form; - } - - @Override public ReferenceDto<FloatingObjectDto> loadReferenceToRead(String floatingObjectId) { ReferenceLocale referenceLocale = getReferenceLocale(); @@ -104,11 +95,13 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F } @Override - public FormDto<FloatingObjectDto> loadToEdit(String floatingObjectId) { + public FormDto<FloatingObjectDto> loadForm(String floatingObjectId) { FloatingObject floatingObject = loadEntity(FloatingObjectDto.class, FloatingObject.class, floatingObjectId); - FormDto<FloatingObjectDto> form = entityToEditFormDto(FloatingObjectDto.class, FloatingObject.class, floatingObject); + FormDto<FloatingObjectDto> form = entityToEditFormDto(FloatingObjectDto.class, + floatingObject, + ObserveReferenceSetRequestDefinitions.FLOATING_OBJECT_FORM); return form; } @@ -118,7 +111,9 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F FloatingObject floatingObject = newEntity(FloatingObject.class); - FormDto<FloatingObjectDto> form = entityToEditFormDto(FloatingObjectDto.class, FloatingObject.class, floatingObject); + FormDto<FloatingObjectDto> form = entityToEditFormDto(FloatingObjectDto.class, + floatingObject, + ObserveReferenceSetRequestDefinitions.FLOATING_OBJECT_FORM); return form; } @@ -150,7 +145,7 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F FloatingObject floatingObject = loadEntity(FloatingObjectDto.class, FloatingObject.class, floatingObjectId); - if (! activitySeine.containsFloatingObject(floatingObject)) { + if (!activitySeine.containsFloatingObject(floatingObject)) { throw new DataNotFoundException(FloatingObjectDto.class, floatingObjectId); } 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 932f94c..228569a 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 @@ -22,7 +22,6 @@ package fr.ird.observe.services.service.seine; * #L% */ -import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import fr.ird.observe.entities.referentiel.Ocean; @@ -36,10 +35,7 @@ import fr.ird.observe.entities.seine.SetSeine; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceTypeName; -import fr.ird.observe.services.dto.referential.SpeciesDto; -import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; -import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; import fr.ird.observe.services.dto.seine.NonTargetCatchDto; @@ -55,17 +51,7 @@ import java.util.Set; public class NonTargetCatchServiceTopia extends ObserveServiceTopia implements NonTargetCatchService { @Override - public FormDto<SetSeineNonTargetCatchDto> loadToRead(String setSeineId) { - - SetSeine setSeine = loadEntity(SetSeineNonTargetCatchDto.class, SetSeine.class, setSeineId); - - FormDto<SetSeineNonTargetCatchDto> form = entityToReadFormDto(SetSeineNonTargetCatchDto.class, SetSeine.class, setSeine); - - return form; - } - - @Override - public FormDto<SetSeineNonTargetCatchDto> loadToEdit(String setSeineId, String tripSeineId) { + public FormDto<SetSeineNonTargetCatchDto> loadForm(String setSeineId, String tripSeineId) { SetSeine setSeine = loadEntity(SetSeineNonTargetCatchDto.class, SetSeine.class, setSeineId); @@ -75,12 +61,10 @@ public class NonTargetCatchServiceTopia extends ObserveServiceTopia implements N FormDto<SetSeineNonTargetCatchDto> form = entityToEditFormDto( SetSeineNonTargetCatchDto.class, - SetSeine.class, setSeine, - ImmutableMap.<String, Object>of(Species.PROPERTY_OCEAN, ocean), - new ReferenceTypeName(NonTargetCatchDto.class, SpeciesDto.class, NonTargetCatchDto.PROPERTY_SPECIES), - new ReferenceTypeName(NonTargetCatchDto.class, SpeciesFateDto.class, NonTargetCatchDto.PROPERTY_SPECIES_FATE), - new ReferenceTypeName(NonTargetCatchDto.class, ReasonForDiscardDto.class, NonTargetCatchDto.PROPERTY_REASON_FOR_DISCARD)); + ObserveReferenceSetRequestDefinitions.SET_SEINE_FORM + //ImmutableMap.<String, Object>of(Species.PROPERTY_OCEAN, ocean), //FIXME context + ); SetSeineNonTargetCatchDto setSeineNonTargetCatchDto = form.getForm(); 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 76ff6d3..5980335 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,10 +32,8 @@ 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.ReferenceSetDto; -import fr.ird.observe.services.dto.ReferenceTypeName; -import fr.ird.observe.services.dto.referential.SexDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.referential.SpeciesDto; -import fr.ird.observe.services.dto.seine.NonTargetLengthDto; import fr.ird.observe.services.dto.seine.NonTargetSampleDto; import fr.ird.observe.services.dto.seine.SetSeineDto; @@ -75,19 +73,7 @@ public class NonTargetSampleServiceTopia extends ObserveServiceTopia implements } @Override - public FormDto<NonTargetSampleDto> loadToRead(String setSeineId) { - - SetSeine setSeine = loadEntity(SetSeineDto.class, SetSeine.class, setSeineId); - - NonTargetSample nonTargetSample = getNonTargetSample(setSeine); - - FormDto<NonTargetSampleDto> form = entityToReadFormDto(NonTargetSampleDto.class, NonTargetSample.class, nonTargetSample); - - return form; - } - - @Override - public FormDto<NonTargetSampleDto> loadToEdit(String setSeineId) { + public FormDto<NonTargetSampleDto> loadForm(String setSeineId) { SetSeine setSeine = loadEntity(SetSeineDto.class, SetSeine.class, setSeineId); @@ -95,13 +81,10 @@ public class NonTargetSampleServiceTopia extends ObserveServiceTopia implements FormDto<NonTargetSampleDto> form = entityToEditFormDto( NonTargetSampleDto.class, - NonTargetSample.class, nonTargetSample, - new ReferenceTypeName(NonTargetLengthDto.class, SexDto.class, NonTargetLengthDto.PROPERTY_SEX), - new ReferenceTypeName(NonTargetLengthDto.class, SpeciesDto.class, NonTargetLengthDto.PROPERTY_SPECIES) - ); + ObserveReferenceSetRequestDefinitions.SET_SEINE_NON_TARGET_CATCH_FORM); - // on filtre la list des espéces cibles + // on filtre la liste des espéces cibles Set<Species> speciesSet = Sets.newLinkedHashSet(); // on recupere la liste des espèces thon cible @@ -116,10 +99,10 @@ public class NonTargetSampleServiceTopia extends ObserveServiceTopia implements } } - + //FIXME request LinkedHashSet<ReferenceDto<SpeciesDto>> speciesRefs = Sets.newLinkedHashSet(); - for (Species species : speciesSet ) { + for (Species species : speciesSet) { speciesRefs.add(entityToReferenceDto(SpeciesDto.class, species)); } 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 3c4109a..2dfed78 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 @@ -25,11 +25,8 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.entities.seine.FloatingObject; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceTypeName; -import fr.ird.observe.services.dto.referential.SpeciesDto; -import fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.seine.FloatingObjectObservedSpeciesDto; -import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -37,22 +34,7 @@ import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; public class ObjectObservedSpeciesServiceTopia extends ObserveServiceTopia implements ObjectObservedSpeciesService { @Override - public FormDto<FloatingObjectObservedSpeciesDto> loadToRead(String floatingObjectId) { - - FloatingObject floatingObject = - loadEntity(FloatingObjectObservedSpeciesDto.class, FloatingObject.class, floatingObjectId); - - FormDto<FloatingObjectObservedSpeciesDto> form = - entityToReadFormDto( - FloatingObjectObservedSpeciesDto.class, - FloatingObject.class, - floatingObject); - - return form; - } - - @Override - public FormDto<FloatingObjectObservedSpeciesDto> loadToEdit(String floatingObjectId) { + public FormDto<FloatingObjectObservedSpeciesDto> loadForm(String floatingObjectId) { FloatingObject floatingObject = loadEntity(FloatingObjectObservedSpeciesDto.class, FloatingObject.class, floatingObjectId); @@ -60,10 +42,8 @@ public class ObjectObservedSpeciesServiceTopia extends ObserveServiceTopia imple FormDto<FloatingObjectObservedSpeciesDto> form = entityToEditFormDto( FloatingObjectObservedSpeciesDto.class, - FloatingObject.class, floatingObject, - new ReferenceTypeName(ObjectObservedSpeciesDto.class, SpeciesDto.class, ObjectObservedSpeciesDto.PROPERTY_SPECIES), - new ReferenceTypeName(ObjectObservedSpeciesDto.class, SpeciesStatusDto.class, ObjectObservedSpeciesDto.PROPERTY_SPECIES_STATUS)); + ObserveReferenceSetRequestDefinitions.FLOATING_OBJECT_OBSERVED_SPECIES_FORM); return form; } 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 51a1c05..4179233 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 @@ -26,6 +26,7 @@ import fr.ird.observe.entities.seine.FloatingObject; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceTypeName; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateDto; import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto; @@ -37,19 +38,7 @@ import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto; public class ObjectSchoolEstimateServiceTopia extends ObserveServiceTopia implements ObjectSchoolEstimateService { @Override - public FormDto<FloatingObjectSchoolEstimateDto> loadToRead(String floatingObjectId) { - - FloatingObject floatingObject = - loadEntity(FloatingObjectSchoolEstimateDto.class, FloatingObject.class, floatingObjectId); - - FormDto<FloatingObjectSchoolEstimateDto> form = - entityToReadFormDto(FloatingObjectSchoolEstimateDto.class, FloatingObject.class, floatingObject); - - return form; - } - - @Override - public FormDto<FloatingObjectSchoolEstimateDto> loadToEdit(String floatingObjectId) { + public FormDto<FloatingObjectSchoolEstimateDto> loadForm(String floatingObjectId) { FloatingObject floatingObject = loadEntity(FloatingObjectSchoolEstimateDto.class, FloatingObject.class, floatingObjectId); @@ -57,8 +46,8 @@ public class ObjectSchoolEstimateServiceTopia extends ObserveServiceTopia implem FormDto<FloatingObjectSchoolEstimateDto> form = entityToEditFormDto( FloatingObjectSchoolEstimateDto.class, - FloatingObject.class, floatingObject, + ObserveReferenceSetRequestDefinitions.FLOATING_OBJECT_SCHOOL_ESTIMATE_FORM, new ReferenceTypeName(ObjectSchoolEstimateDto.class, SpeciesDto.class, ObjectObservedSpeciesDto.PROPERTY_SPECIES)); return form; 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 2f3e494..b82c596 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 @@ -113,18 +113,6 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi } @Override - public FormDto<RouteDto> loadToRead(String routeId) { - - Route route = loadEntity(RouteDto.class, Route.class, routeId); - - FormDto<RouteDto> form = entityToReadFormDto(RouteDto.class, Route.class, route); - - bindFindeVeilleProperties(route.getActivitySeine(), form.getForm().getActivitySeine()); - - return form; - } - - @Override public ReferenceDto<RouteDto> loadReferenceToRead(String routeId) { Route route = loadEntity(RouteDto.class, Route.class, routeId); @@ -148,11 +136,11 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi } @Override - public FormDto<RouteDto> loadToEdit(String routeId) { + public FormDto<RouteDto> loadForm(String routeId) { Route route = loadEntity(RouteDto.class, Route.class, routeId); - FormDto<RouteDto> form = entityToEditFormDto(RouteDto.class, Route.class, route); + FormDto<RouteDto> form = entityToEditFormDto(RouteDto.class, route, null); bindFindeVeilleProperties(route.getActivitySeine(), form.getForm().getActivitySeine()); @@ -187,7 +175,7 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi preCreated.setDate(DateUtil.getDay(date)); - FormDto<RouteDto> form = entityToEditFormDto(RouteDto.class, Route.class, preCreated); + FormDto<RouteDto> form = entityToEditFormDto(RouteDto.class, preCreated, null); return form; } 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 abf9075..8a7aa39 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 @@ -22,17 +22,13 @@ package fr.ird.observe.services.service.seine; * #L% */ -import com.google.common.collect.ImmutableMap; import fr.ird.observe.entities.referentiel.Ocean; -import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.seine.SchoolEstimate; import fr.ird.observe.entities.seine.SetSeine; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceTypeName; -import fr.ird.observe.services.dto.referential.SpeciesDto; -import fr.ird.observe.services.dto.seine.SchoolEstimateDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto; import fr.ird.observe.services.dto.seine.TripSeineDto; @@ -40,18 +36,9 @@ import fr.ird.observe.services.dto.seine.TripSeineDto; * @author Sylvain Bavencoff - bavencoff@codelutin.com */ public class SchoolEstimateServiceTopia extends ObserveServiceTopia implements SchoolEstimateService { - @Override - public FormDto<SetSeineSchoolEstimateDto> loadToRead(String setSeineId) { - - SetSeine setSeine = loadEntity(SetSeineSchoolEstimateDto.class, SetSeine.class, setSeineId); - - FormDto<SetSeineSchoolEstimateDto> form = entityToReadFormDto(SetSeineSchoolEstimateDto.class, SetSeine.class, setSeine); - - return form; - } @Override - public FormDto<SetSeineSchoolEstimateDto> loadToEdit(String setSeineId, String tripSeineId) { + public FormDto<SetSeineSchoolEstimateDto> loadForm(String setSeineId, String tripSeineId) { SetSeine setSeine = loadEntity(SetSeineSchoolEstimateDto.class, SetSeine.class, setSeineId); @@ -61,10 +48,10 @@ public class SchoolEstimateServiceTopia extends ObserveServiceTopia implements S FormDto<SetSeineSchoolEstimateDto> form = entityToEditFormDto( SetSeineSchoolEstimateDto.class, - SetSeine.class, setSeine, - ImmutableMap.<String, Object>of(Species.PROPERTY_OCEAN, ocean), - new ReferenceTypeName(SchoolEstimateDto.class, SpeciesDto.class, SchoolEstimateDto.PROPERTY_SPECIES)); + ObserveReferenceSetRequestDefinitions.SET_SEINE_SCHOOL_ESTIMATE_FORM + //ImmutableMap.<String, Object>of(Species.PROPERTY_OCEAN, ocean), //FIXME context + ); return form; } 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 9c7bc1a..f3a8116 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 @@ -29,6 +29,7 @@ import fr.ird.observe.entities.seine.SetSeine; 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.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.SetSeineDto; @@ -43,16 +44,6 @@ import java.util.Date; public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSeineService { @Override - public FormDto<SetSeineDto> loadToRead(String setSeineId) { - - SetSeine setSeine = loadEntity(SetSeineDto.class, SetSeine.class, setSeineId); - - FormDto<SetSeineDto> form = entityToReadFormDto(SetSeineDto.class, SetSeine.class, setSeine); - - return form; - } - - @Override public ReferenceDto<SetSeineDto> loadReferenceToRead(String setSeineId) { SetSeine setSeine = loadEntity(SetSeineDto.class, SetSeine.class, setSeineId); @@ -73,11 +64,13 @@ public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSein } @Override - public FormDto<SetSeineDto> loadToEdit(String setSeineId) { + public FormDto<SetSeineDto> loadForm(String setSeineId) { SetSeine setSeine = loadEntity(SetSeineDto.class, SetSeine.class, setSeineId); - FormDto<SetSeineDto> form = entityToEditFormDto(SetSeineDto.class, SetSeine.class, setSeine); + FormDto<SetSeineDto> form = entityToEditFormDto(SetSeineDto.class, + setSeine, + ObserveReferenceSetRequestDefinitions.SET_SEINE_FORM); return form; } @@ -89,7 +82,7 @@ public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSein ActivitySeine activitySeine = loadEntity(ActivitySeineDto.class, ActivitySeine.class, activitySeineId); - if (! route.containsActivitySeine(activitySeine)) { + if (!route.containsActivitySeine(activitySeine)) { throw new DataNotFoundException(ActivitySeineDto.class, activitySeineId); } @@ -114,7 +107,9 @@ public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSein SchoolType schoolType = activitySeine.getSchoolType(); preCreated.setSchoolType(schoolType); - FormDto<SetSeineDto> form = entityToEditFormDto(SetSeineDto.class, SetSeine.class, preCreated); + FormDto<SetSeineDto> form = entityToEditFormDto(SetSeineDto.class, + preCreated, + ObserveReferenceSetRequestDefinitions.SET_SEINE_FORM); return form; 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 254b91a..ab6adc4 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 @@ -1,7 +1,6 @@ package fr.ird.observe.services.service.seine; import com.google.common.base.Optional; -import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -16,10 +15,7 @@ import fr.ird.observe.entities.seine.TargetSample; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceTypeName; -import fr.ird.observe.services.dto.referential.SpeciesDto; -import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; -import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; import fr.ird.observe.services.dto.seine.SetSeineTargetCatchDto; @@ -38,29 +34,7 @@ import java.util.Set; public class TargetCatchServiceTopia extends ObserveServiceTopia implements TargetCatchService { @Override - public FormDto<SetSeineTargetCatchDto> loadToRead(String setSeineId, boolean discarded) { - - SetSeine setSeine = loadEntity(SetSeineTargetCatchDto.class, SetSeine.class, setSeineId); - - FormDto<SetSeineTargetCatchDto> form = entityToReadFormDto(SetSeineTargetCatchDto.class, SetSeine.class, setSeine); - - SetSeineTargetCatchDto setSeineTargetCatchDto = form.getForm(); - - setSeineTargetCatchDto.setDiscarded(discarded); - - // on filtre les captures pour ne garder que les conservées ou les rejetées - Collection<TargetCatchDto> allTargetCatchDtos = setSeineTargetCatchDto.getTargetCatch(); - - List<TargetCatchDto> targetCatchDtos = Lists.newArrayList(Iterables.filter(allTargetCatchDtos, TargetCatchDtos.newDiscardedPredicate(discarded))); - - setSeineTargetCatchDto.setTargetCatch(targetCatchDtos); - - - return form; - } - - @Override - public FormDto<SetSeineTargetCatchDto> loadToEdit(String setSeineId, boolean discarded, String tripSeineId) { + public FormDto<SetSeineTargetCatchDto> loadForm(String setSeineId, boolean discarded, String tripSeineId) { SetSeine setSeine = loadEntity(SetSeineTargetCatchDto.class, SetSeine.class, setSeineId); @@ -70,12 +44,10 @@ public class TargetCatchServiceTopia extends ObserveServiceTopia implements Targ FormDto<SetSeineTargetCatchDto> form = entityToEditFormDto( SetSeineTargetCatchDto.class, - SetSeine.class, setSeine, - ImmutableMap.<String, Object>of(Species.PROPERTY_OCEAN, ocean), - new ReferenceTypeName(TargetCatchDto.class, SpeciesDto.class, TargetCatchDto.PROPERTY_SPECIES), - new ReferenceTypeName(TargetCatchDto.class, ReasonForDiscardDto.class, TargetCatchDto.PROPERTY_REASON_FOR_DISCARD), - new ReferenceTypeName(TargetCatchDto.class, WeightCategoryDto.class, TargetCatchDto.PROPERTY_WEIGHT_CATEGORY)); + ObserveReferenceSetRequestDefinitions.SET_SEINE_TARGET_CATCH_FORM + //ImmutableMap.<String, Object>of(Species.PROPERTY_OCEAN, ocean), //FIXME context + ); SetSeineTargetCatchDto setSeineTargetCatchDto = form.getForm(); @@ -129,7 +101,7 @@ public class TargetCatchServiceTopia extends ObserveServiceTopia implements Targ List<TargetCatchDto> otherTargetCatchDtos = Lists.newArrayList(Iterables.filter( allTargetCatchDtos, - TargetCatchDtos.newDiscardedPredicate( ! dto.isDiscarded()))); + TargetCatchDtos.newDiscardedPredicate(!dto.isDiscarded()))); dto.addAllTargetCatch(otherTargetCatchDtos); @@ -152,7 +124,7 @@ public class TargetCatchServiceTopia extends ObserveServiceTopia implements Targ for (TargetLength targetLength : targetSample.getTargetLength()) { - if (! speciesCatchs.contains(targetLength.getSpecies())) { + if (!speciesCatchs.contains(targetLength.getSpecies())) { targetLengthToDelete.add(targetLength); 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 a55f943..656ea17 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,7 +32,7 @@ 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.ReferenceSetDto; -import fr.ird.observe.services.dto.ReferenceTypeName; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; @@ -73,19 +73,7 @@ public class TargetSampleServiceTopia extends ObserveServiceTopia implements Tar } @Override - public FormDto<TargetSampleDto> loadToRead(String setSeineId, boolean discarded) { - - SetSeine setSeine = loadEntity(SetSeineDto.class, SetSeine.class, setSeineId); - - TargetSample targetSample = getTargetSample(setSeine, discarded); - - FormDto<TargetSampleDto> form = entityToReadFormDto(TargetSampleDto.class, TargetSample.class, targetSample); - - return form; - } - - @Override - public FormDto<TargetSampleDto> loadToEdit(String setSeineId, boolean discarded) { + public FormDto<TargetSampleDto> loadForm(String setSeineId, boolean discarded) { SetSeine setSeine = loadEntity(SetSeineDto.class, SetSeine.class, setSeineId); @@ -93,9 +81,8 @@ public class TargetSampleServiceTopia extends ObserveServiceTopia implements Tar FormDto<TargetSampleDto> form = entityToEditFormDto( TargetSampleDto.class, - TargetSample.class, targetSample, - new ReferenceTypeName(TargetLengthDto.class, SpeciesDto.class, TargetLengthDto.PROPERTY_SPECIES)); + ObserveReferenceSetRequestDefinitions.TARGET_SAMPLE_FORM); // on filtre la list des espéces cibles Set<Species> speciesSet = Sets.newLinkedHashSet(); 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 67fd1cb..21429cb 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 @@ -25,12 +25,8 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.entities.seine.FloatingObject; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.ReferenceTypeName; -import fr.ird.observe.services.dto.referential.CountryDto; -import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto; -import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto; -import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -38,19 +34,7 @@ import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; public class TransmittingBuoyOperationServiceTopia extends ObserveServiceTopia implements TransmittingBuoyOperationService { @Override - public FormDto<FloatingObjectTransmittingBuoyDto> loadToRead(String floatingObjectId) { - - FloatingObject floatingObject = - loadEntity(FloatingObjectTransmittingBuoyDto.class, FloatingObject.class, floatingObjectId); - - FormDto<FloatingObjectTransmittingBuoyDto> form = - entityToReadFormDto(FloatingObjectTransmittingBuoyDto.class, FloatingObject.class, floatingObject); - - return form; - } - - @Override - public FormDto<FloatingObjectTransmittingBuoyDto> loadToEdit(String floatingObjectId) { + public FormDto<FloatingObjectTransmittingBuoyDto> loadForm(String floatingObjectId) { FloatingObject floatingObject = loadEntity(FloatingObjectTransmittingBuoyDto.class, FloatingObject.class, floatingObjectId); @@ -58,11 +42,8 @@ public class TransmittingBuoyOperationServiceTopia extends ObserveServiceTopia i FormDto<FloatingObjectTransmittingBuoyDto> form = entityToEditFormDto( FloatingObjectTransmittingBuoyDto.class, - FloatingObject.class, floatingObject, - new ReferenceTypeName(TransmittingBuoyDto.class, TransmittingBuoyOperationDto.class, TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_OPERATION), - new ReferenceTypeName(TransmittingBuoyDto.class, TransmittingBuoyTypeDto.class, TransmittingBuoyDto.PROPERTY_TRANSMITTING_BUOY_TYPE), - new ReferenceTypeName(TransmittingBuoyDto.class, CountryDto.class, TransmittingBuoyDto.PROPERTY_COUNTRY)); + ObserveReferenceSetRequestDefinitions.FLOATING_OBJECT_TRANSMITTING_BUOY_FORM); return form; } 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 e8b0e7f..63856c8 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 @@ -26,13 +26,9 @@ import fr.ird.observe.entities.seine.TripSeine; 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.ReferenceTypeName; -import fr.ird.observe.services.dto.referential.GearCaracteristicDto; -import fr.ird.observe.services.dto.referential.GearDto; +import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.result.SaveResultDtos; -import fr.ird.observe.services.dto.seine.GearUseFeaturesMeasurementSeineDto; -import fr.ird.observe.services.dto.seine.GearUseFeaturesSeineDto; import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; /** @@ -41,26 +37,14 @@ import fr.ird.observe.services.dto.seine.TripSeineGearUseDto; public class TripSeineGearUseServiceTopia extends ObserveServiceTopia implements TripSeineGearUseService { @Override - public FormDto<TripSeineGearUseDto> loadToRead(String tripSeineId) { - - TripSeine tripSeine = loadEntity(TripSeineGearUseDto.class, TripSeine.class, tripSeineId); - - FormDto<TripSeineGearUseDto> form = entityToReadFormDto(TripSeineGearUseDto.class, TripSeine.class, tripSeine); - - return form; - } - - @Override - public FormDto<TripSeineGearUseDto> loadToEdit(String tripSeineId) { + public FormDto<TripSeineGearUseDto> loadForm(String tripSeineId) { TripSeine tripSeine = loadEntity(TripSeineGearUseDto.class, TripSeine.class, tripSeineId); FormDto<TripSeineGearUseDto> form = entityToEditFormDto( TripSeineGearUseDto.class, - TripSeine.class, tripSeine, - new ReferenceTypeName(GearUseFeaturesSeineDto.class, GearDto.class, GearUseFeaturesSeineDto.PROPERTY_GEAR), - new ReferenceTypeName(GearUseFeaturesMeasurementSeineDto.class, GearCaracteristicDto.class, GearUseFeaturesMeasurementSeineDto.PROPERTY_GEAR_CARACTERISTIC)); + ObserveReferenceSetRequestDefinitions.TRIP_SEINE_GEAR_USE_FORM); return form; } 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 4473b56..aed6e26 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 @@ -22,7 +22,6 @@ package fr.ird.observe.services.service.seine; * #L% */ -import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.constants.ReferenceLocale; @@ -35,6 +34,7 @@ import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.ReferenceSetDtos; import fr.ird.observe.services.dto.TripMapDto; +import fr.ird.observe.services.dto.TripMapDtos; import fr.ird.observe.services.dto.TripMapPointDto; import fr.ird.observe.services.dto.reference.definition.ObserveReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.referential.ProgramDto; @@ -115,11 +115,9 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe TripSeine tripSeine = loadEntity(TripSeineDto.class, TripSeine.class, tripSeineId); - FormDto<TripSeineDto> form = entityToEditFormDto(TripSeineDto.class, TripSeine.class, tripSeine); - //FIXME Remove labels building from the entityToEditFormDto method - form.setLabels(ImmutableList.<ReferenceSetDto>of()); - - form.setReferentialReferenceSetRequestName(ObserveReferenceSetRequestDefinitions.TRIP_SEINE_FORM.name()); + FormDto<TripSeineDto> form = entityToEditFormDto(TripSeineDto.class, + tripSeine, + ObserveReferenceSetRequestDefinitions.TRIP_SEINE_FORM); TripSeineDto tripSeineDto = form.getForm(); @@ -134,7 +132,7 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe @Override public TripSeineDto loadDto(String tripSeineId) { - TripSeineDto dto= loadEntityToDto(TripSeineDto.class, tripSeineId); + TripSeineDto dto = loadEntityToDto(TripSeineDto.class, tripSeineId); return dto; } @@ -143,13 +141,9 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe LinkedHashSet<TripMapPointDto> points = getDao().extractTripMapActivityPoints(tripSeineId); - TripMapDto tripMapDto = new TripMapDto(); - - tripMapDto.setId(tripSeineId); - - tripMapDto.setPoints(points); - + TripMapDto tripMapDto = TripMapDtos.newTripMapDto(tripSeineId, points); return tripMapDto; + } @Override @@ -181,8 +175,9 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe tripSeine.setProgram(program); - FormDto<TripSeineDto> form = entityToEditFormDto(TripSeineDto.class, TripSeine.class, tripSeine); - form.setReferentialReferenceSetRequestName(ObserveReferenceSetRequestDefinitions.TRIP_SEINE_FORM.name()); + FormDto<TripSeineDto> form = entityToEditFormDto(TripSeineDto.class, + tripSeine, + ObserveReferenceSetRequestDefinitions.TRIP_SEINE_FORM); return form; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.