#795 Add a read or unread label to list of popular / stock / history

support-project · Jul 12, 2017 · b94ead1 · b94ead1
1 parent 9bab2f1
commit b94ead1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
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
@@ -490,7 +490,7 @@ public Boundary list() throws Exception {
     }
 
     /**
-     * 閲覧履歴の表示
+     * イベント一覧
      * 
      * @return
      * @throws InvalidParamException
@@ -563,6 +563,7 @@ public Boundary show_history() throws InvalidParamException {
         }
         List<KnowledgesEntity> histories = knowledgeLogic.getKnowledges(historyIds, loginedUser);
         List<StockKnowledge> stocks = knowledgeLogic.setStockInfo(histories, loginedUser);
+        KnowledgeLogic.get().setViewed(stocks, getLoginedUser());
         setAttribute("histories", stocks);
         LOG.trace("履歴取得完了");
 
@@ -587,6 +588,7 @@ public Boundary show_popularity() throws InvalidParamException {
 
         List<KnowledgesEntity> list = knowledgeLogic.getPopularityKnowledges(loginedUser, 0, 20);
         List<StockKnowledge> stocks = knowledgeLogic.setStockInfo(list, loginedUser);
+        KnowledgeLogic.get().setViewed(stocks, getLoginedUser());
         setAttribute("popularities", stocks);
         LOG.trace("取得完了");
         // ナレッジの公開先の情報を取得
@@ -625,7 +627,7 @@ public Boundary stocks() throws InvalidParamException {
         KnowledgeLogic knowledgeLogic = KnowledgeLogic.get();
         List<KnowledgesEntity> list = knowledgeLogic.getStocks(loginedUser, offset * PAGE_LIMIT, PAGE_LIMIT, stockid);
         List<StockKnowledge> stocks = knowledgeLogic.setStockInfo(list, loginedUser);
-//        setAttribute("stocks", list);
+        KnowledgeLogic.get().setViewed(stocks, getLoginedUser());
         setAttribute("popularities", stocks);
         LOG.trace("取得完了");
 

diff --git a/src/main/java/org/support/project/knowledge/entity/gen/GenKnowledgesEntity.java b/src/main/java/org/support/project/knowledge/entity/gen/GenKnowledgesEntity.java
@@ -62,11 +62,11 @@ public GenKnowledgesEntity(Long knowledgeId) {
     /** タグ名称一覧 */
     private String tagNames;
     /** いいね件数 */
-    private Long likeCount;
+    private Long likeCount = new Long(0);
     /** コメント件数 */
-    private Integer commentCount;
+    private Integer commentCount = 0;
     /** 参照件数 */
-    private Long viewCount;
+    private Long viewCount = new Long(0);
     /** テンプレートの種類ID */
     private Integer typeId;
     /** 通知ステータス */