branch feature/7587 updated (1dcdd98 -> 83e27fc)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7587 in repository observe. See http://git.codelutin.com/observe.git from 1dcdd98 calcule de la nouvelle position de la marée (refs #7587) new 3531dda dans le service save remonter l'id et le lastUpdate dans un SaveResultDto (refs #7587). new 83e27fc créer une methode de service pour recupérer la position d'une marée seine dans un programe (refs #7587). The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 83e27fcbced876ae0bb7e22363349220dc5b11a5 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 7 09:17:06 2015 +0200 créer une methode de service pour recupérer la position d'une marée seine dans un programe (refs #7587). commit 3531ddadf20bac1886cf96b05788a40cc22feb04 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 7 09:04:11 2015 +0200 dans le service save remonter l'id et le lastUpdate dans un SaveResultDto (refs #7587). Summary of changes: .../content/open/impl/seine/TripSeineUIHandler.java | 13 +++++-------- .../v1/seine/TripSeineServiceController.java | 8 +++++++- .../services/service/seine/TripSeineService.java | 9 ++++++--- .../src/main/xmi/observe-services-dto-common.zargo | Bin 41878 -> 42247 bytes .../services/dto/ObserveDtosInitializer.java | 5 +++++ .../service/seine/TripSeineServiceTopia.java | 12 ++++++++++-- .../service/seine/TripSeineServiceTopiaTest.java | 5 +++-- 7 files changed, 36 insertions(+), 16 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7587 in repository observe. See http://git.codelutin.com/observe.git commit 3531ddadf20bac1886cf96b05788a40cc22feb04 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 7 09:04:11 2015 +0200 dans le service save remonter l'id et le lastUpdate dans un SaveResultDto (refs #7587). --- .../content/open/impl/seine/TripSeineUIHandler.java | 6 ++++-- .../v1/seine/TripSeineServiceController.java | 3 ++- .../services/service/seine/TripSeineService.java | 3 ++- .../src/main/xmi/observe-services-dto-common.zargo | Bin 41878 -> 42247 bytes .../services/dto/ObserveDtosInitializer.java | 5 +++++ .../service/seine/TripSeineServiceTopia.java | 6 ++++-- .../service/seine/TripSeineServiceTopiaTest.java | 5 +++-- 7 files changed, 20 insertions(+), 8 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java index a82f283..c98d327 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java @@ -29,6 +29,7 @@ import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDtos; import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.SaveResultDto; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.dto.seine.TripSeineDtos; @@ -271,8 +272,9 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { log.debug("endDate = " + endDate); } - String beanId = getTripSeineService().save(bean); - bean.setId(beanId); + SaveResultDto saveResult = getTripSeineService().save(bean); + bean.setId(saveResult.getId()); + bean.setLastUpdate(saveResult.getLastUpdate()); // recuperation de la position de la maree dans le program obtainChildPosition(bean); 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 b11b6a7..29cc65e 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 @@ -25,6 +25,7 @@ package fr.ird.observe.application.web.controller.v1.seine; import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.SaveResultDto; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.seine.TripSeineService; @@ -64,7 +65,7 @@ public class TripSeineServiceController extends ObserveAuthenticatedServiceContr } @Override - public String save(TripSeineDto dto) { + public SaveResultDto save(TripSeineDto dto) { return service.save(dto); } 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 8fcb7c5..632a71b 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 @@ -25,6 +25,7 @@ package fr.ird.observe.services.service.seine; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.SaveResultDto; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.spi.DeleteRequest; @@ -56,7 +57,7 @@ public interface TripSeineService extends ObserveService { @Write @WriteDataPermission @PostRequest - String save(TripSeineDto dto); + SaveResultDto save(TripSeineDto dto); @Write @WriteDataPermission diff --git a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo index 41d4637..cd26edf 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo differ diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java index e063c72..0620971 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java @@ -351,6 +351,11 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { } @Override + public void initSaveResultDto() { + // Rien à faire + } + + @Override public void initTripMapDto() { // Rien à fairea } 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 6b24fbe..2c789dd 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 @@ -34,6 +34,8 @@ 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.SaveResultDto; +import fr.ird.observe.services.dto.SaveResultDtos; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.TripMapPointDto; import fr.ird.observe.services.dto.referential.ProgramDto; @@ -150,7 +152,7 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe } @Override - public String save(TripSeineDto dto) { + public SaveResultDto save(TripSeineDto dto) { TripSeine tripSeine = dtoToEntity(TripSeineDto.class, TripSeine.class, dto); @@ -159,7 +161,7 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe TripSeineTopiaDao dao = getTopiaPersistenceContext().getTripSeineDao(); dao.updateEndDate(tripSeine); - return tripSeine.getTopiaId(); + return SaveResultDtos.newSaveResult(tripSeine.getTopiaId(), tripSeine.getLastUpdate()); } @Override diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java index 7fec8b0..7b01ea1 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/seine/TripSeineServiceTopiaTest.java @@ -30,6 +30,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.SaveResultDto; import fr.ird.observe.services.dto.referential.HarbourDto; import fr.ird.observe.services.dto.referential.OceanDto; import fr.ird.observe.services.dto.referential.PersonDto; @@ -274,9 +275,9 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { Date lastUpdateBefore = getLastUpdate(TripSeine.class); - String tripSeineId = service.save(formDto.getForm()); + SaveResultDto saveResult = service.save(formDto.getForm()); - TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, tripSeineId); + TripSeine tripSeine = dataSourceResource.findById(TripSeine.class, saveResult.getId()); assertReferenceDtoEqualsEntity(tripSeineDto.getCaptain(), tripSeine.getCaptain()); assertReferenceDtoEqualsEntity(tripSeineDto.getObserver(), tripSeine.getObserver()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7587 in repository observe. See http://git.codelutin.com/observe.git commit 83e27fcbced876ae0bb7e22363349220dc5b11a5 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 7 09:17:06 2015 +0200 créer une methode de service pour recupérer la position d'une marée seine dans un programe (refs #7587). --- .../ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java | 7 +------ .../web/controller/v1/seine/TripSeineServiceController.java | 5 +++++ .../fr/ird/observe/services/service/seine/TripSeineService.java | 6 ++++-- .../ird/observe/services/service/seine/TripSeineServiceTopia.java | 6 ++++++ 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java index c98d327..83de93e 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/TripSeineUIHandler.java @@ -21,14 +21,11 @@ */ package fr.ird.observe.ui.content.open.impl.seine; -import com.google.common.collect.Iterables; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.services.dto.FormDto; -import fr.ird.observe.services.dto.IdDtos; -import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.SaveResultDto; import fr.ird.observe.services.dto.TripMapDto; import fr.ird.observe.services.dto.seine.TripSeineDto; @@ -284,9 +281,7 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { protected int getOpenablePosition(String parentId, TripSeineDto bean) { - ReferenceSetDto<TripSeineDto> tripSeineByProgram = getTripSeineService().getTripSeineByProgram(parentId); - - int position = Iterables.indexOf(tripSeineByProgram.getReference(), IdDtos.newIdPredicate(bean.getId())); + int position = getTripSeineService().getTripSeinePositionInProgram(parentId, bean.getId()); return position; } 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 29cc65e..53a1760 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 @@ -45,6 +45,11 @@ public class TripSeineServiceController extends ObserveAuthenticatedServiceContr } @Override + public int getTripSeinePositionInProgram(String programId, String tripSeineId) { + return service.getTripSeinePositionInProgram(programId, tripSeineId); + } + + @Override public TripMapDto getTripSeineMap(String tripSeineId) { return service.getTripSeineMap(tripSeineId); } 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 632a71b..7dbf404 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 @@ -43,6 +43,9 @@ public interface TripSeineService extends ObserveService { ReferenceSetDto<TripSeineDto> getTripSeineByProgram(String programId); @ReadDataPermission + int getTripSeinePositionInProgram(String programId, String tripSeineId); + + @ReadDataPermission TripMapDto getTripSeineMap(String tripSeineId); @ReadDataPermission @@ -63,5 +66,4 @@ public interface TripSeineService extends ObserveService { @WriteDataPermission @DeleteRequest void delete(String tripSeineId); - - } \ No newline at end of file +} \ No newline at end of file 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 2c789dd..9682918 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 @@ -91,6 +91,12 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe } @Override + public int getTripSeinePositionInProgram(String programId, String tripSeineId) { + int position = getDao().findPositionByProgramId(programId, tripSeineId); + return position; + } + + @Override public TripMapDto getTripSeineMap(String tripSeineId) { LinkedHashSet<TripMapPointDto> points = getDao().extractTripMapActivityPoints(tripSeineId); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm