talksik/clean-architecture-go-v2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: change function names

Browse Source
This commit is contained in:
Elton Minetto
2020-06-30 13:19:03 -03:00
parent 74d7384f47
commit 4c6b43b04d
21 changed files with 234 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/handler/book.go
+10 -10
View File
@@ -17,7 +17,7 @@ import (
"github.com/gorilla/mux"
)
func listBooks(service book.Repository) http.Handler {
func listBooks(manager book.Manager) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
errorMessage := "Error reading books"
var data []*book.Book
@@ -25,9 +25,9 @@ func listBooks(service book.Repository) http.Handler {
title := r.URL.Query().Get("title")
switch {
case title == "":
data, err = service.List()
data, err = manager.List()
default:
data, err = service.Search(title)
data, err = manager.Search(title)
}
w.Header().Set("Content-Type", "application/json")
if err != nil && err != domain.ErrNotFound {
@@ -58,7 +58,7 @@ func listBooks(service book.Repository) http.Handler {
})
}
func createBook(service book.Repository) http.Handler {
func createBook(manager book.Manager) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
errorMessage := "Error adding book"
var input struct {
@@ -82,7 +82,7 @@ func createBook(service book.Repository) http.Handler {
Quantity: input.Quantity,
CreatedAt: time.Now(),
}
b.ID, err = service.Create(b)
b.ID, err = manager.Create(b)
if err != nil {
log.Println(err.Error())
w.WriteHeader(http.StatusInternalServerError)
@@ -107,7 +107,7 @@ func createBook(service book.Repository) http.Handler {
})
}
func getBook(service book.Repository) http.Handler {
func getBook(manager book.Manager) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
errorMessage := "Error reading book"
vars := mux.Vars(r)
@@ -117,7 +117,7 @@ func getBook(service book.Repository) http.Handler {
w.Write([]byte(errorMessage))
return
}
data, err := service.Get(id)
data, err := manager.Get(id)
if err != nil && err != domain.ErrNotFound {
w.WriteHeader(http.StatusInternalServerError)
w.Write([]byte(errorMessage))
@@ -143,7 +143,7 @@ func getBook(service book.Repository) http.Handler {
})
}
func deleteBook(service book.Repository) http.Handler {
func deleteBook(manager book.Manager) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
errorMessage := "Error removing bookmark"
vars := mux.Vars(r)
@@ -153,7 +153,7 @@ func deleteBook(service book.Repository) http.Handler {
w.Write([]byte(errorMessage))
return
}
err = service.Delete(id)
err = manager.Delete(id)
if err != nil {
w.WriteHeader(http.StatusInternalServerError)
w.Write([]byte(errorMessage))
@@ -163,7 +163,7 @@ func deleteBook(service book.Repository) http.Handler {
}
//MakeBookHandlers make url handlers
func MakeBookHandlers(r *mux.Router, n negroni.Negroni, service book.Repository) {
func MakeBookHandlers(r *mux.Router, n negroni.Negroni, service book.Manager) {
r.Handle("/v1/book", n.With(
negroni.Wrap(listBooks(service)),
)).Methods("GET", "OPTIONS").Name("listBooks")
api/handler/book_test.go
+22 -22
View File
@@ -23,18 +23,18 @@ import (
func Test_listBooks(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
service := mock.NewMockUseCase(controller)
manager := mock.NewMockManager(controller)
r := mux.NewRouter()
n := negroni.New()
MakeBookHandlers(r, *n, service)
MakeBookHandlers(r, *n, manager)
path, err := r.GetRoute("listBooks").GetPathTemplate()
assert.Nil(t, err)
assert.Equal(t, "/v1/book", path)
b := book.NewFixtureBook()
service.EXPECT().
manager.EXPECT().
List().
Return([]*book.Book{b}, nil)
ts := httptest.NewServer(listBooks(service))
ts := httptest.NewServer(listBooks(manager))
defer ts.Close()
res, err := http.Get(ts.URL)
assert.Nil(t, err)
@@ -44,10 +44,10 @@ func Test_listBooks(t *testing.T) {
func Test_listBooks_NotFound(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
service := mock.NewMockUseCase(controller)
ts := httptest.NewServer(listBooks(service))
manager := mock.NewMockManager(controller)
ts := httptest.NewServer(listBooks(manager))
defer ts.Close()
service.EXPECT().
manager.EXPECT().
Search("book of books").
Return(nil, domain.ErrNotFound)
res, err := http.Get(ts.URL + "?title=book+of+books")
@@ -58,12 +58,12 @@ func Test_listBooks_NotFound(t *testing.T) {
func Test_listBooks_Search(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
service := mock.NewMockUseCase(controller)
manager := mock.NewMockManager(controller)
b := book.NewFixtureBook()
service.EXPECT().
manager.EXPECT().
Search("ozzy").
Return([]*book.Book{b}, nil)
ts := httptest.NewServer(listBooks(service))
ts := httptest.NewServer(listBooks(manager))
defer ts.Close()
res, err := http.Get(ts.URL + "?title=ozzy")
assert.Nil(t, err)
@@ -73,18 +73,18 @@ func Test_listBooks_Search(t *testing.T) {
func Test_createBook(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
service := mock.NewMockUseCase(controller)
manager := mock.NewMockManager(controller)
r := mux.NewRouter()
n := negroni.New()
MakeBookHandlers(r, *n, service)
MakeBookHandlers(r, *n, manager)
path, err := r.GetRoute("createBook").GetPathTemplate()
assert.Nil(t, err)
assert.Equal(t, "/v1/book", path)
service.EXPECT().
manager.EXPECT().
Create(gomock.Any()).
Return(entity.NewID(), nil)
h := createBook(service)
h := createBook(manager)
ts := httptest.NewServer(h)
defer ts.Close()
@@ -105,18 +105,18 @@ func Test_createBook(t *testing.T) {
func Test_getBook(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
service := mock.NewMockUseCase(controller)
manager := mock.NewMockManager(controller)
r := mux.NewRouter()
n := negroni.New()
MakeBookHandlers(r, *n, service)
MakeBookHandlers(r, *n, manager)
path, err := r.GetRoute("getBook").GetPathTemplate()
assert.Nil(t, err)
assert.Equal(t, "/v1/book/{id}", path)
b := book.NewFixtureBook()
service.EXPECT().
manager.EXPECT().
Get(b.ID).
Return(b, nil)
handler := getBook(service)
handler := getBook(manager)
r.Handle("/v1/book/{id}", handler)
ts := httptest.NewServer(r)
defer ts.Close()
@@ -132,16 +132,16 @@ func Test_getBook(t *testing.T) {
func Test_deleteBook(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
service := mock.NewMockUseCase(controller)
manager := mock.NewMockManager(controller)
r := mux.NewRouter()
n := negroni.New()
MakeBookHandlers(r, *n, service)
MakeBookHandlers(r, *n, manager)
path, err := r.GetRoute("deleteBook").GetPathTemplate()
assert.Nil(t, err)
assert.Equal(t, "/v1/book/{id}", path)
b := book.NewFixtureBook()
service.EXPECT().Delete(b.ID).Return(nil)
handler := deleteBook(service)
manager.EXPECT().Delete(b.ID).Return(nil)
handler := deleteBook(manager)
req, _ := http.NewRequest("DELETE", "/v1/bookmark/"+b.ID.String(), nil)
r.Handle("/v1/bookmark/{id}", handler).Methods("DELETE", "OPTIONS")
rr := httptest.NewRecorder()
api/handler/loan.go
+10 -10
View File
@@ -17,7 +17,7 @@ import (
"github.com/gorilla/mux"
)
func borrowBook(bService book.Repository, uService user.Repository, loanService loan.UseCase) http.Handler {
func borrowBook(bManager book.Manager, uManager user.Manager, loanUseCase loan.UseCase) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
errorMessage := "Error borrowing book"
vars := mux.Vars(r)
@@ -27,7 +27,7 @@ func borrowBook(bService book.Repository, uService user.Repository, loanService
w.Write([]byte(errorMessage))
return
}
b, err := bService.Get(bID)
b, err := bManager.Get(bID)
if err != nil && err != domain.ErrNotFound {
w.WriteHeader(http.StatusInternalServerError)
w.Write([]byte(errorMessage))
@@ -44,7 +44,7 @@ func borrowBook(bService book.Repository, uService user.Repository, loanService
w.Write([]byte(errorMessage))
return
}
u, err := uService.Get(uID)
u, err := uManager.Get(uID)
if err != nil && err != domain.ErrNotFound {
w.WriteHeader(http.StatusInternalServerError)
w.Write([]byte(errorMessage))
@@ -55,7 +55,7 @@ func borrowBook(bService book.Repository, uService user.Repository, loanService
w.Write([]byte(errorMessage))
return
}
err = loanService.Borrow(u, b)
err = loanUseCase.Borrow(u, b)
if err != nil {
fmt.Println(err)
w.WriteHeader(http.StatusInternalServerError)
@@ -66,7 +66,7 @@ func borrowBook(bService book.Repository, uService user.Repository, loanService
})
}
func returnBook(bService book.Repository, loanService loan.UseCase) http.Handler {
func returnBook(bManager book.Manager, loanUseCase loan.UseCase) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
errorMessage := "Error returning book"
vars := mux.Vars(r)
@@ -76,7 +76,7 @@ func returnBook(bService book.Repository, loanService loan.UseCase) http.Handler
w.Write([]byte(errorMessage))
return
}
b, err := bService.Get(bID)
b, err := bManager.Get(bID)
if err != nil && err != domain.ErrNotFound {
w.WriteHeader(http.StatusInternalServerError)
w.Write([]byte(errorMessage))
@@ -87,7 +87,7 @@ func returnBook(bService book.Repository, loanService loan.UseCase) http.Handler
w.Write([]byte(errorMessage))
return
}
err = loanService.Return(b)
err = loanUseCase.Return(b)
if err != nil && err != domain.ErrNotFound {
w.WriteHeader(http.StatusInternalServerError)
w.Write([]byte(errorMessage))
@@ -98,12 +98,12 @@ func returnBook(bService book.Repository, loanService loan.UseCase) http.Handler
}
//MakeLoanHandlers make url handlers
func MakeLoanHandlers(r *mux.Router, n negroni.Negroni, bService book.Repository, uService user.Repository, loanService loan.UseCase) {
func MakeLoanHandlers(r *mux.Router, n negroni.Negroni, bManager book.Manager, uManager user.Manager, loanUseCase loan.UseCase) {
r.Handle("/v1/loan/borrow/{book_id}/{user_id}", n.With(
negroni.Wrap(borrowBook(bService, uService, loanService)),
negroni.Wrap(borrowBook(bManager, uManager, loanUseCase)),
)).Methods("GET", "OPTIONS").Name("borrowBook")
r.Handle("/v1/loan/return/{book_id}", n.With(
negroni.Wrap(returnBook(bService, loanService)),
negroni.Wrap(returnBook(bManager, loanUseCase)),
)).Methods("GET", "OPTIONS").Name("returnBook")
}
api/handler/loan_test.go
+4 -4
View File
@@ -25,8 +25,8 @@ import (
func Test_borrowBook(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
uMock := umock.NewMockUseCase(controller)
bMock := bmock.NewMockUseCase(controller)
uMock := umock.NewMockManager(controller)
bMock := bmock.NewMockManager(controller)
lMock := lmock.NewMockUseCase(controller)
r := mux.NewRouter()
n := negroni.New()
@@ -74,8 +74,8 @@ func Test_borrowBook(t *testing.T) {
func Test_returnBook(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
uMock := umock.NewMockUseCase(controller)
bMock := bmock.NewMockUseCase(controller)
uMock := umock.NewMockManager(controller)
bMock := bmock.NewMockManager(controller)
lMock := lmock.NewMockUseCase(controller)
r := mux.NewRouter()
n := negroni.New()
api/handler/user.go
+14 -14
View File
@@ -18,7 +18,7 @@ import (
"github.com/gorilla/mux"
)
func listUsers(service user.Repository) http.Handler {
func listUsers(manager user.Manager) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
errorMessage := "Error reading users"
var data []*user.User
@@ -26,9 +26,9 @@ func listUsers(service user.Repository) http.Handler {
name := r.URL.Query().Get("name")
switch {
case name == "":
data, err = service.List()
data, err = manager.List()
default:
data, err = service.Search(name)
data, err = manager.Search(name)
}
w.Header().Set("Content-Type", "application/json")
if err != nil && err != domain.ErrNotFound {
@@ -58,7 +58,7 @@ func listUsers(service user.Repository) http.Handler {
})
}
func createUser(service user.Repository) http.Handler {
func createUser(manager user.Manager) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
errorMessage := "Error adding user"
var input struct {
@@ -83,7 +83,7 @@ func createUser(service user.Repository) http.Handler {
LastName: input.LastName,
CreatedAt: time.Now(),
}
u.ID, err = service.Create(u)
u.ID, err = manager.Create(u)
if err != nil {
log.Println(err.Error())
w.WriteHeader(http.StatusInternalServerError)
@@ -107,7 +107,7 @@ func createUser(service user.Repository) http.Handler {
})
}
func getUser(service user.Repository) http.Handler {
func getUser(manager user.Manager) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
errorMessage := "Error reading user"
vars := mux.Vars(r)
@@ -117,7 +117,7 @@ func getUser(service user.Repository) http.Handler {
w.Write([]byte(errorMessage))
return
}
data, err := service.Get(id)
data, err := manager.Get(id)
w.Header().Set("Content-Type", "application/json")
if err != nil && err != domain.ErrNotFound {
w.WriteHeader(http.StatusInternalServerError)
@@ -143,7 +143,7 @@ func getUser(service user.Repository) http.Handler {
})
}
func deleteUser(service user.Repository) http.Handler {
func deleteUser(manager user.Manager) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
errorMessage := "Error removing user"
vars := mux.Vars(r)
@@ -153,7 +153,7 @@ func deleteUser(service user.Repository) http.Handler {
w.Write([]byte(errorMessage))
return
}
err = service.Delete(id)
err = manager.Delete(id)
if err != nil {
w.WriteHeader(http.StatusInternalServerError)
w.Write([]byte(errorMessage))
@@ -163,20 +163,20 @@ func deleteUser(service user.Repository) http.Handler {
}
//MakeUserHandlers make url handlers
func MakeUserHandlers(r *mux.Router, n negroni.Negroni, service user.Repository) {
func MakeUserHandlers(r *mux.Router, n negroni.Negroni, manager user.Manager) {
r.Handle("/v1/user", n.With(
negroni.Wrap(listUsers(service)),
negroni.Wrap(listUsers(manager)),
)).Methods("GET", "OPTIONS").Name("listUsers")
r.Handle("/v1/user", n.With(
negroni.Wrap(createUser(service)),
negroni.Wrap(createUser(manager)),
)).Methods("POST", "OPTIONS").Name("createUser")
r.Handle("/v1/user/{id}", n.With(
negroni.Wrap(getUser(service)),
negroni.Wrap(getUser(manager)),
)).Methods("GET", "OPTIONS").Name("getUser")
r.Handle("/v1/user/{id}", n.With(
negroni.Wrap(deleteUser(service)),
negroni.Wrap(deleteUser(manager)),
)).Methods("DELETE", "OPTIONS").Name("deleteUser")
}
api/handler/user_test.go
+22 -22
View File
@@ -22,18 +22,18 @@ import (
func Test_listUsers(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
service := mock.NewMockUseCase(controller)
m := mock.NewMockManager(controller)
r := mux.NewRouter()
n := negroni.New()
MakeUserHandlers(r, *n, service)
MakeUserHandlers(r, *n, m)
path, err := r.GetRoute("listUsers").GetPathTemplate()
assert.Nil(t, err)
assert.Equal(t, "/v1/user", path)
u := user.NewFixtureUser()
service.EXPECT().
m.EXPECT().
List().
Return([]*user.User{u}, nil)
ts := httptest.NewServer(listUsers(service))
ts := httptest.NewServer(listUsers(m))
defer ts.Close()
res, err := http.Get(ts.URL)
assert.Nil(t, err)
@@ -43,10 +43,10 @@ func Test_listUsers(t *testing.T) {
func Test_listUsers_NotFound(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
service := mock.NewMockUseCase(controller)
ts := httptest.NewServer(listUsers(service))
m := mock.NewMockManager(controller)
ts := httptest.NewServer(listUsers(m))
defer ts.Close()
service.EXPECT().
m.EXPECT().
Search("dio").
Return(nil, domain.ErrNotFound)
res, err := http.Get(ts.URL + "?name=dio")
@@ -57,12 +57,12 @@ func Test_listUsers_NotFound(t *testing.T) {
func Test_listUsers_Search(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
service := mock.NewMockUseCase(controller)
m := mock.NewMockManager(controller)
u := user.NewFixtureUser()
service.EXPECT().
m.EXPECT().
Search("ozzy").
Return([]*user.User{u}, nil)
ts := httptest.NewServer(listUsers(service))
ts := httptest.NewServer(listUsers(m))
defer ts.Close()
res, err := http.Get(ts.URL + "?name=ozzy")
assert.Nil(t, err)
@@ -72,18 +72,18 @@ func Test_listUsers_Search(t *testing.T) {
func Test_createUser(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
service := mock.NewMockUseCase(controller)
m := mock.NewMockManager(controller)
r := mux.NewRouter()
n := negroni.New()
MakeUserHandlers(r, *n, service)
MakeUserHandlers(r, *n, m)
path, err := r.GetRoute("createUser").GetPathTemplate()
assert.Nil(t, err)
assert.Equal(t, "/v1/user", path)
service.EXPECT().
m.EXPECT().
Create(gomock.Any()).
Return(entity.NewID(), nil)
h := createUser(service)
h := createUser(m)
ts := httptest.NewServer(h)
defer ts.Close()
@@ -105,18 +105,18 @@ func Test_createUser(t *testing.T) {
func Test_getUser(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
service := mock.NewMockUseCase(controller)
m := mock.NewMockManager(controller)
r := mux.NewRouter()
n := negroni.New()
MakeUserHandlers(r, *n, service)
MakeUserHandlers(r, *n, m)
path, err := r.GetRoute("getUser").GetPathTemplate()
assert.Nil(t, err)
assert.Equal(t, "/v1/user/{id}", path)
u := user.NewFixtureUser()
service.EXPECT().
m.EXPECT().
Get(u.ID).
Return(u, nil)
handler := getUser(service)
handler := getUser(m)
r.Handle("/v1/user/{id}", handler)
ts := httptest.NewServer(r)
defer ts.Close()
@@ -132,16 +132,16 @@ func Test_getUser(t *testing.T) {
func Test_deleteUser(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
service := mock.NewMockUseCase(controller)
m := mock.NewMockManager(controller)
r := mux.NewRouter()
n := negroni.New()
MakeUserHandlers(r, *n, service)
MakeUserHandlers(r, *n, m)
path, err := r.GetRoute("deleteUser").GetPathTemplate()
assert.Nil(t, err)
assert.Equal(t, "/v1/user/{id}", path)
u := user.NewFixtureUser()
service.EXPECT().Delete(u.ID).Return(nil)
handler := deleteUser(service)
m.EXPECT().Delete(u.ID).Return(nil)
handler := deleteUser(m)
req, _ := http.NewRequest("DELETE", "/v1/user/"+u.ID.String(), nil)
r.Handle("/v1/user/{id}", handler).Methods("DELETE", "OPTIONS")
rr := httptest.NewRecorder()