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

feat: move entity and usecase to root folder

Browse Source
This commit is contained in:
Elton Minetto
2020-10-12 07:35:29 -03:00
parent 2c0f46aff1
commit 3e4eb2e616
33 changed files with 109 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/handler/book.go
+4 -6
View File
@@ -5,14 +5,12 @@ import (
"log"
"net/http"
"github.com/eminetto/clean-architecture-go-v2/domain/usecase/book"
"github.com/eminetto/clean-architecture-go-v2/domain"
"github.com/eminetto/clean-architecture-go-v2/usecase/book"
"github.com/eminetto/clean-architecture-go-v2/api/presenter"
"github.com/codegangsta/negroni"
"github.com/eminetto/clean-architecture-go-v2/domain/entity"
"github.com/eminetto/clean-architecture-go-v2/entity"
"github.com/gorilla/mux"
)
@@ -29,7 +27,7 @@ func listBooks(service book.UseCase) http.Handler {
data, err = service.SearchBooks(title)
}
w.Header().Set("Content-Type", "application/json")
if err != nil && err != domain.ErrNotFound {
if err != nil && err != entity.ErrNotFound {
w.WriteHeader(http.StatusInternalServerError)
w.Write([]byte(errorMessage))
return
@@ -108,7 +106,7 @@ func getBook(service book.UseCase) http.Handler {
return
}
data, err := service.GetBook(id)
if err != nil && err != domain.ErrNotFound {
if err != nil && err != entity.ErrNotFound {
w.WriteHeader(http.StatusInternalServerError)
w.Write([]byte(errorMessage))
return
api/handler/book_test.go
+3 -4
View File
@@ -8,11 +8,10 @@ import (
"strings"
"testing"
"github.com/eminetto/clean-architecture-go-v2/domain"
"github.com/eminetto/clean-architecture-go-v2/domain/entity"
"github.com/eminetto/clean-architecture-go-v2/entity"
"github.com/codegangsta/negroni"
"github.com/eminetto/clean-architecture-go-v2/domain/usecase/book/mock"
"github.com/eminetto/clean-architecture-go-v2/usecase/book/mock"
"github.com/golang/mock/gomock"
"github.com/gorilla/mux"
"github.com/stretchr/testify/assert"
@@ -49,7 +48,7 @@ func Test_listBooks_NotFound(t *testing.T) {
defer ts.Close()
service.EXPECT().
SearchBooks("book of books").
Return(nil, domain.ErrNotFound)
Return(nil, entity.ErrNotFound)
res, err := http.Get(ts.URL + "?title=book+of+books")
assert.Nil(t, err)
assert.Equal(t, http.StatusNotFound, res.StatusCode)
api/handler/loan.go
+8 -10
View File
@@ -4,15 +4,13 @@ import (
"fmt"
"net/http"
"github.com/eminetto/clean-architecture-go-v2/domain/usecase/book"
"github.com/eminetto/clean-architecture-go-v2/domain/usecase/user"
"github.com/eminetto/clean-architecture-go-v2/usecase/book"
"github.com/eminetto/clean-architecture-go-v2/usecase/user"
"github.com/eminetto/clean-architecture-go-v2/domain/usecase/loan"
"github.com/eminetto/clean-architecture-go-v2/domain"
"github.com/eminetto/clean-architecture-go-v2/usecase/loan"
"github.com/codegangsta/negroni"
"github.com/eminetto/clean-architecture-go-v2/domain/entity"
"github.com/eminetto/clean-architecture-go-v2/entity"
"github.com/gorilla/mux"
)
@@ -27,7 +25,7 @@ func borrowBook(bookService book.UseCase, userService user.UseCase, loanService
return
}
b, err := bookService.GetBook(bID)
if err != nil && err != domain.ErrNotFound {
if err != nil && err != entity.ErrNotFound {
w.WriteHeader(http.StatusInternalServerError)
w.Write([]byte(errorMessage))
return
@@ -44,7 +42,7 @@ func borrowBook(bookService book.UseCase, userService user.UseCase, loanService
return
}
u, err := userService.GetUser(uID)
if err != nil && err != domain.ErrNotFound {
if err != nil && err != entity.ErrNotFound {
w.WriteHeader(http.StatusInternalServerError)
w.Write([]byte(errorMessage))
return
@@ -76,7 +74,7 @@ func returnBook(bookService book.UseCase, loanService loan.UseCase) http.Handler
return
}
b, err := bookService.GetBook(bID)
if err != nil && err != domain.ErrNotFound {
if err != nil && err != entity.ErrNotFound {
w.WriteHeader(http.StatusInternalServerError)
w.Write([]byte(errorMessage))
return
@@ -87,7 +85,7 @@ func returnBook(bookService book.UseCase, loanService loan.UseCase) http.Handler
return
}
err = loanService.Return(b)
if err != nil && err != domain.ErrNotFound {
if err != nil && err != entity.ErrNotFound {
w.WriteHeader(http.StatusInternalServerError)
w.Write([]byte(errorMessage))
return
api/handler/loan_test.go
+7 -8
View File
@@ -6,13 +6,12 @@ import (
"net/http/httptest"
"testing"
"github.com/eminetto/clean-architecture-go-v2/domain"
"github.com/eminetto/clean-architecture-go-v2/domain/entity"
"github.com/eminetto/clean-architecture-go-v2/entity"
"github.com/codegangsta/negroni"
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"
bmock "github.com/eminetto/clean-architecture-go-v2/usecase/book/mock"
lmock "github.com/eminetto/clean-architecture-go-v2/usecase/loan/mock"
umock "github.com/eminetto/clean-architecture-go-v2/usecase/user/mock"
"github.com/golang/mock/gomock"
"github.com/gorilla/mux"
"github.com/stretchr/testify/assert"
@@ -35,7 +34,7 @@ func Test_borrowBook(t *testing.T) {
t.Run("book not found", func(t *testing.T) {
bID := entity.NewID()
uID := entity.NewID()
bMock.EXPECT().GetBook(bID).Return(nil, domain.ErrNotFound)
bMock.EXPECT().GetBook(bID).Return(nil, entity.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()))
@@ -48,7 +47,7 @@ func Test_borrowBook(t *testing.T) {
}
uID := entity.NewID()
bMock.EXPECT().GetBook(b.ID).Return(b, nil)
uMock.EXPECT().GetUser(uID).Return(nil, domain.ErrNotFound)
uMock.EXPECT().GetUser(uID).Return(nil, entity.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()))
@@ -89,7 +88,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().GetBook(bID).Return(nil, domain.ErrNotFound)
bMock.EXPECT().GetBook(bID).Return(nil, entity.ErrNotFound)
ts := httptest.NewServer(r)
defer ts.Close()
res, err := http.Get(fmt.Sprintf("%s/v1/loan/return/%s", ts.URL, bID.String()))
api/handler/user.go
+4 -6
View File
@@ -5,13 +5,11 @@ import (
"log"
"net/http"
"github.com/eminetto/clean-architecture-go-v2/domain/usecase/user"
"github.com/eminetto/clean-architecture-go-v2/domain"
"github.com/eminetto/clean-architecture-go-v2/usecase/user"
"github.com/eminetto/clean-architecture-go-v2/api/presenter"
"github.com/eminetto/clean-architecture-go-v2/domain/entity"
"github.com/eminetto/clean-architecture-go-v2/entity"
"github.com/codegangsta/negroni"
"github.com/gorilla/mux"
@@ -30,7 +28,7 @@ func listUsers(service user.UseCase) http.Handler {
data, err = service.SearchUsers(name)
}
w.Header().Set("Content-Type", "application/json")
if err != nil && err != domain.ErrNotFound {
if err != nil && err != entity.ErrNotFound {
w.WriteHeader(http.StatusInternalServerError)
w.Write([]byte(errorMessage))
return
@@ -108,7 +106,7 @@ func getUser(service user.UseCase) http.Handler {
}
data, err := service.GetUser(id)
w.Header().Set("Content-Type", "application/json")
if err != nil && err != domain.ErrNotFound {
if err != nil && err != entity.ErrNotFound {
w.WriteHeader(http.StatusInternalServerError)
w.Write([]byte(errorMessage))
return
api/handler/user_test.go
+3 -4
View File
@@ -10,9 +10,8 @@ import (
"github.com/codegangsta/negroni"
"github.com/eminetto/clean-architecture-go-v2/api/presenter"
"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/usecase/user/mock"
"github.com/eminetto/clean-architecture-go-v2/entity"
"github.com/eminetto/clean-architecture-go-v2/usecase/user/mock"
"github.com/golang/mock/gomock"
"github.com/gorilla/mux"
"github.com/stretchr/testify/assert"
@@ -49,7 +48,7 @@ func Test_listUsers_NotFound(t *testing.T) {
defer ts.Close()
m.EXPECT().
SearchUsers("dio").
Return(nil, domain.ErrNotFound)
Return(nil, entity.ErrNotFound)
res, err := http.Get(ts.URL + "?name=dio")
assert.Nil(t, err)
assert.Equal(t, http.StatusNotFound, res.StatusCode)