From 0cf9c5165fb8dd2f79f7d9b275c1eb1d0b2b6c52 Mon Sep 17 00:00:00 2001
From: liuzx <liuzx@pcl.ac.cn>
Date: Wed, 23 Feb 2022 15:45:48 +0800
Subject: [PATCH] fix-1556

---
 routers/api/v1/api.go              |  7 ++++---
 routers/api/v1/repo/cloudbrain.go  | 17 ++++++++++++-----
 templates/repo/debugjob/index.tmpl |  2 +-
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 36f220cef..c8dbc3a34 100755
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -878,9 +878,10 @@ func RegisterRoutes(m *macaron.Macaron) {
 					}, reqAdmin())
 				}, reqAnyRepoReader())
 				m.Group("/cloudbrain", func() {
-					// m.Get("/:jobid", repo.GetCloudbrainTask)
-					m.Get("/:jobname", repo.GetCloudbrainTask)
-					m.Get("/:jobname/log", repo.CloudbrainGetLog)
+					m.Get("/:jobid", repo.GetCloudbrainTask)
+					m.Get("/:jobid/log", repo.CloudbrainGetLog)
+					// m.Get("/:jobname", repo.GetCloudbrainTask)
+					// m.Get("/:jobname/log", repo.CloudbrainGetLog)
 				}, reqRepoReader(models.UnitTypeCloudBrain))
 				m.Group("/modelarts", func() {
 					m.Group("/notebook", func() {
diff --git a/routers/api/v1/repo/cloudbrain.go b/routers/api/v1/repo/cloudbrain.go
index 6a2538048..a23e3853a 100755
--- a/routers/api/v1/repo/cloudbrain.go
+++ b/routers/api/v1/repo/cloudbrain.go
@@ -49,8 +49,11 @@ func GetCloudbrainTask(ctx *context.APIContext) {
 		err error
 	)
 
-	jobName := ctx.Params(":jobname")
-	job, err := models.GetCloudbrainByName(jobName)
+	// jobName := ctx.Params(":jobname")
+	// job, err := models.GetCloudbrainByName(jobName)
+	jobID := ctx.Params(":jobid")
+	repoID := ctx.Repo.Repository.ID
+	job, err := models.GetRepoCloudBrainByJobID(repoID, jobID)
 	if err != nil {
 		ctx.Data["error"] = err.Error()
 	}
@@ -83,6 +86,7 @@ func GetCloudbrainTask(ctx *context.APIContext) {
 	}
 
 	ctx.JSON(http.StatusOK, map[string]interface{}{
+		"JobID":         result.Config.JobID,
 		"JobName":       result.Config.JobName,
 		"JobStatus":     result.JobStatus.State,
 		"SubState":      result.JobStatus.SubState,
@@ -93,8 +97,11 @@ func GetCloudbrainTask(ctx *context.APIContext) {
 }
 
 func CloudbrainGetLog(ctx *context.Context) {
-	jobName := ctx.Params(":jobname")
-	job, err := models.GetCloudbrainByName(jobName)
+	// jobName := ctx.Params(":jobname")
+	// job, err := models.GetCloudbrainByName(jobName)
+	jobID := ctx.Params(":jobid")
+	repoID := ctx.Repo.Repository.ID
+	job, err := models.GetRepoCloudBrainByJobID(repoID, jobID)
 	if err != nil {
 		log.Error("GetCloudbrainByJobID failed: %v", err, ctx.Data["MsgID"])
 		ctx.ServerError(err.Error(), err)
@@ -141,7 +148,7 @@ func CloudbrainGetLog(ctx *context.Context) {
 	}
 
 	ctx.JSON(http.StatusOK, map[string]interface{}{
-		"JobName": jobName,
+		"JobID":   jobID,
 		"Content": content,
 	})
 
diff --git a/templates/repo/debugjob/index.tmpl b/templates/repo/debugjob/index.tmpl
index 36f3fd681..c5a1b9ee6 100755
--- a/templates/repo/debugjob/index.tmpl
+++ b/templates/repo/debugjob/index.tmpl
@@ -293,7 +293,7 @@
                                 </div>
                                 <div class="two wide column text center">
                                      <!--任务状态 -->
-                                     <span class="job-status" id="{{.JobID}}" data-repopath="{{$.RepoRelPath}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}" data-jobid="{{if eq .ComputeResource "CPU/GPU"}}{{.JobName}}{{else}}{{.JobID}}{{end}}" data-resource="{{.ComputeResource}}">
+                                     <span class="job-status" id="{{.JobID}}" data-repopath="{{$.RepoRelPath}}{{if eq .ComputeResource "CPU/GPU"}}/cloudbrain{{else}}/modelarts/notebook{{end}}" data-jobid="{{.JobID}}" data-resource="{{.ComputeResource}}">
                                         <span><i id="{{.JobID}}-icon" style="vertical-align: middle;" class="{{.Status}}"></i><span id="{{.JobID}}-text" style="margin-left: 0.4em;font-size: 12px;">{{.Status}}</span></span>
                                     </span>
                                 </div>