From 2d5aadfaaeb60a930162e027e07c5ac99f22b254 Mon Sep 17 00:00:00 2001
From: zhanghailong22 <zhanghailong22@huawei.com>
Date: Tue, 22 Dec 2020 09:23:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8E=86=E5=8F=B2=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E8=A2=AB=E6=B8=85=E7=A9=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../developer/mapper/ProjectMapper.java       |  2 +
 .../developer/service/ProjectService.java     |  2 +-
 src/main/resources/mapper/ProjectMapper.xml   | 55 +++++++++++++++++++
 3 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/edgegallery/developer/mapper/ProjectMapper.java b/src/main/java/org/edgegallery/developer/mapper/ProjectMapper.java
index 064573b4..57cb757b 100644
--- a/src/main/java/org/edgegallery/developer/mapper/ProjectMapper.java
+++ b/src/main/java/org/edgegallery/developer/mapper/ProjectMapper.java
@@ -45,6 +45,8 @@ public interface ProjectMapper {
 
     int updateTestConfig(ProjectTestConfig testConfig);
 
+    int cleanTestConfig(ProjectTestConfig testConfig);
+
     List<ProjectTestConfig> getTestConfigByProjectId(String projectId);
 
     int saveImageConfig(ProjectImageConfig imageConfig);
diff --git a/src/main/java/org/edgegallery/developer/service/ProjectService.java b/src/main/java/org/edgegallery/developer/service/ProjectService.java
index 64abddd3..c6c96e75 100644
--- a/src/main/java/org/edgegallery/developer/service/ProjectService.java
+++ b/src/main/java/org/edgegallery/developer/service/ProjectService.java
@@ -963,7 +963,7 @@ public class ProjectService {
         }
         LOGGER.info("Update project status to TESTED success");
 
-        int tes = projectMapper.updateTestConfig(testConfig);
+        int tes = projectMapper.cleanTestConfig(testConfig);
         if (tes < 1) {
             LOGGER.error("Update test config {} failed", testConfig.getTestId());
         }
diff --git a/src/main/resources/mapper/ProjectMapper.xml b/src/main/resources/mapper/ProjectMapper.xml
index f90eb07c..0406a5a9 100644
--- a/src/main/resources/mapper/ProjectMapper.xml
+++ b/src/main/resources/mapper/ProjectMapper.xml
@@ -177,6 +177,61 @@
     </select>
 
     <update id="updateTestConfig" parameterType="org.edgegallery.developer.model.workspace.ProjectTestConfig">
+        UPDATE
+        tbl_project_test_config
+        SET
+        <if test="projectId !=null and projectId !=''">
+            project_id = #{projectId},
+        </if>
+        <if test="appApiFileId !=null and appApiFileId !=''">
+            app_api_file_id = #{appApiFileId},
+        </if>
+        <if test="deployFileId !=null and deployFileId !=''">
+            deploy_file_id = #{deployFileId},
+        </if>
+        <if test="privateHost !=null">
+            private_host = #{privateHost},
+        </if>
+        <if test="platform !=null">
+            platform = #{platform},
+        </if>
+        <if test="hosts !=null">
+            hosts = #{hosts, jdbcType=OTHER, typeHandler=org.edgegallery.developer.model.handler.JsonCollectionTypeHandler},
+        </if>
+        <if test="errorLog !=null and errorLog !=''">
+            error_log = #{errorLog},
+        </if>
+        <if test="stageStatus !=null">
+            stage_status = #{stageStatus, jdbcType=OTHER, typeHandler=org.edgegallery.developer.model.handler.JsonTypeHandler},
+        </if>
+
+        <if test="accessUrl !=null and accessUrl !=''">
+            access_url = #{accessUrl},
+        </if>
+        <if test="deployDate !=null">
+            deploy_date = #{deployDate},
+        </if>
+        <if test="pods !=null and pods !=''">
+            pods = #{pods},
+        </if>
+        <if test="appInstanceId !=null and appInstanceId !=''">
+            app_instance_id = #{appInstanceId},
+        </if>
+        <if test="workLoadId !=null and workLoadId !=''">
+            work_load_id = #{workLoadId},
+        </if>
+        <if test="deployStatus !=null">
+            deploy_status = #{deployStatus},
+        </if>
+        <if test="lcmToken !=null and lcmToken !=''">
+            lcm_token = #{lcmToken},
+        </if>
+        test_id = #{testId}
+        WHERE
+        test_id = #{testId}
+    </update>
+
+    <update id="cleanTestConfig" parameterType="org.edgegallery.developer.model.workspace.ProjectTestConfig">
         UPDATE
         tbl_project_test_config
         SET
-- 
Gitee