diff --git a/api/handler/book/book.go b/api/handler/book/book.go index cdf181a..27577fe 100644 --- a/api/handler/book/book.go +++ b/api/handler/book/book.go @@ -4,7 +4,6 @@ import ( "encoding/json" "log" "net/http" - "time" "github.com/eminetto/clean-architecture-go-v2/domain/usecase/book" @@ -74,27 +73,18 @@ func createBook(service book.UseCase) http.Handler { w.Write([]byte(errorMessage)) return } - b := &entity.Book{ - ID: entity.NewID(), - Title: input.Title, - Author: input.Author, - Pages: input.Pages, - Quantity: input.Quantity, - CreatedAt: time.Now(), - } - b.ID, err = service.CreateBook(b) + id, err := service.CreateBook(input.Title, input.Author, input.Pages, input.Quantity) if err != nil { - log.Println(err.Error()) w.WriteHeader(http.StatusInternalServerError) w.Write([]byte(errorMessage)) return } toJ := &presenter.Book{ - ID: b.ID, - Title: b.Title, - Author: b.Author, - Pages: b.Pages, - Quantity: b.Quantity, + ID: id, + Title: input.Title, + Author: input.Author, + Pages: input.Pages, + Quantity: input.Quantity, } w.WriteHeader(http.StatusCreated) diff --git a/api/handler/book/book_test.go b/api/handler/book/book_test.go index 5be49f7..67cd612 100644 --- a/api/handler/book/book_test.go +++ b/api/handler/book/book_test.go @@ -28,7 +28,9 @@ func Test_listBooks(t *testing.T) { path, err := r.GetRoute("listBooks").GetPathTemplate() assert.Nil(t, err) assert.Equal(t, "/v1/book", path) - b := entity.NewFixtureBook() + b := &entity.Book{ + ID: entity.NewID(), + } manager.EXPECT(). ListBooks(). Return([]*entity.Book{b}, nil) @@ -57,7 +59,9 @@ func Test_listBooks_Search(t *testing.T) { controller := gomock.NewController(t) defer controller.Finish() manager := mock.NewMockUseCase(controller) - b := entity.NewFixtureBook() + b := &entity.Book{ + ID: entity.NewID(), + } manager.EXPECT(). SearchBooks("ozzy"). Return([]*entity.Book{b}, nil) @@ -80,7 +84,7 @@ func Test_createBook(t *testing.T) { assert.Equal(t, "/v1/book", path) manager.EXPECT(). - CreateBook(gomock.Any()). + CreateBook(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()). Return(entity.NewID(), nil) h := createBook(manager) @@ -110,7 +114,9 @@ func Test_getBook(t *testing.T) { path, err := r.GetRoute("getBook").GetPathTemplate() assert.Nil(t, err) assert.Equal(t, "/v1/book/{id}", path) - b := entity.NewFixtureBook() + b := &entity.Book{ + ID: entity.NewID(), + } manager.EXPECT(). GetBook(b.ID). Return(b, nil) @@ -137,7 +143,9 @@ func Test_deleteBook(t *testing.T) { path, err := r.GetRoute("deleteBook").GetPathTemplate() assert.Nil(t, err) assert.Equal(t, "/v1/book/{id}", path) - b := entity.NewFixtureBook() + b := &entity.Book{ + ID: entity.NewID(), + } manager.EXPECT().DeleteBook(b.ID).Return(nil) handler := deleteBook(manager) req, _ := http.NewRequest("DELETE", "/v1/bookmark/"+b.ID.String(), nil) diff --git a/api/handler/loan/loan_test.go b/api/handler/loan/loan_test.go index b1d7408..881d2b9 100644 --- a/api/handler/loan/loan_test.go +++ b/api/handler/loan/loan_test.go @@ -43,7 +43,9 @@ func Test_borrowBook(t *testing.T) { assert.Equal(t, http.StatusNotFound, res.StatusCode) }) t.Run("user not found", func(t *testing.T) { - b := entity.NewFixtureBook() + b := &entity.Book{ + ID: entity.NewID(), + } uID := entity.NewID() bMock.EXPECT().GetBook(b.ID).Return(b, nil) uMock.EXPECT().GetUser(uID).Return(nil, domain.ErrNotFound) @@ -54,8 +56,12 @@ func Test_borrowBook(t *testing.T) { assert.Equal(t, http.StatusNotFound, res.StatusCode) }) t.Run("success", func(t *testing.T) { - b := entity.NewFixtureBook() - u := entity.NewFixtureUser() + b := &entity.Book{ + ID: entity.NewID(), + } + u := &entity.User{ + ID: entity.NewID(), + } bMock.EXPECT().GetBook(b.ID).Return(b, nil) uMock.EXPECT().GetUser(u.ID).Return(u, nil) lMock.EXPECT().Borrow(u, b).Return(nil) @@ -91,7 +97,9 @@ func Test_returnBook(t *testing.T) { assert.Equal(t, http.StatusNotFound, res.StatusCode) }) t.Run("success", func(t *testing.T) { - b := entity.NewFixtureBook() + b := &entity.Book{ + ID: entity.NewID(), + } bMock.EXPECT().GetBook(b.ID).Return(b, nil) lMock.EXPECT().Return(b).Return(nil) ts := httptest.NewServer(r) diff --git a/api/handler/user/user.go b/api/handler/user/user.go index 1472e94..1fb5d2c 100644 --- a/api/handler/user/user.go +++ b/api/handler/user/user.go @@ -4,7 +4,6 @@ import ( "encoding/json" "log" "net/http" - "time" "github.com/eminetto/clean-architecture-go-v2/domain/usecase/user" @@ -74,16 +73,7 @@ func createUser(service user.UseCase) http.Handler { w.Write([]byte(errorMessage)) return } - //TODO: validate data ;) - u := &entity.User{ - ID: entity.NewID(), - Email: input.Email, - Password: input.Password, - FirstName: input.FirstName, - LastName: input.LastName, - CreatedAt: time.Now(), - } - u.ID, err = service.CreateUser(u) + id, err := service.CreateUser(input.Email, input.Password, input.FirstName, input.LastName) if err != nil { log.Println(err.Error()) w.WriteHeader(http.StatusInternalServerError) @@ -91,15 +81,14 @@ func createUser(service user.UseCase) http.Handler { return } toJ := &presenter.User{ - ID: u.ID, - Email: u.Email, - FirstName: u.FirstName, - LastName: u.LastName, + ID: id, + Email: input.Email, + FirstName: input.FirstName, + LastName: input.LastName, } w.WriteHeader(http.StatusCreated) if err := json.NewEncoder(w).Encode(toJ); err != nil { - log.Println(err.Error()) w.WriteHeader(http.StatusInternalServerError) w.Write([]byte(errorMessage)) return diff --git a/api/handler/user/user_test.go b/api/handler/user/user_test.go index 9f60833..0e39c4c 100644 --- a/api/handler/user/user_test.go +++ b/api/handler/user/user_test.go @@ -28,7 +28,9 @@ func Test_listUsers(t *testing.T) { path, err := r.GetRoute("listUsers").GetPathTemplate() assert.Nil(t, err) assert.Equal(t, "/v1/user", path) - u := entity.NewFixtureUser() + u := &entity.User{ + ID: entity.NewID(), + } m.EXPECT(). ListUsers(). Return([]*entity.User{u}, nil) @@ -57,7 +59,9 @@ func Test_listUsers_Search(t *testing.T) { controller := gomock.NewController(t) defer controller.Finish() m := mock.NewMockUseCase(controller) - u := entity.NewFixtureUser() + u := &entity.User{ + ID: entity.NewID(), + } m.EXPECT(). SearchUsers("ozzy"). Return([]*entity.User{u}, nil) @@ -80,7 +84,7 @@ func Test_createUser(t *testing.T) { assert.Equal(t, "/v1/user", path) m.EXPECT(). - CreateUser(gomock.Any()). + CreateUser(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()). Return(entity.NewID(), nil) h := createUser(m) @@ -111,7 +115,9 @@ func Test_getUser(t *testing.T) { path, err := r.GetRoute("getUser").GetPathTemplate() assert.Nil(t, err) assert.Equal(t, "/v1/user/{id}", path) - u := entity.NewFixtureUser() + u := &entity.User{ + ID: entity.NewID(), + } m.EXPECT(). GetUser(u.ID). Return(u, nil) @@ -138,7 +144,9 @@ func Test_deleteUser(t *testing.T) { path, err := r.GetRoute("deleteUser").GetPathTemplate() assert.Nil(t, err) assert.Equal(t, "/v1/user/{id}", path) - u := entity.NewFixtureUser() + u := &entity.User{ + ID: entity.NewID(), + } m.EXPECT().DeleteUser(u.ID).Return(nil) handler := deleteUser(m) req, _ := http.NewRequest("DELETE", "/v1/user/"+u.ID.String(), nil) diff --git a/api/main.go b/api/main.go index cb11ac2..d76195c 100644 --- a/api/main.go +++ b/api/main.go @@ -14,8 +14,6 @@ import ( brepo "github.com/eminetto/clean-architecture-go-v2/infra/repository/book" urepo "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/usecase/loan" "github.com/prometheus/client_golang/prometheus/promhttp" @@ -45,7 +43,7 @@ func main() { bookService := book.NewService(bookRepo) userRepo := urepo.NewMySQLRepoRepository(db) - userService := user.NewService(userRepo, password.NewService()) + userService := user.NewService(userRepo) loanUseCase := loan.NewService(userService, bookService) diff --git a/cmd/main.go b/cmd/main.go index cddf8c5..eabc3d9 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -42,8 +42,8 @@ func main() { } defer db.Close() repo := repo.NewMySQLRepository(db) - manager := book.NewService(repo) - all, err := manager.SearchBooks(query) + service := book.NewService(repo) + all, err := service.SearchBooks(query) if err != nil { log.Fatal(err) } diff --git a/domain/entity/book.go b/domain/entity/book.go index 9a5fc0c..f1abac2 100644 --- a/domain/entity/book.go +++ b/domain/entity/book.go @@ -2,6 +2,8 @@ package entity import ( "time" + + "github.com/eminetto/clean-architecture-go-v2/domain" ) //Book data @@ -14,3 +16,24 @@ type Book struct { CreatedAt time.Time UpdatedAt time.Time } + +//NewBook create a new book +func NewBook(title string, author string, pages int, quantity int) (*Book, error) { + b := &Book{ + ID: NewID(), + Title: title, + Author: author, + Pages: pages, + Quantity: quantity, + CreatedAt: time.Now(), + } + return b, nil +} + +//Validate validate book +func (b *Book) Validate() error { + if b.Title == "" || b.Author == "" || b.Pages <= 0 { + return domain.ErrInvalidEntity + } + return nil +} diff --git a/domain/entity/book_fixture.go b/domain/entity/book_fixture.go deleted file mode 100644 index ce7fe1d..0000000 --- a/domain/entity/book_fixture.go +++ /dev/null @@ -1,16 +0,0 @@ -package entity - -import ( - "time" -) - -func NewFixtureBook() *Book { - return &Book{ - ID: NewID(), - Title: "I Am Ozzy", - Author: "Ozzy Osbourne", - Pages: 294, - Quantity: 1, - CreatedAt: time.Now(), - } -} diff --git a/domain/entity/book_test.go b/domain/entity/book_test.go new file mode 100644 index 0000000..9e6e2ea --- /dev/null +++ b/domain/entity/book_test.go @@ -0,0 +1,71 @@ +package entity_test + +import ( + "testing" + + "github.com/eminetto/clean-architecture-go-v2/domain" + "github.com/eminetto/clean-architecture-go-v2/domain/entity" + "github.com/stretchr/testify/assert" +) + +func TestNewBook(t *testing.T) { + b, err := entity.NewBook("American Gods", "Neil Gaiman", 100, 0) + assert.Nil(t, err) + assert.Equal(t, b.Title, "American Gods") + assert.NotNil(t, b.ID) +} + +func TestBookValidate(t *testing.T) { + type test struct { + title string + author string + pages int + quantity int + want error + } + + tests := []test{ + { + title: "American Gods", + author: "Neil Gaiman", + pages: 100, + quantity: 1, + want: nil, + }, + { + title: "American Gods", + author: "Neil Gaiman", + pages: 100, + quantity: 0, + want: nil, + }, + { + title: "", + author: "Neil Gaiman", + pages: 100, + quantity: 1, + want: domain.ErrInvalidEntity, + }, + { + title: "American Gods", + author: "", + pages: 100, + quantity: 1, + want: domain.ErrInvalidEntity, + }, + { + title: "American Gods", + author: "Neil Gaiman", + pages: 0, + quantity: 1, + want: domain.ErrInvalidEntity, + }, + } + for _, tc := range tests { + + b, err := entity.NewBook(tc.title, tc.author, tc.pages, tc.quantity) + err = b.Validate() + assert.Equal(t, err, tc.want) + } + +} diff --git a/domain/entity/user.go b/domain/entity/user.go index 944debf..2401864 100644 --- a/domain/entity/user.go +++ b/domain/entity/user.go @@ -2,6 +2,9 @@ package entity import ( "time" + + "github.com/eminetto/clean-architecture-go-v2/domain" + "golang.org/x/crypto/bcrypt" ) //User data @@ -15,3 +18,67 @@ type User struct { UpdatedAt time.Time Books []ID } + +func NewUser(email, password, firstName, lastName string) (*User, error) { + e := &User{ + ID: NewID(), + Email: email, + FirstName: firstName, + LastName: lastName, + CreatedAt: time.Now(), + } + pwd, err := generatePassword(password) + if err != nil { + return nil, err + } + e.Password = pwd + return e, nil +} + +func (u *User) AddBook(id ID) error { + u.Books = append(u.Books, id) + return nil +} + +func (u *User) RemoveBook(id ID) error { + for i, j := range u.Books { + if j == id { + u.Books = append(u.Books[:i], u.Books[i+1:]...) + return nil + } + } + return domain.ErrNotFound +} + +func (u *User) GetBook(id ID) (ID, error) { + for _, v := range u.Books { + if v == id { + return id, nil + } + } + return id, domain.ErrNotFound +} + +func (u *User) Validate() error { + if u.Email == "" || u.FirstName == "" || u.LastName == "" || u.Password == "" { + return domain.ErrInvalidEntity + } + + return nil +} + +func (u *User) ValidatePassword(p string) error { + err := bcrypt.CompareHashAndPassword([]byte(u.Password), []byte(p)) + if err != nil { + return err + } + return nil +} + +func generatePassword(raw string) (string, error) { + hash, err := bcrypt.GenerateFromPassword([]byte(raw), 10) + if err != nil { + return "", err + } + return string(hash), nil +} diff --git a/domain/entity/user_fixture.go b/domain/entity/user_fixture.go deleted file mode 100644 index d83f996..0000000 --- a/domain/entity/user_fixture.go +++ /dev/null @@ -1,16 +0,0 @@ -package entity - -import ( - "time" -) - -func NewFixtureUser() *User { - return &User{ - ID: NewID(), - Email: "ozzy@metalgods.net", - Password: "123456", - FirstName: "Ozzy", - LastName: "Osbourne", - CreatedAt: time.Now(), - } -} diff --git a/domain/entity/user_test.go b/domain/entity/user_test.go new file mode 100644 index 0000000..86da9a9 --- /dev/null +++ b/domain/entity/user_test.go @@ -0,0 +1,109 @@ +package entity_test + +import ( + "testing" + + "github.com/eminetto/clean-architecture-go-v2/domain" + "github.com/eminetto/clean-architecture-go-v2/domain/entity" + "github.com/stretchr/testify/assert" +) + +func TestNewUser(t *testing.T) { + u, err := entity.NewUser("sjobs@apple.com", "new_password", "Steve", "Jobs") + assert.Nil(t, err) + assert.Equal(t, u.FirstName, "Steve") + assert.NotNil(t, u.ID) + assert.NotEqual(t, u.Password, "new_password") +} + +func TestValidatePassword(t *testing.T) { + u, _ := entity.NewUser("sjobs@apple.com", "new_password", "Steve", "Jobs") + err := u.ValidatePassword("new_password") + assert.Nil(t, err) + err = u.ValidatePassword("wrong_password") + assert.NotNil(t, err) + +} + +func TestAddBook(t *testing.T) { + u, _ := entity.NewUser("sjobs@apple.com", "new_password", "Steve", "Jobs") + err := u.AddBook(entity.NewID()) + assert.Nil(t, err) + assert.Equal(t, 1, len(u.Books)) +} + +func TestRemoveBook(t *testing.T) { + u, _ := entity.NewUser("sjobs@apple.com", "new_password", "Steve", "Jobs") + err := u.RemoveBook(entity.NewID()) + assert.Equal(t, domain.ErrNotFound, err) + bID := entity.NewID() + _ = u.AddBook(bID) + err = u.RemoveBook(bID) + assert.Nil(t, err) +} + +func TestGetBook(t *testing.T) { + u, _ := entity.NewUser("sjobs@apple.com", "new_password", "Steve", "Jobs") + bID := entity.NewID() + _ = u.AddBook(bID) + id, err := u.GetBook(bID) + assert.Nil(t, err) + assert.Equal(t, id, bID) + _, err = u.GetBook(entity.NewID()) + assert.Equal(t, domain.ErrNotFound, err) +} + +func TestUserValidate(t *testing.T) { + type test struct { + email string + password string + firstName string + lastName string + want error + } + + tests := []test{ + { + email: "sjobs@apple.com", + password: "new_password", + firstName: "Steve", + lastName: "Jobs", + want: nil, + }, + { + email: "", + password: "new_password", + firstName: "Steve", + lastName: "Jobs", + want: domain.ErrInvalidEntity, + }, + { + email: "sjobs@apple.com", + password: "", + firstName: "Steve", + lastName: "Jobs", + want: nil, + }, + { + email: "sjobs@apple.com", + password: "new_password", + firstName: "", + lastName: "Jobs", + want: domain.ErrInvalidEntity, + }, + { + email: "sjobs@apple.com", + password: "new_password", + firstName: "Steve", + lastName: "", + want: domain.ErrInvalidEntity, + }, + } + for _, tc := range tests { + + u, err := entity.NewUser(tc.email, tc.password, tc.firstName, tc.lastName) + err = u.Validate() + assert.Equal(t, err, tc.want) + } + +} diff --git a/domain/error.go b/domain/error.go index e235ef3..c86196b 100644 --- a/domain/error.go +++ b/domain/error.go @@ -5,6 +5,9 @@ import "errors" //ErrNotFound not found var ErrNotFound = errors.New("Not found") +//ErrInvalidEntity invalid entity +var ErrInvalidEntity = errors.New("Invalid entity") + //ErrCannotBeDeleted cannot be deleted var ErrCannotBeDeleted = errors.New("Cannot Be Deleted") diff --git a/domain/usecase/book/interface.go b/domain/usecase/book/interface.go index 0382f8a..07cdb00 100644 --- a/domain/usecase/book/interface.go +++ b/domain/usecase/book/interface.go @@ -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 } diff --git a/domain/usecase/book/mock/book.go b/domain/usecase/book/mock/book.go index 932c503..bb72af6 100644 --- a/domain/usecase/book/mock/book.go +++ b/domain/usecase/book/mock/book.go @@ -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 diff --git a/domain/usecase/book/service.go b/domain/usecase/book/service.go index 172727c..36f5ed7 100644 --- a/domain/usecase/book/service.go +++ b/domain/usecase/book/service.go @@ -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) } diff --git a/domain/usecase/book/service_test.go b/domain/usecase/book/service_test.go index 479db7f..9db7d39 100644 --- a/domain/usecase/book/service_test.go +++ b/domain/usecase/book/service_test.go @@ -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) diff --git a/domain/usecase/loan/mock/loan.go b/domain/usecase/loan/mock/loan.go index 0d25a74..5d5b355 100644 --- a/domain/usecase/loan/mock/loan.go +++ b/domain/usecase/loan/mock/loan.go @@ -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 diff --git a/domain/usecase/loan/service.go b/domain/usecase/loan/service.go index 18e684a..1bb3e3a 100644 --- a/domain/usecase/loan/service.go +++ b/domain/usecase/loan/service.go @@ -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) diff --git a/domain/usecase/loan/service_test.go b/domain/usecase/loan/service_test.go index 663d7ba..cd68a2a 100644 --- a/domain/usecase/loan/service_test.go +++ b/domain/usecase/loan/service_test.go @@ -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) diff --git a/domain/usecase/user/interface.go b/domain/usecase/user/interface.go index 454af47..f673510 100644 --- a/domain/usecase/user/interface.go +++ b/domain/usecase/user/interface.go @@ -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 } diff --git a/domain/usecase/user/mock/user.go b/domain/usecase/user/mock/user.go index a184132..adcd3e7 100644 --- a/domain/usecase/user/mock/user.go +++ b/domain/usecase/user/mock/user.go @@ -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 diff --git a/domain/usecase/user/service.go b/domain/usecase/user/service.go index 5fa50e9..dbb960d 100644 --- a/domain/usecase/user/service.go +++ b/domain/usecase/user/service.go @@ -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) } diff --git a/domain/usecase/user/service_test.go b/domain/usecase/user/service_test.go index 6a9fb8e..c41b42c 100644 --- a/domain/usecase/user/service_test.go +++ b/domain/usecase/user/service_test.go @@ -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: "ozzy@metalgods.net", + 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) }