pagination fragment

New Renkan

Create a Renkan with the title

Project list

@@ -141,7 +144,7 @@ - + @@ -184,5 +187,5 @@ /*]]>*/ - + diff -r 7adef9ce92aa -r 523f0647513e server/src/main/webapp/WEB-INF/templates/renkanIndex.html --- a/server/src/main/webapp/WEB-INF/templates/renkanIndex.html Wed Mar 13 15:37:31 2013 +0100 +++ b/server/src/main/webapp/WEB-INF/templates/renkanIndex.html Wed Mar 13 15:47:08 2013 +0100 @@ -1,5 +1,6 @@ + Renkan @@ -123,27 +124,33 @@ /*]]>*/ - + +

New Space

Create a Renkan with the title

Create a Space with the title

- +

Space list

title	date	Edit projet

- + + + + - + + @@ -161,7 +168,7 @@ return false; } - new_renkan = { + new_space = { title: renkantitle, description: "(empty description)", uri: null @@ -169,7 +176,7 @@ var post_url = /*[[@{/rest/spaces/}]]*/"/rest/spaces/"; $.ajax(post_url, { - data:JSON.stringify(new_renkan), + data:JSON.stringify(new_space), type: "POST", dataType: "json", contentType: "application/json; charset=UTF-8" @@ -183,5 +190,5 @@ /*]]>*/ - + diff -r 7adef9ce92aa -r 523f0647513e server/src/test/java/org/iri_research/renkan/test/repositories/ProjectsRepositoryTest.java --- a/server/src/test/java/org/iri_research/renkan/test/repositories/ProjectsRepositoryTest.java Wed Mar 13 15:37:31 2013 +0100 +++ b/server/src/test/java/org/iri_research/renkan/test/repositories/ProjectsRepositoryTest.java Wed Mar 13 15:47:08 2013 +0100 @@ -3,6 +3,8 @@ import java.util.ArrayList; import java.util.Date; +import java.util.List; +import java.util.Map; import java.util.UUID; import org.iri_research.renkan.models.Project; @@ -25,6 +27,8 @@ @ContextConfiguration("repositories-context.xml") public class ProjectsRepositoryTest { + private final static int SPACE_NB = 3; + private Logger logger = LoggerFactory.getLogger(ProjectsRepositoryTest.class); @Autowired @@ -37,28 +41,36 @@ private Date creationDate = new Date(); + private List spaceIds = new ArrayList<>(); + public ProjectsRepositoryTest() { } @Before public void setup() { - + logger.debug("Setup"); - Space testSpace = new Space(UUID.randomUUID().toString(), "test", "Test space", null, null, null, "test_user", null, this.creationDate); - testSpace = spacesRepository.save(testSpace); ArrayList pl = new ArrayList(); - pl.add(new Project(testSpace.getId(), UUID.randomUUID().toString(), "test1", "desc1", "http://localhost:8080/rest/projects/id1", this.creationDate)); - pl.add(new Project(testSpace.getId(), UUID.randomUUID().toString(), "test2", "desc2", "http://localhost:8080/rest/projects/id2", this.creationDate)); - logger.debug("Setup : new Project "); + Space testSpace = null; + for(int i=0; i groupRes = projectsRepository.getCountBySpace(); + + Assert.assertNotNull("GroupRes not null", groupRes); + Assert.assertEquals("Group res size", SPACE_NB-1, groupRes.size()); + + for(int i=0;i<(SPACE_NB-1);i++) { + Integer count = groupRes.get(this.spaceIds.get(i)); + Assert.assertNotNull("count not null", count); + Assert.assertEquals("Nb of project/space", 2-i, count.intValue()); + } + + Assert.assertNull("Last space id has no project i.e count is null", groupRes.get(this.spaceIds.get(SPACE_NB-1))); + } + } diff -r 7adef9ce92aa -r 523f0647513e server/src/test/java/org/iri_research/renkan/test/repositories/SpacesRepositoryTest.java --- a/server/src/test/java/org/iri_research/renkan/test/repositories/SpacesRepositoryTest.java Wed Mar 13 15:37:31 2013 +0100 +++ b/server/src/test/java/org/iri_research/renkan/test/repositories/SpacesRepositoryTest.java Wed Mar 13 15:47:08 2013 +0100 @@ -1,7 +1,9 @@ package org.iri_research.renkan.test.repositories; +import java.util.ArrayList; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.UUID; @@ -15,6 +17,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; +import org.springframework.data.domain.Sort.Direction; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -26,6 +33,8 @@ @ContextConfiguration("repositories-context.xml") public class SpacesRepositoryTest { + private final static int SPACE_NB = 3; + private Logger logger = LoggerFactory.getLogger(SpacesRepositoryTest.class); @Autowired @@ -34,19 +43,27 @@ @Autowired private MongoTemplate mongoTemplate; - private Map spacesList = new HashMap(); - + private Map spacesList = new HashMap(SPACE_NB); + private List spacesUuids = new ArrayList<>(SPACE_NB); @Before public void setup() { logger.debug("Setup"); spacesRepository.deleteAll(); - Date creationDate = new Date(); - String uuid = UUID.randomUUID().toString(); - Space testSpace = new Space(uuid, "test", "Test space", "{}", "http://ldt.iri.centrepompidou.fr", "#ababab", "test_user", "http://ldt.iri.centrepompidou.fr", creationDate); - testSpace = spacesRepository.save(testSpace); - this.spacesList.put(uuid, testSpace); + for(int i=0;i page = this.spacesRepository.findAll(p); + + Assert.assertEquals("page content length must be two", 2, page.getNumberOfElements()); + Assert.assertEquals("id must be id of last created space", this.spacesUuids.get(SPACE_NB-1), page.getContent().get(0).getId()); + Assert.assertEquals("id must be id of last created space", this.spacesUuids.get(SPACE_NB-2), page.getContent().get(1).getId()); + + p = new PageRequest(1, 2, s); + page = this.spacesRepository.findAll(p); + Assert.assertEquals("page content length must be one", 1, page.getNumberOfElements()); + Assert.assertEquals("id must be id of first created space", this.spacesUuids.get(0), page.getContent().get(0).getId()); } diff -r 7adef9ce92aa -r 523f0647513e server/src/test/resources/log4j.xml --- a/server/src/test/resources/log4j.xml Wed Mar 13 15:37:31 2013 +0100 +++ b/server/src/test/resources/log4j.xml Wed Mar 13 15:47:08 2013 +0100 @@ -1,4 +1,4 @@ - +

Name	Creation	Edit	Name	Creation	Proj. count	Edit
title	date	nb. proj	Open space