feature. add clusters value to cloudSetting VO

openinfradev · Mar 27, 2023 · 844aae5 · 844aae5
1 parent fe8ab21
commit 844aae5
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 16 deletions.
diff --git a/internal/repository/cloud-setting.go b/internal/repository/cloud-setting.go
@@ -63,12 +63,12 @@ func (r *CloudSettingRepository) Get(cloudSettingId uuid.UUID) (out domain.Cloud
 func (r *CloudSettingRepository) Fetch(organizationId string) (out []domain.CloudSetting, err error) {
 	var cloudSettings []CloudSetting
 	res := r.db.Find(&cloudSettings, "organization_id = ?", organizationId)
-	if res.RowsAffected == 0 {
-		return nil, httpErrors.NewNotFoundError(fmt.Errorf("No data found"))
-	}
 	if res.Error != nil {
 		return nil, res.Error
 	}
+	if res.RowsAffected == 0 {
+		return nil, httpErrors.NewNotFoundError(fmt.Errorf("No data found"))
+	}
 
 	for _, cloudSetting := range cloudSettings {
 		out = append(out, r.reflect(cloudSetting))

diff --git a/internal/repository/cluster.go b/internal/repository/cluster.go
@@ -16,6 +16,7 @@ type IClusterRepository interface {
 	WithTrx(*gorm.DB) IClusterRepository
 	Fetch() (res []domain.Cluster, err error)
 	FetchByOrganizationId(organizationId string) (res []domain.Cluster, err error)
+	FetchByCloudSettingId(cloudSettingId uuid.UUID) (res []domain.Cluster, err error)
 	Get(id string) (domain.Cluster, error)
 	Create(organizationId string, templateId string, name string, conf *domain.ClusterConf, creator uuid.UUID, description string) (clusterId string, err error)
 	Delete(id string) error
@@ -54,6 +55,8 @@ type Cluster struct {
 	WorkflowId     string
 	Status         domain.ClusterStatus
 	StatusDesc     string
+	CloudSettingId uuid.UUID
+	CloudSetting   CloudSetting `gorm:"foreignKey:CloudSettingId"`
 }
 
 func (c *Cluster) BeforeCreate(tx *gorm.DB) (err error) {
@@ -86,25 +89,47 @@ func (r *ClusterRepository) Fetch() (out []domain.Cluster, err error) {
 	return out, nil
 }
 
-func (r *ClusterRepository) FetchByOrganizationId(organizationId string) (resClusters []domain.Cluster, err error) {
+// [TODO] Need refactoring about filters and pagination
+func (r *ClusterRepository) FetchByOrganizationId(organizationId string) (out []domain.Cluster, err error) {
 	var clusters []Cluster
 
 	res := r.db.Find(&clusters, "organization_id = ?", organizationId)
 
 	if res.Error != nil {
-		return nil, fmt.Errorf("Error while finding clusters with organizationId: %s", organizationId)
+		return nil, res.Error
 	}
 
 	if res.RowsAffected == 0 {
-		return resClusters, nil
+		return out, nil
 	}
 
 	for _, cluster := range clusters {
 		outCluster := r.reflect(cluster)
-		resClusters = append(resClusters, outCluster)
+		out = append(out, outCluster)
+	}
+
+	return
+}
+
+func (r *ClusterRepository) FetchByCloudSettingId(cloudSettingId uuid.UUID) (out []domain.Cluster, err error) {
+	var clusters []Cluster
+
+	res := r.db.Find(&clusters, "cloud_setting_id = ?", cloudSettingId)
+
+	if res.Error != nil {
+		return nil, res.Error
+	}
+
+	if res.RowsAffected == 0 {
+		return out, nil
+	}
+
+	for _, cluster := range clusters {
+		outCluster := r.reflect(cluster)
+		out = append(out, outCluster)
 	}
 
-	return resClusters, nil
+	return
 }
 
 func (r *ClusterRepository) Get(id string) (domain.Cluster, error) {

diff --git a/internal/repository/repository.go b/internal/repository/repository.go
@@ -1 +1,5 @@
 package repository
+
+import "gorm.io/gorm"
+
+type FilterFunc func(user *gorm.DB) *gorm.DB
diff --git a/internal/repository/user.go b/internal/repository/user.go
@@ -2,6 +2,7 @@ package repository
 
 import (
 	"fmt"
+
 	"github.com/google/uuid"
 	"github.com/pkg/errors"
 
@@ -30,7 +31,6 @@ type IUserRepository interface {
 	AssignRoleWithUuid(uuid uuid.UUID, roleName string) error
 }
 
-type FilterFunc func(user *gorm.DB) *gorm.DB
 type UserRepository struct {
 	db *gorm.DB
 }

diff --git a/internal/usecase/cloud-setting.go b/internal/usecase/cloud-setting.go
@@ -75,14 +75,9 @@ func (u *CloudSettingUsecase) Get(cloudSettingId uuid.UUID) (res domain.CloudSet
 		return domain.CloudSetting{}, err
 	}
 
-	/*
-		res, err = u.clusterRepo.Get(cloudSettingId)
-		if err != nil {
-			return domain.CloudSetting{}, err
-		}
-	*/
+	res.Clusters = u.getClusterCnt(cloudSettingId)
 
-	return res, nil
+	return
 }
 
 func (u *CloudSettingUsecase) Fetch(organizationId string) (res []domain.CloudSetting, err error) {
@@ -106,3 +101,21 @@ func (u *CloudSettingUsecase) Delete(cloudSettingId uuid.UUID) (err error) {
 
 	return nil
 }
+
+func (u *CloudSettingUsecase) getClusterCnt(cloudSettingId uuid.UUID) (cnt int) {
+	cnt = 0
+
+	clusters, err := u.clusterRepo.FetchByCloudSettingId(cloudSettingId)
+	if err != nil {
+		log.Error("Failed to get clusters by cloudSettingId. err : ", err)
+		return cnt
+	}
+
+	for _, cluster := range clusters {
+		if cluster.Status != "DELETED" {
+			cnt++
+		}
+	}
+
+	return cnt
+}
diff --git a/internal/usecase/cluster.go b/internal/usecase/cluster.go
@@ -16,6 +16,7 @@ import (
 type IClusterUsecase interface {
 	WithTrx(*gorm.DB) IClusterUsecase
 	Fetch(organizationId string) ([]domain.Cluster, error)
+	FetchByCloudSettingId(cloudSettingId uuid.UUID) (out []domain.Cluster, err error)
 	Create(organizationId string, templateId string, name string, conf domain.ClusterConf, creatorId string, description string) (clusterId string, err error)
 	Get(clusterId string) (out domain.Cluster, err error)
 	Delete(clusterId string) (err error)
@@ -81,6 +82,17 @@ func (u *ClusterUsecase) Fetch(organizationId string) (out []domain.Cluster, err
 	return out, nil
 }
 
+func (u *ClusterUsecase) FetchByCloudSettingId(cloudSettingId uuid.UUID) (out []domain.Cluster, err error) {
+	if cloudSettingId == uuid.Nil {
+		return nil, fmt.Errorf("Invalid cloudSettingId")
+	}
+
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 func (u *ClusterUsecase) Create(organizationId string, templateId string, name string, conf domain.ClusterConf, creatorId string, description string) (clusterId string, err error) {
 	creator := uuid.Nil
 	if creatorId != "" {