feat: remove calculate total count service (#772)

* feat: add user list interface Signed-off-by: Gaius <[email protected]> * feat: remove calculate total count interface Signed-off-by: Gaius <[email protected]>
dragonflyoss · Jun 28, 2023 · 54e79fa · 54e79fa
1 parent 2c48888
commit 54e79fa
Show file tree

Hide file tree

Showing 19 changed files with 81 additions and 254 deletions.
diff --git a/manager/handlers/cdn.go b/manager/handlers/cdn.go
@@ -157,18 +157,12 @@ func (h *Handlers) GetCDNs(ctx *gin.Context) {
 	}
 
 	h.setPaginationDefault(&query.Page, &query.PerPage)
-	cdns, err := h.service.GetCDNs(ctx.Request.Context(), query)
+	cdns, count, err := h.service.GetCDNs(ctx.Request.Context(), query)
 	if err != nil {
 		ctx.Error(err)
 		return
 	}
 
-	totalCount, err := h.service.CDNTotalCount(ctx.Request.Context(), query)
-	if err != nil {
-		ctx.Error(err)
-		return
-	}
-
-	h.setPaginationLinkHeader(ctx, query.Page, query.PerPage, int(totalCount))
+	h.setPaginationLinkHeader(ctx, query.Page, query.PerPage, int(count))
 	ctx.JSON(http.StatusOK, cdns)
 }
diff --git a/manager/handlers/cdn_cluster.go b/manager/handlers/cdn_cluster.go
@@ -179,19 +179,13 @@ func (h *Handlers) GetCDNClusters(ctx *gin.Context) {
 	}
 
 	h.setPaginationDefault(&query.Page, &query.PerPage)
-	cdns, err := h.service.GetCDNClusters(ctx.Request.Context(), query)
+	cdns, count, err := h.service.GetCDNClusters(ctx.Request.Context(), query)
 	if err != nil {
 		ctx.Error(err)
 		return
 	}
 
-	totalCount, err := h.service.CDNClusterTotalCount(ctx.Request.Context(), query)
-	if err != nil {
-		ctx.Error(err)
-		return
-	}
-
-	h.setPaginationLinkHeader(ctx, query.Page, query.PerPage, int(totalCount))
+	h.setPaginationLinkHeader(ctx, query.Page, query.PerPage, int(count))
 	ctx.JSON(http.StatusOK, cdns)
 }
 

diff --git a/manager/handlers/config.go b/manager/handlers/config.go
@@ -157,18 +157,12 @@ func (h *Handlers) GetConfigs(ctx *gin.Context) {
 	}
 
 	h.setPaginationDefault(&query.Page, &query.PerPage)
-	configs, err := h.service.GetConfigs(ctx.Request.Context(), query)
+	configs, count, err := h.service.GetConfigs(ctx.Request.Context(), query)
 	if err != nil {
 		ctx.Error(err)
 		return
 	}
 
-	totalCount, err := h.service.ConfigTotalCount(ctx.Request.Context(), query)
-	if err != nil {
-		ctx.Error(err)
-		return
-	}
-
-	h.setPaginationLinkHeader(ctx, query.Page, query.PerPage, int(totalCount))
+	h.setPaginationLinkHeader(ctx, query.Page, query.PerPage, int(count))
 	ctx.JSON(http.StatusOK, configs)
 }
diff --git a/manager/handlers/job.go b/manager/handlers/job.go
@@ -154,18 +154,12 @@ func (h *Handlers) GetJobs(ctx *gin.Context) {
 	}
 
 	h.setPaginationDefault(&query.Page, &query.PerPage)
-	jobs, err := h.service.GetJobs(ctx.Request.Context(), query)
+	jobs, count, err := h.service.GetJobs(ctx.Request.Context(), query)
 	if err != nil {
 		ctx.Error(err)
 		return
 	}
 
-	totalCount, err := h.service.JobTotalCount(ctx.Request.Context(), query)
-	if err != nil {
-		ctx.Error(err)
-		return
-	}
-
-	h.setPaginationLinkHeader(ctx, query.Page, query.PerPage, int(totalCount))
+	h.setPaginationLinkHeader(ctx, query.Page, query.PerPage, int(count))
 	ctx.JSON(http.StatusOK, jobs)
 }
diff --git a/manager/handlers/oauth.go b/manager/handlers/oauth.go
@@ -157,18 +157,12 @@ func (h *Handlers) GetOauths(ctx *gin.Context) {
 	}
 
 	h.setPaginationDefault(&query.Page, &query.PerPage)
-	oauth, err := h.service.GetOauths(ctx.Request.Context(), query)
+	oauth, count, err := h.service.GetOauths(ctx.Request.Context(), query)
 	if err != nil {
 		ctx.Error(err)
 		return
 	}
 
-	totalCount, err := h.service.OauthTotalCount(ctx.Request.Context(), query)
-	if err != nil {
-		ctx.Error(err)
-		return
-	}
-
-	h.setPaginationLinkHeader(ctx, query.Page, query.PerPage, int(totalCount))
+	h.setPaginationLinkHeader(ctx, query.Page, query.PerPage, int(count))
 	ctx.JSON(http.StatusOK, oauth)
 }
diff --git a/manager/handlers/scheduler.go b/manager/handlers/scheduler.go
@@ -157,18 +157,12 @@ func (h *Handlers) GetSchedulers(ctx *gin.Context) {
 	}
 
 	h.setPaginationDefault(&query.Page, &query.PerPage)
-	schedulers, err := h.service.GetSchedulers(ctx.Request.Context(), query)
+	schedulers, count, err := h.service.GetSchedulers(ctx.Request.Context(), query)
 	if err != nil {
 		ctx.Error(err)
 		return
 	}
 
-	totalCount, err := h.service.SchedulerTotalCount(ctx.Request.Context(), query)
-	if err != nil {
-		ctx.Error(err)
-		return
-	}
-
-	h.setPaginationLinkHeader(ctx, query.Page, query.PerPage, int(totalCount))
+	h.setPaginationLinkHeader(ctx, query.Page, query.PerPage, int(count))
 	ctx.JSON(http.StatusOK, schedulers)
 }
diff --git a/manager/handlers/scheduler_cluster.go b/manager/handlers/scheduler_cluster.go
@@ -179,19 +179,13 @@ func (h *Handlers) GetSchedulerClusters(ctx *gin.Context) {
 	}
 
 	h.setPaginationDefault(&query.Page, &query.PerPage)
-	schedulerClusters, err := h.service.GetSchedulerClusters(ctx.Request.Context(), query)
+	schedulerClusters, count, err := h.service.GetSchedulerClusters(ctx.Request.Context(), query)
 	if err != nil {
 		ctx.Error(err)
 		return
 	}
 
-	totalCount, err := h.service.SchedulerClusterTotalCount(ctx.Request.Context(), query)
-	if err != nil {
-		ctx.Error(err)
-		return
-	}
-
-	h.setPaginationLinkHeader(ctx, query.Page, query.PerPage, int(totalCount))
+	h.setPaginationLinkHeader(ctx, query.Page, query.PerPage, int(count))
 	ctx.JSON(http.StatusOK, schedulerClusters)
 }
 

diff --git a/manager/handlers/security_group.go b/manager/handlers/security_group.go
@@ -157,19 +157,13 @@ func (h *Handlers) GetSecurityGroups(ctx *gin.Context) {
 	}
 
 	h.setPaginationDefault(&query.Page, &query.PerPage)
-	securityGroups, err := h.service.GetSecurityGroups(ctx.Request.Context(), query)
+	securityGroups, count, err := h.service.GetSecurityGroups(ctx.Request.Context(), query)
 	if err != nil {
 		ctx.Error(err)
 		return
 	}
 
-	totalCount, err := h.service.SecurityGroupTotalCount(ctx.Request.Context(), query)
-	if err != nil {
-		ctx.Error(err)
-		return
-	}
-
-	h.setPaginationLinkHeader(ctx, query.Page, query.PerPage, int(totalCount))
+	h.setPaginationLinkHeader(ctx, query.Page, query.PerPage, int(count))
 	ctx.JSON(http.StatusOK, securityGroups)
 }
 

diff --git a/manager/handlers/user.go b/manager/handlers/user.go
@@ -71,19 +71,13 @@ func (h *Handlers) GetUsers(ctx *gin.Context) {
 	}
 
 	h.setPaginationDefault(&query.Page, &query.PerPage)
-	users, err := h.service.GetUsers(ctx.Request.Context(), query)
+	users, count, err := h.service.GetUsers(ctx.Request.Context(), query)
 	if err != nil {
 		ctx.Error(err)
 		return
 	}
 
-	totalCount, err := h.service.UserTotalCount(ctx.Request.Context(), query)
-	if err != nil {
-		ctx.Error(err)
-		return
-	}
-
-	h.setPaginationLinkHeader(ctx, query.Page, query.PerPage, int(totalCount))
+	h.setPaginationLinkHeader(ctx, query.Page, query.PerPage, int(count))
 	ctx.JSON(http.StatusOK, users)
 }
 

diff --git a/manager/service/cdn.go b/manager/service/cdn.go
@@ -79,36 +79,20 @@ func (s *rest) GetCDN(ctx context.Context, id uint) (*model.CDN, error) {
 	return &cdn, nil
 }
 
-func (s *rest) GetCDNs(ctx context.Context, q types.GetCDNsQuery) (*[]model.CDN, error) {
-	cdns := []model.CDN{}
-	if err := s.db.WithContext(ctx).Scopes(model.Paginate(q.Page, q.PerPage)).Where(&model.CDN{
-		HostName:     q.HostName,
-		IDC:          q.IDC,
-		Location:     q.Location,
-		IP:           q.IP,
-		Port:         q.Port,
-		DownloadPort: q.DownloadPort,
-		CDNClusterID: q.CDNClusterID,
-	}).Find(&cdns).Error; err != nil {
-		return nil, err
-	}
-
-	return &cdns, nil
-}
-
-func (s *rest) CDNTotalCount(ctx context.Context, q types.GetCDNsQuery) (int64, error) {
+func (s *rest) GetCDNs(ctx context.Context, q types.GetCDNsQuery) (*[]model.CDN, int64, error) {
 	var count int64
-	if err := s.db.WithContext(ctx).Model(&model.CDN{}).Where(&model.CDN{
+	var cdns []model.CDN
+	if err := s.db.WithContext(ctx).Scopes(model.Paginate(q.Page, q.PerPage)).Where(&model.CDN{
 		HostName:     q.HostName,
 		IDC:          q.IDC,
 		Location:     q.Location,
 		IP:           q.IP,
 		Port:         q.Port,
 		DownloadPort: q.DownloadPort,
 		CDNClusterID: q.CDNClusterID,
-	}).Count(&count).Error; err != nil {
-		return 0, err
+	}).Find(&cdns).Count(&count).Error; err != nil {
+		return nil, 0, err
 	}
 
-	return count, nil
+	return &cdns, count, nil
 }
diff --git a/manager/service/cdn_cluster.go b/manager/service/cdn_cluster.go
@@ -136,26 +136,16 @@ func (s *rest) GetCDNCluster(ctx context.Context, id uint) (*model.CDNCluster, e
 	return &cdnCluster, nil
 }
 
-func (s *rest) GetCDNClusters(ctx context.Context, q types.GetCDNClustersQuery) (*[]model.CDNCluster, error) {
-	cdnClusters := []model.CDNCluster{}
-	if err := s.db.WithContext(ctx).Scopes(model.Paginate(q.Page, q.PerPage)).Where(&model.CDNCluster{
-		Name: q.Name,
-	}).Find(&cdnClusters).Error; err != nil {
-		return nil, err
-	}
-
-	return &cdnClusters, nil
-}
-
-func (s *rest) CDNClusterTotalCount(ctx context.Context, q types.GetCDNClustersQuery) (int64, error) {
+func (s *rest) GetCDNClusters(ctx context.Context, q types.GetCDNClustersQuery) (*[]model.CDNCluster, int64, error) {
 	var count int64
-	if err := s.db.WithContext(ctx).Model(&model.CDNCluster{}).Where(&model.CDNCluster{
+	var cdnClusters []model.CDNCluster
+	if err := s.db.WithContext(ctx).Scopes(model.Paginate(q.Page, q.PerPage)).Where(&model.CDNCluster{
 		Name: q.Name,
-	}).Count(&count).Error; err != nil {
-		return 0, err
+	}).Find(&cdnClusters).Count(&count).Error; err != nil {
+		return nil, 0, err
 	}
 
-	return count, nil
+	return &cdnClusters, count, nil
 }
 
 func (s *rest) AddCDNToCDNCluster(ctx context.Context, id, cdnID uint) error {

diff --git a/manager/service/config.go b/manager/service/config.go
@@ -74,28 +74,16 @@ func (s *rest) GetConfig(ctx context.Context, id uint) (*model.Config, error) {
 	return &config, nil
 }
 
-func (s *rest) GetConfigs(ctx context.Context, q types.GetConfigsQuery) (*[]model.Config, error) {
-	configs := []model.Config{}
-	if err := s.db.WithContext(ctx).Scopes(model.Paginate(q.Page, q.PerPage)).Where(&model.Config{
-		Name:   q.Name,
-		Value:  q.Value,
-		UserID: q.UserID,
-	}).Find(&configs).Error; err != nil {
-		return nil, err
-	}
-
-	return &configs, nil
-}
-
-func (s *rest) ConfigTotalCount(ctx context.Context, q types.GetConfigsQuery) (int64, error) {
+func (s *rest) GetConfigs(ctx context.Context, q types.GetConfigsQuery) (*[]model.Config, int64, error) {
 	var count int64
-	if err := s.db.WithContext(ctx).Model(&model.Config{}).Where(&model.Config{
+	var configs []model.Config
+	if err := s.db.WithContext(ctx).Scopes(model.Paginate(q.Page, q.PerPage)).Where(&model.Config{
 		Name:   q.Name,
 		Value:  q.Value,
 		UserID: q.UserID,
-	}).Count(&count).Error; err != nil {
-		return 0, err
+	}).Find(&configs).Count(&count).Error; err != nil {
+		return nil, 0, err
 	}
 
-	return count, nil
+	return &configs, count, nil
 }
diff --git a/manager/service/job.go b/manager/service/job.go
@@ -171,30 +171,18 @@ func (s *rest) GetJob(ctx context.Context, id uint) (*model.Job, error) {
 	return &job, nil
 }
 
-func (s *rest) GetJobs(ctx context.Context, q types.GetJobsQuery) (*[]model.Job, error) {
-	jobs := []model.Job{}
-	if err := s.db.WithContext(ctx).Scopes(model.Paginate(q.Page, q.PerPage)).Where(&model.Job{
-		Type:   q.Type,
-		Status: q.Status,
-		UserID: q.UserID,
-	}).Find(&jobs).Error; err != nil {
-		return nil, err
-	}
-
-	return &jobs, nil
-}
-
-func (s *rest) JobTotalCount(ctx context.Context, q types.GetJobsQuery) (int64, error) {
+func (s *rest) GetJobs(ctx context.Context, q types.GetJobsQuery) (*[]model.Job, int64, error) {
 	var count int64
-	if err := s.db.WithContext(ctx).Model(&model.Job{}).Where(&model.Job{
+	var jobs []model.Job
+	if err := s.db.WithContext(ctx).Scopes(model.Paginate(q.Page, q.PerPage)).Where(&model.Job{
 		Type:   q.Type,
 		Status: q.Status,
 		UserID: q.UserID,
-	}).Count(&count).Error; err != nil {
-		return 0, err
+	}).Find(&jobs).Count(&count).Error; err != nil {
+		return nil, 0, err
 	}
 
-	return count, nil
+	return &jobs, count, nil
 }
 
 func (s *rest) AddJobToSchedulerClusters(ctx context.Context, id, schedulerClusterIDs []uint) error {

diff --git a/manager/service/oauth.go b/manager/service/oauth.go
@@ -76,26 +76,15 @@ func (s *rest) GetOauth(ctx context.Context, id uint) (*model.Oauth, error) {
 	return &oauth, nil
 }
 
-func (s *rest) GetOauths(ctx context.Context, q types.GetOauthsQuery) (*[]model.Oauth, error) {
-	oauths := []model.Oauth{}
-	if err := s.db.WithContext(ctx).Scopes(model.Paginate(q.Page, q.PerPage)).Where(&model.Oauth{
-		Name:     q.Name,
-		ClientID: q.ClientID,
-	}).Find(&oauths).Error; err != nil {
-		return nil, err
-	}
-
-	return &oauths, nil
-}
-
-func (s *rest) OauthTotalCount(ctx context.Context, q types.GetOauthsQuery) (int64, error) {
+func (s *rest) GetOauths(ctx context.Context, q types.GetOauthsQuery) (*[]model.Oauth, int64, error) {
 	var count int64
-	if err := s.db.WithContext(ctx).Model(&model.Oauth{}).Where(&model.Oauth{
+	var oauths []model.Oauth
+	if err := s.db.WithContext(ctx).Scopes(model.Paginate(q.Page, q.PerPage)).Where(&model.Oauth{
 		Name:     q.Name,
 		ClientID: q.ClientID,
-	}).Count(&count).Error; err != nil {
-		return 0, err
+	}).Find(&oauths).Count(&count).Error; err != nil {
+		return nil, 0, err
 	}
 
-	return count, nil
+	return &oauths, count, nil
 }