The Unified and Autonomous Development Platform
refactor: Rename methods for clarity in notification managers and improve handling of null project cases in choice providers
Robin Shen4f0cebaa56f2
diff --git a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.javaindex 39944c72f7..b7eb6ce48b 100644--- a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java@@ -322,7 +322,7 @@ public class IssueNotificationManager implements Serializable {&& user != null&& !user.equals(mentionedUser)&& canCreateWorkspace(mentionedUser, issue, true)) {- addressConcern(mentionedUser, user, issue);+ onAiMentioned(mentionedUser, user, issue);}}}@@ -348,14 +348,14 @@ public class IssueNotificationManager implements Serializable {EmailAddress emailAddress = watch.getUser().getPrimaryEmailAddress();if (emailAddress != null && emailAddress.isVerified())bccEmailAddresses.add(emailAddress.getValue());- } else if (event.getCommentText() instanceof MarkdownText+ } else if ((!user.isSystem()+ || event instanceof IssueOpened issueOpened && issueOpened.getIssue().getOnBehalfOf() != null+ || event instanceof IssueCommentCreated issueCommentCreated && issueCommentCreated.getComment().getOnBehalfOf() != null)+ && !user.equals(watch.getUser())&& watch.getUser().getAiSetting().isProactive()&& isAiEntitled(user, issue, watch.getUser(), false)- && user != null- && !user.isSystem()- && !user.equals(watch.getUser())&& canCreateWorkspace(watch.getUser(), issue, false)) {- onUserCommented(watch.getUser(), user, issue);+ onAiNotified(watch.getUser(), user, issue);}}}@@ -405,36 +405,39 @@ public class IssueNotificationManager implements Serializable {return Pair.of(commitId, branch);}- private void addressConcern(User ai, User commenter, Issue issue) {+ private void onAiMentioned(User ai, User user, Issue issue) {var branchAndCommitId = getWorkspaceCommitIdAndBranch(issue);- String prompt;+ String rolesInfo;var assignedFields = getAssignedFields(ai, issue);- if (assignedFields.isEmpty()) {- prompt = """- Work on issue %d to address %s's latest concern. \- Do not switch checkout if the concern does not require you to write code. \- Mention the user in your comment if you expect a response. \- Make sure to submit work afterwards without confirmation."""- .formatted(issue.getNumber(), commenter.getName());+ if (!assignedFields.isEmpty()) {+ rolesInfo = "as roles [%s] ".formatted(StringUtils.join(assignedFields, ", "));} else {- prompt = """- Work on issue %d as roles [%s] to address %s's latest concern. \- Do not switch checkout if the concern does not require you to write code. \- Mention the user in your comment if you expect a response. \- Make sure to submit work afterwards without confirmation.""".- formatted(issue.getNumber(), StringUtils.join(assignedFields, ", "), commenter.getName());+ rolesInfo = "";}+ String prompt = """+ Work on issue %d %sto address %s's latest concern. \+ Do not switch checkout if the concern does not require you to write code. \+ Mention the user in your comment if you expect a response. \+ Make sure to submit work afterwards without confirmation.""".+ formatted(issue.getNumber(), rolesInfo, user.getName());runPrompt(ai, issue, issue.getProject(), branchAndCommitId.getLeft(), branchAndCommitId.getRight(), prompt);}- private void onUserCommented(User ai, User commenter, Issue issue) {+ private void onAiNotified(User ai, User user, Issue issue) {var branchAndCommitId = getWorkspaceCommitIdAndBranch(issue);+ String rolesInfo;+ var assignedFields = getAssignedFields(ai, issue);+ if (!assignedFields.isEmpty()) {+ rolesInfo = "as roles [%s] ".formatted(StringUtils.join(assignedFields, ", "));+ } else {+ rolesInfo = "";+ }String prompt = """- Work on issue %d to check whether you are relevant to %s's latest comment. \- Do not switch checkout if the comment does not require you to write code. \+ Work on issue %d %sto check whether you are relevant to %s's latest concern. \+ Do not switch checkout if the concern does not require you to write code. \Respond only if you are relevant and a response is necessary. \Make sure to submit work afterwards without confirmation."""- .formatted(issue.getNumber(), commenter.getName());+ .formatted(issue.getNumber(), rolesInfo, user.getName());runPrompt(ai, issue, issue.getProject(), branchAndCommitId.getLeft(), branchAndCommitId.getRight(), prompt);}diff --git a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.javaindex cb77fb9feb..1ffc70616e 100644--- a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java@@ -379,7 +379,7 @@ public class PullRequestNotificationManager implements Serializable {&& user != null&& !user.equals(mentionedUser)&& canCreateWorkspace(mentionedUser, request, true)) {- addressConcern(mentionedUser, user, request);+ onUserMentioned(mentionedUser, user, request);}}}@@ -533,7 +533,7 @@ public class PullRequestNotificationManager implements Serializable {}}- private void addressConcern(User ai, User commenter, PullRequest request) {+ private void onUserMentioned(User ai, User commenter, PullRequest request) {List<String> prompts = new ArrayList<>();if (request.getSubmitter().equals(ai)) {prompts.add("Work on pull request %d as submitter to address %s's latest concern."diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.javaindex 62c207af99..a744b36154 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java@@ -1,5 +1,6 @@package io.onedev.server.web.component.build.choice;+import java.util.ArrayList;import java.util.Collection;import java.util.List;@@ -9,7 +10,6 @@ import org.json.JSONWriter;import org.jspecify.annotations.Nullable;import org.unbescape.html.HtmlEscape;-import com.google.common.base.Preconditions;import com.google.common.collect.Lists;import io.onedev.server.OneDev;@@ -60,9 +60,12 @@ public abstract class BuildChoiceProvider extends ChoiceProvider<Build> {int count = (page+1) * WebConstants.PAGE_SIZE + 1;var buildService = OneDev.getInstance(BuildService.class);var subject = SecurityUtils.getSubject();- if (useNumber) {- Preconditions.checkState(getProject() != null);- List<Build> builds = buildService.query(subject, getProject(), term, count);+ if (useNumber) {+ List<Build> builds;+ if (getProject() != null)+ builds = buildService.query(subject, getProject(), term, count);+ else+ builds = new ArrayList<>();new ResponseFiller<>(response).fill(builds, page, WebConstants.PAGE_SIZE);} else {var scopedQuery = ProjectScopedQuery.of(getProject(), term, '#', '-');diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.javaindex 67ed9dcdc4..b9ab557268 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java@@ -10,7 +10,6 @@ import org.json.JSONWriter;import org.jspecify.annotations.Nullable;import org.unbescape.html.HtmlEscape;-import com.google.common.base.Preconditions;import com.google.common.collect.Lists;import io.onedev.server.OneDev;@@ -87,9 +86,13 @@ public abstract class IssueChoiceProvider extends ChoiceProvider<Issue> {var issueService = OneDev.getInstance(IssueService.class);var subject = SecurityUtils.getSubject();if (useNumber) {- Preconditions.checkState(getProject() != null);- var issueQuery = buildQuery(term);- var issues = issueService.query(subject, new ProjectScope(getProject(), false, false), issueQuery, false, 0, count);+ List<Issue> issues;+ if (getProject() != null) {+ var issueQuery = buildQuery(term);+ issues = issueService.query(subject, new ProjectScope(getProject(), false, false), issueQuery, false, 0, count);+ } else {+ issues = new ArrayList<>();+ }new ResponseFiller<>(response).fill(issues, page, WebConstants.PAGE_SIZE);} else {var scopedQuery = ProjectScopedQuery.of(getProject(), term, '#', '-');diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.javaindex 4f4d97026e..20b8297247 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java@@ -1,5 +1,6 @@package io.onedev.server.web.component.pullrequest.choice;+import java.util.ArrayList;import java.util.Collection;import java.util.List;@@ -9,7 +10,6 @@ import org.json.JSONWriter;import org.jspecify.annotations.Nullable;import org.unbescape.html.HtmlEscape;-import com.google.common.base.Preconditions;import com.google.common.collect.Lists;import io.onedev.server.OneDev;@@ -62,9 +62,13 @@ public abstract class PullRequestChoiceProvider extends ChoiceProvider<PullRequevar pullRequestService = OneDev.getInstance(PullRequestService.class);var subject = SecurityUtils.getSubject();if (useNumber) {- Preconditions.checkState(getProject() != null);- List<PullRequest> requests = pullRequestService.query(subject, getProject(),- new PullRequestQuery(new FuzzyCriteria(term)), false, 0, count);+ List<PullRequest> requests;+ if (getProject() != null) {+ requests = pullRequestService.query(subject, getProject(),+ new PullRequestQuery(new FuzzyCriteria(term)), false, 0, count);+ } else {+ requests = new ArrayList<>();+ }new ResponseFiller<>(response).fill(requests, page, WebConstants.PAGE_SIZE);} else {var scopedQuery = ProjectScopedQuery.of(getProject(), term, '#', '-');