Commit @2a3bb58d882f125861257bcbafd9264411b37da4

wansoon 2013-10-14

pull-request: remove commit changed notification event

@2a3bb58d882f125861257bcbafd9264411b37da4

73922f1

2a3bb58

app/actors/PullRequestEventActor.java

--- app/actors/PullRequestEventActor.java

+++ app/actors/PullRequestEventActor.java


             PullRequestMergeResult mergeResult = pullRequest.attemptMerge();
             
             if (mergeResult.commitChanged()) {
-                
+            
                 mergeResult.saveCommits();
                 
                 if (!mergeResult.getNewCommits().isEmpty()) {
-                    NotificationEvent.addCommitChange(message.getSender(), pullRequest, message.getRequest(), mergeResult);
                     PullRequestEvent.addCommitEvents(message.getSender(), pullRequest, mergeResult.getNewCommits());                
                 }
             }

73922f1

2a3bb58

app/models/NotificationEvent.java

--- app/models/NotificationEvent.java

+++ app/models/NotificationEvent.java


         
         return notiEvent;
     }
-    
-    /**
-     * 보낸 코드의 커밋 변경시 알림 설정
-     * @param sender
-     * @param pullRequest
-     * @param request
-     * @param mergeResult
-     * @return
-     */
-    public static NotificationEvent addCommitChange(User sender, PullRequest pullRequest, Request request,
-            PullRequestMergeResult mergeResult) {
-            
-        String title = NotificationEvent.formatReplyTitle(pullRequest);
-        Resource resource = pullRequest.asResource();
-        Set<User> watchers = pullRequest.getWatchers();
-        watchers.addAll(NotificationEvent.getMentionedUsers(pullRequest.body));
-        watchers.remove(pullRequest.contributor);
-        
-        Project toProject = pullRequest.toProject;
-
-        NotificationEvent notiEvent = new NotificationEvent();
-        notiEvent.created = new Date();
-        notiEvent.title = title;
-        notiEvent.senderId = sender.id;
-        notiEvent.receivers = watchers;
-        notiEvent.urlToView = routes.PullRequestApp.pullRequest(
-                toProject.owner, toProject.name, pullRequest.number).absoluteURL(
-                request);
-        notiEvent.resourceId = resource.getId();
-        notiEvent.resourceType = resource.getType();
-        notiEvent.eventType = EventType.PULL_REQUEST_COMMIT_CHANGED;
-        notiEvent.oldValue = makeCommitMessage(pullRequest.pullRequestCommits);
-        notiEvent.newValue = makeCommitMessage(mergeResult.getNewCommits());
-        
-        add(notiEvent);
-        
-        return notiEvent;
-    }
-
-    /**
-     * 알림용 커밋메세지를 생성
-     * @param commits
-     * @return
-     */
-    private static String makeCommitMessage(List<PullRequestCommit> commits) {
-        StringBuilder sb = new StringBuilder();
-        for (PullRequestCommit commit : commits) {
-            sb.append(commit.commitShortId).append(": ").append(commit.commitMessage).append("\n");
-        }
-        return sb.toString();
-    }
 }

Add a comment

Open 0
Closed 0

List

...	...	@@ -34,11 +34,10 @@
34	34	PullRequestMergeResult mergeResult = pullRequest.attemptMerge();
35	35
36	36	if (mergeResult.commitChanged()) {
37		-
	37	+
38	38	mergeResult.saveCommits();
39	39
40	40	if (!mergeResult.getNewCommits().isEmpty()) {
41		- NotificationEvent.addCommitChange(message.getSender(), pullRequest, message.getRequest(), mergeResult);
42	41	PullRequestEvent.addCommitEvents(message.getSender(), pullRequest, mergeResult.getNewCommits());
43	42	}
44	43	}

...	...	@@ -352,55 +352,4 @@
352	352
353	353	return notiEvent;
354	354	}
355		-
356		- /**
357		- * 보낸 코드의 커밋 변경시 알림 설정
358		- * @param sender
359		- * @param pullRequest
360		- * @param request
361		- * @param mergeResult
362		- * @return
363		- */
364		- public static NotificationEvent addCommitChange(User sender, PullRequest pullRequest, Request request,
365		- PullRequestMergeResult mergeResult) {
366		-
367		- String title = NotificationEvent.formatReplyTitle(pullRequest);
368		- Resource resource = pullRequest.asResource();
369		- Set<User> watchers = pullRequest.getWatchers();
370		- watchers.addAll(NotificationEvent.getMentionedUsers(pullRequest.body));
371		- watchers.remove(pullRequest.contributor);
372		-
373		- Project toProject = pullRequest.toProject;
374		-
375		- NotificationEvent notiEvent = new NotificationEvent();
376		- notiEvent.created = new Date();
377		- notiEvent.title = title;
378		- notiEvent.senderId = sender.id;
379		- notiEvent.receivers = watchers;
380		- notiEvent.urlToView = routes.PullRequestApp.pullRequest(
381		- toProject.owner, toProject.name, pullRequest.number).absoluteURL(
382		- request);
383		- notiEvent.resourceId = resource.getId();
384		- notiEvent.resourceType = resource.getType();
385		- notiEvent.eventType = EventType.PULL_REQUEST_COMMIT_CHANGED;
386		- notiEvent.oldValue = makeCommitMessage(pullRequest.pullRequestCommits);
387		- notiEvent.newValue = makeCommitMessage(mergeResult.getNewCommits());
388		-
389		- add(notiEvent);
390		-
391		- return notiEvent;
392		- }
393		-
394		- /**
395		- * 알림용 커밋메세지를 생성
396		- * @param commits
397		- * @return
398		- */
399		- private static String makeCommitMessage(List<PullRequestCommit> commits) {
400		- StringBuilder sb = new StringBuilder();
401		- for (PullRequestCommit commit : commits) {
402		- sb.append(commit.commitShortId).append(": ").append(commit.commitMessage).append("\n");
403		- }
404		- return sb.toString();
405		- }
406	355	}

Delete comment