#18: GET /group + fix JUnit

docs-web/src/main/java/com/sismics/docs/rest/resource/GroupResource.java

@@ -4,12 +4,15 @@ import java.text.MessageFormat;
 import java.util.List;
 
 import javax.json.Json;
+import javax.json.JsonArrayBuilder;
 import javax.json.JsonObjectBuilder;
 import javax.ws.rs.DELETE;
 import javax.ws.rs.FormParam;
+import javax.ws.rs.GET;
 import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
+import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.Response.Status;
 
@@ -21,9 +24,11 @@ import com.sismics.docs.core.dao.jpa.dto.GroupDto;
 import com.sismics.docs.core.model.jpa.Group;
 import com.sismics.docs.core.model.jpa.User;
 import com.sismics.docs.core.model.jpa.UserGroup;
+import com.sismics.docs.core.util.jpa.SortCriteria;
 import com.sismics.docs.rest.constant.BaseFunction;
 import com.sismics.rest.exception.ClientException;
 import com.sismics.rest.exception.ForbiddenClientException;
+import com.sismics.rest.util.JsonUtil;
 import com.sismics.rest.util.ValidationUtil;
 
 /**
@@ -177,4 +182,35 @@ public class GroupResource extends BaseResource {
                 .add("status", "ok");
         return Response.ok().entity(response.build()).build();
     }
+    
+    /**
+     * Returns all active groups.
+     * 
+     * @param sortColumn Sort index
+     * @param asc If true, ascending sorting, else descending
+     * @return Response
+     */
+    @GET
+    public Response list(
+            @QueryParam("sort_column") Integer sortColumn,
+            @QueryParam("asc") Boolean asc) {
+        if (!authenticate()) {
+            throw new ForbiddenClientException();
+        }
+        
+        JsonArrayBuilder groups = Json.createArrayBuilder();
+        SortCriteria sortCriteria = new SortCriteria(sortColumn, asc);
+
+        GroupDao groupDao = new GroupDao();
+        List<GroupDto> groupDtoList = groupDao.findByCriteria(new GroupCriteria(), sortCriteria);
+        for (GroupDto groupDto : groupDtoList) {
+            groups.add(Json.createObjectBuilder()
+                    .add("name", groupDto.getName())
+                    .add("parent", JsonUtil.nullable(groupDto.getParentName())));
+        }
+        
+        JsonObjectBuilder response = Json.createObjectBuilder()
+                .add("groups", groups);
+        return Response.ok().entity(response.build()).build();
+    }
 }

docs-web/src/main/java/com/sismics/docs/rest/resource/UserResource.java

@@ -532,8 +532,6 @@ public class UserResource extends BaseResource {
     /**
      * Returns all active users.
      * 
-     * @param limit Page limit
-     * @param offset Page offset
      * @param sortColumn Sort index
      * @param asc If true, ascending sorting, else descending
      * @return Response

docs-web/src/test/java/com/sismics/docs/rest/TestCommentResource.java

@@ -108,7 +108,8 @@ public class TestCommentResource extends BaseJerseyTest {
                 .put(Entity.form(new Form()
                         .param("source", document1Id)
                         .param("perm", "READ")
-                        .param("username", "comment2")), JsonObject.class);
+                        .param("target", "comment2")
+                        .param("type", "USER")), JsonObject.class);
         
         // Create a comment with comment2
         json = target().path("/comment").request()

docs-web/src/test/java/com/sismics/docs/rest/TestGroupResource.java

@@ -41,11 +41,24 @@ public class TestGroupResource extends BaseJerseyTest {
         clientUtil.createUser("group1", "g112", "g12");
         String group1Token = clientUtil.login("group1");
         
-        // Check admin groups (all computed groups)
-        JsonObject json = target().path("/user").request()
+        // Get all groups
+        JsonObject json = target().path("/group")
+                .queryParam("sort_column", "1")
+                .queryParam("asc", "true")
+                .request()
                 .cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
                 .get(JsonObject.class);
         JsonArray groups = json.getJsonArray("groups");
+        Assert.assertEquals(6, groups.size());
+        JsonObject groupG11 = groups.getJsonObject(2);
+        Assert.assertEquals("g11", groupG11.getString("name"));
+        Assert.assertEquals("g1", groupG11.getString("parent"));
+        
+        // Check admin groups (all computed groups)
+        json = target().path("/user").request()
+                .cookie(TokenBasedSecurityFilter.COOKIE_NAME, adminToken)
+                .get(JsonObject.class);
+        groups = json.getJsonArray("groups");
         Assert.assertEquals(1, groups.size());
         Assert.assertEquals("administrators", groups.getString(0));