Author: bleny Date: 2013-04-12 12:09:55 +0200 (Fri, 12 Apr 2013) New Revision: 92 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: add building in RequestList Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/RequestedArticleJpaDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedList.java trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java trunk/magalie-services/src/main/resources/fixtures2.yaml Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/RequestedArticleJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/RequestedArticleJpaDao.java 2013-04-12 09:24:13 UTC (rev 91) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/jpa/RequestedArticleJpaDao.java 2013-04-12 10:09:55 UTC (rev 92) @@ -21,12 +21,12 @@ @Override public List<RequestedArticle> findAllUndelivered(Building building) { - // XXX brendan 10/04/13 what about building ??? TypedQuery<RequestedArticle> query = entityManager.createQuery( - "from RequestedArticle ra where ra not in (select dra.requestedArticle from DeliveredRequestedArticle dra)", + "from RequestedArticle ra where ra not in (select dra.requestedArticle from DeliveredRequestedArticle dra) and ra.requestedList.building = :building", getEntityClass() ); + query.setParameter("building", building); return query.getResultList(); } Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedList.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedList.java 2013-04-12 09:24:13 UTC (rev 91) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/entity/RequestedList.java 2013-04-12 10:09:55 UTC (rev 92) @@ -2,6 +2,7 @@ import javax.persistence.Entity; import javax.persistence.Id; +import javax.persistence.ManyToOne; import java.util.Date; @Entity @@ -10,6 +11,9 @@ @Id protected String id; + @ManyToOne + protected Building building; + protected String code; protected Date requestDate; @@ -48,4 +52,12 @@ public void setCode(String code) { this.code = code; } + + public Building getBuilding() { + return building; + } + + public void setBuilding(Building building) { + this.building = building; + } } 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-04-12 09:24:13 UTC (rev 91) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-04-12 10:09:55 UTC (rev 92) @@ -87,8 +87,6 @@ log.info(allRequestedArticles.size() + " articles requested in building " + building.getCode()); } - // TODO brendan 05/04/13 consider warehouse.code - return allRequestedArticles; } Modified: trunk/magalie-services/src/main/resources/fixtures2.yaml =================================================================== --- trunk/magalie-services/src/main/resources/fixtures2.yaml 2013-04-12 09:24:13 UTC (rev 91) +++ trunk/magalie-services/src/main/resources/fixtures2.yaml 2013-04-12 10:09:55 UTC (rev 92) @@ -199,6 +199,7 @@ code: 987654321 requestDate: 2013-04-08 12:00:00 urgent: true + building: *B1 requestedList2: &requestedList2 !requested-list @@ -206,6 +207,7 @@ code: 123456789 requestDate: 2013-04-08 12:00:00 urgent: false + building: *B1 requestedLists: - *requestedList1