feat: improvements in structures

This commit is contained in:
Elton Minetto
2020-09-29 21:51:18 -03:00
parent 201f7607e1
commit 2c7f87e73a
41 changed files with 821 additions and 1265 deletions
+17 -21
View File
@@ -6,17 +6,13 @@ import (
"net/http/httptest"
"testing"
"github.com/eminetto/clean-architecture-go-v2/domain/entity/user"
"github.com/eminetto/clean-architecture-go-v2/domain/entity/book"
"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/entity/book/mock"
umock "github.com/eminetto/clean-architecture-go-v2/domain/entity/user/mock"
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"
@@ -25,8 +21,8 @@ import (
func Test_borrowBook(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
uMock := umock.NewMockManager(controller)
bMock := bmock.NewMockManager(controller)
uMock := umock.NewMockUseCase(controller)
bMock := bmock.NewMockUseCase(controller)
lMock := lmock.NewMockUseCase(controller)
r := mux.NewRouter()
n := negroni.New()
@@ -39,7 +35,7 @@ func Test_borrowBook(t *testing.T) {
t.Run("book not found", func(t *testing.T) {
bID := entity.NewID()
uID := entity.NewID()
bMock.EXPECT().Get(bID).Return(nil, domain.ErrNotFound)
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()))
@@ -47,10 +43,10 @@ func Test_borrowBook(t *testing.T) {
assert.Equal(t, http.StatusNotFound, res.StatusCode)
})
t.Run("user not found", func(t *testing.T) {
b := book.NewFixtureBook()
b := entity.NewFixtureBook()
uID := entity.NewID()
bMock.EXPECT().Get(b.ID).Return(b, nil)
uMock.EXPECT().Get(uID).Return(nil, domain.ErrNotFound)
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()))
@@ -58,10 +54,10 @@ func Test_borrowBook(t *testing.T) {
assert.Equal(t, http.StatusNotFound, res.StatusCode)
})
t.Run("success", func(t *testing.T) {
b := book.NewFixtureBook()
u := user.NewFixtureUser()
bMock.EXPECT().Get(b.ID).Return(b, nil)
uMock.EXPECT().Get(u.ID).Return(u, nil)
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()
@@ -74,8 +70,8 @@ func Test_borrowBook(t *testing.T) {
func Test_returnBook(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
uMock := umock.NewMockManager(controller)
bMock := bmock.NewMockManager(controller)
uMock := umock.NewMockUseCase(controller)
bMock := bmock.NewMockUseCase(controller)
lMock := lmock.NewMockUseCase(controller)
r := mux.NewRouter()
n := negroni.New()
@@ -87,7 +83,7 @@ func Test_returnBook(t *testing.T) {
r.Handle("/v1/loan/return/{book_id}", handler)
t.Run("book not found", func(t *testing.T) {
bID := entity.NewID()
bMock.EXPECT().Get(bID).Return(nil, domain.ErrNotFound)
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()))
@@ -95,8 +91,8 @@ func Test_returnBook(t *testing.T) {
assert.Equal(t, http.StatusNotFound, res.StatusCode)
})
t.Run("success", func(t *testing.T) {
b := book.NewFixtureBook()
bMock.EXPECT().Get(b.ID).Return(b, nil)
b := entity.NewFixtureBook()
bMock.EXPECT().GetBook(b.ID).Return(b, nil)
lMock.EXPECT().Return(b).Return(nil)
ts := httptest.NewServer(r)
defer ts.Close()