Commit @e7e246e38c3beeadd382a4c061d08fc1f1aeed19

64d159d

e7e246e

app/controllers/CodeHistoryApp.java

--- app/controllers/CodeHistoryApp.java

+++ app/controllers/CodeHistoryApp.java


             return notFound(ErrorViews.NotFound.render("error.notfound", project, null));
         }
 
-        List<CodeComment> comments = CodeComment.find.where().eq("commitId",
+        List<CommitComment> comments = CommitComment.find.where().eq("commitId",
                 commitId).eq("project.id", project.id).findList();
 
         String selectedBranch = request().getQueryString("branch");

 
     public static Result newComment(String ownerName, String projectName, String commitId)
             throws IOException, ServletException, SVNException {
-        Form<CodeComment> codeCommentForm = new Form<>(CodeComment.class)
+        Form<CommitComment> codeCommentForm = new Form<>(CommitComment.class)
                 .bindFromRequest();
 
         Project project = Project.findByOwnerAndProjectName(ownerName, projectName);

         }
 
         if (!AccessControl.isProjectResourceCreatable(UserApp.currentUser(), project,
-                ResourceType.CODE_COMMENT)) {
+                ResourceType.COMMIT_COMMENT)) {
             return forbidden(forbidden.render("error.forbidden", project));
         }
 
-        CodeComment codeComment = codeCommentForm.get();
+        CommitComment codeComment = codeCommentForm.get();
         codeComment.project = project;
         codeComment.commitId = commitId;
         codeComment.createdDate = new Date();

         return toView;
     }
 
-    private static void addNotificationEventForNewComment(Project project, CodeComment codeComment, Call toView) throws IOException, SVNException, ServletException {
+    private static void addNotificationEventForNewComment(Project project, CommitComment codeComment, Call toView) throws IOException, SVNException, ServletException {
         Commit commit = RepositoryService.getRepository(project).getCommit(codeComment.commitId);
         Set<User> watchers = commit.getWatchers(project);
         watchers.addAll(NotificationEvent.getMentionedUsers(codeComment.contents));

 
     public static Result deleteComment(String ownerName, String projectName, String commitId,
                                        Long id) {
-        CodeComment codeComment = CodeComment.find.byId(id);
+        CommitComment codeComment = CommitComment.find.byId(id);
 
         if (codeComment == null) {
             return notFound(notfound_default.render(request().path()));

e7e246e

app/controllers/CommentApp.java (added)

+++ app/controllers/CommentApp.java

...	...	@@ -0,0 +1,25 @@
	1	+package controllers;
	2	+
	3	+import models.Project;
	4	+import models.enumeration.ResourceType;
	5	+import models.resource.Resource;
	6	+import play.mvc.Result;
	7	+import play.mvc.Controller;
	8	+
	9	+public class CommentApp extends Controller {
	10	+ public static Result delete(String type, String id) {
	11	+ Resource comment = Resource.get(ResourceType.getValue(type), id);
	12	+
	13	+ if (comment.getType().equals(ResourceType.COMMIT_COMMENT)) {
	14	+ return CodeHistoryApp.deleteComment(comment.getProject().owner,
	15	+ comment.getProject().name, comment.getContainer().getId(),
	16	+ Long.valueOf(comment.getId()));
	17	+ }
	18	+
	19	+ if (comment.getType().equals(ResourceType.PULL_REQUEST_COMMENT)) {
	20	+ return PullRequestCommentApp.deleteComment(Long.valueOf(id));
	21	+ }
	22	+
	23	+ return badRequest();
	24	+ }
	25	+}

64d159d

e7e246e

app/controllers/ProjectApp.java

--- app/controllers/ProjectApp.java

+++ app/controllers/ProjectApp.java


     }
 
     private static void addCodeCommenters(String commitId, Long projectId, List<User> userList) {
-        List<CodeComment> comments = CodeComment.find.where().eq("commitId",
+        List<CommitComment> comments = CommitComment.find.where().eq("commitId",
                 commitId).eq("project.id", projectId).findList();
 
-        for (CodeComment codeComment : comments) {
+        for (CommitComment codeComment : comments) {
             User commentAuthor = User.findByLoginId(codeComment.authorLoginId);
             if( userList.contains(commentAuthor) ) {
                 userList.remove(commentAuthor);

64d159d

e7e246e

app/controllers/PullRequestApp.java

--- app/controllers/PullRequestApp.java

+++ app/controllers/PullRequestApp.java


             return notFound(ErrorViews.NotFound.render("error.notfound", project, null));
         }
 
-        List<CodeComment> comments = CodeComment.find.where().eq("commitId",
+        List<CommitComment> comments = CommitComment.find.where().eq("commitId",
                 commitId).eq("project.id", project.id).findList();
 
         return ok(diff.render(pullRequest, commit, parentCommit, patch, comments));

64d159d

e7e246e

app/models/CodeComment.java

--- app/models/CodeComment.java

+++ app/models/CodeComment.java


 import play.db.ebean.Model;
 
 import javax.persistence.Column;
-import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
-import javax.validation.constraints.Size;
+import javax.persistence.MappedSuperclass;
 import java.beans.Transient;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.List;
 
-@Entity
+import org.joda.time.Duration;
+import utils.JodaDateUtil;
+
+import javax.validation.constraints.Size;
+
+
+@MappedSuperclass
 public class CodeComment extends Model implements ResourceConvertible, TimelineItem {
     private static final long serialVersionUID = 1L;
     public static final Finder<Long, CodeComment> find = new Finder<>(Long.class, CodeComment.class);
 
     @Id
     public Long id;
-
     @ManyToOne
     public Project project;
-
     public String commitId;
     public String path;
-    public Long line;
+    public Integer line; // FIXME: DB엔 integer가 아닌 bigint로 되어있음.
     public String side;
-
     @Constraints.Required @Column(length = 4000) @Size(max=4000)
     public String contents;
-
     @Constraints.Required
     public Date createdDate;
-
     public Long authorId;
     public String authorLoginId;
     public String authorName;
 
     public CodeComment() {
         createdDate = new Date();
-    }
-
-    public static int count(Project project, String commitId, String path){
-        if(path != null){
-            return CodeComment.find.where()
-                    .eq("project.id", project.id)
-                    .eq("commitId", commitId)
-                    .eq("path", path)
-                    .findRowCount();
-        } else {
-            return CodeComment.find.where()
-                    .eq("project.id", project.id)
-                    .eq("commitId", commitId)
-                    .findRowCount();
-        }
-    }   
-
-    public static int countByCommits(Project project, List<PullRequestCommit> commits) {
-        int count = 0;
-        for(PullRequestCommit commit: commits) {
-            count += CodeComment.find.where().eq("project.id", project.id)
-                                .eq("commitId", commit.getCommitId())
-                                .findRowCount();
-        }
-        
-        return count;
     }
 
     @Transient

     }
 
     @Override
-    public Resource asResource() {
-        return new Resource() {
-            @Override
-            public String getId() {
-                return id.toString();
-            }
-
-            @Override
-            public Project getProject() {
-                return project;
-            }
-
-            @Override
-            public ResourceType getType() {
-                return ResourceType.CODE_COMMENT;
-            }
-
-            @Override
-            public Long getAuthorId() {
-                return authorId;
-            }
-        };
-    }
-
-    @Override
     public Date getDate() {
         return createdDate;
     }
 
-    public static List<CodeComment> findByCommits(Project project, List<PullRequestCommit> commits) {
-        List<CodeComment> list = new ArrayList<>();
-        for(PullRequestCommit commit: commits) {
-            list.addAll(CodeComment.find.where().eq("project.id", project.id).eq("commitId", commit.getCommitId()).findList());
-        }
-        return list;
+    public Duration ago() {
+        return JodaDateUtil.ago(this.createdDate);
     }
+
+    abstract public Resource asResource();
 }

e7e246e

app/models/CommitComment.java (added)

+++ app/models/CommitComment.java

...	...	@@ -0,0 +1,82 @@
	1	+package models;
	2	+
	3	+import models.enumeration.ResourceType;
	4	+import models.resource.Resource;
	5	+
	6	+import java.util.List;
	7	+
	8	+import javax.persistence.Entity;
	9	+import javax.validation.constraints.Size;
	10	+
	11	+@Entity
	12	+public class CommitComment extends CodeComment {
	13	+ private static final long serialVersionUID = 1L;
	14	+ public static final Finder<Long, CommitComment> find = new Finder<>(Long.class, CommitComment.class);
	15	+
	16	+ public CommitComment() {
	17	+ super();
	18	+ }
	19	+
	20	+ @Override
	21	+ public Resource asResource() {
	22	+ return new Resource() {
	23	+ @Override
	24	+ public String getId() {
	25	+ return id.toString();
	26	+ }
	27	+
	28	+ @Override
	29	+ public Project getProject() {
	30	+ return project;
	31	+ }
	32	+
	33	+ @Override
	34	+ public ResourceType getType() {
	35	+ return ResourceType.COMMIT_COMMENT;
	36	+ }
	37	+
	38	+ @Override
	39	+ public Long getAuthorId() {
	40	+ return authorId;
	41	+ }
	42	+
	43	+ public void delete() {
	44	+ CommitComment.this.delete();
	45	+ }
	46	+ };
	47	+ }
	48	+
	49	+ public static int count(Project project, String commitId, String path){
	50	+ if(path != null){
	51	+ return CommitComment.find.where()
	52	+ .eq("project.id", project.id)
	53	+ .eq("commitId", commitId)
	54	+ .eq("path", path)
	55	+ .findRowCount();
	56	+ } else {
	57	+ return CommitComment.find.where()
	58	+ .eq("project.id", project.id)
	59	+ .eq("commitId", commitId)
	60	+ .findRowCount();
	61	+ }
	62	+ }
	63	+
	64	+ public static int countByCommits(Project project, List<PullRequestCommit> commits) {
	65	+ int count = 0;
	66	+ for(PullRequestCommit commit: commits) {
	67	+ count += CommitComment.find.where().eq("project.id", project.id)
	68	+ .eq("commitId", commit.getCommitId())
	69	+ .findRowCount();
	70	+ }
	71	+
	72	+ return count;
	73	+ }
	74	+
	75	+ public static List<CodeComment> findByCommits(Project project, List<PullRequestCommit> commits) {
	76	+ List<CodeComment> list = new ArrayList<>();
	77	+ for(PullRequestCommit commit: commits) {
	78	+ list.addAll(CodeComment.find.where().eq("project.id", project.id).eq("commitId", commit.getCommitId()).findList());
	79	+ }
	80	+ return list;
	81	+ }
	82	+}

64d159d

e7e246e

app/models/Project.java

--- app/models/Project.java

+++ app/models/Project.java


 import com.avaje.ebean.Ebean;
 import com.avaje.ebean.ExpressionList;
 import com.avaje.ebean.Page;
-import com.avaje.ebean.RawSql;
-import com.avaje.ebean.RawSqlBuilder;
 
 import controllers.EnrollProjectApp;
-import controllers.ProjectApp;
 import controllers.routes;
 import models.enumeration.RequestState;
 import models.enumeration.ResourceType;

 import org.eclipse.jgit.api.errors.NoHeadException;
 import org.joda.time.Duration;
 import org.tmatesoft.svn.core.SVNException;
-import play.Logger;
 import play.data.validation.Constraints;
 import play.db.ebean.Model;
 import play.db.ebean.Transactional;

     public List<User> enrolledUsers;
 
     @OneToMany(cascade = CascadeType.REMOVE)
-    public List<CodeComment> codeComments;
+    public List<CommitComment> codeComments;
 
     /**
      * 신규 프로젝트를 생성한다.

64d159d

e7e246e

app/models/PullRequestComment.java

--- app/models/PullRequestComment.java

+++ app/models/PullRequestComment.java


 import org.eclipse.jgit.blame.BlameGenerator;
 import org.eclipse.jgit.blame.BlameResult;
 import org.eclipse.jgit.lib.Repository;
-import org.joda.time.Duration;
-import play.data.validation.Constraints;
-import play.db.ebean.Model;
 import playRepository.FileDiff;
 import playRepository.GitRepository;
 import playRepository.RepositoryService;

 import java.util.List;
 
 @Entity
-public class PullRequestComment extends Model implements ResourceConvertible, TimelineItem  {
+public class PullRequestComment extends CodeComment implements ResourceConvertible, TimelineItem  {
 
     private static final long serialVersionUID = 1L;
     public static final Finder<Long, PullRequestComment> find = new Finder<>(Long.class, PullRequestComment.class);
-
-    @Id
-    public Long id;
 
     @ManyToOne
     public PullRequest pullRequest;
 
     public String commitA;
     public String commitB;
-    public String path;
-    public String side;
-    public Integer line;
 
-    @Constraints.Required @Column(length = 4000) @Size(max=4000)
-    public String contents;
-
-    @Constraints.Required
-    public Date createdDate;
-
-    public Long authorId;
-    public String authorLoginId;
-    public String authorName;
-
-    /**
-     * 어떤 리소스에 대한 댓글인지 나타내는 값.
-     *
-     * 리소스타입과 해당 리소스의 PK 값을 조합하여 되도록이면 바뀌지 않으며
-     * 댓글을 달 수 있는 리소스당 유일한 값이어야 한다.
-     *
-     * ex) pull_request_1, pull_request_2, profile_1, milestone_1
-     *
-     */
-    public String resourceKey;
-
-    public PullRequestComment() {
-        createdDate = new Date();
-    }
-
-    public Duration ago() {
-        return JodaDateUtil.ago(this.createdDate);
-    }
 
     public void authorInfos(User user) {
         this.authorId = user.id;

                 ", authorId=" + authorId +
                 ", authorLoginId='" + authorLoginId + '\'' +
                 ", authorName='" + authorName + '\'' +
-                ", resourceKey='" + resourceKey + '\'' +
                 '}';
     }
 
-    public static List<PullRequestComment> findByResourceKey(String resourceKey) {
-        return find.where()
-                .eq("resourceKey", resourceKey)
-                .orderBy().asc("createdDate")
-                .findList();
-    }
-
-    public static int countByResourceKey(String resourceKey) {
-        return find.where()
-                .eq("resourceKey", resourceKey)
-                .findRowCount();
-    }
 
     @Override
     public Resource asResource(){

             @Override
             public Long getAuthorId() {
                 return authorId;
+            }
+
+            public void delete() {
+                PullRequestComment.this.delete();
             }
         };
     }

         blame.push(null, gitRepo.resolve(pullRequest.mergedCommitIdTo));
         BlameResult blameResult = blame.computeBlameResult();
 
-        return !blameResult.getSourceCommit(line - 1).getName().equals(commitB);
+        return !blameResult.getSourceCommit(line.intValue() - 1).getName().equals(commitB);
     }
 
     @Transient

64d159d

e7e246e

app/models/enumeration/ResourceType.java

--- app/models/enumeration/ResourceType.java

+++ app/models/enumeration/ResourceType.java


     LABEL("label"),
     PROJECT_LABELS("project_labels"),
     FORK("fork"),
-    CODE_COMMENT("code_comment"),
+    COMMIT_COMMENT("code_comment"),
     PULL_REQUEST("pull_request"),
     PULL_REQUEST_COMMENT("pull_request_comment"),
     COMMIT("commit"),

64d159d

e7e246e

app/models/resource/Resource.java

--- app/models/resource/Resource.java

+++ app/models/resource/Resource.java


             case MILESTONE:
                 finder = Milestone.find;
                 break;
-            case CODE_COMMENT:
-                finder = CodeComment.find;
+            case COMMIT_COMMENT:
+                finder = CommitComment.find;
                 break;
             case PULL_REQUEST:
                 finder = PullRequest.finder;

             case MILESTONE:
                 resource = Milestone.find.byId(longId).asResource();
                 break;
-            case CODE_COMMENT:
-                resource = CodeComment.find.byId(longId).asResource();
+            case COMMIT_COMMENT:
+                resource = CommitComment.find.byId(longId).asResource();
                 break;
             case PULL_REQUEST:
                 return PullRequest.finder.byId(longId).asResource();

     abstract public ResourceType getType();
     public Resource getContainer() { return null; }
     public Long getAuthorId() { return null; }
+    public void delete() { throw new UnsupportedOperationException(); }
 }

64d159d

e7e246e

app/playRepository/Commit.java

--- app/playRepository/Commit.java

+++ app/playRepository/Commit.java


         }
 
         // Add every user who comments on this commit
-        List<CodeComment> comments = CodeComment.find.where()
+        List<CommitComment> comments = CommitComment.find.where()
                 .eq("project.id", project.id).eq("commitId", getId()).findList();
-        for (CodeComment c : comments) {
+        for (CommitComment c : comments) {
             User user = User.find.byId(c.authorId);
             if (user != null) {
                 actualWatchers.add(user);

64d159d

e7e246e

app/playRepository/Hunk.java

--- app/playRepository/Hunk.java

+++ app/playRepository/Hunk.java


 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Created with IntelliJ IDEA.
- * User: nori
- * Date: 13. 9. 11
- * Time: 오후 4:48
- * To change this template use File | Settings | File Templates.
- */
 public class Hunk extends EditList {
     public int beginA;
     public int endA;

64d159d

e7e246e

app/utils/AccessControl.java

--- app/utils/AccessControl.java

+++ app/utils/AccessControl.java


                 case ISSUE_COMMENT:
                 case NONISSUE_COMMENT:
                 case FORK:
-                case CODE_COMMENT:
+                case COMMIT_COMMENT:
                 case PULL_REQUEST_COMMENT:
                     return true;
                 default:

         case ISSUE_COMMENT:
         case NONISSUE_COMMENT:
         case BOARD_POST:
-        case CODE_COMMENT:
+        case COMMIT_COMMENT:
         case PULL_REQUEST:
         case PULL_REQUEST_COMMENT:
             return resource.getAuthorId().equals(user.id);

64d159d

e7e246e

app/views/code/diff.scala.html

--- app/views/code/diff.scala.html

+++ app/views/code/diff.scala.html


-@(project: Project, commit:playRepository.Commit, parentCommit:playRepository.Commit, patch: String, comments:List[CodeComment], selectedBranch:String, diff: List[playRepository.FileDiff])
+@(project: Project, commit:playRepository.Commit, parentCommit:playRepository.Commit, patch: String, comments:List[CommitComment], selectedBranch:String, diff: List[playRepository.FileDiff])
 
 @import playRepository.RepositoryService
 @import java.net.URLEncoder

                         
                         <div class="comment-body markdown-wrap markdown-before" markdown="true">@comment.contents</div>
                         
-                        <div class="attachments" data-resourceType="@ResourceType.CODE_COMMENT" data-resourceId="@comment.id"></div>
+                        <div class="attachments" data-resourceType="@ResourceType.COMMIT_COMMENT" data-resourceId="@comment.id"></div>
                     </div>
                 </li>
                 }
             </ul>
             }
             
-            @common.commentForm(project, ResourceType.CODE_COMMENT, routes.CodeHistoryApp.newComment(project.owner, project.name, commit.getId).toString())
+            @common.commentForm(project, ResourceType.COMMIT_COMMENT, routes.CodeHistoryApp.newComment(project.owner, project.name, commit.getId).toString())
         </div>
         @** // Comment **@        
     </div>

     $(document).ready(function(){
         $yobi.loadModule("code.Diff", {
             "welDiff": $("#commit"),
-            "bCommentable"   : @if(isProjectResourceCreatable(UserApp.currentUser, project, ResourceType.CODE_COMMENT)){true}else{false},
+            "bCommentable"   : @if(isProjectResourceCreatable(UserApp.currentUser, project, ResourceType.COMMIT_COMMENT)){true}else{false},
             "sWatchUrl"     : "@routes.WatchApp.watch(commit.asResource(project).asParameter)",
             "sUnwatchUrl"   : "@routes.WatchApp.unwatch(commit.asResource(project).asParameter)",
             "sParentCommitId": "@if(parentCommit != null){@parentCommit.getId}",

64d159d

e7e246e

app/views/code/history.scala.html

--- app/views/code/history.scala.html

+++ app/views/code/history.scala.html


                                 </a>
                             </td>
                             <td class="messages">
-                                @defining(CodeComment.count(project, commit.getId, if(path != null){"/"+path}else{null})){ numOfComment =>
+                                @defining(CommitComment.count(project, commit.getId, if(path != null){"/"+path}else{null})){ numOfComment =>
                                 @if(numOfComment > 0) {
                                 <span class="number-of-comments"><i class="yobicon-comments"></i> @numOfComment</span>
                                 }

64d159d

e7e246e

app/views/code/view.scala.html

--- app/views/code/view.scala.html

+++ app/views/code/view.scala.html


             <span id="revisionNo" class="revision">
                 <a href="@routes.CodeHistoryApp.show(project.owner, project.name, revId)@if(branch){?branch=@URLEncoder.encode(branch, "UTF-8")}#@path">
                     @if(project.vcs.equals("GIT")){ @revId.substring(0,7) } else { Revision @revId }
-                    @defining(CodeComment.count(project, fieldText(files, "commitId"), "/"+path)){ numOfComment =>
+                    @defining(CommitComment.count(project, fieldText(files, "commitId"), "/"+path)){ numOfComment =>
                     @if(numOfComment > 0) {
                         <span class="number-of-comments ml5"><i class="yobicon-comments"></i> @numOfComment</span>
                     }

64d159d

e7e246e

app/views/git/diff.scala.html

--- app/views/git/diff.scala.html

+++ app/views/git/diff.scala.html


-@(pull: PullRequest, commit:playRepository.Commit, parentCommit:playRepository.Commit, patch: String, comments:List[CodeComment])
+@(pull: PullRequest, commit:playRepository.Commit, parentCommit:playRepository.Commit, patch: String, comments:List[CommitComment])
 
 @import playRepository.RepositoryService
 @import java.net.URLEncoder

                     
                     <div class="comment-body markdown-wrap markdown-before" markdown="true">@comment.contents</div>
                     
-                    <div class="attachments" data-resourceType="@ResourceType.CODE_COMMENT" data-resourceId="@comment.id"></div>
+                    <div class="attachments" data-resourceType="@ResourceType.COMMIT_COMMENT" data-resourceId="@comment.id"></div>
                 </div>
             </li>
             }
         </ul>
         }
         
-        @common.commentForm(pull.fromProject, ResourceType.CODE_COMMENT, routes.CodeHistoryApp.newComment(pull.fromProject.owner, pull.fromProject.name, commit.getId).toString())
+        @common.commentForm(pull.fromProject, ResourceType.COMMIT_COMMENT, routes.CodeHistoryApp.newComment(pull.fromProject.owner, pull.fromProject.name, commit.getId).toString())
     </div>
     @** // Comment **@
     

 <script type="text/javascript">
     $(document).ready(function(){
         $yobi.loadModule("code.Diff", {
-            "bCommentable"   : @if(isProjectResourceCreatable(UserApp.currentUser, pull.fromProject, ResourceType.CODE_COMMENT)){true}else{false},
+            "bCommentable"   : @if(isProjectResourceCreatable(UserApp.currentUser, pull.fromProject, ResourceType.COMMIT_COMMENT)){true}else{false},
             "sWatchUrl"      : "@routes.WatchApp.watch(commit.asResource(pull.fromProject).asParameter)",
             "sUnwatchUrl"    : "@routes.WatchApp.unwatch(commit.asResource(pull.fromProject).asParameter)",
             "sParentCommitId": "@if(parentCommit != null){@parentCommit.getId}",

64d159d

e7e246e

app/views/git/partial_diff.scala.html

--- app/views/git/partial_diff.scala.html

+++ app/views/git/partial_diff.scala.html


 				            </td>
 				
 				            <td class="messages">
-				                @defining(CodeComment.count(pullRequest.fromProject, commit.getId, null)){ numOfComment =>
+				                @defining(CommitComment.count(pullRequest.fromProject, commit.getId, null)){ numOfComment =>
 				                    @if(numOfComment > 0) {
 				                    <span class="number-of-comments"><i class="yobicon-comments"></i> @numOfComment</span>
 				                    }

64d159d

e7e246e

app/views/git/partial_list.scala.html

--- app/views/git/partial_list.scala.html

+++ app/views/git/partial_list.scala.html


                     <div class="infos nm">
                         <a href="@routes.UserApp.userInfo(req.contributor.loginId)" class="author">@req.contributor.name</a>
                         <span class="date ml10">@agoString(req.createdAgo())</span>
-                        @defining(PullRequestComment.countByResourceKey(req.getResourceKey()) + CodeComment.countByCommits(req.fromProject, req.pullRequestCommits)) { count =>
+                        @defining(req.comments.size + CommitComment.countByCommits(req.fromProject, req.pullRequestCommits)) { count =>
                             @if(count > 0) {
                             <a href="@routes.PullRequestApp.pullRequest(req.toProject.owner, req.toProject.name, req.number)#comments" class="comment-wrap">
                                 <i class="icon yobicon-comments"></i>

64d159d

e7e246e

app/views/git/view.scala.html

--- app/views/git/view.scala.html

+++ app/views/git/view.scala.html


 					}
 					</ul>
 					}
-					@common.commentForm(project, ResourceType.SIMPLE_COMMENT, routes.PullRequestCommentApp.newComment(project.owner, project.name, pull.id).toString())
+					@common.commentForm(project, ResourceType.PULL_REQUEST_COMMENT, routes.PullRequestCommentApp.newComment(project.owner, project.name, pull.id).toString())
 				</div>
             </div>
 

 
                             <td class="messages">
 
-                                @defining(CodeComment.count(pull.fromProject, commit.getCommitId, null)){ numOfComment =>
+                                @defining(CommitComment.count(pull.fromProject, commit.getCommitId, null)){ numOfComment =>
                                     @if(numOfComment > 0) {
                                     <span class="number-of-comments"><i class="yobicon-comments"></i> @numOfComment</span>
                                     }

64d159d

e7e246e

app/views/partial_diff.scala.html

--- app/views/partial_diff.scala.html

+++ app/views/partial_diff.scala.html


-@(fileDiffs: List[playRepository.FileDiff], comments:List[CommonComment])
+@(fileDiffs: java.util.List[playRepository.FileDiff], comments:java.util.List[_ <: CodeComment])
 
 @import playRepository.DiffLineType
 @import org.eclipse.jgit.diff.DiffEntry
+@import scala.collection.JavaConversions._
 
-@render(fileDiffs: List[playRepository.FileDiff], comments:List[CodeComment]) = {
-    render2(fileDiffs, comments map { [comment.path, comment.line, comment.side] => comment })
+@render(fileDiffs, comments.toList.groupBy((comment: CodeComment) => commentKey(comment.path, comment.side, comment.line)))
+
+@writeLine(klass: String, prefix: String, numA: Integer, numB: Integer, content: String, commentsOnLine: scala.collection.immutable.List[_ <: CodeComment]) = {
+    <tr class="@klass" data-line="@Option(numA).getOrElse(numB)" data-type="@klass"><td class="linenum"><i class="icon-comment"></i>@Option(numA).getOrElse("")</td><td class="linenum">@Option(numB).getOrElse("")</td><td><span>@prefix</span>@content</td></tr>
+    @if(commentsOnLine != null) { @writeCommentsOnLine(commentsOnLine) }
 }
 
-@writeLine(klass: String, prefix: String, numA: Integer, numB: Integer, content: String) = {
-    @writeCodeLine(klass, prefix, numA, numB, content)
-    @writeComment(comment)
-}
+@writeCommentsOnLine(comments: scala.collection.immutable.List[CodeComment]) = {
+    <tr class="comments board-comment-wrap">
+        <td colspan=3>
+            <ul class="comments">
+                @for(comment: CodeComment <- comments) {
+                <li id="comment-@comment.id" data-path="@comment.path" data-side="@comment.side" data-line="@comment.line" class="comment">
+                    <div class="comment-avatar">
+                        <a href="@routes.UserApp.userInfo(comment.authorLoginId)" class="avatar-wrap" data-toggle="tooltip" data-placement="top" title="@comment.authorName">
+                            <img src="@User.findByLoginId(comment.authorLoginId).avatarUrl" width="32" height="32" alt="@comment.authorLoginId">
+                        </a>
+                    </div>
+                    <div class="media-body">
+                        <div class="meta-info">
+                            <span class="comment_author pull-left">
+                                <i class="yobicon-comment"></i>
+                                <a href="@routes.UserApp.userInfo(comment.authorLoginId)" data-toggle="tooltip" data-placement="top" title="@comment.authorName">
+                                    <strong>@comment.authorLoginId </strong>
+                                </a>
+                            </span>
+                            <span class="ago"><a href="#comment-@comment.id">@utils.TemplateHelper.agoString(utils.JodaDateUtil.ago(comment.createdDate))</a></span>
+                            @if(utils.AccessControl.isAllowed(UserApp.currentUser(), comment.asResource(), Operation.DELETE)){
+                            <span class="edit pull-right">
+                                <!-- FIXME: Delete comment? pull request하고 commit comment 구분해야 함 -->
+                                <button class="btn-transparent pull-right close" data-request-method="delete" data-request-uri="@routes.CommentApp.delete(comment.asResource.getType.resource, comment.asResource.getId)"><i class="yobicon-trash"></i></button>
+                            </span>
+                            }
+                        </div>
 
-@writeLine(klass: String, prefix: String, numA: Integer, numB: Integer, content: String, comment: CodeComment) = {
-    @writeCodeLine(klass, prefix, numA, numB, content)
-}
+                        <div class="comment-body markdown-wrap markdown-before" markdown="true">@comment.contents</div>
 
-@writeCodeLine(klass: String, prefix: String, numA: Integer, numB: Integer, content: String, comment: CodeComment) = { <tr class="@klass" data-line="@Option(numA).getOrElse(numB)" data-type="@klass"><td class="linenum"><i class="icon-comment"></i>@Option(numA).getOrElse("")</td><td class="linenum">@Option(numB).getOrElse("")</td><td><span>@prefix</span>@content</td></tr>
-}
-
-@writeComment(comment: CodeComment) = {
-    <li id="comment-@comment.id" data-path="@comment.path" data-side="@comment.side" data-line="@comment.line" class="comment">
-        <div class="comment-avatar">
-            <a href="@routes.UserApp.userInfo(comment.authorLoginId)" class="avatar-wrap" data-toggle="tooltip" data-placement="top" title="@comment.authorName">
-                <img src="@User.findByLoginId(comment.authorLoginId).avatarUrl" width="32" height="32" alt="@comment.authorLoginId">
-            </a>
-        </div>
-        <div class="media-body">
-            <div class="meta-info">
-                <span class="comment_author pull-left">
-                    <i class="yobicon-comment"></i>
-                    <a href="@routes.UserApp.userInfo(comment.authorLoginId)" data-toggle="tooltip" data-placement="top" title="@comment.authorName">
-                        <strong>@comment.authorLoginId </strong>
-                    </a>
-                </span>
-                <span class="ago"><a href="#comment-@comment.id">@utils.TemplateHelper.agoString(ago(comment.createdDate))</a></span>
-                @if(isAllowed(UserApp.currentUser(), comment.asResource(), Operation.DELETE)){
-                <span class="edit pull-right">
-                    <button class="btn-transparent pull-right close" data-request-method="delete" data-request-uri="@routes.CodeHistoryApp.deleteComment(project.owner, project.name, commit.getId, comment.id)"><i class="yobicon-trash"></i></button>
-                </span>
+                        <div class="attachments" resourceType="@comment.asResource.getType" resourceId="@comment.id"></div>
+                    </div>
+                </li>
                 }
-            </div>
-
-            <div class="comment-body markdown-wrap markdown-before" markdown="true">@comment.contents</div>
-
-            <div class="attachments" resourceType="@ResourceType.CODE_COMMENT" resourceId="@comment.id"></div>
-        </div>
-    </li>
+                <button class="nbtn medium btn-thread">댓글창 열기</button>
+                <button class="nbtn medium btn-thread" style="display: none;">댓글창 닫기</button>
+            </ul>
+        </td>
+    </tr>
 }
 
-@renderHunks(hunks: List[Hunk], comments: List[CodeComment]) = {
+@commentKey(path: String, side: String, lineNum: Integer) = @{ path + ":" + side + ":" + lineNum }
+
+@commentsOrNull(comments: Map[String, scala.collection.immutable.List[_ <: CodeComment]], key: String) = @{
+    if(comments.contains(key)) {
+        comments(key)
+    } else {
+        null
+    }
+}
+
+@renderFileDiff(diff: playRepository.FileDiff, comments:scala.collection.immutable.Map[String, scala.collection.immutable.List[_ <: CodeComment]]) = {
     @for(hunk <- diff.getHunks) {
         <tr class="range"><td>...</td><td>...</td><td>-@(hunk.beginA + 1),@(hunk.endA - hunk.beginA) +@(hunk.beginB + 1),@(hunk.endB - hunk.beginB)</td></tr>
         @for(line <- hunk.lines){
             @line.kind match {
-            case DiffLineType.ADD => { @writeLine(line.kind.toString.toLowerCase, "+", null, line.numB + 1, line.content, comments(List(diff.pathB, "add", line.numB + 1)) }
-            case DiffLineType.REMOVE => { @writeLine(line.kind.toString.toLowerCase, "-", line.numA + 1, null, line.content, comments(List(diff.pathA, "remove", line.numA + 1))) }
-            case _ => { @writeLine(line.kind.toString.toLowerCase, " ", line.numA + 1, line.numB + 1, line.content, comments(List(diff.pathA, "base", line.numA + 1))) }
+            case DiffLineType.ADD => { @writeLine(line.kind.toString.toLowerCase, "+", null, line.numB + 1, line.content, commentsOrNull(comments, commentKey(diff.pathB, "add", line.numB + 1))) }
+            case DiffLineType.REMOVE => { @writeLine(line.kind.toString.toLowerCase, "-", line.numA + 1, null, line.content, commentsOrNull(comments, commentKey(diff.pathA, "remove", line.numA + 1))) }
+            case _ => { @writeLine(line.kind.toString.toLowerCase, " ", line.numA + 1, line.numB + 1, line.content, commentsOrNull(comments, commentKey(diff.pathA, "base", line.numA + 1))) }
             }
         }
     }
 }
 
-@render2(fileDiffs: List[playRepository.FileDiff], comments:Map[List, CodeComment]) = {
+@render(fileDiffs: java.util.List[playRepository.FileDiff], comments:scala.collection.immutable.Map[String, scala.collection.immutable.List[_ <: CodeComment]]) = {
 @for(diff <- fileDiffs) {
     @diff.changeType match {
     case DiffEntry.ChangeType.MODIFY => {
-        <table class="diff-body" data-path="@diff.pathB"><tbody>
+        <table class="diff-body show-comments" data-path="@diff.pathB"><tbody>
         <tr class="file">
             <td colspan=3>@diff.pathB</td>
         </tr>
-        @renderHunks(diff.getHunks, comments)
+        @renderFileDiff(diff, comments)
         </tbody></table>
     }
+
     case DiffEntry.ChangeType.ADD => {
-        <table class="diff-body" data-path="@diff.pathB"><tbody>
+        <table class="diff-body show-comments" data-path="@diff.pathB"><tbody>
         <tr class="file">
             <td colspan=3>@diff.pathB (Added)</td>
         </tr>
         @for(i <- 0 until diff.b.size) {
-            @writeLine("add", "+", null, i + 1, diff.b.getString(i))
+            @writeLine("add", "+", null, i + 1, diff.b.getString(i), commentsOrNull(comments, diff.pathB + ":add:" + (i + 1)))
         }
         </tbody></table>
     }
     case DiffEntry.ChangeType.DELETE => {
-        <table class="diff-body" data-path="@diff.pathA"><tbody>
+        <table class="diff-body show-comments" data-path="@diff.pathA"><tbody>
         <tr class="file">
             <td colspan=3>@diff.pathA (Deleted)</td>
         </tr>
         @for(i <- 0 until diff.a.size) {
-            @writeLine("remove", "-", null, i + 1, diff.a.getString(i))
+            @writeLine("remove", "-", null, i + 1, diff.a.getString(i), commentsOrNull(comments, diff.pathA + ":add:" + (i + 1)))
         }
         </tbody></table>
     }
     case DiffEntry.ChangeType.RENAME => {
-        <table class="diff-body" data-path="@diff.pathB"><tbody>
+        <table class="diff-body show-comments" data-path="@diff.pathB"><tbody>
         <tr class="file">
             <td colspan=3>@diff.pathB -> @diff.pathB</td>
         </tr>
-        @renderHunks(diff.getHunks, comments)
+        @renderFileDiff(diff, comments)
         </tbody></table>
     }
     case DiffEntry.ChangeType.COPY => {
-        <table class="diff-body" data-path="@diff.pathB"><tbody>
+        <table class="diff-body show-comments" data-path="@diff.pathB"><tbody>
         <tr class="file">
             <td colspan=3>Copy @diff.pathA to @diff.pathB</td>
         </tr>

64d159d

e7e246e

conf/evolutions/default/41.sql

--- conf/evolutions/default/41.sql

+++ conf/evolutions/default/41.sql


 # --- !Ups
 
 ALTER TABLE simple_comment RENAME TO pull_request_comment;
+DROP SEQUENCE IF EXISTS pull_request_comment_seq;
 CREATE SEQUENCE pull_request_comment_seq START WITH simple_comment_seq.nextval;
 DROP SEQUENCE IF EXISTS simple_comment_seq;
+ALTER TABLE pull_request_comment ADD COLUMN project_id bigint;
+ALTER TABLE pull_request_comment ADD COLUMN commit_a varchar(40);
+ALTER TABLE pull_request_comment ADD COLUMN commit_b varchar(40);
+ALTER TABLE pull_request_comment ADD COLUMN path varchar(255);
+ALTER TABLE pull_request_comment ADD COLUMN line integer;
+ALTER TABLE pull_request_comment ADD COLUMN side varchar(16);
+ALTER TABLE pull_request_comment ADD COLUMN pull_request_id bigint;
+
+ALTER TABLE code_comment RENAME TO commit_comment;
+DROP SEQUENCE IF EXISTS commit_comment_seq;
+CREATE SEQUENCE commit_comment_seq START WITH code_comment_seq.nextval;
+DROP SEQUENCE IF EXISTS code_commit_seq;
 
 ALTER TABLE notification_event DROP CONSTRAINT IF EXISTS ck_notification_event_resource_type;
 ALTER TABLE notification_event ALTER COLUMN resource_type TYPE varchar(255);
+UPDATE notification_event SET resource_type='COMMIT_COMMENT' WHERE resource_type='CODE_COMMENT';
+UPDATE notification_event SET event_type='NEW_COMMIT_COMMENT' WHERE event_type='NEW_CODE_COMMENT';
 UPDATE notification_event SET resource_type='PULL_REQUEST_COMMENT' WHERE resource_type='SIMPLE_COMMENT';
 UPDATE notification_event SET event_type='NEW_PULL_REQUEST_COMMENT' WHERE event_type='NEW_SIMPLE_COMMENT';
-ALTER TABLE notification_event ADD constraint ck_notification_event_resource_type check (resource_type in ('ISSUE_POST','ISSUE_ASSIGNEE','ISSUE_STATE','ISSUE_CATEGORY','ISSUE_MILESTONE','ISSUE_LABEL','BOARD_POST','BOARD_CATEGORY','BOARD_NOTICE','CODE','MILESTONE','WIKI_PAGE','PROJECT_SETTING','SITE_SETTING','USER','USER_AVATAR','PROJECT','ATTACHMENT','ISSUE_COMMENT','NONISSUE_COMMENT','LABEL','PROJECT_LABELS','FORK','CODE_COMMENT','PULL_REQUEST','PULL_REQUEST_COMMENT'));
+ALTER TABLE notification_event ADD constraint ck_notification_event_resource_type check (resource_type in ('ISSUE_POST','ISSUE_ASSIGNEE','ISSUE_STATE','ISSUE_CATEGORY','ISSUE_MILESTONE','ISSUE_LABEL','BOARD_POST','BOARD_CATEGORY','BOARD_NOTICE','CODE','MILESTONE','WIKI_PAGE','PROJECT_SETTING','SITE_SETTING','USER','USER_AVATAR','PROJECT','ATTACHMENT','ISSUE_COMMENT','NONISSUE_COMMENT','LABEL','PROJECT_LABELS','FORK','COMMIT_COMMENT','PULL_REQUEST','PULL_REQUEST_COMMENT'));
 
 ALTER TABLE watch DROP CONSTRAINT IF EXISTS ck_watch_resource_type;
 ALTER TABLE watch ALTER COLUMN resource_type TYPE varchar(255);
+UPDATE watch SET resource_type='COMMIT_COMMENT' WHERE resource_type='CODE_COMMENT';
 UPDATE watch SET resource_type='PULL_REQUEST_COMMENT' WHERE resource_type='SIMPLE_COMMENT';
-ALTER TABLE watch ADD CONSTRAINT ck_watch_resource_type check (resource_type in ('ISSUE_POST','ISSUE_ASSIGNEE','ISSUE_STATE','ISSUE_CATEGORY','ISSUE_MILESTONE','ISSUE_LABEL','BOARD_POST','BOARD_CATEGORY','BOARD_NOTICE','CODE','MILESTONE','WIKI_PAGE','PROJECT_SETTING','SITE_SETTING','USER','USER_AVATAR','PROJECT','ATTACHMENT','ISSUE_COMMENT','NONISSUE_COMMENT','LABEL','PROJECT_LABELS','FORK','CODE_COMMENT','PULL_REQUEST','PULL_REQUEST_COMMENT', 'COMMIT'));
+ALTER TABLE watch ADD CONSTRAINT ck_watch_resource_type check (resource_type in ('ISSUE_POST','ISSUE_ASSIGNEE','ISSUE_STATE','ISSUE_CATEGORY','ISSUE_MILESTONE','ISSUE_LABEL','BOARD_POST','BOARD_CATEGORY','BOARD_NOTICE','CODE','MILESTONE','WIKI_PAGE','PROJECT_SETTING','SITE_SETTING','USER','USER_AVATAR','PROJECT','ATTACHMENT','ISSUE_COMMENT','NONISSUE_COMMENT','LABEL','PROJECT_LABELS','FORK','COMMIT_COMMENT','PULL_REQUEST','PULL_REQUEST_COMMENT', 'COMMIT'));
 
 ALTER TABLE unwatch DROP CONSTRAINT IF EXISTS ck_unwatch_resource_type;
 ALTER TABLE unwatch ALTER COLUMN resource_type TYPE varchar(255);
+UPDATE unwatch SET resource_type='COMMIT_COMMENT' WHERE resource_type='CODE_COMMENT';
 UPDATE unwatch SET resource_type='PULL_REQUEST_COMMENT' WHERE resource_type='SIMPLE_COMMENT';
-ALTER TABLE unwatch ADD CONSTRAINT ck_unwatch_resource_type check (resource_type in ('ISSUE_POST','ISSUE_ASSIGNEE','ISSUE_STATE','ISSUE_CATEGORY','ISSUE_MILESTONE','ISSUE_LABEL','BOARD_POST','BOARD_CATEGORY','BOARD_NOTICE','CODE','MILESTONE','WIKI_PAGE','PROJECT_SETTING','SITE_SETTING','USER','USER_AVATAR','PROJECT','ATTACHMENT','ISSUE_COMMENT','NONISSUE_COMMENT','LABEL','PROJECT_LABELS','FORK','CODE_COMMENT','PULL_REQUEST','PULL_REQUEST_COMMENT', 'COMMIT'));
+ALTER TABLE unwatch ADD CONSTRAINT ck_unwatch_resource_type check (resource_type in ('ISSUE_POST','ISSUE_ASSIGNEE','ISSUE_STATE','ISSUE_CATEGORY','ISSUE_MILESTONE','ISSUE_LABEL','BOARD_POST','BOARD_CATEGORY','BOARD_NOTICE','CODE','MILESTONE','WIKI_PAGE','PROJECT_SETTING','SITE_SETTING','USER','USER_AVATAR','PROJECT','ATTACHMENT','ISSUE_COMMENT','NONISSUE_COMMENT','LABEL','PROJECT_LABELS','FORK','COMMIT_COMMENT','PULL_REQUEST','PULL_REQUEST_COMMENT', 'COMMIT'));
 
 ALTER TABLE issue_event DROP CONSTRAINT IF EXISTS ck_issue_event_event_type;
-ALTER TABLE issue_event ALTER COLUMN resource_type TYPE varchar(255);
+ALTER TABLE issue_event ALTER COLUMN event_type TYPE varchar(255);
+UPDATE issue_event SET event_type='NEW_COMMIT_COMMENT' WHERE event_type='NEW_CODE_COMMENT';
 UPDATE issue_event SET event_type='NEW_PULL_REQUEST_COMMENT' WHERE event_type='NEW_SIMPLE_COMMENT';
 ALTER TABLE issue_event ADD CONSTRAINT ck_issue_event_event_type check (event_type in ('NEW_ISSUE','NEW_POSTING','ISSUE_ASSIGNEE_CHANGED','ISSUE_STATE_CHANGED','NEW_COMMENT','NEW_PULL_REQUEST','NEW_PULL_REQUEST_COMMENT','PULL_REQUEST_STATE_CHANGED'));
 
+ALTER TABLE attachment DROP CONSTRAINT IF EXISTS ck_attachment_container_type;
+UPDATE attachment SET container_type='COMMIT_COMMENT' WHERE container_type='CODE_COMMENT';
+UPDATE attachment SET container_type='PULL_REQUEST_COMMENT' WHERE container_type='SIMPLE_COMMENT';
+ALTER TABLE attachment ADD CONSTRAINT ck_attachment_container_type check (container_type in ('ISSUE_POST','ISSUE_ASSIGNEE','ISSUE_STATE','ISSUE_CATEGORY','ISSUE_MILESTONE','ISSUE_LABEL','BOARD_POST','BOARD_CATEGORY','BOARD_NOTICE','CODE','MILESTONE','WIKI_PAGE','PROJECT_SETTING','SITE_SETTING','USER','USER_AVATAR','PROJECT','ATTACHMENT','ISSUE_COMMENT','NONISSUE_COMMENT','COMMIT_COMMENT', 'PULL_REQUEST_COMMENT', 'PULL_REQUEST'));
+
 # --- !Downs
 
+ALTER TABLE pull_request_comment DROP COLUMN IF EXISTS project_id;
+ALTER TABLE pull_request_comment DROP COLUMN IF EXISTS commit_a;
+ALTER TABLE pull_request_comment DROP COLUMN IF EXISTS commit_b;
+ALTER TABLE pull_request_comment DROP COLUMN IF EXISTS path;
+ALTER TABLE pull_request_comment DROP COLUMN IF EXISTS line;
+ALTER TABLE pull_request_comment DROP COLUMN IF EXISTS side;
+ALTER TABLE pull_request_comment DROP COLUMN IF EXISTS pull_request_id;
 ALTER TABLE pull_request_comment RENAME TO simple_comment;
+DROP SEQUENCE IF EXISTS simple_comment_seq;
 CREATE SEQUENCE simple_comment_seq START WITH pull_request_comment_seq.nextval;
 DROP SEQUENCE IF EXISTS pull_request_comment_seq;
 
+ALTER TABLE commit_comment RENAME TO code_comment;
+DROP SEQUENCE IF EXISTS code_comment_seq;
+CREATE SEQUENCE code_comment_seq START WITH commit_comment_seq.nextval;
+DROP SEQUENCE IF EXISTS commit_comment_seq;
+
 ALTER TABLE notification_event DROP CONSTRAINT IF EXISTS ck_notification_event_resource_type;
+UPDATE notification_event SET resource_type='CODE_COMMENT' WHERE resource_type='COMMIT_COMMENT';
+UPDATE notification_event SET event_type='NEW_CODE_COMMENT' WHERE event_type='NEW_COMMIT_COMMENT';
 UPDATE notification_event SET resource_type='SIMPLE_COMMENT' WHERE resource_type='PULL_REQUEST_COMMENT';
 UPDATE notification_event SET event_type='NEW_SIMPLE_COMMENT' WHERE event_type='NEW_PULL_REQUEST_COMMENT';
 ALTER TABLE notification_event ADD constraint ck_notification_event_resource_type check (resource_type in ('ISSUE_POST','ISSUE_ASSIGNEE','ISSUE_STATE','ISSUE_CATEGORY','ISSUE_MILESTONE','ISSUE_LABEL','BOARD_POST','BOARD_CATEGORY','BOARD_NOTICE','CODE','MILESTONE','WIKI_PAGE','PROJECT_SETTING','SITE_SETTING','USER','USER_AVATAR','PROJECT','ATTACHMENT','ISSUE_COMMENT','NONISSUE_COMMENT','LABEL','PROJECT_LABELS','FORK','CODE_COMMENT','PULL_REQUEST','SIMPLE_COMMENT'));
 ALTER TABLE notification_event ALTER COLUMN resource_type TYPE varchar(16);
 
 ALTER TABLE watch DROP CONSTRAINT IF EXISTS ck_watch_resource_type;
+UPDATE watch SET resource_type='CODE_COMMENT' WHERE resource_type='COMMIT_COMMENT';
 UPDATE watch SET resource_type='SIMPLE_COMMENT' WHERE resource_type='PULL_REQUEST_COMMENT';
 ALTER TABLE watch ADD CONSTRAINT ck_watch_resource_type check (resource_type in ('ISSUE_POST','ISSUE_ASSIGNEE','ISSUE_STATE','ISSUE_CATEGORY','ISSUE_MILESTONE','ISSUE_LABEL','BOARD_POST','BOARD_CATEGORY','BOARD_NOTICE','CODE','MILESTONE','WIKI_PAGE','PROJECT_SETTING','SITE_SETTING','USER','USER_AVATAR','PROJECT','ATTACHMENT','ISSUE_COMMENT','NONISSUE_COMMENT','LABEL','PROJECT_LABELS','FORK','CODE_COMMENT','PULL_REQUEST','SIMPLE_COMMENT', 'COMMIT'));
 ALTER TABLE watch ALTER COLUMN resource_type TYPE varchar(16);
 
 ALTER TABLE unwatch DROP CONSTRAINT IF EXISTS ck_unwatch_resource_type;
+UPDATE unwatch SET resource_type='CODE_COMMENT' WHERE resource_type='COMMIT_COMMENT';
 UPDATE unwatch SET resource_type='SIMPLE_COMMENT' WHERE resource_type='PULL_REQUEST_COMMENT';
 ALTER TABLE unwatch ADD CONSTRAINT ck_unwatch_resource_type check (resource_type in ('ISSUE_POST','ISSUE_ASSIGNEE','ISSUE_STATE','ISSUE_CATEGORY','ISSUE_MILESTONE','ISSUE_LABEL','BOARD_POST','BOARD_CATEGORY','BOARD_NOTICE','CODE','MILESTONE','WIKI_PAGE','PROJECT_SETTING','SITE_SETTING','USER','USER_AVATAR','PROJECT','ATTACHMENT','ISSUE_COMMENT','NONISSUE_COMMENT','LABEL','PROJECT_LABELS','FORK','CODE_COMMENT','PULL_REQUEST','SIMPLE_COMMENT', 'COMMIT'));
 ALTER TABLE unwatch ALTER COLUMN resource_type TYPE varchar(16);
 
 ALTER TABLE issue_event DROP CONSTRAINT IF EXISTS ck_issue_event_event_type;
+UPDATE issue_event SET event_type='NEW_CODE_COMMENT' WHERE event_type='NEW_COMMIT_COMMENT';
 UPDATE issue_event SET event_type='NEW_SIMPLE_COMMENT' WHERE event_type='NEW_PULL_REQUEST_COMMENT';
-ALTER TABLE issue_event ADD CONSTRAINT ck_issue_event_event_type check (event_type in ('NEW_ISSUE','NEW_POSTING','ISSUE_ASSIGNEE_CHANGED','ISSUE_STATE_CHANGED','NEW_COMMENT','NEW_PULL_REQUEST','NEW_SIMPLE_COMMENT','PULL_REQUEST_STATE_CHANGED')),
-ALTER TABLE issue_event ALTER COLUMN resource_type TYPE varchar(16);
+ALTER TABLE issue_event ADD CONSTRAINT ck_issue_event_event_type check (event_type in ('NEW_ISSUE','NEW_POSTING','ISSUE_ASSIGNEE_CHANGED','ISSUE_STATE_CHANGED','NEW_COMMENT','NEW_PULL_REQUEST','NEW_SIMPLE_COMMENT','PULL_REQUEST_STATE_CHANGED'));
+ALTER TABLE issue_event ALTER COLUMN event_type TYPE varchar(16);
+
+ALTER TABLE attachment DROP CONSTRAINT IF EXISTS ck_attachment_container_type;
+UPDATE attachment SET container_type='CODE_COMMENT' WHERE container_type='COMMIT_COMMENT';
+UPDATE attachment SET container_type='SIMPLE_COMMENT' WHERE container_type='PULL_REQUEST_COMMENT';
+ALTER TABLE attachment ADD CONSTRAINT ck_attachment_container_type check (container_type in ('ISSUE_POST','ISSUE_ASSIGNEE','ISSUE_STATE','ISSUE_CATEGORY','ISSUE_MILESTONE','ISSUE_LABEL','BOARD_POST','BOARD_CATEGORY','BOARD_NOTICE','CODE','MILESTONE','WIKI_PAGE','PROJECT_SETTING','SITE_SETTING','USER','USER_AVATAR','PROJECT','ATTACHMENT','ISSUE_COMMENT','NONISSUE_COMMENT','CODE_COMMENT', 'PULL_REQUEST'));

64d159d

e7e246e

conf/routes

--- conf/routes

+++ conf/routes

...	...	@@ -219,3 +219,5 @@
219	219	# remove trailing slash
220	220	GET /*paths controllers.Application.removeTrailer(paths)
221	221
	222	+# Comment
	223	+DELETE /comments/:type/:id controllers.CommentApp.delete(type, id)

...	...	@@ -163,7 +163,7 @@
163	163	return notFound(ErrorViews.NotFound.render("error.notfound", project, null));
164	164	}
165	165
166		- List<CodeComment> comments = CodeComment.find.where().eq("commitId",
	166	+ List<CommitComment> comments = CommitComment.find.where().eq("commitId",
167	167	commitId).eq("project.id", project.id).findList();
168	168
169	169	String selectedBranch = request().getQueryString("branch");
...	...	@@ -173,7 +173,7 @@
173	173
174	174	public static Result newComment(String ownerName, String projectName, String commitId)
175	175	throws IOException, ServletException, SVNException {
176		- Form<CodeComment> codeCommentForm = new Form<>(CodeComment.class)
	176	+ Form<CommitComment> codeCommentForm = new Form<>(CommitComment.class)
177	177	.bindFromRequest();
178	178
179	179	Project project = Project.findByOwnerAndProjectName(ownerName, projectName);
...	...	@@ -191,11 +191,11 @@
191	191	}
192	192
193	193	if (!AccessControl.isProjectResourceCreatable(UserApp.currentUser(), project,
194		- ResourceType.CODE_COMMENT)) {
	194	+ ResourceType.COMMIT_COMMENT)) {
195	195	return forbidden(forbidden.render("error.forbidden", project));
196	196	}
197	197
198		- CodeComment codeComment = codeCommentForm.get();
	198	+ CommitComment codeComment = codeCommentForm.get();
199	199	codeComment.project = project;
200	200	codeComment.commitId = commitId;
201	201	codeComment.createdDate = new Date();
...	...	@@ -221,7 +221,7 @@
221	221	return toView;
222	222	}
223	223
224		- private static void addNotificationEventForNewComment(Project project, CodeComment codeComment, Call toView) throws IOException, SVNException, ServletException {
	224	+ private static void addNotificationEventForNewComment(Project project, CommitComment codeComment, Call toView) throws IOException, SVNException, ServletException {
225	225	Commit commit = RepositoryService.getRepository(project).getCommit(codeComment.commitId);
226	226	Set<User> watchers = commit.getWatchers(project);
227	227	watchers.addAll(NotificationEvent.getMentionedUsers(codeComment.contents));
...	...	@@ -244,7 +244,7 @@
244	244
245	245	public static Result deleteComment(String ownerName, String projectName, String commitId,
246	246	Long id) {
247		- CodeComment codeComment = CodeComment.find.byId(id);
	247	+ CommitComment codeComment = CommitComment.find.byId(id);
248	248
249	249	if (codeComment == null) {
250	250	return notFound(notfound_default.render(request().path()));

...	...	@@ -531,10 +531,10 @@
531	531	}
532	532
533	533	private static void addCodeCommenters(String commitId, Long projectId, List<User> userList) {
534		- List<CodeComment> comments = CodeComment.find.where().eq("commitId",
	534	+ List<CommitComment> comments = CommitComment.find.where().eq("commitId",
535	535	commitId).eq("project.id", projectId).findList();
536	536
537		- for (CodeComment codeComment : comments) {
	537	+ for (CommitComment codeComment : comments) {
538	538	User commentAuthor = User.findByLoginId(codeComment.authorLoginId);
539	539	if( userList.contains(commentAuthor) ) {
540	540	userList.remove(commentAuthor);

...	...	@@ -738,7 +738,7 @@
738	738	return notFound(ErrorViews.NotFound.render("error.notfound", project, null));
739	739	}
740	740
741		- List<CodeComment> comments = CodeComment.find.where().eq("commitId",
	741	+ List<CommitComment> comments = CommitComment.find.where().eq("commitId",
742	742	commitId).eq("project.id", project.id).findList();
743	743
744	744	return ok(diff.render(pullRequest, commit, parentCommit, patch, comments));

...	...	@@ -1,4 +1,4 @@
1		-@(project: Project, commit:playRepository.Commit, parentCommit:playRepository.Commit, patch: String, comments:List[CodeComment], selectedBranch:String, diff: List[playRepository.FileDiff])
	1	+@(project: Project, commit:playRepository.Commit, parentCommit:playRepository.Commit, patch: String, comments:List[CommitComment], selectedBranch:String, diff: List[playRepository.FileDiff])
2	2
3	3	@import playRepository.RepositoryService
4	4	@import java.net.URLEncoder
...	...	@@ -134,14 +134,14 @@
134	134
135	135	<div class="comment-body markdown-wrap markdown-before" markdown="true">@comment.contents</div>
136	136
137		- <div class="attachments" data-resourceType="@ResourceType.CODE_COMMENT" data-resourceId="@comment.id"></div>
	137	+ <div class="attachments" data-resourceType="@ResourceType.COMMIT_COMMENT" data-resourceId="@comment.id"></div>
138	138	</div>
139	139	</li>
140	140	}
141	141	</ul>
142	142	}
143	143
144		- @common.commentForm(project, ResourceType.CODE_COMMENT, routes.CodeHistoryApp.newComment(project.owner, project.name, commit.getId).toString())
	144	+ @common.commentForm(project, ResourceType.COMMIT_COMMENT, routes.CodeHistoryApp.newComment(project.owner, project.name, commit.getId).toString())
145	145	</div>
146	146	@ // Comment @
147	147	</div>
...	...	@@ -181,7 +181,7 @@
181	181	$(document).ready(function(){
182	182	$yobi.loadModule("code.Diff", {
183	183	"welDiff": $("#commit"),
184		- "bCommentable" : @if(isProjectResourceCreatable(UserApp.currentUser, project, ResourceType.CODE_COMMENT)){true}else{false},
	184	+ "bCommentable" : @if(isProjectResourceCreatable(UserApp.currentUser, project, ResourceType.COMMIT_COMMENT)){true}else{false},
185	185	"sWatchUrl" : "@routes.WatchApp.watch(commit.asResource(project).asParameter)",
186	186	"sUnwatchUrl" : "@routes.WatchApp.unwatch(commit.asResource(project).asParameter)",
187	187	"sParentCommitId": "@if(parentCommit != null){@parentCommit.getId}",

...	...	@@ -113,7 +113,7 @@
113	113	</a>
114	114	</td>
115	115	<td class="messages">
116		- @defining(CodeComment.count(project, commit.getId, if(path != null){"/"+path}else{null})){ numOfComment =>
	116	+ @defining(CommitComment.count(project, commit.getId, if(path != null){"/"+path}else{null})){ numOfComment =>
117	117	@if(numOfComment > 0) {
118	118	<span class="number-of-comments"><i class="yobicon-comments"></i> @numOfComment</span>
119	119	}

...	...	@@ -7,69 +7,42 @@
7	7	import play.db.ebean.Model;
8	8
9	9	import javax.persistence.Column;
10		-import javax.persistence.Entity;
11	10	import javax.persistence.Id;
12	11	import javax.persistence.ManyToOne;
13		-import javax.validation.constraints.Size;
	12	+import javax.persistence.MappedSuperclass;
14	13	import java.beans.Transient;
15	14	import java.util.ArrayList;
16	15	import java.util.Date;
17		-import java.util.List;
18	16
19		-@Entity
	17	+import org.joda.time.Duration;
	18	+import utils.JodaDateUtil;
	19	+
	20	+import javax.validation.constraints.Size;
	21	+
	22	+
	23	+@MappedSuperclass
20	24	public class CodeComment extends Model implements ResourceConvertible, TimelineItem {
21	25	private static final long serialVersionUID = 1L;
22	26	public static final Finder<Long, CodeComment> find = new Finder<>(Long.class, CodeComment.class);
23	27
24	28	@Id
25	29	public Long id;
26		-
27	30	@ManyToOne
28	31	public Project project;
29		-
30	32	public String commitId;
31	33	public String path;
32		- public Long line;
	34	+ public Integer line; // FIXME: DB엔 integer가 아닌 bigint로 되어있음.
33	35	public String side;
34		-
35	36	@Constraints.Required @Column(length = 4000) @Size(max=4000)
36	37	public String contents;
37		-
38	38	@Constraints.Required
39	39	public Date createdDate;
40		-
41	40	public Long authorId;
42	41	public String authorLoginId;
43	42	public String authorName;
44	43
45	44	public CodeComment() {
46	45	createdDate = new Date();
47		- }
48		-
49		- public static int count(Project project, String commitId, String path){
50		- if(path != null){
51		- return CodeComment.find.where()
52		- .eq("project.id", project.id)
53		- .eq("commitId", commitId)
54		- .eq("path", path)
55		- .findRowCount();
56		- } else {
57		- return CodeComment.find.where()
58		- .eq("project.id", project.id)
59		- .eq("commitId", commitId)
60		- .findRowCount();
61		- }
62		- }
63		-
64		- public static int countByCommits(Project project, List<PullRequestCommit> commits) {
65		- int count = 0;
66		- for(PullRequestCommit commit: commits) {
67		- count += CodeComment.find.where().eq("project.id", project.id)
68		- .eq("commitId", commit.getCommitId())
69		- .findRowCount();
70		- }
71		-
72		- return count;
73	46	}
74	47
75	48	@Transient
...	...	@@ -80,40 +53,13 @@
80	53	}
81	54
82	55	@Override
83		- public Resource asResource() {
84		- return new Resource() {
85		- @Override
86		- public String getId() {
87		- return id.toString();
88		- }
89		-
90		- @Override
91		- public Project getProject() {
92		- return project;
93		- }
94		-
95		- @Override
96		- public ResourceType getType() {
97		- return ResourceType.CODE_COMMENT;
98		- }
99		-
100		- @Override
101		- public Long getAuthorId() {
102		- return authorId;
103		- }
104		- };
105		- }
106		-
107		- @Override
108	56	public Date getDate() {
109	57	return createdDate;
110	58	}
111	59
112		- public static List<CodeComment> findByCommits(Project project, List<PullRequestCommit> commits) {
113		- List<CodeComment> list = new ArrayList<>();
114		- for(PullRequestCommit commit: commits) {
115		- list.addAll(CodeComment.find.where().eq("project.id", project.id).eq("commitId", commit.getCommitId()).findList());
116		- }
117		- return list;
	60	+ public Duration ago() {
	61	+ return JodaDateUtil.ago(this.createdDate);
118	62	}
	63	+
	64	+ abstract public Resource asResource();
119	65	}

...	...	@@ -3,11 +3,8 @@
3	3	import com.avaje.ebean.Ebean;
4	4	import com.avaje.ebean.ExpressionList;
5	5	import com.avaje.ebean.Page;
6		-import com.avaje.ebean.RawSql;
7		-import com.avaje.ebean.RawSqlBuilder;
8	6
9	7	import controllers.EnrollProjectApp;
10		-import controllers.ProjectApp;
11	8	import controllers.routes;
12	9	import models.enumeration.RequestState;
13	10	import models.enumeration.ResourceType;
...	...	@@ -19,7 +16,6 @@
19	16	import org.eclipse.jgit.api.errors.NoHeadException;
20	17	import org.joda.time.Duration;
21	18	import org.tmatesoft.svn.core.SVNException;
22		-import play.Logger;
23	19	import play.data.validation.Constraints;
24	20	import play.db.ebean.Model;
25	21	import play.db.ebean.Transactional;
...	...	@@ -109,7 +105,7 @@
109	105	public List<User> enrolledUsers;
110	106
111	107	@OneToMany(cascade = CascadeType.REMOVE)
112		- public List<CodeComment> codeComments;
	108	+ public List<CommitComment> codeComments;
113	109
114	110	/**
115	111	* 신규 프로젝트를 생성한다.

...	...	@@ -7,9 +7,6 @@
7	7	import org.eclipse.jgit.blame.BlameGenerator;
8	8	import org.eclipse.jgit.blame.BlameResult;
9	9	import org.eclipse.jgit.lib.Repository;
10		-import org.joda.time.Duration;
11		-import play.data.validation.Constraints;
12		-import play.db.ebean.Model;
13	10	import playRepository.FileDiff;
14	11	import playRepository.GitRepository;
15	12	import playRepository.RepositoryService;
...	...	@@ -23,51 +20,17 @@
23	20	import java.util.List;
24	21
25	22	@Entity
26		-public class PullRequestComment extends Model implements ResourceConvertible, TimelineItem {
	23	+public class PullRequestComment extends CodeComment implements ResourceConvertible, TimelineItem {
27	24
28	25	private static final long serialVersionUID = 1L;
29	26	public static final Finder<Long, PullRequestComment> find = new Finder<>(Long.class, PullRequestComment.class);
30		-
31		- @Id
32		- public Long id;
33	27
34	28	@ManyToOne
35	29	public PullRequest pullRequest;
36	30
37	31	public String commitA;
38	32	public String commitB;
39		- public String path;
40		- public String side;
41		- public Integer line;
42	33
43		- @Constraints.Required @Column(length = 4000) @Size(max=4000)
44		- public String contents;
45		-
46		- @Constraints.Required
47		- public Date createdDate;
48		-
49		- public Long authorId;
50		- public String authorLoginId;
51		- public String authorName;
52		-
53		- /**
54		- * 어떤 리소스에 대한 댓글인지 나타내는 값.
55		- *
56		- * 리소스타입과 해당 리소스의 PK 값을 조합하여 되도록이면 바뀌지 않으며
57		- * 댓글을 달 수 있는 리소스당 유일한 값이어야 한다.
58		- *
59		- * ex) pull_request_1, pull_request_2, profile_1, milestone_1
60		- *
61		- */
62		- public String resourceKey;
63		-
64		- public PullRequestComment() {
65		- createdDate = new Date();
66		- }
67		-
68		- public Duration ago() {
69		- return JodaDateUtil.ago(this.createdDate);
70		- }
71	34
72	35	public void authorInfos(User user) {
73	36	this.authorId = user.id;
...	...	@@ -84,22 +47,9 @@
84	47	", authorId=" + authorId +
85	48	", authorLoginId='" + authorLoginId + '\'' +
86	49	", authorName='" + authorName + '\'' +
87		- ", resourceKey='" + resourceKey + '\'' +
88	50	'}';
89	51	}
90	52
91		- public static List<PullRequestComment> findByResourceKey(String resourceKey) {
92		- return find.where()
93		- .eq("resourceKey", resourceKey)
94		- .orderBy().asc("createdDate")
95		- .findList();
96		- }
97		-
98		- public static int countByResourceKey(String resourceKey) {
99		- return find.where()
100		- .eq("resourceKey", resourceKey)
101		- .findRowCount();
102		- }
103	53
104	54	@Override
105	55	public Resource asResource(){
...	...	@@ -122,6 +72,10 @@
122	72	@Override
123	73	public Long getAuthorId() {
124	74	return authorId;
	75	+ }
	76	+
	77	+ public void delete() {
	78	+ PullRequestComment.this.delete();
125	79	}
126	80	};
127	81	}
...	...	@@ -152,7 +106,7 @@
152	106	blame.push(null, gitRepo.resolve(pullRequest.mergedCommitIdTo));
153	107	BlameResult blameResult = blame.computeBlameResult();
154	108
155		- return !blameResult.getSourceCommit(line - 1).getName().equals(commitB);
	109	+ return !blameResult.getSourceCommit(line.intValue() - 1).getName().equals(commitB);
156	110	}
157	111
158	112	@Transient

...	...	@@ -25,7 +25,7 @@
25	25	LABEL("label"),
26	26	PROJECT_LABELS("project_labels"),
27	27	FORK("fork"),
28		- CODE_COMMENT("code_comment"),
	28	+ COMMIT_COMMENT("code_comment"),
29	29	PULL_REQUEST("pull_request"),
30	30	PULL_REQUEST_COMMENT("pull_request_comment"),
31	31	COMMIT("commit"),

...	...	@@ -43,8 +43,8 @@
43	43	case MILESTONE:
44	44	finder = Milestone.find;
45	45	break;
46		- case CODE_COMMENT:
47		- finder = CodeComment.find;
	46	+ case COMMIT_COMMENT:
	47	+ finder = CommitComment.find;
48	48	break;
49	49	case PULL_REQUEST:
50	50	finder = PullRequest.finder;
...	...	@@ -117,8 +117,8 @@
117	117	case MILESTONE:
118	118	resource = Milestone.find.byId(longId).asResource();
119	119	break;
120		- case CODE_COMMENT:
121		- resource = CodeComment.find.byId(longId).asResource();
	120	+ case COMMIT_COMMENT:
	121	+ resource = CommitComment.find.byId(longId).asResource();
122	122	break;
123	123	case PULL_REQUEST:
124	124	return PullRequest.finder.byId(longId).asResource();
...	...	@@ -140,4 +140,5 @@
140	140	abstract public ResourceType getType();
141	141	public Resource getContainer() { return null; }
142	142	public Long getAuthorId() { return null; }
	143	+ public void delete() { throw new UnsupportedOperationException(); }
143	144	}

...	...	@@ -35,9 +35,9 @@
35	35	}
36	36
37	37	// Add every user who comments on this commit
38		- List<CodeComment> comments = CodeComment.find.where()
	38	+ List<CommitComment> comments = CommitComment.find.where()
39	39	.eq("project.id", project.id).eq("commitId", getId()).findList();
40		- for (CodeComment c : comments) {
	40	+ for (CommitComment c : comments) {
41	41	User user = User.find.byId(c.authorId);
42	42	if (user != null) {
43	43	actualWatchers.add(user);

...	...	@@ -5,13 +5,6 @@
5	5	import java.util.ArrayList;
6	6	import java.util.List;
7	7
8		-/**
9		- * Created with IntelliJ IDEA.
10		- * User: nori
11		- * Date: 13. 9. 11
12		- * Time: 오후 4:48
13		- * To change this template use File \| Settings \| File Templates.
14		- */
15	8	public class Hunk extends EditList {
16	9	public int beginA;
17	10	public int endA;

...	...	@@ -58,7 +58,7 @@
58	58	case ISSUE_COMMENT:
59	59	case NONISSUE_COMMENT:
60	60	case FORK:
61		- case CODE_COMMENT:
	61	+ case COMMIT_COMMENT:
62	62	case PULL_REQUEST_COMMENT:
63	63	return true;
64	64	default:
...	...	@@ -227,7 +227,7 @@
227	227	case ISSUE_COMMENT:
228	228	case NONISSUE_COMMENT:
229	229	case BOARD_POST:
230		- case CODE_COMMENT:
	230	+ case COMMIT_COMMENT:
231	231	case PULL_REQUEST:
232	232	case PULL_REQUEST_COMMENT:
233	233	return resource.getAuthorId().equals(user.id);

...	...	@@ -129,7 +129,7 @@
129	129	<span id="revisionNo" class="revision">
130	130	<a href="@routes.CodeHistoryApp.show(project.owner, project.name, revId)@if(branch){?branch=@URLEncoder.encode(branch, "UTF-8")}#@path">
131	131	@if(project.vcs.equals("GIT")){ @revId.substring(0,7) } else { Revision @revId }
132		- @defining(CodeComment.count(project, fieldText(files, "commitId"), "/"+path)){ numOfComment =>
	132	+ @defining(CommitComment.count(project, fieldText(files, "commitId"), "/"+path)){ numOfComment =>
133	133	@if(numOfComment > 0) {
134	134	<span class="number-of-comments ml5"><i class="yobicon-comments"></i> @numOfComment</span>
135	135	}

...	...	@@ -1,4 +1,4 @@
1		-@(pull: PullRequest, commit:playRepository.Commit, parentCommit:playRepository.Commit, patch: String, comments:List[CodeComment])
	1	+@(pull: PullRequest, commit:playRepository.Commit, parentCommit:playRepository.Commit, patch: String, comments:List[CommitComment])
2	2
3	3	@import playRepository.RepositoryService
4	4	@import java.net.URLEncoder
...	...	@@ -119,14 +119,14 @@
119	119
120	120	<div class="comment-body markdown-wrap markdown-before" markdown="true">@comment.contents</div>
121	121
122		- <div class="attachments" data-resourceType="@ResourceType.CODE_COMMENT" data-resourceId="@comment.id"></div>
	122	+ <div class="attachments" data-resourceType="@ResourceType.COMMIT_COMMENT" data-resourceId="@comment.id"></div>
123	123	</div>
124	124	</li>
125	125	}
126	126	</ul>
127	127	}
128	128
129		- @common.commentForm(pull.fromProject, ResourceType.CODE_COMMENT, routes.CodeHistoryApp.newComment(pull.fromProject.owner, pull.fromProject.name, commit.getId).toString())
	129	+ @common.commentForm(pull.fromProject, ResourceType.COMMIT_COMMENT, routes.CodeHistoryApp.newComment(pull.fromProject.owner, pull.fromProject.name, commit.getId).toString())
130	130	</div>
131	131	@ // Comment @
132	132
...	...	@@ -160,7 +160,7 @@
160	160	<script type="text/javascript">
161	161	$(document).ready(function(){
162	162	$yobi.loadModule("code.Diff", {
163		- "bCommentable" : @if(isProjectResourceCreatable(UserApp.currentUser, pull.fromProject, ResourceType.CODE_COMMENT)){true}else{false},
	163	+ "bCommentable" : @if(isProjectResourceCreatable(UserApp.currentUser, pull.fromProject, ResourceType.COMMIT_COMMENT)){true}else{false},
164	164	"sWatchUrl" : "@routes.WatchApp.watch(commit.asResource(pull.fromProject).asParameter)",
165	165	"sUnwatchUrl" : "@routes.WatchApp.unwatch(commit.asResource(pull.fromProject).asParameter)",
166	166	"sParentCommitId": "@if(parentCommit != null){@parentCommit.getId}",

...	...	@@ -327,7 +327,7 @@
327	327	}
328	328	</ul>
329	329	}
330		- @common.commentForm(project, ResourceType.SIMPLE_COMMENT, routes.PullRequestCommentApp.newComment(project.owner, project.name, pull.id).toString())
	330	+ @common.commentForm(project, ResourceType.PULL_REQUEST_COMMENT, routes.PullRequestCommentApp.newComment(project.owner, project.name, pull.id).toString())
331	331	</div>
332	332	</div>
333	333
...	...	@@ -354,7 +354,7 @@
354	354
355	355	<td class="messages">
356	356
357		- @defining(CodeComment.count(pull.fromProject, commit.getCommitId, null)){ numOfComment =>
	357	+ @defining(CommitComment.count(pull.fromProject, commit.getCommitId, null)){ numOfComment =>
358	358	@if(numOfComment > 0) {
359	359	<span class="number-of-comments"><i class="yobicon-comments"></i> @numOfComment</span>
360	360	}

...	...	@@ -83,7 +83,7 @@
83	83	</td>
84	84
85	85	<td class="messages">
86		- @defining(CodeComment.count(pullRequest.fromProject, commit.getId, null)){ numOfComment =>
	86	+ @defining(CommitComment.count(pullRequest.fromProject, commit.getId, null)){ numOfComment =>
87	87	@if(numOfComment > 0) {
88	88	<span class="number-of-comments"><i class="yobicon-comments"></i> @numOfComment</span>
89	89	}

...	...	@@ -24,7 +24,7 @@
24	24	<div class="infos nm">
25	25	<a href="@routes.UserApp.userInfo(req.contributor.loginId)" class="author">@req.contributor.name</a>
26	26	<span class="date ml10">@agoString(req.createdAgo())</span>
27		- @defining(PullRequestComment.countByResourceKey(req.getResourceKey()) + CodeComment.countByCommits(req.fromProject, req.pullRequestCommits)) { count =>
	27	+ @defining(req.comments.size + CommitComment.countByCommits(req.fromProject, req.pullRequestCommits)) { count =>
28	28	@if(count > 0) {
29	29	<a href="@routes.PullRequestApp.pullRequest(req.toProject.owner, req.toProject.name, req.number)#comments" class="comment-wrap">
30	30	<i class="icon yobicon-comments"></i>

...	...	@@ -1,108 +1,122 @@
1		-@(fileDiffs: List[playRepository.FileDiff], comments:List[CommonComment])
	1	+@(fileDiffs: java.util.List[playRepository.FileDiff], comments:java.util.List[_ <: CodeComment])
2	2
3	3	@import playRepository.DiffLineType
4	4	@import org.eclipse.jgit.diff.DiffEntry
	5	+@import scala.collection.JavaConversions._
5	6
6		-@render(fileDiffs: List[playRepository.FileDiff], comments:List[CodeComment]) = {
7		- render2(fileDiffs, comments map { [comment.path, comment.line, comment.side] => comment })
	7	+@render(fileDiffs, comments.toList.groupBy((comment: CodeComment) => commentKey(comment.path, comment.side, comment.line)))
	8	+
	9	+@writeLine(klass: String, prefix: String, numA: Integer, numB: Integer, content: String, commentsOnLine: scala.collection.immutable.List[_ <: CodeComment]) = {
	10	+ <tr class="@klass" data-line="@Option(numA).getOrElse(numB)" data-type="@klass"><td class="linenum"><i class="icon-comment"></i>@Option(numA).getOrElse("")</td><td class="linenum">@Option(numB).getOrElse("")</td><td><span>@prefix</span>@content</td></tr>
	11	+ @if(commentsOnLine != null) { @writeCommentsOnLine(commentsOnLine) }
8	12	}
9	13
10		-@writeLine(klass: String, prefix: String, numA: Integer, numB: Integer, content: String) = {
11		- @writeCodeLine(klass, prefix, numA, numB, content)
12		- @writeComment(comment)
13		-}
	14	+@writeCommentsOnLine(comments: scala.collection.immutable.List[CodeComment]) = {
	15	+ <tr class="comments board-comment-wrap">
	16	+ <td colspan=3>
	17	+ <ul class="comments">
	18	+ @for(comment: CodeComment <- comments) {
	19	+ <li id="comment-@comment.id" data-path="@comment.path" data-side="@comment.side" data-line="@comment.line" class="comment">
	20	+ <div class="comment-avatar">
	21	+ <a href="@routes.UserApp.userInfo(comment.authorLoginId)" class="avatar-wrap" data-toggle="tooltip" data-placement="top" title="@comment.authorName">
	22	+ <img src="@User.findByLoginId(comment.authorLoginId).avatarUrl" width="32" height="32" alt="@comment.authorLoginId">
	23	+ </a>
	24	+ </div>
	25	+ <div class="media-body">
	26	+ <div class="meta-info">
	27	+ <span class="comment_author pull-left">
	28	+ <i class="yobicon-comment"></i>
	29	+ <a href="@routes.UserApp.userInfo(comment.authorLoginId)" data-toggle="tooltip" data-placement="top" title="@comment.authorName">
	30	+ <strong>@comment.authorLoginId </strong>
	31	+ </a>
	32	+ </span>
	33	+ <span class="ago"><a href="#comment-@comment.id">@utils.TemplateHelper.agoString(utils.JodaDateUtil.ago(comment.createdDate))</a></span>
	34	+ @if(utils.AccessControl.isAllowed(UserApp.currentUser(), comment.asResource(), Operation.DELETE)){
	35	+ <span class="edit pull-right">
	36	+ <!-- FIXME: Delete comment? pull request하고 commit comment 구분해야 함 -->
	37	+ <button class="btn-transparent pull-right close" data-request-method="delete" data-request-uri="@routes.CommentApp.delete(comment.asResource.getType.resource, comment.asResource.getId)"><i class="yobicon-trash"></i></button>
	38	+ </span>
	39	+ }
	40	+ </div>
14	41
15		-@writeLine(klass: String, prefix: String, numA: Integer, numB: Integer, content: String, comment: CodeComment) = {
16		- @writeCodeLine(klass, prefix, numA, numB, content)
17		-}
	42	+ <div class="comment-body markdown-wrap markdown-before" markdown="true">@comment.contents</div>
18	43
19		-@writeCodeLine(klass: String, prefix: String, numA: Integer, numB: Integer, content: String, comment: CodeComment) = { <tr class="@klass" data-line="@Option(numA).getOrElse(numB)" data-type="@klass"><td class="linenum"><i class="icon-comment"></i>@Option(numA).getOrElse("")</td><td class="linenum">@Option(numB).getOrElse("")</td><td><span>@prefix</span>@content</td></tr>
20		-}
21		-
22		-@writeComment(comment: CodeComment) = {
23		- <li id="comment-@comment.id" data-path="@comment.path" data-side="@comment.side" data-line="@comment.line" class="comment">
24		- <div class="comment-avatar">
25		- <a href="@routes.UserApp.userInfo(comment.authorLoginId)" class="avatar-wrap" data-toggle="tooltip" data-placement="top" title="@comment.authorName">
26		- <img src="@User.findByLoginId(comment.authorLoginId).avatarUrl" width="32" height="32" alt="@comment.authorLoginId">
27		- </a>
28		- </div>
29		- <div class="media-body">
30		- <div class="meta-info">
31		- <span class="comment_author pull-left">
32		- <i class="yobicon-comment"></i>
33		- <a href="@routes.UserApp.userInfo(comment.authorLoginId)" data-toggle="tooltip" data-placement="top" title="@comment.authorName">
34		- <strong>@comment.authorLoginId </strong>
35		- </a>
36		- </span>
37		- <span class="ago"><a href="#comment-@comment.id">@utils.TemplateHelper.agoString(ago(comment.createdDate))</a></span>
38		- @if(isAllowed(UserApp.currentUser(), comment.asResource(), Operation.DELETE)){
39		- <span class="edit pull-right">
40		- <button class="btn-transparent pull-right close" data-request-method="delete" data-request-uri="@routes.CodeHistoryApp.deleteComment(project.owner, project.name, commit.getId, comment.id)"><i class="yobicon-trash"></i></button>
41		- </span>
	44	+ <div class="attachments" resourceType="@comment.asResource.getType" resourceId="@comment.id"></div>
	45	+ </div>
	46	+ </li>
42	47	}
43		- </div>
44		-
45		- <div class="comment-body markdown-wrap markdown-before" markdown="true">@comment.contents</div>
46		-
47		- <div class="attachments" resourceType="@ResourceType.CODE_COMMENT" resourceId="@comment.id"></div>
48		- </div>
49		- </li>
	48	+ <button class="nbtn medium btn-thread">댓글창 열기</button>
	49	+ <button class="nbtn medium btn-thread" style="display: none;">댓글창 닫기</button>
	50	+ </ul>
	51	+ </td>
	52	+ </tr>
50	53	}
51	54
52		-@renderHunks(hunks: List[Hunk], comments: List[CodeComment]) = {
	55	+@commentKey(path: String, side: String, lineNum: Integer) = @{ path + ":" + side + ":" + lineNum }
	56	+
	57	+@commentsOrNull(comments: Map[String, scala.collection.immutable.List[_ <: CodeComment]], key: String) = @{
	58	+ if(comments.contains(key)) {
	59	+ comments(key)
	60	+ } else {
	61	+ null
	62	+ }
	63	+}
	64	+
	65	+@renderFileDiff(diff: playRepository.FileDiff, comments:scala.collection.immutable.Map[String, scala.collection.immutable.List[_ <: CodeComment]]) = {
53	66	@for(hunk <- diff.getHunks) {
54	67	<tr class="range"><td>...</td><td>...</td><td>-@(hunk.beginA + 1),@(hunk.endA - hunk.beginA) +@(hunk.beginB + 1),@(hunk.endB - hunk.beginB)</td></tr>
55	68	@for(line <- hunk.lines){
56	69	@line.kind match {
57		- case DiffLineType.ADD => { @writeLine(line.kind.toString.toLowerCase, "+", null, line.numB + 1, line.content, comments(List(diff.pathB, "add", line.numB + 1)) }
58		- case DiffLineType.REMOVE => { @writeLine(line.kind.toString.toLowerCase, "-", line.numA + 1, null, line.content, comments(List(diff.pathA, "remove", line.numA + 1))) }
59		- case _ => { @writeLine(line.kind.toString.toLowerCase, " ", line.numA + 1, line.numB + 1, line.content, comments(List(diff.pathA, "base", line.numA + 1))) }
	70	+ case DiffLineType.ADD => { @writeLine(line.kind.toString.toLowerCase, "+", null, line.numB + 1, line.content, commentsOrNull(comments, commentKey(diff.pathB, "add", line.numB + 1))) }
	71	+ case DiffLineType.REMOVE => { @writeLine(line.kind.toString.toLowerCase, "-", line.numA + 1, null, line.content, commentsOrNull(comments, commentKey(diff.pathA, "remove", line.numA + 1))) }
	72	+ case _ => { @writeLine(line.kind.toString.toLowerCase, " ", line.numA + 1, line.numB + 1, line.content, commentsOrNull(comments, commentKey(diff.pathA, "base", line.numA + 1))) }
60	73	}
61	74	}
62	75	}
63	76	}
64	77
65		-@render2(fileDiffs: List[playRepository.FileDiff], comments:Map[List, CodeComment]) = {
	78	+@render(fileDiffs: java.util.List[playRepository.FileDiff], comments:scala.collection.immutable.Map[String, scala.collection.immutable.List[_ <: CodeComment]]) = {
66	79	@for(diff <- fileDiffs) {
67	80	@diff.changeType match {
68	81	case DiffEntry.ChangeType.MODIFY => {
69		- <table class="diff-body" data-path="@diff.pathB"><tbody>
	82	+ <table class="diff-body show-comments" data-path="@diff.pathB"><tbody>
70	83	<tr class="file">
71	84	<td colspan=3>@diff.pathB</td>
72	85	</tr>
73		- @renderHunks(diff.getHunks, comments)
	86	+ @renderFileDiff(diff, comments)
74	87	</tbody></table>
75	88	}
	89	+
76	90	case DiffEntry.ChangeType.ADD => {
77		- <table class="diff-body" data-path="@diff.pathB"><tbody>
	91	+ <table class="diff-body show-comments" data-path="@diff.pathB"><tbody>
78	92	<tr class="file">
79	93	<td colspan=3>@diff.pathB (Added)</td>
80	94	</tr>
81	95	@for(i <- 0 until diff.b.size) {
82		- @writeLine("add", "+", null, i + 1, diff.b.getString(i))
	96	+ @writeLine("add", "+", null, i + 1, diff.b.getString(i), commentsOrNull(comments, diff.pathB + ":add:" + (i + 1)))
83	97	}
84	98	</tbody></table>
85	99	}
86	100	case DiffEntry.ChangeType.DELETE => {
87		- <table class="diff-body" data-path="@diff.pathA"><tbody>
	101	+ <table class="diff-body show-comments" data-path="@diff.pathA"><tbody>
88	102	<tr class="file">
89	103	<td colspan=3>@diff.pathA (Deleted)</td>
90	104	</tr>
91	105	@for(i <- 0 until diff.a.size) {
92		- @writeLine("remove", "-", null, i + 1, diff.a.getString(i))
	106	+ @writeLine("remove", "-", null, i + 1, diff.a.getString(i), commentsOrNull(comments, diff.pathA + ":add:" + (i + 1)))
93	107	}
94	108	</tbody></table>
95	109	}
96	110	case DiffEntry.ChangeType.RENAME => {
97		- <table class="diff-body" data-path="@diff.pathB"><tbody>
	111	+ <table class="diff-body show-comments" data-path="@diff.pathB"><tbody>
98	112	<tr class="file">
99	113	<td colspan=3>@diff.pathB -> @diff.pathB</td>
100	114	</tr>
101		- @renderHunks(diff.getHunks, comments)
	115	+ @renderFileDiff(diff, comments)
102	116	</tbody></table>
103	117	}
104	118	case DiffEntry.ChangeType.COPY => {
105		- <table class="diff-body" data-path="@diff.pathB"><tbody>
	119	+ <table class="diff-body show-comments" data-path="@diff.pathB"><tbody>
106	120	<tr class="file">
107	121	<td colspan=3>Copy @diff.pathA to @diff.pathB</td>
108	122	</tr>

...	...	@@ -1,53 +1,99 @@
1	1	# --- !Ups
2	2
3	3	ALTER TABLE simple_comment RENAME TO pull_request_comment;
	4	+DROP SEQUENCE IF EXISTS pull_request_comment_seq;
4	5	CREATE SEQUENCE pull_request_comment_seq START WITH simple_comment_seq.nextval;
5	6	DROP SEQUENCE IF EXISTS simple_comment_seq;
	7	+ALTER TABLE pull_request_comment ADD COLUMN project_id bigint;
	8	+ALTER TABLE pull_request_comment ADD COLUMN commit_a varchar(40);
	9	+ALTER TABLE pull_request_comment ADD COLUMN commit_b varchar(40);
	10	+ALTER TABLE pull_request_comment ADD COLUMN path varchar(255);
	11	+ALTER TABLE pull_request_comment ADD COLUMN line integer;
	12	+ALTER TABLE pull_request_comment ADD COLUMN side varchar(16);
	13	+ALTER TABLE pull_request_comment ADD COLUMN pull_request_id bigint;
	14	+
	15	+ALTER TABLE code_comment RENAME TO commit_comment;
	16	+DROP SEQUENCE IF EXISTS commit_comment_seq;
	17	+CREATE SEQUENCE commit_comment_seq START WITH code_comment_seq.nextval;
	18	+DROP SEQUENCE IF EXISTS code_commit_seq;
6	19
7	20	ALTER TABLE notification_event DROP CONSTRAINT IF EXISTS ck_notification_event_resource_type;
8	21	ALTER TABLE notification_event ALTER COLUMN resource_type TYPE varchar(255);
	22	+UPDATE notification_event SET resource_type='COMMIT_COMMENT' WHERE resource_type='CODE_COMMENT';
	23	+UPDATE notification_event SET event_type='NEW_COMMIT_COMMENT' WHERE event_type='NEW_CODE_COMMENT';
9	24	UPDATE notification_event SET resource_type='PULL_REQUEST_COMMENT' WHERE resource_type='SIMPLE_COMMENT';
10	25	UPDATE notification_event SET event_type='NEW_PULL_REQUEST_COMMENT' WHERE event_type='NEW_SIMPLE_COMMENT';
11		-ALTER TABLE notification_event ADD constraint ck_notification_event_resource_type check (resource_type in ('ISSUE_POST','ISSUE_ASSIGNEE','ISSUE_STATE','ISSUE_CATEGORY','ISSUE_MILESTONE','ISSUE_LABEL','BOARD_POST','BOARD_CATEGORY','BOARD_NOTICE','CODE','MILESTONE','WIKI_PAGE','PROJECT_SETTING','SITE_SETTING','USER','USER_AVATAR','PROJECT','ATTACHMENT','ISSUE_COMMENT','NONISSUE_COMMENT','LABEL','PROJECT_LABELS','FORK','CODE_COMMENT','PULL_REQUEST','PULL_REQUEST_COMMENT'));
	26	+ALTER TABLE notification_event ADD constraint ck_notification_event_resource_type check (resource_type in ('ISSUE_POST','ISSUE_ASSIGNEE','ISSUE_STATE','ISSUE_CATEGORY','ISSUE_MILESTONE','ISSUE_LABEL','BOARD_POST','BOARD_CATEGORY','BOARD_NOTICE','CODE','MILESTONE','WIKI_PAGE','PROJECT_SETTING','SITE_SETTING','USER','USER_AVATAR','PROJECT','ATTACHMENT','ISSUE_COMMENT','NONISSUE_COMMENT','LABEL','PROJECT_LABELS','FORK','COMMIT_COMMENT','PULL_REQUEST','PULL_REQUEST_COMMENT'));
12	27
13	28	ALTER TABLE watch DROP CONSTRAINT IF EXISTS ck_watch_resource_type;
14	29	ALTER TABLE watch ALTER COLUMN resource_type TYPE varchar(255);
	30	+UPDATE watch SET resource_type='COMMIT_COMMENT' WHERE resource_type='CODE_COMMENT';
15	31	UPDATE watch SET resource_type='PULL_REQUEST_COMMENT' WHERE resource_type='SIMPLE_COMMENT';
16		-ALTER TABLE watch ADD CONSTRAINT ck_watch_resource_type check (resource_type in ('ISSUE_POST','ISSUE_ASSIGNEE','ISSUE_STATE','ISSUE_CATEGORY','ISSUE_MILESTONE','ISSUE_LABEL','BOARD_POST','BOARD_CATEGORY','BOARD_NOTICE','CODE','MILESTONE','WIKI_PAGE','PROJECT_SETTING','SITE_SETTING','USER','USER_AVATAR','PROJECT','ATTACHMENT','ISSUE_COMMENT','NONISSUE_COMMENT','LABEL','PROJECT_LABELS','FORK','CODE_COMMENT','PULL_REQUEST','PULL_REQUEST_COMMENT', 'COMMIT'));
	32	+ALTER TABLE watch ADD CONSTRAINT ck_watch_resource_type check (resource_type in ('ISSUE_POST','ISSUE_ASSIGNEE','ISSUE_STATE','ISSUE_CATEGORY','ISSUE_MILESTONE','ISSUE_LABEL','BOARD_POST','BOARD_CATEGORY','BOARD_NOTICE','CODE','MILESTONE','WIKI_PAGE','PROJECT_SETTING','SITE_SETTING','USER','USER_AVATAR','PROJECT','ATTACHMENT','ISSUE_COMMENT','NONISSUE_COMMENT','LABEL','PROJECT_LABELS','FORK','COMMIT_COMMENT','PULL_REQUEST','PULL_REQUEST_COMMENT', 'COMMIT'));
17	33
18	34	ALTER TABLE unwatch DROP CONSTRAINT IF EXISTS ck_unwatch_resource_type;
19	35	ALTER TABLE unwatch ALTER COLUMN resource_type TYPE varchar(255);
	36	+UPDATE unwatch SET resource_type='COMMIT_COMMENT' WHERE resource_type='CODE_COMMENT';
20	37	UPDATE unwatch SET resource_type='PULL_REQUEST_COMMENT' WHERE resource_type='SIMPLE_COMMENT';
21		-ALTER TABLE unwatch ADD CONSTRAINT ck_unwatch_resource_type check (resource_type in ('ISSUE_POST','ISSUE_ASSIGNEE','ISSUE_STATE','ISSUE_CATEGORY','ISSUE_MILESTONE','ISSUE_LABEL','BOARD_POST','BOARD_CATEGORY','BOARD_NOTICE','CODE','MILESTONE','WIKI_PAGE','PROJECT_SETTING','SITE_SETTING','USER','USER_AVATAR','PROJECT','ATTACHMENT','ISSUE_COMMENT','NONISSUE_COMMENT','LABEL','PROJECT_LABELS','FORK','CODE_COMMENT','PULL_REQUEST','PULL_REQUEST_COMMENT', 'COMMIT'));
	38	+ALTER TABLE unwatch ADD CONSTRAINT ck_unwatch_resource_type check (resource_type in ('ISSUE_POST','ISSUE_ASSIGNEE','ISSUE_STATE','ISSUE_CATEGORY','ISSUE_MILESTONE','ISSUE_LABEL','BOARD_POST','BOARD_CATEGORY','BOARD_NOTICE','CODE','MILESTONE','WIKI_PAGE','PROJECT_SETTING','SITE_SETTING','USER','USER_AVATAR','PROJECT','ATTACHMENT','ISSUE_COMMENT','NONISSUE_COMMENT','LABEL','PROJECT_LABELS','FORK','COMMIT_COMMENT','PULL_REQUEST','PULL_REQUEST_COMMENT', 'COMMIT'));
22	39
23	40	ALTER TABLE issue_event DROP CONSTRAINT IF EXISTS ck_issue_event_event_type;
24		-ALTER TABLE issue_event ALTER COLUMN resource_type TYPE varchar(255);
	41	+ALTER TABLE issue_event ALTER COLUMN event_type TYPE varchar(255);
	42	+UPDATE issue_event SET event_type='NEW_COMMIT_COMMENT' WHERE event_type='NEW_CODE_COMMENT';
25	43	UPDATE issue_event SET event_type='NEW_PULL_REQUEST_COMMENT' WHERE event_type='NEW_SIMPLE_COMMENT';
26	44	ALTER TABLE issue_event ADD CONSTRAINT ck_issue_event_event_type check (event_type in ('NEW_ISSUE','NEW_POSTING','ISSUE_ASSIGNEE_CHANGED','ISSUE_STATE_CHANGED','NEW_COMMENT','NEW_PULL_REQUEST','NEW_PULL_REQUEST_COMMENT','PULL_REQUEST_STATE_CHANGED'));
27	45
	46	+ALTER TABLE attachment DROP CONSTRAINT IF EXISTS ck_attachment_container_type;
	47	+UPDATE attachment SET container_type='COMMIT_COMMENT' WHERE container_type='CODE_COMMENT';
	48	+UPDATE attachment SET container_type='PULL_REQUEST_COMMENT' WHERE container_type='SIMPLE_COMMENT';
	49	+ALTER TABLE attachment ADD CONSTRAINT ck_attachment_container_type check (container_type in ('ISSUE_POST','ISSUE_ASSIGNEE','ISSUE_STATE','ISSUE_CATEGORY','ISSUE_MILESTONE','ISSUE_LABEL','BOARD_POST','BOARD_CATEGORY','BOARD_NOTICE','CODE','MILESTONE','WIKI_PAGE','PROJECT_SETTING','SITE_SETTING','USER','USER_AVATAR','PROJECT','ATTACHMENT','ISSUE_COMMENT','NONISSUE_COMMENT','COMMIT_COMMENT', 'PULL_REQUEST_COMMENT', 'PULL_REQUEST'));
	50	+
28	51	# --- !Downs
29	52
	53	+ALTER TABLE pull_request_comment DROP COLUMN IF EXISTS project_id;
	54	+ALTER TABLE pull_request_comment DROP COLUMN IF EXISTS commit_a;
	55	+ALTER TABLE pull_request_comment DROP COLUMN IF EXISTS commit_b;
	56	+ALTER TABLE pull_request_comment DROP COLUMN IF EXISTS path;
	57	+ALTER TABLE pull_request_comment DROP COLUMN IF EXISTS line;
	58	+ALTER TABLE pull_request_comment DROP COLUMN IF EXISTS side;
	59	+ALTER TABLE pull_request_comment DROP COLUMN IF EXISTS pull_request_id;
30	60	ALTER TABLE pull_request_comment RENAME TO simple_comment;
	61	+DROP SEQUENCE IF EXISTS simple_comment_seq;
31	62	CREATE SEQUENCE simple_comment_seq START WITH pull_request_comment_seq.nextval;
32	63	DROP SEQUENCE IF EXISTS pull_request_comment_seq;
33	64
	65	+ALTER TABLE commit_comment RENAME TO code_comment;
	66	+DROP SEQUENCE IF EXISTS code_comment_seq;
	67	+CREATE SEQUENCE code_comment_seq START WITH commit_comment_seq.nextval;
	68	+DROP SEQUENCE IF EXISTS commit_comment_seq;
	69	+
34	70	ALTER TABLE notification_event DROP CONSTRAINT IF EXISTS ck_notification_event_resource_type;
	71	+UPDATE notification_event SET resource_type='CODE_COMMENT' WHERE resource_type='COMMIT_COMMENT';
	72	+UPDATE notification_event SET event_type='NEW_CODE_COMMENT' WHERE event_type='NEW_COMMIT_COMMENT';
35	73	UPDATE notification_event SET resource_type='SIMPLE_COMMENT' WHERE resource_type='PULL_REQUEST_COMMENT';
36	74	UPDATE notification_event SET event_type='NEW_SIMPLE_COMMENT' WHERE event_type='NEW_PULL_REQUEST_COMMENT';
37	75	ALTER TABLE notification_event ADD constraint ck_notification_event_resource_type check (resource_type in ('ISSUE_POST','ISSUE_ASSIGNEE','ISSUE_STATE','ISSUE_CATEGORY','ISSUE_MILESTONE','ISSUE_LABEL','BOARD_POST','BOARD_CATEGORY','BOARD_NOTICE','CODE','MILESTONE','WIKI_PAGE','PROJECT_SETTING','SITE_SETTING','USER','USER_AVATAR','PROJECT','ATTACHMENT','ISSUE_COMMENT','NONISSUE_COMMENT','LABEL','PROJECT_LABELS','FORK','CODE_COMMENT','PULL_REQUEST','SIMPLE_COMMENT'));
38	76	ALTER TABLE notification_event ALTER COLUMN resource_type TYPE varchar(16);
39	77
40	78	ALTER TABLE watch DROP CONSTRAINT IF EXISTS ck_watch_resource_type;
	79	+UPDATE watch SET resource_type='CODE_COMMENT' WHERE resource_type='COMMIT_COMMENT';
41	80	UPDATE watch SET resource_type='SIMPLE_COMMENT' WHERE resource_type='PULL_REQUEST_COMMENT';
42	81	ALTER TABLE watch ADD CONSTRAINT ck_watch_resource_type check (resource_type in ('ISSUE_POST','ISSUE_ASSIGNEE','ISSUE_STATE','ISSUE_CATEGORY','ISSUE_MILESTONE','ISSUE_LABEL','BOARD_POST','BOARD_CATEGORY','BOARD_NOTICE','CODE','MILESTONE','WIKI_PAGE','PROJECT_SETTING','SITE_SETTING','USER','USER_AVATAR','PROJECT','ATTACHMENT','ISSUE_COMMENT','NONISSUE_COMMENT','LABEL','PROJECT_LABELS','FORK','CODE_COMMENT','PULL_REQUEST','SIMPLE_COMMENT', 'COMMIT'));
43	82	ALTER TABLE watch ALTER COLUMN resource_type TYPE varchar(16);
44	83
45	84	ALTER TABLE unwatch DROP CONSTRAINT IF EXISTS ck_unwatch_resource_type;
	85	+UPDATE unwatch SET resource_type='CODE_COMMENT' WHERE resource_type='COMMIT_COMMENT';
46	86	UPDATE unwatch SET resource_type='SIMPLE_COMMENT' WHERE resource_type='PULL_REQUEST_COMMENT';
47	87	ALTER TABLE unwatch ADD CONSTRAINT ck_unwatch_resource_type check (resource_type in ('ISSUE_POST','ISSUE_ASSIGNEE','ISSUE_STATE','ISSUE_CATEGORY','ISSUE_MILESTONE','ISSUE_LABEL','BOARD_POST','BOARD_CATEGORY','BOARD_NOTICE','CODE','MILESTONE','WIKI_PAGE','PROJECT_SETTING','SITE_SETTING','USER','USER_AVATAR','PROJECT','ATTACHMENT','ISSUE_COMMENT','NONISSUE_COMMENT','LABEL','PROJECT_LABELS','FORK','CODE_COMMENT','PULL_REQUEST','SIMPLE_COMMENT', 'COMMIT'));
48	88	ALTER TABLE unwatch ALTER COLUMN resource_type TYPE varchar(16);
49	89
50	90	ALTER TABLE issue_event DROP CONSTRAINT IF EXISTS ck_issue_event_event_type;
	91	+UPDATE issue_event SET event_type='NEW_CODE_COMMENT' WHERE event_type='NEW_COMMIT_COMMENT';
51	92	UPDATE issue_event SET event_type='NEW_SIMPLE_COMMENT' WHERE event_type='NEW_PULL_REQUEST_COMMENT';
52		-ALTER TABLE issue_event ADD CONSTRAINT ck_issue_event_event_type check (event_type in ('NEW_ISSUE','NEW_POSTING','ISSUE_ASSIGNEE_CHANGED','ISSUE_STATE_CHANGED','NEW_COMMENT','NEW_PULL_REQUEST','NEW_SIMPLE_COMMENT','PULL_REQUEST_STATE_CHANGED')),
53		-ALTER TABLE issue_event ALTER COLUMN resource_type TYPE varchar(16);
	93	+ALTER TABLE issue_event ADD CONSTRAINT ck_issue_event_event_type check (event_type in ('NEW_ISSUE','NEW_POSTING','ISSUE_ASSIGNEE_CHANGED','ISSUE_STATE_CHANGED','NEW_COMMENT','NEW_PULL_REQUEST','NEW_SIMPLE_COMMENT','PULL_REQUEST_STATE_CHANGED'));
	94	+ALTER TABLE issue_event ALTER COLUMN event_type TYPE varchar(16);
	95	+
	96	+ALTER TABLE attachment DROP CONSTRAINT IF EXISTS ck_attachment_container_type;
	97	+UPDATE attachment SET container_type='CODE_COMMENT' WHERE container_type='COMMIT_COMMENT';
	98	+UPDATE attachment SET container_type='SIMPLE_COMMENT' WHERE container_type='PULL_REQUEST_COMMENT';
	99	+ALTER TABLE attachment ADD CONSTRAINT ck_attachment_container_type check (container_type in ('ISSUE_POST','ISSUE_ASSIGNEE','ISSUE_STATE','ISSUE_CATEGORY','ISSUE_MILESTONE','ISSUE_LABEL','BOARD_POST','BOARD_CATEGORY','BOARD_NOTICE','CODE','MILESTONE','WIKI_PAGE','PROJECT_SETTING','SITE_SETTING','USER','USER_AVATAR','PROJECT','ATTACHMENT','ISSUE_COMMENT','NONISSUE_COMMENT','CODE_COMMENT', 'PULL_REQUEST'));