This is an automated email from the git hooks/post-receive script. New commit to branch feature/7622 in repository observe. See http://git.codelutin.com/observe.git commit d5ae5d99a408202000a752c543a88fffac324a99 Author: Kevin Morin <morin@codelutin.com> Date: Mon Nov 16 16:39:20 2015 +0100 ajout des méthodes pour déplacer une route (refs #7622) --- .../web/controller/v1/seine/RouteServiceController.java | 4 ++++ .../java/fr/ird/observe/services/service/seine/RouteService.java | 3 +++ .../fr/ird/observe/services/service/seine/RouteServiceTopia.java | 8 ++++++++ .../ird/observe/services/service/seine/TripSeineServiceTopia.java | 4 ++++ 4 files changed, 19 insertions(+) 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 5a42d30..7b402f9 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 @@ -89,4 +89,8 @@ public class RouteServiceController extends ObserveAuthenticatedServiceControlle return service.delete(tripSeineId, routeId); } + @Override + public int moveRouteToTripSeine(String routeId, String tripSeineId) { + return service.moveRouteToTripSeine(routeId, tripSeineId); + } } 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 57d5e68..2a321c0 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 @@ -73,4 +73,7 @@ public interface RouteService extends ObserveService { @DeleteRequest boolean delete(String tripSeineId, String routeId); + @Write + @WriteDataPermission + int moveRouteToTripSeine(String routeId, String tripSeineId); } 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 aa49974..70d71a4 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 @@ -261,4 +261,12 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi } + @Override + public int moveRouteToTripSeine(String routeId, String tripSeineId) { + Route route = loadEntity(RouteDto.class, Route.class, routeId); + TripSeine tripSeine = loadEntity(TripSeineDto.class, TripSeine.class, tripSeineId); + tripSeine.addRoute(route); + saveEntity(TripSeine.class, tripSeine); + return getRoutePositionInTripSeine(tripSeineId, routeId); + } } 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 607b7d5..29624ed 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 @@ -215,6 +215,10 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe Program program = loadEntity(ProgramDto.class, Program.class, programId); tripSeine.setProgram(program); saveEntity(TripSeine.class, tripSeine); + + ObserveTopiaPersistenceContext persistenceContext = serviceContext.getTopiaPersistenceContext(); + persistenceContext.flush(); + return getTripSeinePositionInProgram(programId, tripSeineId); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.