Migrate the logic of converting errors into the Store package. (#190)

* Remove unused methods of interface.

* Migrate handling errors into the store package

Author: Noah Hanjun Lee

internal/interactor/license.go

@@ -23,17 +23,11 @@ func (i *Interactor) GetLicense(ctx context.Context) (*vo.License, error) {
 	)
 
 	if memberCnt, err = i.Store.CountUsers(ctx); err != nil {
-		return nil, e.NewError(
-			e.ErrorCodeInternalError,
-			err,
-		)
+		return nil, err
 	}
 
 	if deploymentCnt, err = i.Store.CountDeployments(ctx); err != nil {
-		return nil, e.NewError(
-			e.ErrorCodeInternalError,
-			err,
-		)
+		return nil, err
 	}
 
 	if i.licenseKey == "" {

internal/pkg/store/deployment.go

@@ -13,9 +13,17 @@ import (
 )
 
 func (s *Store) CountDeployments(ctx context.Context) (int, error) {
-	return s.c.Deployment.
+	cnt, err := s.c.Deployment.
 		Query().
 		Count(ctx)
+	if err != nil {
+		return 0, e.NewError(
+			e.ErrorCodeInternalError,
+			err,
+		)
+	}
+
+	return cnt, nil
 }
 
 func (s *Store) SearchDeployments(ctx context.Context, u *ent.User, ss []deployment.Status, owned bool, from time.Time, to time.Time, page, perPage int) ([]*ent.Deployment, error) {

internal/pkg/store/user.go

@@ -5,8 +5,23 @@ import (
 
 	"github.com/gitploy-io/gitploy/ent"
 	"github.com/gitploy-io/gitploy/ent/user"
+	"github.com/gitploy-io/gitploy/pkg/e"
 )
 
+func (s *Store) CountUsers(ctx context.Context) (int, error) {
+	cnt, err := s.c.User.
+		Query().
+		Count(ctx)
+	if err != nil {
+		return 0, e.NewError(
+			e.ErrorCodeInternalError,
+			err,
+		)
+	}
+
+	return cnt, nil
+}
+
 func (s *Store) ListUsers(ctx context.Context, login string, page, perPage int) ([]*ent.User, error) {
 	return s.c.User.
 		Query().
@@ -54,12 +69,6 @@ func (s *Store) FindUserByLogin(ctx context.Context, login string) (*ent.User, e
 		Only(ctx)
 }
 
-func (s *Store) CountUsers(ctx context.Context) (int, error) {
-	return s.c.User.
-		Query().
-		Count(ctx)
-}
-
 func (s *Store) CreateUser(ctx context.Context, u *ent.User) (*ent.User, error) {
 	return s.c.User.Create().
 		SetID(u.ID).

internal/server/api/v1/repos/interface.go

@@ -27,7 +27,6 @@ type (
 		FindDeploymentByID(ctx context.Context, id int) (*ent.Deployment, error)
 		FindDeploymentOfRepoByNumber(ctx context.Context, r *ent.Repo, number int) (*ent.Deployment, error)
 		FindPrevSuccessDeployment(ctx context.Context, d *ent.Deployment) (*ent.Deployment, error)
-		GetNextDeploymentNumberOfRepo(ctx context.Context, r *ent.Repo) (int, error)
 		IsApproved(ctx context.Context, d *ent.Deployment) bool
 		Deploy(ctx context.Context, u *ent.User, re *ent.Repo, d *ent.Deployment, env *vo.Env) (*ent.Deployment, error)
 		CreateRemoteDeployment(ctx context.Context, u *ent.User, re *ent.Repo, d *ent.Deployment, env *vo.Env) (*ent.Deployment, error)

internal/server/api/v1/repos/mock/interactor.go

@@ -29,7 +29,6 @@ type (
 
 		ListDeploymentsOfRepo(ctx context.Context, r *ent.Repo, env string, status string, page, perPage int) ([]*ent.Deployment, error)
 		FindDeploymentByID(ctx context.Context, id int) (*ent.Deployment, error)
-		GetNextDeploymentNumberOfRepo(ctx context.Context, r *ent.Repo) (int, error)
 		Deploy(ctx context.Context, u *ent.User, re *ent.Repo, d *ent.Deployment, env *vo.Env) (*ent.Deployment, error)
 		GetConfig(ctx context.Context, u *ent.User, r *ent.Repo) (*vo.Config, error)