fsylvain/RenewCMS
1
0
Fork 0
mirror of https://github.com/Floriansylvain/RenewCMS.git synced 2026-08-19 11:43:22 +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 ( import (
entity "GohCMS2/adapters/secondary/gateways/models" entity "GohCMS2/adapters/secondary/gateways/models"
domain "GohCMS2/domain/article" domain "GohCMS2/domain/article"
. "GohCMS2/domain/gateways" "GohCMS2/domain/gateways"
"gorm.io/gorm" "gorm.io/gorm"
) )
@@ -65,4 +65,4 @@ func (a *ArticleRepository) GetAll() []domain.Article {
return domainArticles return domainArticles
} }
var _ IArticleRepository = &ArticleRepository{} var _ gateways.IArticleRepository = &ArticleRepository{}
adapters/secondary/gateways/pageRepository.go
+2 -2
View File
@@ -1,7 +1,7 @@
package gateways package gateways
import ( import (
. "GohCMS2/domain/gateways" "GohCMS2/domain/gateways"
"bytes" "bytes"
"embed" "embed"
"html/template" "html/template"
@@ -29,4 +29,4 @@ func (p *PageRepository) Get(name string, data interface{}) ([]byte, error) {
return processedHTML.Bytes(), nil 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 ( import (
entity "GohCMS2/adapters/secondary/gateways/models" entity "GohCMS2/adapters/secondary/gateways/models"
. "GohCMS2/domain/gateways" "GohCMS2/domain/gateways"
domain "GohCMS2/domain/user" domain "GohCMS2/domain/user"
"golang.org/x/crypto/bcrypt" "golang.org/x/crypto/bcrypt"
"gorm.io/gorm" "gorm.io/gorm"
@@ -77,4 +77,4 @@ func (u *UserRepository) GetByUsername(username string) (domain.User, error) {
return mapUserToDomain(user), nil return mapUserToDomain(user), nil
} }
var _ IUserRepository = &UserRepository{} var _ gateways.IUserRepository = &UserRepository{}
api/article.go
+2 -2
View File
@@ -1,7 +1,7 @@
package api package api
import ( import (
. "GohCMS2/useCases" "GohCMS2/useCases"
"encoding/json" "encoding/json"
"github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5"
"net/http" "net/http"
@@ -44,7 +44,7 @@ func postArticle(w http.ResponseWriter, r *http.Request) {
return return
} }
createdArticle, err := Container.CreateArticleUseCase.CreateArticle(CreateArticleCommand{ createdArticle, err := Container.CreateArticleUseCase.CreateArticle(useCases.CreateArticleCommand{
Title: article.Title, Title: article.Title,
Body: article.Body, Body: article.Body,
}) })
api/dependecyInjection.go
+22 -22
View File
@@ -2,32 +2,32 @@ package api
import ( import (
"GohCMS2/adapters/secondary/gateways/models" "GohCMS2/adapters/secondary/gateways/models"
. "GohCMS2/useCases" "GohCMS2/useCases"
"github.com/glebarez/sqlite" "github.com/glebarez/sqlite"
"go.uber.org/dig" "go.uber.org/dig"
"gorm.io/gorm" "gorm.io/gorm"
) )
type LocalContainer struct { type LocalContainer struct {
CreateArticleUseCase *CreateArticleUseCase CreateArticleUseCase *useCases.CreateArticleUseCase
GetArticleUseCase *GetArticleUseCase GetArticleUseCase *useCases.GetArticleUseCase
ListArticlesUseCase *ListArticlesUseCase ListArticlesUseCase *useCases.ListArticlesUseCase
GetUserUseCase *GetUserUseCase GetUserUseCase *useCases.GetUserUseCase
CreateUserUseCase *CreateUserUseCase CreateUserUseCase *useCases.CreateUserUseCase
ListUsersUseCase *ListUsersUseCase ListUsersUseCase *useCases.ListUsersUseCase
GetPageUseCase *GetPageUseCase GetPageUseCase *useCases.GetPageUseCase
} }
var Container *LocalContainer var Container *LocalContainer
func setContainer( func setContainer(
createArticle *CreateArticleUseCase, createArticle *useCases.CreateArticleUseCase,
getArticle *GetArticleUseCase, getArticle *useCases.GetArticleUseCase,
listArticle *ListArticlesUseCase, listArticle *useCases.ListArticlesUseCase,
getUser *GetUserUseCase, getUser *useCases.GetUserUseCase,
createUser *CreateUserUseCase, createUser *useCases.CreateUserUseCase,
listUsers *ListUsersUseCase, listUsers *useCases.ListUsersUseCase,
getPage *GetPageUseCase, getPage *useCases.GetPageUseCase,
) *LocalContainer { ) *LocalContainer {
Container = &LocalContainer{ Container = &LocalContainer{
CreateArticleUseCase: createArticle, CreateArticleUseCase: createArticle,
@@ -56,13 +56,13 @@ func InitContainer() {
_ = digContainer.Provide(func() *gorm.DB { return db }) _ = digContainer.Provide(func() *gorm.DB { return db })
_ = digContainer.Provide(func(db *gorm.DB) *CreateArticleUseCase { return NewCreateArticleUseCase(db) }) _ = digContainer.Provide(func(db *gorm.DB) *useCases.CreateArticleUseCase { return useCases.NewCreateArticleUseCase(db) })
_ = digContainer.Provide(func(db *gorm.DB) *GetArticleUseCase { return NewGetArticleUseCase(db) }) _ = digContainer.Provide(func(db *gorm.DB) *useCases.GetArticleUseCase { return useCases.NewGetArticleUseCase(db) })
_ = digContainer.Provide(func(db *gorm.DB) *ListArticlesUseCase { return NewListArticlesUseCase(db) }) _ = digContainer.Provide(func(db *gorm.DB) *useCases.ListArticlesUseCase { return useCases.NewListArticlesUseCase(db) })
_ = digContainer.Provide(func(db *gorm.DB) *GetUserUseCase { return NewGetUserUseCase(db) }) _ = digContainer.Provide(func(db *gorm.DB) *useCases.GetUserUseCase { return useCases.NewGetUserUseCase(db) })
_ = digContainer.Provide(func(db *gorm.DB) *CreateUserUseCase { return NewCreateUserUseCase(db) }) _ = digContainer.Provide(func(db *gorm.DB) *useCases.CreateUserUseCase { return useCases.NewCreateUserUseCase(db) })
_ = digContainer.Provide(func(db *gorm.DB) *ListUsersUseCase { return NewListUsersUseCase(db) }) _ = digContainer.Provide(func(db *gorm.DB) *useCases.ListUsersUseCase { return useCases.NewListUsersUseCase(db) })
_ = digContainer.Provide(NewGetPageUseCase) _ = digContainer.Provide(useCases.NewGetPageUseCase)
_ = digContainer.Invoke(setContainer) _ = digContainer.Invoke(setContainer)
} }
domain/gateways/IArticleRepository.go
+4 -4
View File
@@ -1,11 +1,11 @@
package gateways package gateways
import ( import (
. "GohCMS2/domain/article" "GohCMS2/domain/article"
) )
type IArticleRepository interface { type IArticleRepository interface {
Get(id uint32) (Article, error) Get(id uint32) (article.Article, error)
GetAll() []Article GetAll() []article.Article
Create(article Article) (Article, error) Create(article article.Article) (article.Article, error)
} }
domain/gateways/IUserRepository.go
+5 -5
View File
@@ -1,10 +1,10 @@
package gateways package gateways
import . "GohCMS2/domain/user" import "GohCMS2/domain/user"
type IUserRepository interface { type IUserRepository interface {
Get(id uint32) (User, error) Get(id uint32) (user.User, error)
GetByUsername(username string) (User, error) GetByUsername(username string) (user.User, error)
GetAll() []User GetAll() []user.User
Create(user User) (User, error) Create(user user.User) (user.User, error)
} }
useCases/CreateArticleUseCase.go
+9 -6
View File
@@ -1,13 +1,13 @@
package useCases package useCases
import ( import (
. "GohCMS2/adapters/secondary/gateways" "GohCMS2/adapters/secondary/gateways"
. "GohCMS2/domain/article" "GohCMS2/domain/article"
"gorm.io/gorm" "gorm.io/gorm"
) )
type CreateArticleUseCase struct { type CreateArticleUseCase struct {
articleRepository ArticleRepository articleRepository gateways.ArticleRepository
} }
type CreateArticleCommand struct { type CreateArticleCommand struct {
@@ -17,10 +17,13 @@ type CreateArticleCommand struct {
func NewCreateArticleUseCase(db *gorm.DB) *CreateArticleUseCase { func NewCreateArticleUseCase(db *gorm.DB) *CreateArticleUseCase {
return &CreateArticleUseCase{ return &CreateArticleUseCase{
articleRepository: *NewArticleRepository(db), articleRepository: *gateways.NewArticleRepository(db),
} }
} }
func (g *CreateArticleUseCase) CreateArticle(article CreateArticleCommand) (Article, error) { func (g *CreateArticleUseCase) CreateArticle(createArticle CreateArticleCommand) (article.Article, error) {
return g.articleRepository.Create(FromApi(article.Title, article.Body)) return g.articleRepository.Create(article.FromApi(
createArticle.Title,
createArticle.Body,
))
} }
useCases/CreateUserUseCase.go
+10 -6
View File
@@ -1,13 +1,13 @@
package useCases package useCases
import ( import (
. "GohCMS2/adapters/secondary/gateways" "GohCMS2/adapters/secondary/gateways"
. "GohCMS2/domain/user" "GohCMS2/domain/user"
"gorm.io/gorm" "gorm.io/gorm"
) )
type CreateUserUseCase struct { type CreateUserUseCase struct {
userRepository UserRepository userRepository gateways.UserRepository
} }
type CreateUserCommand struct { type CreateUserCommand struct {
@@ -18,10 +18,14 @@ type CreateUserCommand struct {
func NewCreateUserUseCase(db *gorm.DB) *CreateUserUseCase { func NewCreateUserUseCase(db *gorm.DB) *CreateUserUseCase {
return &CreateUserUseCase{ return &CreateUserUseCase{
userRepository: *NewUserRepository(db), userRepository: *gateways.NewUserRepository(db),
} }
} }
func (g *CreateUserUseCase) CreateUser(user CreateUserCommand) (User, error) { func (g *CreateUserUseCase) CreateUser(createUser CreateUserCommand) (user.User, error) {
return g.userRepository.Create(FromApi(user.Username, user.Password, user.Email)) 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 package useCases
import ( import (
. "GohCMS2/adapters/secondary/gateways" "GohCMS2/adapters/secondary/gateways"
. "GohCMS2/domain/article" "GohCMS2/domain/article"
"gorm.io/gorm" "gorm.io/gorm"
) )
type GetArticleUseCase struct { type GetArticleUseCase struct {
articleRepository ArticleRepository articleRepository gateways.ArticleRepository
} }
func NewGetArticleUseCase(db *gorm.DB) *GetArticleUseCase { func NewGetArticleUseCase(db *gorm.DB) *GetArticleUseCase {
return &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) return g.articleRepository.Get(id)
} }
useCases/GetPageUseCase.go
+3 -3
View File
@@ -1,16 +1,16 @@
package useCases package useCases
import ( import (
. "GohCMS2/adapters/secondary/gateways" "GohCMS2/adapters/secondary/gateways"
) )
type GetPageUseCase struct { type GetPageUseCase struct {
pageRepository PageRepository pageRepository gateways.PageRepository
} }
func NewGetPageUseCase() *GetPageUseCase { func NewGetPageUseCase() *GetPageUseCase {
return &GetPageUseCase{ return &GetPageUseCase{
pageRepository: *NewPageRepository(), pageRepository: *gateways.NewPageRepository(),
} }
} }
useCases/GetUserUseCase.go
+6 -6
View File
@@ -1,25 +1,25 @@
package useCases package useCases
import ( import (
. "GohCMS2/adapters/secondary/gateways" "GohCMS2/adapters/secondary/gateways"
. "GohCMS2/domain/user" "GohCMS2/domain/user"
"gorm.io/gorm" "gorm.io/gorm"
) )
type GetUserUseCase struct { type GetUserUseCase struct {
userRepository UserRepository userRepository gateways.UserRepository
} }
func NewGetUserUseCase(db *gorm.DB) *GetUserUseCase { func NewGetUserUseCase(db *gorm.DB) *GetUserUseCase {
return &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) 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) return g.userRepository.GetByUsername(username)
} }
useCases/ListArticlesUseCase.go
+5 -5
View File
@@ -1,21 +1,21 @@
package useCases package useCases
import ( import (
. "GohCMS2/adapters/secondary/gateways" "GohCMS2/adapters/secondary/gateways"
. "GohCMS2/domain/article" "GohCMS2/domain/article"
"gorm.io/gorm" "gorm.io/gorm"
) )
type ListArticlesUseCase struct { type ListArticlesUseCase struct {
articleRepository ArticleRepository articleRepository gateways.ArticleRepository
} }
func NewListArticlesUseCase(db *gorm.DB) *ListArticlesUseCase { func NewListArticlesUseCase(db *gorm.DB) *ListArticlesUseCase {
return &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() return g.articleRepository.GetAll()
} }
useCases/ListUsersUseCase.go
+5 -5
View File
@@ -1,21 +1,21 @@
package useCases package useCases
import ( import (
. "GohCMS2/adapters/secondary/gateways" "GohCMS2/adapters/secondary/gateways"
. "GohCMS2/domain/user" "GohCMS2/domain/user"
"gorm.io/gorm" "gorm.io/gorm"
) )
type ListUsersUseCase struct { type ListUsersUseCase struct {
userRepository UserRepository userRepository gateways.UserRepository
} }
func NewListUsersUseCase(db *gorm.DB) *ListUsersUseCase { func NewListUsersUseCase(db *gorm.DB) *ListUsersUseCase {
return &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() return g.userRepository.GetAll()
} }