Skip to content

Commit 2c48868

Browse files
authored
Merge pull request #13 from bmf-san/revert-12-fix/logger-interface
Revert "Move Logger interface from usecases to interfaces"
2 parents 034d0af + 232e49a commit 2c48868

File tree

6 files changed

+12
-9
lines changed

6 files changed

+12
-9
lines changed

app/infrastructure/env.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import (
55
"os"
66
"strings"
77

8-
"github.com/bmf-san/go-clean-architecture-web-application-boilerplate/app/interfaces"
8+
"github.com/bmf-san/go-clean-architecture-web-application-boilerplate/app/usecases"
99
)
1010

1111
// Load is load configs from a env file.
12-
func Load(logger interfaces.Logger) {
12+
func Load(logger usecases.Logger) {
1313
filePath := ".env"
1414

1515
f, err := os.Open(filePath)

app/infrastructure/logger.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,15 @@ import (
44
"io"
55
"log"
66
"os"
7+
8+
"github.com/bmf-san/go-clean-architecture-web-application-boilerplate/app/usecases"
79
)
810

911
// A Logger belong to the infrastructure layer.
1012
type Logger struct{}
1113

1214
// NewLogger return a Logger.
13-
func NewLogger() *Logger {
15+
func NewLogger() usecases.Logger {
1416
return &Logger{}
1517
}
1618

app/infrastructure/router.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ import (
55
"os"
66

77
"github.com/bmf-san/go-clean-architecture-web-application-boilerplate/app/interfaces"
8+
"github.com/bmf-san/go-clean-architecture-web-application-boilerplate/app/usecases"
89
"github.com/go-chi/chi"
910
)
1011

1112
// Dispatch is handle routing
12-
func Dispatch(logger interfaces.Logger, sqlHandler interfaces.SQLHandler) {
13+
func Dispatch(logger usecases.Logger, sqlHandler interfaces.SQLHandler) {
1314
userController := interfaces.NewUserController(sqlHandler, logger)
1415
postController := interfaces.NewPostController(sqlHandler, logger)
1516

app/interfaces/post_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212
// A PostController belong to the interface layer.
1313
type PostController struct {
1414
PostInteractor usecases.PostInteractor
15-
Logger Logger
15+
Logger usecases.Logger
1616
}
1717

1818
// NewPostController returns the resource of Posts.
19-
func NewPostController(sqlHandler SQLHandler, logger Logger) *PostController {
19+
func NewPostController(sqlHandler SQLHandler, logger usecases.Logger) *PostController {
2020
return &PostController{
2121
PostInteractor: usecases.PostInteractor{
2222
PostRepository: &PostRepository{

app/interfaces/user_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import (
1111
// A UserController belong to the interface layer.
1212
type UserController struct {
1313
UserInteractor usecases.UserInteractor
14-
Logger Logger
14+
Logger usecases.Logger
1515
}
1616

1717
// NewUserController returns the resource of users.
18-
func NewUserController(sqlHandler SQLHandler, logger Logger) *UserController {
18+
func NewUserController(sqlHandler SQLHandler, logger usecases.Logger) *UserController {
1919
return &UserController{
2020
UserInteractor: usecases.UserInteractor{
2121
UserRepository: &UserRepository{

app/interfaces/logger.go renamed to app/usecases/logger.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package interfaces
1+
package usecases
22

33
// A Logger belong to the usecases layer.
44
type Logger interface {

0 commit comments

Comments
 (0)