fsylvain/RenewCMS
1
0
Fork 0
mirror of https://github.com/Floriansylvain/RenewCMS.git synced 2026-08-19 19:53:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

clean: removed use of "." in imports

Browse Source
This commit is contained in:
Florian Sylvain
2023-08-13 02:48:19 +02:00
parent 2525a64d0a
commit c6bd7731cc
14 changed files with 82 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adapters/secondary/gateways/articleRepository.go
+2 -2
View File
@@ -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{}
adapters/secondary/gateways/pageRepository.go
+2 -2
View File
@@ -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{}
adapters/secondary/gateways/userRepository.go
+2 -2
View File
@@ -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{}
api/article.go
+2 -2
View File
@@ -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,
})
api/dependecyInjection.go
+22 -22
View File
@@ -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)
}
domain/gateways/IArticleRepository.go
+4 -4
View File
@@ -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)
}
domain/gateways/IUserRepository.go
+5 -5
View File
@@ -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)
}
useCases/CreateArticleUseCase.go
+9 -6
View File
@@ -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,
))
}
useCases/CreateUserUseCase.go
+10 -6
View File
@@ -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,
))
}
useCases/GetArticleUseCase.go
+5 -5
View File
@@ -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)
}
useCases/GetPageUseCase.go
+3 -3
View File
@@ -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(),
}
}
useCases/GetUserUseCase.go
+6 -6
View File
@@ -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)
}
useCases/ListArticlesUseCase.go
+5 -5
View File
@@ -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()
}
useCases/ListUsersUseCase.go
+5 -5
View File
@@ -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()
}