feat: refactoring

api/handler/book.go

@@ -17,7 +17,7 @@ import (
 	"github.com/gorilla/mux"
 )
 
-func listBooks(service book.UseCase) http.Handler {
+func listBooks(service book.Repository) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		errorMessage := "Error reading books"
 		var data []*book.Book
@@ -58,7 +58,7 @@ func listBooks(service book.UseCase) http.Handler {
 	})
 }
 
-func createBook(service book.UseCase) http.Handler {
+func createBook(service book.Repository) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		errorMessage := "Error adding book"
 		var input struct {
@@ -107,7 +107,7 @@ func createBook(service book.UseCase) http.Handler {
 	})
 }
 
-func getBook(service book.UseCase) http.Handler {
+func getBook(service book.Repository) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		errorMessage := "Error reading book"
 		vars := mux.Vars(r)
@@ -143,7 +143,7 @@ func getBook(service book.UseCase) http.Handler {
 	})
 }
 
-func deleteBook(service book.UseCase) http.Handler {
+func deleteBook(service book.Repository) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		errorMessage := "Error removing bookmark"
 		vars := mux.Vars(r)
@@ -163,7 +163,7 @@ func deleteBook(service book.UseCase) http.Handler {
 }
 
 //MakeBookHandlers make url handlers
-func MakeBookHandlers(r *mux.Router, n negroni.Negroni, service book.UseCase) {
+func MakeBookHandlers(r *mux.Router, n negroni.Negroni, service book.Repository) {
 	r.Handle("/v1/book", n.With(
 		negroni.Wrap(listBooks(service)),
 	)).Methods("GET", "OPTIONS").Name("listBooks")

api/handler/loan.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/eminetto/clean-architecture-go-v2/domain/entity/user"
 
-	"github.com/eminetto/clean-architecture-go-v2/domain/loan"
+	"github.com/eminetto/clean-architecture-go-v2/domain/usecase/loan"
 
 	"github.com/eminetto/clean-architecture-go-v2/domain"
 
@@ -17,7 +17,7 @@ import (
 	"github.com/gorilla/mux"
 )
 
-func borrowBook(bService book.UseCase, uService user.UseCase, loanService loan.UseCase) http.Handler {
+func borrowBook(bService book.Repository, uService user.Repository, loanService loan.UseCase) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		errorMessage := "Error borrowing book"
 		vars := mux.Vars(r)
@@ -66,7 +66,7 @@ func borrowBook(bService book.UseCase, uService user.UseCase, loanService loan.U
 	})
 }
 
-func returnBook(bService book.UseCase, loanService loan.UseCase) http.Handler {
+func returnBook(bService book.Repository, loanService loan.UseCase) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		errorMessage := "Error returning book"
 		vars := mux.Vars(r)
@@ -98,7 +98,7 @@ func returnBook(bService book.UseCase, loanService loan.UseCase) http.Handler {
 }
 
 //MakeLoanHandlers make url handlers
-func MakeLoanHandlers(r *mux.Router, n negroni.Negroni, bService book.UseCase, uService user.UseCase, loanService loan.UseCase) {
+func MakeLoanHandlers(r *mux.Router, n negroni.Negroni, bService book.Repository, uService user.Repository, loanService loan.UseCase) {
 	r.Handle("/v1/loan/borrow/{book_id}/{user_id}", n.With(
 		negroni.Wrap(borrowBook(bService, uService, loanService)),
 	)).Methods("GET", "OPTIONS").Name("borrowBook")

api/handler/loan_test.go

@@ -16,7 +16,7 @@ import (
 	"github.com/codegangsta/negroni"
 	bmock "github.com/eminetto/clean-architecture-go-v2/domain/entity/book/mock"
 	umock "github.com/eminetto/clean-architecture-go-v2/domain/entity/user/mock"
-	lmock "github.com/eminetto/clean-architecture-go-v2/domain/loan/mock"
+	lmock "github.com/eminetto/clean-architecture-go-v2/domain/usecase/loan/mock"
 	"github.com/golang/mock/gomock"
 	"github.com/gorilla/mux"
 	"github.com/stretchr/testify/assert"

api/handler/user.go

@@ -18,7 +18,7 @@ import (
 	"github.com/gorilla/mux"
 )
 
-func listUsers(service user.UseCase) http.Handler {
+func listUsers(service user.Repository) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		errorMessage := "Error reading users"
 		var data []*user.User
@@ -58,7 +58,7 @@ func listUsers(service user.UseCase) http.Handler {
 	})
 }
 
-func createUser(service user.UseCase) http.Handler {
+func createUser(service user.Repository) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		errorMessage := "Error adding user"
 		var input struct {
@@ -107,7 +107,7 @@ func createUser(service user.UseCase) http.Handler {
 	})
 }
 
-func getUser(service user.UseCase) http.Handler {
+func getUser(service user.Repository) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		errorMessage := "Error reading user"
 		vars := mux.Vars(r)
@@ -143,7 +143,7 @@ func getUser(service user.UseCase) http.Handler {
 	})
 }
 
-func deleteUser(service user.UseCase) http.Handler {
+func deleteUser(service user.Repository) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		errorMessage := "Error removing user"
 		vars := mux.Vars(r)
@@ -163,7 +163,7 @@ func deleteUser(service user.UseCase) http.Handler {
 }
 
 //MakeUserHandlers make url handlers
-func MakeUserHandlers(r *mux.Router, n negroni.Negroni, service user.UseCase) {
+func MakeUserHandlers(r *mux.Router, n negroni.Negroni, service user.Repository) {
 	r.Handle("/v1/user", n.With(
 		negroni.Wrap(listUsers(service)),
 	)).Methods("GET", "OPTIONS").Name("listUsers")