From 736d5a00b718ada6bfb739cdf573daa6e0c16533 Mon Sep 17 00:00:00 2001
From: Xiang Hong Wei <hongwei.xiang@shopee.com>
Date: Fri, 7 May 2021 19:06:47 +0800
Subject: [PATCH 1/3] optimize the migration task name

---
 .../kafka/manager/web/converters/ReassignModelConverter.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/ReassignModelConverter.java b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/ReassignModelConverter.java
index 747fbb8b..cac1e553 100644
--- a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/ReassignModelConverter.java
+++ b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/ReassignModelConverter.java
@@ -89,18 +89,20 @@ public class ReassignModelConverter {
         }
 
         ReassignTaskVO vo = new ReassignTaskVO();
-        vo.setTaskName(String.format("%s 数据迁移任务", DateUtils.getFormattedDate(taskId)));
         vo.setTaskId(taskId);
         vo.setTotalTopicNum(doList.size());
         vo.setBeginTime(0L);
         vo.setEndTime(0L);
 
         Integer completedTopicNum = 0;
+        StringBuilder clusterAndTopicName = new StringBuilder();
         Set<Integer> statusSet = new HashSet<>();
         for (ReassignTaskDO elem: doList) {
             vo.setGmtCreate(elem.getGmtCreate().getTime());
             vo.setOperator(elem.getOperator());
             vo.setDescription(elem.getDescription());
+            // There is only one `ReassignTaskDO` in the `doList`
+            clusterAndTopicName.append("-").append(elem.getClusterId()).append("-").append(elem.getTopicName());
             if (TaskStatusReassignEnum.isFinished(elem.getStatus())) {
                 completedTopicNum += 1;
                 statusSet.add(elem.getStatus());
@@ -113,6 +115,7 @@ public class ReassignModelConverter {
             // 任务计划开始时间
             vo.setBeginTime(elem.getBeginTime().getTime());
         }
+        vo.setTaskName(String.format("%s 数据迁移任务%s", DateUtils.getFormattedDate(taskId), clusterAndTopicName.toString()));
 
         // 任务整体状态
         if (statusSet.contains(TaskStatusReassignEnum.RUNNING.getCode())) {

From fcdeef01469b53c42798448a690dd7ad793caf02 Mon Sep 17 00:00:00 2001
From: "hongtenzone@foxmail.com" <hongtenzone@foxmail.com>
Date: Sun, 4 Jul 2021 17:55:54 +0800
Subject: [PATCH 2/3] remove duplicate operation

---
 .../src/main/java/com/xiaojukeji/kafka/manager/bpm/Converts.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kafka-manager-extends/kafka-manager-bpm/src/main/java/com/xiaojukeji/kafka/manager/bpm/Converts.java b/kafka-manager-extends/kafka-manager-bpm/src/main/java/com/xiaojukeji/kafka/manager/bpm/Converts.java
index 956491b2..39d80369 100644
--- a/kafka-manager-extends/kafka-manager-bpm/src/main/java/com/xiaojukeji/kafka/manager/bpm/Converts.java
+++ b/kafka-manager-extends/kafka-manager-bpm/src/main/java/com/xiaojukeji/kafka/manager/bpm/Converts.java
@@ -19,7 +19,6 @@ public class Converts {
         orderDO.setApprover("");
         orderDO.setOpinion("");
         orderDO.setExtensions(orderDTO.getExtensions());
-        orderDO.setType(orderDTO.getType());
         return orderDO;
     }
 }
\ No newline at end of file

From 31fc6e4e566ce2486a2b37ed2df4a2f516a83563 Mon Sep 17 00:00:00 2001
From: "hongtenzone@foxmail.com" <hongtenzone@foxmail.com>
Date: Sun, 4 Jul 2021 17:59:36 +0800
Subject: [PATCH 3/3] remove duplicate operation

---
 .../kafka/manager/web/converters/ReassignModelConverter.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/ReassignModelConverter.java b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/ReassignModelConverter.java
index cac1e553..747fbb8b 100644
--- a/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/ReassignModelConverter.java
+++ b/kafka-manager-web/src/main/java/com/xiaojukeji/kafka/manager/web/converters/ReassignModelConverter.java
@@ -89,20 +89,18 @@ public class ReassignModelConverter {
         }
 
         ReassignTaskVO vo = new ReassignTaskVO();
+        vo.setTaskName(String.format("%s 数据迁移任务", DateUtils.getFormattedDate(taskId)));
         vo.setTaskId(taskId);
         vo.setTotalTopicNum(doList.size());
         vo.setBeginTime(0L);
         vo.setEndTime(0L);
 
         Integer completedTopicNum = 0;
-        StringBuilder clusterAndTopicName = new StringBuilder();
         Set<Integer> statusSet = new HashSet<>();
         for (ReassignTaskDO elem: doList) {
             vo.setGmtCreate(elem.getGmtCreate().getTime());
             vo.setOperator(elem.getOperator());
             vo.setDescription(elem.getDescription());
-            // There is only one `ReassignTaskDO` in the `doList`
-            clusterAndTopicName.append("-").append(elem.getClusterId()).append("-").append(elem.getTopicName());
             if (TaskStatusReassignEnum.isFinished(elem.getStatus())) {
                 completedTopicNum += 1;
                 statusSet.add(elem.getStatus());
@@ -115,7 +113,6 @@ public class ReassignModelConverter {
             // 任务计划开始时间
             vo.setBeginTime(elem.getBeginTime().getTime());
         }
-        vo.setTaskName(String.format("%s 数据迁移任务%s", DateUtils.getFormattedDate(taskId), clusterAndTopicName.toString()));
 
         // 任务整体状态
         if (statusSet.contains(TaskStatusReassignEnum.RUNNING.getCode())) {