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

feat: new handlers - WIP

Browse Source
This commit is contained in:
Elton Minetto
2020-06-26 15:51:51 -03:00
parent adc2331b89
commit bf36e4cc88
5 changed files with 126 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/handler/book.go
-1
View File
@@ -118,7 +118,6 @@ func getBook(service book.UseCase) http.Handler {
return
}
data, err := service.Get(id)
w.Header().Set("Content-Type", "application/json")
if err != nil && err != domain.ErrNotFound {
w.WriteHeader(http.StatusInternalServerError)
w.Write([]byte(errorMessage))
api/handler/book_test.go
+10 -10
View File
@@ -20,14 +20,14 @@ import (
"github.com/stretchr/testify/assert"
)
func Test_BookIndex(t *testing.T) {
func Test_listBooks(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
service := mock.NewMockUseCase(controller)
r := mux.NewRouter()
n := negroni.New()
MakeBookHandlers(r, *n, service)
path, err := r.GetRoute("bookIndex").GetPathTemplate()
path, err := r.GetRoute("listBooks").GetPathTemplate()
assert.Nil(t, err)
assert.Equal(t, "/v1/book", path)
b := book.NewFixtureBook()
@@ -41,7 +41,7 @@ func Test_BookIndex(t *testing.T) {
assert.Equal(t, http.StatusOK, res.StatusCode)
}
func Test_BookIndexNotFound(t *testing.T) {
func Test_listBooks_NotFound(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
service := mock.NewMockUseCase(controller)
@@ -55,7 +55,7 @@ func Test_BookIndexNotFound(t *testing.T) {
assert.Equal(t, http.StatusNotFound, res.StatusCode)
}
func Test_BookSearch(t *testing.T) {
func Test_listBooks_Search(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
service := mock.NewMockUseCase(controller)
@@ -70,14 +70,14 @@ func Test_BookSearch(t *testing.T) {
assert.Equal(t, http.StatusOK, res.StatusCode)
}
func Test_BookAdd(t *testing.T) {
func Test_createBook(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
service := mock.NewMockUseCase(controller)
r := mux.NewRouter()
n := negroni.New()
MakeBookHandlers(r, *n, service)
path, err := r.GetRoute("bookAdd").GetPathTemplate()
path, err := r.GetRoute("createBook").GetPathTemplate()
assert.Nil(t, err)
assert.Equal(t, "/v1/book", path)
@@ -102,14 +102,14 @@ func Test_BookAdd(t *testing.T) {
assert.Equal(t, "Ozzy Osbourne", b.Author)
}
func Test_BookFind(t *testing.T) {
func Test_getBook(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
service := mock.NewMockUseCase(controller)
r := mux.NewRouter()
n := negroni.New()
MakeBookHandlers(r, *n, service)
path, err := r.GetRoute("bookFind").GetPathTemplate()
path, err := r.GetRoute("getBook").GetPathTemplate()
assert.Nil(t, err)
assert.Equal(t, "/v1/book/{id}", path)
b := book.NewFixtureBook()
@@ -129,14 +129,14 @@ func Test_BookFind(t *testing.T) {
assert.Equal(t, b.ID, d.ID)
}
func TestBookRemove(t *testing.T) {
func Test_deleteBook(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
service := mock.NewMockUseCase(controller)
r := mux.NewRouter()
n := negroni.New()
MakeBookHandlers(r, *n, service)
path, err := r.GetRoute("bookDelete").GetPathTemplate()
path, err := r.GetRoute("deleteBook").GetPathTemplate()
assert.Nil(t, err)
assert.Equal(t, "/v1/book/{id}", path)
b := book.NewFixtureBook()
api/handler/loan.go
+68
View File
@@ -0,0 +1,68 @@
package handler
import (
"net/http"
"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"
"github.com/eminetto/clean-architecture-go-v2/domain/entity"
"github.com/eminetto/clean-architecture-go-v2/domain/entity/book"
"github.com/codegangsta/negroni"
"github.com/gorilla/mux"
)
func borrow(bService book.UseCase, uService user.UseCase, loanService loan.UseCase) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
errorMessage := "Error borrowing book"
vars := mux.Vars(r)
bID, err := entity.StringToID(vars["book_id"])
if err != nil {
w.WriteHeader(http.StatusInternalServerError)
w.Write([]byte(errorMessage))
return
}
b, err := bService.Get(bID)
if err != nil && err != domain.ErrNotFound {
w.WriteHeader(http.StatusInternalServerError)
w.Write([]byte(errorMessage))
return
}
uID, err := entity.StringToID(vars["user_id"])
if err != nil {
w.WriteHeader(http.StatusInternalServerError)
w.Write([]byte(errorMessage))
return
}
u, err := uService.Get(uID)
if err != nil && err != domain.ErrNotFound {
w.WriteHeader(http.StatusInternalServerError)
w.Write([]byte(errorMessage))
return
}
err = loanService.Borrow(u, b)
if err != nil && err != domain.ErrNotFound {
w.WriteHeader(http.StatusInternalServerError)
w.Write([]byte(errorMessage))
return
}
w.WriteHeader(http.StatusCreated)
})
}
//MakeLoanHandlers make url handlers
func MakeLoanHandlers(r *mux.Router, n negroni.Negroni, bService book.UseCase, uService user.UseCase, loanService loan.UseCase) {
r.Handle("/v1/loan/borrow/{book_id}/{user_id}", n.With(
negroni.Wrap(borrow(bService, uService, loanService)),
)).Methods("GET", "OPTIONS").Name("borrow")
//r.Handle("/v1/book/{book_id}/return", n.With(
// negroni.Wrap(returnBook(service)),
//)).Methods("GET", "OPTIONS").Name("returnBook")
}
api/handler/user_test.go
+42 -51
View File
@@ -8,11 +8,10 @@ import (
"strings"
"testing"
"github.com/codegangsta/negroni"
"github.com/eminetto/clean-architecture-go-v2/api/presenter"
"github.com/eminetto/clean-architecture-go-v2/domain"
"github.com/eminetto/clean-architecture-go-v2/domain/entity"
"github.com/codegangsta/negroni"
"github.com/eminetto/clean-architecture-go-v2/domain/entity/user"
"github.com/eminetto/clean-architecture-go-v2/domain/entity/user/mock"
"github.com/golang/mock/gomock"
@@ -20,32 +19,32 @@ import (
"github.com/stretchr/testify/assert"
)
func Test_UserIndex(t *testing.T) {
func Test_listUsers(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
service := mock.NewMockUseCase(controller)
r := mux.NewRouter()
n := negroni.New()
MakeUserHandlers(r, *n, service)
path, err := r.GetRoute("userIndex").GetPathTemplate()
path, err := r.GetRoute("listUsers").GetPathTemplate()
assert.Nil(t, err)
assert.Equal(t, "/v1/user", path)
u := user.NewFixtureUser()
service.EXPECT().
List().
Return([]*user.User{u}, nil)
ts := httptest.NewServer(userIndex(service))
ts := httptest.NewServer(listUsers(service))
defer ts.Close()
res, err := http.Get(ts.URL)
assert.Nil(t, err)
assert.Equal(t, http.StatusOK, res.StatusCode)
}
func Test_UserIndexNotFound(t *testing.T) {
func Test_listUsers_NotFound(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
service := mock.NewMockUseCase(controller)
ts := httptest.NewServer(userIndex(service))
ts := httptest.NewServer(listUsers(service))
defer ts.Close()
service.EXPECT().
Search("dio").
@@ -55,7 +54,7 @@ func Test_UserIndexNotFound(t *testing.T) {
assert.Equal(t, http.StatusNotFound, res.StatusCode)
}
func Test_UserSearch(t *testing.T) {
func Test_listUsers_Search(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
service := mock.NewMockUseCase(controller)
@@ -63,37 +62,37 @@ func Test_UserSearch(t *testing.T) {
service.EXPECT().
Search("ozzy").
Return([]*user.User{u}, nil)
ts := httptest.NewServer(userIndex(service))
ts := httptest.NewServer(listUsers(service))
defer ts.Close()
res, err := http.Get(ts.URL + "?name=ozzy")
assert.Nil(t, err)
assert.Equal(t, http.StatusOK, res.StatusCode)
}
func Test_UserAdd(t *testing.T) {
func Test_createUser(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
service := mock.NewMockUseCase(controller)
r := mux.NewRouter()
n := negroni.New()
MakeUserHandlers(r, *n, service)
path, err := r.GetRoute("userAdd").GetPathTemplate()
path, err := r.GetRoute("createUser").GetPathTemplate()
assert.Nil(t, err)
assert.Equal(t, "/v1/user", path)
service.EXPECT().
Create(gomock.Any()).
Return(entity.NewID(), nil)
h := userAdd(service)
h := createUser(service)
ts := httptest.NewServer(h)
defer ts.Close()
payload := fmt.Sprintf(`{
"name": "ozzy",
"email": "ozzy@hell.com",
"password": "asasa",
"first_name":"Ozzy",
"last_name":"Osbourne"
"name": "ozzy",
"email": "ozzy@hell.com",
"password": "asasa",
"first_name":"Ozzy",
"last_name":"Osbourne"
}`)
resp, _ := http.Post(ts.URL+"/v1/user", "application/json", strings.NewReader(payload))
assert.Equal(t, http.StatusCreated, resp.StatusCode)
@@ -103,57 +102,49 @@ func Test_UserAdd(t *testing.T) {
assert.Equal(t, "Ozzy Osbourne", fmt.Sprintf("%s %s", u.FirstName, u.LastName))
}
func Test_UserFind(t *testing.T) {
func Test_getUser(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
service := mock.NewMockUseCase(controller)
r := mux.NewRouter()
n := negroni.New()
MakeUserHandlers(r, *n, service)
path, err := r.GetRoute("userFind").GetPathTemplate()
path, err := r.GetRoute("getUser").GetPathTemplate()
assert.Nil(t, err)
assert.Equal(t, "/v1/user/{id}", path)
u := user.NewFixtureUser()
service.EXPECT().
Get(u.ID).
Return(u, nil)
handler := userFind(service)
r.Handle("/v1/bookmark/{id}", handler)
handler := getUser(service)
r.Handle("/v1/user/{id}", handler)
ts := httptest.NewServer(r)
defer ts.Close()
res, err := http.Get(ts.URL + "/v1/bookmark/" + b.ID.String())
res, err := http.Get(ts.URL + "/v1/user/" + u.ID.String())
assert.Nil(t, err)
assert.Equal(t, http.StatusOK, res.StatusCode)
var d *entity.Bookmark
var d *presenter.User
json.NewDecoder(res.Body).Decode(&d)
assert.NotNil(t, d)
assert.Equal(t, b.ID, d.ID)
assert.Equal(t, u.ID, d.ID)
}
//
//func TestBookmarkRemove(t *testing.T) {
// controller := gomock.NewController(t)
// defer controller.Finish()
// service := mock.NewMockUseCase(controller)
// r := mux.NewRouter()
// n := negroni.New()
// MakeBookmarkHandlers(r, *n, service)
// path, err := r.GetRoute("bookmarkDelete").GetPathTemplate()
// assert.Nil(t, err)
// assert.Equal(t, "/v1/bookmark/{id}", path)
// b := &entity.Bookmark{
// ID: entity.NewID(),
// Name: "Elton Minetto",
// Description: "Minetto's page",
// Link: "http://www.eltonminetto.net",
// Tags: []string{"golang", "php", "linux", "mac"},
// Favorite: false,
// }
// service.EXPECT().Delete(b.ID).Return(nil)
// handler := bookmarkDelete(service)
// req, _ := http.NewRequest("DELETE", "/v1/bookmark/"+b.ID.String(), nil)
// r.Handle("/v1/bookmark/{id}", handler).Methods("DELETE", "OPTIONS")
// rr := httptest.NewRecorder()
// r.ServeHTTP(rr, req)
// assert.Equal(t, http.StatusOK, rr.Code)
//}
func Test_deleteUser(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
service := mock.NewMockUseCase(controller)
r := mux.NewRouter()
n := negroni.New()
MakeUserHandlers(r, *n, service)
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)
req, _ := http.NewRequest("DELETE", "/v1/user/"+u.ID.String(), nil)
r.Handle("/v1/user/{id}", handler).Methods("DELETE", "OPTIONS")
rr := httptest.NewRecorder()
r.ServeHTTP(rr, req)
assert.Equal(t, http.StatusOK, rr.Code)
}
api/main.go
+6 -1
View File
@@ -9,6 +9,8 @@ import (
"strconv"
"time"
"github.com/eminetto/clean-architecture-go-v2/domain/loan"
"github.com/eminetto/clean-architecture-go-v2/domain/entity/user"
"github.com/eminetto/clean-architecture-go-v2/domain/entity/book"
@@ -39,7 +41,7 @@ func main() {
userRepo := user.NewMySQLRepoRepository(db)
userService := user.NewService(userRepo)
//loanService := loan.NewService(userService, bookService)
loanService := loan.NewService(userService, bookService)
metricService, err := metric.NewPrometheusService()
if err != nil {
@@ -58,6 +60,9 @@ func main() {
//user
handler.MakeUserHandlers(r, *n, userService)
//loan
handler.MakeLoanHandlers(r, *n, bookService, userService, loanService)
http.Handle("/", r)
http.Handle("/metrics", promhttp.Handler())
r.HandleFunc("/ping", func(w http.ResponseWriter, r *http.Request) {