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

fix: move some logic to domain entities

Browse Source
This commit is contained in:
Elton Minetto
2020-10-05 08:49:21 -03:00
parent c008dbab29
commit 098477169a
25 changed files with 493 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
domain/usecase/book/interface.go
+1 -1
View File
@@ -29,7 +29,7 @@ type UseCase interface {
GetBook(id entity.ID) (*entity.Book, error)
SearchBooks(query string) ([]*entity.Book, error)
ListBooks() ([]*entity.Book, error)
CreateBook(e *entity.Book) (entity.ID, error)
CreateBook(title string, author string, pages int, quantity int) (entity.ID, error)
UpdateBook(e *entity.Book) error
DeleteBook(id entity.ID) error
}
domain/usecase/book/mock/book.go
+6 -5
View File
@@ -5,9 +5,10 @@
package mock
import (
reflect "reflect"
entity "github.com/eminetto/clean-architecture-go-v2/domain/entity"
gomock "github.com/golang/mock/gomock"
reflect "reflect"
)
// MockReader is a mock of Reader interface
@@ -324,18 +325,18 @@ func (mr *MockUseCaseMockRecorder) ListBooks() *gomock.Call {
}
// CreateBook mocks base method
func (m *MockUseCase) CreateBook(e *entity.Book) (entity.ID, error) {
func (m *MockUseCase) CreateBook(title, author string, pages, quantity int) (entity.ID, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "CreateBook", e)
ret := m.ctrl.Call(m, "CreateBook", title, author, pages, quantity)
ret0, _ := ret[0].(entity.ID)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// CreateBook indicates an expected call of CreateBook
func (mr *MockUseCaseMockRecorder) CreateBook(e interface{}) *gomock.Call {
func (mr *MockUseCaseMockRecorder) CreateBook(title, author, pages, quantity interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateBook", reflect.TypeOf((*MockUseCase)(nil).CreateBook), e)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateBook", reflect.TypeOf((*MockUseCase)(nil).CreateBook), title, author, pages, quantity)
}
// UpdateBook mocks base method
domain/usecase/book/service.go
+15 -4
View File
@@ -22,10 +22,16 @@ func NewService(r Repository) *Service {
}
//CreateBook create a book
func (s *Service) CreateBook(e *entity.Book) (entity.ID, error) {
e.ID = entity.NewID()
e.CreatedAt = time.Now()
return s.repo.Create(e)
func (s *Service) CreateBook(title string, author string, pages int, quantity int) (entity.ID, error) {
b, err := entity.NewBook(title, author, pages, quantity)
if err != nil {
return b.ID, err
}
err = b.Validate()
if err != nil {
return b.ID, err
}
return s.repo.Create(b)
}
//GetBook get a book
@@ -76,5 +82,10 @@ func (s *Service) DeleteBook(id entity.ID) error {
//UpdateBook Update a book
func (s *Service) UpdateBook(e *entity.Book) error {
err := e.Validate()
if err != nil {
return err
}
e.UpdatedAt = time.Now()
return s.repo.Update(e)
}
domain/usecase/book/service_test.go
+22 -12
View File
@@ -2,6 +2,7 @@ package book
import (
"testing"
"time"
"github.com/eminetto/clean-architecture-go-v2/domain/entity"
@@ -12,25 +13,34 @@ import (
"github.com/stretchr/testify/assert"
)
func newFixtureBook() *entity.Book {
return &entity.Book{
Title: "I Am Ozzy",
Author: "Ozzy Osbourne",
Pages: 294,
Quantity: 1,
CreatedAt: time.Now(),
}
}
func Test_Create(t *testing.T) {
repo := book.NewInmemRepository()
m := NewService(repo)
u := entity.NewFixtureBook()
id, err := m.CreateBook(u)
u := newFixtureBook()
_, err := m.CreateBook(u.Title, u.Author, u.Pages, u.Quantity)
assert.Nil(t, err)
assert.Equal(t, u.ID, id)
assert.False(t, u.CreatedAt.IsZero())
}
func Test_SearchAndFind(t *testing.T) {
repo := book.NewInmemRepository()
m := NewService(repo)
u1 := entity.NewFixtureBook()
u2 := entity.NewFixtureBook()
u1 := newFixtureBook()
u2 := newFixtureBook()
u2.Title = "Lemmy: Biography"
uID, _ := m.CreateBook(u1)
_, _ = m.CreateBook(u2)
uID, _ := m.CreateBook(u1.Title, u1.Author, u1.Pages, u1.Quantity)
_, _ = m.CreateBook(u2.Title, u2.Author, u2.Pages, u2.Quantity)
t.Run("search", func(t *testing.T) {
c, err := m.SearchBooks("ozzy")
@@ -58,8 +68,8 @@ func Test_SearchAndFind(t *testing.T) {
func Test_Update(t *testing.T) {
repo := book.NewInmemRepository()
m := NewService(repo)
u := entity.NewFixtureBook()
id, err := m.CreateBook(u)
u := newFixtureBook()
id, err := m.CreateBook(u.Title, u.Author, u.Pages, u.Quantity)
assert.Nil(t, err)
saved, _ := m.GetBook(id)
saved.Title = "Lemmy: Biography"
@@ -72,9 +82,9 @@ func Test_Update(t *testing.T) {
func TestDelete(t *testing.T) {
repo := book.NewInmemRepository()
m := NewService(repo)
u1 := entity.NewFixtureBook()
u2 := entity.NewFixtureBook()
u2ID, _ := m.CreateBook(u2)
u1 := newFixtureBook()
u2 := newFixtureBook()
u2ID, _ := m.CreateBook(u2.Title, u2.Author, u2.Pages, u2.Quantity)
err := m.DeleteBook(u1.ID)
assert.Equal(t, domain.ErrNotFound, err)
domain/usecase/loan/mock/loan.go
+2 -1
View File
@@ -5,9 +5,10 @@
package mock
import (
reflect "reflect"
entity "github.com/eminetto/clean-architecture-go-v2/domain/entity"
gomock "github.com/golang/mock/gomock"
reflect "reflect"
)
// MockUseCase is a mock of UseCase interface
domain/usecase/loan/service.go
+21 -20
View File
@@ -34,12 +34,15 @@ func (s *Service) Borrow(u *entity.User, b *entity.Book) error {
if b.Quantity <= 0 {
return domain.ErrNotEnoughBooks
}
for _, v := range u.Books {
if v == b.ID {
return domain.ErrBookAlreadyBorrowed
}
_, err = u.GetBook(b.ID)
if err == nil {
return domain.ErrBookAlreadyBorrowed
}
err = u.AddBook(b.ID)
if err != nil {
return err
}
u.Books = append(u.Books, b.ID)
err = s.userService.UpdateUser(u)
if err != nil {
return err
@@ -66,13 +69,13 @@ func (s *Service) Return(b *entity.Book) error {
borrowed := false
var borrowedBy entity.ID
for _, u := range all {
for _, bookID := range u.Books {
if bookID == b.ID {
borrowed = true
borrowedBy = u.ID
break
}
_, err := u.GetBook(b.ID)
if err != nil {
continue
}
borrowed = true
borrowedBy = u.ID
break
}
if !borrowed {
return domain.ErrBookNotBorrowed
@@ -81,15 +84,13 @@ func (s *Service) Return(b *entity.Book) error {
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.userService.UpdateUser(u)
if err != nil {
return err
}
break
}
err = u.RemoveBook(b.ID)
if err != nil {
return err
}
err = s.userService.UpdateUser(u)
if err != nil {
return err
}
b.Quantity++
err = s.bookService.UpdateBook(b)
domain/usecase/loan/service_test.go
+48 -17
View File
@@ -19,23 +19,35 @@ func Test_Borrow(t *testing.T) {
bMock := bmock.NewMockUseCase(controller)
uc := NewService(uMock, bMock)
t.Run("user not found", func(t *testing.T) {
u := entity.NewFixtureUser()
b := entity.NewFixtureBook()
u := &entity.User{
ID: entity.NewID(),
}
b := &entity.Book{
ID: entity.NewID(),
}
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()
u := &entity.User{
ID: entity.NewID(),
}
b := &entity.Book{
ID: entity.NewID(),
}
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()
u := &entity.User{
ID: entity.NewID(),
}
b := &entity.Book{
ID: entity.NewID(),
}
b.Quantity = 0
uMock.EXPECT().GetUser(u.ID).Return(u, nil)
bMock.EXPECT().GetBook(b.ID).Return(b, nil)
@@ -43,9 +55,13 @@ func Test_Borrow(t *testing.T) {
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}
u := &entity.User{
ID: entity.NewID(),
}
b := &entity.Book{
ID: entity.NewID(),
}
u.AddBook(b.ID)
b.Quantity = 1
uMock.EXPECT().GetUser(u.ID).Return(u, nil)
bMock.EXPECT().GetBook(b.ID).Return(b, nil)
@@ -53,8 +69,13 @@ func Test_Borrow(t *testing.T) {
assert.Equal(t, domain.ErrBookAlreadyBorrowed, err)
})
t.Run("sucess", func(t *testing.T) {
u := entity.NewFixtureUser()
b := entity.NewFixtureBook()
u := &entity.User{
ID: entity.NewID(),
}
b := &entity.Book{
ID: entity.NewID(),
Quantity: 10,
}
uMock.EXPECT().GetUser(u.ID).Return(u, nil)
bMock.EXPECT().GetBook(b.ID).Return(b, nil)
uMock.EXPECT().UpdateUser(u).Return(nil)
@@ -71,23 +92,33 @@ func Test_Return(t *testing.T) {
bMock := bmock.NewMockUseCase(controller)
uc := NewService(uMock, bMock)
t.Run("book not found", func(t *testing.T) {
b := entity.NewFixtureBook()
b := &entity.Book{
ID: entity.NewID(),
}
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()
u := &entity.User{
ID: entity.NewID(),
}
b := &entity.Book{
ID: entity.NewID(),
}
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}
u := &entity.User{
ID: entity.NewID(),
}
b := &entity.Book{
ID: entity.NewID(),
}
u.AddBook(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)
domain/usecase/user/interface.go
+1 -1
View File
@@ -29,7 +29,7 @@ type UseCase interface {
GetUser(id entity.ID) (*entity.User, error)
SearchUsers(query string) ([]*entity.User, error)
ListUsers() ([]*entity.User, error)
CreateUser(e *entity.User) (entity.ID, error)
CreateUser(email, password, firstName, lastName string) (entity.ID, error)
UpdateUser(e *entity.User) error
DeleteUser(id entity.ID) error
}
domain/usecase/user/mock/user.go
+6 -5
View File
@@ -5,9 +5,10 @@
package mock
import (
reflect "reflect"
entity "github.com/eminetto/clean-architecture-go-v2/domain/entity"
gomock "github.com/golang/mock/gomock"
reflect "reflect"
)
// MockReader is a mock of Reader interface
@@ -324,18 +325,18 @@ func (mr *MockUseCaseMockRecorder) ListUsers() *gomock.Call {
}
// CreateUser mocks base method
func (m *MockUseCase) CreateUser(e *entity.User) (entity.ID, error) {
func (m *MockUseCase) CreateUser(email, password, firstName, lastName string) (entity.ID, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "CreateUser", e)
ret := m.ctrl.Call(m, "CreateUser", email, password, firstName, lastName)
ret0, _ := ret[0].(entity.ID)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// CreateUser indicates an expected call of CreateUser
func (mr *MockUseCaseMockRecorder) CreateUser(e interface{}) *gomock.Call {
func (mr *MockUseCaseMockRecorder) CreateUser(email, password, firstName, lastName interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateUser", reflect.TypeOf((*MockUseCase)(nil).CreateUser), e)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateUser", reflect.TypeOf((*MockUseCase)(nil).CreateUser), email, password, firstName, lastName)
}
// UpdateUser mocks base method
domain/usecase/user/service.go
+12 -11
View File
@@ -6,34 +6,31 @@ import (
"github.com/eminetto/clean-architecture-go-v2/domain"
"github.com/eminetto/clean-architecture-go-v2/pkg/password"
"github.com/eminetto/clean-architecture-go-v2/domain/entity"
)
//Service interface
type Service struct {
repo Repository
pwd password.Service
}
//NewService create new use case
func NewService(r Repository, pwd password.Service) *Service {
func NewService(r Repository) *Service {
return &Service{
repo: r,
pwd: pwd,
}
}
//CreateUser Create an user
func (s *Service) CreateUser(e *entity.User) (entity.ID, error) {
e.ID = entity.NewID()
e.CreatedAt = time.Now()
pwd, err := s.pwd.Generate(e.Password)
func (s *Service) CreateUser(email, password, firstName, lastName string) (entity.ID, error) {
e, err := entity.NewUser(email, password, firstName, lastName)
if err != nil {
return e.ID, err
return e.ID, domain.ErrInvalidEntity
}
err = e.Validate()
if err != nil {
return e.ID, domain.ErrInvalidEntity
}
e.Password = pwd
return s.repo.Create(e)
}
@@ -69,6 +66,10 @@ func (s *Service) DeleteUser(id entity.ID) error {
//UpdateUser Update an user
func (s *Service) UpdateUser(e *entity.User) error {
err := e.Validate()
if err != nil {
return domain.ErrInvalidEntity
}
e.UpdatedAt = time.Now()
return s.repo.Update(e)
}
domain/usecase/user/service_test.go
+34 -23
View File
@@ -2,37 +2,46 @@ package user
import (
"testing"
"time"
"github.com/eminetto/clean-architecture-go-v2/infra/repository/user"
"github.com/eminetto/clean-architecture-go-v2/pkg/password"
"github.com/eminetto/clean-architecture-go-v2/domain"
"github.com/eminetto/clean-architecture-go-v2/domain/entity"
"github.com/stretchr/testify/assert"
)
func newFixtureUser() *entity.User {
return &entity.User{
ID: entity.NewID(),
Email: "[email protected]",
Password: "123456",
FirstName: "Ozzy",
LastName: "Osbourne",
CreatedAt: time.Now(),
}
}
func Test_Create(t *testing.T) {
repo := user.NewInmemRepository()
m := NewService(repo, password.NewFakeService())
u := entity.NewFixtureUser()
id, err := m.CreateUser(u)
m := NewService(repo)
u := newFixtureUser()
_, err := m.CreateUser(u.Email, u.Password, u.FirstName, u.LastName)
assert.Nil(t, err)
assert.Equal(t, u.ID, id)
assert.False(t, u.CreatedAt.IsZero())
assert.True(t, u.UpdatedAt.IsZero())
}
func Test_SearchAndFind(t *testing.T) {
repo := user.NewInmemRepository()
m := NewService(repo, password.NewFakeService())
u1 := entity.NewFixtureUser()
u2 := entity.NewFixtureUser()
m := NewService(repo)
u1 := newFixtureUser()
u2 := newFixtureUser()
u2.FirstName = "Lemmy"
uID, _ := m.CreateUser(u1)
_, _ = m.CreateUser(u2)
uID, _ := m.CreateUser(u1.Email, u1.Password, u1.FirstName, u1.LastName)
_, _ = m.CreateUser(u2.Email, u2.Password, u2.FirstName, u2.LastName)
t.Run("search", func(t *testing.T) {
c, err := m.SearchUsers("ozzy")
@@ -59,9 +68,9 @@ func Test_SearchAndFind(t *testing.T) {
func Test_Update(t *testing.T) {
repo := user.NewInmemRepository()
m := NewService(repo, password.NewFakeService())
u := entity.NewFixtureUser()
id, err := m.CreateUser(u)
m := NewService(repo)
u := newFixtureUser()
id, err := m.CreateUser(u.Email, u.Password, u.FirstName, u.LastName)
assert.Nil(t, err)
saved, _ := m.GetUser(id)
saved.FirstName = "Dio"
@@ -70,16 +79,16 @@ func Test_Update(t *testing.T) {
updated, err := m.GetUser(id)
assert.Nil(t, err)
assert.Equal(t, "Dio", updated.FirstName)
assert.False(t, u.UpdatedAt.IsZero())
assert.False(t, updated.UpdatedAt.IsZero())
assert.Equal(t, 1, len(updated.Books))
}
func TestDelete(t *testing.T) {
repo := user.NewInmemRepository()
m := NewService(repo, password.NewFakeService())
u1 := entity.NewFixtureUser()
u2 := entity.NewFixtureUser()
u2ID, _ := m.CreateUser(u2)
m := NewService(repo)
u1 := newFixtureUser()
u2 := newFixtureUser()
u2ID, _ := m.CreateUser(u2.Email, u2.Password, u2.FirstName, u2.LastName)
err := m.DeleteUser(u1.ID)
assert.Equal(t, domain.ErrNotFound, err)
@@ -89,9 +98,11 @@ func TestDelete(t *testing.T) {
_, err = m.GetUser(u2ID)
assert.Equal(t, domain.ErrNotFound, err)
u3 := entity.NewFixtureUser()
u3.Books = []entity.ID{entity.NewID()}
_, _ = m.CreateUser(u3)
err = m.DeleteUser(u3.ID)
u3 := newFixtureUser()
id, _ := m.CreateUser(u3.Email, u3.Password, u3.FirstName, u3.LastName)
saved, _ := m.GetUser(id)
saved.Books = []entity.ID{entity.NewID()}
_ = m.UpdateUser(saved)
err = m.DeleteUser(id)
assert.Equal(t, domain.ErrCannotBeDeleted, err)
}