From 80aa686e8487b1cf4d51694fdbbd9841ae30cb3f Mon Sep 17 00:00:00 2001
From: simonzhangsz <simonzhangsz@outlook.com>
Date: Wed, 20 Sep 2023 11:20:07 +0800
Subject: [PATCH] trace&measure

---
 database/upgrade/upgrade.sql | 10 +++++++++-
 features/trace/trace.go      |  2 ++
 lib/dborm/dborm.go           |  4 +++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/database/upgrade/upgrade.sql b/database/upgrade/upgrade.sql
index fb6cdc4c..30140fba 100644
--- a/database/upgrade/upgrade.sql
+++ b/database/upgrade/upgrade.sql
@@ -58,4 +58,12 @@ ALTER TABLE `omc_db`.`user`
 MODIFY COLUMN `name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL AFTER `account_id`;
 
 ALTER TABLE `omc_db`.`measure_threshold` 
-CHANGE COLUMN IF EXISTS `alarm_id` `alarm_code` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '10200' AFTER `orig_severity`;
\ No newline at end of file
+CHANGE COLUMN IF EXISTS `alarm_id` `alarm_code` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '10200' AFTER `orig_severity`;
+
+ALTER TABLE `omc_db`.`measure_task` 
+ADD COLUMN IF NOT EXISTS `account_id` varchar(32) NULL AFTER `status`,
+ADD COLUMN IF NOT EXISTS `comment` varchar(255) NULL AFTER `account_id`;
+
+ALTER TABLE `omc_db`.`trace_task` 
+ADD COLUMN IF NOT EXISTS `account_id` varchar(32) NULL AFTER `update_time`,
+ADD COLUMN IF NOT EXISTS `comment` varchar(255) NULL AFTER `account_id`;
\ No newline at end of file
diff --git a/features/trace/trace.go b/features/trace/trace.go
index 5caccb3f..b22382c4 100644
--- a/features/trace/trace.go
+++ b/features/trace/trace.go
@@ -48,6 +48,8 @@ type TraceTask struct {
 	Status     string   `json:"-" xorm:"status"`
 	SuccNEs    []string `json:"-" xorm:"succ_nes"`
 	FailNEs    []string `json:"-" xorm:"fail_nes"`
+	AccountID  string   `json:"accountId" xorm:"account_id"`
+	Comment    string   `json:"comment" xorm:"comment"`
 	UpdateTime string   `json:"-" xorm:"-"`
 }
 
diff --git a/lib/dborm/dborm.go b/lib/dborm/dborm.go
index cef4da0f..58f43567 100644
--- a/lib/dborm/dborm.go
+++ b/lib/dborm/dborm.go
@@ -553,6 +553,8 @@ type MeasureTask struct {
 	Schedule     []ScheduleJ `json:"Schedule" xorm:"schedule"`
 	GranulOption string      `json:"granulOption" xorm:"granul_option"`
 	Status       string      `json:"status" xorm:"status"`
+	AccountID    string      `json:"accountId" xorm:"account_id"`
+	Comment      string      `json:"comment" xorm:"comment"`
 	CreateTime   string      `json:"createTime" xorm:"create_time"`
 	UpdateTime   string      `json:"updateTime" xorm:"update_time"`
 	DeleteTime   string      `json:"deleteTime xorm:"delete_time"`
@@ -563,7 +565,7 @@ func GetMeasureTask(taskId int) (*MeasureTask, error) {
 
 	measureTask := new(MeasureTask)
 	has, err := xEngine.Table("measure_task").Where("id=?", taskId).Get(measureTask)
-	if err != nil || has == false {
+	if err != nil || !has {
 		log.Error("Failed to get table measure_task from database:", err)
 
 		return nil, err