Author: bleny Date: 2013-07-31 16:11:50 +0200 (Wed, 31 Jul 2013) New Revision: 350 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: fixes #2989 reported errors was not considered Added: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/StorageTransferServiceTest.java Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java 2013-07-31 13:00:16 UTC (rev 349) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/StorageTransferService.java 2013-07-31 14:11:50 UTC (rev 350) @@ -104,7 +104,7 @@ StoredArticleDao storedArticleDao = persistenceContext.getStoredArticleDao(); - Iterable<StoredArticle > storedArticles = storedArticleDao.findAllByLocation(location); + Iterable<StoredArticle> storedArticles = storedArticleDao.findAllByLocation(location); ArticleStorageService articleStorageService = serviceContext.newService(ArticleStorageService.class); @@ -118,7 +118,12 @@ storedArticles = articleStorageService.computeActualQuantities(storedArticles, allImpactingStoredArticle); + LocationErrorsService locationErrorsService = serviceContext.newService(LocationErrorsService.class); + + storedArticles = locationErrorsService.filterLocationInError(storedArticles); + return Lists.newArrayList(storedArticles); + } public void confirmStorageTransfer(MagalieUser magalieUser, StoredArticle storedArticle, double quantity, Location destinationLocation) { Added: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/StorageTransferServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/StorageTransferServiceTest.java (rev 0) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/StorageTransferServiceTest.java 2013-07-31 14:11:50 UTC (rev 350) @@ -0,0 +1,63 @@ +package com.franciaflex.magalie.services.service; + +import com.franciaflex.magalie.persistence.entity.Building; +import com.franciaflex.magalie.persistence.entity.Location; +import com.franciaflex.magalie.persistence.entity.MagalieUser; +import com.franciaflex.magalie.persistence.entity.StoredArticle; +import com.franciaflex.magalie.services.AbstractMagalieServiceTest; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import java.text.ParseException; +import java.util.Date; +import java.util.List; + +public class StorageTransferServiceTest extends AbstractMagalieServiceTest { + + protected StorageTransferService service; + + protected MagalieUser magalieUser; + + protected Building building; + + @Before + public void setUp() throws ParseException { + + loadFixtures("fixtures"); + + service = newService(StorageTransferService.class); + + serviceContext.setDate(new Date(1363948427576l)); + + magalieUser = fixture("bruno"); + + building = fixture("B1"); + + } + + @Test + public void testGetStoredArticlesInLocationIgnoreArticlesReportedInError() { + + Location location = fixture("location3"); + + List<StoredArticle> storedArticlesInLocation = + service.getStoredArticlesInLocation(location); + + Assert.assertEquals(2, storedArticlesInLocation.size()); + + LocationErrorsService locationErrorsService = + newService(LocationErrorsService.class); + + locationErrorsService.reportError(storedArticlesInLocation.get(0).getId(), magalieUser); + + List<StoredArticle> storedArticlesInLocationAfterError = + service.getStoredArticlesInLocation(location); + + Assert.assertEquals( + storedArticlesInLocation.size() - 1, + storedArticlesInLocationAfterError.size()); + + } + +}