From c6bd7731cc288b7998de19276bc5749b055de572 Mon Sep 17 00:00:00 2001 From: Florian Sylvain Date: Sun, 13 Aug 2023 02:48:19 +0200 Subject: [PATCH] clean: removed use of "." in imports --- .../secondary/gateways/articleRepository.go | 4 +- adapters/secondary/gateways/pageRepository.go | 4 +- adapters/secondary/gateways/userRepository.go | 4 +- api/article.go | 4 +- api/dependecyInjection.go | 44 +++++++++---------- domain/gateways/IArticleRepository.go | 8 ++-- domain/gateways/IUserRepository.go | 10 ++--- useCases/CreateArticleUseCase.go | 15 ++++--- useCases/CreateUserUseCase.go | 16 ++++--- useCases/GetArticleUseCase.go | 10 ++--- useCases/GetPageUseCase.go | 6 +-- useCases/GetUserUseCase.go | 12 ++--- useCases/ListArticlesUseCase.go | 10 ++--- useCases/ListUsersUseCase.go | 10 ++--- 14 files changed, 82 insertions(+), 75 deletions(-) diff --git a/adapters/secondary/gateways/articleRepository.go b/adapters/secondary/gateways/articleRepository.go index ab4f569..f2d87f7 100644 --- a/adapters/secondary/gateways/articleRepository.go +++ b/adapters/secondary/gateways/articleRepository.go @@ -3,7 +3,7 @@ package gateways import ( entity "GohCMS2/adapters/secondary/gateways/models" domain "GohCMS2/domain/article" - . "GohCMS2/domain/gateways" + "GohCMS2/domain/gateways" "gorm.io/gorm" ) @@ -65,4 +65,4 @@ func (a *ArticleRepository) GetAll() []domain.Article { return domainArticles } -var _ IArticleRepository = &ArticleRepository{} +var _ gateways.IArticleRepository = &ArticleRepository{} diff --git a/adapters/secondary/gateways/pageRepository.go b/adapters/secondary/gateways/pageRepository.go index 691eb21..9e52a3b 100644 --- a/adapters/secondary/gateways/pageRepository.go +++ b/adapters/secondary/gateways/pageRepository.go @@ -1,7 +1,7 @@ package gateways import ( - . "GohCMS2/domain/gateways" + "GohCMS2/domain/gateways" "bytes" "embed" "html/template" @@ -29,4 +29,4 @@ func (p *PageRepository) Get(name string, data interface{}) ([]byte, error) { return processedHTML.Bytes(), nil } -var _ IPageRepository = &PageRepository{} +var _ gateways.IPageRepository = &PageRepository{} diff --git a/adapters/secondary/gateways/userRepository.go b/adapters/secondary/gateways/userRepository.go index b0380ef..691ed33 100644 --- a/adapters/secondary/gateways/userRepository.go +++ b/adapters/secondary/gateways/userRepository.go @@ -2,7 +2,7 @@ package gateways import ( entity "GohCMS2/adapters/secondary/gateways/models" - . "GohCMS2/domain/gateways" + "GohCMS2/domain/gateways" domain "GohCMS2/domain/user" "golang.org/x/crypto/bcrypt" "gorm.io/gorm" @@ -77,4 +77,4 @@ func (u *UserRepository) GetByUsername(username string) (domain.User, error) { return mapUserToDomain(user), nil } -var _ IUserRepository = &UserRepository{} +var _ gateways.IUserRepository = &UserRepository{} diff --git a/api/article.go b/api/article.go index d64683b..8d0cfbc 100644 --- a/api/article.go +++ b/api/article.go @@ -1,7 +1,7 @@ package api import ( - . "GohCMS2/useCases" + "GohCMS2/useCases" "encoding/json" "github.com/go-chi/chi/v5" "net/http" @@ -44,7 +44,7 @@ func postArticle(w http.ResponseWriter, r *http.Request) { return } - createdArticle, err := Container.CreateArticleUseCase.CreateArticle(CreateArticleCommand{ + createdArticle, err := Container.CreateArticleUseCase.CreateArticle(useCases.CreateArticleCommand{ Title: article.Title, Body: article.Body, }) diff --git a/api/dependecyInjection.go b/api/dependecyInjection.go index 5dbef1b..19e6969 100644 --- a/api/dependecyInjection.go +++ b/api/dependecyInjection.go @@ -2,32 +2,32 @@ package api import ( "GohCMS2/adapters/secondary/gateways/models" - . "GohCMS2/useCases" + "GohCMS2/useCases" "github.com/glebarez/sqlite" "go.uber.org/dig" "gorm.io/gorm" ) type LocalContainer struct { - CreateArticleUseCase *CreateArticleUseCase - GetArticleUseCase *GetArticleUseCase - ListArticlesUseCase *ListArticlesUseCase - GetUserUseCase *GetUserUseCase - CreateUserUseCase *CreateUserUseCase - ListUsersUseCase *ListUsersUseCase - GetPageUseCase *GetPageUseCase + CreateArticleUseCase *useCases.CreateArticleUseCase + GetArticleUseCase *useCases.GetArticleUseCase + ListArticlesUseCase *useCases.ListArticlesUseCase + GetUserUseCase *useCases.GetUserUseCase + CreateUserUseCase *useCases.CreateUserUseCase + ListUsersUseCase *useCases.ListUsersUseCase + GetPageUseCase *useCases.GetPageUseCase } var Container *LocalContainer func setContainer( - createArticle *CreateArticleUseCase, - getArticle *GetArticleUseCase, - listArticle *ListArticlesUseCase, - getUser *GetUserUseCase, - createUser *CreateUserUseCase, - listUsers *ListUsersUseCase, - getPage *GetPageUseCase, + createArticle *useCases.CreateArticleUseCase, + getArticle *useCases.GetArticleUseCase, + listArticle *useCases.ListArticlesUseCase, + getUser *useCases.GetUserUseCase, + createUser *useCases.CreateUserUseCase, + listUsers *useCases.ListUsersUseCase, + getPage *useCases.GetPageUseCase, ) *LocalContainer { Container = &LocalContainer{ CreateArticleUseCase: createArticle, @@ -56,13 +56,13 @@ func InitContainer() { _ = digContainer.Provide(func() *gorm.DB { return db }) - _ = digContainer.Provide(func(db *gorm.DB) *CreateArticleUseCase { return NewCreateArticleUseCase(db) }) - _ = digContainer.Provide(func(db *gorm.DB) *GetArticleUseCase { return NewGetArticleUseCase(db) }) - _ = digContainer.Provide(func(db *gorm.DB) *ListArticlesUseCase { return NewListArticlesUseCase(db) }) - _ = digContainer.Provide(func(db *gorm.DB) *GetUserUseCase { return NewGetUserUseCase(db) }) - _ = digContainer.Provide(func(db *gorm.DB) *CreateUserUseCase { return NewCreateUserUseCase(db) }) - _ = digContainer.Provide(func(db *gorm.DB) *ListUsersUseCase { return NewListUsersUseCase(db) }) - _ = digContainer.Provide(NewGetPageUseCase) + _ = digContainer.Provide(func(db *gorm.DB) *useCases.CreateArticleUseCase { return useCases.NewCreateArticleUseCase(db) }) + _ = digContainer.Provide(func(db *gorm.DB) *useCases.GetArticleUseCase { return useCases.NewGetArticleUseCase(db) }) + _ = digContainer.Provide(func(db *gorm.DB) *useCases.ListArticlesUseCase { return useCases.NewListArticlesUseCase(db) }) + _ = digContainer.Provide(func(db *gorm.DB) *useCases.GetUserUseCase { return useCases.NewGetUserUseCase(db) }) + _ = digContainer.Provide(func(db *gorm.DB) *useCases.CreateUserUseCase { return useCases.NewCreateUserUseCase(db) }) + _ = digContainer.Provide(func(db *gorm.DB) *useCases.ListUsersUseCase { return useCases.NewListUsersUseCase(db) }) + _ = digContainer.Provide(useCases.NewGetPageUseCase) _ = digContainer.Invoke(setContainer) } diff --git a/domain/gateways/IArticleRepository.go b/domain/gateways/IArticleRepository.go index 0dc25b8..7373471 100644 --- a/domain/gateways/IArticleRepository.go +++ b/domain/gateways/IArticleRepository.go @@ -1,11 +1,11 @@ package gateways import ( - . "GohCMS2/domain/article" + "GohCMS2/domain/article" ) type IArticleRepository interface { - Get(id uint32) (Article, error) - GetAll() []Article - Create(article Article) (Article, error) + Get(id uint32) (article.Article, error) + GetAll() []article.Article + Create(article article.Article) (article.Article, error) } diff --git a/domain/gateways/IUserRepository.go b/domain/gateways/IUserRepository.go index eab1917..aa83c34 100644 --- a/domain/gateways/IUserRepository.go +++ b/domain/gateways/IUserRepository.go @@ -1,10 +1,10 @@ package gateways -import . "GohCMS2/domain/user" +import "GohCMS2/domain/user" type IUserRepository interface { - Get(id uint32) (User, error) - GetByUsername(username string) (User, error) - GetAll() []User - Create(user User) (User, error) + Get(id uint32) (user.User, error) + GetByUsername(username string) (user.User, error) + GetAll() []user.User + Create(user user.User) (user.User, error) } diff --git a/useCases/CreateArticleUseCase.go b/useCases/CreateArticleUseCase.go index 5bef35c..6382616 100644 --- a/useCases/CreateArticleUseCase.go +++ b/useCases/CreateArticleUseCase.go @@ -1,13 +1,13 @@ package useCases import ( - . "GohCMS2/adapters/secondary/gateways" - . "GohCMS2/domain/article" + "GohCMS2/adapters/secondary/gateways" + "GohCMS2/domain/article" "gorm.io/gorm" ) type CreateArticleUseCase struct { - articleRepository ArticleRepository + articleRepository gateways.ArticleRepository } type CreateArticleCommand struct { @@ -17,10 +17,13 @@ type CreateArticleCommand struct { func NewCreateArticleUseCase(db *gorm.DB) *CreateArticleUseCase { return &CreateArticleUseCase{ - articleRepository: *NewArticleRepository(db), + articleRepository: *gateways.NewArticleRepository(db), } } -func (g *CreateArticleUseCase) CreateArticle(article CreateArticleCommand) (Article, error) { - return g.articleRepository.Create(FromApi(article.Title, article.Body)) +func (g *CreateArticleUseCase) CreateArticle(createArticle CreateArticleCommand) (article.Article, error) { + return g.articleRepository.Create(article.FromApi( + createArticle.Title, + createArticle.Body, + )) } diff --git a/useCases/CreateUserUseCase.go b/useCases/CreateUserUseCase.go index d405b7e..ca76e84 100644 --- a/useCases/CreateUserUseCase.go +++ b/useCases/CreateUserUseCase.go @@ -1,13 +1,13 @@ package useCases import ( - . "GohCMS2/adapters/secondary/gateways" - . "GohCMS2/domain/user" + "GohCMS2/adapters/secondary/gateways" + "GohCMS2/domain/user" "gorm.io/gorm" ) type CreateUserUseCase struct { - userRepository UserRepository + userRepository gateways.UserRepository } type CreateUserCommand struct { @@ -18,10 +18,14 @@ type CreateUserCommand struct { func NewCreateUserUseCase(db *gorm.DB) *CreateUserUseCase { return &CreateUserUseCase{ - userRepository: *NewUserRepository(db), + userRepository: *gateways.NewUserRepository(db), } } -func (g *CreateUserUseCase) CreateUser(user CreateUserCommand) (User, error) { - return g.userRepository.Create(FromApi(user.Username, user.Password, user.Email)) +func (g *CreateUserUseCase) CreateUser(createUser CreateUserCommand) (user.User, error) { + return g.userRepository.Create(user.FromApi( + createUser.Username, + createUser.Password, + createUser.Email, + )) } diff --git a/useCases/GetArticleUseCase.go b/useCases/GetArticleUseCase.go index b83f5d7..85f6a59 100644 --- a/useCases/GetArticleUseCase.go +++ b/useCases/GetArticleUseCase.go @@ -1,21 +1,21 @@ package useCases import ( - . "GohCMS2/adapters/secondary/gateways" - . "GohCMS2/domain/article" + "GohCMS2/adapters/secondary/gateways" + "GohCMS2/domain/article" "gorm.io/gorm" ) type GetArticleUseCase struct { - articleRepository ArticleRepository + articleRepository gateways.ArticleRepository } func NewGetArticleUseCase(db *gorm.DB) *GetArticleUseCase { return &GetArticleUseCase{ - articleRepository: *NewArticleRepository(db), + articleRepository: *gateways.NewArticleRepository(db), } } -func (g *GetArticleUseCase) GetArticle(id uint32) (Article, error) { +func (g *GetArticleUseCase) GetArticle(id uint32) (article.Article, error) { return g.articleRepository.Get(id) } diff --git a/useCases/GetPageUseCase.go b/useCases/GetPageUseCase.go index 42ee55f..74cb6e7 100644 --- a/useCases/GetPageUseCase.go +++ b/useCases/GetPageUseCase.go @@ -1,16 +1,16 @@ package useCases import ( - . "GohCMS2/adapters/secondary/gateways" + "GohCMS2/adapters/secondary/gateways" ) type GetPageUseCase struct { - pageRepository PageRepository + pageRepository gateways.PageRepository } func NewGetPageUseCase() *GetPageUseCase { return &GetPageUseCase{ - pageRepository: *NewPageRepository(), + pageRepository: *gateways.NewPageRepository(), } } diff --git a/useCases/GetUserUseCase.go b/useCases/GetUserUseCase.go index 66e76a0..e95fc54 100644 --- a/useCases/GetUserUseCase.go +++ b/useCases/GetUserUseCase.go @@ -1,25 +1,25 @@ package useCases import ( - . "GohCMS2/adapters/secondary/gateways" - . "GohCMS2/domain/user" + "GohCMS2/adapters/secondary/gateways" + "GohCMS2/domain/user" "gorm.io/gorm" ) type GetUserUseCase struct { - userRepository UserRepository + userRepository gateways.UserRepository } func NewGetUserUseCase(db *gorm.DB) *GetUserUseCase { return &GetUserUseCase{ - userRepository: *NewUserRepository(db), + userRepository: *gateways.NewUserRepository(db), } } -func (g *GetUserUseCase) GetUser(id uint32) (User, error) { +func (g *GetUserUseCase) GetUser(id uint32) (user.User, error) { return g.userRepository.Get(id) } -func (g *GetUserUseCase) GetUserByUsername(username string) (User, error) { +func (g *GetUserUseCase) GetUserByUsername(username string) (user.User, error) { return g.userRepository.GetByUsername(username) } diff --git a/useCases/ListArticlesUseCase.go b/useCases/ListArticlesUseCase.go index 36a70d7..b95167b 100644 --- a/useCases/ListArticlesUseCase.go +++ b/useCases/ListArticlesUseCase.go @@ -1,21 +1,21 @@ package useCases import ( - . "GohCMS2/adapters/secondary/gateways" - . "GohCMS2/domain/article" + "GohCMS2/adapters/secondary/gateways" + "GohCMS2/domain/article" "gorm.io/gorm" ) type ListArticlesUseCase struct { - articleRepository ArticleRepository + articleRepository gateways.ArticleRepository } func NewListArticlesUseCase(db *gorm.DB) *ListArticlesUseCase { return &ListArticlesUseCase{ - articleRepository: *NewArticleRepository(db), + articleRepository: *gateways.NewArticleRepository(db), } } -func (g *ListArticlesUseCase) ListArticles() []Article { +func (g *ListArticlesUseCase) ListArticles() []article.Article { return g.articleRepository.GetAll() } diff --git a/useCases/ListUsersUseCase.go b/useCases/ListUsersUseCase.go index 2904c0d..6790e47 100644 --- a/useCases/ListUsersUseCase.go +++ b/useCases/ListUsersUseCase.go @@ -1,21 +1,21 @@ package useCases import ( - . "GohCMS2/adapters/secondary/gateways" - . "GohCMS2/domain/user" + "GohCMS2/adapters/secondary/gateways" + "GohCMS2/domain/user" "gorm.io/gorm" ) type ListUsersUseCase struct { - userRepository UserRepository + userRepository gateways.UserRepository } func NewListUsersUseCase(db *gorm.DB) *ListUsersUseCase { return &ListUsersUseCase{ - userRepository: *NewUserRepository(db), + userRepository: *gateways.NewUserRepository(db), } } -func (g *ListUsersUseCase) ListUsers() []User { +func (g *ListUsersUseCase) ListUsers() []user.User { return g.userRepository.GetAll() }