From 33c97d53013febc9106439035b68ece4fd6e3f66 Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Fri, 8 Jul 2022 17:45:46 +0800
Subject: [PATCH] #2225 update

---
 models/task_config.go          | 34 ++++++++++++++++++++++++++++++----
 modules/modelarts/modelarts.go |  2 --
 routers/task/config.go         |  8 +++++++-
 services/task/task_config.go   |  4 ++--
 4 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/models/task_config.go b/models/task_config.go
index 0f7638795..aaf25633e 100644
--- a/models/task_config.go
+++ b/models/task_config.go
@@ -2,6 +2,8 @@ package models
 
 import (
 	"code.gitea.io/gitea/modules/timeutil"
+	"fmt"
+	"xorm.io/builder"
 )
 
 const (
@@ -106,21 +108,45 @@ func GetTaskConfigList() ([]*TaskConfig, error) {
 	}
 	return r, nil
 }
-func GetTaskConfigPageWithDeleted(opt ListOptions) ([]*TaskAndLimiterConfig, int64, error) {
+
+type GetTaskConfigOpts struct {
+	ListOptions
+	Status     int //1 normal 2 deleted
+	ActionType int
+}
+
+func GetTaskConfigPageWithDeleted(opt GetTaskConfigOpts) ([]*TaskAndLimiterConfig, int64, error) {
 	if opt.Page <= 0 {
 		opt.Page = 1
 	}
-	n, err := x.Unscoped().Count(&TaskConfig{})
+	cond := builder.NewCond()
+	if opt.ActionType > 0 {
+		cond = cond.And(builder.Eq{"task_code": fmt.Sprint(opt.ActionType)})
+	}
+
+	var count int64
+	var err error
+	if opt.Status == 1 {
+		subCond := builder.NewCond()
+		subCond = subCond.Or(builder.IsNull{"task_config.deleted_at"})
+		subCond = subCond.Or(builder.Eq{"task_config.deleted_at": 0})
+		cond = cond.And(subCond)
+	} else if opt.Status == 2 {
+		cond = cond.And(builder.Gt{"task_config.deleted_at": 0})
+	}
+	count, err = x.Unscoped().Where(cond).Count(&TaskConfig{})
 	if err != nil {
 		return nil, 0, err
 	}
 	r := make([]*TaskAndLimiterConfig, 0)
-	err = x.Join("LEFT", "limit_config", "task_config.id = limit_config.related_id").Unscoped().Limit(opt.PageSize, (opt.Page-1)*opt.PageSize).OrderBy("task_config.deleted_at desc,task_config.id desc").Find(&r)
+	err = x.Join("LEFT", "limit_config", "task_config.id = limit_config.related_id").
+		Unscoped().Where(cond).Limit(opt.PageSize, (opt.Page-1)*opt.PageSize).
+		OrderBy("task_config.deleted_at desc,task_config.id desc").Find(&r)
 
 	if len(r) == 0 {
 		return nil, 0, ErrRecordNotExist{}
 	}
-	return r, n, nil
+	return r, count, nil
 }
 
 func EditTaskConfig(config TaskConfigWithLimit, doer *User) error {
diff --git a/modules/modelarts/modelarts.go b/modules/modelarts/modelarts.go
index ebf34e231..36d9ec3dd 100755
--- a/modules/modelarts/modelarts.go
+++ b/modules/modelarts/modelarts.go
@@ -98,7 +98,6 @@ type GenerateTrainJobReq struct {
 	VersionCount      int
 	EngineName        string
 	TotalVersionCount int
-	ResourceSpecId    int
 	DatasetName       string
 }
 
@@ -131,7 +130,6 @@ type GenerateInferenceJobReq struct {
 	ModelVersion      string
 	CkptName          string
 	ResultUrl         string
-	ResourceSpecId    int
 }
 
 type VersionInfo struct {
diff --git a/routers/task/config.go b/routers/task/config.go
index 4e52d70eb..7f9f42b97 100644
--- a/routers/task/config.go
+++ b/routers/task/config.go
@@ -12,7 +12,13 @@ import (
 
 func GetTaskConfigList(ctx *context.Context) {
 	page := ctx.QueryInt("Page")
-	r, err := task.GetTaskConfigWithLimitList(models.ListOptions{PageSize: 20, Page: page})
+	status := ctx.QueryInt("Status")
+	action := ctx.QueryInt("Action")
+	r, err := task.GetTaskConfigWithLimitList(models.GetTaskConfigOpts{
+		ListOptions: models.ListOptions{PageSize: 20, Page: page},
+		Status:      status,
+		ActionType:  action,
+	})
 	if err != nil {
 		ctx.JSON(http.StatusOK, response.ServerError(err.Error()))
 		return
diff --git a/services/task/task_config.go b/services/task/task_config.go
index 0f470d763..424151098 100644
--- a/services/task/task_config.go
+++ b/services/task/task_config.go
@@ -52,7 +52,7 @@ func GetTaskConfigList() ([]*models.TaskConfig, error) {
 	return config, nil
 }
 
-func GetTaskConfigPageWithDeleted(opt models.ListOptions) ([]*models.TaskAndLimiterConfig, int64, error) {
+func GetTaskConfigPageWithDeleted(opt models.GetTaskConfigOpts) ([]*models.TaskAndLimiterConfig, int64, error) {
 	config, count, err := models.GetTaskConfigPageWithDeleted(opt)
 	if err != nil {
 		log.Error(" GetTaskConfigPageWithDeleted from model error. %v", err)
@@ -64,7 +64,7 @@ func GetTaskConfigPageWithDeleted(opt models.ListOptions) ([]*models.TaskAndLimi
 	return config, count, nil
 }
 
-func GetTaskConfigWithLimitList(opt models.ListOptions) (*models.TaskConfigWithLimitResponse, error) {
+func GetTaskConfigWithLimitList(opt models.GetTaskConfigOpts) (*models.TaskConfigWithLimitResponse, error) {
 	list, n, err := GetTaskConfigPageWithDeleted(opt)
 	if err != nil {
 		return nil, err