Skip to content

The Unified and Autonomous Development Platform

Code comments visit date refactoring

robin shen44060efbdc0d
diff --git a/core/src/main/java/com/gitplex/server/manager/VisitManager.java b/core/src/main/java/com/gitplex/server/manager/VisitManager.java
index eb389c5d09..092054a6f7 100644
--- a/core/src/main/java/com/gitplex/server/manager/VisitManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/VisitManager.java
@@ -10,14 +10,19 @@ import com.gitplex.server.model.User;
public interface VisitManager {
- void visit(User user, PullRequest request);
+ void visitPullRequest(User user, PullRequest request);
- void visit(User user, CodeComment comment);
+ void visitPullRequestCodeComments(User user, PullRequest request);
+
+ void visitCodeComment(User user, CodeComment comment);
+
+ @Nullable
+ Date getPullRequestVisitDate(User user, PullRequest request);
@Nullable
- Date getVisitDate(User user, PullRequest request);
+ Date getPullRequestCodeCommentsVisitDate(User user, PullRequest request);
@Nullable
- Date getVisitDate(User user, CodeComment comment);
+ Date getCodeCommentVisitDate(User user, CodeComment comment);
}
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultNotificationManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultNotificationManager.java
index 17a8a9194b..bb926abf2d 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultNotificationManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultNotificationManager.java
@@ -316,7 +316,7 @@ public class DefaultNotificationManager implements NotificationManager {
if (request.getLastEvent() == null) {
usersToNotify.add(watch.getUser());
} else {
- Date visitDate = visitInfoManager.getVisitDate(watch.getUser(), request);
+ Date visitDate = visitInfoManager.getPullRequestVisitDate(watch.getUser(), request);
if (visitDate == null || visitDate.getTime()<request.getLastEvent().getDate().getTime()) {
if (!request.getLastEvent().getType().equals(eventType)) {
usersToNotify.add(watch.getUser());
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitManager.java
index cdf5a2c3bf..716a02632e 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitManager.java
@@ -39,6 +39,8 @@ public class DefaultVisitManager extends AbstractEnvironmentManager implements V
private static final String PULL_REQUEST_STORE = "pullRequest";
+ private static final String PULL_REQUEST_CODE_COMMENTS_STORE = "pullRequestCodeComments";
+
private static final String CODE_COMMENT_STORE = "codeComment";
private final StorageManager storageManager;
@@ -52,7 +54,7 @@ public class DefaultVisitManager extends AbstractEnvironmentManager implements V
}
@Override
- public void visit(User user, PullRequest request) {
+ public void visitPullRequest(User user, PullRequest request) {
Environment env = getEnv(request.getTargetProject().getId().toString());
Store store = getStore(env, PULL_REQUEST_STORE);
env.executeInTransaction(new TransactionalExecutable() {
@@ -67,7 +69,22 @@ public class DefaultVisitManager extends AbstractEnvironmentManager implements V
}
@Override
- public void visit(User user, CodeComment comment) {
+ public void visitPullRequestCodeComments(User user, PullRequest request) {
+ Environment env = getEnv(request.getTargetProject().getId().toString());
+ Store store = getStore(env, PULL_REQUEST_CODE_COMMENTS_STORE);
+ env.executeInTransaction(new TransactionalExecutable() {
+
+ @Override
+ public void execute(Transaction txn) {
+ store.put(txn, new StringPairByteIterable(user.getUUID(), request.getUUID()),
+ new ArrayByteIterable(longToBytes(System.currentTimeMillis()+1000L)));
+ }
+
+ });
+ }
+
+ @Override
+ public void visitCodeComment(User user, CodeComment comment) {
Environment env = getEnv(comment.getProject().getId().toString());
Store store = getStore(env, CODE_COMMENT_STORE);
env.executeInTransaction(new TransactionalExecutable() {
@@ -82,7 +99,7 @@ public class DefaultVisitManager extends AbstractEnvironmentManager implements V
}
@Override
- public Date getVisitDate(User user, PullRequest request) {
+ public Date getPullRequestVisitDate(User user, PullRequest request) {
Environment env = getEnv(request.getTargetProject().getId().toString());
Store store = getStore(env, PULL_REQUEST_STORE);
return env.computeInTransaction(new TransactionalComputable<Date>() {
@@ -100,7 +117,25 @@ public class DefaultVisitManager extends AbstractEnvironmentManager implements V
}
@Override
- public Date getVisitDate(User user, CodeComment comment) {
+ public Date getPullRequestCodeCommentsVisitDate(User user, PullRequest request) {
+ Environment env = getEnv(request.getTargetProject().getId().toString());
+ Store store = getStore(env, PULL_REQUEST_CODE_COMMENTS_STORE);
+ return env.computeInTransaction(new TransactionalComputable<Date>() {
+
+ @Override
+ public Date compute(Transaction txn) {
+ byte[] bytes = getBytes(store.get(txn, new StringPairByteIterable(user.getUUID(), request.getUUID())));
+ if (bytes != null)
+ return new Date(bytesToLong(bytes));
+ else
+ return null;
+ }
+
+ });
+ }
+
+ @Override
+ public Date getCodeCommentVisitDate(User user, CodeComment comment) {
Environment env = getEnv(comment.getProject().getId().toString());
Store store = getStore(env, CODE_COMMENT_STORE);
return env.computeInTransaction(new TransactionalComputable<Date>() {
@@ -119,30 +154,30 @@ public class DefaultVisitManager extends AbstractEnvironmentManager implements V
@Listen
public void on(CodeCommentEvent event) {
- visit(event.getUser(), event.getComment());
+ visitCodeComment(event.getUser(), event.getComment());
}
@Listen
public void on(PullRequestCommentCreated event) {
- visit(event.getUser(), event.getRequest());
+ visitPullRequest(event.getUser(), event.getRequest());
}
@Listen
public void on(PullRequestCodeCommentEvent event) {
if (!event.isPassive())
- visit(event.getUser(), event.getRequest());
+ visitPullRequest(event.getUser(), event.getRequest());
}
@Listen
public void on(PullRequestOpened event) {
if (event.getRequest().getSubmitter() != null)
- visit(event.getRequest().getSubmitter(), event.getRequest());
+ visitPullRequest(event.getRequest().getSubmitter(), event.getRequest());
}
@Listen
public void on(PullRequestStatusChangeEvent event) {
if (event.getUser() != null)
- visit(event.getUser(), event.getRequest());
+ visitPullRequest(event.getUser(), event.getRequest());
}
@Transactional
diff --git a/core/src/main/java/com/gitplex/server/model/CodeComment.java b/core/src/main/java/com/gitplex/server/model/CodeComment.java
index cfbf5ca64f..7124d259f7 100644
--- a/core/src/main/java/com/gitplex/server/model/CodeComment.java
+++ b/core/src/main/java/com/gitplex/server/model/CodeComment.java
@@ -205,7 +205,7 @@ public class CodeComment extends AbstractEntity {
public boolean isVisitedAfter(Date date) {
User user = SecurityUtils.getUser();
if (user != null) {
- Date visitDate = GitPlex.getInstance(VisitManager.class).getVisitDate(user, this);
+ Date visitDate = GitPlex.getInstance(VisitManager.class).getCodeCommentVisitDate(user, this);
return visitDate != null && visitDate.getTime()>date.getTime();
} else {
return true;
diff --git a/core/src/main/java/com/gitplex/server/model/PullRequest.java b/core/src/main/java/com/gitplex/server/model/PullRequest.java
index 1ce7306e28..428e526315 100644
--- a/core/src/main/java/com/gitplex/server/model/PullRequest.java
+++ b/core/src/main/java/com/gitplex/server/model/PullRequest.java
@@ -704,7 +704,17 @@ public class PullRequest extends AbstractEntity {
public boolean isVisitedAfter(Date date) {
User user = SecurityUtils.getUser();
if (user != null) {
- Date visitDate = GitPlex.getInstance(VisitManager.class).getVisitDate(user, this);
+ Date visitDate = GitPlex.getInstance(VisitManager.class).getPullRequestVisitDate(user, this);
+ return visitDate != null && visitDate.getTime()>date.getTime();
+ } else {
+ return true;
+ }
+ }
+
+ public boolean isCodeCommentsVisitedAfter(Date date) {
+ User user = SecurityUtils.getUser();
+ if (user != null) {
+ Date visitDate = GitPlex.getInstance(VisitManager.class).getPullRequestCodeCommentsVisitDate(user, this);
return visitDate != null && visitDate.getTime()>date.getTime();
} else {
return true;
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.java b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.java
index f7d96d031c..d2648ffd67 100644
--- a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.java
@@ -510,6 +510,49 @@ public abstract class CodeCommentPanel extends Panel {
add(repliesView);
add(newAddReplyContainer());
+ RequestCycle.get().getListeners().add(new IRequestCycleListener() {
+
+ @Override
+ public void onUrlMapped(RequestCycle cycle, IRequestHandler handler, Url url) {
+ }
+
+ @Override
+ public void onRequestHandlerScheduled(RequestCycle cycle, IRequestHandler handler) {
+ }
+
+ @Override
+ public void onRequestHandlerResolved(RequestCycle cycle, IRequestHandler handler) {
+ }
+
+ @Override
+ public void onRequestHandlerExecuted(RequestCycle cycle, IRequestHandler handler) {
+ }
+
+ @Override
+ public void onExceptionRequestHandlerResolved(RequestCycle cycle, IRequestHandler handler, Exception exception) {
+ }
+
+ @Override
+ public IRequestHandler onException(RequestCycle cycle, Exception ex) {
+ return null;
+ }
+
+ @Override
+ public void onEndRequest(RequestCycle cycle) {
+ if (SecurityUtils.getUser() != null) {
+ GitPlex.getInstance(VisitManager.class).visitCodeComment(SecurityUtils.getUser(), getComment());
+ }
+ }
+
+ @Override
+ public void onDetach(RequestCycle cycle) {
+ }
+
+ @Override
+ public void onBeginRequest(RequestCycle cycle) {
+ }
+ });
+
setOutputMarkupId(true);
}
@@ -555,51 +598,6 @@ public abstract class CodeCommentPanel extends Panel {
prevReplyMarkupId = newReplyContainer.getMarkupId();
}
- if (pageDataChanged.isOnConnect()) {
- RequestCycle.get().getListeners().add(new IRequestCycleListener() {
-
- @Override
- public void onUrlMapped(RequestCycle cycle, IRequestHandler handler, Url url) {
- }
-
- @Override
- public void onRequestHandlerScheduled(RequestCycle cycle, IRequestHandler handler) {
- }
-
- @Override
- public void onRequestHandlerResolved(RequestCycle cycle, IRequestHandler handler) {
- }
-
- @Override
- public void onRequestHandlerExecuted(RequestCycle cycle, IRequestHandler handler) {
- }
-
- @Override
- public void onExceptionRequestHandlerResolved(RequestCycle cycle, IRequestHandler handler, Exception exception) {
- }
-
- @Override
- public IRequestHandler onException(RequestCycle cycle, Exception ex) {
- return null;
- }
-
- @Override
- public void onEndRequest(RequestCycle cycle) {
- if (SecurityUtils.getUser() != null) {
- GitPlex.getInstance(VisitManager.class).visit(SecurityUtils.getUser(), getComment());
- }
- }
-
- @Override
- public void onDetach(RequestCycle cycle) {
- }
-
- @Override
- public void onBeginRequest(RequestCycle cycle) {
- }
- });
-
- }
}
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/newrequest/NewRequestPage.html b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/newrequest/NewRequestPage.html
index e121109f32..c9e2e037cf 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/newrequest/NewRequestPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/newrequest/NewRequestPage.html
@@ -93,10 +93,12 @@
<td class="name">Required Reviewers</td>
<td class="value"><div wicket:id="reviewers"></div></td>
</tr>
+ <wicket:enclosure child="verifications">
<tr class="verifications">
<td class="name">Required Verifications</td>
<td class="value"><div wicket:id="verifications"></div></td>
</tr>
+ </wicket:enclosure>
</table>
<div class="clearfix">
<input wicket:id="send" type="submit" class="btn btn-primary pull-left" value="Create Pull Request"></input>
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.java
index 4b513a8e12..61c8efa4bf 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.java
@@ -324,60 +324,50 @@ public abstract class RequestDetailPage extends ProjectPage {
tabs.add(new RequestTab("Merge Preview", MergePreviewPage.class));
add(new Tabbable("requestTabs", tabs).setOutputMarkupId(true));
- }
-
- @Override
- public void onEvent(IEvent<?> event) {
- super.onEvent(event);
- if (event.getPayload() instanceof PageDataChanged) {
- PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();
- if (pageDataChanged.isOnConnect()) {
- RequestCycle.get().getListeners().add(new IRequestCycleListener() {
-
- @Override
- public void onUrlMapped(RequestCycle cycle, IRequestHandler handler, Url url) {
- }
-
- @Override
- public void onRequestHandlerScheduled(RequestCycle cycle, IRequestHandler handler) {
- }
-
- @Override
- public void onRequestHandlerResolved(RequestCycle cycle, IRequestHandler handler) {
- }
-
- @Override
- public void onRequestHandlerExecuted(RequestCycle cycle, IRequestHandler handler) {
- }
-
- @Override
- public void onExceptionRequestHandlerResolved(RequestCycle cycle, IRequestHandler handler, Exception exception) {
- }
-
- @Override
- public IRequestHandler onException(RequestCycle cycle, Exception ex) {
- return null;
- }
-
- @Override
- public void onEndRequest(RequestCycle cycle) {
- if (SecurityUtils.getUser() != null) {
- GitPlex.getInstance(VisitManager.class).visit(SecurityUtils.getUser(),
- getPullRequest());
- }
- }
-
- @Override
- public void onDetach(RequestCycle cycle) {
- }
-
- @Override
- public void onBeginRequest(RequestCycle cycle) {
- }
-
- });
+
+ RequestCycle.get().getListeners().add(new IRequestCycleListener() {
+
+ @Override
+ public void onUrlMapped(RequestCycle cycle, IRequestHandler handler, Url url) {
}
- }
+
+ @Override
+ public void onRequestHandlerScheduled(RequestCycle cycle, IRequestHandler handler) {
+ }
+
+ @Override
+ public void onRequestHandlerResolved(RequestCycle cycle, IRequestHandler handler) {
+ }
+
+ @Override
+ public void onRequestHandlerExecuted(RequestCycle cycle, IRequestHandler handler) {
+ }
+
+ @Override
+ public void onExceptionRequestHandlerResolved(RequestCycle cycle, IRequestHandler handler, Exception exception) {
+ }
+
+ @Override
+ public IRequestHandler onException(RequestCycle cycle, Exception ex) {
+ return null;
+ }
+
+ @Override
+ public void onEndRequest(RequestCycle cycle) {
+ if (SecurityUtils.getUser() != null) {
+ GitPlex.getInstance(VisitManager.class).visitPullRequest(SecurityUtils.getUser(), getPullRequest());
+ }
+ }
+
+ @Override
+ public void onDetach(RequestCycle cycle) {
+ }
+
+ @Override
+ public void onBeginRequest(RequestCycle cycle) {
+ }
+
+ });
}
private WebMarkupContainer newStatusAndBranchesContainer() {
@@ -957,10 +947,12 @@ public abstract class RequestDetailPage extends ProjectPage {
@Override
protected String load() {
PullRequest request = getPullRequest();
- if (request.getLastCodeCommentEventDate() != null && !request.isVisitedAfter(request.getLastCodeCommentEventDate()))
+ if (request.getLastCodeCommentEventDate() != null
+ && !request.isCodeCommentsVisitedAfter(request.getLastCodeCommentEventDate())) {
return "new";
- else
+ } else {
return "";
+ }
}
}));
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java
index 67d9491b28..2f7e959502 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java
@@ -1,9 +1,16 @@
package com.gitplex.server.web.page.project.pullrequest.requestdetail.codecomments;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.request.IRequestHandler;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.cycle.IRequestCycleListener;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.manager.VisitManager;
import com.gitplex.server.model.PullRequest;
+import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.component.comment.CodeCommentFilter;
import com.gitplex.server.web.component.comment.CodeCommentListPanel;
import com.gitplex.server.web.page.project.pullrequest.requestdetail.RequestDetailPage;
@@ -49,6 +56,50 @@ public class RequestCodeCommentsPage extends RequestDetailPage {
}
});
+
+ RequestCycle.get().getListeners().add(new IRequestCycleListener() {
+
+ @Override
+ public void onUrlMapped(RequestCycle cycle, IRequestHandler handler, Url url) {
+ }
+
+ @Override
+ public void onRequestHandlerScheduled(RequestCycle cycle, IRequestHandler handler) {
+ }
+
+ @Override
+ public void onRequestHandlerResolved(RequestCycle cycle, IRequestHandler handler) {
+ }
+
+ @Override
+ public void onRequestHandlerExecuted(RequestCycle cycle, IRequestHandler handler) {
+ }
+
+ @Override
+ public void onExceptionRequestHandlerResolved(RequestCycle cycle, IRequestHandler handler, Exception exception) {
+ }
+
+ @Override
+ public IRequestHandler onException(RequestCycle cycle, Exception ex) {
+ return null;
+ }
+
+ @Override
+ public void onEndRequest(RequestCycle cycle) {
+ if (SecurityUtils.getUser() != null) {
+ GitPlex.getInstance(VisitManager.class).visitPullRequestCodeComments(SecurityUtils.getUser(), getPullRequest());
+ }
+ }
+
+ @Override
+ public void onDetach(RequestCycle cycle) {
+ }
+
+ @Override
+ public void onBeginRequest(RequestCycle cycle) {
+ }
+
+ });
}
}