feat: improvements in structures

api/handler/book/book.go

@@ -1,4 +1,4 @@
-package handler
+package book
 
 import (
 	"encoding/json"
@@ -162,8 +162,8 @@ func deleteBook(service book.UseCase) http.Handler {
 	})
 }
 
-//MakeBookHandlers make url handlers
+//MakeHandlers make url handlers
-func MakeBookHandlers(r *mux.Router, n negroni.Negroni, service book.UseCase) {
+func MakeHandlers(r *mux.Router, n negroni.Negroni, service book.UseCase) {
 	r.Handle("/v1/book", n.With(
 		negroni.Wrap(listBooks(service)),
 	)).Methods("GET", "OPTIONS").Name("listBooks")

api/handler/book/book_test.go

@@ -1,4 +1,4 @@
-package handler
+package book
 
 import (
 	"encoding/json"
@@ -24,7 +24,7 @@ func Test_listBooks(t *testing.T) {
 	manager := mock.NewMockUseCase(controller)
 	r := mux.NewRouter()
 	n := negroni.New()
-	MakeBookHandlers(r, *n, manager)
+	MakeHandlers(r, *n, manager)
 	path, err := r.GetRoute("listBooks").GetPathTemplate()
 	assert.Nil(t, err)
 	assert.Equal(t, "/v1/book", path)
@@ -74,7 +74,7 @@ func Test_createBook(t *testing.T) {
 	manager := mock.NewMockUseCase(controller)
 	r := mux.NewRouter()
 	n := negroni.New()
-	MakeBookHandlers(r, *n, manager)
+	MakeHandlers(r, *n, manager)
 	path, err := r.GetRoute("createBook").GetPathTemplate()
 	assert.Nil(t, err)
 	assert.Equal(t, "/v1/book", path)
@@ -106,7 +106,7 @@ func Test_getBook(t *testing.T) {
 	manager := mock.NewMockUseCase(controller)
 	r := mux.NewRouter()
 	n := negroni.New()
-	MakeBookHandlers(r, *n, manager)
+	MakeHandlers(r, *n, manager)
 	path, err := r.GetRoute("getBook").GetPathTemplate()
 	assert.Nil(t, err)
 	assert.Equal(t, "/v1/book/{id}", path)
@@ -133,7 +133,7 @@ func Test_deleteBook(t *testing.T) {
 	manager := mock.NewMockUseCase(controller)
 	r := mux.NewRouter()
 	n := negroni.New()
-	MakeBookHandlers(r, *n, manager)
+	MakeHandlers(r, *n, manager)
 	path, err := r.GetRoute("deleteBook").GetPathTemplate()
 	assert.Nil(t, err)
 	assert.Equal(t, "/v1/book/{id}", path)

api/handler/loan/loan.go

@@ -1,4 +1,4 @@
-package handler
+package loan
 
 import (
 	"fmt"
@@ -96,8 +96,8 @@ func returnBook(bookService book.UseCase, loanService loan.UseCase) http.Handler
 	})
 }
 
-//MakeLoanHandlers make url handlers
+//MakeHandlers make url handlers
-func MakeLoanHandlers(r *mux.Router, n negroni.Negroni, bookService book.UseCase, userService user.UseCase, loanService loan.UseCase) {
+func MakeHandlers(r *mux.Router, n negroni.Negroni, bookService book.UseCase, userService user.UseCase, loanService loan.UseCase) {
 	r.Handle("/v1/loan/borrow/{book_id}/{user_id}", n.With(
 		negroni.Wrap(borrowBook(bookService, userService, loanService)),
 	)).Methods("GET", "OPTIONS").Name("borrowBook")

api/handler/loan/loan_test.go

@@ -1,4 +1,4 @@
-package handler
+package loan
 
 import (
 	"fmt"
@@ -26,7 +26,7 @@ func Test_borrowBook(t *testing.T) {
 	lMock := lmock.NewMockUseCase(controller)
 	r := mux.NewRouter()
 	n := negroni.New()
-	MakeLoanHandlers(r, *n, bMock, uMock, lMock)
+	MakeHandlers(r, *n, bMock, uMock, lMock)
 	path, err := r.GetRoute("borrowBook").GetPathTemplate()
 	assert.Nil(t, err)
 	assert.Equal(t, "/v1/loan/borrow/{book_id}/{user_id}", path)
@@ -75,7 +75,7 @@ func Test_returnBook(t *testing.T) {
 	lMock := lmock.NewMockUseCase(controller)
 	r := mux.NewRouter()
 	n := negroni.New()
-	MakeLoanHandlers(r, *n, bMock, uMock, lMock)
+	MakeHandlers(r, *n, bMock, uMock, lMock)
 	path, err := r.GetRoute("returnBook").GetPathTemplate()
 	assert.Nil(t, err)
 	assert.Equal(t, "/v1/loan/return/{book_id}", path)

api/handler/user/user.go

@@ -1,4 +1,4 @@
-package handler
+package user
 
 import (
 	"encoding/json"
@@ -162,8 +162,8 @@ func deleteUser(service user.UseCase) http.Handler {
 	})
 }
 
-//MakeUserHandlers make url handlers
+//MakeHandlers make url handlers
-func MakeUserHandlers(r *mux.Router, n negroni.Negroni, service user.UseCase) {
+func MakeHandlers(r *mux.Router, n negroni.Negroni, service user.UseCase) {
 	r.Handle("/v1/user", n.With(
 		negroni.Wrap(listUsers(service)),
 	)).Methods("GET", "OPTIONS").Name("listUsers")

api/handler/user/user_test.go

@@ -1,4 +1,4 @@
-package handler
+package user
 
 import (
 	"encoding/json"
@@ -24,7 +24,7 @@ func Test_listUsers(t *testing.T) {
 	m := mock.NewMockUseCase(controller)
 	r := mux.NewRouter()
 	n := negroni.New()
-	MakeUserHandlers(r, *n, m)
+	MakeHandlers(r, *n, m)
 	path, err := r.GetRoute("listUsers").GetPathTemplate()
 	assert.Nil(t, err)
 	assert.Equal(t, "/v1/user", path)
@@ -74,7 +74,7 @@ func Test_createUser(t *testing.T) {
 	m := mock.NewMockUseCase(controller)
 	r := mux.NewRouter()
 	n := negroni.New()
-	MakeUserHandlers(r, *n, m)
+	MakeHandlers(r, *n, m)
 	path, err := r.GetRoute("createUser").GetPathTemplate()
 	assert.Nil(t, err)
 	assert.Equal(t, "/v1/user", path)
@@ -107,7 +107,7 @@ func Test_getUser(t *testing.T) {
 	m := mock.NewMockUseCase(controller)
 	r := mux.NewRouter()
 	n := negroni.New()
-	MakeUserHandlers(r, *n, m)
+	MakeHandlers(r, *n, m)
 	path, err := r.GetRoute("getUser").GetPathTemplate()
 	assert.Nil(t, err)
 	assert.Equal(t, "/v1/user/{id}", path)
@@ -134,7 +134,7 @@ func Test_deleteUser(t *testing.T) {
 	m := mock.NewMockUseCase(controller)
 	r := mux.NewRouter()
 	n := negroni.New()
-	MakeUserHandlers(r, *n, m)
+	MakeHandlers(r, *n, m)
 	path, err := r.GetRoute("deleteUser").GetPathTemplate()
 	assert.Nil(t, err)
 	assert.Equal(t, "/v1/user/{id}", path)

api/main.go

@@ -21,7 +21,9 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 
 	"github.com/codegangsta/negroni"
-	"github.com/eminetto/clean-architecture-go-v2/api/handler"
+	bhandler "github.com/eminetto/clean-architecture-go-v2/api/handler/book"
+	lhandler "github.com/eminetto/clean-architecture-go-v2/api/handler/loan"
+	uhandler "github.com/eminetto/clean-architecture-go-v2/api/handler/user"
 	"github.com/eminetto/clean-architecture-go-v2/api/middleware"
 	"github.com/eminetto/clean-architecture-go-v2/config"
 	"github.com/eminetto/clean-architecture-go-v2/pkg/metric"
@@ -40,12 +42,12 @@ func main() {
 	defer db.Close()
 
 	bookRepo := brepo.NewMySQLRepository(db)
-	bookManager := book.NewService(bookRepo)
+	bookService := book.NewService(bookRepo)
 
 	userRepo := urepo.NewMySQLRepoRepository(db)
-	userManager := user.NewService(userRepo, password.NewService())
+	userService := user.NewService(userRepo, password.NewService())
 
-	loanUseCase := loan.NewService(userManager, bookManager)
+	loanUseCase := loan.NewService(userService, bookService)
 
 	metricService, err := metric.NewPrometheusService()
 	if err != nil {
@@ -59,13 +61,13 @@ func main() {
 		negroni.NewLogger(),
 	)
 	//book
-	handler.MakeBookHandlers(r, *n, bookManager)
+	bhandler.MakeHandlers(r, *n, bookService)
 
 	//user
-	handler.MakeUserHandlers(r, *n, userManager)
+	uhandler.MakeHandlers(r, *n, userService)
 
 	//loan
-	handler.MakeLoanHandlers(r, *n, bookManager, userManager, loanUseCase)
+	lhandler.MakeHandlers(r, *n, bookService, userService, loanUseCase)
 
 	http.Handle("/", r)
 	http.Handle("/metrics", promhttp.Handler())