feat: improvements in structures

This commit is contained in:
Elton Minetto
2020-09-29 21:51:18 -03:00
parent 201f7607e1
commit 2c7f87e73a
41 changed files with 821 additions and 1265 deletions
+17 -17
View File
@@ -6,7 +6,7 @@ import (
"net/http"
"time"
"github.com/eminetto/clean-architecture-go-v2/domain/entity/user"
"github.com/eminetto/clean-architecture-go-v2/domain/usecase/user"
"github.com/eminetto/clean-architecture-go-v2/domain"
@@ -18,17 +18,17 @@ import (
"github.com/gorilla/mux"
)
func listUsers(manager user.Manager) http.Handler {
func listUsers(service user.UseCase) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
errorMessage := "Error reading users"
var data []*user.User
var data []*entity.User
var err error
name := r.URL.Query().Get("name")
switch {
case name == "":
data, err = manager.List()
data, err = service.ListUsers()
default:
data, err = manager.Search(name)
data, err = service.SearchUsers(name)
}
w.Header().Set("Content-Type", "application/json")
if err != nil && err != domain.ErrNotFound {
@@ -58,7 +58,7 @@ func listUsers(manager user.Manager) http.Handler {
})
}
func createUser(manager user.Manager) http.Handler {
func createUser(service user.UseCase) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
errorMessage := "Error adding user"
var input struct {
@@ -75,7 +75,7 @@ func createUser(manager user.Manager) http.Handler {
return
}
//TODO: validate data ;)
u := &user.User{
u := &entity.User{
ID: entity.NewID(),
Email: input.Email,
Password: input.Password,
@@ -83,7 +83,7 @@ func createUser(manager user.Manager) http.Handler {
LastName: input.LastName,
CreatedAt: time.Now(),
}
u.ID, err = manager.Create(u)
u.ID, err = service.CreateUser(u)
if err != nil {
log.Println(err.Error())
w.WriteHeader(http.StatusInternalServerError)
@@ -107,7 +107,7 @@ func createUser(manager user.Manager) http.Handler {
})
}
func getUser(manager user.Manager) http.Handler {
func getUser(service user.UseCase) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
errorMessage := "Error reading user"
vars := mux.Vars(r)
@@ -117,7 +117,7 @@ func getUser(manager user.Manager) http.Handler {
w.Write([]byte(errorMessage))
return
}
data, err := manager.Get(id)
data, err := service.GetUser(id)
w.Header().Set("Content-Type", "application/json")
if err != nil && err != domain.ErrNotFound {
w.WriteHeader(http.StatusInternalServerError)
@@ -143,7 +143,7 @@ func getUser(manager user.Manager) http.Handler {
})
}
func deleteUser(manager user.Manager) http.Handler {
func deleteUser(service user.UseCase) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
errorMessage := "Error removing user"
vars := mux.Vars(r)
@@ -153,7 +153,7 @@ func deleteUser(manager user.Manager) http.Handler {
w.Write([]byte(errorMessage))
return
}
err = manager.Delete(id)
err = service.DeleteUser(id)
if err != nil {
w.WriteHeader(http.StatusInternalServerError)
w.Write([]byte(errorMessage))
@@ -163,20 +163,20 @@ func deleteUser(manager user.Manager) http.Handler {
}
//MakeUserHandlers make url handlers
func MakeUserHandlers(r *mux.Router, n negroni.Negroni, manager user.Manager) {
func MakeUserHandlers(r *mux.Router, n negroni.Negroni, service user.UseCase) {
r.Handle("/v1/user", n.With(
negroni.Wrap(listUsers(manager)),
negroni.Wrap(listUsers(service)),
)).Methods("GET", "OPTIONS").Name("listUsers")
r.Handle("/v1/user", n.With(
negroni.Wrap(createUser(manager)),
negroni.Wrap(createUser(service)),
)).Methods("POST", "OPTIONS").Name("createUser")
r.Handle("/v1/user/{id}", n.With(
negroni.Wrap(getUser(manager)),
negroni.Wrap(getUser(service)),
)).Methods("GET", "OPTIONS").Name("getUser")
r.Handle("/v1/user/{id}", n.With(
negroni.Wrap(deleteUser(manager)),
negroni.Wrap(deleteUser(service)),
)).Methods("DELETE", "OPTIONS").Name("deleteUser")
}