From 306cf75a8e40941c597e58f428ba4592eebb02c1 Mon Sep 17 00:00:00 2001
From: chenyifan01 <cyf_uestc@outlook.com>
Date: Thu, 3 Nov 2022 15:15:46 +0800
Subject: [PATCH] #3045 update

---
 models/resource_queue.go                              |  3 ---
 models/resource_specification.go                      | 11 ++++-------
 .../cloudbrain/resource/resource_specification.go     |  1 +
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/models/resource_queue.go b/models/resource_queue.go
index fc0dd8cb5..87809bba7 100644
--- a/models/resource_queue.go
+++ b/models/resource_queue.go
@@ -313,9 +313,6 @@ func SyncGrampusQueues(updateList []ResourceQueue, insertList []ResourceQueue, e
 			if _, err = sess.In("id", deleteSpcIds).Update(&ResourceSpecification{Status: SpecOffShelf}); err != nil {
 				return err
 			}
-			if _, err = sess.In("spec_id", deleteSpcIds).Delete(&ResourceSceneSpec{}); err != nil {
-				return err
-			}
 		}
 
 	}
diff --git a/models/resource_specification.go b/models/resource_specification.go
index 2da8d015d..a6f5f1f82 100644
--- a/models/resource_specification.go
+++ b/models/resource_specification.go
@@ -168,6 +168,7 @@ type FindSpecsOptions struct {
 	UseShareMemGiB  bool
 	//if true,find specs no matter used or not used in scene. if false,only find specs used in scene
 	RequestAll bool
+	SpecStatus int
 }
 
 type Specification struct {
@@ -269,10 +270,6 @@ func ResourceSpecOffShelf(id int64) (int64, error) {
 		}
 		sess.Close()
 	}()
-	//delete scene spec relation
-	if _, err = sess.Where("spec_id = ?", id).Delete(&ResourceSceneSpec{}); err != nil {
-		return 0, err
-	}
 
 	param := ResourceSpecification{
 		Status: SpecOffShelf,
@@ -317,9 +314,6 @@ func SyncGrampusSpecs(updateList []ResourceSpecification, insertList []ResourceS
 		if _, err = sess.Cols("status", "is_available").In("id", deleteIds).Update(&ResourceSpecification{Status: SpecOffShelf, IsAvailable: false}); err != nil {
 			return err
 		}
-		if _, err = sess.In("spec_id", deleteIds).Delete(&ResourceSceneSpec{}); err != nil {
-			return err
-		}
 	}
 
 	//update exists specs
@@ -384,6 +378,9 @@ func FindSpecs(opts FindSpecsOptions) ([]*Specification, error) {
 	if opts.UseShareMemGiB {
 		cond = cond.And(builder.Eq{"resource_specification.share_mem_gi_b": opts.ShareMemGiB})
 	}
+	if opts.SpecStatus > 0 {
+		cond = cond.And(builder.Eq{"resource_specification.status": opts.SpecStatus})
+	}
 	r := make([]*Specification, 0)
 	s := x.Where(cond).
 		Join("INNER", "resource_queue", "resource_queue.id = resource_specification.queue_id")
diff --git a/services/cloudbrain/resource/resource_specification.go b/services/cloudbrain/resource/resource_specification.go
index b68abbb88..9388a1efb 100644
--- a/services/cloudbrain/resource/resource_specification.go
+++ b/services/cloudbrain/resource/resource_specification.go
@@ -197,6 +197,7 @@ func AddSpecOperateLog(doerId int64, operateType string, newValue, oldValue *mod
 }
 
 func FindAvailableSpecs(userId int64, opts models.FindSpecsOptions) ([]*models.Specification, error) {
+	opts.SpecStatus = models.SpecOnShelf
 	r, err := models.FindSpecs(opts)
 	if err != nil {
 		log.Error("FindAvailableSpecs error.%v", err)