feat: improvements in structures
This commit is contained in:
@@ -0,0 +1,108 @@
|
||||
package loan
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
|
||||
"github.com/eminetto/clean-architecture-go-v2/domain/usecase/book"
|
||||
"github.com/eminetto/clean-architecture-go-v2/domain/usecase/user"
|
||||
|
||||
"github.com/eminetto/clean-architecture-go-v2/domain/usecase/loan"
|
||||
|
||||
"github.com/eminetto/clean-architecture-go-v2/domain"
|
||||
|
||||
"github.com/codegangsta/negroni"
|
||||
"github.com/eminetto/clean-architecture-go-v2/domain/entity"
|
||||
"github.com/gorilla/mux"
|
||||
)
|
||||
|
||||
func borrowBook(bookService book.UseCase, userService 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 := bookService.GetBook(bID)
|
||||
if err != nil && err != domain.ErrNotFound {
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
w.Write([]byte(errorMessage))
|
||||
return
|
||||
}
|
||||
if b == nil {
|
||||
w.WriteHeader(http.StatusNotFound)
|
||||
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 := userService.GetUser(uID)
|
||||
if err != nil && err != domain.ErrNotFound {
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
w.Write([]byte(errorMessage))
|
||||
return
|
||||
}
|
||||
if u == nil {
|
||||
w.WriteHeader(http.StatusNotFound)
|
||||
w.Write([]byte(errorMessage))
|
||||
return
|
||||
}
|
||||
err = loanService.Borrow(u, b)
|
||||
if err != nil {
|
||||
fmt.Println(err)
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
w.Write([]byte(errorMessage))
|
||||
return
|
||||
}
|
||||
w.WriteHeader(http.StatusCreated)
|
||||
})
|
||||
}
|
||||
|
||||
func returnBook(bookService book.UseCase, loanService loan.UseCase) http.Handler {
|
||||
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
||||
errorMessage := "Error returning 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 := bookService.GetBook(bID)
|
||||
if err != nil && err != domain.ErrNotFound {
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
w.Write([]byte(errorMessage))
|
||||
return
|
||||
}
|
||||
if b == nil {
|
||||
w.WriteHeader(http.StatusNotFound)
|
||||
w.Write([]byte(errorMessage))
|
||||
return
|
||||
}
|
||||
err = loanService.Return(b)
|
||||
if err != nil && err != domain.ErrNotFound {
|
||||
w.WriteHeader(http.StatusInternalServerError)
|
||||
w.Write([]byte(errorMessage))
|
||||
return
|
||||
}
|
||||
w.WriteHeader(http.StatusCreated)
|
||||
})
|
||||
}
|
||||
|
||||
//MakeHandlers make url handlers
|
||||
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")
|
||||
|
||||
r.Handle("/v1/loan/return/{book_id}", n.With(
|
||||
negroni.Wrap(returnBook(bookService, loanService)),
|
||||
)).Methods("GET", "OPTIONS").Name("returnBook")
|
||||
}
|
||||
@@ -0,0 +1,103 @@
|
||||
package loan
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"testing"
|
||||
|
||||
"github.com/eminetto/clean-architecture-go-v2/domain"
|
||||
"github.com/eminetto/clean-architecture-go-v2/domain/entity"
|
||||
|
||||
"github.com/codegangsta/negroni"
|
||||
bmock "github.com/eminetto/clean-architecture-go-v2/domain/usecase/book/mock"
|
||||
lmock "github.com/eminetto/clean-architecture-go-v2/domain/usecase/loan/mock"
|
||||
umock "github.com/eminetto/clean-architecture-go-v2/domain/usecase/user/mock"
|
||||
"github.com/golang/mock/gomock"
|
||||
"github.com/gorilla/mux"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func Test_borrowBook(t *testing.T) {
|
||||
controller := gomock.NewController(t)
|
||||
defer controller.Finish()
|
||||
uMock := umock.NewMockUseCase(controller)
|
||||
bMock := bmock.NewMockUseCase(controller)
|
||||
lMock := lmock.NewMockUseCase(controller)
|
||||
r := mux.NewRouter()
|
||||
n := negroni.New()
|
||||
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)
|
||||
handler := borrowBook(bMock, uMock, lMock)
|
||||
r.Handle("/v1/loan/borrow/{book_id}/{user_id}", handler)
|
||||
t.Run("book not found", func(t *testing.T) {
|
||||
bID := entity.NewID()
|
||||
uID := entity.NewID()
|
||||
bMock.EXPECT().GetBook(bID).Return(nil, domain.ErrNotFound)
|
||||
ts := httptest.NewServer(r)
|
||||
defer ts.Close()
|
||||
res, err := http.Get(fmt.Sprintf("%s/v1/loan/borrow/%s/%s", ts.URL, bID.String(), uID.String()))
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, http.StatusNotFound, res.StatusCode)
|
||||
})
|
||||
t.Run("user not found", func(t *testing.T) {
|
||||
b := entity.NewFixtureBook()
|
||||
uID := entity.NewID()
|
||||
bMock.EXPECT().GetBook(b.ID).Return(b, nil)
|
||||
uMock.EXPECT().GetUser(uID).Return(nil, domain.ErrNotFound)
|
||||
ts := httptest.NewServer(r)
|
||||
defer ts.Close()
|
||||
res, err := http.Get(fmt.Sprintf("%s/v1/loan/borrow/%s/%s", ts.URL, b.ID.String(), uID.String()))
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, http.StatusNotFound, res.StatusCode)
|
||||
})
|
||||
t.Run("success", func(t *testing.T) {
|
||||
b := entity.NewFixtureBook()
|
||||
u := entity.NewFixtureUser()
|
||||
bMock.EXPECT().GetBook(b.ID).Return(b, nil)
|
||||
uMock.EXPECT().GetUser(u.ID).Return(u, nil)
|
||||
lMock.EXPECT().Borrow(u, b).Return(nil)
|
||||
ts := httptest.NewServer(r)
|
||||
defer ts.Close()
|
||||
res, err := http.Get(fmt.Sprintf("%s/v1/loan/borrow/%s/%s", ts.URL, b.ID.String(), u.ID.String()))
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, http.StatusCreated, res.StatusCode)
|
||||
})
|
||||
}
|
||||
|
||||
func Test_returnBook(t *testing.T) {
|
||||
controller := gomock.NewController(t)
|
||||
defer controller.Finish()
|
||||
uMock := umock.NewMockUseCase(controller)
|
||||
bMock := bmock.NewMockUseCase(controller)
|
||||
lMock := lmock.NewMockUseCase(controller)
|
||||
r := mux.NewRouter()
|
||||
n := negroni.New()
|
||||
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)
|
||||
handler := returnBook(bMock, lMock)
|
||||
r.Handle("/v1/loan/return/{book_id}", handler)
|
||||
t.Run("book not found", func(t *testing.T) {
|
||||
bID := entity.NewID()
|
||||
bMock.EXPECT().GetBook(bID).Return(nil, domain.ErrNotFound)
|
||||
ts := httptest.NewServer(r)
|
||||
defer ts.Close()
|
||||
res, err := http.Get(fmt.Sprintf("%s/v1/loan/return/%s", ts.URL, bID.String()))
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, http.StatusNotFound, res.StatusCode)
|
||||
})
|
||||
t.Run("success", func(t *testing.T) {
|
||||
b := entity.NewFixtureBook()
|
||||
bMock.EXPECT().GetBook(b.ID).Return(b, nil)
|
||||
lMock.EXPECT().Return(b).Return(nil)
|
||||
ts := httptest.NewServer(r)
|
||||
defer ts.Close()
|
||||
res, err := http.Get(fmt.Sprintf("%s/v1/loan/return/%s", ts.URL, b.ID.String()))
|
||||
assert.Nil(t, err)
|
||||
assert.Equal(t, http.StatusCreated, res.StatusCode)
|
||||
})
|
||||
}
|
||||
Reference in New Issue
Block a user