#23: Tag tree (server)

docs-core/src/main/java/com/sismics/docs/core/dao/jpa/TagDao.java

@@ -103,7 +103,7 @@ public class TagDao {
     @SuppressWarnings("unchecked")
     public List<TagDto> getByDocumentId(String documentId, String userId) {
         EntityManager em = ThreadLocalContext.get().getEntityManager();
-        StringBuilder sb = new StringBuilder("select t.TAG_ID_C, t.TAG_NAME_C, t.TAG_COLOR_C from T_DOCUMENT_TAG dt ");
+        StringBuilder sb = new StringBuilder("select t.TAG_ID_C, t.TAG_NAME_C, t.TAG_COLOR_C, t.TAG_IDPARENT_C from T_DOCUMENT_TAG dt ");
         sb.append(" join T_TAG t on t.TAG_ID_C = dt.DOT_IDTAG_C ");
         sb.append(" where dt.DOT_IDDOCUMENT_C = :documentId and t.TAG_DELETEDATE_D is null ");
         sb.append(" and t.TAG_IDUSER_C = :userId and dt.DOT_DELETEDATE_D is null ");
@@ -123,6 +123,7 @@ public class TagDao {
             tagDto.setId((String) o[i++]);
             tagDto.setName((String) o[i++]);
             tagDto.setColor((String) o[i++]);
+            tagDto.setParentId((String) o[i++]);
             tagDtoList.add(tagDto);
         }
         return tagDtoList;
@@ -137,7 +138,7 @@ public class TagDao {
     @SuppressWarnings("unchecked")
     public List<TagStatDto> getStats(String userId) {
         EntityManager em = ThreadLocalContext.get().getEntityManager();
-        StringBuilder sb = new StringBuilder("select t.TAG_ID_C, t.TAG_NAME_C, t.TAG_COLOR_C, count(d.DOC_ID_C) ");
+        StringBuilder sb = new StringBuilder("select t.TAG_ID_C, t.TAG_NAME_C, t.TAG_COLOR_C, t.TAG_IDPARENT_C, count(d.DOC_ID_C) ");
         sb.append(" from T_TAG t ");
         sb.append(" left join T_DOCUMENT_TAG dt on t.TAG_ID_C = dt.DOT_IDTAG_C and dt.DOT_DELETEDATE_D is null ");
         sb.append(" left join T_DOCUMENT d on d.DOC_ID_C = dt.DOT_IDDOCUMENT_C and d.DOC_DELETEDATE_D is null and d.DOC_IDUSER_C = :userId ");
@@ -158,6 +159,7 @@ public class TagDao {
             tagDto.setId((String) o[i++]);
             tagDto.setName((String) o[i++]);
             tagDto.setColor((String) o[i++]);
+            tagDto.setParentId((String) o[i++]);
             tagDto.setCount(((Number) o[i++]).intValue());
             tagStatDtoList.add(tagDto);
         }
@@ -281,6 +283,7 @@ public class TagDao {
         // Update the tag
         tagFromDb.setName(tag.getName());
         tagFromDb.setColor(tag.getColor());
+        tagFromDb.setParentId(tag.getParentId());
         
         // Create audit log
         AuditLogUtil.create(tagFromDb, AuditLogType.UPDATE);

docs-core/src/main/java/com/sismics/docs/core/dao/jpa/dto/TagDto.java

@@ -24,6 +24,11 @@ public class TagDto {
      */
     private String color;
     
+    /**
+     * Parent ID.
+     */
+    private String parentId;
+
     /**
      * Getter of id.
      *
@@ -77,4 +82,22 @@ public class TagDto {
     public void setColor(String color) {
         this.color = color;
     }
+    
+    /**
+     * Getter of parentId.
+     *
+     * @return the parentId
+     */
+    public String getParentId() {
+        return parentId;
+    }
+
+    /**
+     * Setter of parentId.
+     *
+     * @param color parentId
+     */
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
 }

docs-core/src/main/java/com/sismics/docs/core/dao/jpa/dto/TagStatDto.java

@@ -2,7 +2,7 @@ package com.sismics.docs.core.dao.jpa.dto;
 
 
 /**
- * Tag DTO.
+ * Tag stat DTO.
  *
  * @author bgamard 
  */

docs-core/src/main/java/com/sismics/docs/core/model/jpa/Tag.java

@@ -39,6 +39,12 @@ public class Tag implements Loggable {
     @Column(name = "TAG_IDUSER_C", nullable = false, length = 36)
     private String userId;
     
+    /**
+     * User ID.
+     */
+    @Column(name = "TAG_IDPARENT_C", length = 36)
+    private String parentId;
+    
     /**
      * Creation date.
      */
@@ -166,11 +172,30 @@ public class Tag implements Loggable {
         this.deleteDate = deleteDate;
     }
     
+    /**
+     * Getter of parentId.
+     *
+     * @return parentId
+     */
+    public String getParentId() {
+        return parentId;
+    }
+
+    /**
+     * Setter of parentId.
+     *
+     * @param parentId parentId
+     */
+    public void setParentId(String parentId) {
+        this.parentId = parentId;
+    }
+
     @Override
     public String toString() {
         return MoreObjects.toStringHelper(this)
                 .add("id", id)
                 .add("name", name)
+                .add("parentId", parentId)
                 .toString();
     }
 

docs-core/src/main/resources/config.properties

@@ -1 +1 @@
-db.version=1
+db.version=2

docs-core/src/main/resources/db/update/dbupdate-002-0.sql

@@ -0,0 +1,2 @@
+alter table T_TAG add column TAG_IDPARENT_C varchar(36);
+update T_CONFIG set CFG_VALUE_C = '2' where CFG_ID_C = 'DB_VERSION';

docs-web/src/dev/resources/config.properties

@@ -1,3 +1,3 @@
 api.current_version=${project.version}
 api.min_version=1.0
-db.version=1
+db.version=2

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

@@ -22,6 +22,7 @@ import com.sismics.docs.core.dao.jpa.dto.TagStatDto;
 import com.sismics.docs.core.model.jpa.Tag;
 import com.sismics.rest.exception.ClientException;
 import com.sismics.rest.exception.ForbiddenClientException;
+import com.sismics.rest.util.JsonUtil;
 import com.sismics.rest.util.ValidationUtil;
 
 /**
@@ -50,7 +51,8 @@ public class TagResource extends BaseResource {
             items.add(Json.createObjectBuilder()
                     .add("id", tag.getId())
                     .add("name", tag.getName())
-                    .add("color", tag.getColor()));
+                    .add("color", tag.getColor())
+                    .add("parent", JsonUtil.nullable(tag.getParentId())));
         }
         
         JsonObjectBuilder response = Json.createObjectBuilder()
@@ -96,7 +98,8 @@ public class TagResource extends BaseResource {
     @PUT
     public Response add(
             @FormParam("name") String name,
-            @FormParam("color") String color) {
+            @FormParam("color") String color,
+            @FormParam("parent") String parentId) {
         if (!authenticate()) {
             throw new ForbiddenClientException();
         }
@@ -117,11 +120,20 @@ public class TagResource extends BaseResource {
             throw new ClientException("AlreadyExistingTag", MessageFormat.format("Tag already exists: {0}", name));
         }
         
+        // Check the parent
+        if (parentId != null) {
+            Tag parentTag = tagDao.getByTagId(principal.getId(), parentId);
+            if (parentTag == null) {
+                throw new ClientException("ParentNotFound", MessageFormat.format("Parent not found: {0}", parentId));
+            }
+        }
+        
         // Create the tag
         tag = new Tag();
         tag.setName(name);
         tag.setColor(color);
         tag.setUserId(principal.getId());
+        tag.setParentId(parentId);
         String id = tagDao.create(tag);
         
         JsonObjectBuilder response = Json.createObjectBuilder()
@@ -140,7 +152,8 @@ public class TagResource extends BaseResource {
     public Response update(
             @PathParam("id") String id,
             @FormParam("name") String name,
-            @FormParam("color") String color) {
+            @FormParam("color") String color,
+            @FormParam("parent") String parentId) {
         if (!authenticate()) {
             throw new ForbiddenClientException();
         }
@@ -161,6 +174,14 @@ public class TagResource extends BaseResource {
             throw new ClientException("TagNotFound", MessageFormat.format("Tag not found: {0}", id));
         }
         
+        // Check the parent
+        if (parentId != null) {
+            Tag parentTag = tagDao.getByTagId(principal.getId(), parentId);
+            if (parentTag == null) {
+                throw new ClientException("ParentNotFound", MessageFormat.format("Parent not found: {0}", parentId));
+            }
+        }
+        
         // Check for name duplicate
         Tag tagDuplicate = tagDao.getByName(principal.getId(), name);
         if (tagDuplicate != null && !tagDuplicate.getId().equals(id)) {
@@ -174,6 +195,8 @@ public class TagResource extends BaseResource {
         if (!StringUtils.isEmpty(color)) {
             tag.setColor(color);
         }
+        // Parent tag is always updated to have the possibility to delete it
+        tag.setParentId(parentId);
         
         tagDao.update(tag);
         

docs-web/src/prod/resources/config.properties

@@ -1,3 +1,3 @@
 api.current_version=${project.version}
 api.min_version=1.0
-db.version=1
+db.version=2

docs-web/src/stress/resources/config.properties

@@ -1,3 +1,3 @@
 api.current_version=${project.version}
 api.min_version=1.0
-db.version=1
+db.version=2

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

@@ -2,6 +2,7 @@ package com.sismics.docs.rest;
 
 import javax.json.JsonArray;
 import javax.json.JsonObject;
+import javax.json.JsonValue;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.core.Form;
 import javax.ws.rs.core.Response;
@@ -44,7 +45,8 @@ public class TestTagResource extends BaseJerseyTest {
                 .cookie(TokenBasedSecurityFilter.COOKIE_NAME, tag1Token)
                 .put(Entity.form(new Form()
                         .param("name", "Tag4")
-                        .param("color", "#00ff00")), JsonObject.class);
+                        .param("color", "#00ff00")
+                        .param("parent", tag3Id)), JsonObject.class);
         String tag4Id = json.getString("id");
         Assert.assertNotNull(tag4Id);
         
@@ -129,6 +131,7 @@ public class TestTagResource extends BaseJerseyTest {
         Assert.assertTrue(tags.size() > 0);
         Assert.assertEquals("Tag4", tags.getJsonObject(1).getString("name"));
         Assert.assertEquals("#00ff00", tags.getJsonObject(1).getString("color"));
+        Assert.assertEquals(tag3Id, tags.getJsonObject(1).getString("parent"));
         
         // Update a tag
         json = target().path("/tag/" + tag4Id).request()
@@ -146,6 +149,7 @@ public class TestTagResource extends BaseJerseyTest {
         Assert.assertTrue(tags.size() > 0);
         Assert.assertEquals("UpdatedName", tags.getJsonObject(1).getString("name"));
         Assert.assertEquals("#0000ff", tags.getJsonObject(1).getString("color"));
+        Assert.assertEquals(JsonValue.NULL, tags.getJsonObject(1).get("parent"));
         
         // Deletes a tag
         target().path("/tag/" + tag4Id).request()