+ <%@ include file="topicview.jsp"%>
+
+
+
+ <%@ include file="topicview.jsp"%>
+
+
+
\ No newline at end of file
Index: lams_central/web/comments/allviewwrapper.jsp
===================================================================
diff -u
--- lams_central/web/comments/allviewwrapper.jsp (revision 0)
+++ lams_central/web/comments/allviewwrapper.jsp (revision 16eafe54d28edddfe0bdb558a18c68e1962cb536)
@@ -0,0 +1,19 @@
+
+
+
+
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+
+
-
-
-
+
-
- <%@ include file="topicview.jsp"%>
-
-
-
+ <%@ include file="allview.jsp"%>
+
+
Index: lams_central/web/comments/msgview.jsp
===================================================================
diff -u -r3074a9a950b01b5d024ca73e9ac0cc15c5d6f921 -r16eafe54d28edddfe0bdb558a18c68e1962cb536
--- lams_central/web/comments/msgview.jsp (.../msgview.jsp) (revision 3074a9a950b01b5d024ca73e9ac0cc15c5d6f921)
+++ lams_central/web/comments/msgview.jsp (.../msgview.jsp) (revision 16eafe54d28edddfe0bdb558a18c68e1962cb536)
@@ -30,11 +30,24 @@
+
|
@@ -158,13 +183,13 @@
|
+
getNextThreadByThreadId(final Long rootTopicId, final Long previousThreadMessageId,
Integer numberOfThreads, Integer sortBy, String extraSortParam, Integer userId);
+
+ public abstract SortedSet getStickyThreads(final Long rootTopicId, Integer sortBy, String extraSortParam, Integer userId);
}
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/comments/dao/hibernate/CommentDAO.java
===================================================================
diff -u -r54921c2609f8b6eed36ab972d246bc9094489ebf -r16eafe54d28edddfe0bdb558a18c68e1962cb536
--- lams_common/src/java/org/lamsfoundation/lams/comments/dao/hibernate/CommentDAO.java (.../CommentDAO.java) (revision 54921c2609f8b6eed36ab972d246bc9094489ebf)
+++ lams_common/src/java/org/lamsfoundation/lams/comments/dao/hibernate/CommentDAO.java (.../CommentDAO.java) (revision 16eafe54d28edddfe0bdb558a18c68e1962cb536)
@@ -53,11 +53,6 @@
}
@Override
- public void update(Comment comment) {
- this.getHibernateTemplate().saveOrUpdate(comment);
- }
-
- @Override
public Comment getById(Long commentId) {
return (Comment) getHibernateTemplate().get(Comment.class, commentId);
}
@@ -128,10 +123,9 @@
}
private static final String SQL_QUERY_FIND_FIRST_THREAD_TOP_BY_UID = "SELECT uid FROM lams_comment"
- + " WHERE root_comment_uid = :rootUid AND comment_level = 1 ORDER BY uid DESC";
-
+ + " WHERE root_comment_uid = :rootUid AND comment_level = 1 AND sticky = 0 ORDER BY uid DESC";
private static final String SQL_QUERY_FIND_NEXT_THREAD_TOP = "SELECT uid FROM lams_comment"
- + " WHERE root_comment_uid = :rootUid AND uid < :lastUid AND comment_level = 1 ORDER BY uid DESC";
+ + " WHERE root_comment_uid = :rootUid AND uid < :lastUid AND comment_level = 1 AND sticky = 0 ORDER BY uid DESC";
private static final String SQL_QUERY_FIND_NEXT_THREAD_MESSAGES =
"SELECT c.*, SUM(l.vote) likes_total, l2.vote user_vote FROM lams_comment c "
@@ -180,7 +174,7 @@
+ " FROM lams_comment c "
+ " LEFT JOIN lams_comment_likes l ON c.uid = l.comment_uid "
+ " LEFT JOIN lams_comment_likes l2 ON c.uid = l2.comment_uid AND l2.user_id=:userId "
- + " WHERE root_comment_uid = :rootUid AND comment_level = 1 "
+ + " WHERE root_comment_uid = :rootUid AND comment_level = 1 AND sticky = 0 "
+ " GROUP BY c.uid "
+ " ORDER BY likes_total DESC, c.uid DESC";
@@ -189,7 +183,7 @@
+ " FROM lams_comment c "
+ " LEFT JOIN lams_comment_likes l ON c.uid = l.comment_uid "
+ " LEFT JOIN lams_comment_likes l2 ON c.uid = l2.comment_uid AND l2.user_id=:userId "
- + " WHERE root_comment_uid = :rootUid AND comment_level = 1 "
+ + " WHERE root_comment_uid = :rootUid AND comment_level = 1 AND sticky = 0 "
+ " GROUP BY c.uid "
+ " ORDER BY likes_total DESC, c.uid DESC) cl "
+ " WHERE (cl.likes_total = :like AND cl.uid < :lastUid ) "
@@ -250,4 +244,81 @@
}
return new TreeSet();
}
+
+ @Override
+ public SortedSet getStickyThreads(final Long rootTopicId, Integer sortBy, String extraSortParam, Integer userId) {
+
+ if (ICommentService.SORT_BY_LIKE.equals(sortBy)) {
+ return getStickyByThreadIdLikes(rootTopicId, sortBy, extraSortParam, userId);
+ } else {
+ return getStickyByThreadIdNewestFirst(rootTopicId, sortBy, userId);
+ }
+
+ }
+
+ private static final String SQL_QUERY_FIND_STICKY_BY_UID = "SELECT uid FROM lams_comment"
+ + " WHERE root_comment_uid = :rootUid AND comment_level = 1 AND sticky = 1 ORDER BY uid DESC";
+
+ @SuppressWarnings({"unchecked" })
+ private SortedSet getStickyByThreadIdNewestFirst(final Long rootTopicId, Integer sortBy, Integer userId) {
+
+ // the search to get to the top level is quite light, so get just the uids
+ // then build a complete set.
+ List threadUidList = (List) getSession().
+ createSQLQuery(SQL_QUERY_FIND_STICKY_BY_UID)
+ .setLong("rootUid", rootTopicId)
+ .list();
+
+ if (threadUidList != null && threadUidList.size() > 0) {
+ SQLQuery query = getSession().createSQLQuery(SQL_QUERY_FIND_NEXT_THREAD_MESSAGES);
+ query.addEntity("comment", Comment.class)
+ .addScalar("likes_total", Hibernate.INTEGER)
+ .addScalar("user_vote", Hibernate.INTEGER)
+ .setLong("userId", userId != null ? userId : 0)
+ .setParameterList("threadIds", threadUidList);
+ List results = query.list();
+ return upgradeComments(results, sortBy);
+ }
+ return new TreeSet();
+ }
+
+ private static final String SQL_QUERY_FIND_STICKY_BY_LIKES = "SELECT c.*, COALESCE(SUM(l.vote),0) likes_total, l2.vote user_vote"
+ + " FROM lams_comment c "
+ + " LEFT JOIN lams_comment_likes l ON c.uid = l.comment_uid "
+ + " LEFT JOIN lams_comment_likes l2 ON c.uid = l2.comment_uid AND l2.user_id=:userId "
+ + " WHERE root_comment_uid = :rootUid AND comment_level = 1 AND c.sticky = 1 "
+ + " GROUP BY c.uid "
+ + " ORDER BY likes_total DESC, c.uid DESC";
+
+ @SuppressWarnings({ "unchecked" })
+ private SortedSet getStickyByThreadIdLikes(final Long rootTopicId, Integer sortBy, String extraSortParam, Integer userId) {
+
+ List topThreadObjects = (List) getSession().createSQLQuery(SQL_QUERY_FIND_STICKY_BY_LIKES)
+ .addEntity("comment", Comment.class)
+ .addScalar("likes_total", Hibernate.INTEGER)
+ .addScalar("user_vote", Hibernate.INTEGER)
+ .setLong("rootUid", rootTopicId)
+ .setLong("userId", userId != null ? userId : 0)
+ .list();
+
+ if (topThreadObjects != null && topThreadObjects.size() > 0) {
+ // build the list of uids
+ List threadUidList = new ArrayList();
+ for ( Object[] rawObject : topThreadObjects ) {
+ Comment comment = (Comment) rawObject[0];
+ threadUidList.add(comment.getUid());
+ }
+ SQLQuery query = getSession().createSQLQuery(SQL_QUERY_FIND_NEXT_THREAD_MESSAGES_REPLIES_ONLY);
+ query.addEntity("comment", Comment.class)
+ .addScalar("likes_total", Hibernate.INTEGER)
+ .addScalar("user_vote", Hibernate.INTEGER)
+ .setLong("userId", userId != null ? userId : 0)
+ .setParameterList("threadIds", threadUidList);
+ List results = query.list();
+ topThreadObjects.addAll(results);
+ return upgradeComments(topThreadObjects, sortBy);
+ }
+ return new TreeSet();
+ }
+
}
Index: lams_common/src/java/org/lamsfoundation/lams/comments/service/CommentService.java
===================================================================
diff -u -r54921c2609f8b6eed36ab972d246bc9094489ebf -r16eafe54d28edddfe0bdb558a18c68e1962cb536
--- lams_common/src/java/org/lamsfoundation/lams/comments/service/CommentService.java (.../CommentService.java) (revision 54921c2609f8b6eed36ab972d246bc9094489ebf)
+++ lams_common/src/java/org/lamsfoundation/lams/comments/service/CommentService.java (.../CommentService.java) (revision 16eafe54d28edddfe0bdb558a18c68e1962cb536)
@@ -78,7 +78,23 @@
SortedSet comments = commentDAO.getNextThreadByThreadId(rootTopic.getUid(), lastThreadMessageUid, pageSize, sortBy, extraSortParam, userId);
return getSortedCommentDTO(comments);
}
-
+
+ @Override
+ public List getTopicStickyThread(Long externalId, Integer externalType, String externalSignature,
+ Integer sortBy, String extraSortParam, Integer userId) {
+
+ // hidden root of all the threads!
+ Comment rootTopic = commentDAO.getRootTopic(externalId, externalType, externalSignature);
+
+ // first time through - no root topic.
+ if ( rootTopic == null ) {
+ return new ArrayList();
+ }
+
+ SortedSet comments = commentDAO.getStickyThreads(rootTopic.getUid(), sortBy, extraSortParam, userId);
+ return getSortedCommentDTO(comments);
+ }
+
private List getSortedCommentDTO(SortedSet comments) {
List msgDtoList = new ArrayList();
@@ -215,6 +231,19 @@
}
}
+ public Comment updateSticky(Long commentUid, Boolean newSticky) {
+
+ Comment comment = commentDAO.getById(commentUid);
+ if ( comment != null ) {
+ comment.setSticky(newSticky);
+ commentDAO.saveOrUpdate(comment);
+ return comment;
+ } else {
+ log.error("Unable to update comment as comment not found. Comment uid "+commentUid
+ +" new sticky "+newSticky);
+ return null;
+ }
+ }
public CommentDTO getComment(Long commentUid){
Comment comment = commentDAO.getById(commentUid);
return comment != null ? CommentDTO.getCommentDTO(comment) : null;
Index: lams_common/src/java/org/lamsfoundation/lams/comments/service/ICommentService.java
===================================================================
diff -u -r54921c2609f8b6eed36ab972d246bc9094489ebf -r16eafe54d28edddfe0bdb558a18c68e1962cb536
--- lams_common/src/java/org/lamsfoundation/lams/comments/service/ICommentService.java (.../ICommentService.java) (revision 54921c2609f8b6eed36ab972d246bc9094489ebf)
+++ lams_common/src/java/org/lamsfoundation/lams/comments/service/ICommentService.java (.../ICommentService.java) (revision 16eafe54d28edddfe0bdb558a18c68e1962cb536)
@@ -37,10 +37,15 @@
public static final Integer SORT_BY_LIKE = 1;
- /** Gets the comments for a tool, based on the tool session and the tool's id. Allows for paging */
+ /** Gets the comments for a tool, based on the tool session and the tool's id. Allows for paging.
+ * Will not include the sticky - get them using getTopicStickyThread() */
List getTopicThread(Long externalId, Integer externalType, String externalSignature, Long lastMsgSeqId,
Integer pageSize, Integer sortBy, String extraSortParam, Integer userId);
+ /** Gets all the sticky comments for a tool, based on the tool session and the tool's id */
+ List getTopicStickyThread(Long externalId, Integer externalType, String externalSignature,
+ Integer sortBy, String extraSortParam, Integer userId);
+
/** Saves a comment - either creating a whole tree one if there is no parent or saving under the given parent. */
Comment createReply(Long parentId, String replyText, User user);
Comment createReply(Comment parent, String replyText, User user);
@@ -62,6 +67,9 @@
/** Update the body in a comment, and update the modified time, who by, etc, etc */
Comment updateComment(Long commentUid, String newBody, User user, boolean makeAuditEntry);
+ /** Update the sticky flag for a comment */
+ Comment updateSticky(Long commentUid, Boolean newSticky);
+
/** Update the like list for Comment commentUid by likeVote. Returns true if like/dislike added. */
boolean addLike(Long commentUid, User user, Integer likeVote);
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040061.sql
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040061.sql (revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040061.sql (revision 16eafe54d28edddfe0bdb558a18c68e1962cb536)
@@ -0,0 +1,10 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+
+-- LDEV-3756 Noticeboard comments: set thread to top
+ALTER TABLE lams_comment
+ADD COLUMN sticky SMALLINT(6) NULL DEFAULT 0,
+ADD INDEX IX_comment_level_sticky (comment_level ASC, sticky ASC);
+
+COMMIT;
+SET AUTOCOMMIT = 1;
\ No newline at end of file