#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

@@ -23,6 +23,11 @@ public class TagDto {
      * Color.
      */
     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.
      */
@@ -165,12 +171,31 @@ public class Tag implements Loggable {
     public void setDeleteDate(Date deleteDate) {
         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';