The Unified and Autonomous Development Platform
chore: Support project parent/child query for tod resource
Robin Shen81f828f558cf
diff --git a/server-core/src/main/java/io/onedev/server/ai/ProjectHelper.java b/server-core/src/main/java/io/onedev/server/ai/ProjectHelper.javanew file mode 100644index 0000000000..ecfdd5652b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ai/ProjectHelper.java@@ -0,0 +1,48 @@+package io.onedev.server.ai;++import java.util.LinkedHashMap;+import java.util.Map;+import java.util.stream.Collectors;++import io.onedev.server.OneDev;+import io.onedev.server.model.Project;+import io.onedev.server.service.UrlService;++public class ProjectHelper {++ private static UrlService getUrlService() {+ return OneDev.getInstance(UrlService.class);+ }++ public static Map<String, Object> getDetail(Project project) {+ var data = getSummary(project);+ data.put("childPaths", project.getChildren().stream()+ .map(it -> it.getPath())+ .collect(Collectors.toList()));+ return data;+ }++ public static Map<String, Object> getSummary(Project project) {+ var summary = new LinkedHashMap<String, Object>();+ summary.put("id", project.getId());+ summary.put("key", project.getKey());+ summary.put("name", project.getName());+ if (project.getParent() != null)+ summary.put("parentPath", project.getParent().getPath());+ else+ summary.put("parentPath", null);+ summary.put("path", project.getPath());+ summary.put("description", project.getDescription());+ summary.put("codeManagement", project.isCodeManagement());+ summary.put("packManagement", project.isPackManagement());+ summary.put("issueManagement", project.isIssueManagement());+ summary.put("timeTracking", project.isTimeTracking());+ summary.put("defaultBranch", project.getDefaultBranch());+ summary.put("labels", project.getLabels().stream()+ .map(it -> it.getSpec().getName())+ .collect(Collectors.toList()));+ summary.put("link", getUrlService().urlFor(project, true));+ return summary;+ }++}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.javaindex 9e984eeb32..f19d89d52b 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@@ -575,7 +575,7 @@ public class QueryDescriptions {| 'fork roots'| '"Name"' 'is' ('not')? '"'ProjectNameOrPattern'"'| '"Key"' 'is' ('not')? '"'ProjectKeyOrPattern'"'- | '"Path"' 'is' ('not')? '"'ProjectPathOrPattern'"'+ | '"Path"' 'is' ('not')? '"'ProjectPathOrPattern'"'| '"Label"' 'is' ('not')? '"'LabelName'"'| '"Description"' 'contains' '"'Text'"'| '"Id"' 'is' ('not')? '"'Number'"'diff --git a/server-core/src/main/java/io/onedev/server/ai/TodResource.java b/server-core/src/main/java/io/onedev/server/ai/TodResource.javaindex 470dc76d21..15b11b2508 100644--- a/server-core/src/main/java/io/onedev/server/ai/TodResource.java+++ b/server-core/src/main/java/io/onedev/server/ai/TodResource.java@@ -10,7 +10,6 @@ import java.text.MessageFormat;import java.util.ArrayList;import java.util.Date;import java.util.HashMap;-import java.util.LinkedHashMap;import java.util.List;import java.util.Map;import java.util.stream.Collectors;@@ -40,8 +39,6 @@ import org.jspecify.annotations.Nullable;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import com.fasterxml.jackson.core.type.TypeReference;-import com.fasterxml.jackson.databind.ObjectMapper;import com.google.common.base.Joiner;import com.google.common.base.Splitter;import com.google.common.base.Throwables;@@ -100,6 +97,7 @@ import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.build.BuildQuery;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.IssueQueryParseOption;+import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.service.BuildService;@@ -135,9 +133,6 @@ public class TodResource {private static final Logger logger = LoggerFactory.getLogger(TodResource.class);- @Inject- private ObjectMapper objectMapper;-@Injectprivate SettingService settingService;@@ -405,6 +400,14 @@ public class TodResource {return escapeHtml5(QueryDescriptions.getPullRequestQueryDescription());}+ @Path("/get-project-query-description")+ @GET+ public String getProjectQueryDescription() {+ if (SecurityUtils.getUser() == null)+ throw new UnauthenticatedException();+ return escapeHtml5(QueryDescriptions.getProjectQueryDescription());+ }+@Path("/get-valid-issue-fields")@GETpublic Map<String, Object> getValidIssueFields() {@@ -562,35 +565,41 @@ public class TodResource {return IssueHelper.getDetail(subject, currentProject, issue);}+ @Path("/query-projects")+ @GET+ public List<Map<String, Object>> queryProjects(+ @QueryParam("query") String query,+ @QueryParam("offset") int offset,+ @QueryParam("count") int count) {+ var subject = SecurityUtils.getSubject();+ if (SecurityUtils.getUser(subject) == null)+ throw new UnauthenticatedException();++ if (count > RestConstants.MAX_PAGE_SIZE)+ throw new NotAcceptableException("Count should not be greater than " + RestConstants.MAX_PAGE_SIZE);++ EntityQuery<Project> parsedQuery;+ try {+ parsedQuery = ProjectQuery.parse(query);+ } catch (Exception e) {+ logger.error("Error parsing query", e);+ throw new NotAcceptableException("Invalid project query, check server log for details");+ }++ var summaries = new ArrayList<Map<String, Object>>();+ for (var project : projectService.query(subject, parsedQuery, true, offset, count))+ summaries.add(ProjectHelper.getSummary(project));+ return summaries;+ }+@Path("/get-project")@GET@Nullablepublic Map<String, Object> getProjectDetail(@QueryParam("project") @NotNull String projectPath) {- if (SecurityUtils.getUser() == null)+ var subject = SecurityUtils.getSubject();+ if (SecurityUtils.getUser(subject) == null)throw new UnauthenticatedException();-- Map<String, Object> projectDetail;- var project = getProject(projectPath);- if (SecurityUtils.canManageProject(project)) {- var typeReference = new TypeReference<LinkedHashMap<String, Object>>() {};- projectDetail = objectMapper.convertValue(project, typeReference);- projectDetail.remove("lastActivityDateId");- projectDetail.remove("pathLen");- } else {- projectDetail = new HashMap<String, Object>();- projectDetail.put("id", project.getId());- projectDetail.put("key", project.getKey());- projectDetail.put("name", project.getName());- projectDetail.put("path", project.getPath());- projectDetail.put("description", project.getDescription());- projectDetail.put("codeManagement", project.isCodeManagement());- projectDetail.put("packManagement", project.isPackManagement());- projectDetail.put("issueManagement", project.isIssueManagement());- projectDetail.put("timeTracking", project.isTimeTracking());- }- projectDetail.put("defaultBranch", project.getDefaultBranch());- projectDetail.put("link", urlService.urlFor(project, true));- return projectDetail;+ return ProjectHelper.getDetail(getProject(projectPath));}@Path("/get-issue-comments")