Author: bleny Date: 2013-04-25 12:31:03 +0200 (Thu, 25 Apr 2013) New Revision: 130 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: in LocationError consider article and not only location Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationErrorDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/LocationErrorJpaDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/LocationError.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/LocationErrorsService.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/dao/LocationErrorDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationErrorDao.java 2013-04-25 10:06:18 UTC (rev 129) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/LocationErrorDao.java 2013-04-25 10:31:03 UTC (rev 130) @@ -23,6 +23,7 @@ * #L% */ +import com.franciaflex.magalie.persistence.entity.Article; import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.persistence.entity.LocationError; @@ -35,7 +36,7 @@ LocationError findByLocation(Location location); - List<Location> getAllLocationsInError(); + List<Location> getAllLocationsInError(Article article); List<LocationError> findAll(); Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/LocationErrorJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/LocationErrorJpaDao.java 2013-04-25 10:06:18 UTC (rev 129) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/LocationErrorJpaDao.java 2013-04-25 10:31:03 UTC (rev 130) @@ -24,6 +24,7 @@ */ import com.franciaflex.magalie.persistence.dao.LocationErrorDao; +import com.franciaflex.magalie.persistence.entity.Article; import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.persistence.entity.LocationError; @@ -51,8 +52,8 @@ } @Override - public List<Location> getAllLocationsInError() { - Query query = entityManager.createQuery("select se.location from LocationError se"); + public List<Location> getAllLocationsInError(Article article) { + Query query = entityManager.createQuery("select se.location from LocationError se where se.article = :article"); List<Location> allLocationsInError = query.getResultList(); return allLocationsInError; } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/LocationError.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/LocationError.java 2013-04-25 10:06:18 UTC (rev 129) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/LocationError.java 2013-04-25 10:31:03 UTC (rev 130) @@ -40,6 +40,9 @@ @OneToOne protected Location location; + @OneToOne + protected Article article; + @ManyToOne protected MagalieUser magalieUser; @@ -77,4 +80,12 @@ public void setReportDate(Date reportDate) { this.reportDate = reportDate; } + + public Article getArticle() { + return article; + } + + public void setArticle(Article article) { + this.article = article; + } } 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-04-25 10:06:18 UTC (rev 129) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/ArticleStorageService.java 2013-04-25 10:31:03 UTC (rev 130) @@ -393,7 +393,7 @@ LocationErrorsService locationErrorsService = serviceContext.newService(LocationErrorsService.class); - List<Location> allLocationsInError = locationErrorsService.getAllLocationsInError(); + List<Location> allLocationsInError = locationErrorsService.getAllLocationsInError(article); storedArticles = Lists.newArrayList( @@ -467,7 +467,7 @@ Location locationInError = locationDao.findById(locationInErrorId); - locationErrorsService.reportError(locationInError, magalieUser, confirmDate); + locationErrorsService.reportError(locationInError, storageMovementOrder.getArticle(), magalieUser, confirmDate); } Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/LocationErrorsService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/LocationErrorsService.java 2013-04-25 10:06:18 UTC (rev 129) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/LocationErrorsService.java 2013-04-25 10:31:03 UTC (rev 130) @@ -24,6 +24,7 @@ */ import com.franciaflex.magalie.persistence.dao.LocationErrorDao; +import com.franciaflex.magalie.persistence.entity.Article; import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.persistence.entity.LocationError; import com.franciaflex.magalie.persistence.entity.MagalieUser; @@ -46,15 +47,15 @@ this.serviceContext = serviceContext; } - public void reportError(Location location, MagalieUser magalieUser) { + public void reportError(Location location, Article article, MagalieUser magalieUser) { Date reportDate = serviceContext.getNow(); - reportError(location, magalieUser, reportDate); + reportError(location, article, magalieUser, reportDate); } - public void reportError(Location location, MagalieUser magalieUser, Date reportDate) { + public void reportError(Location location, Article article, MagalieUser magalieUser, Date reportDate) { LocationErrorDao locationErrorDao = serviceContext.getPersistenceContext().getLocationErrorDao(); @@ -68,6 +69,8 @@ newLocationError.setLocation(location); + newLocationError.setArticle(article); + newLocationError.setReportDate(reportDate); locationErrorDao.persist(newLocationError); @@ -83,11 +86,11 @@ } } - public List<Location> getAllLocationsInError() { + public List<Location> getAllLocationsInError(Article article) { LocationErrorDao locationErrorDao = serviceContext.getPersistenceContext().getLocationErrorDao(); - List<Location> allLocationsInError = locationErrorDao.getAllLocationsInError(); + List<Location> allLocationsInError = locationErrorDao.getAllLocationsInError(article); return allLocationsInError; 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-04-25 10:06:18 UTC (rev 129) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java 2013-04-25 10:31:03 UTC (rev 130) @@ -189,7 +189,7 @@ // report location 2 in error Location location2 = fixture("location2"); LocationErrorsService locationErrorsService = newService(LocationErrorsService.class); - locationErrorsService.reportError(location2, alexandre); + locationErrorsService.reportError(location2, article, alexandre); BookArticleRequest bookArticleRequest = new BookArticleRequest(cathy, building, article, 30., destinationLocation, false); BookArticleResult bookArticleResult = service.bookArticle(bookArticleRequest);