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

r414 - trunk/magalie-web/src/main/resources
by bleny＠users.forge.codelutin.com 11 Sep '13

11 Sep '13

Author: bleny Date: 2013-09-11 17:36:18 +0200 (Wed, 11 Sep 2013) New Revision: 414 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #3151 conf logs Modified: trunk/magalie-web/src/main/resources/log4j.properties Modified: trunk/magalie-web/src/main/resources/log4j.properties =================================================================== --- trunk/magalie-web/src/main/resources/log4j.properties 2013-09-11 14:22:08 UTC (rev 413) +++ trunk/magalie-web/src/main/resources/log4j.properties 2013-09-11 15:36:18 UTC (rev 414) @@ -20,11 +20,11 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -log4j.rootCategory=WARN, console, file +log4j.rootCategory=WARN, file -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n +#log4j.appender.console=org.apache.log4j.ConsoleAppender +#log4j.appender.console.layout=org.apache.log4j.PatternLayout +#log4j.appender.console.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n # FileAppender : need to have magalie.log.dir in system properties at application startup log4j.appender.file=org.apache.log4j.RollingFileAppender @@ -35,11 +35,11 @@ log4j.appender.file.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n # global level -log4j.logger.com.franciaflex.magalie=TRACE +# log4j.logger.com.franciaflex.magalie=WARN ### persistence level # log4j.logger.org.nuiton.jpa=TRACE -log4j.logger.oracle.jdbc.driver=TRACE +# log4j.logger.oracle.jdbc.driver=TRACE ### services level # log4j.logger.com.franciaflex.magalie.services.service.RequestedArticleService=TRACE

1 0

r413 - in trunk: . magalie-web
by bleny＠users.forge.codelutin.com 11 Sep '13

11 Sep '13

Author: bleny Date: 2013-09-11 16:22:08 +0200 (Wed, 11 Sep 2013) New Revision: 413 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #3150 update dependencies Modified: trunk/magalie-web/pom.xml trunk/pom.xml Modified: trunk/magalie-web/pom.xml =================================================================== --- trunk/magalie-web/pom.xml 2013-09-02 16:07:15 UTC (rev 412) +++ trunk/magalie-web/pom.xml 2013-09-11 14:22:08 UTC (rev 413) @@ -25,6 +25,8 @@ <defaultWebContextPath>magalie</defaultWebContextPath> <defaultSiteUrl>http://localhost:8080/${defaultWebContextPath}</defaultSiteUrl> <defaultLogDir>${basedir}/target</defaultLogDir> + + <skipPostRelease>false</skipPostRelease> </properties> <dependencies> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-02 16:07:15 UTC (rev 412) +++ trunk/pom.xml 2013-09-11 14:22:08 UTC (rev 413) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.11</version> + <version>4.0</version> </parent> <groupId>com.franciaflex</groupId> @@ -113,10 +113,9 @@ <nuitonJpaVersion>1.0-rc-1</nuitonJpaVersion> <nuitonWebVersion>1.14</nuitonWebVersion> - <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> - <h2Version>1.3.172</h2Version> - <struts2Version>2.3.14.2</struts2Version> - <jqueryPluginVersion>3.6.0</jqueryPluginVersion> + <h2Version>1.3.173</h2Version> + <struts2Version>2.3.15.1</struts2Version> + <jqueryPluginVersion>3.6.1</jqueryPluginVersion> <bootstrapPluginVersion>1.6.1</bootstrapPluginVersion> <shiroVersion>1.2.1</shiroVersion> <slf4jVersion>1.7.5</slf4jVersion> @@ -154,13 +153,13 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>2.7.1</version> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>${nuitonUtilsVersion}</version> + <version>3.0-alpha-1</version> </dependency> <dependency>

1 0

r412 - trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity
by bleny＠users.forge.codelutin.com 02 Sep '13

02 Sep '13

Author: bleny Date: 2013-09-02 18:07:15 +0200 (Mon, 02 Sep 2013) New Revision: 412 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: update file headers Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedList.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedList.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedList.java 2013-09-02 16:01:38 UTC (rev 411) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedList.java 2013-09-02 16:07:15 UTC (rev 412) @@ -1,5 +1,28 @@ package com.franciaflex.magalie.persistence.entity; +/* + * #%L + * MagaLiE :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2013 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + import com.google.common.base.Objects; import javax.persistence.Entity;

1 0

r411 - in trunk: . magalie-persistence magalie-services magalie-web
by maven-release＠users.forge.codelutin.com 02 Sep '13

02 Sep '13

Author: maven-release Date: 2013-09-02 18:01:38 +0200 (Mon, 02 Sep 2013) New Revision: 411 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/magalie-persistence/pom.xml trunk/magalie-services/pom.xml trunk/magalie-web/pom.xml trunk/pom.xml Modified: trunk/magalie-persistence/pom.xml =================================================================== --- trunk/magalie-persistence/pom.xml 2013-09-02 16:01:30 UTC (rev 410) +++ trunk/magalie-persistence/pom.xml 2013-09-02 16:01:38 UTC (rev 411) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-6</version> + <version>1.0-rc-7-SNAPSHOT</version> </parent> <artifactId>magalie-persistence</artifactId> Modified: trunk/magalie-services/pom.xml =================================================================== --- trunk/magalie-services/pom.xml 2013-09-02 16:01:30 UTC (rev 410) +++ trunk/magalie-services/pom.xml 2013-09-02 16:01:38 UTC (rev 411) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-6</version> + <version>1.0-rc-7-SNAPSHOT</version> </parent> <artifactId>magalie-services</artifactId> Modified: trunk/magalie-web/pom.xml =================================================================== --- trunk/magalie-web/pom.xml 2013-09-02 16:01:30 UTC (rev 410) +++ trunk/magalie-web/pom.xml 2013-09-02 16:01:38 UTC (rev 411) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-6</version> + <version>1.0-rc-7-SNAPSHOT</version> </parent> <groupId>com.franciaflex</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-02 16:01:30 UTC (rev 410) +++ trunk/pom.xml 2013-09-02 16:01:38 UTC (rev 411) @@ -10,7 +10,7 @@ <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-6</version> + <version>1.0-rc-7-SNAPSHOT</version> <packaging>pom</packaging> <name>MagaLiE</name> @@ -92,9 +92,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/tags/francia…</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/tags/francia…</developerConnection> - <url>http://forge.codelutin.com/repositories/browse/franciaflex-magalie/tags/fra…</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/trunk</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/trunk</developerConnection> + <url>http://forge.codelutin.com/repositories/browse/franciaflex-magalie/trunk</url> </scm> <distributionManagement> <site>

1 0

r410 - in tags: . franciaflex-magalie-1.0-rc-6
by maven-release＠users.forge.codelutin.com 02 Sep '13

02 Sep '13

Author: maven-release Date: 2013-09-02 18:01:30 +0200 (Mon, 02 Sep 2013) New Revision: 410 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: [maven-release-plugin] copy for tag franciaflex-magalie-1.0-rc-6 Added: tags/franciaflex-magalie-1.0-rc-6/ Property changes on: tags/franciaflex-magalie-1.0-rc-6 ___________________________________________________________________ Added: svn:ignore + target *.iml *.ipr .idea *~ Added: svn:mergeinfo + /branches/magalie-eugene:191-224

1 0

r409 - in trunk: . magalie-persistence magalie-services magalie-web
by maven-release＠users.forge.codelutin.com 02 Sep '13

02 Sep '13

Author: maven-release Date: 2013-09-02 18:01:22 +0200 (Mon, 02 Sep 2013) New Revision: 409 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: [maven-release-plugin] prepare release franciaflex-magalie-1.0-rc-6 Modified: trunk/magalie-persistence/pom.xml trunk/magalie-services/pom.xml trunk/magalie-web/pom.xml trunk/pom.xml Modified: trunk/magalie-persistence/pom.xml =================================================================== --- trunk/magalie-persistence/pom.xml 2013-09-02 15:46:28 UTC (rev 408) +++ trunk/magalie-persistence/pom.xml 2013-09-02 16:01:22 UTC (rev 409) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-6-SNAPSHOT</version> + <version>1.0-rc-6</version> </parent> <artifactId>magalie-persistence</artifactId> Modified: trunk/magalie-services/pom.xml =================================================================== --- trunk/magalie-services/pom.xml 2013-09-02 15:46:28 UTC (rev 408) +++ trunk/magalie-services/pom.xml 2013-09-02 16:01:22 UTC (rev 409) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-6-SNAPSHOT</version> + <version>1.0-rc-6</version> </parent> <artifactId>magalie-services</artifactId> Modified: trunk/magalie-web/pom.xml =================================================================== --- trunk/magalie-web/pom.xml 2013-09-02 15:46:28 UTC (rev 408) +++ trunk/magalie-web/pom.xml 2013-09-02 16:01:22 UTC (rev 409) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-6-SNAPSHOT</version> + <version>1.0-rc-6</version> </parent> <groupId>com.franciaflex</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-02 15:46:28 UTC (rev 408) +++ trunk/pom.xml 2013-09-02 16:01:22 UTC (rev 409) @@ -10,7 +10,7 @@ <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-6-SNAPSHOT</version> + <version>1.0-rc-6</version> <packaging>pom</packaging> <name>MagaLiE</name> @@ -92,9 +92,9 @@ </modules> <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/trunk</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/trunk</developerConnection> - <url>http://forge.codelutin.com/repositories/browse/franciaflex-magalie/trunk</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/tags/francia…</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/franciaflex-magalie/tags/francia…</developerConnection> + <url>http://forge.codelutin.com/repositories/browse/franciaflex-magalie/tags/fra…</url> </scm> <distributionManagement> <site>

1 0

r408 - trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action
by bleny＠users.forge.codelutin.com 02 Sep '13

02 Sep '13

Author: bleny Date: 2013-09-02 17:46:28 +0200 (Mon, 02 Sep 2013) New Revision: 408 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fix NPE found in logs Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java 2013-09-02 15:18:31 UTC (rev 407) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/StorageTransferAction.java 2013-09-02 15:46:28 UTC (rev 408) @@ -34,6 +34,7 @@ import com.franciaflex.magalie.services.service.StorageTransferService; import com.franciaflex.magalie.web.MagalieActionSupport; import com.franciaflex.magalie.web.MagalieSession; +import com.google.common.base.Optional; import com.google.common.collect.Iterables; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -49,7 +50,8 @@ @Results({ @Result(name="success", type="redirectAction", params = { "actionName", "storage-transfer-location!input"}), - @Result(name="error", type="redirectAction", params = { "actionName", "storage-transfer-location!input"}) + @Result(name="error", type="redirectAction", params = { "actionName", "storage-transfer-location!input"}), + @Result(name="choose-stored-article", type="redirectAction", params = { "actionName", "storage-transfer-location!input", "originId", "%{origin.id}"}) }) public class StorageTransferAction extends MagalieActionSupport { @@ -108,8 +110,17 @@ if (storedArticleId != null) { - storedArticle = Iterables.find(storedArticles, JpaEntities.entityHasId(storedArticleId)); + // dans un cas très rare, on risque la NPE si l'article a déjà sorti de l'emplacement par un autre utilisateur + // dans ce cas, on retourne à la liste de choix + // XXX brendan 02/09/13 c'est arrivé une seule fois, à voir si on conserve ce comportement qui ne devrait pratiquement jamais arrivé + Optional<StoredArticle> storedArticleOptional = Iterables.tryFind(storedArticles, JpaEntities.entityHasId(storedArticleId)); + if (storedArticleOptional.isPresent()) { + + storedArticle = storedArticleOptional.get(); + + } + } Company company = session.getBuilding().getCompany(); @@ -123,6 +134,13 @@ prepare(); + if (storedArticleId != null && storedArticle == null) { + if (log.isWarnEnabled()) { + log.warn("stored article " + storedArticleId + " was not available, ask user to choose another"); + } + return "choose-stored-article"; + } + // default value if (storedArticle != null) { quantity = storedArticle.getQuantity();

1 0

r407 - trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com 02 Sep '13

02 Sep '13

Author: bleny Date: 2013-09-02 17:18:31 +0200 (Mon, 02 Sep 2013) New Revision: 407 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add a preconditions to try to spot a bug Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 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-09-02 14:28:18 UTC (rev 406) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-09-02 15:18:31 UTC (rev 407) @@ -536,6 +536,8 @@ RequestedArticle requestedArticle = requestedArticleDao.findById(requestedArticleId); + Preconditions.checkNotNull(requestedArticle, "unable to find requestedArticle with id = " + requestedArticleId); + return requestedArticle; }

1 0

r406 - trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action
by bleny＠users.forge.codelutin.com 02 Sep '13

02 Sep '13

Author: bleny Date: 2013-09-02 16:28:18 +0200 (Mon, 02 Sep 2013) New Revision: 406 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #3149 show message only for a not prepared article reception Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java 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-09-02 12:08:27 UTC (rev 405) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/ReceiveArticleAction.java 2013-09-02 14:28:18 UTC (rev 406) @@ -103,6 +103,13 @@ receptionTask = service.getReceptionTask(storedArticleId); + // on affiche ce message que dans le cas des réceptions simples, dans le cas des prepared, c'est toujours true donc plus gênant comme notification qu'autre chose + if (receptionTask.isUserMustChooseExtraLocation()) { + + addActionMessage("Pas de stock : emplacement libre proposé"); + + } + } if (preparedArticleReceptionBarcode != null) { @@ -133,12 +140,6 @@ Preconditions.checkNotNull(receptionTask); - if (receptionTask.isUserMustChooseExtraLocation()) { - - addActionMessage("Pas de stock : emplacement libre proposé"); - - } - Supplier supplier = receptionTask.getStoredArticle().getArticle().getSupplier(); if (supplier != null) {

1 0

r405 - in trunk/magalie-services/src: main/java/com/franciaflex/magalie/services/service test/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com 02 Sep '13

02 Sep '13

Author: bleny Date: 2013-09-02 14:08:27 +0200 (Mon, 02 Sep 2013) New Revision: 405 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #3147 do not affect to another list if user was already affected to a completed list Modified: 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 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-09-02 09:48:10 UTC (rev 404) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-09-02 12:08:27 UTC (rev 405) @@ -88,52 +88,8 @@ DeliveredRequestedList affectedDeliveredRequestedList = deliveredRequestedListDao.findByAffectedTo(magalieUser); - DeliveredRequestedList oldAffectation = null; + if (affectedDeliveredRequestedList == null) { - if (affectedDeliveredRequestedList != null) { - - RequestedList affectedRequestedList = affectedDeliveredRequestedList.getRequestedList(); - - 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; - - if (findOrderToExecuteResult.isDriverLicenseRequired()) { - - userNotificationContext.notifyUnaffectedRequestedListDriverLicenseRequired(magalieUser, oldAffectation); - - } else if (findOrderToExecuteResult.isEverythingUnavailable()) { - - userNotificationContext.notifyUnaffectedRequestedListForEverythingUnavailable(magalieUser, oldAffectation); - - } - - } - - } - - DeliveredRequestedList newAffectation = null; - - if (findOrderToExecuteResult == null || ! findOrderToExecuteResult.isSuccess()) { - RequestedArticleJpaDao requestedArticleDao = persistenceContext.getRequestedArticleDao(); @@ -163,7 +119,7 @@ RequestedList requestedList = findOrderToExecuteResult.getRequestedArticle().getRequestedList(); - newAffectation = deliveredRequestedListDao.findByRequestedList(requestedList); + DeliveredRequestedList newAffectation = deliveredRequestedListDao.findByRequestedList(requestedList); if (newAffectation == null) { @@ -185,34 +141,62 @@ deliveredRequestedListDao.merge(newAffectation); + userNotificationContext.notifyAffectedRequestedList(magalieUser, newAffectation); + + findOrderToExecuteResult.setNewAffectation(newAffectation); + } } - } + } else { - persistenceContext.commit(); + RequestedList affectedRequestedList = affectedDeliveredRequestedList.getRequestedList(); - if (oldAffectation != null) { + findOrderToExecuteResult = + findOrderToExecute(affectedRequestedList, magalieUser, building); - findOrderToExecuteResult.setOldAffectation(oldAffectation); + if (findOrderToExecuteResult.isSuccess()) { - } + if (log.isInfoEnabled()) { + log.info("order to execute " + findOrderToExecuteResult + " found in affected list " + affectedDeliveredRequestedList); + } - if (newAffectation != null) { + } else { - findOrderToExecuteResult.setNewAffectation(newAffectation); + if (log.isInfoEnabled()) { + log.info("request list " + affectedDeliveredRequestedList.getRequestedList() + + " is not complete, putting it back to pending"); + } - userNotificationContext.notifyAffectedRequestedList(magalieUser, newAffectation); + affectedDeliveredRequestedList.setStatus(DeliveredRequestedListStatus.PENDING); + affectedDeliveredRequestedList.setAffectedTo(null); + + DeliveredRequestedList oldAffectation = affectedDeliveredRequestedList; + + if (findOrderToExecuteResult.isDriverLicenseRequired()) { + + userNotificationContext.notifyUnaffectedRequestedListDriverLicenseRequired(magalieUser, oldAffectation); + + } else if (findOrderToExecuteResult.isEverythingUnavailable()) { + + userNotificationContext.notifyUnaffectedRequestedListForEverythingUnavailable(magalieUser, oldAffectation); + + } + + findOrderToExecuteResult.setOldAffectation(oldAffectation); + + } + } + persistenceContext.commit(); + if (log.isInfoEnabled()) { log.info("will return " + findOrderToExecuteResult); } - Preconditions.checkState(oldAffectation == null || newAffectation == null || ! oldAffectation.equals(newAffectation)); - Preconditions.checkState(findOrderToExecuteResult != null); Preconditions.checkState( 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-09-02 09:48:10 UTC (rev 404) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java 2013-09-02 12:08:27 UTC (rev 405) @@ -218,15 +218,23 @@ // first list is finished, must know old affectation and new affectation { + orderToExecute = service.findOrderToExecute(magalieUser, building, LIST_TYPE); + Assert.assertFalse(orderToExecute.isSuccess()); + + Assert.assertNull(orderToExecute.getNewAffectation()); + Assert.assertNotNull(orderToExecute.getOldAffectation()); + + } + + // start a new list, we should have been affected to another list + { + orderToExecute = service.findOrderToExecute(magalieUser, building, LIST_TYPE); Preconditions.checkState(orderToExecute.isSuccess()); Assert.assertEquals("requestedArticle6", orderToExecute.getRequestedArticle().getId()); Assert.assertNotNull(orderToExecute.getNewAffectation()); - Assert.assertNotNull(orderToExecute.getOldAffectation()); - Assert.assertNotEquals( - orderToExecute.getOldAffectation().getRequestedList(), - orderToExecute.getNewAffectation().getRequestedList()); + Assert.assertNull(orderToExecute.getOldAffectation()); StorageMovementConfirmation confirmation = new StorageMovementConfirmation(); confirmation.setRequestedArticleId(orderToExecute.getRequestedArticle().getId());

1 0