Skip to content

The Unified and Autonomous Development Platform

feat: Able to add emoji reactions to issue work item (OD-2793)

Robin Shen8a7cdfdb450b
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.java
index af562f24e0..443c96f53d 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -228,6 +228,7 @@ import io.onedev.server.service.IssueStateHistoryService;
import io.onedev.server.service.IssueTouchService;
import io.onedev.server.service.IssueVoteService;
import io.onedev.server.service.IssueWatchService;
+import io.onedev.server.service.IssueWorkReactionService;
import io.onedev.server.service.IssueWorkService;
import io.onedev.server.service.IterationService;
import io.onedev.server.service.LabelSpecService;
@@ -316,6 +317,7 @@ import io.onedev.server.service.impl.DefaultIssueStateHistoryService;
import io.onedev.server.service.impl.DefaultIssueTouchService;
import io.onedev.server.service.impl.DefaultIssueVoteService;
import io.onedev.server.service.impl.DefaultIssueWatchService;
+import io.onedev.server.service.impl.DefaultIssueWorkReactionService;
import io.onedev.server.service.impl.DefaultIssueWorkService;
import io.onedev.server.service.impl.DefaultIterationService;
import io.onedev.server.service.impl.DefaultLabelSpecService;
@@ -599,6 +601,7 @@ public class CoreModule extends AbstractPluginModule {
bind(OAuthTokenService.class).to(DefaultOAuthTokenService.class);
bind(IssueReactionService.class).to(DefaultIssueReactionService.class);
bind(IssueCommentReactionService.class).to(DefaultIssueCommentReactionService.class);
+ bind(IssueWorkReactionService.class).to(DefaultIssueWorkReactionService.class);
bind(PullRequestReactionService.class).to(DefaultPullRequestReactionService.class);
bind(PullRequestCommentReactionService.class).to(DefaultPullRequestCommentReactionService.class);
bind(SsoProviderService.class).to(DefaultSsoProviderService.class);
diff --git a/server-core/src/main/java/io/onedev/server/ai/QueryDescriptions.java b/server-core/src/main/java/io/onedev/server/ai/QueryDescriptions.java
index a45c1d1461..a2902265c4 100644
--- a/server-core/src/main/java/io/onedev/server/ai/QueryDescriptions.java
+++ b/server-core/src/main/java/io/onedev/server/ai/QueryDescriptions.java
@@ -53,8 +53,8 @@ public class QueryDescriptions {
| '"Reaction: Confused Count"' 'is' ('greater'|'less') 'than' '"'Number'"'
| '"Reaction: Heart Count"' 'is' ('not')? '"'Number'"'
| '"Reaction: Heart Count"' 'is' ('greater'|'less') 'than' '"'Number'"'
- | '"Reaction: Rocket Count"' 'is' ('not')? '"'Number'"'
- | '"Reaction: Rocket Count"' 'is' ('greater'|'less') 'than' '"'Number'"'
+ | '"Reaction: Tick Count"' 'is' ('not')? '"'Number'"'
+ | '"Reaction: Tick Count"' 'is' ('greater'|'less') 'than' '"'Number'"'
| '"Reaction: Eyes Count"' 'is' ('not')? '"'Number'"'
| '"Reaction: Eyes Count"' 'is' ('greater'|'less') 'than' '"'Number'"'
""".trim();
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
index 3a6667a2b4..92adf1ebf9 100644
--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
@@ -8715,6 +8715,20 @@ public class DataMigrator {
}
}
dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("Issues.xml")) {
+ var dom = VersionedXmlDoc.fromFile(file);
+ for (Element element : dom.getRootElement().elements()) {
+ element.element("rocketCount").detach();
+ element.addElement("tickCount").setText("0");
+ }
+ dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("PullRequests.xml")) {
+ var dom = VersionedXmlDoc.fromFile(file);
+ for (Element element : dom.getRootElement().elements()) {
+ element.element("rocketCount").detach();
+ element.addElement("tickCount").setText("0");
+ }
+ dom.writeToFile(file, false);
}
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.java
index 9786440ff0..1d4d2e6731 100644
--- a/server-core/src/main/java/io/onedev/server/model/Issue.java
+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java
@@ -6,8 +6,8 @@ import static io.onedev.server.model.Issue.PROP_BOARD_POSITION;
import static io.onedev.server.model.Issue.PROP_COMMENT_COUNT;
import static io.onedev.server.model.Issue.PROP_CONFUSED_COUNT;
import static io.onedev.server.model.Issue.PROP_EYES_COUNT;
+import static io.onedev.server.model.Issue.PROP_TICK_COUNT;
import static io.onedev.server.model.Issue.PROP_HEART_COUNT;
-import static io.onedev.server.model.Issue.PROP_ROCKET_COUNT;
import static io.onedev.server.model.Issue.PROP_SMILE_COUNT;
import static io.onedev.server.model.Issue.PROP_STATE;
import static io.onedev.server.model.Issue.PROP_SUBMIT_DATE;
@@ -119,7 +119,7 @@ import io.onedev.server.xodus.VisitInfoService;
@Index(columnList=PROP_THUMBS_UP_COUNT), @Index(columnList=PROP_THUMBS_DOWN_COUNT),
@Index(columnList=PROP_SMILE_COUNT), @Index(columnList=PROP_TADA_COUNT),
@Index(columnList=PROP_CONFUSED_COUNT), @Index(columnList=PROP_HEART_COUNT),
- @Index(columnList=PROP_ROCKET_COUNT), @Index(columnList=PROP_EYES_COUNT),
+ @Index(columnList=PROP_EYES_COUNT), @Index(columnList=PROP_TICK_COUNT),
@Index(columnList= LastActivity.COLUMN_DATE), @Index(columnList="o_numberScope_id")},
uniqueConstraints={@UniqueConstraint(columnNames={"o_numberScope_id", PROP_NUMBER})})
//use dynamic update in order not to overwrite other edits while background threads change update date
@@ -193,14 +193,14 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupport
public static final String PROP_HEART_COUNT = "heartCount";
- public static final String NAME_ROCKET_COUNT = "Reaction: Rocket Count";
-
- public static final String PROP_ROCKET_COUNT = "rocketCount";
-
public static final String NAME_EYES_COUNT = "Reaction: Eyes Count";
public static final String PROP_EYES_COUNT = "eyesCount";
+ public static final String NAME_TICK_COUNT = "Reaction: Tick Count";
+
+ public static final String PROP_TICK_COUNT = "tickCount";
+
public static final String NAME_LAST_ACTIVITY_DATE = "Last Activity Date";
public static final String PROP_LAST_ACTIVITY = "lastActivity";
@@ -240,7 +240,8 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupport
NAME_DESCRIPTION, NAME_COMMENT, NAME_SUBMIT_DATE, NAME_LAST_ACTIVITY_DATE,
NAME_VOTE_COUNT, NAME_COMMENT_COUNT, NAME_ITERATION,
NAME_THUMBS_UP_COUNT, NAME_THUMBS_DOWN_COUNT, NAME_SMILE_COUNT, NAME_TADA_COUNT,
- NAME_CONFUSED_COUNT, NAME_HEART_COUNT, NAME_ROCKET_COUNT, NAME_EYES_COUNT,
+ NAME_CONFUSED_COUNT, NAME_HEART_COUNT, NAME_EYES_COUNT,
+ NAME_TICK_COUNT,
NAME_ESTIMATED_TIME, NAME_SPENT_TIME, NAME_PROGRESS,
BurndownIndicators.ISSUE_COUNT, BurndownIndicators.REMAINING_TIME);
@@ -250,7 +251,8 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupport
NAME_COMMENT, NAME_SUBMIT_DATE, NAME_LAST_ACTIVITY_DATE, NAME_VOTE_COUNT,
NAME_COMMENT_COUNT, NAME_ITERATION,
NAME_THUMBS_UP_COUNT, NAME_THUMBS_DOWN_COUNT, NAME_SMILE_COUNT, NAME_TADA_COUNT,
- NAME_CONFUSED_COUNT, NAME_HEART_COUNT, NAME_ROCKET_COUNT, NAME_EYES_COUNT);
+ NAME_CONFUSED_COUNT, NAME_HEART_COUNT, NAME_EYES_COUNT,
+ NAME_TICK_COUNT);
public static final Map<String, IssueSortField> SORT_FIELDS = new LinkedHashMap<>();
static {
@@ -271,8 +273,8 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupport
SORT_FIELDS.put(NAME_TADA_COUNT, new IssueSortField(PROP_TADA_COUNT, DESCENDING, comparingInt(Issue::getTadaCount)));
SORT_FIELDS.put(NAME_CONFUSED_COUNT, new IssueSortField(PROP_CONFUSED_COUNT, DESCENDING, comparingInt(Issue::getConfusedCount)));
SORT_FIELDS.put(NAME_HEART_COUNT, new IssueSortField(PROP_HEART_COUNT, DESCENDING, comparingInt(Issue::getHeartCount)));
- SORT_FIELDS.put(NAME_ROCKET_COUNT, new IssueSortField(PROP_ROCKET_COUNT, DESCENDING, comparingInt(Issue::getRocketCount)));
SORT_FIELDS.put(NAME_EYES_COUNT, new IssueSortField(PROP_EYES_COUNT, DESCENDING, comparingInt(Issue::getEyesCount)));
+ SORT_FIELDS.put(NAME_TICK_COUNT, new IssueSortField(PROP_TICK_COUNT, DESCENDING, comparingInt(Issue::getTickCount)));
}
private static ThreadLocal<Stack<Issue>> stack = ThreadLocal.withInitial(() -> new Stack<>());
@@ -332,10 +334,10 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupport
private int confusedCount;
private int heartCount;
-
- private int rocketCount;
private int eyesCount;
+
+ private int tickCount;
private int totalEstimatedTime;
@@ -751,14 +753,6 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupport
this.heartCount = heartCount;
}
- public int getRocketCount() {
- return rocketCount;
- }
-
- public void setRocketCount(int rocketCount) {
- this.rocketCount = rocketCount;
- }
-
public int getEyesCount() {
return eyesCount;
}
@@ -767,6 +761,14 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupport
this.eyesCount = eyesCount;
}
+ public int getTickCount() {
+ return tickCount;
+ }
+
+ public void setTickCount(int tickCount) {
+ this.tickCount = tickCount;
+ }
+
public int getTotalEstimatedTime() {
return totalEstimatedTime;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/IssueWork.java b/server-core/src/main/java/io/onedev/server/model/IssueWork.java
index 1f407812b3..5c5eac59e7 100644
--- a/server-core/src/main/java/io/onedev/server/model/IssueWork.java
+++ b/server-core/src/main/java/io/onedev/server/model/IssueWork.java
@@ -2,15 +2,19 @@ package io.onedev.server.model;
import static io.onedev.server.model.IssueWork.PROP_DATE;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.Date;
import org.jspecify.annotations.Nullable;
+import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Index;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
import javax.persistence.Table;
import org.apache.commons.lang3.StringUtils;
@@ -55,6 +59,9 @@ public class IssueWork extends AbstractEntity {
@Column(length=MAX_CONTENT_LEN)
private String note;
+ @OneToMany(mappedBy="work", cascade=CascadeType.REMOVE)
+ private Collection<IssueWorkReaction> reactions = new ArrayList<>();
+
public Issue getIssue() {
return issue;
}
@@ -100,4 +107,12 @@ public class IssueWork extends AbstractEntity {
return getClass().getSimpleName() + "-" + getId();
}
+ public Collection<IssueWorkReaction> getReactions() {
+ return reactions;
+ }
+
+ public void setReactions(Collection<IssueWorkReaction> reactions) {
+ this.reactions = reactions;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/IssueWorkReaction.java b/server-core/src/main/java/io/onedev/server/model/IssueWorkReaction.java
new file mode 100644
index 0000000000..69d0d86905
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/IssueWorkReaction.java
@@ -0,0 +1,40 @@
+package io.onedev.server.model;
+
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+import io.onedev.server.model.support.EntityReaction;
+
+@Entity
+@Table(
+ indexes={@Index(columnList="o_work_id"), @Index(columnList="o_user_id")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_work_id", "o_user_id", "emoji"})}
+)
+public class IssueWorkReaction extends EntityReaction {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String PROP_WORK = "work";
+
+ @ManyToOne
+ @JoinColumn(nullable=false)
+ private IssueWork work;
+
+ public IssueWork getWork() {
+ return work;
+ }
+
+ public void setWork(IssueWork work) {
+ this.work = work;
+ }
+
+ @Override
+ protected AbstractEntity getEntity() {
+ return work;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
index 2c7e5ae412..50cfe26a90 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -8,8 +8,8 @@ import static io.onedev.server.model.PullRequest.PROP_CLOSE_WEEK;
import static io.onedev.server.model.PullRequest.PROP_COMMENT_COUNT;
import static io.onedev.server.model.PullRequest.PROP_CONFUSED_COUNT;
import static io.onedev.server.model.PullRequest.PROP_EYES_COUNT;
+import static io.onedev.server.model.PullRequest.PROP_TICK_COUNT;
import static io.onedev.server.model.PullRequest.PROP_HEART_COUNT;
-import static io.onedev.server.model.PullRequest.PROP_ROCKET_COUNT;
import static io.onedev.server.model.PullRequest.PROP_SMILE_COUNT;
import static io.onedev.server.model.PullRequest.PROP_STATUS;
import static io.onedev.server.model.PullRequest.PROP_SUBMIT_DATE;
@@ -120,7 +120,8 @@ import io.onedev.server.xodus.VisitInfoService;
@Index(columnList=PROP_THUMBS_UP_COUNT), @Index(columnList=PROP_THUMBS_DOWN_COUNT),
@Index(columnList=PROP_SMILE_COUNT), @Index(columnList=PROP_TADA_COUNT),
@Index(columnList=PROP_CONFUSED_COUNT), @Index(columnList=PROP_HEART_COUNT),
- @Index(columnList=PROP_ROCKET_COUNT), @Index(columnList=PROP_EYES_COUNT),
+ @Index(columnList=PROP_EYES_COUNT),
+ @Index(columnList=PROP_TICK_COUNT),
@Index(columnList=PROP_COMMENT_COUNT), @Index(columnList="o_numberScope_id")},
uniqueConstraints={@UniqueConstraint(columnNames={"o_numberScope_id", PROP_NUMBER})})
//use dynamic update in order not to overwrite other edits while background threads change update date
@@ -194,14 +195,14 @@ public class PullRequest extends ProjectBelonging
public static final String PROP_HEART_COUNT = "heartCount";
- public static final String NAME_ROCKET_COUNT = "Reaction: Rocket Count";
-
- public static final String PROP_ROCKET_COUNT = "rocketCount";
-
public static final String NAME_EYES_COUNT = "Reaction: Eyes Count";
public static final String PROP_EYES_COUNT = "eyesCount";
+ public static final String NAME_TICK_COUNT = "Reaction: Tick Count";
+
+ public static final String PROP_TICK_COUNT = "tickCount";
+
public static final String PROP_SUBMITTER = "submitter";
public static final String NAME_SUBMIT_DATE = "Submit Date";
@@ -256,8 +257,8 @@ public class PullRequest extends ProjectBelonging
NAME_SOURCE_PROJECT, NAME_SOURCE_BRANCH, NAME_LABEL, NAME_DESCRIPTION,
NAME_COMMENT, NAME_SUBMIT_DATE, NAME_LAST_ACTIVITY_DATE, NAME_CLOSE_DATE,
NAME_MERGE_STRATEGY, NAME_COMMENT_COUNT, NAME_THUMBS_UP_COUNT, NAME_THUMBS_DOWN_COUNT,
- NAME_SMILE_COUNT, NAME_TADA_COUNT, NAME_CONFUSED_COUNT, NAME_HEART_COUNT,
- NAME_ROCKET_COUNT, NAME_EYES_COUNT);
+ NAME_SMILE_COUNT, NAME_TADA_COUNT, NAME_CONFUSED_COUNT, NAME_HEART_COUNT,
+ NAME_EYES_COUNT, NAME_TICK_COUNT);
public static final Map<String, SortField<PullRequest>> SORT_FIELDS = new LinkedHashMap<>();
static {
@@ -277,8 +278,8 @@ public class PullRequest extends ProjectBelonging
SORT_FIELDS.put(NAME_TADA_COUNT, new SortField<>(PROP_TADA_COUNT, DESCENDING));
SORT_FIELDS.put(NAME_CONFUSED_COUNT, new SortField<>(PROP_CONFUSED_COUNT, DESCENDING));
SORT_FIELDS.put(NAME_HEART_COUNT, new SortField<>(PROP_HEART_COUNT, DESCENDING));
- SORT_FIELDS.put(NAME_ROCKET_COUNT, new SortField<>(PROP_ROCKET_COUNT, DESCENDING));
SORT_FIELDS.put(NAME_EYES_COUNT, new SortField<>(PROP_EYES_COUNT, DESCENDING));
+ SORT_FIELDS.put(NAME_TICK_COUNT, new SortField<>(PROP_TICK_COUNT, DESCENDING));
}
private static ThreadLocal<Stack<PullRequest>> stack = withInitial(Stack::new);
@@ -378,11 +379,11 @@ public class PullRequest extends ProjectBelonging
private int confusedCount;
private int heartCount;
-
- private int rocketCount;
-
+
private int eyesCount;
+ private int tickCount;
+
@JsonProperty(access = READ_ONLY)
private int descriptionRevisionCount;
@@ -1384,14 +1385,6 @@ public class PullRequest extends ProjectBelonging
this.heartCount = heartCount;
}
- public int getRocketCount() {
- return rocketCount;
- }
-
- public void setRocketCount(int rocketCount) {
- this.rocketCount = rocketCount;
- }
-
public int getEyesCount() {
return eyesCount;
}
@@ -1399,6 +1392,14 @@ public class PullRequest extends ProjectBelonging
public void setEyesCount(int eyesCount) {
this.eyesCount = eyesCount;
}
+
+ public int getTickCount() {
+ return tickCount;
+ }
+
+ public void setTickCount(int tickCount) {
+ this.tickCount = tickCount;
+ }
public boolean isWorkInProgress() {
var lowerTitle = title.toLowerCase();
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
index 0261253f24..2e5f7d5833 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
@@ -7,11 +7,11 @@ import static io.onedev.server.model.Issue.NAME_CONFUSED_COUNT;
import static io.onedev.server.model.Issue.NAME_DESCRIPTION;
import static io.onedev.server.model.Issue.NAME_ESTIMATED_TIME;
import static io.onedev.server.model.Issue.NAME_EYES_COUNT;
+import static io.onedev.server.model.Issue.NAME_TICK_COUNT;
import static io.onedev.server.model.Issue.NAME_HEART_COUNT;
import static io.onedev.server.model.Issue.NAME_LAST_ACTIVITY_DATE;
import static io.onedev.server.model.Issue.NAME_PROGRESS;
import static io.onedev.server.model.Issue.NAME_PROJECT;
-import static io.onedev.server.model.Issue.NAME_ROCKET_COUNT;
import static io.onedev.server.model.Issue.NAME_SMILE_COUNT;
import static io.onedev.server.model.Issue.NAME_SPENT_TIME;
import static io.onedev.server.model.Issue.NAME_STATE;
@@ -365,10 +365,10 @@ public class IssueQuery extends EntityQuery<Issue> {
criterias.add(new ConfusedCountCriteria(getIntValue(value), operator));
} else if (fieldName.equals(NAME_HEART_COUNT)) {
criterias.add(new HeartCountCriteria(getIntValue(value), operator));
- } else if (fieldName.equals(NAME_ROCKET_COUNT)) {
- criterias.add(new RocketCountCriteria(getIntValue(value), operator));
} else if (fieldName.equals(NAME_EYES_COUNT)) {
criterias.add(new EyesCountCriteria(getIntValue(value), operator));
+ } else if (fieldName.equals(NAME_TICK_COUNT)) {
+ criterias.add(new TickCountCriteria(getIntValue(value), operator));
} else if (fieldName.equals(NAME_NUMBER)) {
criterias.add(new ReferenceCriteria(project, value, operator));
} else if (fieldName.equals(NAME_ESTIMATED_TIME)) {
@@ -434,12 +434,12 @@ public class IssueQuery extends EntityQuery<Issue> {
case NAME_HEART_COUNT:
criterias.add(new HeartCountCriteria(getIntValue(value), operator));
break;
- case NAME_ROCKET_COUNT:
- criterias.add(new RocketCountCriteria(getIntValue(value), operator));
- break;
case NAME_EYES_COUNT:
criterias.add(new EyesCountCriteria(getIntValue(value), operator));
break;
+ case NAME_TICK_COUNT:
+ criterias.add(new TickCountCriteria(getIntValue(value), operator));
+ break;
case NAME_ESTIMATED_TIME:
int intValue = value.equals(NAME_SPENT_TIME) ? -1 : timeTrackingSetting.parseWorkingPeriod(value);
criterias.add(new EstimatedTimeCriteria(intValue, operator));
@@ -612,8 +612,8 @@ public class IssueQuery extends EntityQuery<Issue> {
&& !fieldName.equals(Issue.NAME_TADA_COUNT)
&& !fieldName.equals(Issue.NAME_CONFUSED_COUNT)
&& !fieldName.equals(Issue.NAME_HEART_COUNT)
- && !fieldName.equals(Issue.NAME_ROCKET_COUNT)
&& !fieldName.equals(Issue.NAME_EYES_COUNT)
+ && !fieldName.equals(Issue.NAME_TICK_COUNT)
&& !fieldName.equals(NAME_NUMBER)
&& !fieldName.equals(IssueSchedule.NAME_ITERATION)
&& !(fieldSpec instanceof IssueChoiceField)
@@ -648,8 +648,8 @@ public class IssueQuery extends EntityQuery<Issue> {
&& !fieldName.equals(Issue.NAME_TADA_COUNT)
&& !fieldName.equals(Issue.NAME_CONFUSED_COUNT)
&& !fieldName.equals(Issue.NAME_HEART_COUNT)
- && !fieldName.equals(Issue.NAME_ROCKET_COUNT)
&& !fieldName.equals(Issue.NAME_EYES_COUNT)
+ && !fieldName.equals(Issue.NAME_TICK_COUNT)
&& !fieldName.equals(NAME_NUMBER)
&& !(fieldSpec instanceof IntegerField)
&& !(fieldSpec instanceof FloatField)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/RocketCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/TickCountCriteria.java
similarity index 78%
rename from server-core/src/main/java/io/onedev/server/search/entity/issue/RocketCountCriteria.java
rename to server-core/src/main/java/io/onedev/server/search/entity/issue/TickCountCriteria.java
index e9a631b84c..602d797280 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/RocketCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/TickCountCriteria.java
@@ -11,7 +11,7 @@ import io.onedev.server.model.Issue;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-public class RocketCountCriteria extends Criteria<Issue> {
+public class TickCountCriteria extends Criteria<Issue> {
private static final long serialVersionUID = 1L;
@@ -19,14 +19,14 @@ public class RocketCountCriteria extends Criteria<Issue> {
private final int value;
- public RocketCountCriteria(int value, int operator) {
+ public TickCountCriteria(int value, int operator) {
this.operator = operator;
this.value = value;
}
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
- Path<Integer> attribute = from.get(Issue.PROP_ROCKET_COUNT);
+ Path<Integer> attribute = from.get(Issue.PROP_TICK_COUNT);
if (operator == IssueQueryLexer.Is)
return builder.equal(attribute, value);
else if (operator == IssueQueryLexer.IsNot)
@@ -40,20 +40,20 @@ public class RocketCountCriteria extends Criteria<Issue> {
@Override
public boolean matches(Issue issue) {
if (operator == IssueQueryLexer.Is)
- return issue.getRocketCount() == value;
+ return issue.getTickCount() == value;
else if (operator == IssueQueryLexer.IsNot)
- return issue.getRocketCount() != value;
+ return issue.getTickCount() != value;
else if (operator == IssueQueryLexer.IsGreaterThan)
- return issue.getRocketCount() > value;
+ return issue.getTickCount() > value;
else
- return issue.getRocketCount() < value;
+ return issue.getTickCount() < value;
}
@Override
public String toStringWithoutParens() {
- return quote(Issue.NAME_ROCKET_COUNT) + " "
+ return quote(Issue.NAME_TICK_COUNT) + " "
+ IssueQuery.getRuleName(operator) + " "
+ quote(String.valueOf(value));
}
-}
\ No newline at end of file
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
index 94d33c4cf4..7fcc5d2f90 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
@@ -357,12 +357,12 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {
case PullRequest.NAME_HEART_COUNT:
criterias.add(new HeartCountCriteria(getIntValue(value), operator));
break;
- case PullRequest.NAME_ROCKET_COUNT:
- criterias.add(new RocketCountCriteria(getIntValue(value), operator));
- break;
case PullRequest.NAME_EYES_COUNT:
criterias.add(new EyesCountCriteria(getIntValue(value), operator));
break;
+ case PullRequest.NAME_TICK_COUNT:
+ criterias.add(new TickCountCriteria(getIntValue(value), operator));
+ break;
default:
throw new IllegalStateException();
}
@@ -394,12 +394,12 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {
case PullRequest.NAME_HEART_COUNT:
criterias.add(new HeartCountCriteria(getIntValue(value), operator));
break;
- case PullRequest.NAME_ROCKET_COUNT:
- criterias.add(new RocketCountCriteria(getIntValue(value), operator));
- break;
case PullRequest.NAME_EYES_COUNT:
criterias.add(new EyesCountCriteria(getIntValue(value), operator));
break;
+ case PullRequest.NAME_TICK_COUNT:
+ criterias.add(new TickCountCriteria(getIntValue(value), operator));
+ break;
}
break;
default:
@@ -497,8 +497,8 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {
&& !fieldName.equals(PullRequest.NAME_TADA_COUNT)
&& !fieldName.equals(PullRequest.NAME_CONFUSED_COUNT)
&& !fieldName.equals(PullRequest.NAME_HEART_COUNT)
- && !fieldName.equals(PullRequest.NAME_ROCKET_COUNT)
- && !fieldName.equals(PullRequest.NAME_EYES_COUNT)) {
+ && !fieldName.equals(PullRequest.NAME_EYES_COUNT)
+ && !fieldName.equals(PullRequest.NAME_TICK_COUNT)) {
throw newOperatorException(fieldName, operator);
}
break;
@@ -512,8 +512,8 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {
&& !fieldName.equals(PullRequest.NAME_TADA_COUNT)
&& !fieldName.equals(PullRequest.NAME_CONFUSED_COUNT)
&& !fieldName.equals(PullRequest.NAME_HEART_COUNT)
- && !fieldName.equals(PullRequest.NAME_ROCKET_COUNT)
- && !fieldName.equals(PullRequest.NAME_EYES_COUNT)) {
+ && !fieldName.equals(PullRequest.NAME_EYES_COUNT)
+ && !fieldName.equals(PullRequest.NAME_TICK_COUNT)) {
throw newOperatorException(fieldName, operator);
}
break;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RocketCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TickCountCriteria.java
similarity index 78%
rename from server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RocketCountCriteria.java
rename to server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TickCountCriteria.java
index 40a1352254..2b24b392bc 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RocketCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TickCountCriteria.java
@@ -11,7 +11,7 @@ import io.onedev.server.model.PullRequest;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-public class RocketCountCriteria extends Criteria<PullRequest> {
+public class TickCountCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
@@ -19,14 +19,14 @@ public class RocketCountCriteria extends Criteria<PullRequest> {
private final int value;
- public RocketCountCriteria(int value, int operator) {
+ public TickCountCriteria(int value, int operator) {
this.operator = operator;
this.value = value;
}
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
- Path<Integer> attribute = from.get(PullRequest.PROP_ROCKET_COUNT);
+ Path<Integer> attribute = from.get(PullRequest.PROP_TICK_COUNT);
if (operator == PullRequestQueryLexer.Is)
return builder.equal(attribute, value);
else if (operator == PullRequestQueryLexer.IsNot)
@@ -40,20 +40,20 @@ public class RocketCountCriteria extends Criteria<PullRequest> {
@Override
public boolean matches(PullRequest request) {
if (operator == PullRequestQueryLexer.Is)
- return request.getRocketCount() == value;
+ return request.getTickCount() == value;
else if (operator == PullRequestQueryLexer.IsNot)
- return request.getRocketCount() != value;
+ return request.getTickCount() != value;
else if (operator == PullRequestQueryLexer.IsGreaterThan)
- return request.getRocketCount() > value;
+ return request.getTickCount() > value;
else
- return request.getRocketCount() < value;
+ return request.getTickCount() < value;
}
@Override
public String toStringWithoutParens() {
- return quote(PullRequest.NAME_ROCKET_COUNT) + " "
+ return quote(PullRequest.NAME_TICK_COUNT) + " "
+ PullRequestQuery.getRuleName(operator) + " "
+ quote(String.valueOf(value));
}
-}
\ No newline at end of file
+}
diff --git a/server-core/src/main/java/io/onedev/server/service/IssueWorkReactionService.java b/server-core/src/main/java/io/onedev/server/service/IssueWorkReactionService.java
new file mode 100644
index 0000000000..7c89285de4
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/service/IssueWorkReactionService.java
@@ -0,0 +1,13 @@
+package io.onedev.server.service;
+
+import io.onedev.server.model.IssueWork;
+import io.onedev.server.model.IssueWorkReaction;
+import io.onedev.server.model.User;
+
+public interface IssueWorkReactionService extends EntityService<IssueWorkReaction> {
+
+ void create(IssueWorkReaction reaction);
+
+ void toggleEmoji(User user, IssueWork work, String emoji);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueReactionService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueReactionService.java
index 803a1d16c0..7ba76c733f 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueReactionService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueReactionService.java
@@ -47,12 +47,12 @@ public class DefaultIssueReactionService extends BaseEntityService<IssueReaction
case "❤️":
issue.setHeartCount(issue.getHeartCount() + (reaction == null ? 1 : -1));
break;
- case "🚀":
- issue.setRocketCount(issue.getRocketCount() + (reaction == null ? 1 : -1));
- break;
case "👀":
issue.setEyesCount(issue.getEyesCount() + (reaction == null ? 1 : -1));
break;
+ case "✅":
+ issue.setTickCount(issue.getTickCount() + (reaction == null ? 1 : -1));
+ break;
}
if (reaction != null) {
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueWorkReactionService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueWorkReactionService.java
new file mode 100644
index 0000000000..cc684dd72d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultIssueWorkReactionService.java
@@ -0,0 +1,44 @@
+package io.onedev.server.service.impl;
+
+import javax.inject.Singleton;
+
+import com.google.common.base.Preconditions;
+
+import io.onedev.server.model.IssueWork;
+import io.onedev.server.model.IssueWorkReaction;
+import io.onedev.server.model.User;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.service.IssueWorkReactionService;
+
+@Singleton
+public class DefaultIssueWorkReactionService extends BaseEntityService<IssueWorkReaction>
+ implements IssueWorkReactionService {
+
+ @Transactional
+ @Override
+ public void create(IssueWorkReaction reaction) {
+ Preconditions.checkState(reaction.isNew());
+ dao.persist(reaction);
+ }
+
+ @Transactional
+ @Override
+ public void toggleEmoji(User user, IssueWork work, String emoji) {
+ var reaction = work.getReactions().stream()
+ .filter(r -> r.getUser().equals(user) && r.getEmoji().equals(emoji))
+ .findFirst()
+ .orElse(null);
+ if (reaction == null) {
+ reaction = new IssueWorkReaction();
+ reaction.setWork(work);
+ reaction.setUser(user);
+ reaction.setEmoji(emoji);
+ create(reaction);
+ work.getReactions().add(reaction);
+ } else {
+ work.getReactions().remove(reaction);
+ dao.remove(reaction);
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestReactionService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestReactionService.java
index 2a5dffa17c..a90e00845a 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestReactionService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultPullRequestReactionService.java
@@ -48,12 +48,12 @@ public class DefaultPullRequestReactionService extends BaseEntityService<PullReq
case "❤️":
request.setHeartCount(request.getHeartCount() + (reaction == null ? 1 : -1));
break;
- case "🚀":
- request.setRocketCount(request.getRocketCount() + (reaction == null ? 1 : -1));
- break;
case "👀":
request.setEyesCount(request.getEyesCount() + (reaction == null ? 1 : -1));
break;
+ case "✅":
+ request.setTickCount(request.getTickCount() + (reaction == null ? 1 : -1));
+ break;
}
if (reaction == null) {
diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserService.java
index a87c3d86ae..bd1c02dd14 100644
--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserService.java
+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserService.java
@@ -329,6 +329,11 @@ public class DefaultUserService extends BaseEntityService<User> implements UserS
query.setParameter("unknown", getUnknown());
query.executeUpdate();
+ query = getSession().createQuery("update IssueWorkReaction set user=:unknown where user=:user");
+ query.setParameter("user", user);
+ query.setParameter("unknown", getUnknown());
+ query.executeUpdate();
+
query = getSession().createQuery("update IssueChange set user=:unknown where user=:user");
query.setParameter("user", user);
query.setParameter("unknown", getUnknown());
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
index b14a35eaa8..be7fc19e79 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
@@ -9,11 +9,11 @@ import static io.onedev.server.model.Issue.NAME_CONFUSED_COUNT;
import static io.onedev.server.model.Issue.NAME_DESCRIPTION;
import static io.onedev.server.model.Issue.NAME_ESTIMATED_TIME;
import static io.onedev.server.model.Issue.NAME_EYES_COUNT;
+import static io.onedev.server.model.Issue.NAME_TICK_COUNT;
import static io.onedev.server.model.Issue.NAME_HEART_COUNT;
import static io.onedev.server.model.Issue.NAME_LAST_ACTIVITY_DATE;
import static io.onedev.server.model.Issue.NAME_PROGRESS;
import static io.onedev.server.model.Issue.NAME_PROJECT;
-import static io.onedev.server.model.Issue.NAME_ROCKET_COUNT;
import static io.onedev.server.model.Issue.NAME_SMILE_COUNT;
import static io.onedev.server.model.Issue.NAME_SPENT_TIME;
import static io.onedev.server.model.Issue.NAME_STATE;
@@ -319,8 +319,8 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
|| fieldName.equals(NAME_TADA_COUNT)
|| fieldName.equals(NAME_CONFUSED_COUNT)
|| fieldName.equals(NAME_HEART_COUNT)
- || fieldName.equals(NAME_ROCKET_COUNT)
- || fieldName.equals(NAME_EYES_COUNT)
+ || fieldName.equals(NAME_EYES_COUNT)
+ || fieldName.equals(NAME_TICK_COUNT)
|| fieldSpec instanceof IntegerField
|| fieldSpec instanceof TextField) {
return null;
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
index 95de946ee1..4066ba12b3 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
@@ -170,8 +170,8 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {
case PullRequest.NAME_TADA_COUNT:
case PullRequest.NAME_CONFUSED_COUNT:
case PullRequest.NAME_HEART_COUNT:
- case PullRequest.NAME_ROCKET_COUNT:
case PullRequest.NAME_EYES_COUNT:
+ case PullRequest.NAME_TICK_COUNT:
return null;
}
} catch (ExplicitException ignored) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.html
index e2bda38830..cd1411d7e2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.html
@@ -9,7 +9,7 @@
</div>
<wicket:fragment wicket:id="detailViewFrag">
<div wicket:id="note" class="note mt-3"></div>
- <div class="d-flex align-items-center d-empty-none mt-3"><wicket:enclosure child="edit"><a wicket:id="edit" class="text-muted text-hover-primary font-size-sm mr-2"><wicket:t>Edit</wicket:t></a><span class="d-last-child-none dot mr-2"></span></wicket:enclosure><wicket:enclosure child="delete"><a wicket:id="delete" class="text-muted text-hover-primary font-size-sm"><wicket:t>Delete</wicket:t></a><span class="d-last-child-none dot mr-2"></span></wicket:enclosure></div>
+ <div class="mt-3 d-empty-none d-flex align-items-center font-size-sm"><wicket:enclosure child="edit"><a wicket:id="edit" class="text-muted text-hover-primary mr-2"><wicket:t>Edit</wicket:t></a><span class="d-last-child-none dot mr-2"></span></wicket:enclosure><wicket:enclosure child="delete"><a wicket:id="delete" class="text-muted text-hover-primary mr-2"><wicket:t>Delete</wicket:t></a><span class="d-last-child-none dot mr-2"></span></wicket:enclosure><span wicket:id="reactions"></span></div>
</wicket:fragment>
<wicket:fragment wicket:id="detailEditFrag">
<form wicket:id="form">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.java
index fa1a5addd8..cd57460b4e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueWorkPanel.java
@@ -2,6 +2,10 @@ package io.onedev.server.web.component.issue.activities.activity;
import static io.onedev.server.util.DateUtils.formatDateTime;
+import java.util.Collection;
+
+import javax.inject.Inject;
+
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
@@ -19,10 +23,13 @@ import io.onedev.server.OneDev;
import io.onedev.server.service.IssueWorkService;
import io.onedev.server.service.SettingService;
import io.onedev.server.model.IssueWork;
+import io.onedev.server.model.support.EntityReaction;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.service.IssueWorkReactionService;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.component.markdown.MarkdownViewer;
+import io.onedev.server.web.component.reaction.ReactionListPanel;
import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.editable.BeanContext;
@@ -30,6 +37,9 @@ import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.util.editbean.IssueWorkBean;
class IssueWorkPanel extends Panel {
+
+ @Inject
+ private IssueWorkReactionService issueWorkReactionService;
public IssueWorkPanel(String id) {
super(id);
@@ -96,6 +106,23 @@ class IssueWorkPanel extends Panel {
}
});
+ fragment.add(new ReactionListPanel("reactions") {
+
+ @Override
+ protected Collection<? extends EntityReaction> getReactions() {
+ return getWork().getReactions();
+ }
+
+ @Override
+ protected void onToggleEmoji(AjaxRequestTarget target, String emoji) {
+ issueWorkReactionService.toggleEmoji(
+ SecurityUtils.getUser(),
+ getWork(),
+ emoji);
+ }
+
+ });
+
fragment.setOutputMarkupId(true);
return fragment;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/reaction/ReactionListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/reaction/ReactionListPanel.java
index d516aceeb0..138d6754b6 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/reaction/ReactionListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/reaction/ReactionListPanel.java
@@ -35,10 +35,10 @@ public abstract class ReactionListPanel extends Panel {
put("thumbs_up", "👍");
put("thumbs_down", "👎");
put("smile", "😄");
- put("tada", "🎉");
put("confused", "😕");
put("heart", "❤️");
- put("rocket", "🚀");
+ put("tick", "✅");
+ put("tada", "🎉");
put("eyes", "👀");
}};