[Observe-commits] 02/04: - réordonnement des méthodes de service - ajout d'une méthode pour déplacer un trip dans un autre programme

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 a6153644d7a3a1dd9fb551d8a9c4dd0a1ea2b062 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 | 13 +++++++------ .../v1/longline/TripLonglineServiceController.java | 9 +++++++-- .../v1/seine/ActivitySeineServiceController.java | 9 +++++---- .../v1/seine/FloatingObjectServiceController.java | 13 +++++++------ .../controller/v1/seine/RouteServiceController.java | 13 +++++++------ .../v1/seine/SetSeineServiceController.java | 13 +++++++------ .../v1/seine/TripSeineServiceController.java | 9 +++++++-- .../ird/observe/ObserveTopiaPersistenceContext.java | 4 ++++ .../service/longline/ActivityLonglineService.java | 5 +++-- .../services/service/longline/SetLonglineService.java | 7 ++++--- .../service/longline/TripLonglineService.java | 12 +++++++++--- .../services/service/seine/ActivitySeineService.java | 5 +++-- .../services/service/seine/FloatingObjectService.java | 7 ++++--- .../observe/services/service/seine/RouteService.java | 7 ++++--- .../services/service/seine/SetSeineService.java | 7 ++++--- .../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, 153 insertions(+), 86 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 92702da..2947407 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 @@ -60,6 +60,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); } @@ -78,9 +83,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 3dc91d1..ebac706 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 @@ -44,8 +44,13 @@ public class SetLonglineServiceController extends ObserveAuthenticatedServiceCon } @Override - public ReferenceDto<SetLonglineDto> loadReferenceToRead(String id) { - return service.loadReferenceToRead(id); + public ReferenceDto<SetLonglineDto> loadReferenceToRead(String setLonglineId) { + return service.loadReferenceToRead(setLonglineId); + } + + @Override + public boolean exists(String setLonglineId) { + return service.exists(setLonglineId); } @Override @@ -68,8 +73,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 ac7bfa6..5f9c14e 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 @@ -71,6 +71,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); } @@ -91,7 +96,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 a9a0160..fdc4ccf 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 @@ -60,6 +60,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); } @@ -79,8 +84,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 39929f8..88b9ada 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 @@ -49,8 +49,13 @@ public class FloatingObjectServiceController extends ObserveAuthenticatedService } @Override - public ReferenceDto<FloatingObjectDto> loadReferenceToRead(String id) { - return service.loadReferenceToRead(id); + public ReferenceDto<FloatingObjectDto> loadReferenceToRead(String floatingObjectId) { + return service.loadReferenceToRead(floatingObjectId); + } + + @Override + public boolean exists(String floatingObjectId) { + return service.exists(floatingObjectId); } @Override @@ -73,8 +78,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 f1e917a..5845f7b 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 @@ -55,8 +55,13 @@ public class RouteServiceController extends ObserveAuthenticatedServiceControlle } @Override - public ReferenceDto<RouteDto> loadReferenceToRead(String id) { - return service.loadReferenceToRead(id); + public ReferenceDto<RouteDto> loadReferenceToRead(String routeId) { + return service.loadReferenceToRead(routeId); + } + + @Override + public boolean exists(String routeId) { + return service.exists(routeId); } @Override @@ -79,8 +84,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 e0ea4d8..21716c7 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 @@ -43,8 +43,13 @@ public class SetSeineServiceController extends ObserveAuthenticatedServiceContro } @Override - public ReferenceDto<SetSeineDto> loadReferenceToRead(String id) { - return service.loadReferenceToRead(id); + public ReferenceDto<SetSeineDto> loadReferenceToRead(String setSeineId) { + return service.loadReferenceToRead(setSeineId); + } + + @Override + public boolean exists(String setSeineId) { + return service.exists(setSeineId); } @Override @@ -67,8 +72,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 f92c748..0fb821a 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 @@ -66,6 +66,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); } @@ -91,7 +96,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 683bc15..38453b0 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 @@ -51,6 +51,9 @@ public interface ActivityLonglineService extends ObserveService { @ReadDataPermission ReferenceDto<ActivityLonglineDto> loadReferenceToRead(String activityLonglineId); + @ReadDataPermission + boolean exists(String activityLonglineId); + @WriteDataPermission FormDto<ActivityLonglineDto> loadToEdit(String activityLonglineId); @@ -70,6 +73,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 f64e5d3..d9eb5b3 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 @@ -42,7 +42,10 @@ public interface SetLonglineService extends ObserveService { FormDto<SetLonglineDto> loadToRead(String setLonglineId); @ReadDataPermission - ReferenceDto<SetLonglineDto> loadReferenceToRead(String id); + ReferenceDto<SetLonglineDto> loadReferenceToRead(String setLonglineId); + + @ReadDataPermission + boolean exists(String setLonglineId); @WriteDataPermission FormDto<SetLonglineDto> loadToEdit(String setLonglineId); @@ -60,6 +63,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 c5209d3..d83ea5c 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 @@ -56,7 +56,10 @@ public interface TripLonglineService extends ObserveService { FormDto<TripLonglineDto> loadToRead(String tripLonglineId); @ReadDataPermission - ReferenceDto<TripLonglineDto> loadReferenceToRead(String id); + ReferenceDto<TripLonglineDto> loadReferenceToRead(String tripLonglineId); + + @ReadDataPermission + boolean exists(String tripLonglineId); @WriteDataPermission FormDto<TripLonglineDto> loadToEdit(String tripLonglineId); @@ -74,6 +77,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 95bdf94..d4882d7 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 @@ -51,6 +51,9 @@ public interface ActivitySeineService extends ObserveService { @ReadDataPermission ReferenceDto<ActivitySeineDto> loadReferenceToRead(String activitySeineId); + @ReadDataPermission + boolean exists(String activitySeineId); + @WriteDataPermission FormDto<ActivitySeineDto> loadToEdit(String activitySeineId); @@ -67,6 +70,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 a01ddf2..ccb1ef4 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 @@ -45,7 +45,10 @@ public interface FloatingObjectService extends ObserveService { FormDto<FloatingObjectDto> loadToRead(String floatingObjectId); @ReadDataPermission - ReferenceDto<FloatingObjectDto> loadReferenceToRead(String id); + ReferenceDto<FloatingObjectDto> loadReferenceToRead(String floatingObjectId); + + @ReadDataPermission + boolean exists(String floatingObjectId); @WriteDataPermission FormDto<FloatingObjectDto> loadToEdit(String floatingObjectId); @@ -63,6 +66,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 dbf9c25..9f43d11 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 @@ -49,7 +49,10 @@ public interface RouteService extends ObserveService { FormDto<RouteDto> loadToRead(String routeId); @ReadDataPermission - ReferenceDto<RouteDto> loadReferenceToRead(String id); + ReferenceDto<RouteDto> loadReferenceToRead(String routeId); + + @ReadDataPermission + boolean exists(String routeId); @WriteDataPermission FormDto<RouteDto> loadToEdit(String routeId); @@ -67,6 +70,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 4d50fef..173259d 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 @@ -41,7 +41,10 @@ public interface SetSeineService extends ObserveService { FormDto<SetSeineDto> loadToRead(String setSeineId); @ReadDataPermission - ReferenceDto<SetSeineDto> loadReferenceToRead(String id); + ReferenceDto<SetSeineDto> loadReferenceToRead(String setSeineId); + + @ReadDataPermission + boolean exists(String setSeineId); @WriteDataPermission FormDto<SetSeineDto> loadToEdit(String setSeineId); @@ -59,6 +62,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 ae26efa..e20de8f 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 @@ -57,6 +57,9 @@ public interface TripSeineService extends ObserveService { @ReadDataPermission ReferenceDto<TripSeineDto> loadReferenceToRead(String tripSeineId); + @ReadDataPermission + boolean exists(String tripSeineId); + @WriteDataPermission FormDto<TripSeineDto> loadToEdit(String tripSeineId); @@ -73,6 +76,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 3e96ac0..4fe79b7 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 @@ -116,6 +116,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); @@ -225,8 +230,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 0335193..9228476 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 @@ -63,6 +63,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); @@ -142,8 +147,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 6cdca19..c203954 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; @@ -145,6 +146,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); @@ -200,7 +206,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 e262c85..9087f85 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 @@ -122,6 +122,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); @@ -223,8 +228,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 02243d5..c4210a9 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 @@ -94,6 +94,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); @@ -148,8 +153,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 9985d38..231b186 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 @@ -138,6 +138,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); @@ -244,8 +249,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 4b1a163..eed2aa1 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 @@ -63,6 +63,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); @@ -146,8 +151,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 e4dbe6f..1860fd1 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 @@ -139,6 +139,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); @@ -196,7 +201,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>.