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

r160 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence 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 17 May '13

17 May '13

Author: bleny Date: 2013-05-17 10:45:28 +0200 (Fri, 17 May 2013) New Revision: 160 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: refs #2165 prevent suggestion of 'REC' locations Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java 2013-05-16 15:56:34 UTC (rev 159) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java 2013-05-17 08:45:28 UTC (rev 160) @@ -33,6 +33,14 @@ public class Locations { + protected static class IsReceptionLocation implements Predicate<Location> { + + @Override + public boolean apply(Location location) { + return codeForReceptionLocations().equals(location.getCode()); + } + } + protected static class AccessibleLocationPredicate implements Predicate<Location> { protected MagalieUser magalieUser; @@ -81,4 +89,8 @@ public static String codeForReceptionLocations() { return "REC"; } + + public static Predicate<Location> isNotReceptionLocation() { + return Predicates.not(new IsReceptionLocation()); + } } 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-05-16 15:56:34 UTC (rev 159) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ReceptionService.java 2013-05-17 08:45:28 UTC (rev 160) @@ -23,6 +23,7 @@ * #L% */ +import com.franciaflex.magalie.persistence.Locations; import com.franciaflex.magalie.persistence.MagaliePersistenceContext; import com.franciaflex.magalie.persistence.StoredArticles; import com.franciaflex.magalie.persistence.dao.LocationDao; @@ -119,6 +120,17 @@ protected List<Location> findLocationsToReceiveArticle(Building building, Article article) { + // first step, add fixed locations for this article first + Set<Location> locations = Sets.newLinkedHashSet(); + + if (article.getFixedLocations() != null) { + + locations.addAll(article.getFixedLocations()); + + } + + // second step, add locations where there is already quantities stored + // we will suggest locations with highest quantities first ArticleStorageService articleStorageService = serviceContext.newService(ArticleStorageService.class); @@ -135,30 +147,33 @@ Iterables.addAll(sortedStoredArticles, storedArticles); - Set<Location> result = Sets.newLinkedHashSet(); - - if (article.getFixedLocations() != null) { - - result.addAll(article.getFixedLocations()); - - } - Iterables.addAll( - result, + locations, Iterables.transform( - sortedStoredArticles, - StoredArticles.getLocationFunction())); + sortedStoredArticles, + StoredArticles.getLocationFunction())); + // third step, add extra locations MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); LocationDao locationDao = persistenceContext.getLocationDao(); - result.addAll(locationDao.findAllWithoutReception(building)); + locations.addAll(locationDao.findAllWithoutReception(building)); - return Lists.newArrayList(result); + // fourth step, remove reception locations because it's stupid to + // move an article from reception location to another reception location + List<Location> result = + Lists.newArrayList( + Iterables.filter( + locations, + Locations.isNotReceptionLocation() + ) + ); + return result; + } public void confirmReception(MagalieUser magalieUser, ReceptionConfirmation receptionConfirmation) { Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-05-16 15:56:34 UTC (rev 159) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-05-17 08:45:28 UTC (rev 160) @@ -23,6 +23,7 @@ * #L% */ +import com.franciaflex.magalie.persistence.Locations; import com.franciaflex.magalie.persistence.dao.StorageMovementDao; import com.franciaflex.magalie.persistence.entity.Article; import com.franciaflex.magalie.persistence.entity.Building; @@ -120,6 +121,20 @@ Assert.assertEquals(fixedLocation, receptionTask.getLocations().get(0)); + for (Location location : receptionTask.getLocations()) { + + Assert.assertNotEquals( + "we should never suggest someone to store something in a reception location", + Locations.codeForReceptionLocations(), + location.getCode()); + + Assert.assertNotEquals( + "we should never suggest someone to store something in a warehouse without locations", + Locations.codeForWarehouseWithoutLocations(), + location.getCode()); + + } + } @Test

1 0

r159 - trunk/magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 16 May '13

16 May '13

Author: bleny Date: 2013-05-16 17:56:34 +0200 (Thu, 16 May 2013) New Revision: 159 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: add craveMan field in report of magalie users Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-05-16 14:49:16 UTC (rev 158) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/report.jsp 2013-05-16 15:56:34 UTC (rev 159) @@ -332,8 +332,11 @@ nom </th> <th> - permis ? + niveau de permis </th> + <th> + permis pontier + </th> </tr> </thead> @@ -350,8 +353,11 @@ <s:property value="name" /> </td> <td> - <s:property value="driverLicenseOwner" /> + <s:property value="accreditationLevel" /> </td> + <td> + <s:property value="craneMan" /> + </td> </tr> </s:iterator> </tbody>

1 0

r158 - trunk/magalie-web/src/main/webapp/WEB-INF
by bleny＠users.forge.codelutin.com 16 May '13

16 May '13

Author: bleny Date: 2013-05-16 16:49:16 +0200 (Thu, 16 May 2013) New Revision: 158 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: prevent caching of javascript files without expiration Modified: trunk/magalie-web/src/main/webapp/WEB-INF/web.xml Modified: trunk/magalie-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/web.xml 2013-05-16 12:37:12 UTC (rev 157) +++ trunk/magalie-web/src/main/webapp/WEB-INF/web.xml 2013-05-16 14:49:16 UTC (rev 158) @@ -33,7 +33,25 @@ <session-timeout>600</session-timeout> </session-config> +  <filter> + <filter-name>ExpiresFilter</filter-name> + <filter-class>org.apache.catalina.filters.ExpiresFilter</filter-class> + <init-param> + <param-name>ExpiresByType image</param-name> + <param-value>access plus 10 minutes</param-value> + </init-param> + <init-param> + <param-name>ExpiresByType text/css</param-name> + <param-value>access plus 10 minutes</param-value> + </init-param> + <init-param> + <param-name>ExpiresByType application/javascript</param-name> + <param-value>access plus 10 minutes</param-value> + </init-param> + </filter> + + <filter> <filter-name>jpaTransaction</filter-name> <filter-class>com.franciaflex.magalie.web.MagalieJpaTransactionFilter</filter-class> </filter> @@ -78,4 +96,10 @@ <listener-class>com.franciaflex.magalie.web.MagalieApplicationListener</listener-class> </listener> + <filter-mapping> + <filter-name>ExpiresFilter</filter-name> + <url-pattern>/*</url-pattern> + <dispatcher>REQUEST</dispatcher> + </filter-mapping> + </web-app>

1 0

r157 - trunk/magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 16 May '13

16 May '13

Author: bleny Date: 2013-05-16 14:37:12 +0200 (Thu, 16 May 2013) New Revision: 157 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: on fulfil kanban, put focus on articleBarcode Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp 2013-05-16 10:05:24 UTC (rev 156) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/fulfil-kanban-input.jsp 2013-05-16 12:37:12 UTC (rev 157) @@ -25,6 +25,11 @@ <head> <title>Traitement des kanbans</title> + <script type="text/javascript"> + $(document).ready(function () { + $("#fulfil-kanban_articleBarcode").focus(); + }); + </script> </head> <s:url namespace="/" action="choose-activity" id="chooseActivityUrl"/>

1 0

r156 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity magalie-services/src/main/resources magalie-services/src/test/java/com/franciaflex/magalie/services/service
by Bavencoff＠users.forge.codelutin.com 16 May '13

16 May '13

Author: Bavencoff Date: 2013-05-16 12:05:24 +0200 (Thu, 16 May 2013) New Revision: 156 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fixes #2371 : add Crane man control Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/MagalieUser.java trunk/magalie-services/src/main/resources/fixtures.yaml trunk/magalie-services/src/main/resources/fixtures2.yaml trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/OldFixturesArticleStorageServiceTest.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java 2013-05-16 08:40:46 UTC (rev 155) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java 2013-05-16 10:05:24 UTC (rev 156) @@ -43,7 +43,8 @@ @Override public boolean apply(Location location) { - boolean isLocationAccessible = magalieUser.getAccreditationLevel() >= location.getRequiredAccreditationLevel(); + boolean isLocationAccessible = magalieUser.getAccreditationLevel() >= location.getRequiredAccreditationLevel() + && (magalieUser.isCraneMan() || !location.isRequiredCraneMan()) ; return isLocationAccessible; } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java 2013-05-16 08:40:46 UTC (rev 155) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java 2013-05-16 10:05:24 UTC (rev 156) @@ -42,6 +42,8 @@ protected boolean fullLocation; + protected boolean requiredCraneMan; + @Override public String getId() { return id; @@ -87,4 +89,13 @@ public void setFullLocation(boolean fullLocation) { this.fullLocation = fullLocation; } + + public boolean isRequiredCraneMan() { + return requiredCraneMan; } + + public void setRequiredCraneMan(boolean requiredCraneMan) { + this.requiredCraneMan = requiredCraneMan; + } + +} Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/MagalieUser.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/MagalieUser.java 2013-05-16 08:40:46 UTC (rev 155) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/MagalieUser.java 2013-05-16 10:05:24 UTC (rev 156) @@ -38,6 +38,8 @@ protected int accreditationLevel; + protected boolean craneMan; + @Override public String getId() { return id; @@ -71,4 +73,13 @@ this.accreditationLevel = accreditationLevel; } + + public boolean isCraneMan() { + return craneMan; + } + + public void setCraneMan(boolean craneMan) { + this.craneMan = craneMan; + } + } Modified: trunk/magalie-services/src/main/resources/fixtures.yaml =================================================================== --- trunk/magalie-services/src/main/resources/fixtures.yaml 2013-05-16 08:40:46 UTC (rev 155) +++ trunk/magalie-services/src/main/resources/fixtures.yaml 2013-05-16 10:05:24 UTC (rev 156) @@ -4,6 +4,7 @@ login: phe name: Pascal Heinz accreditationLevel: 9 + craneMan: false bruno: &bruno !user @@ -11,6 +12,7 @@ login: bmr name: Bruno Menager accreditationLevel: 9 + craneMan: true corinne: &corinne !user @@ -18,6 +20,7 @@ login: ccr name: Corinne Cocolon accreditationLevel: 0 + craneMan: false xavier: &xavier !user @@ -25,6 +28,7 @@ login: xbe name: Xavier Bertini accreditationLevel: 0 + craneMan: false users: - *bruno @@ -102,6 +106,7 @@ warehouse: *U01 code: A01 requiredAccreditationLevel: 0 + requiredCraneMan : false location2: &location2 !location @@ -109,6 +114,7 @@ warehouse: *U01 code: B02 requiredAccreditationLevel: 9 + requiredCraneMan : false location3: &location3 !location @@ -116,6 +122,7 @@ warehouse: *U01 code: C03 requiredAccreditationLevel: 0 + requiredCraneMan : false location4: &location4 !location @@ -123,6 +130,7 @@ warehouse: *U01 code: D04 requiredAccreditationLevel: 9 + requiredCraneMan : false location5: &location5 !location @@ -130,6 +138,7 @@ warehouse: *U02 code: F01 requiredAccreditationLevel: 0 + requiredCraneMan : false location6: &location6 !location @@ -137,6 +146,7 @@ warehouse: *U02 code: G02 requiredAccreditationLevel: 0 + requiredCraneMan : false location7: &location7 !location @@ -144,6 +154,7 @@ warehouse: *U02 code: H03 requiredAccreditationLevel: 9 + requiredCraneMan : false location8: &location8 !location @@ -151,6 +162,7 @@ warehouse: *U04 code: A010 requiredAccreditationLevel: 0 + requiredCraneMan : false location9: &location9 !location @@ -158,6 +170,7 @@ warehouse: *SOM code: B10 requiredAccreditationLevel: 0 + requiredCraneMan : false location10: &location10 !location @@ -165,6 +178,7 @@ warehouse: *SOM code: B24 requiredAccreditationLevel: 0 + requiredCraneMan : false location11: &location11 !location @@ -172,6 +186,7 @@ warehouse: *SOM code: B77 requiredAccreditationLevel: 0 + requiredCraneMan : false location12: &location12 !location @@ -179,6 +194,7 @@ warehouse: *SOM code: C12 requiredAccreditationLevel: 0 + requiredCraneMan : false location13: &location13 !location @@ -186,6 +202,7 @@ warehouse: *U01 code: REC requiredAccreditationLevel: 0 + requiredCraneMan : false location14: &location14 !location @@ -193,6 +210,7 @@ warehouse: *B01 code: SANS requiredAccreditationLevel: 0 + requiredCraneMan : false locationRecU01: &locationRecU01 !location @@ -200,6 +218,7 @@ warehouse: *U01 code: REC requiredAccreditationLevel: 0 + requiredCraneMan : false locationRecU02: &locationRecU02 !location @@ -207,6 +226,7 @@ warehouse: *U02 code: REC requiredAccreditationLevel: 0 + requiredCraneMan : false locationRecU03: &locationRecU03 !location @@ -214,6 +234,7 @@ warehouse: *U03 code: REC requiredAccreditationLevel: 0 + requiredCraneMan : false locationRecU04: &locationRecU04 !location @@ -221,6 +242,7 @@ warehouse: *U04 code: REC requiredAccreditationLevel: 0 + requiredCraneMan : false locationRecSOM: &locationRecSOM !location @@ -228,6 +250,7 @@ warehouse: *SOM code: REC requiredAccreditationLevel: 0 + requiredCraneMan : false locationRecB01: &locationRecB01 !location @@ -235,6 +258,7 @@ warehouse: *B01 code: REC requiredAccreditationLevel: 0 + requiredCraneMan : false locations: - *location1 Modified: trunk/magalie-services/src/main/resources/fixtures2.yaml =================================================================== --- trunk/magalie-services/src/main/resources/fixtures2.yaml 2013-05-16 08:40:46 UTC (rev 155) +++ trunk/magalie-services/src/main/resources/fixtures2.yaml 2013-05-16 10:05:24 UTC (rev 156) @@ -4,6 +4,7 @@ login: ale name: Alexandre accreditationLevel: 9 + craneMan: true basile: &basile !user @@ -11,6 +12,7 @@ login: bas name: Basile accreditationLevel: 0 + craneMan: false cathy: &cathy !user @@ -18,6 +20,7 @@ login: cat name: Cathy accreditationLevel: 9 + craneMan: false david: &david !user @@ -25,6 +28,7 @@ login: dav name: David accreditationLevel: 0 + craneMan: false users: - *alexandre @@ -96,6 +100,7 @@ warehouse: *U01 code: A1 requiredAccreditationLevel: 0 + requiredCraneMan: false location2: &location2 !location @@ -103,6 +108,7 @@ warehouse: *U01 code: B2 requiredAccreditationLevel: 9 + requiredCraneMan: false location3: &location3 !location @@ -110,6 +116,7 @@ warehouse: *U01 code: C3 requiredAccreditationLevel: 0 + requiredCraneMan: false location4: &location4 !location @@ -117,6 +124,7 @@ warehouse: *U01 code: D4 requiredAccreditationLevel: 9 + requiredCraneMan: false location5: &location5 !location @@ -124,13 +132,23 @@ warehouse: *U02 code: A1 requiredAccreditationLevel: 0 + requiredCraneMan: false +location6: + &location6 !location + id: location6 + warehouse: *U02 + code: A2 + requiredAccreditationLevel: 0 + requiredCraneMan: true + locations: - *location1 - *location2 - *location3 - *location4 - *location5 + - *location6 supplier1: &supplier1 !supplier @@ -174,10 +192,19 @@ description: magic powder fixedLocationsFirst: false +article4: + &article4 !article + id: article4 + code: 444444444 + unit: g + description: lutins malins + fixedLocationsFirst: false + articles: - *article1 - *article2 - *article3 + - *article4 kanban1: &kanban1 !kanban @@ -230,12 +257,21 @@ location: *location4 quantity: 1000 +storedArticle5: + &storedArticle5 !stored-article + id: storedArticle5 + article: *article4 + location: *location6 + quantity: 1000 + storedArticles: - *storedArticle1 - *storedArticle2 - *storedArticle3 - *storedArticle4 + - *storedArticle5 + storedArticlesForArticle1: - *storedArticle1 - *storedArticle2 Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/OldFixturesArticleStorageServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/OldFixturesArticleStorageServiceTest.java 2013-05-16 08:40:46 UTC (rev 155) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/OldFixturesArticleStorageServiceTest.java 2013-05-16 10:05:24 UTC (rev 156) @@ -138,6 +138,38 @@ } @Test + public void testThrowRequiredCraneManLicenceException() throws Exception { + + MagalieUser basile = fixture("basile"); + Article article = fixture("article4"); + + BookArticleRequest bookArticleRequest = new BookArticleRequest(basile, building, article, 70., destinationLocation, false); + + BookArticleResult bookArticleResult = service.bookArticle(bookArticleRequest); + + Assert.assertFalse(bookArticleResult.isSuccess()); + Assert.assertTrue(bookArticleResult.isArticleInaccessible()); + Assert.assertFalse(bookArticleResult.isArticleUnavailable()); + + } + + @Test + public void testWithCraneManWithLocationRequiredCraneMan() throws Exception { + + MagalieUser basile = fixture("alexandre"); + Article article = fixture("article4"); + + BookArticleRequest bookArticleRequest = new BookArticleRequest(basile, building, article, 70., destinationLocation, false); + + BookArticleResult bookArticleResult = service.bookArticle(bookArticleRequest); + + Assert.assertTrue(bookArticleResult.isSuccess()); + Assert.assertFalse(bookArticleResult.isArticleInaccessible()); + Assert.assertFalse(bookArticleResult.isArticleUnavailable()); + + } + + @Test public void testWithdrawArticleConsiderAlreadyRemovedItem() throws Exception { MagalieUser alexandre = fixture("alexandre");

1 0

r155 - trunk
by Bavencoff＠users.forge.codelutin.com 16 May '13

16 May '13

Author: Bavencoff Date: 2013-05-16 10:40:46 +0200 (Thu, 16 May 2013) New Revision: 155 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: update dependencies nuiton-web and nuiton-utilities Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-05-15 16:01:34 UTC (rev 154) +++ trunk/pom.xml 2013-05-16 08:40:46 UTC (rev 155) @@ -90,8 +90,8 @@ <projectId>franciaflex-magalie</projectId>  - <nuitonWebVersion>1.12-SNAPSHOT</nuitonWebVersion> - <nuitonUtilsVersion>2.6.11-SNAPSHOT</nuitonUtilsVersion> + <nuitonWebVersion>1.13</nuitonWebVersion> + <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> <h2Version>1.3.170</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <struts2Version>2.3.8</struts2Version>

1 0

r154 - trunk/magalie-web/src/main/webapp/WEB-INF/content
by bleny＠users.forge.codelutin.com 15 May '13

15 May '13

Author: bleny Date: 2013-05-15 18:01:34 +0200 (Wed, 15 May 2013) New Revision: 154 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: in reception show article code Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp Modified: trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp =================================================================== --- trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp 2013-05-15 15:25:50 UTC (rev 153) +++ trunk/magalie-web/src/main/webapp/WEB-INF/content/prepare-article-reception.jsp 2013-05-15 16:01:34 UTC (rev 154) @@ -33,6 +33,7 @@ <s:property value="quantity" /> <s:property value="article.unit" /> <s:property value="article.description" /> + (Réf <s:property value="article.code" />) </s:a> </li> </s:iterator>

1 0

r153 - trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com 15 May '13

15 May '13

Author: bleny Date: 2013-05-15 17:25:50 +0200 (Wed, 15 May 2013) New Revision: 153 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fix 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-05-15 15:22:01 UTC (rev 152) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-05-15 15:25:50 UTC (rev 153) @@ -130,7 +130,7 @@ somethingIsAvailable = true; - driverLicenseRequired = bookArticleResult.isArticleInaccessible(); + driverLicenseRequired |= bookArticleResult.isArticleInaccessible(); }

1 0

r152 - trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service
by bleny＠users.forge.codelutin.com 15 May '13

15 May '13

Author: bleny Date: 2013-05-15 17:22:01 +0200 (Wed, 15 May 2013) New Revision: 152 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: rename test Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java 2013-05-15 15:13:20 UTC (rev 151) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java 2013-05-15 15:22:01 UTC (rev 152) @@ -104,7 +104,7 @@ } @Test - public void testRegression() { + public void testUserCannotAccessArticle() { MagalieUser corinne = fixture("corinne");

1 0

r151 - in trunk: magalie-persistence/src/main/java/com/franciaflex/magalie/persistence 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 15 May '13

15 May '13

Author: bleny Date: 2013-05-15 17:13:20 +0200 (Wed, 15 May 2013) New Revision: 151 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revision… Log: fix the fact that user is sent on article he cannot access, add docs, use real values for compte location accessibility Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/MagalieUser.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/BookArticleResult.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/ArticleStorageServiceTest.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java 2013-05-13 16:55:20 UTC (rev 150) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/Locations.java 2013-05-15 15:13:20 UTC (rev 151) @@ -33,14 +33,6 @@ public class Locations { - protected static class LocationRequireDriverLicensePredicate implements Predicate<Location> { - - @Override - public boolean apply(Location location) { - return location.isDriverLicenseRequired(); - } - } - protected static class AccessibleLocationPredicate implements Predicate<Location> { protected MagalieUser magalieUser; @@ -51,8 +43,7 @@ @Override public boolean apply(Location location) { - boolean isLocationAccessible = magalieUser.isDriverLicenseOwner() - || ! location.isDriverLicenseRequired(); + boolean isLocationAccessible = magalieUser.getAccreditationLevel() >= location.getRequiredAccreditationLevel(); return isLocationAccessible; } @@ -62,15 +53,7 @@ @Override public int compare(Location location1, Location location2) { - boolean location1RequireDriverLicense = locationRequireDriverLicensePredicate().apply(location1); - boolean location2RequireDriverLicense = locationRequireDriverLicensePredicate().apply(location2); - if (location1RequireDriverLicense && ! location2RequireDriverLicense) { - return -1; - } else if ( ! location1RequireDriverLicense && location2RequireDriverLicense) { - return +1; - } else { - return 0; - } + return Integer.compare(location2.getRequiredAccreditationLevel(), location1.getRequiredAccreditationLevel()); } } @@ -82,10 +65,6 @@ return Predicates.not(accessibleLocationPredicate(magalieUser)); } - public static Predicate<Location> locationRequireDriverLicensePredicate() { - return new LocationRequireDriverLicensePredicate(); - } - public static Comparator<Location> locationRequiringDriverLicenseFirstComparator() { return new LocationRequiringDriverLicenseFirstComparator(); } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java 2013-05-13 16:55:20 UTC (rev 150) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/Location.java 2013-05-15 15:13:20 UTC (rev 151) @@ -80,10 +80,6 @@ return barcode; } - public boolean isDriverLicenseRequired() { - return requiredAccreditationLevel == 9; - } - public boolean isFullLocation() { return fullLocation; } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/MagalieUser.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/MagalieUser.java 2013-05-13 16:55:20 UTC (rev 150) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/MagalieUser.java 2013-05-15 15:13:20 UTC (rev 151) @@ -71,7 +71,4 @@ this.accreditationLevel = accreditationLevel; } - public boolean isDriverLicenseOwner() { - return accreditationLevel == 9; - } } 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-05-13 16:55:20 UTC (rev 150) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-05-15 15:13:20 UTC (rev 151) @@ -68,6 +68,13 @@ this.serviceContext = serviceContext; } + /** + * Everything starts here, every time an article is requested, a call to + * this method must be used. + * + * @param bookArticleRequest the request gather all the details we must know + * before computing a storage movement order + */ public BookArticleResult bookArticle(BookArticleRequest bookArticleRequest) { Preconditions.checkNotNull(bookArticleRequest.getMagalieUser()); @@ -86,27 +93,32 @@ log.info("will process article request" + bookArticleRequest); } + // we will proceed in three main steps + + // fist, get a snapshot of the actual current state of the stock Iterable<StoredArticle> storedArticles = getStoredArticles(bookArticleRequest.getBuilding(), article); + // second step, sort all those stored article by priority Set<StoredArticle> sortedStoredArticles = sortStoredArticlesByPriority(storedArticles); + // third step, compute actual order with priorities and actual quantities BookArticleResult bookArticleResult = buildStorageMovementOrder(bookArticleRequest, sortedStoredArticles); - StorageMovementOrder storageMovementOrder = bookArticleResult.getStorageMovementOrder(); - MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); - boolean articleIsAvailable = storageMovementOrder != null; + boolean saveStorageMovementOrder = bookArticleResult.isSuccess(); - if (articleIsAvailable) { + if (saveStorageMovementOrder) { + StorageMovementOrder storageMovementOrder = bookArticleResult.getStorageMovementOrder(); + StorageMovementOrderDao dao = persistenceContext.getStorageMovementOrderDao(); dao.persist(storageMovementOrder); } - updateArticleAvailability(bookArticleRequest, articleIsAvailable); + updateArticleAvailability(bookArticleResult); persistenceContext.commit(); @@ -117,18 +129,22 @@ /** * Add or remove a line in table {@link UnavailableArticle} */ - protected void updateArticleAvailability(BookArticleRequest bookArticleRequest, boolean articleIsAvailable) { + protected void updateArticleAvailability(BookArticleResult bookArticleResult) { - MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); + BookArticleRequest bookArticleRequest = bookArticleResult.getBookArticleRequest(); - UnavailableArticleDao dao = persistenceContext.getUnavailableArticleDao(); - Article article = bookArticleRequest.getArticle(); Building building = bookArticleRequest.getBuilding(); + MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); + + UnavailableArticleDao dao = persistenceContext.getUnavailableArticleDao(); + UnavailableArticle unavailableArticle = dao.findByArticle(building, article); + boolean articleIsAvailable = ! bookArticleResult.isArticleUnavailable(); + if (articleIsAvailable) { if (unavailableArticle != null) { @@ -220,8 +236,6 @@ // TODO brendan 15/04/13 refactor - bookArticleResult.setAvailableQuantity(quantity); - if (CollectionUtils.isEmpty(storageMovementOrder.getStorageMovements())) { storageMovementOrder = null; @@ -318,12 +332,16 @@ } + /** + * Get a snapshot of the actual current state of the stock. + */ protected Iterable<StoredArticle> getStoredArticles(Building building, Article article) { MagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); StoredArticleDao storedArticleDao = persistenceContext.getStoredArticleDao(); + // first get all stored articles in the building at known quantities Iterable<StoredArticle> storedArticles = storedArticleDao.findAllForArticleInBuilding(article, building); ImmutableMap<Location, StoredArticle> storedArticlesByLocation = @@ -336,6 +354,8 @@ StorageMovementDao storageMovementDao = persistenceContext.getStorageMovementDao(); + // consider all storage movements, adding quantities when someone added some stock and + // removing quantities if someone has withdraw quantities List<StorageMovement> storageMovements = storageMovementDao.findAllByArticle(article); for (StorageMovement storageMovement : storageMovements) { Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/BookArticleResult.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/BookArticleResult.java 2013-05-13 16:55:20 UTC (rev 150) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/BookArticleResult.java 2013-05-15 15:13:20 UTC (rev 151) @@ -27,6 +27,7 @@ import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.StorageMovementOrder; +import com.google.common.base.Preconditions; import com.google.common.base.Predicate; public class BookArticleResult { @@ -35,8 +36,6 @@ protected BookArticleRequest bookArticleRequest; - protected double availableQuantity; - protected Location inaccessibleLocation; public void setStorageMovementOrder(StorageMovementOrder storageMovementOrder) { @@ -44,6 +43,7 @@ } public StorageMovementOrder getStorageMovementOrder() { + Preconditions.checkState(isSuccess()); return storageMovementOrder; } @@ -81,14 +81,6 @@ return storageMovementOrder == null; } - public void setAvailableQuantity(double availableQuantity) { - this.availableQuantity = availableQuantity; - } - - public double getAvailableQuantity() { - return availableQuantity; - } - public boolean isSuccess() { return ! isArticleInaccessible() && ! isArticleUnavailable(); } 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-05-13 16:55:20 UTC (rev 150) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-05-15 15:13:20 UTC (rev 151) @@ -124,10 +124,16 @@ bookArticleResult = articleStorageService.bookArticle(bookArticleRequest); - driverLicenseRequired |= bookArticleResult.isArticleInaccessible() && ! bookArticleResult.isArticleUnavailable(); + boolean articleIsAvailable = ! bookArticleResult.isArticleUnavailable(); - somethingIsAvailable |= ! bookArticleResult.isArticleUnavailable(); + if (articleIsAvailable) { + somethingIsAvailable = true; + + driverLicenseRequired = bookArticleResult.isArticleInaccessible(); + + } + success = bookArticleResult.isSuccess(); } Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java 2013-05-13 16:55:20 UTC (rev 150) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java 2013-05-15 15:13:20 UTC (rev 151) @@ -29,6 +29,7 @@ import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.StorageMovement; import com.franciaflex.magalie.services.AbstractMagalieServiceTest; +import com.google.common.base.Preconditions; import com.google.common.collect.Iterables; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -101,4 +102,25 @@ Assert.assertEquals(fixedLocation, storageMovements.get(2).getOriginLocation()); } + + @Test + public void testRegression() { + + MagalieUser corinne = fixture("corinne"); + + Article article = fixture("article1"); + + Preconditions.checkState(article.getCode().equals("4034108")); + + BookArticleRequest bookArticleRequest = + new BookArticleRequest(corinne, building, article, 50., destinationLocation, true); + + BookArticleResult bookArticleResult = service.bookArticle(bookArticleRequest); + + Assert.assertFalse(bookArticleResult.isSuccess()); + Assert.assertFalse(bookArticleResult.isArticleUnavailable()); + Assert.assertTrue(bookArticleResult.isArticleInaccessible()); + + } + }

1 0