Skip to content

The Unified and Autonomous Development Platform

Add update date to project

Robin Shen0c64fdc74aac
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java
index fed869591b..574c92f7e7 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java
@@ -35,6 +35,8 @@ public interface ProjectManager extends EntityManager<Project> {
*/
void save(Project project, @Nullable String oldName);
+ void create(Project project);
+
void onDeleteBranch(Project project, String branchName);
void deleteBranch(Project project, String branchName);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
index 427fd68ed0..c0bfb73a83 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
@@ -40,7 +40,6 @@ import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.event.entity.EntityRemoved;
-import io.onedev.server.event.issue.IssueCommitted;
import io.onedev.server.event.issue.IssueEvent;
import io.onedev.server.event.issue.IssueOpened;
import io.onedev.server.event.system.SystemStarted;
@@ -252,8 +251,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
@Transactional
@Listen
public void on(IssueEvent event) {
- if (!(event instanceof IssueCommitted))
- event.getIssue().setUpdateDate(event.getDate());
+ event.getIssue().setUpdateDate(event.getDate());
}
@Sessional
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
index febe3e9a15..414cab5535 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
@@ -48,6 +48,8 @@ import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.event.ProjectCreated;
+import io.onedev.server.event.ProjectEvent;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.event.system.SystemStopping;
@@ -162,22 +164,23 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
@Transactional
@Override
public void save(Project project, String oldName) {
- boolean isNew = project.isNew();
-
dao.persist(project);
-
- if (isNew) {
- project.setOwner(SecurityUtils.getUser());
- checkSanity(project);
- }
-
if (oldName != null && !oldName.equals(project.getName())) {
for (JobExecutor jobExecutor: settingManager.getJobExecutors())
jobExecutor.onRenameProject(oldName, project.getName());
for (GroovyScript groovyScript: settingManager.getGroovyScripts())
groovyScript.onRenameProject(oldName, project.getName());
}
-
+ }
+
+ @Transactional
+ @Override
+ public void create(Project project) {
+ dao.persist(project);
+ project.setOwner(SecurityUtils.getUser());
+ checkSanity(project);
+
+ listenerRegistry.post(new ProjectCreated(project));
}
@Transactional
@@ -235,6 +238,8 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
checkSanity(to);
commitInfoManager.cloneInfo(from, to);
avatarManager.copyAvatar(from, to);
+
+ listenerRegistry.post(new ProjectCreated(to));
}
private boolean isGitHookValid(File gitDir, String hookName) {
@@ -314,6 +319,12 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem
}
}
+ @Transactional
+ @Listen
+ public void on(ProjectEvent event) {
+ event.getProject().setUpdateDate(event.getDate());
+ }
+
@Transactional
@Listen
public void on(SystemStarted event) {
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index dd80993c53..679a3d7b4c 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -633,8 +633,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
@Transactional
@Listen
public void on(PullRequestEvent event) {
- if (!(event instanceof PullRequestMergePreviewCalculated) && !(event instanceof PullRequestBuildEvent))
- event.getRequest().setUpdateDate(event.getDate());
+ event.getRequest().setUpdateDate(event.getDate());
}
@Transactional
diff --git a/server-core/src/main/java/io/onedev/server/event/ProjectCreated.java b/server-core/src/main/java/io/onedev/server/event/ProjectCreated.java
new file mode 100644
index 0000000000..cf040b9840
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/event/ProjectCreated.java
@@ -0,0 +1,11 @@
+package io.onedev.server.event;
+
+import io.onedev.server.model.Project;
+
+public class ProjectCreated extends ProjectEvent {
+
+ public ProjectCreated(Project project) {
+ super(project.getOwner(), project.getCreateDate(), project);
+ }
+
+}
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 3cf4762a8c..99bb1e5441 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
@@ -63,6 +63,7 @@ import io.onedev.server.web.editable.annotation.Editable;
@Index(columnList="commentCount"), @Index(columnList="o_milestone_id"),
@Index(columnList="updateDate")},
uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "number"})})
+//use dynamic update in order not to overwrite other edits while background threads change update date
@DynamicUpdate
@Editable
public class Issue extends AbstractEntity implements Referenceable, AttachmentStorageSupport {
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index ccbb808c95..3be10dd800 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -123,9 +123,10 @@ import io.onedev.server.web.util.ProjectAware;
import io.onedev.server.web.util.WicketUtils;
@Entity
-@Table(indexes={@Index(columnList="o_forkedFrom_id"), @Index(columnList="name")})
+@Table(indexes={@Index(columnList="o_forkedFrom_id"), @Index(columnList="name"), @Index(columnList="updateDate")})
@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
-@DynamicUpdate
+//use dynamic update in order not to overwrite other edits while background threads change update date
+@DynamicUpdate
@Editable
public class Project extends AbstractEntity {
@@ -188,7 +189,10 @@ public class Project extends AbstractEntity {
private ArrayList<Secret> secrets = new ArrayList<>();
@Column(nullable=false)
- private Date createdAt = new Date();
+ private Date createDate = new Date();
+
+ @Column(nullable=false)
+ private Date updateDate = new Date();
@OneToMany(mappedBy="targetProject", cascade=CascadeType.REMOVE)
private Collection<PullRequest> incomingRequests = new ArrayList<>();
@@ -340,12 +344,20 @@ public class Project extends AbstractEntity {
this.tagProtections = tagProtections;
}
- public Date getCreatedAt() {
- return createdAt;
+ public Date getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(Date createDate) {
+ this.createDate = createDate;
+ }
+
+ public Date getUpdateDate() {
+ return updateDate;
}
- public void setCreatedAt(Date createdAt) {
- this.createdAt = createdAt;
+ public void setUpdateDate(Date updateDate) {
+ this.updateDate = updateDate;
}
public Collection<PullRequest> getIncomingRequests() {
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 f40124420f..c8ce03f084 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
@@ -69,6 +69,7 @@ import io.onedev.server.util.jackson.RestView;
@Index(columnList="CLOSE_STATUS"), @Index(columnList="CLOSE_USER"),
@Index(columnList="CLOSE_USER_NAME")},
uniqueConstraints={@UniqueConstraint(columnNames={"o_targetProject_id", "number"})})
+//use dynamic update in order not to overwrite other edits while background threads change update date
@DynamicUpdate
public class PullRequest extends AbstractEntity implements Referenceable, AttachmentStorageSupport {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4
index d49dc63e2d..aa5445ca82 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4
@@ -9,7 +9,7 @@ query
criteria
: operator=ForksOf WS+ criteriaValue=Quoted #OperatorValueCriteria
| criteriaField=Quoted WS+ operator=IsMe #FieldOperatorCriteria
- | criteriaField=Quoted WS+ operator=(Is|Contains) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria
+ | criteriaField=Quoted WS+ operator=(Is|Contains|IsBefore|IsAfter) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria
| criteria WS+ And WS+ criteria #AndCriteria
| criteria WS+ Or WS+ criteria #OrCriteria
| Not WS* LParens WS* criteria WS* RParens #NotCriteria
@@ -36,6 +36,14 @@ IsMe
: 'is' WS+ 'me'
;
+IsAfter
+ : 'is' WS+ 'after'
+ ;
+
+IsBefore
+ : 'is' WS+ 'before'
+ ;
+
Contains
: 'contains'
;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java
index 22e7c9e0ca..280add912d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java
@@ -124,6 +124,9 @@ public class ProjectQuery extends EntityQuery<Project> {
return new OwnerCriteria(value);
case ProjectQueryLexer.Contains:
return new DescriptionCriteria(value);
+ case ProjectQueryLexer.IsBefore:
+ case ProjectQueryLexer.IsAfter:
+ return new UpdateDateCriteria(value, operator);
default:
throw new OneException("Unexpected operator " + getRuleName(operator));
}
@@ -196,6 +199,11 @@ public class ProjectQuery extends EntityQuery<Project> {
if (!fieldName.equals(ProjectConstants.FIELD_OWNER))
throw newOperatorException(fieldName, operator);
break;
+ case ProjectQueryLexer.IsBefore:
+ case ProjectQueryLexer.IsAfter:
+ if (!fieldName.equals(ProjectConstants.FIELD_UPDATE_DATE))
+ throw newOperatorException(fieldName, operator);
+ break;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/UpdateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/UpdateDateCriteria.java
new file mode 100644
index 0000000000..0d50b46969
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/UpdateDateCriteria.java
@@ -0,0 +1,60 @@
+package io.onedev.server.search.entity.project;
+
+import java.util.Date;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.search.entity.EntityCriteria;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.ProjectConstants;
+
+public class UpdateDateCriteria extends EntityCriteria<Project> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final int operator;
+
+ private final String value;
+
+ private final Date date;
+
+ public UpdateDateCriteria(String value, int operator) {
+ date = EntityQuery.getDateValue(value);
+ this.operator = operator;
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(Root<Project> root, CriteriaBuilder builder, User user) {
+ Path<Date> attribute = ProjectQuery.getPath(root, ProjectConstants.ATTR_UPDATE_DATE);
+ if (operator == ProjectQueryLexer.IsBefore)
+ return builder.lessThan(attribute, date);
+ else
+ return builder.greaterThan(attribute, date);
+ }
+
+ @Override
+ public boolean matches(Project project, User user) {
+ if (operator == ProjectQueryLexer.IsBefore)
+ return project.getUpdateDate().before(date);
+ else
+ return project.getUpdateDate().after(date);
+ }
+
+ @Override
+ public boolean needsLogin() {
+ return false;
+ }
+
+ @Override
+ public String toString() {
+ return ProjectQuery.quote(ProjectConstants.FIELD_UPDATE_DATE) + " "
+ + ProjectQuery.getRuleName(operator) + " " + ProjectQuery.quote(value);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectConstants.java b/server-core/src/main/java/io/onedev/server/util/ProjectConstants.java
index 8f4cd6acea..0c783196df 100644
--- a/server-core/src/main/java/io/onedev/server/util/ProjectConstants.java
+++ b/server-core/src/main/java/io/onedev/server/util/ProjectConstants.java
@@ -13,6 +13,10 @@ public class ProjectConstants {
public static final String ATTR_NAME = "name";
+ public static final String FIELD_UPDATE_DATE = "Update Date";
+
+ public static final String ATTR_UPDATE_DATE = "updateDate";
+
public static final String FIELD_DESCRIPTION = "Description";
public static final String ATTR_DESCRIPTION = "description";
@@ -26,10 +30,11 @@ public class ProjectConstants {
public static final String ATTR_FORKED_FROM = "forkedFrom";
public static final List<String> QUERY_FIELDS =
- Lists.newArrayList(FIELD_NAME, FIELD_OWNER, FIELD_DESCRIPTION);
+ Lists.newArrayList(FIELD_NAME, FIELD_OWNER, FIELD_DESCRIPTION, FIELD_UPDATE_DATE);
public static final Map<String, String> ORDER_FIELDS = Maps.newLinkedHashMap(
FIELD_NAME, ATTR_NAME,
- FIELD_OWNER, ATTR_OWNER);
+ FIELD_OWNER, ATTR_OWNER,
+ FIELD_UPDATE_DATE, ATTR_UPDATE_DATE);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java
index d4cf7caad9..617ae19674 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java
@@ -17,6 +17,7 @@ import io.onedev.commons.codeassist.parser.TerminalExpect;
import io.onedev.server.OneException;
import io.onedev.server.search.entity.project.ProjectQuery;
import io.onedev.server.search.entity.project.ProjectQueryParser;
+import io.onedev.server.util.DateUtils;
import io.onedev.server.util.ProjectConstants;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
import io.onedev.server.web.util.SuggestionUtils;
@@ -53,7 +54,10 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {
String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());
try {
ProjectQuery.checkField(fieldName, operator);
- if (fieldName.equals(ProjectConstants.FIELD_NAME)) {
+ if (fieldName.equals(ProjectConstants.FIELD_UPDATE_DATE)) {
+ List<InputSuggestion> suggestions = SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, matchWith);
+ return !suggestions.isEmpty()? suggestions: null;
+ } else if (fieldName.equals(ProjectConstants.FIELD_NAME)) {
if (!matchWith.contains("*"))
return SuggestionUtils.suggestProjects(matchWith);
else
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
index 51f68d4b7e..2ee98e545f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
@@ -42,6 +42,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.project.ProjectQuery;
+import io.onedev.server.util.DateUtils;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.WebConstants;
@@ -64,8 +65,6 @@ public class ProjectListPanel extends Panel {
private static final Logger logger = LoggerFactory.getLogger(ProjectListPanel.class);
- private static final int MAX_DESCRIPTION_LEN = 120;
-
private final String query;
private final int expectedCount;
@@ -278,10 +277,7 @@ public class ProjectListPanel extends Panel {
public void populateItem(Item<ICellPopulator<Project>> cellItem, String componentId,
IModel<Project> rowModel) {
Project project = rowModel.getObject();
- if (project.getOwner() != null)
- cellItem.add(new UserIdentPanel(componentId, UserIdent.of(project.getOwner()), Mode.AVATAR_AND_NAME));
- else
- cellItem.add(new Label(componentId, "<i>No owner</i>").setEscapeModelStrings(false));
+ cellItem.add(new UserIdentPanel(componentId, UserIdent.of(project.getOwner()), Mode.NAME));
}
@Override
@@ -291,23 +287,18 @@ public class ProjectListPanel extends Panel {
});
- columns.add(new AbstractColumn<Project, Void>(Model.of("Description")) {
+ columns.add(new AbstractColumn<Project, Void>(Model.of("Last Update")) {
@Override
public void populateItem(Item<ICellPopulator<Project>> cellItem, String componentId,
IModel<Project> rowModel) {
Project project = rowModel.getObject();
- if (project.getDescription() != null) {
- cellItem.add(new Label(componentId,
- StringUtils.abbreviate(project.getDescription(), MAX_DESCRIPTION_LEN)));
- } else {
- cellItem.add(new Label(componentId, "<i>No description</i>").setEscapeModelStrings(false));
- }
+ cellItem.add(new Label(componentId, DateUtils.formatAge(project.getUpdateDate())));
}
@Override
public String getCssClass() {
- return "description expanded";
+ return "last-update expanded";
}
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java
index 12ce024f84..337796917f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java
@@ -33,7 +33,7 @@ public class NewProjectPage extends LayoutPage {
Project project = new Project();
BeanEditor editor = BeanContext.edit("editor", project,
- Lists.newArrayList("name", "description", "defaultRoleName"), false);
+ Lists.newArrayList("name", "description"), false);
Form<?> form = new Form<Void>("form") {
@@ -47,7 +47,7 @@ public class NewProjectPage extends LayoutPage {
editor.error(new Path(new PathNode.Named("name")),
"This name has already been used by another project");
} else {
- projectManager.save(project, null);
+ projectManager.create(project);
Session.get().success("New project created");
setResponsePage(ProjectBlobPage.class, ProjectBlobPage.paramsOf(project));
}