Author: bleny Date: 2013-08-19 16:30:14 +0200 (Mon, 19 Aug 2013) New Revision: 365 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: refs #3000 exclude list with status complete or affected from listTypes Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListJpaDao.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/RequestedListJpaDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListJpaDao.java 2013-08-19 13:57:53 UTC (rev 364) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListJpaDao.java 2013-08-19 14:30:14 UTC (rev 365) @@ -23,6 +23,8 @@ * #L% */ +import com.franciaflex.magalie.persistence.entity.DeliveredRequestedListStatus; + import javax.persistence.EntityManager; import javax.persistence.TypedQuery; import java.util.List; @@ -35,7 +37,15 @@ @Override public List<String> findAllDistinctListTypes() { - TypedQuery<String> query = entityManager.createQuery("select distinct rl.listType from RequestedList rl", String.class); + TypedQuery<String> query = + entityManager.createQuery( + " select distinct rl.listType" + + " from RequestedList rl" + + " where rl not in (select drl.requestedList from DeliveredRequestedList drl where drl.status = :affectedDeliveredRequestedListStatus OR drl.status = :completeDeliveredRequestedListStatus)" + , String.class); + query.setParameter("affectedDeliveredRequestedListStatus", DeliveredRequestedListStatus.AFFECTED); + query.setParameter("completeDeliveredRequestedListStatus", DeliveredRequestedListStatus.COMPLETE); return query.getResultList(); } + } 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-19 13:57:53 UTC (rev 364) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java 2013-08-19 14:30:14 UTC (rev 365) @@ -68,9 +68,19 @@ magalieUser = fixture("bruno"); building = fixture("B1"); + } @Test + public void testListTypes() { + + List<String> listTypes = service.getListTypes(); + + Assert.assertEquals(1, listTypes.size()); + + } + + @Test public void testGetRequestedArticles() { List<RequestedArticle> requestedArticles = service.getRequestedArticles(building, magalieUser, LIST_TYPE);