fix(controller): page not working (#2540)

star-whale · Jul 25, 2023 · a7ede5b · a7ede5b
1 parent 495296c
commit a7ede5b
Show file tree

Hide file tree

Showing 12 changed files with 466 additions and 43 deletions.
diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/dataset/DatasetService.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/dataset/DatasetService.java
@@ -178,9 +178,9 @@ public DatasetService(ProjectService projectService, DatasetMapper datasetMapper
 
 
     public PageInfo<DatasetVo> listDataset(DatasetQuery query, PageParams pageParams) {
-        PageHelper.startPage(pageParams.getPageNum(), pageParams.getPageSize());
         Long projectId = projectService.getProjectId(query.getProjectUrl());
         Long userId = userService.getUserId(query.getOwner());
+        PageHelper.startPage(pageParams.getPageNum(), pageParams.getPageSize());
         List<DatasetEntity> entities = datasetMapper.list(projectId,
                 query.getNamePrefix(), userId, null);
 

diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/evaluation/EvaluationService.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/evaluation/EvaluationService.java
@@ -29,8 +29,8 @@
 import ai.starwhale.mlops.domain.evaluation.mapper.ViewConfigMapper;
 import ai.starwhale.mlops.domain.evaluation.po.ViewConfigEntity;
 import ai.starwhale.mlops.domain.job.JobDao;
-import ai.starwhale.mlops.domain.job.bo.Job;
 import ai.starwhale.mlops.domain.job.converter.JobConverter;
+import ai.starwhale.mlops.domain.job.po.JobEntity;
 import ai.starwhale.mlops.domain.job.status.JobStatusMachine;
 import ai.starwhale.mlops.domain.project.ProjectService;
 import ai.starwhale.mlops.domain.user.UserService;
@@ -112,14 +112,14 @@ public Boolean createViewConfig(String projectUrl, ConfigRequest configRequest)
 
     public PageInfo<SummaryVo> listEvaluationSummary(String projectUrl,
             SummaryFilter summaryFilter, PageParams pageParams) {
-        PageHelper.startPage(pageParams.getPageNum(), pageParams.getPageSize());
         Long projectId = projectService.getProjectId(projectUrl);
-        List<Job> jobs = jobDao.listJobs(projectId, null);
+        PageHelper.startPage(pageParams.getPageNum(), pageParams.getPageSize());
+        var jobs = jobDao.listJobs(projectId, null);
         return PageUtil.toPageInfo(jobs, this::toSummary);
     }
 
 
-    private SummaryVo toSummary(Job job) {
+    private SummaryVo toSummary(JobEntity job) {
         if (summaryCache.containsKey(job.getId())) {
             return summaryCache.get(job.getId());
         }
@@ -129,7 +129,7 @@ private SummaryVo toSummary(Job job) {
                 .id(jobVo.getId())
                 .uuid(jobVo.getUuid())
                 .projectId(idConvertor.convert(job.getProject().getId()))
-                .projectName(job.getProject().getName())
+                .projectName(job.getProject().getProjectName())
                 .modelName(jobVo.getModelName())
                 .modelVersion(jobVo.getModelVersion())
                 .datasets(StrUtil.join(",", jobVo.getDatasets()))
@@ -145,7 +145,7 @@ private SummaryVo toSummary(Job job) {
                 .build();
 
         // only cache the jobs which have the final status
-        if (jobStatusMachine.isFinal(job.getStatus())) {
+        if (jobStatusMachine.isFinal(job.getJobStatus())) {
             summaryCache.put(job.getId(), summaryVo);
         }
         return summaryVo;

diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/job/JobDao.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/job/JobDao.java
@@ -116,11 +116,8 @@ private JobEntity convertFromFlatten(JobFlattenEntity flattenEntity) {
     }
 
 
-    public List<Job> listJobs(Long projectId, Long modelId) {
-        return jobMapper.listJobs(projectId, modelId)
-                .stream()
-                .map(jobBoConverter::fromEntity)
-                .collect(Collectors.toList());
+    public List<JobEntity> listJobs(Long projectId, Long modelId) {
+        return jobMapper.listJobs(projectId, modelId);
     }
 
     public List<Job> findJobByStatusIn(List<JobStatus> jobStatuses) {
@@ -177,6 +174,14 @@ public Job findJob(String jobUrl) {
         }
     }
 
+    public JobEntity findJobEntity(String jobUrl) {
+        if (idConvertor.isId(jobUrl)) {
+            return jobMapper.findJobById(idConvertor.revert(jobUrl));
+        } else {
+            return jobMapper.findJobByUuid(jobUrl);
+        }
+    }
+
     public boolean updateJobPinStatus(String jobUrl, boolean pinned) {
         Date pinnedTime = pinned ? Date.from(Instant.now()) : null;
 

diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/job/JobService.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/job/JobService.java
@@ -140,9 +140,9 @@ public JobService(
     }
 
     public PageInfo<JobVo> listJobs(String projectUrl, Long modelId, PageParams pageParams) {
-        PageHelper.startPage(pageParams.getPageNum(), pageParams.getPageSize());
         Long projectId = projectService.getProjectId(projectUrl);
-        List<Job> jobEntities = jobDao.listJobs(projectId, modelId);
+        PageHelper.startPage(pageParams.getPageNum(), pageParams.getPageSize());
+        var jobEntities = jobDao.listJobs(projectId, modelId);
         return PageUtil.toPageInfo(jobEntities, jobConvertor::convert);
     }
 

diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/job/step/mapper/StepMapper.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/job/step/mapper/StepMapper.java
@@ -35,7 +35,7 @@ public interface StepMapper {
             + " values (#{step.uuid}, #{step.name}, #{step.jobId}, #{step.lastStepId}, #{step.status}, "
             + " #{step.concurrency}, #{step.taskNum}, #{step.poolInfo})")
     @Options(useGeneratedKeys = true, keyColumn = "id", keyProperty = "id")
-    void save(@Param("step") StepEntity stepEntity);
+    int save(@Param("step") StepEntity stepEntity);
 
     @Select("select id, step_uuid as uuid, step_name as name, job_id, last_step_id, step_status as status,"
             + " finished_time, started_time, created_time, modified_time, concurrency, task_num, pool_info from step"

diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/model/ModelService.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/model/ModelService.java
@@ -173,9 +173,9 @@ public ModelService(
     }
 
     public PageInfo<ModelVo> listModel(ModelQuery query, PageParams pageParams) {
-        PageHelper.startPage(pageParams.getPageNum(), pageParams.getPageSize());
         Long projectId = projectService.getProjectId(query.getProjectUrl());
         Long userId = userService.getUserId(query.getOwner());
+        PageHelper.startPage(pageParams.getPageNum(), pageParams.getPageSize());
         List<ModelEntity> entities = modelMapper.list(projectId, query.getNamePrefix(), userId, null);
         return PageUtil.toPageInfo(entities, entity -> {
             ModelVo vo = modelVoConverter.convert(entity);

diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/runtime/RuntimeService.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/runtime/RuntimeService.java
@@ -197,9 +197,9 @@ public RuntimeService(RuntimeMapper runtimeMapper,
     }
 
     public PageInfo<RuntimeVo> listRuntime(RuntimeQuery runtimeQuery, PageParams pageParams) {
-        PageHelper.startPage(pageParams.getPageNum(), pageParams.getPageSize());
         Long projectId = projectService.getProjectId(runtimeQuery.getProjectUrl());
         Long userId = userService.getUserId(runtimeQuery.getOwner());
+        PageHelper.startPage(pageParams.getPageNum(), pageParams.getPageSize());
         List<RuntimeEntity> entities = runtimeMapper.list(projectId, runtimeQuery.getNamePrefix(), userId, null);
 
         return PageUtil.toPageInfo(entities, rt -> {

diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/task/TaskService.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/task/TaskService.java
@@ -19,8 +19,8 @@
 import ai.starwhale.mlops.api.protocol.task.TaskVo;
 import ai.starwhale.mlops.common.IdConverter;
 import ai.starwhale.mlops.common.PageParams;
+import ai.starwhale.mlops.common.util.PageUtil;
 import ai.starwhale.mlops.domain.job.JobDao;
-import ai.starwhale.mlops.domain.job.bo.Job;
 import ai.starwhale.mlops.domain.task.bo.ResultPath;
 import ai.starwhale.mlops.domain.task.converter.TaskConverter;
 import ai.starwhale.mlops.domain.task.mapper.TaskMapper;
@@ -63,16 +63,16 @@ public TaskService(TaskConverter taskConvertor, TaskMapper taskMapper,
     }
 
     public PageInfo<TaskVo> listTasks(String jobUrl, PageParams pageParams) {
+        var job = jobDao.findJobEntity(jobUrl);
         PageHelper.startPage(pageParams.getPageNum(), pageParams.getPageSize());
-        Job job = jobDao.findJob(jobUrl);
-        List<TaskVo> tasks = taskMapper.listTasks(job.getId()).stream().map(taskConvertor::convert)
-                .peek(taskVo -> {
-                    if (!StringUtils.hasText(taskVo.getResourcePool())) {
-                        taskVo.setResourcePool(job.getResourcePool().getName());
-                    }
-                })
-                .collect(Collectors.toList());
-        return PageInfo.of(tasks);
+        var entities = taskMapper.listTasks(job.getId());
+        return PageUtil.toPageInfo(entities, entity -> {
+            var vo = taskConvertor.convert(entity);
+            if (!StringUtils.hasText(vo.getResourcePool())) {
+                vo.setResourcePool(job.getResourcePool());
+            }
+            return vo;
+        });
 
     }