fix

Author: yokowu

backend/biz/git/usecase/gitbot.go

@@ -17,8 +17,8 @@ import (
 
 // GitBotUsecase GitBot 业务逻辑
 type GitBotUsecase struct {
-	cfg  *config.Config
-	repo domain.GitBotRepo
+	cfg    *config.Config
+	repo   domain.GitBotRepo
 	logger *slog.Logger
 }
 
@@ -40,9 +40,9 @@ func (u *GitBotUsecase) GetByID(ctx context.Context, id uuid.UUID) (*domain.GitB
 		}
 		return nil, err
 	}
-	return (&domain.GitBot{
+	return cvt.From(bot, &domain.GitBot{
 		WebhookURL: u.webhookURL(bot),
-	}).From(bot), nil
+	}), nil
 }
 
 // GetInstallationID 获取 installation_id
@@ -78,9 +78,9 @@ func (u *GitBotUsecase) List(ctx context.Context, uid uuid.UUID) (*domain.ListGi
 	}
 	return &domain.ListGitBotResp{
 		Bots: cvt.Iter(bots, func(_ int, bot *db.GitBot) *domain.GitBot {
-			return (&domain.GitBot{
+			return cvt.From(bot, &domain.GitBot{
 				WebhookURL: u.webhookURL(bot),
-			}).From(bot)
+			})
 		}),
 	}, nil
 }
@@ -91,9 +91,9 @@ func (u *GitBotUsecase) Create(ctx context.Context, uid uuid.UUID, req domain.Cr
 	if err != nil {
 		return nil, err
 	}
-	return (&domain.GitBot{
+	return cvt.From(bot, &domain.GitBot{
 		WebhookURL: u.webhookURL(bot),
-	}).From(bot), nil
+	}), nil
 }
 
 // Update 更新 GitBot
@@ -102,9 +102,9 @@ func (u *GitBotUsecase) Update(ctx context.Context, uid uuid.UUID, req domain.Up
 	if err != nil {
 		return nil, err
 	}
-	return (&domain.GitBot{
+	return cvt.From(bot, &domain.GitBot{
 		WebhookURL: u.webhookURL(bot),
-	}).From(bot), nil
+	}), nil
 }
 
 // Delete 删除 GitBot
@@ -120,7 +120,7 @@ func (u *GitBotUsecase) ListTask(ctx context.Context, uid uuid.UUID, req domain.
 	}
 	return &domain.ListGitBotTaskResp{
 		Tasks: cvt.Iter(tasks, func(_ int, t *db.GitBotTask) *domain.GitBotTask {
-			return (&domain.GitBotTask{}).From(t)
+			return cvt.From(t, &domain.GitBotTask{})
 		}),
 		Page:  pageInfo.TotalCount,
 		Size:  int64(req.Size),

backend/biz/host/usecase/host.go

@@ -242,7 +242,7 @@ func (h *HostUsecase) vmSleepConsumer() {
 				if err := h.taskflow.VirtualMachiner().Hibernate(ctx, &taskflow.HibernateVirtualMachineReq{
 					HostID: vm.HostID,
 					UserID: vm.UserID.String(),
-					ID:     vm.ID,
+					ID:     vm.EnvironmentID,
 				}); err != nil {
 					return fmt.Errorf("hibernate vm %s: %w", vm.ID, err)
 				}

backend/biz/project/repo/project.go

@@ -62,6 +62,7 @@ func (r *ProjectRepo) Get(ctx context.Context, uid, id uuid.UUID) (*db.Project,
 		WithIssues(func(piq *db.ProjectIssueQuery) {
 			piq.WithUser()
 		}).
+		WithGitBots().
 		First(ctx)
 }
 

backend/domain/gitbot.go

@@ -59,9 +59,9 @@ func (g *GitBot) From(src *db.GitBot) *GitBot {
 	g.Name = src.Name
 	g.Token = src.Token
 	g.SecretToken = src.SecretToken
-	g.Host = g.Host.From(src.Edges.Host)
+	g.Host = cvt.From(src.Edges.Host, &Host{})
 	g.Users = cvt.Iter(src.Edges.Users, func(_ int, u *db.User) *User {
-		return (&User{}).From(u)
+		return cvt.From(u, &User{})
 	})
 	g.CreatedAt = src.CreatedAt.Unix()
 	return g
@@ -97,9 +97,9 @@ type ListGitBotResp struct {
 
 // ListGitBotTaskReq Git Bot 任务列表请求
 type ListGitBotTaskReq struct {
-	ID uuid.UUID `json:"id" query:"id" validate:"omitempty"`
-	Page         int `json:"page" query:"page"`
-	Size         int `json:"size" query:"size"`
+	ID   uuid.UUID `json:"id" query:"id" validate:"omitempty"`
+	Page int       `json:"page" query:"page"`
+	Size int       `json:"size" query:"size"`
 }
 
 // ListGitBotTaskResp Git Bot 任务列表响应
@@ -112,12 +112,12 @@ type ListGitBotTaskResp struct {
 
 // GitBotTask Git Bot 任务实体
 type GitBotTask struct {
-	ID          uuid.UUID     `json:"id"`
-	PullRequest PullRequest   `json:"pull_request"`
-	Repo        GitRepository `json:"repo"`
+	ID          uuid.UUID         `json:"id"`
+	PullRequest PullRequest       `json:"pull_request"`
+	Repo        GitRepository     `json:"repo"`
 	Status      consts.TaskStatus `json:"status"`
-	Bot         *GitBot       `json:"bot"`
-	CreatedAt   int64         `json:"created_at"`
+	Bot         *GitBot           `json:"bot"`
+	CreatedAt   int64             `json:"created_at"`
 }
 
 // From 从 ent 实体转换
@@ -128,7 +128,7 @@ func (g *GitBotTask) From(src *db.GitBotTask) *GitBotTask {
 	g.ID = src.ID
 	g.CreatedAt = src.CreatedAt.Unix()
 	if bot := src.Edges.GitBot; bot != nil {
-		g.Bot = (&GitBot{}).From(bot)
+		g.Bot = cvt.From(bot, &GitBot{})
 	}
 	if task := src.Edges.Task; task != nil {
 		g.Status = task.Status