fix: extra column in cluster (#121)

Signed-off-by: closetool <[email protected]>
horizoncd · Apr 6, 2023 · 2d9fc8d · 2d9fc8d
1 parent d18a6ae
commit 2d9fc8d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/core/controller/cluster/controller_basic.go b/core/controller/cluster/controller_basic.go
@@ -104,18 +104,17 @@ func (c *controller) List(ctx context.Context, query *q.Query) ([]*ListClusterWi
 			perror.WithMessage(err, "failed to list user clusters")
 	}
 
-	if _, ok := query.Keywords[common.ClusterQueryWithFavorite]; ok {
-		err = c.addIsFavoriteForClusters(ctx, currentUserID, clusters)
-		if err != nil {
-			return nil, 0, err
-		}
-	}
-
 	responses, err := c.getFullResponsesWithRegion(ctx, clusters)
 	if err != nil {
 		return nil, 0, err
 	}
 
+	if _, ok := query.Keywords[common.ClusterQueryWithFavorite]; ok {
+		err = c.addIsFavoriteForClusters(ctx, currentUserID, responses)
+		if err != nil {
+			return nil, 0, err
+		}
+	}
 	return responses, count, nil
 }
 
@@ -179,6 +178,7 @@ func (c *controller) getFullResponses(ctx context.Context,
 		}
 		responses = append(responses, &ListClusterWithFullResponse{
 			response,
+			nil,
 			fullName,
 			fullPath,
 		})
@@ -1112,7 +1112,7 @@ var (
 )
 
 func (c *controller) addIsFavoriteForClusters(ctx context.Context,
-	userID uint, clusters []*cmodels.ClusterWithRegion) error {
+	userID uint, clusters []*ListClusterWithFullResponse) error {
 	ids := make([]uint, 0, len(clusters))
 	for i := range clusters {
 		ids = append(ids, clusters[i].ID)

diff --git a/core/controller/cluster/models_basic.go b/core/controller/cluster/models_basic.go
@@ -244,9 +244,8 @@ func ofCluster(cluster *models.Cluster) *ListClusterResponse {
 		Git: &GitResponse{
 			GitURL: cluster.GitURL,
 		},
-		IsFavorite: cluster.IsFavorite,
-		CreatedAt:  cluster.CreatedAt,
-		UpdatedAt:  cluster.UpdatedAt,
+		CreatedAt: cluster.CreatedAt,
+		UpdatedAt: cluster.UpdatedAt,
 	}
 }
 
@@ -288,8 +287,9 @@ type GetClusterByNameResponse struct {
 
 type ListClusterWithFullResponse struct {
 	*ListClusterResponse
-	FullName string `json:"fullName,omitempty"`
-	FullPath string `json:"fullPath,omitempty"`
+	IsFavorite *bool  `json:"isFavorite"`
+	FullName   string `json:"fullName,omitempty"`
+	FullPath   string `json:"fullPath,omitempty"`
 }
 
 type ListClusterWithExpiryResponse struct {

diff --git a/pkg/cluster/models/cluster.go b/pkg/cluster/models/cluster.go
@@ -16,7 +16,6 @@ type Cluster struct {
 	GitSubfolder    string
 	GitRef          string
 	GitRefType      string
-	IsFavorite      *bool
 	Template        string
 	TemplateRelease string
 	Status          string