#444 Add a page of liked users list

support-project · Aug 9, 2017 · 497d3c3 · 497d3c3
1 parent 5d80f87
commit 497d3c3
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.support-project</groupId>
             <artifactId>web</artifactId>
-            <version>1.10.0</version>
+            <version>1.11.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>

diff --git a/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java b/src/main/java/org/support/project/knowledge/control/open/KnowledgeControl.java
@@ -33,6 +33,7 @@
 import org.support.project.knowledge.entity.KnowledgeHistoriesEntity;
 import org.support.project.knowledge.entity.KnowledgeItemValuesEntity;
 import org.support.project.knowledge.entity.KnowledgesEntity;
+import org.support.project.knowledge.entity.LikeCommentsEntity;
 import org.support.project.knowledge.entity.LikesEntity;
 import org.support.project.knowledge.entity.StocksEntity;
 import org.support.project.knowledge.entity.TagsEntity;
@@ -782,8 +783,44 @@ public Boundary likes() throws InvalidParamException {
     }
 
 
+    /**
+     * いいねを押したユーザを一覧表示（コメントに対し）
+     * 
+     * @return
+     * @throws InvalidParamException
+     */
+    @Get
+    public Boundary likecomments() throws InvalidParamException {
+        // 共通処理呼の表示条件の保持の呼び出し
+        setViewParam();
 
+        Long commentNo = super.getPathLong(Long.valueOf(-1));
+        CommentsEntity comment = CommentsDao.get().selectOnKey(commentNo);
+        if (comment == null) {
+            return sendError(HttpStatus.SC_404_NOT_FOUND, "NOT FOUND");
+        }
+        setAttribute("knowledgeId", comment.getKnowledgeId());
+        setAttribute("commentNo", comment.getKnowledgeId());
 
+        Integer page = 0;
+        String p = getParamWithDefault("page", "");
+        if (StringUtils.isInteger(p)) {
+            page = Integer.parseInt(p);
+        }
+
+        List<LikeCommentsEntity> likes = LikeCommentsDao.get().selectOnCommentNo(commentNo, page * PAGE_LIMIT, PAGE_LIMIT);
+        setAttribute("likes", likes);
+
+        int previous = page - 1;
+        if (previous < 0) {
+            previous = 0;
+        }
+        setAttribute("page", page);
+        setAttribute("previous", previous);
+        setAttribute("next", page + 1);
+
+        return forward("likes.jsp");
+    }
 
     /**
      * 編集履歴の表示

diff --git a/src/main/java/org/support/project/knowledge/dao/LikeCommentsDao.java b/src/main/java/org/support/project/knowledge/dao/LikeCommentsDao.java
@@ -1,9 +1,13 @@
 package org.support.project.knowledge.dao;
 
+import java.util.List;
+
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
 import org.support.project.knowledge.dao.gen.GenLikeCommentsDao;
+import org.support.project.knowledge.entity.LikeCommentsEntity;
+import org.support.project.ormapping.common.SQLManager;
 
 /**
  * コメントのイイネ
@@ -26,6 +30,11 @@ public Long selectOnCommentNo(Long commentNo) {
         return super.executeQuerySingle(sql, Long.class, commentNo);
     }
 
+    public List<LikeCommentsEntity> selectOnCommentNo(Long commentNo, int offset, int limit) {
+        String sql = SQLManager.getInstance().getSql("/org/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_selectOnCommentNo.sql");
+        return executeQueryList(sql, LikeCommentsEntity.class, commentNo, limit, offset);
+    }
+
 
 
 }
diff --git a/src/main/java/org/support/project/knowledge/entity/LikeCommentsEntity.java b/src/main/java/org/support/project/knowledge/entity/LikeCommentsEntity.java
@@ -1,16 +1,9 @@
 package org.support.project.knowledge.entity;
 
-import org.support.project.knowledge.entity.gen.GenLikeCommentsEntity;
-
-import java.util.List;
-import java.util.Map;
-
-import org.support.project.common.bean.ValidateError;
 import org.support.project.di.Container;
 import org.support.project.di.DI;
 import org.support.project.di.Instance;
-
-import java.sql.Timestamp;
+import org.support.project.knowledge.entity.gen.GenLikeCommentsEntity;
 
 
 /**
@@ -22,6 +15,8 @@ public class LikeCommentsEntity extends GenLikeCommentsEntity {
     /** SerialVersion */
     private static final long serialVersionUID = 1L;
 
+    private String userName;
+
     /**
      * Get instance from DI container.
      * @return instance
@@ -46,4 +41,18 @@ public LikeCommentsEntity(Long no) {
         super( no);
     }
 
+    /**
+     * @return the userName
+     */
+    public String getUserName() {
+        return userName;
+    }
+
+    /**
+     * @param userName the userName to set
+     */
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
 }
diff --git a/...g/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_selectOnCommentNo.sql b/...g/support/project/knowledge/dao/sql/LikeCommentsDao/LikeCommentsDao_selectOnCommentNo.sql
@@ -0,0 +1,15 @@
+SELECT
+        LIKE_COMMENTS.*,
+        USERS.USER_NAME
+    FROM
+        LIKE_COMMENTS
+        LEFT OUTER JOIN USERS ON (LIKE_COMMENTS.INSERT_USER = USERS.USER_ID)
+    WHERE
+        LIKE_COMMENTS.COMMENT_NO = ?
+        AND LIKE_COMMENTS.DELETE_FLAG = 0
+    ORDER BY
+        LIKE_COMMENTS.UPDATE_DATETIME DESC LIMIT ? OFFSET ?;
+
+
+
+
diff --git a/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-comment-list.jsp b/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-comment-list.jsp
@@ -88,7 +88,7 @@
                     </c:if>
                 </c:forEach>
 
-                <a href="<%=request.getContextPath()%>/open.knowledge/likeComments/<%=jspUtil.out("comment.getCommentNo()")%><%=jspUtil.out("params")%>"
+                <a href="<%=request.getContextPath()%>/open.knowledge/likecomments/<%=jspUtil.out("comment.getCommentNo()")%><%=jspUtil.out("params")%>"
                     class="text-primary btn-link">
                     <i class="fa fa-thumbs-o-up"></i>&nbsp;<%=jspUtil.label("knowledge.view.like")%> × 
                     <span id="like_comment_count_<%=comment.getCommentNo()%>">
@@ -174,7 +174,7 @@
                     </c:if>
                 </c:forEach>
 
-                <a href="<%=request.getContextPath()%>/open.knowledge/likeComments/<%=jspUtil.out("comment.getCommentNo()")%><%=jspUtil.out("params")%>"
+                <a href="<%=request.getContextPath()%>/open.knowledge/likecomments/<%=jspUtil.out("comment.getCommentNo()")%><%=jspUtil.out("params")%>"
                     class="text-primary btn-link">
                     <i class="fa fa-thumbs-o-up"></i>&nbsp;<%=jspUtil.label("knowledge.view.like")%> × 
                     <span id="like_comment_count_<%=comment.getCommentNo()%>">