Merge pull request #524 from chaitin/fix-mcp-upstream-delete

fix: 修复 mcp upstreams 删除问题

Author: yokowu

backend/biz/setting/repo/mcp.go

@@ -17,6 +17,7 @@ import (
 	"github.com/chaitin/MonkeyCode/backend/domain"
 	"github.com/chaitin/MonkeyCode/backend/errcode"
 	"github.com/chaitin/MonkeyCode/backend/pkg/cvt"
+	"github.com/chaitin/MonkeyCode/backend/pkg/entx"
 )
 
 type mcpRepo struct {
@@ -133,7 +134,31 @@ func (r *mcpRepo) DeleteUserUpstream(ctx context.Context, uid, id uuid.UUID) err
 	if err != nil {
 		return err
 	}
-	return r.db.MCPUpstream.DeleteOneID(row.ID).Exec(ctx)
+	return entx.WithTx2(ctx, r.db, func(tx *db.Tx) error {
+		tools, err := tx.MCPTool.Query().
+			Where(mcptool.UserID(uid)).
+			Where(mcptool.UpstreamID(id)).
+			All(ctx)
+		if err != nil {
+			return err
+		}
+		toolIds := cvt.Iter(tools, func(_ int, t *db.MCPTool) uuid.UUID { return t.ID })
+		if _, err := tx.MCPTool.Delete().
+			Where(mcptool.IDIn(toolIds...)).
+			Exec(ctx); err != nil {
+			return err
+		}
+		if _, err := tx.MCPUserToolSetting.Delete().
+			Where(mcpusertoolsetting.ToolIDIn(toolIds...)).
+			Exec(ctx); err != nil {
+			return err
+		}
+		_, err = tx.MCPUpstream.Delete().
+			Where(mcpupstream.UserID(uid)).
+			Where(mcpupstream.ID(row.ID)).
+			Exec(ctx)
+		return err
+	})
 }
 
 func (r *mcpRepo) GetUserUpstream(ctx context.Context, uid, id uuid.UUID) (*domain.MCPUpstream, error) {