Skip to content

The Unified and Autonomous Development Platform

feat: Add webhook notification for build and PR label changes

Robin Shen40648bece36b
diff --git a/server-core/src/main/java/io/onedev/server/event/project/build/BuildLabelAdded.java b/server-core/src/main/java/io/onedev/server/event/project/build/BuildLabelAdded.java
new file mode 100644
index 0000000000..1f986f8cc2
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/event/project/build/BuildLabelAdded.java
@@ -0,0 +1,36 @@
+package io.onedev.server.event.project.build;
+
+import java.text.MessageFormat;
+import java.util.Date;
+
+import org.jspecify.annotations.Nullable;
+
+import io.onedev.server.model.Build;
+import io.onedev.server.model.User;
+
+public class BuildLabelAdded extends BuildEvent {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String label;
+
+ public BuildLabelAdded(@Nullable User user, Date date, Build build, String label) {
+ super(user, date, build);
+ this.label = label;
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ @Override
+ public String getActivity() {
+ return MessageFormat.format("added label \"{0}\"", label);
+ }
+
+ @Override
+ public boolean isMinor() {
+ return true;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/event/project/build/BuildLabelRemoved.java b/server-core/src/main/java/io/onedev/server/event/project/build/BuildLabelRemoved.java
new file mode 100644
index 0000000000..0d35ca0d11
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/event/project/build/BuildLabelRemoved.java
@@ -0,0 +1,36 @@
+package io.onedev.server.event.project.build;
+
+import java.text.MessageFormat;
+import java.util.Date;
+
+import org.jspecify.annotations.Nullable;
+
+import io.onedev.server.model.Build;
+import io.onedev.server.model.User;
+
+public class BuildLabelRemoved extends BuildEvent {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String label;
+
+ public BuildLabelRemoved(@Nullable User user, Date date, Build build, String label) {
+ super(user, date, build);
+ this.label = label;
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ @Override
+ public String getActivity() {
+ return MessageFormat.format("removed label \"{0}\"", label);
+ }
+
+ @Override
+ public boolean isMinor() {
+ return true;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestLabelAdded.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestLabelAdded.java
new file mode 100644
index 0000000000..36af1ba957
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestLabelAdded.java
@@ -0,0 +1,36 @@
+package io.onedev.server.event.project.pullrequest;
+
+import java.text.MessageFormat;
+import java.util.Date;
+
+import org.jspecify.annotations.Nullable;
+
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
+
+public class PullRequestLabelAdded extends PullRequestEvent {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String label;
+
+ public PullRequestLabelAdded(@Nullable User user, Date date, PullRequest request, String label) {
+ super(user, date, request);
+ this.label = label;
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ @Override
+ public String getActivity() {
+ return MessageFormat.format("added label \"{0}\"", label);
+ }
+
+ @Override
+ public boolean isMinor() {
+ return true;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestLabelRemoved.java b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestLabelRemoved.java
new file mode 100644
index 0000000000..1dd8b7133a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/event/project/pullrequest/PullRequestLabelRemoved.java
@@ -0,0 +1,36 @@
+package io.onedev.server.event.project.pullrequest;
+
+import java.text.MessageFormat;
+import java.util.Date;
+
+import org.jspecify.annotations.Nullable;
+
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
+
+public class PullRequestLabelRemoved extends PullRequestEvent {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String label;
+
+ public PullRequestLabelRemoved(@Nullable User user, Date date, PullRequest request, String label) {
+ super(user, date, request);
+ this.label = label;
+ }
+
+ public String getLabel() {
+ return label;
+ }
+
+ @Override
+ public String getActivity() {
+ return MessageFormat.format("removed label \"{0}\"", label);
+ }
+
+ @Override
+ public boolean isMinor() {
+ return true;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java
index 10dbd11c9a..9b9e86276f 100644
--- a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java
@@ -116,7 +116,7 @@ public class BuildNotificationManager implements Serializable {
@Sessional
@Listen
public void on(BuildEvent event) {
- if (!(event instanceof BuildUpdated) && (event.getUser() == null || event.getUser().getType() != User.Type.SERVICE)) {
+ if (!event.isMinor() && !(event instanceof BuildUpdated) && (event.getUser() == null || event.getUser().getType() != User.Type.SERVICE)) {
Project project = event.getProject();
Map<User, Collection<String>> subscribedQueryStrings = new HashMap<>();
for (BuildQueryPersonalization personalization: project.getBuildQueryPersonalizations()) {
diff --git a/server-core/src/main/java/io/onedev/server/notification/ChannelNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/ChannelNotificationManager.java
index c4770ea107..97e8ed3bdf 100644
--- a/server-core/src/main/java/io/onedev/server/notification/ChannelNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/ChannelNotificationManager.java
@@ -91,7 +91,7 @@ public abstract class ChannelNotificationManager<T extends ChannelNotificationSe
@Sessional
@Listen
public void on(BuildEvent event) {
- if (event.getUser() == null || event.getUser().getType() != User.Type.SERVICE) {
+ if (!event.isMinor() && (event.getUser() == null || event.getUser().getType() != User.Type.SERVICE)) {
Build build = event.getBuild();
var status = StringUtils.capitalize(build.getStatus().toString().toLowerCase());
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/BaseEntityLabelService.java b/server-core/src/main/java/io/onedev/server/service/impl/BaseEntityLabelService.java
index fc3e39a9dc..acfc9d04eb 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/BaseEntityLabelService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/BaseEntityLabelService.java
@@ -35,11 +35,13 @@ public abstract class BaseEntityLabelService<T extends EntityLabel> extends Base
if (labelSpec == null)
throw new EntityNotFoundException("Label spec not found: " + it);
var label = newEntityLabel((AbstractEntity) entity, labelSpec);
- dao.persist(label);
+ create(label);
entity.getLabels().add(label);
});
}
+ public abstract void create(T label);
+
protected abstract T newEntityLabel(AbstractEntity entity, LabelSpec spec);
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildLabelService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildLabelService.java
index db65e043c3..4ec732711c 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildLabelService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultBuildLabelService.java
@@ -1,24 +1,34 @@
package io.onedev.server.service.impl;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
+import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.Root;
import com.google.common.base.Preconditions;
+import io.onedev.server.event.ListenerRegistry;
+import io.onedev.server.event.project.build.BuildLabelAdded;
+import io.onedev.server.event.project.build.BuildLabelRemoved;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Build;
import io.onedev.server.model.BuildLabel;
import io.onedev.server.model.LabelSpec;
import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.security.SecurityUtils;
import io.onedev.server.service.BuildLabelService;
@Singleton
public class DefaultBuildLabelService extends BaseEntityLabelService<BuildLabel> implements BuildLabelService {
+ @Inject
+ private ListenerRegistry listenerRegistry;
+
@Override
protected BuildLabel newEntityLabel(AbstractEntity entity, LabelSpec spec) {
var label = new BuildLabel();
@@ -27,10 +37,21 @@ public class DefaultBuildLabelService extends BaseEntityLabelService<BuildLabel>
return label;
}
+ @Transactional
@Override
public void create(BuildLabel buildLabel) {
Preconditions.checkState(buildLabel.isNew());
dao.persist(buildLabel);
+ listenerRegistry.post(new BuildLabelAdded(SecurityUtils.getUser(), new Date(),
+ buildLabel.getBuild(), buildLabel.getSpec().getName()));
+ }
+
+ @Transactional
+ @Override
+ public void delete(BuildLabel buildLabel) {
+ super.delete(buildLabel);
+ listenerRegistry.post(new BuildLabelRemoved(SecurityUtils.getUser(), new Date(),
+ buildLabel.getBuild(), buildLabel.getSpec().getName()));
}
@Sessional
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestLabelService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestLabelService.java
index 6f2fb13304..5b7db96fea 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestLabelService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestLabelService.java
@@ -2,24 +2,34 @@ package io.onedev.server.service.impl;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Date;
+import jakarta.inject.Inject;
import jakarta.inject.Singleton;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.Root;
import com.google.common.base.Preconditions;
+import io.onedev.server.event.ListenerRegistry;
+import io.onedev.server.event.project.pullrequest.PullRequestLabelAdded;
+import io.onedev.server.event.project.pullrequest.PullRequestLabelRemoved;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.LabelSpec;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestLabel;
import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.security.SecurityUtils;
import io.onedev.server.service.PullRequestLabelService;
@Singleton
public class DefaultPullRequestLabelService extends BaseEntityLabelService<PullRequestLabel>
implements PullRequestLabelService {
+ @Inject
+ private ListenerRegistry listenerRegistry;
+
@Override
protected PullRequestLabel newEntityLabel(AbstractEntity entity, LabelSpec spec) {
var label = new PullRequestLabel();
@@ -28,10 +38,21 @@ public class DefaultPullRequestLabelService extends BaseEntityLabelService<PullR
return label;
}
+ @Transactional
@Override
public void create(PullRequestLabel pullRequestLabel) {
Preconditions.checkState(pullRequestLabel.isNew());
dao.persist(pullRequestLabel);
+ listenerRegistry.post(new PullRequestLabelAdded(SecurityUtils.getUser(), new Date(),
+ pullRequestLabel.getRequest(), pullRequestLabel.getSpec().getName()));
+ }
+
+ @Transactional
+ @Override
+ public void delete(PullRequestLabel pullRequestLabel) {
+ super.delete(pullRequestLabel);
+ listenerRegistry.post(new PullRequestLabelRemoved(SecurityUtils.getUser(), new Date(),
+ pullRequestLabel.getRequest(), pullRequestLabel.getSpec().getName()));
}
@Sessional
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java
index e5d11ef711..84a0dca389 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestService.java
@@ -795,7 +795,7 @@ public class DefaultPullRequestService extends BaseEntityService<PullRequest>
@Sessional
public void on(BuildEvent event) {
Build build = event.getBuild();
- if (build.getRequest() != null && build.getRequest().isOpen()) {
+ if (!event.isMinor() && build.getRequest() != null && build.getRequest().isOpen()) {
if (build.getCommitHash().equals(build.getRequest().getBuildCommitHash()))
listenerRegistry.post(new PullRequestBuildEvent(build));
}