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

r404 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity magalie-services/src/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 11:48:10 +0200 (Mon, 02 Sep 2013) New Revision: 404 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #3144 add toString to ease debug, remove sout call Added: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedList.java Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java Added: 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 (rev 0) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedList.java 2013-09-02 09:48:10 UTC (rev 404) @@ -0,0 +1,21 @@ +package com.franciaflex.magalie.persistence.entity; + +import com.google.common.base.Objects; + +import javax.persistence.Entity; + +@Entity +public class DeliveredRequestedList extends AbstractJpaDeliveredRequestedList { + + private static final long serialVersionUID = 1L; + + @Override + public String toString() { + return Objects.toStringHelper(this) + .add(PROPERTY_REQUESTED_LIST, requestedList.getCode()) + .add(PROPERTY_AFFECTED_TO, affectedTo) + .add(PROPERTY_STATUS, status.name()) + .toString(); + } + +} 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:47:04 UTC (rev 403) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java 2013-09-02 09:48:10 UTC (rev 404) @@ -288,7 +288,6 @@ if (log.isDebugEnabled()) { log.debug("delivered requested list = " + deliveredRequestedLists); } - System.out.println("delivered requested list = " + deliveredRequestedLists); Assert.assertEquals(2, deliveredRequestedLists.size());

1 0

r403 - trunk/magalie-web/src/main/webapp/js
by bleny＠users.forge.codelutin.com 02 Sep '13

02 Sep '13

Author: bleny Date: 2013-09-02 11:47:04 +0200 (Mon, 02 Sep 2013) New Revision: 403 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #3145 absurd code lack of test Modified: trunk/magalie-web/src/main/webapp/js/receive-article-input.js Modified: trunk/magalie-web/src/main/webapp/js/receive-article-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-09-02 09:35:28 UTC (rev 402) +++ trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-09-02 09:47:04 UTC (rev 403) @@ -62,13 +62,14 @@ async: false, success: function(data) { location = data.receptionLocation; // null si le code barre n'est pas valide + if (location != null) { + locations.push(location); + } } }); } if (location == null) { throw new ValidationError(barcode + " n'est pas le code barre d'un emplacement valide"); - } else { - locations.push(location); } if (location.fullLocation) { throw new ValidationError("Emplt " + barcode + " en erreur - choisir un autre");

1 0

r402 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity magalie-services/src/main/java/com/franciaflex/magalie/services/service magalie-services/src/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 11:35:28 +0200 (Mon, 02 Sep 2013) New Revision: 402 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #3144 add a more restrictive request to find undelivered articles Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleJpaDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedListStatus.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 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-30 16:34:51 UTC (rev 401) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedArticleJpaDao.java 2013-09-02 09:35:28 UTC (rev 402) @@ -24,6 +24,7 @@ */ import com.franciaflex.magalie.persistence.entity.Building; +import com.franciaflex.magalie.persistence.entity.DeliveredRequestedListStatus; import com.franciaflex.magalie.persistence.entity.RequestedArticle; import com.franciaflex.magalie.persistence.entity.RequestedList; @@ -46,9 +47,16 @@ @Override 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)"); + TypedQuery<RequestedArticle> query = createQuery( + " from RequestedArticle ra" + + " where ra.requestedList.building = :building" + + " and ra.requestedList.listType = :listType" + + " and ra.requestedList not in (select drl.requestedList from DeliveredRequestedList drl where drl.status = :affectedDeliveredRequestedListStatus OR drl.status = :completeDeliveredRequestedListStatus)" + + " and ra not in (select dra.requestedArticle from DeliveredRequestedArticle dra)"); query.setParameter("building", building); query.setParameter("listType", listType); + query.setParameter("affectedDeliveredRequestedListStatus", DeliveredRequestedListStatus.AFFECTED); + query.setParameter("completeDeliveredRequestedListStatus", DeliveredRequestedListStatus.COMPLETE); return findAll(query); } Modified: 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 2013-08-30 16:34:51 UTC (rev 401) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/DeliveredRequestedListStatus.java 2013-09-02 09:35:28 UTC (rev 402) @@ -39,4 +39,8 @@ return this == AFFECTED; } + public boolean isPending() { + return this == PENDING; + } + } //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-30 16:34:51 UTC (rev 401) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-09-02 09:35:28 UTC (rev 402) @@ -171,6 +171,10 @@ deliveredRequestedListDao.persist(newAffectation); + } else { + + Preconditions.checkState(newAffectation.getStatus().isPending(), "liste déjà affectée"); + } newAffectation.setAffectedTo(magalieUser); 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-30 16:34:51 UTC (rev 401) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java 2013-09-02 09:35:28 UTC (rev 402) @@ -23,7 +23,9 @@ * #L% */ +import com.franciaflex.magalie.persistence.dao.DeliveredRequestedListJpaDao; 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.StorageMovement; @@ -40,6 +42,7 @@ import org.junit.Test; import org.mockito.Mockito; +import javax.persistence.EntityManager; import java.text.ParseException; import java.util.Date; import java.util.List; @@ -255,4 +258,42 @@ } + @Test + public void testAffectationsLockLists() { + + FindOrderToExecuteResult orderToExecute = service.findOrderToExecute(magalieUser, building, LIST_TYPE); + + Preconditions.checkState(orderToExecute.isSuccess()); + + DeliveredRequestedList firstAffectation = orderToExecute.getNewAffectation(); + + Preconditions.checkNotNull(firstAffectation); + + // on essaie de travailler avec un autre utilisateur pour vérifier qu'il n'est pas affecté à la même liste + + MagalieUser otherMagalieUser = fixture("pascal"); + + orderToExecute = service.findOrderToExecute(otherMagalieUser, building, LIST_TYPE); + + Preconditions.checkState(orderToExecute.isSuccess()); + + DeliveredRequestedList otherAffectation = orderToExecute.getNewAffectation(); + + Preconditions.checkNotNull(otherAffectation); + + EntityManager entityManager = getJpaEntityManagerRule().newEntityManager(); + DeliveredRequestedListJpaDao deliveredRequestedListJpaDao = new DeliveredRequestedListJpaDao(entityManager); + List<DeliveredRequestedList> deliveredRequestedLists = deliveredRequestedListJpaDao.findAll(); + + if (log.isDebugEnabled()) { + log.debug("delivered requested list = " + deliveredRequestedLists); + } + System.out.println("delivered requested list = " + deliveredRequestedLists); + + Assert.assertEquals(2, deliveredRequestedLists.size()); + + Assert.assertNotEquals(firstAffectation.getRequestedList(), otherAffectation.getRequestedList()); + + } + }

1 0

r401 - in trunk: . magalie-persistence magalie-services magalie-web
by maven-release＠users.forge.codelutin.com 30 Aug '13

30 Aug '13

Author: maven-release Date: 2013-08-30 18:34:51 +0200 (Fri, 30 Aug 2013) New Revision: 401 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-08-30 16:34:44 UTC (rev 400) +++ trunk/magalie-persistence/pom.xml 2013-08-30 16:34:51 UTC (rev 401) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-5</version> + <version>1.0-rc-6-SNAPSHOT</version> </parent> <artifactId>magalie-persistence</artifactId> Modified: trunk/magalie-services/pom.xml =================================================================== --- trunk/magalie-services/pom.xml 2013-08-30 16:34:44 UTC (rev 400) +++ trunk/magalie-services/pom.xml 2013-08-30 16:34:51 UTC (rev 401) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-5</version> + <version>1.0-rc-6-SNAPSHOT</version> </parent> <artifactId>magalie-services</artifactId> Modified: trunk/magalie-web/pom.xml =================================================================== --- trunk/magalie-web/pom.xml 2013-08-30 16:34:44 UTC (rev 400) +++ trunk/magalie-web/pom.xml 2013-08-30 16:34:51 UTC (rev 401) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-5</version> + <version>1.0-rc-6-SNAPSHOT</version> </parent> <groupId>com.franciaflex</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-30 16:34:44 UTC (rev 400) +++ trunk/pom.xml 2013-08-30 16:34:51 UTC (rev 401) @@ -10,7 +10,7 @@ <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-5</version> + <version>1.0-rc-6-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

r400 - in tags: . franciaflex-magalie-1.0-rc-5
by maven-release＠users.forge.codelutin.com 30 Aug '13

30 Aug '13

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

1 0

r399 - in trunk: . magalie-persistence magalie-services magalie-web
by maven-release＠users.forge.codelutin.com 30 Aug '13

30 Aug '13

Author: maven-release Date: 2013-08-30 18:34:36 +0200 (Fri, 30 Aug 2013) New Revision: 399 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: [maven-release-plugin] prepare release franciaflex-magalie-1.0-rc-5 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-08-30 16:32:06 UTC (rev 398) +++ trunk/magalie-persistence/pom.xml 2013-08-30 16:34:36 UTC (rev 399) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-5-SNAPSHOT</version> + <version>1.0-rc-5</version> </parent> <artifactId>magalie-persistence</artifactId> Modified: trunk/magalie-services/pom.xml =================================================================== --- trunk/magalie-services/pom.xml 2013-08-30 16:32:06 UTC (rev 398) +++ trunk/magalie-services/pom.xml 2013-08-30 16:34:36 UTC (rev 399) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-5-SNAPSHOT</version> + <version>1.0-rc-5</version> </parent> <artifactId>magalie-services</artifactId> Modified: trunk/magalie-web/pom.xml =================================================================== --- trunk/magalie-web/pom.xml 2013-08-30 16:32:06 UTC (rev 398) +++ trunk/magalie-web/pom.xml 2013-08-30 16:34:36 UTC (rev 399) @@ -5,7 +5,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-5-SNAPSHOT</version> + <version>1.0-rc-5</version> </parent> <groupId>com.franciaflex</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-08-30 16:32:06 UTC (rev 398) +++ trunk/pom.xml 2013-08-30 16:34:36 UTC (rev 399) @@ -10,7 +10,7 @@ <groupId>com.franciaflex</groupId> <artifactId>magalie</artifactId> - <version>1.0-rc-5-SNAPSHOT</version> + <version>1.0-rc-5</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

r398 - trunk/magalie-web
by bleny＠users.forge.codelutin.com 30 Aug '13

30 Aug '13

Author: bleny Date: 2013-08-30 18:32:06 +0200 (Fri, 30 Aug 2013) New Revision: 398 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add missing dependency Modified: trunk/magalie-web/pom.xml Modified: trunk/magalie-web/pom.xml =================================================================== --- trunk/magalie-web/pom.xml 2013-08-30 16:28:22 UTC (rev 397) +++ trunk/magalie-web/pom.xml 2013-08-30 16:32:06 UTC (rev 398) @@ -62,6 +62,11 @@ </dependency> <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency>

1 0

r397 - trunk/magalie-web/src/main/webapp/js
by bleny＠users.forge.codelutin.com 30 Aug '13

30 Aug '13

Author: bleny Date: 2013-08-30 18:28:22 +0200 (Fri, 30 Aug 2013) New Revision: 397 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #3111 change message Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js Modified: trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-08-30 16:24:14 UTC (rev 396) +++ trunk/magalie-web/src/main/webapp/js/withdraw-item-input.js 2013-08-30 16:28:22 UTC (rev 397) @@ -70,7 +70,7 @@ } }); if (storageMovement.articleUnavailable) { - alert('Plus de stock'); + alert("Pas d'autre emplacement disponible"); } else { if (this.expectedQuantity) { storageMovement.expectedQuantity = Math.min(model.remaining(), storageMovement.storedArticle.quantity);

1 0

r396 - trunk/magalie-web/src/main/webapp/js
by bleny＠users.forge.codelutin.com 30 Aug '13

30 Aug '13

Author: bleny Date: 2013-08-30 18:24:14 +0200 (Fri, 30 Aug 2013) New Revision: 396 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #3113 'location' field in action was renamed 'receptionLocation' Modified: trunk/magalie-web/src/main/webapp/js/receive-article-input.js Modified: trunk/magalie-web/src/main/webapp/js/receive-article-input.js =================================================================== --- trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-08-29 12:47:46 UTC (rev 395) +++ trunk/magalie-web/src/main/webapp/js/receive-article-input.js 2013-08-30 16:24:14 UTC (rev 396) @@ -61,13 +61,14 @@ }, async: false, success: function(data) { - location = data.location; - locations.push(location); + location = data.receptionLocation; // null si le code barre n'est pas valide } }); } if (location == null) { throw new ValidationError(barcode + " n'est pas le code barre d'un emplacement valide"); + } else { + locations.push(location); } if (location.fullLocation) { throw new ValidationError("Emplt " + barcode + " en erreur - choisir un autre");

1 0

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

29 Aug '13

Author: bleny Date: 2013-08-29 14:47:46 +0200 (Thu, 29 Aug 2013) New Revision: 395 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: prevent an exception to be logged as error, add a precondition Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LocationJsonAction.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LocationJsonAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LocationJsonAction.java 2013-08-29 11:19:42 UTC (rev 394) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/LocationJsonAction.java 2013-08-29 12:47:46 UTC (rev 395) @@ -69,7 +69,7 @@ } @Override - public String execute() throws InvalidMagalieBarcodeException { + public String execute() { MagalieUser magalieUser = session.getMagalieUser(); @@ -79,8 +79,18 @@ Building building = session.getBuilding(); - receptionLocation = service.getReceptionLocation(building, magalieUser, locationBarcode, articleId); + try { + receptionLocation = service.getReceptionLocation(building, magalieUser, locationBarcode, articleId); + + } catch (InvalidMagalieBarcodeException e) { + + if (log.isWarnEnabled()) { + log.warn("unable to find reception location for barcode '" + locationBarcode + "'"); + } + + } + return 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-29 11:19:42 UTC (rev 394) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/WithdrawItemAction.java 2013-08-29 12:47:46 UTC (rev 395) @@ -193,6 +193,12 @@ @Override public String execute() { + if (log.isDebugEnabled()) { + log.debug("confirmation = " + confirmation); + } + + Preconditions.checkNotNull(confirmation, "absence de données de confirmation"); + if (confirmation.getStorageMovementIds().contains(null)) { if (log.isErrorEnabled()) {

1 0