From 0dd482246b67fc027373b17b1f752889ffc60065 Mon Sep 17 00:00:00 2001
From: Jialei <3217223+jialeicui@users.noreply.github.com>
Date: Thu, 25 Aug 2022 11:16:43 +0800
Subject: [PATCH] fix(controller): make resource pool feature compatible with
 the old data (#986)

---
 .../starwhale/mlops/domain/job/converter/JobConvertor.java | 7 ++++++-
 .../domain/system/resourcepool/ResourcePoolConverter.java  | 4 ++++
 .../mlops/domain/system/resourcepool/bo/ResourcePool.java  | 3 +++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/job/converter/JobConvertor.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/job/converter/JobConvertor.java
index 6bcdf84cee..d802db15f9 100644
--- a/server/controller/src/main/java/ai/starwhale/mlops/domain/job/converter/JobConvertor.java
+++ b/server/controller/src/main/java/ai/starwhale/mlops/domain/job/converter/JobConvertor.java
@@ -29,6 +29,7 @@
 import ai.starwhale.mlops.domain.swds.po.SWDatasetVersionEntity;
 import ai.starwhale.mlops.domain.system.mapper.ResourcePoolMapper;
 import ai.starwhale.mlops.domain.system.po.ResourcePoolEntity;
+import ai.starwhale.mlops.domain.system.resourcepool.ResourcePoolConverter;
 import ai.starwhale.mlops.domain.user.UserConvertor;
 import ai.starwhale.mlops.exception.ConvertException;
 import ai.starwhale.mlops.exception.SWProcessException;
@@ -61,6 +62,9 @@ public class JobConvertor implements Convertor<JobEntity, JobVO> {
     @Resource
     private ResourcePoolMapper resourcePoolMapper;
 
+    @Resource
+    private ResourcePoolConverter resourcePoolConverter;
+
     @Override
     public JobVO convert(JobEntity jobEntity) throws ConvertException {
         List<RuntimeVO> runtimeByVersionIds = runtimeService.findRuntimeByVersionIds(
@@ -76,6 +80,7 @@ public JobVO convert(JobEntity jobEntity) throws ConvertException {
             .collect(Collectors.toList());
 
         ResourcePoolEntity resourcePoolEntity = resourcePoolMapper.findById(jobEntity.getResourcePoolId());
+        var resourcePool = resourcePoolConverter.toResourcePool(resourcePoolEntity);
 
         return JobVO.builder()
             .id(idConvertor.convert(jobEntity.getId()))
@@ -91,7 +96,7 @@ public JobVO convert(JobEntity jobEntity) throws ConvertException {
             .jobStatus(jobEntity.getJobStatus())
             .stopTime(localDateTimeConvertor.convert(jobEntity.getFinishedTime()))
             .comment(jobEntity.getComment())
-            .resourcePool(resourcePoolEntity.getLabel())
+            .resourcePool(resourcePool.getLabel())
             .build();
     }
 
diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/system/resourcepool/ResourcePoolConverter.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/system/resourcepool/ResourcePoolConverter.java
index 1f9a4b61c6..2cf592915e 100644
--- a/server/controller/src/main/java/ai/starwhale/mlops/domain/system/resourcepool/ResourcePoolConverter.java
+++ b/server/controller/src/main/java/ai/starwhale/mlops/domain/system/resourcepool/ResourcePoolConverter.java
@@ -39,6 +39,10 @@ public ResourcePoolEntity toEntity(ResourcePool pool) {
     }
 
     public ResourcePool toResourcePool(ResourcePoolEntity entity) {
+        if (entity == null) {
+            return ResourcePool.empty();
+        }
+
         return ResourcePool.builder().label(entity.getLabel()).build();
     }
 
diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/system/resourcepool/bo/ResourcePool.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/system/resourcepool/bo/ResourcePool.java
index 314e49d19b..93fc44b306 100644
--- a/server/controller/src/main/java/ai/starwhale/mlops/domain/system/resourcepool/bo/ResourcePool.java
+++ b/server/controller/src/main/java/ai/starwhale/mlops/domain/system/resourcepool/bo/ResourcePool.java
@@ -49,4 +49,7 @@ public boolean equals(Object o) {
     public int hashCode() {
         return Objects.hash(label);
     }
+    public static ResourcePool empty() {
+        return new ResourcePool("default");
+    }
 }