Author: bleny Date: 2013-08-21 15:14:28 +0200 (Wed, 21 Aug 2013) New Revision: 371 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: refs #2999 show only listTypes in the same building Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListDao.java trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListJpaDao.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/RequestedArticleServiceTest.java trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListDao.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListDao.java 2013-08-21 13:08:11 UTC (rev 370) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListDao.java 2013-08-21 13:14:28 UTC (rev 371) @@ -23,11 +23,13 @@ * #L% */ +import com.franciaflex.magalie.persistence.entity.Building; + import java.util.List; /** @author bleny */ public interface RequestedListDao { - List<String> findAllDistinctListTypes(); + List<String> findAllDistinctListTypes(Building building); } 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-21 13:08:11 UTC (rev 370) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/dao/RequestedListJpaDao.java 2013-08-21 13:14:28 UTC (rev 371) @@ -23,6 +23,7 @@ * #L% */ +import com.franciaflex.magalie.persistence.entity.Building; import com.franciaflex.magalie.persistence.entity.DeliveredRequestedListStatus; import javax.persistence.EntityManager; @@ -36,15 +37,16 @@ } @Override - public List<String> findAllDistinctListTypes() { // TODO brendan 20/08/13 add a building parameter + public List<String> findAllDistinctListTypes(Building building) { 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)" + + " where rl.building = :building and 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); + query.setParameter("building", building); return query.getResultList(); } 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-08-21 13:08:11 UTC (rev 370) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-08-21 13:14:28 UTC (rev 371) @@ -487,13 +487,13 @@ } - public List<String> getListTypes() { + public List<String> getListTypes(Building building) { JpaMagaliePersistenceContext persistenceContext = serviceContext.getPersistenceContext(); RequestedListJpaDao dao = persistenceContext.getRequestedListDao(); - List<String> allDistinctListTypes = dao.findAllDistinctListTypes(); + List<String> allDistinctListTypes = dao.findAllDistinctListTypes(building); return allDistinctListTypes; 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-21 13:08:11 UTC (rev 370) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java 2013-08-21 13:14:28 UTC (rev 371) @@ -81,7 +81,7 @@ @Test public void testListTypes() { - List<String> listTypes = service.getListTypes(); + List<String> listTypes = service.getListTypes(building); Assert.assertEquals(1, listTypes.size()); Modified: trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java =================================================================== --- trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java 2013-08-21 13:08:11 UTC (rev 370) +++ trunk/magalie-web/src/main/java/com/franciaflex/magalie/web/action/DeliverRequestedArticleAction.java 2013-08-21 13:14:28 UTC (rev 371) @@ -74,8 +74,10 @@ requestedList = service.getAffectationForUser(magalieUser); - listTypes = service.getListTypes(); + Building building = session.getBuilding(); + listTypes = service.getListTypes(building); + return INPUT; }