August 2013 - Franciaflex-magalie-commits - mailman.cloud.codelutin.com

r373 - in trunk: magalie-persistence/src/test/java/com/franciaflex/magalie/persistence magalie-web/src/main/java/com/franciaflex/magalie/web/action
by bleny＠users.forge.codelutin.com 21 Aug '13

21 Aug '13

Author: bleny Date: 2013-08-21 15:59:15 +0200 (Wed, 21 Aug 2013) New Revision: 373 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: remove wrong 'throws Exception' clauses Modified: trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/persistence/SuppliersTest.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ChooseCompanyAction.java Modified: trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/persistence/SuppliersTest.java =================================================================== --- trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/persistence/SuppliersTest.java 2013-08-21 13:24:48 UTC (rev 372) +++ trunk/magalie-persistence/src/test/java/com/franciaflex/magalie/persistence/SuppliersTest.java 2013-08-21 13:59:15 UTC (rev 373) @@ -36,7 +36,7 @@ public class SuppliersTest { @Test - public void testOrderByNamesComparator() throws Exception { + public void testOrderByNamesComparator() { ImmutableList<String> supplierNames = ImmutableList.of("d", "a", "c", "b"); Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ChooseCompanyAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ChooseCompanyAction.java 2013-08-21 13:24:48 UTC (rev 372) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ChooseCompanyAction.java 2013-08-21 13:59:15 UTC (rev 373) @@ -43,14 +43,16 @@ } @Override - public String execute() throws Exception { + public String execute() { companies = service.getAllCompanies(); return SUCCESS; + } public List<Company> getCompanies() { return companies; } + }

1 0

r372 - trunk/magalie-web/src/main/java/com/franciaflex/magalie/web
by bleny＠users.forge.codelutin.com 21 Aug '13

21 Aug '13

Author: bleny Date: 2013-08-21 15:24:48 +0200 (Wed, 21 Aug 2013) New Revision: 372 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add some javadoc Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/StrutsActionMessagesUserNotificationContext.java Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/StrutsActionMessagesUserNotificationContext.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/StrutsActionMessagesUserNotificationContext.java 2013-08-21 13:14:28 UTC (rev 371) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/StrutsActionMessagesUserNotificationContext.java 2013-08-21 13:24:48 UTC (rev 372) @@ -13,6 +13,10 @@ import java.util.Map; import java.util.Set; +/** + * C'est une implémentation de {@link MagalieUserNotificationContext} qui stocke les messages + * dans une Multimap indexée par les utilisateurs + */ public class StrutsActionMessagesUserNotificationContext implements MagalieUserNotificationContext { protected SetMultimap<MagalieUser, String> usersNotifications;

1 0

r371 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao magalie-services/src/main/java/com/franciaflex/magalie/services/service magalie-services/src/test/java/com/franciaflex/magalie/services/service magalie-web/src/main/java/com/franciaflex/magalie/web/action
by bleny＠users.forge.codelutin.com 21 Aug '13

21 Aug '13

Author: bleny Date: 2013-08-21 15:14:28 +0200 (Wed, 21 Aug 2013) New Revision: 371 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #2999 show only listTypes in the same building Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListJpaDao.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListDao.java 2013-08-21 13:08:11 UTC (rev 370) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListDao.java 2013-08-21 13:14:28 UTC (rev 371) @@ -23,11 +23,13 @@ * #L% */ +import com.franciaflex.magalie.persistence.entity.Building; + import java.util.List; /** @author bleny */ public interface RequestedListDao { - List<String> findAllDistinctListTypes(); + List<String> findAllDistinctListTypes(Building building); } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListJpaDao.java 2013-08-21 13:08:11 UTC (rev 370) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListJpaDao.java 2013-08-21 13:14:28 UTC (rev 371) @@ -23,6 +23,7 @@ * #L% */ +import com.franciaflex.magalie.persistence.entity.Building; import com.franciaflex.magalie.persistence.entity.DeliveredRequestedListStatus; import javax.persistence.EntityManager; @@ -36,15 +37,16 @@ } @Override - public List<String> findAllDistinctListTypes() { // TODO brendan 20/08/13 add a building parameter + public List<String> findAllDistinctListTypes(Building building) { TypedQuery<String> query = entityManager.createQuery( " select distinct rl.listType" + " from RequestedList rl" - + " where rl not in (select drl.requestedList from DeliveredRequestedList drl where drl.status = :affectedDeliveredRequestedListStatus OR drl.status = :completeDeliveredRequestedListStatus)" + + " where rl.building = :building and rl not in (select drl.requestedList from DeliveredRequestedList drl where drl.status = :affectedDeliveredRequestedListStatus OR drl.status = :completeDeliveredRequestedListStatus)" , String.class); query.setParameter("affectedDeliveredRequestedListStatus", DeliveredRequestedListStatus.AFFECTED); query.setParameter("completeDeliveredRequestedListStatus", DeliveredRequestedListStatus.COMPLETE); + query.setParameter("building", building); return query.getResultList(); } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-08-21 13:08:11 UTC (rev 370) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-08-21 13:14:28 UTC (rev 371) @@ -487,13 +487,13 @@ } - public List<String> getListTypes() { + public List<String> getListTypes(Building building) { JpaMagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); RequestedListJpaDao dao = persistenceContext.getRequestedListDao(); - List<String> allDistinctListTypes = dao.findAllDistinctListTypes(); + List<String> allDistinctListTypes = dao.findAllDistinctListTypes(building); return allDistinctListTypes; Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java 2013-08-21 13:08:11 UTC (rev 370) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java 2013-08-21 13:14:28 UTC (rev 371) @@ -81,7 +81,7 @@ @Test public void testListTypes() { - List<String> listTypes = service.getListTypes(); + List<String> listTypes = service.getListTypes(building); Assert.assertEquals(1, listTypes.size()); Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java 2013-08-21 13:08:11 UTC (rev 370) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java 2013-08-21 13:14:28 UTC (rev 371) @@ -74,8 +74,10 @@ requestedList = service.getAffectationForUser(magalieUser); - listTypes = service.getListTypes(); + Building building = session.getBuilding(); + listTypes = service.getListTypes(building); + return INPUT; }

1 0

r370 - in trunk: magalie-services magalie-services/src/main/java/com/franciaflex/magalie/services magalie-services/src/main/java/com/franciaflex/magalie/services/service magalie-services/src/test/java/com/franciaflex/magalie/services/service magalie-web/src/main/java/com/franciaflex/magalie/web magalie-web/src/main/java/com/franciaflex/magalie/web/action magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 21 Aug '13

21 Aug '13

Author: bleny Date: 2013-08-21 15:08:11 +0200 (Wed, 21 Aug 2013) New Revision: 370 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #2999 introduce notification context in services and use it Added: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieUserNotificationContext.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/StrutsActionMessagesUserNotificationContext.java Modified: trunk/magalie-services/pom.xml trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieServiceContext.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationContext.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp Modified: trunk/magalie-services/pom.xml =================================================================== --- trunk/magalie-services/pom.xml 2013-08-21 09:40:45 UTC (rev 369) +++ trunk/magalie-services/pom.xml 2013-08-21 13:08:11 UTC (rev 370) @@ -81,6 +81,11 @@ <artifactId>junit</artifactId> </dependency> + <dependency> + <groupId>org.mockito</groupId> + <artifactId>mockito-core</artifactId> + </dependency> + </dependencies> <build> Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java 2013-08-21 09:40:45 UTC (rev 369) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/DefaultMagalieServiceContext.java 2013-08-21 13:08:11 UTC (rev 370) @@ -26,6 +26,7 @@ import com.franciaflex.magalie.MagalieApplicationConfig; import com.franciaflex.magalie.MagalieTechnicalException; import com.franciaflex.magalie.persistence.JpaMagaliePersistenceContext; +import com.google.common.base.Preconditions; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -37,6 +38,8 @@ protected JpaMagaliePersistenceContext persistenceContext; + protected MagalieUserNotificationContext userNotificationContext; + @Override public MagalieApplicationConfig getMagalieApplicationConfig() { return magalieApplicationConfig; @@ -95,4 +98,17 @@ public void setPersistenceContext(JpaMagaliePersistenceContext persistenceContext) { this.persistenceContext = persistenceContext; } + + @Override + public MagalieUserNotificationContext getUserNotificationContext() { + Preconditions.checkState( + userNotificationContext != null, + "user notification context not provided"); + return userNotificationContext; + } + + public void setUserNotificationContext(MagalieUserNotificationContext userNotificationContext) { + this.userNotificationContext = userNotificationContext; + } + } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieServiceContext.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieServiceContext.java 2013-08-21 09:40:45 UTC (rev 369) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieServiceContext.java 2013-08-21 13:08:11 UTC (rev 370) @@ -41,4 +41,6 @@ MagalieApplicationConfig getMagalieApplicationConfig(); + MagalieUserNotificationContext getUserNotificationContext(); + } Added: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieUserNotificationContext.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieUserNotificationContext.java (rev 0) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/MagalieUserNotificationContext.java 2013-08-21 13:08:11 UTC (rev 370) @@ -0,0 +1,22 @@ +package com.franciaflex.magalie.services; + +import com.franciaflex.magalie.persistence.entity.DeliveredRequestedList; +import com.franciaflex.magalie.persistence.entity.MagalieUser; + +/** + * Ce contrat représente pour les services une façon de notifier un utilisateur + * pour différent messages. + * + * @author bleny + */ +public interface MagalieUserNotificationContext { + + void notifyUnaffectedRequestedListDriverLicenseRequired(MagalieUser magalieUser, DeliveredRequestedList oldAffectation); + + void notifyUnaffectedRequestedListForEverythingUnavailable(MagalieUser magalieUser, DeliveredRequestedList oldAffectation); + + void notifyUnaffectedRequestedListForCompletedRequestedList(MagalieUser magalieUser, DeliveredRequestedList oldAffectation); + + void notifyAffectedRequestedList(MagalieUser magalieUser, DeliveredRequestedList newAffectation); + +} Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-08-21 09:40:45 UTC (rev 369) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-08-21 13:08:11 UTC (rev 370) @@ -274,7 +274,7 @@ RequestedArticleService requestedArticleService = serviceContext.newService(RequestedArticleService.class); - requestedArticleService.onStorageMovementConfirmation(confirmation, confirmedStorageMovements); + requestedArticleService.onStorageMovementConfirmation(magalieUser, confirmation, confirmedStorageMovements); persistenceContext.commit(); Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-08-21 09:40:45 UTC (rev 369) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-08-21 13:08:11 UTC (rev 370) @@ -41,6 +41,7 @@ import com.franciaflex.magalie.persistence.entity.StorageMovement; import com.franciaflex.magalie.services.MagalieService; import com.franciaflex.magalie.services.MagalieServiceContext; +import com.franciaflex.magalie.services.MagalieUserNotificationContext; import com.franciaflex.magalie.services.StorageMovementConfirmation; import com.google.common.base.Optional; import com.google.common.base.Preconditions; @@ -74,6 +75,9 @@ JpaMagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); + MagalieUserNotificationContext userNotificationContext = + serviceContext.getUserNotificationContext(); + // first, try find order in affected list FindOrderToExecuteResult findOrderToExecuteResult = null; @@ -112,6 +116,16 @@ oldAffectation = affectedDeliveredRequestedList; + if (findOrderToExecuteResult.isDriverLicenseRequired()) { + + userNotificationContext.notifyUnaffectedRequestedListDriverLicenseRequired(magalieUser, oldAffectation); + + } else if (findOrderToExecuteResult.isEverythingUnavailable()) { + + userNotificationContext.notifyUnaffectedRequestedListForEverythingUnavailable(magalieUser, oldAffectation); + + } + } } @@ -175,10 +189,20 @@ persistenceContext.commit(); - findOrderToExecuteResult.setOldAffectation(oldAffectation); + if (oldAffectation != null) { - findOrderToExecuteResult.setNewAffectation(newAffectation); + findOrderToExecuteResult.setOldAffectation(oldAffectation); + } + + if (newAffectation != null) { + + findOrderToExecuteResult.setNewAffectation(newAffectation); + + userNotificationContext.notifyAffectedRequestedList(magalieUser, newAffectation); + + } + if (log.isInfoEnabled()) { log.info("will return " + findOrderToExecuteResult); } @@ -331,7 +355,7 @@ } - public void onStorageMovementConfirmation(StorageMovementConfirmation confirmation, Collection<StorageMovement> storageMovements) { + public void onStorageMovementConfirmation(MagalieUser magalieUser, StorageMovementConfirmation confirmation, Collection<StorageMovement> storageMovements) { String requestedArticleId = confirmation.getRequestedArticleId(); @@ -399,6 +423,11 @@ + requestedList.getCode() + " as complete"); } + MagalieUserNotificationContext userNotificationContext = + serviceContext.getUserNotificationContext(); + + userNotificationContext.notifyUnaffectedRequestedListForCompletedRequestedList(magalieUser, deliveredRequestedList); + deliveredRequestedList.setStatus(DeliveredRequestedListStatus.COMPLETE); } Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java 2013-08-21 09:40:45 UTC (rev 369) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java 2013-08-21 13:08:11 UTC (rev 370) @@ -28,6 +28,7 @@ import com.franciaflex.magalie.persistence.entity.RequestedArticle; import com.franciaflex.magalie.persistence.entity.StorageMovement; import com.franciaflex.magalie.services.AbstractMagalieServiceTest; +import com.franciaflex.magalie.services.MagalieUserNotificationContext; import com.franciaflex.magalie.services.StorageMovementConfirmation; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; @@ -37,6 +38,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.mockito.Mockito; import java.text.ParseException; import java.util.Date; @@ -55,6 +57,8 @@ protected static final String LIST_TYPE = "LOT DE FAB"; + private MagalieUserNotificationContext magalieUserNotificationContextMock; + @Before public void setUp() throws ParseException { @@ -68,6 +72,10 @@ building = fixture("B1"); + magalieUserNotificationContextMock = Mockito.mock(MagalieUserNotificationContext.class); + + serviceContext.setUserNotificationContext(magalieUserNotificationContextMock); + } @Test @@ -106,6 +114,8 @@ Assert.assertNull(orderToExecute.getOldAffectation()); Assert.assertNotNull(orderToExecute.getNewAffectation()); + Mockito.verify(magalieUserNotificationContextMock).notifyAffectedRequestedList(magalieUser, orderToExecute.getNewAffectation()); + } @Test @@ -169,7 +179,7 @@ StorageMovementConfirmation confirmation = new StorageMovementConfirmation(); confirmation.setRequestedArticleId(orderToExecute.getRequestedArticle().getId()); - service.onStorageMovementConfirmation(confirmation, emptySet); + service.onStorageMovementConfirmation(magalieUser, confirmation, emptySet); } @@ -184,7 +194,7 @@ StorageMovementConfirmation confirmation = new StorageMovementConfirmation(); confirmation.setRequestedArticleId(orderToExecute.getRequestedArticle().getId()); - service.onStorageMovementConfirmation(confirmation, emptySet); + service.onStorageMovementConfirmation(magalieUser, confirmation, emptySet); } @@ -199,7 +209,7 @@ StorageMovementConfirmation confirmation = new StorageMovementConfirmation(); confirmation.setRequestedArticleId(orderToExecute.getRequestedArticle().getId()); - service.onStorageMovementConfirmation(confirmation, emptySet); + service.onStorageMovementConfirmation(magalieUser, confirmation, emptySet); } @@ -210,17 +220,14 @@ Assert.assertEquals("requestedArticle6", orderToExecute.getRequestedArticle().getId()); Assert.assertNotNull(orderToExecute.getNewAffectation()); - if (true) { - // XXX brendan 13/07/13 doesn't works but doesn't mind, the information is given to the user by another mean - Assert.assertNotNull(orderToExecute.getOldAffectation()); - Assert.assertNotEquals( - orderToExecute.getOldAffectation().getRequestedList(), - orderToExecute.getNewAffectation().getRequestedList()); - } + Assert.assertNotNull(orderToExecute.getOldAffectation()); + Assert.assertNotEquals( + orderToExecute.getOldAffectation().getRequestedList(), + orderToExecute.getNewAffectation().getRequestedList()); StorageMovementConfirmation confirmation = new StorageMovementConfirmation(); confirmation.setRequestedArticleId(orderToExecute.getRequestedArticle().getId()); - service.onStorageMovementConfirmation(confirmation, emptySet); + service.onStorageMovementConfirmation(magalieUser, confirmation, emptySet); } @@ -234,7 +241,7 @@ StorageMovementConfirmation confirmation = new StorageMovementConfirmation(); confirmation.setRequestedArticleId(orderToExecute.getRequestedArticle().getId()); - service.onStorageMovementConfirmation(confirmation, emptySet); + service.onStorageMovementConfirmation(magalieUser, confirmation, emptySet); } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationContext.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationContext.java 2013-08-21 09:40:45 UTC (rev 369) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieApplicationContext.java 2013-08-21 13:08:11 UTC (rev 370) @@ -25,6 +25,7 @@ import com.franciaflex.magalie.MagalieApplicationConfig; import com.franciaflex.magalie.persistence.JpaMagaliePersistenceContext; +import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.services.DefaultMagalieServiceContext; import com.franciaflex.magalie.services.MagalieServiceContext; import com.franciaflex.magalie.services.service.FixturesService; @@ -49,8 +50,11 @@ protected String contextPath; + protected StrutsActionMessagesUserNotificationContext userNotificationContext; + public MagalieApplicationContext(String contextPath) { this.contextPath = contextPath; + userNotificationContext = new StrutsActionMessagesUserNotificationContext(); } public MagalieApplicationConfig getMagalieApplicationConfig() { @@ -94,20 +98,6 @@ } - public void close() { - - if (entityManagerFactory != null && entityManagerFactory.isOpen()) { - - if (log.isInfoEnabled()) { - log.info("stopping magalie, will close entity manager factory"); - } - - entityManagerFactory.close(); - - } - - } - public MagalieServiceContext newServiceContext(EntityManager entityManager) { // FIXME brendan 04/06/13 very strange behavior, raise exception when loading a page @@ -124,6 +114,8 @@ serviceContext.setMagalieApplicationConfig(applicationConfig); + serviceContext.setUserNotificationContext(userNotificationContext); + return serviceContext; } @@ -152,4 +144,34 @@ } + public void close() { + + if (entityManagerFactory != null && entityManagerFactory.isOpen()) { + + if (log.isInfoEnabled()) { + log.info("stopping magalie, will close entity manager factory"); + } + + entityManagerFactory.close(); + + } + + for (Map.Entry<MagalieUser, String> magalieUserMessage : userNotificationContext.getUsersNotifications().entries()) { + + MagalieUser magalieUser = magalieUserMessage.getKey(); + + String message = magalieUserMessage.getValue(); + + if (log.isWarnEnabled()) { + log.warn("notification message was not delivered magalieUser=" + magalieUser + " message=" + message); + } + + } + + } + + public StrutsActionMessagesUserNotificationContext getUserNotificationContext() { + return userNotificationContext; + } + } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java 2013-08-21 09:40:45 UTC (rev 369) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieInterceptor.java 2013-08-21 13:08:11 UTC (rev 370) @@ -24,6 +24,7 @@ */ import com.franciaflex.magalie.MagalieApplicationConfig; +import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.services.MagalieService; import com.franciaflex.magalie.services.MagalieServiceContext; import com.franciaflex.magalie.web.action.ChooseCompanyAction; @@ -33,9 +34,9 @@ import com.franciaflex.magalie.web.action.RestoreFixturesAction; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Sets; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.interceptor.Interceptor; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.beans.BeanUtil; @@ -77,20 +78,40 @@ if (action instanceof MagalieActionSupport) { + // on ajoute les notifications pour l'utilisateur + + Set<String> messages = Sets.newLinkedHashSet(); + + // d'abord on récupère les notifications ajoutées par les actions dans la session + MagalieSession magalieSession = getMagalieSession(invocation); - if (CollectionUtils.isNotEmpty(magalieSession.getMessages())) { + messages.addAll(magalieSession.getMessagesAndClear()); - for (String message : magalieSession.getMessages()) { + // ensuite on ajoute les notifications ajoutées par les services - ((MagalieActionSupport) action).addActionMessage(message); + MagalieApplicationContext magalieApplicationContext = + getMagalieApplicationContext(invocation); - } + StrutsActionMessagesUserNotificationContext userNotificationContext = + magalieApplicationContext.getUserNotificationContext(); - magalieSession.getMessages().clear(); + MagalieUser magalieUser = magalieSession.getMagalieUser(); + if (magalieUser != null) { + + messages.addAll(userNotificationContext.getMessagesAndClearFor(magalieUser)); + } + // on ajoute tous ces messages comme actionMessage + + for (String message : messages) { + + ((MagalieActionSupport) action).addActionMessage(message); + + } + Class<?> actionClass = action.getClass(); Set<PropertyDescriptor> descriptors = @@ -119,7 +140,7 @@ } else if (MagalieApplicationConfig.class.isAssignableFrom(propertyType)) { - toInject = getMagalieApplicationContext(invocation).getMagalieApplicationConfig(); + toInject = magalieApplicationContext.getMagalieApplicationConfig(); } @@ -137,7 +158,7 @@ try { // prevent accessing a page without a session - if (magalieSession.getMagalieUser() == null) { + if (magalieUser == null) { if (ACCESSIBLE_ACTIONS_FOR_NOT_LOGGED_USER.contains(actionClass)) { Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java 2013-08-21 09:40:45 UTC (rev 369) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/MagalieSession.java 2013-08-21 13:08:11 UTC (rev 370) @@ -33,6 +33,7 @@ import java.io.Serializable; import java.util.Collection; +import java.util.List; /** * The single object every user will have in its session. @@ -54,7 +55,7 @@ protected Activity activity; - protected Collection<String> messages; + protected Collection<String> messages = Lists.newLinkedList(); public MagalieUser getMagalieUser() { return magalieUser; @@ -87,15 +88,14 @@ this.lastUsedDestinationWarehouseForKanbans = lastUsedDestinationWarehouseForKanbans; } - public Collection<String> getMessages() { - if (messages == null) { - messages = Lists.newLinkedList(); - } - return messages; + public void addMessage(String message) { + messages.add(message); } - public void addMessage(String message) { - getMessages().add(message); + public List<String> getMessagesAndClear() { + List<String> messages = Lists.newArrayList(this.messages); + this.messages.clear(); + return messages; } public Activity getActivity() { Added: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/StrutsActionMessagesUserNotificationContext.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/StrutsActionMessagesUserNotificationContext.java (rev 0) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/StrutsActionMessagesUserNotificationContext.java 2013-08-21 13:08:11 UTC (rev 370) @@ -0,0 +1,61 @@ +package com.franciaflex.magalie.web; + +import com.franciaflex.magalie.persistence.entity.DeliveredRequestedList; +import com.franciaflex.magalie.persistence.entity.MagalieUser; +import com.franciaflex.magalie.services.MagalieUserNotificationContext; +import com.google.common.base.Supplier; +import com.google.common.collect.Maps; +import com.google.common.collect.Multimaps; +import com.google.common.collect.SetMultimap; +import com.google.common.collect.Sets; + +import java.util.Collection; +import java.util.Map; +import java.util.Set; + +public class StrutsActionMessagesUserNotificationContext implements MagalieUserNotificationContext { + + protected SetMultimap<MagalieUser, String> usersNotifications; + + public StrutsActionMessagesUserNotificationContext() { + Supplier<Set<String>> emptySetFactory = new Supplier<Set<String>>() { + + @Override + public Set<String> get() { + return Sets.newLinkedHashSet(); + } + }; + Map<MagalieUser, Collection<String >> magalieUserToMessages = Maps.newHashMap(); + SetMultimap<MagalieUser, String> multimap = Multimaps.newSetMultimap(magalieUserToMessages, emptySetFactory); + usersNotifications = Multimaps.synchronizedSetMultimap(multimap); + } + + @Override + public void notifyUnaffectedRequestedListDriverLicenseRequired(MagalieUser magalieUser, DeliveredRequestedList oldAffectation) { + usersNotifications.put(magalieUser, "Vous n'êtes plus affecté à la liste " + oldAffectation.getRequestedList().getCode() + " : permis requis"); + } + + @Override + public void notifyUnaffectedRequestedListForEverythingUnavailable(MagalieUser magalieUser, DeliveredRequestedList oldAffectation) { + usersNotifications.put(magalieUser, "Vous n'êtes plus affecté à la liste " + oldAffectation.getRequestedList().getCode() + " : stock manquant"); + } + + @Override + public void notifyUnaffectedRequestedListForCompletedRequestedList(MagalieUser magalieUser, DeliveredRequestedList oldAffectation) { + usersNotifications.put(magalieUser, "Vous n'êtes plus affecté à la liste " + oldAffectation.getRequestedList().getCode() + " : liste terminée"); + } + + @Override + public void notifyAffectedRequestedList(MagalieUser magalieUser, DeliveredRequestedList newAffectation) { + usersNotifications.put(magalieUser, "Vous êtes désormais affecté à la liste " + newAffectation.getRequestedList().getCode()); + } + + public SetMultimap<MagalieUser, String> getUsersNotifications() { + return usersNotifications; + } + + public Set<String> getMessagesAndClearFor(MagalieUser magalieUser) { + return usersNotifications.removeAll(magalieUser); + } + +} Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java 2013-08-21 09:40:45 UTC (rev 369) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java 2013-08-21 13:08:11 UTC (rev 370) @@ -24,7 +24,6 @@ */ import com.franciaflex.magalie.persistence.entity.Building; -import com.franciaflex.magalie.persistence.entity.DeliveredRequestedList; import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.RequestedArticle; import com.franciaflex.magalie.persistence.entity.RequestedList; @@ -111,34 +110,6 @@ if (findOrderToExecuteResult.isSuccess()) { - DeliveredRequestedList oldAffectation = findOrderToExecuteResult.getOldAffectation(); - - if (oldAffectation != null) { - - String message = "Vous n'êtes plus affecté à la liste " + oldAffectation.getRequestedList().getCode(); - - if (oldAffectation.getStatus().isComplete()) { - - message += " : liste terminée"; - - } else { - - // message += " : liste non terminée"; - - } - - session.addMessage(message); - - } - - DeliveredRequestedList newAffectation = findOrderToExecuteResult.getNewAffectation(); - - if (newAffectation != null) { - - session.addMessage("Vous venez d'être affecté à la liste " + newAffectation.getRequestedList().getCode()); - - } - requestedArticle = findOrderToExecuteResult.getRequestedArticle(); result = SUCCESS; Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-08-21 09:40:45 UTC (rev 369) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-08-21 13:08:11 UTC (rev 370) @@ -25,7 +25,6 @@ import com.franciaflex.magalie.MagalieTechnicalException; import com.franciaflex.magalie.persistence.entity.Article; -import com.franciaflex.magalie.persistence.entity.DeliveredRequestedList; import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.RequestedArticle; import com.franciaflex.magalie.services.StorageMovementConfirmation; @@ -33,7 +32,6 @@ import com.franciaflex.magalie.services.service.RequestedArticleService; import com.franciaflex.magalie.web.MagalieActionSupport; import com.franciaflex.magalie.web.MagalieSession; -import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.opensymphony.xwork2.Preparable; @@ -197,21 +195,6 @@ articleStorageService.confirmStorageMovement(confirmation, magalieUser); - Optional<DeliveredRequestedList> deliveredRequestedListOptional = - requestedArticleService.getDeliveredRequestedList(confirmation); - - if (deliveredRequestedListOptional.isPresent()) { - - DeliveredRequestedList deliveredRequestedList = deliveredRequestedListOptional.get(); - - if (deliveredRequestedList.getStatus().isComplete()) { - - session.addMessage("La liste " + deliveredRequestedList.getRequestedList().getCode() + " est terminée"); - - } - - } - String resultName = session.getActivity().name(); return resultName; Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp 2013-08-21 09:40:45 UTC (rev 369) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp 2013-08-21 13:08:11 UTC (rev 370) @@ -46,29 +46,34 @@ <s:a href="%{removeUserAffectationUrl}" cssClass="btn btn-block" id="removeUserAffectationLink">Abandonner la liste (Esc)</s:a> </s:if> <s:else> - <s:iterator value="listTypes" var="listType" status="stat"> - <s:set var="deliverRequestedArticleId">prepareArticleReceptionId<s:property value="#stat.index" /></s:set> - <s:url action="deliver-requested-article" id="deliverRequestedArticleUrl"> - <s:param name="listType" value="#listType" /> - </s:url> - <s:if test="#stat.index < shortcuts.size()"> - <script type="text/javascript"> - $(document).ready(function () { - var id = '<s:property value="deliverRequestedArticleId" />'; - bindKey('<s:property value="shortcuts.get(#stat.index)" />', function(){ redirectTo($('#' + id));}); - }); - </script> - <s:a href="%{deliverRequestedArticleUrl}" cssClass="btn btn-block" id="%{deliverRequestedArticleId}"> - Commencer à traiter une liste « <s:property value="#listType" /> » - (<s:property value="shortcuts.get(#stat.index)" />) - </s:a> - </s:if> - <s:else> - <s:a href="%{deliverRequestedArticleUrl}" cssClass="btn btn-block"> - Commencer à traiter une liste « <s:property value="#listType" /> » - </s:a> - </s:else> - </s:iterator> + <s:if test="listTypes.empty"> + Aucune liste à servir à traiter + </s:if> + <s:else> + <s:iterator value="listTypes" var="listType" status="stat"> + <s:set var="deliverRequestedArticleId">prepareArticleReceptionId<s:property value="#stat.index" /></s:set> + <s:url action="deliver-requested-article" id="deliverRequestedArticleUrl"> + <s:param name="listType" value="#listType" /> + </s:url> + <s:if test="#stat.index < shortcuts.size()"> + <script type="text/javascript"> + $(document).ready(function () { + var id = '<s:property value="deliverRequestedArticleId" />'; + bindKey('<s:property value="shortcuts.get(#stat.index)" />', function(){ redirectTo($('#' + id));}); + }); + </script> + <s:a href="%{deliverRequestedArticleUrl}" cssClass="btn btn-block" id="%{deliverRequestedArticleId}"> + Commencer à traiter une liste « <s:property value="#listType" /> » + (<s:property value="shortcuts.get(#stat.index)" />) + </s:a> + </s:if> + <s:else> + <s:a href="%{deliverRequestedArticleUrl}" cssClass="btn btn-block"> + Commencer à traiter une liste « <s:property value="#listType" /> » + </s:a> + </s:else> + </s:iterator> + </s:else> <s:url action="remove-user-affectation" id="removeUserAffectationUrl"> <s:param name="result">REDIRECT_TO_ACTIVITIES</s:param>

1 0

r369 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao magalie-services/src/main/java/com/franciaflex/magalie/services/service magalie-services/src/test/java/com/franciaflex/magalie/services/service magalie-web/src/main/java/com/franciaflex/magalie/web/action
by bleny＠users.forge.codelutin.com 21 Aug '13

21 Aug '13

Author: bleny Date: 2013-08-21 11:40:45 +0200 (Wed, 21 Aug 2013) New Revision: 369 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #2999 refactor findOrderToExecute to allow giving more details to the user about why she is no longer affected Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedArticles.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedLists.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleJpaDao.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FindOrderToExecuteResult.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedArticles.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedArticles.java 2013-08-20 16:12:50 UTC (rev 368) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedArticles.java 2013-08-21 09:40:45 UTC (rev 369) @@ -33,8 +33,8 @@ public class RequestedArticles { - public static Comparator<RequestedArticle> comparator(RequestedList affectedRequestedList) { - Comparator<RequestedList> requestedListComparator = RequestedLists.comparator(affectedRequestedList); + public static Comparator<RequestedArticle> comparator() { + Comparator<RequestedList> requestedListComparator = RequestedLists.comparator(); Comparator<RequestedArticle> comparator = Ordering.compound( Lists.newArrayList( Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedLists.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedLists.java 2013-08-20 16:12:50 UTC (rev 368) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedLists.java 2013-08-21 09:40:45 UTC (rev 369) @@ -82,11 +82,10 @@ return new GivenRequestListFirst(requestedList); } - public static Comparator<RequestedList> comparator(RequestedList affectedRequestedList) { + public static Comparator<RequestedList> comparator() { Ordering<RequestedList> comparator = Ordering.compound( Lists.newArrayList( - givenRequestListFirst(affectedRequestedList), urgentFirstComparator(), requestDateFirstComparator() ) Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleDao.java 2013-08-20 16:12:50 UTC (rev 368) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleDao.java 2013-08-21 09:40:45 UTC (rev 369) @@ -24,7 +24,6 @@ */ import com.franciaflex.magalie.persistence.entity.Building; -import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.RequestedArticle; import com.franciaflex.magalie.persistence.entity.RequestedList; @@ -33,8 +32,8 @@ /** @author bleny */ public interface RequestedArticleDao { - List<RequestedArticle> findAllUndelivered(Building building, MagalieUser affectedTo, String listType); + List<RequestedArticle> findAllUndelivered(RequestedList requestedList); - List<RequestedArticle> findAll(RequestedList requestedList); + List<RequestedArticle> findAllUndelivered(Building building, String listType); } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleJpaDao.java 2013-08-20 16:12:50 UTC (rev 368) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleJpaDao.java 2013-08-21 09:40:45 UTC (rev 369) @@ -24,8 +24,6 @@ */ import com.franciaflex.magalie.persistence.entity.Building; -import com.franciaflex.magalie.persistence.entity.DeliveredRequestedListStatus; -import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.RequestedArticle; import com.franciaflex.magalie.persistence.entity.RequestedList; @@ -40,25 +38,17 @@ } @Override - public List<RequestedArticle> findAllUndelivered(Building building, MagalieUser affectedTo, String listType) { - TypedQuery<RequestedArticle> query = createQuery( - "from RequestedArticle ra where " - + " ra not in (select dra.requestedArticle from DeliveredRequestedArticle dra) " - + " and ra.requestedList.building = :building " - + " and ra.requestedList.listType = :listType " - + " and ra.requestedList not in (select drl.requestedList from DeliveredRequestedList drl where drl.status = :complete or drl.status = :affected and drl.affectedTo != :affectedTo)"); - query.setParameter("building", building); - query.setParameter("listType", listType); - query.setParameter("complete", DeliveredRequestedListStatus.COMPLETE); - query.setParameter("affected", DeliveredRequestedListStatus.AFFECTED); - query.setParameter("affectedTo", affectedTo); + public List<RequestedArticle> findAllUndelivered(RequestedList requestedList) { + TypedQuery<RequestedArticle> query = createQuery("from RequestedArticle ra where ra.requestedList = :requestedList and ra not in (select dra.requestedArticle from DeliveredRequestedArticle dra where dra.requestedArticle.requestedList = :requestedList)"); + query.setParameter("requestedList", requestedList); return findAll(query); } @Override - public List<RequestedArticle> findAll(RequestedList requestedList) { - TypedQuery<RequestedArticle> query = createQuery("from RequestedArticle ra where ra.requestedList = :requestedList"); - query.setParameter("requestedList", requestedList); + public List<RequestedArticle> findAllUndelivered(Building building, String listType) { + TypedQuery<RequestedArticle> query = createQuery("from RequestedArticle ra where ra.requestedList.building = :building and ra.requestedList.listType = :listType and ra not in (select dra.requestedArticle from DeliveredRequestedArticle dra)"); + query.setParameter("building", building); + query.setParameter("listType", listType); return findAll(query); } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FindOrderToExecuteResult.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FindOrderToExecuteResult.java 2013-08-20 16:12:50 UTC (rev 368) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/FindOrderToExecuteResult.java 2013-08-21 09:40:45 UTC (rev 369) @@ -25,6 +25,7 @@ import com.franciaflex.magalie.persistence.entity.DeliveredRequestedList; import com.franciaflex.magalie.persistence.entity.RequestedArticle; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; public class FindOrderToExecuteResult { @@ -92,4 +93,9 @@ return newAffectation; } + @Override + public String toString() { + return ReflectionToStringBuilder.toString(this); + } + } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-08-20 16:12:50 UTC (rev 368) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-08-21 09:40:45 UTC (rev 369) @@ -29,7 +29,6 @@ import com.franciaflex.magalie.persistence.dao.DeliveredRequestedArticleJpaDao; import com.franciaflex.magalie.persistence.dao.DeliveredRequestedListDao; import com.franciaflex.magalie.persistence.dao.DeliveredRequestedListJpaDao; -import com.franciaflex.magalie.persistence.dao.RequestedArticleDao; import com.franciaflex.magalie.persistence.dao.RequestedArticleJpaDao; import com.franciaflex.magalie.persistence.dao.RequestedListJpaDao; import com.franciaflex.magalie.persistence.entity.Building; @@ -45,8 +44,11 @@ import com.franciaflex.magalie.services.StorageMovementConfirmation; import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; +import com.google.common.primitives.Booleans; +import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -69,163 +71,212 @@ public FindOrderToExecuteResult findOrderToExecute(MagalieUser magalieUser, Building building, String listType) { - List<RequestedArticle> requestedArticles = getRequestedArticles(building, magalieUser, listType); + JpaMagaliePersistenceContext persistenceContext = + serviceContext.getPersistenceContext(); - Set<RequestedArticle> requestedArticlesByPriority = getRequestedArticlesByPriority(requestedArticles, magalieUser); + // first, try find order in affected list - FindOrderToExecuteResult findOrderToExecuteResult = - findOrderToExecute( - requestedArticlesByPriority, - magalieUser, - building); + FindOrderToExecuteResult findOrderToExecuteResult = null; - return findOrderToExecuteResult; + DeliveredRequestedListJpaDao deliveredRequestedListDao = + persistenceContext.getDeliveredRequestedListDao(); - } + DeliveredRequestedList affectedDeliveredRequestedList = + deliveredRequestedListDao.findByAffectedTo(magalieUser); - protected List<RequestedArticle> getRequestedArticles(Building building, MagalieUser magalieUser, String listType) { + DeliveredRequestedList oldAffectation = null; - RequestedArticleDao requestedArticleDao = serviceContext.getPersistenceContext().getRequestedArticleDao(); + if (affectedDeliveredRequestedList != null) { - List<RequestedArticle> allRequestedArticles = requestedArticleDao.findAllUndelivered(building, magalieUser, listType); + RequestedList affectedRequestedList = affectedDeliveredRequestedList.getRequestedList(); - if (log.isInfoEnabled()) { - log.info(allRequestedArticles.size() + " articles requested in building " + building.getCode()); + findOrderToExecuteResult = + findOrderToExecute(affectedRequestedList, magalieUser, building); + + if (findOrderToExecuteResult.isSuccess()) { + + if (log.isInfoEnabled()) { + log.info("order to execute " + findOrderToExecuteResult + " found in affected list " + affectedDeliveredRequestedList); + } + + } else { + + if (log.isInfoEnabled()) { + log.info("request list " + affectedDeliveredRequestedList.getRequestedList() + + " is not complete, putting it back to pending"); + } + + affectedDeliveredRequestedList.setStatus(DeliveredRequestedListStatus.PENDING); + + affectedDeliveredRequestedList.setAffectedTo(null); + + oldAffectation = affectedDeliveredRequestedList; + + } + } - return allRequestedArticles; + DeliveredRequestedList newAffectation = null; - } + if (findOrderToExecuteResult == null || ! findOrderToExecuteResult.isSuccess()) { - protected FindOrderToExecuteResult findOrderToExecute(Set<RequestedArticle> requestedArticlesByPriority, MagalieUser magalieUser, Building building) { + RequestedArticleJpaDao requestedArticleDao = + persistenceContext.getRequestedArticleDao(); - ArticleStorageService articleStorageService = - serviceContext.newService(ArticleStorageService.class); + List<RequestedArticle> allUndelivered = + requestedArticleDao.findAllUndelivered(building, listType); - RequestedArticle requestedArticle = null; + if (log.isInfoEnabled()) { + log.info(allUndelivered.size() + " undelivered requested articles in building " + building + " for list type " + listType); + } - boolean success = false; + if (allUndelivered.isEmpty()) { - Iterator<RequestedArticle> requestedArticleIterator = requestedArticlesByPriority.iterator(); + findOrderToExecuteResult = new FindOrderToExecuteResult(); - boolean driverLicenseRequired = false; + findOrderToExecuteResult.setNothingToDo(true); - boolean somethingIsAvailable = false; + } else { - while ( ! success && requestedArticleIterator.hasNext()) { + Set<RequestedArticle> allUndeliveredByPriority = + Sets.newTreeSet(RequestedArticles.comparator()); - requestedArticle = requestedArticleIterator.next(); + allUndeliveredByPriority.addAll(allUndelivered); - String articleId = requestedArticle.getArticle().getId(); + findOrderToExecuteResult = findOrderToExecute(allUndeliveredByPriority, magalieUser, building); - RealTimeStorageMovementTask realTimeStorageMovementTask = - articleStorageService.getRealTimeStorageMovementTask(building, magalieUser, articleId); + if (findOrderToExecuteResult != null && findOrderToExecuteResult.isSuccess()) { - boolean articleIsAvailable = ! realTimeStorageMovementTask.isArticleUnavailable(); + RequestedList requestedList = findOrderToExecuteResult.getRequestedArticle().getRequestedList(); - if (articleIsAvailable) { + newAffectation = deliveredRequestedListDao.findByRequestedList(requestedList); - somethingIsAvailable = true; + if (newAffectation == null) { - driverLicenseRequired |= realTimeStorageMovementTask.isDriverLicenseRequired(); + newAffectation = new DeliveredRequestedList(); - } + deliveredRequestedListDao.persist(newAffectation); - success = articleIsAvailable; + } - } + newAffectation.setAffectedTo(magalieUser); - FindOrderToExecuteResult findOrderToExecuteResult = new FindOrderToExecuteResult(); + newAffectation.setRequestedList(requestedList); - if (success) { + newAffectation.setStatus(DeliveredRequestedListStatus.AFFECTED); - if (log.isInfoEnabled()) { - log.info("order to execute found: " + requestedArticle); + deliveredRequestedListDao.merge(newAffectation); + + } + } - Preconditions.checkState(requestedArticle != null); + } - JpaMagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); + persistenceContext.commit(); - findOrderToExecuteResult.setRequestedArticle(requestedArticle); + findOrderToExecuteResult.setOldAffectation(oldAffectation); - // deal with affectations - DeliveredRequestedListJpaDao deliveredRequestedListDao = - persistenceContext.getDeliveredRequestedListDao(); + findOrderToExecuteResult.setNewAffectation(newAffectation); - DeliveredRequestedList oldAffectation = - deliveredRequestedListDao.findByAffectedTo(magalieUser); + if (log.isInfoEnabled()) { + log.info("will return " + findOrderToExecuteResult); + } - RequestedList requestedList = requestedArticle.getRequestedList(); + Preconditions.checkState(oldAffectation == null || newAffectation == null || ! oldAffectation.equals(newAffectation)); - DeliveredRequestedList newAffectation = - deliveredRequestedListDao.findByRequestedList(requestedList); + Preconditions.checkState(findOrderToExecuteResult != null); - if (newAffectation == null) { + Preconditions.checkState( + BooleanUtils.xor( + Booleans.toArray( + ImmutableSet.of( + findOrderToExecuteResult.isSuccess(), + findOrderToExecuteResult.isEverythingUnavailable(), + findOrderToExecuteResult.isNothingToDo(), + findOrderToExecuteResult.isDriverLicenseRequired() + ) + ) + ) + ); - newAffectation = new DeliveredRequestedList(); + return findOrderToExecuteResult; - deliveredRequestedListDao.persist(newAffectation); + } - } + protected FindOrderToExecuteResult findOrderToExecute(RequestedList requestedList, MagalieUser magalieUser, Building building) { - newAffectation.setAffectedTo(magalieUser); + JpaMagaliePersistenceContext persistenceContext = + serviceContext.getPersistenceContext(); - newAffectation.setRequestedList(requestedList); + RequestedArticleJpaDao requestedArticleDao = + persistenceContext.getRequestedArticleDao(); - newAffectation.setStatus(DeliveredRequestedListStatus.AFFECTED); + List<RequestedArticle> allUndelivered = + requestedArticleDao.findAllUndelivered(requestedList); - deliveredRequestedListDao.merge(newAffectation); + Comparator<RequestedArticle> priorityComparator = + RequestedArticles.priorityComparator(); - if (oldAffectation == null) { + Set<RequestedArticle> requestedArticlesByPriority = + Sets.newTreeSet(priorityComparator); - if (log.isInfoEnabled()) { - log.info("user has no previous affectation"); - } + requestedArticlesByPriority.addAll(allUndelivered); - findOrderToExecuteResult.setNewAffectation(newAffectation); + return findOrderToExecute(requestedArticlesByPriority, magalieUser, building); - } else { + } - if (log.isInfoEnabled()) { - log.info("user is affected to " + oldAffectation.getRequestedList().getCode()); - } + protected FindOrderToExecuteResult findOrderToExecute(Set<RequestedArticle> requestedArticlesByPriority, MagalieUser magalieUser, Building building) { - boolean affectationChanged = !oldAffectation.getRequestedList().equals(requestedList); + ArticleStorageService articleStorageService = + serviceContext.newService(ArticleStorageService.class); - if (affectationChanged) { + RequestedArticle requestedArticle = null; - if (log.isInfoEnabled()) { - log.info("user changed affectation from " - + oldAffectation.getRequestedList().getCode() - + " to " + requestedList.getCode()); - } + boolean success = false; - boolean isFinished = oldAffectation.getStatus().isComplete(); + Iterator<RequestedArticle> requestedArticleIterator = requestedArticlesByPriority.iterator(); - if (!isFinished) { + boolean driverLicenseRequired = false; - if (log.isInfoEnabled()) { - log.info("request list " + oldAffectation.getRequestedList() - + " is not complete, putting it back to pending"); - } + boolean somethingIsAvailable = false; - oldAffectation.setStatus(DeliveredRequestedListStatus.PENDING); + while ( ! success && requestedArticleIterator.hasNext()) { - oldAffectation.setAffectedTo(null); + requestedArticle = requestedArticleIterator.next(); - } + String articleId = requestedArticle.getArticle().getId(); - findOrderToExecuteResult.setOldAffectation(oldAffectation); + RealTimeStorageMovementTask realTimeStorageMovementTask = + articleStorageService.getRealTimeStorageMovementTask(building, magalieUser, articleId); - findOrderToExecuteResult.setNewAffectation(newAffectation); + boolean articleIsAvailable = ! realTimeStorageMovementTask.isArticleUnavailable(); - } + if (articleIsAvailable) { + somethingIsAvailable = true; + + driverLicenseRequired |= realTimeStorageMovementTask.isDriverLicenseRequired(); + } - persistenceContext.commit(); + success = articleIsAvailable; + } + + FindOrderToExecuteResult findOrderToExecuteResult = new FindOrderToExecuteResult(); + + if (success) { + + if (log.isInfoEnabled()) { + log.info("order to execute found: " + requestedArticle); + } + + Preconditions.checkState(requestedArticle != null); + + findOrderToExecuteResult.setRequestedArticle(requestedArticle); + } else { if (requestedArticlesByPriority.isEmpty()) { @@ -268,35 +319,6 @@ } - protected Set<RequestedArticle> getRequestedArticlesByPriority(List<RequestedArticle> requests, MagalieUser magalieUser) { - - JpaMagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); - - DeliveredRequestedListDao deliveredRequestedListDao = persistenceContext.getDeliveredRequestedListDao(); - - DeliveredRequestedList affectedDeliveredRequestedList = - deliveredRequestedListDao.findByAffectedTo(magalieUser); - - RequestedList affectedRequestedList = null; - - if (affectedDeliveredRequestedList != null) { - - affectedRequestedList = affectedDeliveredRequestedList.getRequestedList(); - - } - - Comparator<RequestedArticle> priorityComparator = - RequestedArticles.comparator(affectedRequestedList); - - Set<RequestedArticle> requestedArticles = - Sets.newTreeSet(priorityComparator); - - requestedArticles.addAll(requests); - - return requestedArticles; - - } - public List<DeliveredRequestedList> getAllDeliveredRequestedLists() { JpaMagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); @@ -351,7 +373,7 @@ RequestedList requestedList = requestedArticle.getRequestedList(); List<RequestedArticle> allRequestedArticlesForList = - requestedArticleDao.findAll(requestedList); + requestedArticleDao.findAllByRequestedList(requestedList); List<DeliveredRequestedArticle> deliveredRequestedArticlesForList = deliveredRequestedArticleDao.findAll(requestedList); Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java 2013-08-20 16:12:50 UTC (rev 368) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java 2013-08-21 09:40:45 UTC (rev 369) @@ -31,7 +31,6 @@ import com.franciaflex.magalie.services.StorageMovementConfirmation; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -81,38 +80,6 @@ } @Test - public void testGetRequestedArticles() { - - List<RequestedArticle> requestedArticles = service.getRequestedArticles(building, magalieUser, LIST_TYPE); - - for (RequestedArticle requestedArticle : requestedArticles) { - - Assert.assertEquals(building, requestedArticle.getRequestedList().getBuilding()); - - } - - } - - @Test - public void testGetRequestedArticlesByPriority() { - - List<RequestedArticle> requestedArticles = fixture("requestedArticles"); - - Set<RequestedArticle> requestedArticlesByPriority = - service.getRequestedArticlesByPriority(requestedArticles, magalieUser); - - Assert.assertEquals(requestedArticles.size(), requestedArticlesByPriority.size()); - - Assert.assertEquals("requestedArticle3", Iterables.get(requestedArticlesByPriority, 0).getId()); - Assert.assertEquals("requestedArticle1", Iterables.get(requestedArticlesByPriority, 1).getId()); - Assert.assertEquals("requestedArticle4", Iterables.get(requestedArticlesByPriority, 2).getId()); - Assert.assertEquals("requestedArticle2", Iterables.get(requestedArticlesByPriority, 3).getId()); - Assert.assertEquals("requestedArticle6", Iterables.get(requestedArticlesByPriority, 4).getId()); - Assert.assertEquals("requestedArticle5", Iterables.get(requestedArticlesByPriority, 5).getId()); - - } - - @Test public void testFindOrderWhenNoRequestedArticles() { Set<RequestedArticle> emptySet = Sets.newHashSet(); @@ -182,9 +149,6 @@ Assert.assertFalse(orderToExecute.isDriverLicenseRequired()); Assert.assertTrue(orderToExecute.isSuccess()); - Assert.assertNull(orderToExecute.getOldAffectation()); - Assert.assertNotNull(orderToExecute.getNewAffectation()); - } @Test @@ -201,6 +165,7 @@ Assert.assertNull(orderToExecute.getOldAffectation()); Assert.assertNotNull(orderToExecute.getNewAffectation()); + Assert.assertEquals("requestedArticle3", orderToExecute.getRequestedArticle().getId()); StorageMovementConfirmation confirmation = new StorageMovementConfirmation(); confirmation.setRequestedArticleId(orderToExecute.getRequestedArticle().getId()); @@ -215,6 +180,7 @@ Assert.assertNull(orderToExecute.getOldAffectation()); Assert.assertNull(orderToExecute.getNewAffectation()); + Assert.assertEquals("requestedArticle1", orderToExecute.getRequestedArticle().getId()); StorageMovementConfirmation confirmation = new StorageMovementConfirmation(); confirmation.setRequestedArticleId(orderToExecute.getRequestedArticle().getId()); @@ -229,6 +195,7 @@ Assert.assertNull(orderToExecute.getOldAffectation()); Assert.assertNull(orderToExecute.getNewAffectation()); + Assert.assertEquals("requestedArticle2", orderToExecute.getRequestedArticle().getId()); StorageMovementConfirmation confirmation = new StorageMovementConfirmation(); confirmation.setRequestedArticleId(orderToExecute.getRequestedArticle().getId()); @@ -240,9 +207,10 @@ { orderToExecute = service.findOrderToExecute(magalieUser, building, LIST_TYPE); Preconditions.checkState(orderToExecute.isSuccess()); + Assert.assertEquals("requestedArticle6", orderToExecute.getRequestedArticle().getId()); Assert.assertNotNull(orderToExecute.getNewAffectation()); - if (false) { + if (true) { // XXX brendan 13/07/13 doesn't works but doesn't mind, the information is given to the user by another mean Assert.assertNotNull(orderToExecute.getOldAffectation()); Assert.assertNotEquals( @@ -259,6 +227,7 @@ { orderToExecute = service.findOrderToExecute(magalieUser, building, LIST_TYPE); Preconditions.checkState(orderToExecute.isSuccess()); + Assert.assertEquals("requestedArticle5", orderToExecute.getRequestedArticle().getId()); Assert.assertNull(orderToExecute.getOldAffectation()); Assert.assertNull(orderToExecute.getNewAffectation()); @@ -269,6 +238,14 @@ } + { + orderToExecute = service.findOrderToExecute(magalieUser, building, LIST_TYPE); + + Assert.assertTrue(orderToExecute.isEverythingUnavailable()); + // Assert.assertNotNull(orderToExecute.getOldAffectation()); + + } + } } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java 2013-08-20 16:12:50 UTC (rev 368) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java 2013-08-21 09:40:45 UTC (rev 369) @@ -123,7 +123,7 @@ } else { - message += " : liste non terminée"; + // message += " : liste non terminée"; }

1 0

r368 - trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao
by bleny＠users.forge.codelutin.com 20 Aug '13

20 Aug '13

Author: bleny Date: 2013-08-20 18:12:50 +0200 (Tue, 20 Aug 2013) New Revision: 368 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add a todo Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListJpaDao.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListJpaDao.java 2013-08-20 13:25:20 UTC (rev 367) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListJpaDao.java 2013-08-20 16:12:50 UTC (rev 368) @@ -36,7 +36,7 @@ } @Override - public List<String> findAllDistinctListTypes() { + public List<String> findAllDistinctListTypes() { // TODO brendan 20/08/13 add a building parameter TypedQuery<String> query = entityManager.createQuery( " select distinct rl.listType"

1 0

r367 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity magalie-services/src/main/java/com/franciaflex/magalie/services/service magalie-web/src/main/java/com/franciaflex/magalie/web/action
by bleny＠users.forge.codelutin.com 20 Aug '13

20 Aug '13

Author: bleny Date: 2013-08-20 15:25:20 +0200 (Tue, 20 Aug 2013) New Revision: 367 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #2999 when affectation is removed, show if list is complete or not Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedListStatus.java Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedListStatus.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedListStatus.java (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedListStatus.java 2013-08-20 13:25:20 UTC (rev 367) @@ -0,0 +1,19 @@ +package com.franciaflex.magalie.persistence.entity; + +public enum DeliveredRequestedListStatus { + + PENDING, + + AFFECTED, + + COMPLETE; + + public boolean isComplete() { + return this == COMPLETE; + } + + public boolean isAffected() { + return this == AFFECTED; + } + +} //DeliveredRequestedListStatus Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-08-19 15:43:42 UTC (rev 366) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-08-20 13:25:20 UTC (rev 367) @@ -201,7 +201,7 @@ + " to " + requestedList.getCode()); } - boolean isFinished = oldAffectation.getStatus().equals(DeliveredRequestedListStatus.COMPLETE); + boolean isFinished = oldAffectation.getStatus().isComplete(); if (!isFinished) { @@ -398,7 +398,7 @@ DeliveredRequestedList deliveredRequestedList = dao.findByAffectedTo(magalieUser); - if (deliveredRequestedList != null && deliveredRequestedList.getStatus() == DeliveredRequestedListStatus.AFFECTED) { + if (deliveredRequestedList != null && deliveredRequestedList.getStatus().isAffected()) { if (log.isInfoEnabled()) { log.info("user " + magalieUser.getLogin() + Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java 2013-08-19 15:43:42 UTC (rev 366) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java 2013-08-20 13:25:20 UTC (rev 367) @@ -115,8 +115,20 @@ if (oldAffectation != null) { - session.addMessage("Vous n'êtes plus affecté à la liste " + oldAffectation.getRequestedList().getCode()); + String message = "Vous n'êtes plus affecté à la liste " + oldAffectation.getRequestedList().getCode(); + if (oldAffectation.getStatus().isComplete()) { + + message += " : liste terminée"; + + } else { + + message += " : liste non terminée"; + + } + + session.addMessage(message); + } DeliveredRequestedList newAffectation = findOrderToExecuteResult.getNewAffectation(); Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-08-19 15:43:42 UTC (rev 366) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-08-20 13:25:20 UTC (rev 367) @@ -26,7 +26,6 @@ import com.franciaflex.magalie.MagalieTechnicalException; import com.franciaflex.magalie.persistence.entity.Article; import com.franciaflex.magalie.persistence.entity.DeliveredRequestedList; -import com.franciaflex.magalie.persistence.entity.DeliveredRequestedListStatus; import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.RequestedArticle; import com.franciaflex.magalie.services.StorageMovementConfirmation; @@ -205,7 +204,7 @@ DeliveredRequestedList deliveredRequestedList = deliveredRequestedListOptional.get(); - if (deliveredRequestedList.getStatus() == DeliveredRequestedListStatus.COMPLETE) { + if (deliveredRequestedList.getStatus().isComplete()) { session.addMessage("La liste " + deliveredRequestedList.getRequestedList().getCode() + " est terminée");

1 0

r366 - in trunk/magalie-web/src/main: java/com/franciaflex/magalie/web/action webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 19 Aug '13

19 Aug '13

Author: bleny Date: 2013-08-19 17:43:42 +0200 (Mon, 19 Aug 2013) New Revision: 366 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #3000 change redirection after remove affectation Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RemoveUserAffectationAction.java trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RemoveUserAffectationAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RemoveUserAffectationAction.java 2013-08-19 14:30:14 UTC (rev 365) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/RemoveUserAffectationAction.java 2013-08-19 15:43:42 UTC (rev 366) @@ -27,11 +27,13 @@ import com.franciaflex.magalie.services.service.RequestedArticleService; import com.franciaflex.magalie.web.MagalieActionSupport; import com.franciaflex.magalie.web.MagalieSession; +import com.google.common.base.Preconditions; import org.apache.struts2.convention.annotation.Result; import org.apache.struts2.convention.annotation.Results; @Results({ - @Result(name="success", type="redirectAction", params = { "actionName", "choose-activity" }) + @Result(name="REDIRECT_TO_LIST_TYPES", type="redirectAction", params = { "actionName", "deliver-requested-article!input" }), + @Result(name="REDIRECT_TO_ACTIVITIES", type="redirectAction", params = { "actionName", "choose-activity" }) }) public class RemoveUserAffectationAction extends MagalieActionSupport { @@ -39,6 +41,8 @@ protected RequestedArticleService service; + protected String result; + public void setSession(MagalieSession session) { this.session = session; } @@ -47,14 +51,20 @@ this.service = service; } + public void setResult(String result) { + this.result = result; + } + @Override public String execute() { + Preconditions.checkState(result != null); + MagalieUser magalieUser = session.getMagalieUser(); service.removeAffectation(magalieUser); - return SUCCESS; + return result; } Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp 2013-08-19 14:30:14 UTC (rev 365) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/deliver-requested-article-input.jsp 2013-08-19 15:43:42 UTC (rev 366) @@ -39,6 +39,11 @@ <s:param name="listType" value="%{requestedList.listType}" /> </s:url> <s:a href="%{deliverRequestedArticleUrl}" cssClass="btn btn-block" id="requestedArticle" >Demander un article à servir (0)</s:a> + + <s:url action="remove-user-affectation" id="removeUserAffectationUrl"> + <s:param name="result">REDIRECT_TO_LIST_TYPES</s:param> + </s:url> + <s:a href="%{removeUserAffectationUrl}" cssClass="btn btn-block" id="removeUserAffectationLink">Abandonner la liste (Esc)</s:a> </s:if> <s:else> <s:iterator value="listTypes" var="listType" status="stat"> @@ -64,7 +69,9 @@ </s:a> </s:else> </s:iterator> + + <s:url action="remove-user-affectation" id="removeUserAffectationUrl"> + <s:param name="result">REDIRECT_TO_ACTIVITIES</s:param> + </s:url> + <s:a href="%{removeUserAffectationUrl}" cssClass="btn btn-block" id="removeUserAffectationLink">Changer d'activité (Esc)</s:a> </s:else> - -<s:url action="remove-user-affectation" id="removeUserAffectationUrl"/> -<s:a href="%{removeUserAffectationUrl}" cssClass="btn btn-block" id="removeUserAffectationLink">Changer d'activité (Esc)</s:a>

1 0

r365 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao magalie-services/src/test/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com 19 Aug '13

19 Aug '13

Author: bleny Date: 2013-08-19 16:30:14 +0200 (Mon, 19 Aug 2013) New Revision: 365 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #3000 exclude list with status complete or affected from listTypes Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListJpaDao.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListJpaDao.java 2013-08-19 13:57:53 UTC (rev 364) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListJpaDao.java 2013-08-19 14:30:14 UTC (rev 365) @@ -23,6 +23,8 @@ * #L% */ +import com.franciaflex.magalie.persistence.entity.DeliveredRequestedListStatus; + import javax.persistence.EntityManager; import javax.persistence.TypedQuery; import java.util.List; @@ -35,7 +37,15 @@ @Override public List<String> findAllDistinctListTypes() { - TypedQuery<String> query = entityManager.createQuery("select distinct rl.listType from RequestedList rl", String.class); + TypedQuery<String> query = + entityManager.createQuery( + " select distinct rl.listType" + + " from RequestedList rl" + + " where rl not in (select drl.requestedList from DeliveredRequestedList drl where drl.status = :affectedDeliveredRequestedListStatus OR drl.status = :completeDeliveredRequestedListStatus)" + , String.class); + query.setParameter("affectedDeliveredRequestedListStatus", DeliveredRequestedListStatus.AFFECTED); + query.setParameter("completeDeliveredRequestedListStatus", DeliveredRequestedListStatus.COMPLETE); return query.getResultList(); } + } Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java 2013-08-19 13:57:53 UTC (rev 364) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java 2013-08-19 14:30:14 UTC (rev 365) @@ -68,9 +68,19 @@ magalieUser = fixture("bruno"); building = fixture("B1"); + } @Test + public void testListTypes() { + + List<String> listTypes = service.getListTypes(); + + Assert.assertEquals(1, listTypes.size()); + + } + + @Test public void testGetRequestedArticles() { List<RequestedArticle> requestedArticles = service.getRequestedArticles(building, magalieUser, LIST_TYPE);

1 0

r364 - in trunk: magalie-services/src/main/java/com/franciaflex/magalie/services/service magalie-web/src/main/java/com/franciaflex/magalie/web/action
by bleny＠users.forge.codelutin.com 19 Aug '13

19 Aug '13

Author: bleny Date: 2013-08-19 15:57:53 +0200 (Mon, 19 Aug 2013) New Revision: 364 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #2994 change redirection after reception confirmation Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-08-05 15:06:30 UTC (rev 363) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-08-19 13:57:53 UTC (rev 364) @@ -49,6 +49,7 @@ import com.franciaflex.magalie.services.MagalieServiceContext; import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException; import com.franciaflex.magalie.services.exception.PreparedArticleReceptionAlreadyStoredException; +import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableSet; @@ -431,4 +432,45 @@ } + /** + * On cherche à savoir si pour un storedArticle donné, il y a encore des articles à recevoir pour le même fournisseur + */ + public Optional<Supplier> isSupplierHaveOtherArticlesToReceive(Building building, String storedArticleId) { + + JpaMagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); + + StoredArticleJpaDao storedArticleDao = persistenceContext.getStoredArticleDao(); + + StoredArticle storedArticle = storedArticleDao.findById(storedArticleId); + + Supplier supplier = storedArticle.getArticle().getSupplier(); + + Optional<Supplier> result; + + if (supplier == null) { + + result = Optional.absent(); + + } else { + + SuppliersToReceive receivedSuppliers = getReceivedSuppliers(building); + + boolean isSupplierHaveOtherArticlesToReceive = receivedSuppliers.getSuppliersByGroup().values().contains(supplier); + + if (isSupplierHaveOtherArticlesToReceive) { + + result = Optional.of(supplier); + + } else { + + result = Optional.absent(); + + } + + } + + return result; + + } + } Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java 2013-08-05 15:06:30 UTC (rev 363) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java 2013-08-19 13:57:53 UTC (rev 364) @@ -26,13 +26,16 @@ import com.franciaflex.magalie.MagalieTechnicalException; import com.franciaflex.magalie.persistence.entity.Building; import com.franciaflex.magalie.persistence.entity.MagalieUser; +import com.franciaflex.magalie.persistence.entity.Supplier; import com.franciaflex.magalie.services.exception.InvalidMagalieBarcodeException; import com.franciaflex.magalie.services.exception.PreparedArticleReceptionAlreadyStoredException; import com.franciaflex.magalie.services.service.ReceptionConfirmation; import com.franciaflex.magalie.services.service.ReceptionService; import com.franciaflex.magalie.services.service.ReceptionTask; +import com.franciaflex.magalie.web.Activity; import com.franciaflex.magalie.web.MagalieActionSupport; import com.franciaflex.magalie.web.MagalieSession; +import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.base.Strings; import org.apache.commons.logging.Log; @@ -46,7 +49,8 @@ import java.util.Map; @Results({ - @Result(name= "RECEPTIONS", type="redirectAction", params = { "actionName", "prepare-article-reception!input" }), + @Result(name= "REDIRECT_TO_ARTICLES", type="redirectAction", params = { "actionName", "prepare-article-reception", "supplierId", "%{supplierId}" }), + @Result(name= "REDIRECT_TO_SUPPLIERS", type="redirectAction", params = { "actionName", "prepare-article-reception!input" }), @Result(name= "PREPARED_RECEPTIONS", type="redirectAction", params = { "actionName", "prepare-prepared-article-reception!input" }) }) public class ReceiveArticleAction extends MagalieActionSupport { @@ -65,6 +69,8 @@ protected ReceptionConfirmation confirmation; + protected String supplierId; + public void setSession(MagalieSession session) { this.session = session; } @@ -165,10 +171,46 @@ MagalieUser magalieUser = session.getMagalieUser(); + Building building = session.getBuilding(); + service.confirmReception(magalieUser, confirmation, preparedArticleReceptionBarcode); - return session.getActivity().name(); + // on redirige selon l'activité + String result; + + if (Activity.PREPARED_RECEPTIONS.equals(session.getActivity())) { + + result = Activity.PREPARED_RECEPTIONS.name(); + + } else { + + // dans ce cas on redirige vers la listes des articles, s'il reste des articles à réceptionner pour le même fournisseur + // sinon, on renvoie vers la liste des fournisseurs + + Optional<Supplier> supplierOptional = + service.isSupplierHaveOtherArticlesToReceive(building, confirmation.getStoredArticleId()); + + if (supplierOptional.isPresent()) { + + result = "REDIRECT_TO_ARTICLES"; + + supplierId = supplierOptional.get().getId(); + + } else { + + result = "REDIRECT_TO_SUPPLIERS"; + + } + + } + + return result; + } + public String getSupplierId() { + return supplierId; + } + }

1 0