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

feat: improvements in structures

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
domain/usecase/loan/interface.go
+3 -4
View File
@@ -1,12 +1,11 @@
package loan
import (
"github.com/eminetto/clean-architecture-go-v2/domain/entity/book"
"github.com/eminetto/clean-architecture-go-v2/domain/entity/user"
"github.com/eminetto/clean-architecture-go-v2/domain/entity"
)
//UseCase use case interface
type UseCase interface {
Borrow(u *user.User, b *book.Book) error
Return(b *book.Book) error
Borrow(u *entity.User, b *entity.Book) error
Return(b *entity.Book) error
}
domain/usecase/loan/mock/loan.go
+5 -5
View File
@@ -5,10 +5,10 @@
package mock
import (
book "github.com/eminetto/clean-architecture-go-v2/domain/entity/book"
user "github.com/eminetto/clean-architecture-go-v2/domain/entity/user"
gomock "github.com/golang/mock/gomock"
reflect "reflect"
entity "github.com/eminetto/clean-architecture-go-v2/domain/entity"
gomock "github.com/golang/mock/gomock"
)
// MockUseCase is a mock of UseCase interface
@@ -35,7 +35,7 @@ func (m *MockUseCase) EXPECT() *MockUseCaseMockRecorder {
}
// Borrow mocks base method
func (m *MockUseCase) Borrow(u *user.User, b *book.Book) error {
func (m *MockUseCase) Borrow(u *entity.User, b *entity.Book) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Borrow", u, b)
ret0, _ := ret[0].(error)
@@ -49,7 +49,7 @@ func (mr *MockUseCaseMockRecorder) Borrow(u, b interface{}) *gomock.Call {
}
// Return mocks base method
func (m *MockUseCase) Return(b *book.Book) error {
func (m *MockUseCase) Return(b *entity.Book) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "Return", b)
ret0, _ := ret[0].(error)
domain/usecase/loan/usecase.go → domain/usecase/loan/service.go
+22 -21
View File
@@ -3,30 +3,31 @@ package loan
import (
"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/eminetto/clean-architecture-go-v2/domain/entity/user"
"github.com/eminetto/clean-architecture-go-v2/domain/usecase/book"
"github.com/eminetto/clean-architecture-go-v2/domain/usecase/user"
)
type usecase struct {
uManager user.Manager
bManager book.Manager
//Service loan usecase
type Service struct {
userService user.UseCase
bookService book.UseCase
}
//NewUseCase create new use case
func NewUseCase(u user.Manager, b book.Manager) *usecase {
return &usecase{
uManager: u,
bManager: b,
//NewService create new use case
func NewService(u user.UseCase, b book.UseCase) *Service {
return &Service{
userService: u,
bookService: b,
}
}
//Borrow borrow a book to an user
func (s *usecase) Borrow(u *user.User, b *book.Book) error {
u, err := s.uManager.Get(u.ID)
func (s *Service) Borrow(u *entity.User, b *entity.Book) error {
u, err := s.userService.GetUser(u.ID)
if err != nil {
return err
}
b, err = s.bManager.Get(b.ID)
b, err = s.bookService.GetBook(b.ID)
if err != nil {
return err
}
@@ -39,12 +40,12 @@ func (s *usecase) Borrow(u *user.User, b *book.Book) error {
}
}
u.Books = append(u.Books, b.ID)
err = s.uManager.Update(u)
err = s.userService.UpdateUser(u)
if err != nil {
return err
}
b.Quantity--
err = s.bManager.Update(b)
err = s.bookService.UpdateBook(b)
if err != nil {
return err
}
@@ -52,13 +53,13 @@ func (s *usecase) Borrow(u *user.User, b *book.Book) error {
}
//Return return a book
func (s *usecase) Return(b *book.Book) error {
b, err := s.bManager.Get(b.ID)
func (s *Service) Return(b *entity.Book) error {
b, err := s.bookService.GetBook(b.ID)
if err != nil {
return err
}
all, err := s.uManager.List()
all, err := s.userService.ListUsers()
if err != nil {
return err
}
@@ -76,14 +77,14 @@ func (s *usecase) Return(b *book.Book) error {
if !borrowed {
return domain.ErrBookNotBorrowed
}
u, err := s.uManager.Get(borrowedBy)
u, err := s.userService.GetUser(borrowedBy)
if err != nil {
return err
}
for i, j := range u.Books {
if j == b.ID {
u.Books = append(u.Books[:i], u.Books[i+1:]...)
err = s.uManager.Update(u)
err = s.userService.UpdateUser(u)
if err != nil {
return err
}
@@ -91,7 +92,7 @@ func (s *usecase) Return(b *book.Book) error {
}
}
b.Quantity++
err = s.bManager.Update(b)
err = s.bookService.UpdateBook(b)
if err != nil {
return err
}
domain/usecase/loan/service_test.go
+99
View File
@@ -0,0 +1,99 @@
package loan
import (
"testing"
"github.com/eminetto/clean-architecture-go-v2/domain/entity"
"github.com/eminetto/clean-architecture-go-v2/domain"
bmock "github.com/eminetto/clean-architecture-go-v2/domain/usecase/book/mock"
umock "github.com/eminetto/clean-architecture-go-v2/domain/usecase/user/mock"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"
)
func Test_Borrow(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
uMock := umock.NewMockUseCase(controller)
bMock := bmock.NewMockUseCase(controller)
uc := NewService(uMock, bMock)
t.Run("user not found", func(t *testing.T) {
u := entity.NewFixtureUser()
b := entity.NewFixtureBook()
uMock.EXPECT().GetUser(u.ID).Return(nil, domain.ErrNotFound)
err := uc.Borrow(u, b)
assert.Equal(t, domain.ErrNotFound, err)
})
t.Run("book not found", func(t *testing.T) {
u := entity.NewFixtureUser()
b := entity.NewFixtureBook()
uMock.EXPECT().GetUser(u.ID).Return(u, nil)
bMock.EXPECT().GetBook(b.ID).Return(nil, domain.ErrNotFound)
err := uc.Borrow(u, b)
assert.Equal(t, domain.ErrNotFound, err)
})
t.Run("not enough books to borrow", func(t *testing.T) {
u := entity.NewFixtureUser()
b := entity.NewFixtureBook()
b.Quantity = 0
uMock.EXPECT().GetUser(u.ID).Return(u, nil)
bMock.EXPECT().GetBook(b.ID).Return(b, nil)
err := uc.Borrow(u, b)
assert.Equal(t, domain.ErrNotEnoughBooks, err)
})
t.Run("book already borrowed", func(t *testing.T) {
u := entity.NewFixtureUser()
b := entity.NewFixtureBook()
u.Books = []entity.ID{b.ID}
b.Quantity = 1
uMock.EXPECT().GetUser(u.ID).Return(u, nil)
bMock.EXPECT().GetBook(b.ID).Return(b, nil)
err := uc.Borrow(u, b)
assert.Equal(t, domain.ErrBookAlreadyBorrowed, err)
})
t.Run("sucess", func(t *testing.T) {
u := entity.NewFixtureUser()
b := entity.NewFixtureBook()
uMock.EXPECT().GetUser(u.ID).Return(u, nil)
bMock.EXPECT().GetBook(b.ID).Return(b, nil)
uMock.EXPECT().UpdateUser(u).Return(nil)
bMock.EXPECT().UpdateBook(b).Return(nil)
err := uc.Borrow(u, b)
assert.Nil(t, err)
})
}
func Test_Return(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
uMock := umock.NewMockUseCase(controller)
bMock := bmock.NewMockUseCase(controller)
uc := NewService(uMock, bMock)
t.Run("book not found", func(t *testing.T) {
b := entity.NewFixtureBook()
bMock.EXPECT().GetBook(b.ID).Return(nil, domain.ErrNotFound)
err := uc.Return(b)
assert.Equal(t, domain.ErrNotFound, err)
})
t.Run("book not borrowed", func(t *testing.T) {
u := entity.NewFixtureUser()
b := entity.NewFixtureBook()
bMock.EXPECT().GetBook(b.ID).Return(b, nil)
uMock.EXPECT().ListUsers().Return([]*entity.User{u}, nil)
err := uc.Return(b)
assert.Equal(t, domain.ErrBookNotBorrowed, err)
})
t.Run("success", func(t *testing.T) {
u := entity.NewFixtureUser()
b := entity.NewFixtureBook()
u.Books = []entity.ID{b.ID}
bMock.EXPECT().GetBook(b.ID).Return(b, nil)
uMock.EXPECT().GetUser(u.ID).Return(u, nil)
uMock.EXPECT().ListUsers().Return([]*entity.User{u}, nil)
uMock.EXPECT().UpdateUser(u).Return(nil)
bMock.EXPECT().UpdateBook(b).Return(nil)
err := uc.Return(b)
assert.Nil(t, err)
})
}
domain/usecase/loan/usecase_test.go
-101
View File
@@ -1,101 +0,0 @@
package loan
import (
"testing"
"github.com/eminetto/clean-architecture-go-v2/domain/entity"
"github.com/eminetto/clean-architecture-go-v2/domain"
"github.com/eminetto/clean-architecture-go-v2/domain/entity/book"
bmock "github.com/eminetto/clean-architecture-go-v2/domain/entity/book/mock"
"github.com/eminetto/clean-architecture-go-v2/domain/entity/user"
umock "github.com/eminetto/clean-architecture-go-v2/domain/entity/user/mock"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"
)
func Test_Borrow(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
uMock := umock.NewMockManager(controller)
bMock := bmock.NewMockManager(controller)
uc := NewUseCase(uMock, bMock)
t.Run("user not found", func(t *testing.T) {
u := user.NewFixtureUser()
b := book.NewFixtureBook()
uMock.EXPECT().Get(u.ID).Return(nil, domain.ErrNotFound)
err := uc.Borrow(u, b)
assert.Equal(t, domain.ErrNotFound, err)
})
t.Run("book not found", func(t *testing.T) {
u := user.NewFixtureUser()
b := book.NewFixtureBook()
uMock.EXPECT().Get(u.ID).Return(u, nil)
bMock.EXPECT().Get(b.ID).Return(nil, domain.ErrNotFound)
err := uc.Borrow(u, b)
assert.Equal(t, domain.ErrNotFound, err)
})
t.Run("not enough books to borrow", func(t *testing.T) {
u := user.NewFixtureUser()
b := book.NewFixtureBook()
b.Quantity = 0
uMock.EXPECT().Get(u.ID).Return(u, nil)
bMock.EXPECT().Get(b.ID).Return(b, nil)
err := uc.Borrow(u, b)
assert.Equal(t, domain.ErrNotEnoughBooks, err)
})
t.Run("book already borrowed", func(t *testing.T) {
u := user.NewFixtureUser()
b := book.NewFixtureBook()
u.Books = []entity.ID{b.ID}
b.Quantity = 1
uMock.EXPECT().Get(u.ID).Return(u, nil)
bMock.EXPECT().Get(b.ID).Return(b, nil)
err := uc.Borrow(u, b)
assert.Equal(t, domain.ErrBookAlreadyBorrowed, err)
})
t.Run("sucess", func(t *testing.T) {
u := user.NewFixtureUser()
b := book.NewFixtureBook()
uMock.EXPECT().Get(u.ID).Return(u, nil)
bMock.EXPECT().Get(b.ID).Return(b, nil)
uMock.EXPECT().Update(u).Return(nil)
bMock.EXPECT().Update(b).Return(nil)
err := uc.Borrow(u, b)
assert.Nil(t, err)
})
}
func Test_Return(t *testing.T) {
controller := gomock.NewController(t)
defer controller.Finish()
uMock := umock.NewMockManager(controller)
bMock := bmock.NewMockManager(controller)
uc := NewUseCase(uMock, bMock)
t.Run("book not found", func(t *testing.T) {
b := book.NewFixtureBook()
bMock.EXPECT().Get(b.ID).Return(nil, domain.ErrNotFound)
err := uc.Return(b)
assert.Equal(t, domain.ErrNotFound, err)
})
t.Run("book not borrowed", func(t *testing.T) {
u := user.NewFixtureUser()
b := book.NewFixtureBook()
bMock.EXPECT().Get(b.ID).Return(b, nil)
uMock.EXPECT().List().Return([]*user.User{u}, nil)
err := uc.Return(b)
assert.Equal(t, domain.ErrBookNotBorrowed, err)
})
t.Run("success", func(t *testing.T) {
u := user.NewFixtureUser()
b := book.NewFixtureBook()
u.Books = []entity.ID{b.ID}
bMock.EXPECT().Get(b.ID).Return(b, nil)
uMock.EXPECT().Get(u.ID).Return(u, nil)
uMock.EXPECT().List().Return([]*user.User{u}, nil)
uMock.EXPECT().Update(u).Return(nil)
bMock.EXPECT().Update(b).Return(nil)
err := uc.Return(b)
assert.Nil(t, err)
})
}