[Observe-commits] 02/03: utilisation des services dans doSave et doDelete

This is an automated email from the git hooks/post-receive script. New commit to branch feature/7531 in repository observe. See http://git.codelutin.com/observe.git commit 4a26bd22257c118708548289976a12a23c7fe298 Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 24 18:15:26 2015 +0200 utilisation des services dans doSave et doDelete --- .../impl/longline/SetLonglineUIHandler.java | 68 +++++------ .../impl/seine/FloatingObjectUIHandler.java | 42 ++++--- .../ui/content/impl/seine/SetSeineUIHandler.java | 70 +++++------ .../open/impl/longline/TripLonglineUIHandler.java | 112 ++++++++--------- .../ui/content/open/impl/seine/RouteUIHandler.java | 133 +++++++++------------ .../open/impl/seine/TripSeineUIHandler.java | 109 ++++++++--------- .../ui/content/table/ContentTableUIHandler.java | 1 - .../impl/seine/TargetDiscardCatchUIHandler.java | 35 +++--- .../v1/longline/SetLonglineServiceController.java | 4 +- .../v1/longline/TripLonglineServiceController.java | 4 +- .../v1/seine/RouteServiceController.java | 9 +- .../v1/seine/SetSeineServiceController.java | 4 +- .../v1/seine/TripSeineServiceController.java | 4 +- .../service/longline/SetLonglineService.java | 2 +- .../service/longline/TripLonglineService.java | 2 +- .../services/service/seine/RouteService.java | 5 +- .../services/service/seine/SetSeineService.java | 2 +- .../services/service/seine/TripSeineService.java | 2 +- .../services/dto/ObserveDtosInitializer.java | 5 + .../service/longline/SetLonglineServiceTopia.java | 4 +- .../service/longline/TripLonglineServiceTopia.java | 7 +- .../services/service/seine/RouteServiceTopia.java | 36 +++++- .../service/seine/SetSeineServiceTopia.java | 5 +- .../service/seine/TripSeineServiceTopia.java | 7 +- .../fr/ird/observe/services/service/RigthTest.java | 2 +- 25 files changed, 338 insertions(+), 336 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java index 0ed76f6..62b2f46 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/SetLonglineUIHandler.java @@ -27,6 +27,7 @@ import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.service.longline.SetLonglineService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; import fr.ird.observe.ui.content.ContentUIModel; @@ -388,27 +389,17 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { } //FIXME -// @Override -// protected boolean doSave(SetLongline bean, -// DataService dataService, -// DataSource dataSource, -// TopiaEntityBinder<SetLongline> binder) throws Exception { -// -// String activityId = getSelectedParentId(); -// -// if (bean.getTopiaId() == null) { -// -// dataService.create(dataSource, activityId, bean, binder, getCreateExecutor()); -// -// } else { -// -// dataService.update(dataSource, null, bean, getUpdateExecutor()); -// -// } -// -// return true; -// -// } + @Override + protected boolean doSave(SetLonglineDto bean) throws Exception { + + String activityId = getSelectedParentId(); + + String beanId = getSetLonglineService().save(activityId, bean); + bean.setId(beanId); + + return true; + + } //FIXME // @Override @@ -477,23 +468,19 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { } - //FIXME -// @Override -// protected boolean doDelete(SetLongline bean, -// DataService dataService, -// DataSource dataSource, -// TopiaExecutor2<? extends TopiaEntity, SetLongline> deletor) throws Exception { -// -// if (askToDelete(bean)) { -// return false; -// } -// -// String activityId = getSelectedParentId(); -// dataService.delete(dataSource, activityId, bean, deletor); -// -// return true; -// -// } + @Override + protected boolean doDelete(SetLonglineDto bean) throws Exception { + + if (askToDelete(bean)) { + return false; + } + + String activityId = getSelectedParentId(); + getSetLonglineService().delete(activityId, bean.getId()); + + return true; + + } //FIXME // @Override @@ -588,4 +575,9 @@ public class SetLonglineUIHandler extends ContentUIHandler<SetLonglineDto> { } } + + //FIXME + protected SetLonglineService getSetLonglineService() { + return null; + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java index a1b3d7a..5314afd 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/FloatingObjectUIHandler.java @@ -24,6 +24,7 @@ package fr.ird.observe.ui.content.impl.seine; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.service.seine.FloatingObjectService; @@ -213,24 +214,29 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto> } } - //FIXME -// @Override -// protected boolean doDelete(FloatingObject bean, -// DataService dataService, -// DataSource dataSource, -// TopiaExecutor2<? extends TopiaEntity, FloatingObject> deletor) throws Exception { -// -// if (askToDelete(bean)) { -// return false; -// } -// -// if (bean.getTopiaId() != null) { -// -// String activityId = getSelectedParentId(); -// dataService.delete(dataSource, activityId, bean, deletor); -// } -// return true; -// } + @Override + protected FormDto<FloatingObjectDto> loadToEdit(String id) { + return null; + } + + @Override + protected FormDto<FloatingObjectDto> loadToReadDto(String id) { + return null; + } + + protected boolean doDelete(FloatingObjectDto bean) throws Exception { + + if (askToDelete(bean)) { + return false; + } + + if (bean.getId() != null) { + + String activityId = getSelectedParentId(); + getFloatingObjectService().delete(activityId, bean.getId()); + } + return true; + } //FIXME // @Override diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java index 7c0201b..3b17d4f 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/impl/seine/SetSeineUIHandler.java @@ -24,9 +24,11 @@ package fr.ird.observe.ui.content.impl.seine; import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; +import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.constants.seine.SchoolType; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.service.seine.SetSeineService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.ContentUIHandler; import fr.ird.observe.ui.content.ContentUIModel; @@ -284,25 +286,16 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto> { model.setModified(create); } - //FIXME -// @Override -// protected boolean doSave(SetSeine bean, -// DataService dataService, -// DataSource dataSource, -// TopiaEntityBinder<SetSeine> binder) throws Exception { -// -// String activityId = getSelectedParentId(); -// -// if (bean.getTopiaId() == null) { -// -// dataService.create(dataSource, activityId, bean, binder, getCreateExecutor()); -// } else { -// -// dataService.update(dataSource, null, bean, getUpdateExecutor()); -// -// } -// return true; -// } + @Override + protected boolean doSave(SetSeineDto bean) throws Exception { + + String activityId = getSelectedParentId(); + + String beanId = getSetSeineService().save(activityId, bean); + bean.setId(beanId); + + return true; + } //FIXME // @Override @@ -354,21 +347,26 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto> { } } - //FIXME -// @Override -// protected boolean doDelete(SetSeine bean, -// DataService dataService, -// DataSource dataSource, -// TopiaExecutor2<? extends TopiaEntity, SetSeine> deletor) throws Exception { -// -// if (askToDelete(bean)) { -// return false; -// } -// -// String activityId = getSelectedParentId(); -// dataService.delete(dataSource, activityId, bean, deletor); -// return true; -// } + @Override + protected FormDto<SetSeineDto> loadToEdit(String id) { + return null; + } + + @Override + protected FormDto<SetSeineDto> loadToReadDto(String id) { + return null; + } + + protected boolean doDelete(SetSeineDto bean) throws Exception { + + if (askToDelete(bean)) { + return false; + } + + String activityId = getSelectedParentId(); + getSetSeineService().delete(activityId, bean.getId()); + return true; + } //FIXME // @Override @@ -431,4 +429,8 @@ public class SetSeineUIHandler extends ContentUIHandler<SetSeineDto> { } + //FIXME + protected SetSeineService getSetSeineService() { + return null; + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java index c50b765..3ed11d6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/longline/TripLonglineUIHandler.java @@ -27,6 +27,7 @@ import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.longline.TripLonglineDto; +import fr.ird.observe.services.service.longline.TripLonglineService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.open.ContentOpenableUIHandler; import fr.ird.observe.ui.content.open.ContentOpenableUIModel; @@ -35,8 +36,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.DateUtil; -import javax.swing.JTabbedPane; -import javax.swing.SwingUtilities; +import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import java.util.Date; @@ -254,47 +254,36 @@ public class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLongline model.setModified(create); } -// @Override -// protected boolean doSave(TripLongline bean, -// DataService dataService, -// DataSource dataSource, -// TopiaEntityBinder<TripLongline> binder) throws Exception { -// -// String programId = getDataContext().getSelectedProgramId(); -// -// // on force toujours la date a etre sans heure, minute,... -// Date startDate = DateUtil.getDay(bean.getStartDate()); -// if (log.isDebugEnabled()) { -// log.debug("startDate = " + startDate); -// } -// bean.setStartDate(startDate); -// -// Date endDate = bean.getEndDate(); -// if (log.isDebugEnabled()) { -// log.debug("endDate = " + endDate); -// } -// -// bean.setOpen(true); -// -// if (bean.getTopiaId() == null) { -// -// dataService.create(dataSource, programId, bean, binder, getCreateExecutor()); -// -// } else { -// -// dataService.update(dataSource, null, bean, getUpdateExecutor()); -// -// } -// -// // mise a jour de la date de fin -// dataService.updateEndDate(dataSource, bean.getTopiaId()); -// -// // recuperation de la position de la maree dans le program + @Override + protected boolean doSave(TripLonglineDto bean) throws Exception { + + String programId = getDataContext().getSelectedProgramId(); + + // on force toujours la date a etre sans heure, minute,... + Date startDate = DateUtil.getDay(bean.getStartDate()); + if (log.isDebugEnabled()) { + log.debug("startDate = " + startDate); + } + bean.setStartDate(startDate); + + Date endDate = bean.getEndDate(); + if (log.isDebugEnabled()) { + log.debug("endDate = " + endDate); + } + + bean.setOpen(true); + + String beanId = getTripLonglineService().save(bean); + bean.setId(beanId); + + // recuperation de la position de la maree dans le program + //FIXME // obtainChildPosition(bean, dataService, dataSource); -// -// return true; -// } + return true; + } + +//FIXME // @Override // protected TripLongline onCreate(TopiaContext tx, Object parent, TripLongline editBean) throws TopiaException { // TripLongline beanToSave = ObserveDAOHelper.getTripLonglineDAO(tx).create(); @@ -312,25 +301,23 @@ public class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLongline // } //FIXME -// @Override -// protected boolean doDelete(TripLongline bean, -// DataService dataService, -// DataSource dataSource, -// TopiaExecutor2<? extends TopiaEntity, TripLongline> deletor) throws Exception { -// -// if (askToDelete(bean)) { -// return false; -// } -// if (log.isInfoEnabled()) { -// log.info("Will delete Trip " + bean.getTopiaId()); -// } -// -// dataService.delete(dataSource, null, bean, deletor); -// if (log.isInfoEnabled()) { -// log.info("Delete done for Trip " + bean.getTopiaId()); -// } -// return true; -// } + @Override + protected boolean doDelete(TripLonglineDto bean) throws Exception { + + if (askToDelete(bean)) { + return false; + } + if (log.isInfoEnabled()) { + log.info("Will delete Trip " + bean.getId()); + } + + getTripLonglineService().delete(bean.getId()); + + if (log.isInfoEnabled()) { + log.info("Delete done for Trip " + bean.getId()); + } + return true; + } //FIXME // @Override @@ -347,4 +334,9 @@ public class TripLonglineUIHandler extends ContentOpenableUIHandler<TripLongline return !create && !dataContext.isOpenTrip(); } + + //FIXME + protected TripLonglineService getTripLonglineService() { + return null; + } } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java index a5145d4..1847895 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/open/impl/seine/RouteUIHandler.java @@ -23,21 +23,28 @@ package fr.ird.observe.ui.content.open.impl.seine; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.business.db.DataContext; +import fr.ird.observe.business.db.DataSource; +import fr.ird.observe.business.db.DataSourceException; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto; +import fr.ird.observe.services.dto.result.TripChildSaveResultDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.services.service.seine.RouteService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.open.ContentOpenableUIHandler; import fr.ird.observe.ui.tree.ObserveNode; import fr.ird.observe.ui.tree.ObserveTreeHelper; +import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.DateUtil; import org.nuiton.validator.NuitonValidatorScope; -import javax.swing.JOptionPane; +import javax.swing.*; +import java.util.Date; import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; @@ -219,43 +226,30 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { getModel().setModified(create); } -// @Override -// protected boolean doSave(Route bean, -// DataService dataService, -// DataSource dataSource, -// TopiaEntityBinder<Route> binder) throws Exception { -// -// String tripId = getSelectedParentId(); -// -// if (log.isInfoEnabled()) { -// log.info("will save route " + bean.getTopiaId()); -// } -// -// // on sauvegarde toujours en debut de jour -// Date date = DateUtil.getDay(bean.getDate()); -// bean.setDate(date); -// bean.setOpen(true); -// -// if (bean.getTopiaId() == null) { -// -// dataService.create(dataSource, tripId, bean, binder, getCreateExecutor()); -// } else { -// -// dataService.update(dataSource, tripId, bean, getUpdateExecutor()); -// -// if( dateHasChanged) { -// -// dataService.updateDayDate(dataSource, bean.getTopiaId()); -// -// } -// } -// -// updateTripEndDate(tripId); -// + @Override + protected boolean doSave(RouteDto bean) throws Exception { + + String tripId = getSelectedParentId(); + + if (log.isInfoEnabled()) { + log.info("will save route " + bean.getId()); + } + + // on sauvegarde toujours en debut de jour + Date date = DateUtil.getDay(bean.getDate()); + bean.setDate(date); + bean.setOpen(true); + + TripChildSaveResultDto saveResult = getRouteService().save(tripId, bean); + bean.setId(saveResult.getId()); + + setUpdateMareeNodeTag(saveResult.isTripEndDateUpdated()); + + //FIXME // obtainChildPosition(bean, dataService, dataSource); -// -// return true; -// } + + return true; + } @Override protected void afterSave(boolean refresh) { @@ -309,29 +303,27 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { // return beanToSave; // } - //FIXME -// @Override -// protected boolean doDelete(Route bean, -// DataService dataService, -// DataSource dataSource, -// TopiaExecutor2<? extends TopiaEntity, Route> deletor) throws Exception { -// -// if (askToDelete(bean)) { -// return false; -// } -// if (log.isInfoEnabled()) { -// log.info("Will delete Route " + bean.getTopiaId()); -// } -// -// String tripId = getSelectedParentId(); -// dataService.delete(dataSource, tripId, bean, deletor); -// if (log.isInfoEnabled()) { -// log.info("Delete done for Route " + bean.getTopiaId()); -// } -// updateTripEndDate(tripId); -// -// return true; -// } + @Override + protected boolean doDelete(RouteDto bean) throws Exception { + + if (askToDelete(bean)) { + return false; + } + if (log.isInfoEnabled()) { + log.info("Will delete Route " + bean.getId()); + } + + String tripId = getSelectedParentId(); + boolean wasEndDateUpdated = getRouteService ().delete(tripId, bean.getId()); + + if (log.isInfoEnabled()) { + log.info("Delete done for Route " + bean.getId()); + } + + setUpdateMareeNodeTag(wasEndDateUpdated); + + return true; + } // @Override // protected void onDelete(TopiaContext tx, Object parent, Route beanToDelete) { @@ -455,7 +447,7 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { // on recupère l'écran d'édition ActivitySeineUI selectedUI = (ActivitySeineUI) - ObserveSwingApplicationContext.get().getSelectedContentUI(); + ObserveContext.get().getSelectedContentUI(); // on recupère l'activity de fin de veille VesselActivitySeineDto vesselActivitySeine = null; @@ -519,20 +511,7 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { // treeHelper.refreshNode(tripNode, false); } - protected void updateTripEndDate(String tripId) { - - //FIXME -// boolean wasUpdated; - boolean wasUpdated = false; - - // on met a jour si necessaire la date de fin de la maree - //FIXME -// try { -// wasUpdated = getDataService().updateEndDate(getDataSource(), tripId); -// -// } catch (DataSourceException e) { -// throw new ObserveTechnicalException("Could not update end date",e); -// } + protected void setUpdateMareeNodeTag(boolean wasUpdated) { if (wasUpdated) { @@ -547,4 +526,8 @@ public class RouteUIHandler extends ContentOpenableUIHandler<RouteDto> { } + //FIXME + protected RouteService getRouteService() { + return null; + } } 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 9b4e2d7..c8ec607 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 @@ -26,6 +26,7 @@ import fr.ird.observe.business.db.DataContext; import fr.ird.observe.business.db.DataSource; import fr.ird.observe.business.db.constants.DataContextType; import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.services.service.seine.TripSeineService; import fr.ird.observe.ui.content.ContentMode; import fr.ird.observe.ui.content.open.ContentOpenableUIHandler; import fr.ird.observe.ui.content.open.ContentOpenableUIModel; @@ -253,46 +254,34 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { } //FIXME -// @Override -// protected boolean doSave(TripSeine bean, -// DataService dataService, -// DataSource dataSource, -// TopiaEntityBinder<TripSeine> binder) throws Exception { -// -// String programId = getDataContext().getSelectedProgramId(); -// -// // on force toujours la date a etre sans heure, minute,... -// Date startDate = DateUtil.getDay(bean.getStartDate()); -// if (log.isDebugEnabled()) { -// log.debug("startDate = " + startDate); -// } -// bean.setStartDate(startDate); -// -// Date endDate = bean.getEndDate(); -// if (log.isDebugEnabled()) { -// log.debug("endDate = " + endDate); -// } -// -// bean.setOpen(true); -// -// if (bean.getTopiaId() == null) { -// -// dataService.create(dataSource, programId, bean, binder, getCreateExecutor()); -// -// } else { -// -// dataService.update(dataSource, null, bean, getUpdateExecutor()); -// -// } -// -// // mise a jour de la date de fin -// dataService.updateEndDate(dataSource, bean.getTopiaId()); -// -// // recuperation de la position de la maree dans le program + @Override + protected boolean doSave(TripSeineDto bean) throws Exception { + + String programId = getDataContext().getSelectedProgramId(); + + // on force toujours la date a etre sans heure, minute,... + Date startDate = DateUtil.getDay(bean.getStartDate()); + if (log.isDebugEnabled()) { + log.debug("startDate = " + startDate); + } + bean.setStartDate(startDate); + + Date endDate = bean.getEndDate(); + if (log.isDebugEnabled()) { + log.debug("endDate = " + endDate); + } + + bean.setOpen(true); + + String beanId = getTripSeineService().save(bean); + bean.setId(beanId); + + // recuperation de la position de la maree dans le program + //FIXME // obtainChildPosition(bean, dataService, dataSource); -// -// return true; -// } + + return true; + } //FIXME // @Override @@ -311,26 +300,23 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { // return beanToSave; // } - //FIXME -// @Override -// protected boolean doDelete(TripSeine bean, -// DataService dataService, -// DataSource dataSource, -// TopiaExecutor2<? extends TopiaEntity, TripSeine> deletor) throws Exception { -// -// if (askToDelete(bean)) { -// return false; -// } -// if (log.isInfoEnabled()) { -// log.info("Will delete Trip " + bean.getTopiaId()); -// } -// -// dataService.delete(dataSource, null, bean, deletor); -// if (log.isInfoEnabled()) { -// log.info("Delete done for Trip " + bean.getTopiaId()); -// } -// return true; -// } + @Override + protected boolean doDelete(TripSeineDto bean) throws Exception { + + if (askToDelete(bean)) { + return false; + } + if (log.isInfoEnabled()) { + log.info("Will delete Trip " + bean.getId()); + } + + getTripSeineService().delete(bean.getId()); + + if (log.isInfoEnabled()) { + log.info("Delete done for Trip " + bean.getId()); + } + return true; + } //FIXME // @Override @@ -348,4 +334,9 @@ public class TripSeineUIHandler extends ContentOpenableUIHandler<TripSeineDto> { } + //FIXME + protected TripSeineService getTripSeineService() { + return null; + } + } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java index 47438ab..b76cd00 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/ContentTableUIHandler.java @@ -373,7 +373,6 @@ public abstract class ContentTableUIHandler<E extends IdDto, D extends IdDto> ex } doPersist(bean); - return true; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java index e34db35..ae7a6ec 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java @@ -40,9 +40,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; -import javax.swing.JComponent; -import javax.swing.JOptionPane; -import javax.swing.JTable; +import javax.swing.*; import javax.swing.table.DefaultTableCellRenderer; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -280,19 +278,23 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineD // } //FIXME -// @Override -// protected boolean doSave(SetSeine bean, -// DataService dataService, -// DataSource dataSource, -// TopiaEntityBinder<SetSeine> binder) throws Exception { -// try { -// return super.doSave(bean, dataService, dataSource, binder); -// } finally { -// -// // toujours supprimer la référence du context, quoiqu'il arrive -// ALL_TAILLES_TO_DELETE_ENTRY.removeContextValue(getUi()); -// } -// } + @Override + protected boolean doSave(SetSeineDto bean) throws Exception { + + try { + return super.doSave(bean); + + } finally { + + // toujours supprimer la référence du context, quoiqu'il arrive + ALL_TAILLES_TO_DELETE_ENTRY.removeContextValue(getUi()); + } + } + + @Override + protected void doPersist(SetSeineDto bean) { + //FIXME quel service ? + } @Override protected boolean prepareSave(SetSeineDto bean, List<TargetCatchDto> objets) throws DataSourceException { @@ -679,4 +681,5 @@ public class TargetDiscardCatchUIHandler extends ContentTableUIHandler<SetSeineD } } } + } 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 e4af6ba..f79c9db 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 @@ -52,8 +52,8 @@ public class SetLonglineServiceController extends ObserveAuthenticatedServiceCon } @Override - public String save(String activityLonglineId, FormDto<SetLonglineDto> form) { - return service.save(activityLonglineId, form); + public String save(String activityLonglineId, SetLonglineDto dto) { + return service.save(activityLonglineId, dto); } @Override 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 cc402c4..a3dc624 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 @@ -60,8 +60,8 @@ public class TripLonglineServiceController extends ObserveAuthenticatedServiceCo } @Override - public String save(FormDto<TripLonglineDto> form) { - return service.save(form); + public String save(TripLonglineDto dto) { + return service.save(dto); } @Override 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 2dee7f3..4b65180 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 @@ -24,6 +24,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.result.TripChildSaveResultDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.RouteStubDto; import fr.ird.observe.services.service.seine.RouteService; @@ -60,12 +61,12 @@ public class RouteServiceController extends ObserveAuthenticatedServiceControlle } @Override - public String save(String tripSeineId, FormDto<RouteDto> form) { - return service.save(tripSeineId, form); + public TripChildSaveResultDto save(String tripSeineId, RouteDto dto) { + return service.save(tripSeineId, dto); } @Override - public void delete(String tripSeineId, String routeId) { - service.delete(tripSeineId, routeId); + public boolean delete(String tripSeineId, String routeId) { + return service.delete(tripSeineId, routeId); } } 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 b5f6935..58ab321 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 @@ -52,8 +52,8 @@ public class SetSeineServiceController extends ObserveAuthenticatedServiceContro } @Override - public String save(String activitySeineId, FormDto<SetSeineDto> form) { - return service.save(activitySeineId, form); + public String save(String activitySeineId, SetSeineDto dto) { + return service.save(activitySeineId, dto); } @Override 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 864257a..e346f06 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 @@ -60,8 +60,8 @@ public class TripSeineServiceController extends ObserveAuthenticatedServiceContr } @Override - public String save(FormDto<TripSeineDto> form) { - return service.save(form); + public String save(TripSeineDto dto) { + return service.save(dto); } @Override 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 5cd59c2..5ebc557 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 @@ -48,7 +48,7 @@ public interface SetLonglineService extends ObserveService { @WriteDataPermission @Write @PostRequest - String save(String activityLonglineId, FormDto<SetLonglineDto> form); + String save(String activityLonglineId, SetLonglineDto dto); @Write @WriteDataPermission 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 fb6cd1f..1cf2937 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 @@ -54,7 +54,7 @@ public interface TripLonglineService extends ObserveService { @Write @WriteDataPermission @PostRequest - String save(FormDto<TripLonglineDto> form); + String save(TripLonglineDto dto); @Write @WriteDataPermission 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 b18b547..0c53283 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 @@ -24,6 +24,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.result.TripChildSaveResultDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.RouteStubDto; import fr.ird.observe.services.spi.DeleteRequest; @@ -54,11 +55,11 @@ public interface RouteService extends ObserveService { @Write @WriteDataPermission @PostRequest - String save(String tripSeineId, FormDto<RouteDto> form); + TripChildSaveResultDto save(String tripSeineId, RouteDto dto); @Write @WriteDataPermission @DeleteRequest - void delete(String tripSeineId, String routeId); + boolean delete(String tripSeineId, String routeId); } 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 5780cde..c0df928 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 @@ -48,7 +48,7 @@ public interface SetSeineService extends ObserveService { @Write @WriteDataPermission @PostRequest - String save(String activitySeineId, FormDto<SetSeineDto> form); + String save(String activitySeineId, SetSeineDto dto); @Write @WriteDataPermission 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 ccab5b1..74707e9 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 @@ -54,7 +54,7 @@ public interface TripSeineService extends ObserveService { @Write @WriteDataPermission @PostRequest - String save(FormDto<TripSeineDto> form); + String save(TripSeineDto dto); @Write @WriteDataPermission 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 ebc41b6..4b4c20c 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 @@ -1272,6 +1272,11 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { WindDto.PROPERTY_SPEED_RANGE); } + @Override + public void initTripChildSaveResultDto() { + // do nothing + } + // -------------------------------------------------------------------------------------------------------------- // // -- DATA SEINE ------------------------------------------------------------------------------------------------ // // -------------------------------------------------------------------------------------------------------------- // 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 955ccec..9f8c9cd 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 @@ -92,12 +92,10 @@ public class SetLonglineServiceTopia extends ObserveServiceTopia implements SetL } @Override - public String save(String activityLonglineId, FormDto<SetLonglineDto> form) { + public String save(String activityLonglineId, SetLonglineDto setLonglineDto) { ActivityLongline activityLongline = loadEntity(ActivityLonglineDto.class, ActivityLongline.class, activityLonglineId); - SetLonglineDto setLonglineDto = form.getForm(); - SetLongline setLongline = dtoToEntity(SetLonglineDto.class, SetLongline.class, setLonglineDto); setLongline = saveEntity(SetLongline.class, setLongline); 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 975e992..23e3de1 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 @@ -120,12 +120,15 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri } @Override - public String save(FormDto<TripLonglineDto> form) { + public String save(TripLonglineDto dto) { - TripLongline tripLongline = dtoToEntity(TripLonglineDto.class, TripLongline.class, form.getForm()); + TripLongline tripLongline = dtoToEntity(TripLonglineDto.class, TripLongline.class, dto); tripLongline = saveEntity(TripLongline.class, tripLongline); + TripLonglineTopiaDao dao = getTopiaPersistenceContext().getTripLonglineDao(); + dao.updateEndDate(tripLongline); + return tripLongline.getTopiaId(); } 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 6a0833e..c352c86 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 @@ -25,9 +25,12 @@ package fr.ird.observe.services.service.seine; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import fr.ird.observe.entities.seine.Route; +import fr.ird.observe.entities.seine.RouteTopiaDao; 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.result.TripChildSaveResultDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.RouteStubDto; import fr.ird.observe.services.dto.seine.TripSeineDto; @@ -118,15 +121,18 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi } @Override - public String save(String tripSeineId, FormDto<RouteDto> form) { + public TripChildSaveResultDto save(String tripSeineId, RouteDto routeDto) { - TripSeine tripSeine = loadEntity(TripSeineDto.class, TripSeine.class, tripSeineId); + TripChildSaveResultDto result = new TripChildSaveResultDto(); - RouteDto routeDto = form.getForm(); + TripSeine tripSeine = loadEntity(TripSeineDto.class, TripSeine.class, tripSeineId); + Route route = loadEntity(RouteDto.class, Route.class, routeDto.getId()); + Date oldRouteDate = route.getDate(); - Route route = dtoToEntity(RouteDto.class, Route.class, routeDto); + route = dtoToEntity(RouteDto.class, Route.class, routeDto); route = saveEntity(Route.class, route); + result.setId(route.getTopiaId()); if (routeDto.isNotPersisted()) { @@ -134,13 +140,27 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi saveEntity(TripSeine.class, tripSeine); + } else { + Date oldDate = DateUtil.getDay(oldRouteDate); + // si le jour a change, il faut mettre à jour les dates des activitéset des sets + boolean dateHasChanged = !oldDate.equals(routeDto.getDate()); + + if (dateHasChanged) { + RouteTopiaDao dao = getTopiaPersistenceContext().getRouteDao(); + dao.updateActivitiesDate(route.getTopiaId()); + } } - return route.getTopiaId(); + TripSeineTopiaDao tripSeineTopiaDao = getTopiaPersistenceContext().getTripSeineDao(); + boolean wasEndDateUpdated = tripSeineTopiaDao.updateEndDate(tripSeine); + + result.setTripEndDateUpdated(wasEndDateUpdated); + + return result; } @Override - public void delete(String tripSeineId, String routeId) { + public boolean delete(String tripSeineId, String routeId) { TripSeine tripSeine = loadEntity(TripSeineDto.class, TripSeine.class, tripSeineId); @@ -154,6 +174,10 @@ public class RouteServiceTopia extends ObserveServiceTopia implements RouteServi tripSeine.removeRoute(route); + TripSeineTopiaDao tripSeineTopiaDao = getTopiaPersistenceContext().getTripSeineDao(); + boolean wasEndDateUpdated = tripSeineTopiaDao.updateEndDate(tripSeine); + + return wasEndDateUpdated; } } 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 204926c..319b64f 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 @@ -100,12 +100,10 @@ public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSein } @Override - public String save(String activitySeineId, FormDto<SetSeineDto> form) { + public String save(String activitySeineId, SetSeineDto setSeineDto) { ActivitySeine activitySeine = loadEntity(ActivitySeineDto.class, ActivitySeine.class, activitySeineId); - SetSeineDto setSeineDto = form.getForm(); - SetSeine setSeine = dtoToEntity(SetSeineDto.class, SetSeine.class, setSeineDto); setSeine = saveEntity(SetSeine.class, setSeine); @@ -134,5 +132,6 @@ public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSein activitySeine.setSetSeine(null); + //FIXME kmorin : faudrait pas sauver quelquechose là ? parcequ'on n'a rien supprimé... } } 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 2ae405d..525c082 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 @@ -123,12 +123,15 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe } @Override - public String save(FormDto<TripSeineDto> form) { + public String save(TripSeineDto dto) { - TripSeine tripSeine = dtoToEntity(TripSeineDto.class, TripSeine.class, form.getForm()); + TripSeine tripSeine = dtoToEntity(TripSeineDto.class, TripSeine.class, dto); tripSeine = saveEntity(TripSeine.class, tripSeine); + TripSeineTopiaDao dao = getTopiaPersistenceContext().getTripSeineDao(); + dao.updateEndDate(tripSeine); + return tripSeine.getTopiaId(); } diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/service/RigthTest.java b/observe-services-topia/src/test/java/fr/ird/observe/services/service/RigthTest.java index c1fe848..1509d73 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/service/RigthTest.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/service/RigthTest.java @@ -173,7 +173,7 @@ public class RigthTest { FormDto<ProgramDto> formDto = service.loadToEdit(ProgramDto.class, PROGRAM_ID); - service.save(formDto); + service.save(formDto.getForm()); } @Test -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.