Commit @80a80c5f08f1a951263dc69550e61aeb93ccd95e

[Notice] Announcing the End of Demo Server [Read me]

Keesun Baik 2015-03-05

NotificationEvent: bug fix

The pull-request's commit changed events occured even when it is not actually changed. like:
* new pull-request is created.
* other pull-requests are merged.

Fixed to send the event notification only when it is changed.

@80a80c5f08f1a951263dc69550e61aeb93ccd95e

a6d17fc

80a80c5

app/actors/PullRequestActor.java

--- app/actors/PullRequestActor.java

+++ app/actors/PullRequestActor.java


 
             if (mergeResult.hasDiffCommits()) {
                 mergeResult.saveCommits();
-                NotificationEvent.afterPullRequestCommitChanged(message.getSender(), pullRequest);
                 if (!mergeResult.getNewCommits().isEmpty()) {
+                    if (!message.isNewPullRequest()) {
+                        NotificationEvent.afterPullRequestCommitChanged(message.getSender(), pullRequest);
+                    }
                     PullRequestEvent.addCommitEvents(message.getSender(), pullRequest,
                             mergeResult.getNewCommits(),
                             getCommitEventOldValue(oldMergeCommitId, pullRequest.mergedCommitIdTo));

a6d17fc

80a80c5

app/controllers/PullRequestApp.java

--- app/controllers/PullRequestApp.java

+++ app/controllers/PullRequestApp.java


         NotificationEvent notiEvent = NotificationEvent.afterNewPullRequest(pullRequest);
         PullRequestEvent.addFromNotificationEvent(notiEvent, pullRequest);
 
-        PullRequestEventMessage message = new PullRequestEventMessage(
-                UserApp.currentUser(), request(), pullRequest);
+        PullRequestEventMessage message = new PullRequestEventMessage(UserApp.currentUser(), request(), pullRequest, notiEvent.eventType);
         Akka.system().actorOf(Props.create(PullRequestMergingActor.class)).tell(message, null);
 
         return redirect(pullRequestCall);

a6d17fc

80a80c5

app/models/PullRequestEventMessage.java

--- app/models/PullRequestEventMessage.java

+++ app/models/PullRequestEventMessage.java

...	...	@@ -20,6 +20,7 @@
20	20	*/
21	21	package models;
22	22
	23	+import models.enumeration.EventType;
23	24	import play.mvc.Http.Request;
24	25
25	26	public class PullRequestEventMessage {
...	...	@@ -28,6 +29,7 @@
28	29	private Project project;
29	30	private String branch;
30	31	private PullRequest pullRequest;
	32	+ private EventType eventType;
31	33
32	34	public PullRequestEventMessage(User sender, Request request, Project project, String branch) {
33	35	this.sender = sender;
...	...	@@ -40,6 +42,11 @@
40	42	this.sender = sender;
41	43	this.request = request;
42	44	this.pullRequest = pullRequest;
	45	+ }
	46	+
	47	+ public PullRequestEventMessage(User sender, Request request, PullRequest pullRequest, EventType eventType) {
	48	+ this(sender, request, pullRequest);
	49	+ this.eventType = eventType;
43	50	}
44	51
45	52	public User getSender() {
...	...	@@ -61,4 +68,8 @@
61	68	public PullRequest getPullRequest() {
62	69	return pullRequest;
63	70	}
	71	+
	72	+ public boolean isNewPullRequest() {
	73	+ return eventType != null && eventType == EventType.NEW_PULL_REQUEST;
	74	+ }
64	75	}

Add a comment

Open 0
Closed 0

List

...	...	@@ -281,8 +281,7 @@
281	281	NotificationEvent notiEvent = NotificationEvent.afterNewPullRequest(pullRequest);
282	282	PullRequestEvent.addFromNotificationEvent(notiEvent, pullRequest);
283	283
284		- PullRequestEventMessage message = new PullRequestEventMessage(
285		- UserApp.currentUser(), request(), pullRequest);
	284	+ PullRequestEventMessage message = new PullRequestEventMessage(UserApp.currentUser(), request(), pullRequest, notiEvent.eventType);
286	285	Akka.system().actorOf(Props.create(PullRequestMergingActor.class)).tell(message, null);
287	286
288	287	return redirect(pullRequestCall);

...	...	@@ -38,8 +38,10 @@
38	38
39	39	if (mergeResult.hasDiffCommits()) {
40	40	mergeResult.saveCommits();
41		- NotificationEvent.afterPullRequestCommitChanged(message.getSender(), pullRequest);
42	41	if (!mergeResult.getNewCommits().isEmpty()) {
	42	+ if (!message.isNewPullRequest()) {
	43	+ NotificationEvent.afterPullRequestCommitChanged(message.getSender(), pullRequest);
	44	+ }
43	45	PullRequestEvent.addCommitEvents(message.getSender(), pullRequest,
44	46	mergeResult.getNewCommits(),
45	47	getCommitEventOldValue(oldMergeCommitId, pullRequest.mergedCommitIdTo));

Delete comment