refactor: Removing concat error to use httputils one

Signed-off-by: Vincent Boutour <[email protected]>
ViBiOh · Mar 5, 2021 · e09288f · e09288f
1 parent b69af7b
commit e09288f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 27 deletions.
diff --git a/pkg/service/ketchup/ketchup.go b/pkg/service/ketchup/ketchup.go
@@ -10,7 +10,6 @@ import (
 	httpModel "github.com/ViBiOh/httputils/v4/pkg/model"
 	"github.com/ViBiOh/ketchup/pkg/model"
 	"github.com/ViBiOh/ketchup/pkg/semver"
-	"github.com/ViBiOh/ketchup/pkg/service"
 	"github.com/ViBiOh/ketchup/pkg/service/repository"
 	"github.com/ViBiOh/ketchup/pkg/store/ketchup"
 )
@@ -156,7 +155,7 @@ func (a app) check(ctx context.Context, old, new model.Ketchup) error {
 	}
 
 	if new.Repository.ID == 0 && new.User.ID == 0 {
-		return service.ConcatError(output)
+		return httpModel.ConcatError(output)
 	}
 
 	if len(strings.TrimSpace(new.Pattern)) == 0 {
@@ -178,7 +177,7 @@ func (a app) check(ctx context.Context, old, new model.Ketchup) error {
 		}
 	}
 
-	return service.ConcatError(output)
+	return httpModel.ConcatError(output)
 }
 
 func enrichKetchupsWithSemver(list []model.Ketchup) []model.Ketchup {

diff --git a/pkg/service/repository/repository.go b/pkg/service/repository/repository.go
@@ -12,7 +12,6 @@ import (
 	"github.com/ViBiOh/ketchup/pkg/helm"
 	"github.com/ViBiOh/ketchup/pkg/model"
 	"github.com/ViBiOh/ketchup/pkg/semver"
-	"github.com/ViBiOh/ketchup/pkg/service"
 	"github.com/ViBiOh/ketchup/pkg/store/repository"
 )
 
@@ -194,7 +193,7 @@ func (a app) check(ctx context.Context, old, new model.Repository) error {
 		output = append(output, errors.New("name already exists"))
 	}
 
-	return service.ConcatError(output)
+	return httpModel.ConcatError(output)
 }
 
 func (a app) LatestVersions(repo model.Repository) (map[string]semver.Version, error) {

diff --git a/pkg/service/service.go b/pkg/service/service.go
diff --git a/pkg/service/user/user.go b/pkg/service/user/user.go
@@ -11,7 +11,6 @@ import (
 	"github.com/ViBiOh/httputils/v4/pkg/logger"
 	httpModel "github.com/ViBiOh/httputils/v4/pkg/model"
 	"github.com/ViBiOh/ketchup/pkg/model"
-	"github.com/ViBiOh/ketchup/pkg/service"
 	"github.com/ViBiOh/ketchup/pkg/store/user"
 )
 
@@ -102,5 +101,5 @@ func (a app) check(ctx context.Context, _, new model.User) error {
 		output = append(output, errors.New("email already used"))
 	}
 
-	return service.ConcatError(output)
+	return httpModel.ConcatError(output)
 }