refactor: Removing interface along the way

Signed-off-by: Vincent Boutour <[email protected]>

.gitignore

@@ -4,7 +4,6 @@ scripts/
 # Golang
 bin/
 release/
-mocks/
 coverage.*
 profile.out
 

Makefile

@@ -77,6 +77,7 @@ mocks:
 	mockgen -destination pkg/mocks/user_service.go -mock_names UserService=UserService -package mocks github.com/ViBiOh/ketchup/pkg/middleware UserService
 	mockgen -destination pkg/mocks/mailer.go -mock_names Mailer=Mailer -package mocks github.com/ViBiOh/ketchup/pkg/notifier Mailer
 	mockgen -destination pkg/mocks/auth.go -mock_names AuthService=Auth -package mocks github.com/ViBiOh/ketchup/pkg/service/user AuthService
+	mockgen -destination pkg/mocks/user_store.go -mock_names Store=UserStore -package mocks github.com/ViBiOh/ketchup/pkg/service/user Store
 
 ## test: Shortcut to launch all the test tasks (unit, functional and integration).
 .PHONY: test

pkg/service/user/user.go

@@ -10,23 +10,31 @@ 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/store/user"
 )
 
-// AuthService defines interaction with storage and provider from User
+// AuthService defines interaction with underlying User
 type AuthService interface {
 	Create(context.Context, authModel.User) (authModel.User, error)
 	Check(context.Context, authModel.User, authModel.User) error
 }
 
+// Store defines interaction with User storage
+type Store interface {
+	DoAtomic(context.Context, func(context.Context) error) error
+	GetByLoginID(context.Context, uint64) (model.User, error)
+	GetByEmail(context.Context, string) (model.User, error)
+	Create(context.Context, model.User) (uint64, error)
+	Count(context.Context) (uint64, error)
+}
+
 // App of package
 type App struct {
-	userStore user.App
+	userStore Store
 	authApp   AuthService
 }
 
 // New creates new App from Config
-func New(userStore user.App, authApp AuthService) App {
+func New(userStore Store, authApp AuthService) App {
 	return App{
 		userStore: userStore,
 		authApp:   authApp,