fix: move some logic to domain entities

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
+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
+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)