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
api/handler/book/book.go
+6 -16
View File
@@ -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)
api/handler/book/book_test.go
+13 -5
View File
@@ -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)
api/handler/loan/loan_test.go
+12 -4
View File
@@ -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)
api/handler/user/user.go
+5 -16
View File
@@ -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
api/handler/user/user_test.go
+13 -5
View File
@@ -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)
api/main.go
+1 -3
View File
@@ -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)