Merge branch 'fix/comment-mention' into 'next'

from pull-request 1513 * refs/heads/fix/comment-mention: MyIssues: Fix mentioning issues contain unsuitable items Rename Mention.add() to Mention.update() Reviewed-by: 채수원 <sw.chae@navercorp.com>
naver · Mar 12, 2015 · ae715e3 · ae715e3
2 parents 162dd32 + 9e67caf
commit ae715e3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/app/models/AbstractPosting.java b/app/models/AbstractPosting.java
@@ -252,7 +252,7 @@ public Set<User> getWatchers(Set<User> baseWatchers) {
 
     protected void updateMention() {
         if (this.body != null) {
-            Mention.add(this.asResource(), NotificationEvent.getMentionedUsers(this.body));
+            Mention.update(this.asResource(), NotificationEvent.getMentionedUsers(this.body));
         }
     }
 

diff --git a/app/models/Comment.java b/app/models/Comment.java
@@ -87,8 +87,14 @@ public void save() {
         getParent().update();
     }
 
+    @Transactional
+    public void update() {
+        super.update();
+        updateMention();
+    }
+
     protected void updateMention() {
-        Mention.add(this.asResource(), NotificationEvent.getMentionedUsers(this.contents));
+        Mention.update(this.asResource(), NotificationEvent.getMentionedUsers(this.contents));
     }
 
     public void delete() {

diff --git a/app/models/Mention.java b/app/models/Mention.java
@@ -55,7 +55,7 @@ public class Mention extends Model {
      * @param resource the resource mentioning the users
      * @param mentionedUsers the users mentioned by the resource
      */
-    public static void add(Resource resource, Set<User> mentionedUsers) {
+    public static void update(Resource resource, Set<User> mentionedUsers) {
         for (Mention mention : find.where().eq("resourceType", resource.getType()).eq("resourceId",
                 resource.getId()).findList()) {
             if (mentionedUsers.contains(mention.user)) {