Skip to content

The Unified and Autonomous Development Platform

Fix issue #292 - Get top contributors on master branch via RESTful api

Robin Shen8ac1a0e05fb2
diff --git a/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java b/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java
index 28a8ed0927..0d2628ff88 100644
--- a/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/ProjectResource.java
@@ -1,6 +1,7 @@
package io.onedev.server.rest;
import java.io.Serializable;
+import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
@@ -22,9 +23,13 @@ import javax.ws.rs.core.Response;
import org.apache.shiro.authz.UnauthorizedException;
import org.hibernate.criterion.Restrictions;
+import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.server.entitymanager.MilestoneManager;
import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.git.GitContribution;
+import io.onedev.server.git.GitContributor;
+import io.onedev.server.infomanager.CommitInfoManager;
import io.onedev.server.model.GroupAuthorization;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
@@ -44,6 +49,7 @@ import io.onedev.server.rest.support.RestConstants;
import io.onedev.server.search.entity.project.ProjectQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.Day;
@Api(order=1000)
@Path("/projects")
@@ -56,10 +62,14 @@ public class ProjectResource {
private final MilestoneManager milestoneManager;
+ private final CommitInfoManager commitInfoManager;
+
@Inject
- public ProjectResource(ProjectManager projectManager, MilestoneManager milestoneManager) {
+ public ProjectResource(ProjectManager projectManager, MilestoneManager milestoneManager,
+ CommitInfoManager commitInfoManager) {
this.projectManager = projectManager;
this.milestoneManager = milestoneManager;
+ this.commitInfoManager = commitInfoManager;
}
@Api(order=100)
@@ -169,6 +179,27 @@ public class ProjectResource {
return milestoneManager.query(criteria, offset, count);
}
+ @Api(order=760, description="Get top contributors on default branch")
+ @Path("/{projectId}/top-contributors")
+ @GET
+ public List<GitContributor> getTopContributors(@PathParam("projectId") Long projectId,
+ @QueryParam("type") @NotNull GitContribution.Type type,
+ @QueryParam("sinceDate") @NotEmpty @Api(description="Since date of format <i>yyyy-MM-dd</i>") String since,
+ @QueryParam("untilDate") @NotEmpty @Api(description="Until date of format <i>yyyy-MM-dd</i>") String until,
+ @QueryParam("count") int count) {
+ Project project = projectManager.load(projectId);
+ if (!SecurityUtils.canAccess(project))
+ throw new UnauthorizedException();
+
+ if (count > RestConstants.MAX_PAGE_SIZE)
+ throw new InvalidParamException("Count should be less than " + RestConstants.MAX_PAGE_SIZE);
+
+ Day sinceDay = new Day(LocalDate.parse(since));
+ Day untilDay = new Day(LocalDate.parse(until));
+
+ return commitInfoManager.getTopContributors(project, count, type, sinceDay.getValue(), untilDay.getValue());
+ }
+
@SuppressWarnings("unused")
private static String getDateExample() {
return DateUtils.formatISO8601Date(new Date());
@@ -302,4 +333,5 @@ public class ProjectResource {
}
}
+
}
diff --git a/server-core/src/main/java/io/onedev/server/util/CollectionUtils.java b/server-core/src/main/java/io/onedev/server/util/CollectionUtils.java
index 774fa91025..a52facf2bf 100644
--- a/server-core/src/main/java/io/onedev/server/util/CollectionUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/CollectionUtils.java
@@ -1,9 +1,11 @@
package io.onedev.server.util;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
@@ -35,4 +37,16 @@ public class CollectionUtils extends org.apache.commons.collections.CollectionUt
map.put(args[i*2], args[i*2+1]);
}
+ public static List<Map<String, ?>> mapAsList(Map<?, ?> map,
+ String keyName, String valueName) {
+ List<Map<String, ?>> list = new ArrayList<>();
+ for (Map.Entry<?, ?> entry: map.entrySet()) {
+ Map<String, Object> entryMap = new LinkedHashMap<>();
+ entryMap.put(keyName, entry.getKey());
+ entryMap.put(valueName, entry.getValue());
+ list.add(entryMap);
+ }
+ return list;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/util/Day.java b/server-core/src/main/java/io/onedev/server/util/Day.java
index ddd88a9935..cc770d14f7 100644
--- a/server-core/src/main/java/io/onedev/server/util/Day.java
+++ b/server-core/src/main/java/io/onedev/server/util/Day.java
@@ -1,12 +1,16 @@
package io.onedev.server.util;
import java.io.Serializable;
+import java.time.LocalDate;
import java.util.Date;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.joda.time.DateTime;
+import io.onedev.server.rest.annotation.Api;
+
+@Api(description="Date in yyyy-MM-dd format", example="2021-01-01")
public class Day implements Serializable, Comparable<Day> {
private static final long serialVersionUID = 1L;
@@ -31,6 +35,10 @@ public class Day implements Serializable, Comparable<Day> {
this.dayOfMonth = dayOfMonth;
}
+ public Day(LocalDate date) {
+ this(date.getYear(), date.getMonthValue()-1, date.getDayOfMonth());
+ }
+
public Day(int value) {
this(value>>>16, (value&0x0000ffff)>>>8, value&0x000000ff);
}
@@ -93,5 +101,10 @@ public class Day implements Serializable, Comparable<Day> {
.append(dayOfMonth)
.toHashCode();
}
+
+ @Override
+ public String toString() {
+ return String.format("%04d-%02d-%02d", year, monthOfYear+1, dayOfMonth);
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/util/jackson/ObjectMapperProvider.java b/server-core/src/main/java/io/onedev/server/util/jackson/ObjectMapperProvider.java
index b3125f386a..1064a8875d 100644
--- a/server-core/src/main/java/io/onedev/server/util/jackson/ObjectMapperProvider.java
+++ b/server-core/src/main/java/io/onedev/server/util/jackson/ObjectMapperProvider.java
@@ -87,7 +87,7 @@ public class ObjectMapperProvider implements Provider<ObjectMapper> {
mapper.setVisibility(PropertyAccessor.ALL, Visibility.NONE);
mapper.setVisibility(PropertyAccessor.FIELD, Visibility.ANY);
- mapper.configure(MapperFeature.PROPAGATE_TRANSIENT_MARKER, true);
+ mapper.configure(MapperFeature.PROPAGATE_TRANSIENT_MARKER, true);
for (ObjectMapperConfigurator each: configurators)
each.configure(mapper);