This is an automated email from the git hooks/post-receive script. New commit to branch feature/7621 in repository observe. See http://git.codelutin.com/observe.git commit bc4c52c395819435bba9d10e48825c0ff44b52ca Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 9 13:39:24 2015 +0100 - réordonnement des méthodes de service - ajout d'une méthode pour déplacer un trip dans un autre programme --- .../longline/ActivityLonglineServiceController.java | 10 +++++----- .../v1/longline/SetLonglineServiceController.java | 9 +++++---- .../v1/longline/TripLonglineServiceController.java | 9 +++++++-- .../v1/seine/ActivitySeineServiceController.java | 9 +++++---- .../v1/seine/FloatingObjectServiceController.java | 9 +++++---- .../controller/v1/seine/RouteServiceController.java | 9 +++++---- .../v1/seine/SetSeineServiceController.java | 9 +++++---- .../v1/seine/TripSeineServiceController.java | 9 +++++++-- .../ird/observe/ObserveTopiaPersistenceContext.java | 4 ++++ .../service/longline/ActivityLonglineService.java | 5 +++-- .../services/service/longline/SetLonglineService.java | 5 +++-- .../service/longline/TripLonglineService.java | 10 ++++++++-- .../services/service/seine/ActivitySeineService.java | 5 +++-- .../services/service/seine/FloatingObjectService.java | 5 +++-- .../observe/services/service/seine/RouteService.java | 5 +++-- .../services/service/seine/SetSeineService.java | 5 +++-- .../services/service/seine/TripSeineService.java | 9 +++++++-- .../longline/ActivityLonglineServiceTopia.java | 9 +++++---- .../service/longline/SetLonglineServiceTopia.java | 10 ++++++---- .../service/longline/TripLonglineServiceTopia.java | 19 +++++++++++++++++-- .../service/seine/ActivitySeineServiceTopia.java | 9 +++++---- .../service/seine/FloatingObjectServiceTopia.java | 9 +++++---- .../services/service/seine/RouteServiceTopia.java | 9 +++++---- .../services/service/seine/SetSeineServiceTopia.java | 9 +++++---- .../services/service/seine/TripSeineServiceTopia.java | 13 +++++++++++-- 25 files changed, 140 insertions(+), 73 deletions(-) diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java index 09ef623..0c654b2 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/ActivityLonglineServiceController.java @@ -65,6 +65,11 @@ public class ActivityLonglineServiceController extends ObserveAuthenticatedServi } @Override + public boolean exists(String activityLonglineId) { + return service.exists(activityLonglineId); + } + + @Override public FormDto<ActivityLonglineDto> loadToEdit(String activityLonglineId) { return service.loadToEdit(activityLonglineId); } @@ -83,9 +88,4 @@ public class ActivityLonglineServiceController extends ObserveAuthenticatedServi public boolean delete(String tripLonglineId, String activityLonglineId) { return service.delete(tripLonglineId, activityLonglineId); } - - @Override - public boolean exists(String id) { - return service.exists(id); - } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java index 0045c68..5e4a29d 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/SetLonglineServiceController.java @@ -54,6 +54,11 @@ public class SetLonglineServiceController extends ObserveAuthenticatedServiceCon } @Override + public boolean exists(String setLonglineId) { + return service.exists(setLonglineId); + } + + @Override public FormDto<SetLonglineDto> loadToEdit(String setLonglineId) { return service.loadToEdit(setLonglineId); } @@ -73,8 +78,4 @@ public class SetLonglineServiceController extends ObserveAuthenticatedServiceCon service.delete(activityLonglineId, setLonglineId); } - @Override - public boolean exists(String id) { - return service.exists(id); - } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java index 14f0152..4f66c33 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/longline/TripLonglineServiceController.java @@ -76,6 +76,11 @@ public class TripLonglineServiceController extends ObserveAuthenticatedServiceCo } @Override + public boolean exists(String tripLonglineId) { + return service.exists(tripLonglineId); + } + + @Override public FormDto<TripLonglineDto> loadToEdit(String tripLonglineId) { return service.loadToEdit(tripLonglineId); } @@ -96,7 +101,7 @@ public class TripLonglineServiceController extends ObserveAuthenticatedServiceCo } @Override - public boolean exists(String id) { - return service.exists(id); + public int moveTripLonglineToProgram(String tripLonglineId, String programId) { + return service.moveTripLonglineToProgram(tripLonglineId, programId); } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java index f3c2b56..7339cf0 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineServiceController.java @@ -65,6 +65,11 @@ public class ActivitySeineServiceController extends ObserveAuthenticatedServiceC } @Override + public boolean exists(String activitySeineId) { + return service.exists(activitySeineId); + } + + @Override public FormDto<ActivitySeineDto> loadToEdit(String activitySeineId) { return service.loadToEdit(activitySeineId); } @@ -84,8 +89,4 @@ public class ActivitySeineServiceController extends ObserveAuthenticatedServiceC service.delete(routeId, activitySeineId); } - @Override - public boolean exists(String id) { - return service.exists(id); - } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java index faaeb71..c4ed148 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/FloatingObjectServiceController.java @@ -59,6 +59,11 @@ public class FloatingObjectServiceController extends ObserveAuthenticatedService } @Override + public boolean exists(String floatingObjectId) { + return service.exists(floatingObjectId); + } + + @Override public FormDto<FloatingObjectDto> loadToEdit(String floatingObjectId) { return service.loadToEdit(floatingObjectId); } @@ -78,8 +83,4 @@ public class FloatingObjectServiceController extends ObserveAuthenticatedService service.delete(activitySeineId, floatingObjectId); } - @Override - public boolean exists(String id) { - return service.exists(id); - } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java index d293f45..5a42d30 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/RouteServiceController.java @@ -65,6 +65,11 @@ public class RouteServiceController extends ObserveAuthenticatedServiceControlle } @Override + public boolean exists(String routeId) { + return service.exists(routeId); + } + + @Override public FormDto<RouteDto> loadToEdit(String routeId) { return service.loadToEdit(routeId); } @@ -84,8 +89,4 @@ public class RouteServiceController extends ObserveAuthenticatedServiceControlle return service.delete(tripSeineId, routeId); } - @Override - public boolean exists(String id) { - return service.exists(id); - } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java index 4ece2e0..39e3f11 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/SetSeineServiceController.java @@ -53,6 +53,11 @@ public class SetSeineServiceController extends ObserveAuthenticatedServiceContro } @Override + public boolean exists(String setSeineId) { + return service.exists(setSeineId); + } + + @Override public FormDto<SetSeineDto> loadToEdit(String setSeineId) { return service.loadToEdit(setSeineId); } @@ -72,8 +77,4 @@ public class SetSeineServiceController extends ObserveAuthenticatedServiceContro service.delete(activitySeineId, setSeineId); } - @Override - public boolean exists(String id) { - return service.exists(id); - } } diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java index 2e33819..cf321f5 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/TripSeineServiceController.java @@ -71,6 +71,11 @@ public class TripSeineServiceController extends ObserveAuthenticatedServiceContr } @Override + public boolean exists(String tripSeineId) { + return service.exists(tripSeineId); + } + + @Override public FormDto<TripSeineDto> loadToEdit(String tripSeineId) { return service.loadToEdit(tripSeineId); } @@ -96,7 +101,7 @@ public class TripSeineServiceController extends ObserveAuthenticatedServiceContr } @Override - public boolean exists(String id) { - return service.exists(id); + public int moveTripSeineToProgram(String tripSeineId, String programId) { + return service.moveTripSeineToProgram(tripSeineId, programId); } } diff --git a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java index 30db7d1..5b87f16 100644 --- a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java +++ b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java @@ -30,4 +30,8 @@ public class ObserveTopiaPersistenceContext extends AbstractObserveTopiaPersiste super(parameter); } + public void flush() { + getHibernateSupport().getHibernateSession().flush(); + } + } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java index a41d822..bf22503 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/ActivityLonglineService.java @@ -54,6 +54,9 @@ public interface ActivityLonglineService extends ObserveService { @ReadDataPermission ActivityLonglineDto loadDto(String activityLonglineId); + @ReadDataPermission + boolean exists(String activityLonglineId); + @WriteDataPermission FormDto<ActivityLonglineDto> loadToEdit(String activityLonglineId); @@ -73,6 +76,4 @@ public interface ActivityLonglineService extends ObserveService { */ boolean delete(String tripLonglineId, String activityLonglineId); - @ReadDataPermission - boolean exists(String id); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java index f79c983..9e97abe 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/SetLonglineService.java @@ -47,6 +47,9 @@ public interface SetLonglineService extends ObserveService { @ReadDataPermission SetLonglineDto loadDto(String setLonglineId); + @ReadDataPermission + boolean exists(String setLonglineId); + @WriteDataPermission FormDto<SetLonglineDto> loadToEdit(String setLonglineId); @@ -63,6 +66,4 @@ public interface SetLonglineService extends ObserveService { @DeleteRequest void delete(String activityLonglineId, String setLonglineId); - @ReadDataPermission - boolean exists(String id); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java index 2bcee1d..45b37f5 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/longline/TripLonglineService.java @@ -61,6 +61,9 @@ public interface TripLonglineService extends ObserveService { @ReadDataPermission ReferenceDto<TripLonglineDto> loadReferenceToRead(String tripLonglineId); + @ReadDataPermission + boolean exists(String tripLonglineId); + @WriteDataPermission FormDto<TripLonglineDto> loadToEdit(String tripLonglineId); @@ -77,6 +80,9 @@ public interface TripLonglineService extends ObserveService { @DeleteRequest void delete(String tripLonglineId); - @ReadDataPermission - boolean exists(String id); + @Write + @WriteDataPermission + @PostRequest + int moveTripLonglineToProgram(String tripLonglineId, String programId); + } \ No newline at end of file diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java index 12fa516..1fb15f8 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineService.java @@ -54,6 +54,9 @@ public interface ActivitySeineService extends ObserveService { @ReadDataPermission ActivitySeineDto loadDto(String activitySeineId); + @ReadDataPermission + boolean exists(String activitySeineId); + @WriteDataPermission FormDto<ActivitySeineDto> loadToEdit(String activitySeineId); @@ -70,6 +73,4 @@ public interface ActivitySeineService extends ObserveService { @DeleteRequest void delete(String routeId, String activitySeineId); - @ReadDataPermission - boolean exists(String id); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java index e41aa1d..7c473ea 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/FloatingObjectService.java @@ -50,6 +50,9 @@ public interface FloatingObjectService extends ObserveService { @ReadDataPermission FloatingObjectDto loadDto(String floatingObjectId); + @ReadDataPermission + boolean exists(String floatingObjectId); + @WriteDataPermission FormDto<FloatingObjectDto> loadToEdit(String floatingObjectId); @@ -66,6 +69,4 @@ public interface FloatingObjectService extends ObserveService { @DeleteRequest void delete(String activitySeineId, String floatingObjectId); - @ReadDataPermission - boolean exists(String id); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java index 01c8ffb..57d5e68 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/RouteService.java @@ -54,6 +54,9 @@ public interface RouteService extends ObserveService { @ReadDataPermission RouteDto loadDto(String routeId); + @ReadDataPermission + boolean exists(String routeId); + @WriteDataPermission FormDto<RouteDto> loadToEdit(String routeId); @@ -70,6 +73,4 @@ public interface RouteService extends ObserveService { @DeleteRequest boolean delete(String tripSeineId, String routeId); - @ReadDataPermission - boolean exists(String id); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java index c6a4ed1..456ed6a 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/SetSeineService.java @@ -46,6 +46,9 @@ public interface SetSeineService extends ObserveService { @ReadDataPermission SetSeineDto loadDto(String setSeineId); + @ReadDataPermission + boolean exists(String setSeineId); + @WriteDataPermission FormDto<SetSeineDto> loadToEdit(String setSeineId); @@ -62,6 +65,4 @@ public interface SetSeineService extends ObserveService { @DeleteRequest void delete(String activitySeineId, String setSeineId); - @ReadDataPermission - boolean exists(String id); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java index 8b54504..937cb3d 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/seine/TripSeineService.java @@ -60,6 +60,9 @@ public interface TripSeineService extends ObserveService { @ReadDataPermission ReferenceDto<TripSeineDto> loadReferenceToRead(String tripSeineId); + @ReadDataPermission + boolean exists(String tripSeineId); + @WriteDataPermission FormDto<TripSeineDto> loadToEdit(String tripSeineId); @@ -76,6 +79,8 @@ public interface TripSeineService extends ObserveService { @DeleteRequest void delete(String tripSeineId); - @ReadDataPermission - boolean exists(String id); + @Write + @WriteDataPermission + @PostRequest + int moveTripSeineToProgram(String tripSeineId, String programId); } \ No newline at end of file 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 c401b7c..2fd8d7c 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 @@ -121,6 +121,11 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements } @Override + public boolean exists(String activityLonglineId) { + return existsEntity(ActivityLongline.class, activityLonglineId); + } + + @Override public FormDto<ActivityLonglineDto> loadToEdit(String activityLonglineId) { ActivityLongline activityLongline = loadEntity(ActivityLonglineDto.class, ActivityLongline.class, activityLonglineId); @@ -230,8 +235,4 @@ public class ActivityLonglineServiceTopia extends ObserveServiceTopia implements return wasEndDateUpdated; } - @Override - public boolean exists(String id) { - return existsEntity(ActivityLongline.class, id); - } } 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 1e5cdb3..2051283 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 @@ -68,6 +68,11 @@ public class SetLonglineServiceTopia extends ObserveServiceTopia implements SetL } @Override + public boolean exists(String setLonglineId) { + return existsEntity(SetLongline.class, setLonglineId); + } + + @Override public FormDto<SetLonglineDto> loadToEdit(String setLonglineId) { SetLongline setLongline = loadEntity(SetLonglineDto.class, SetLongline.class, setLonglineId); @@ -147,8 +152,5 @@ public class SetLonglineServiceTopia extends ObserveServiceTopia implements SetL } - @Override - public boolean exists(String id) { - return existsEntity(SetLongline.class, id); - } + } 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 a1576ab..440325f 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 @@ -24,6 +24,7 @@ package fr.ird.observe.services.service.longline; import com.google.common.base.Optional; import com.google.common.collect.Sets; +import fr.ird.observe.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.constants.ReferenceLocale; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.longline.TripLonglineTopiaDao; @@ -151,6 +152,11 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri } @Override + public boolean exists(String tripLonglineId) { + return existsEntity(TripLongline.class, tripLonglineId); + } + + @Override public FormDto<TripLonglineDto> loadToEdit(String tripLonglineId) { TripLongline tripLongline = loadEntity(TripLonglineDto.class, TripLongline.class, tripLonglineId); @@ -206,7 +212,16 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri } @Override - public boolean exists(String id) { - return existsEntity(TripLongline.class, id); + public int moveTripLonglineToProgram(String tripLonglineId, String programId) { + TripLongline tripLongline = loadEntity(TripLonglineDto.class, TripLongline.class, tripLonglineId); + Program program = loadEntity(ProgramDto.class, Program.class, programId); + + tripLongline.setProgram(program); + saveEntity(TripLongline.class, tripLongline); + + ObserveTopiaPersistenceContext persistenceContext = serviceContext.getTopiaPersistenceContext(); + persistenceContext.flush(); + + return getTripLonglinePositionInProgram(programId, tripLonglineId); } } 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 e3d438e..a822aa3 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 @@ -128,6 +128,11 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac } @Override + public boolean exists(String activitySeineId) { + return existsEntity(ActivitySeine.class, activitySeineId); + } + + @Override public FormDto<ActivitySeineDto> loadToEdit(String activitySeineId) { ActivitySeine activitySeine = loadEntity(ActivitySeineDto.class, ActivitySeine.class, activitySeineId); @@ -229,8 +234,4 @@ public class ActivitySeineServiceTopia extends ObserveServiceTopia implements Ac } - @Override - public boolean exists(String id) { - return existsEntity(ActivitySeine.class, id); - } } 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 8b13f17..6674efc 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 @@ -99,6 +99,11 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F } @Override + public boolean exists(String floatingObjectId) { + return existsEntity(FloatingObject.class, floatingObjectId); + } + + @Override public FormDto<FloatingObjectDto> loadToEdit(String floatingObjectId) { FloatingObject floatingObject = loadEntity(FloatingObjectDto.class, FloatingObject.class, floatingObjectId); @@ -153,8 +158,4 @@ public class FloatingObjectServiceTopia extends ObserveServiceTopia implements F } - @Override - public boolean exists(String id) { - return existsEntity(FloatingObject.class, id); - } } 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 5d2586f..35041e1 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 @@ -143,6 +143,11 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi } @Override + public boolean exists(String routeId) { + return existsEntity(Route.class, routeId); + } + + @Override public FormDto<RouteDto> loadToEdit(String routeId) { Route route = loadEntity(RouteDto.class, Route.class, routeId); @@ -249,8 +254,4 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi } - @Override - public boolean exists(String id) { - return existsEntity(Route.class, id); - } } 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 630aa11..9c7bc1a 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 @@ -68,6 +68,11 @@ public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSein } @Override + public boolean exists(String setSeineId) { + return existsEntity(SetSeine.class, setSeineId); + } + + @Override public FormDto<SetSeineDto> loadToEdit(String setSeineId) { SetSeine setSeine = loadEntity(SetSeineDto.class, SetSeine.class, setSeineId); @@ -151,8 +156,4 @@ public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSein //FIXME kmorin : faudrait pas sauver quelquechose là ? parcequ'on n'a rien supprimé... } - @Override - public boolean exists(String id) { - return existsEntity(SetSeine.class, id); - } } 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 7a82317..054f0f2 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 @@ -146,6 +146,11 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe } @Override + public boolean exists(String tripSeineId) { + return existsEntity(TripSeine.class, tripSeineId); + } + + @Override public FormDto<TripSeineDto> loadToEdit(String tripSeineId) { TripSeine tripSeine = loadEntity(TripSeineDto.class, TripSeine.class, tripSeineId); @@ -203,7 +208,11 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe } @Override - public boolean exists(String id) { - return existsEntity(TripSeine.class, id); + public int moveTripSeineToProgram(String tripSeineId, String programId) { + TripSeine tripSeine = loadEntity(TripSeineDto.class, TripSeine.class, tripSeineId); + Program program = loadEntity(ProgramDto.class, Program.class, programId); + tripSeine.setProgram(program); + saveEntity(TripSeine.class, tripSeine); + return getTripSeinePositionInProgram(programId, tripSeineId); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.