feat: improvements in structures

2020-09-29 22:07:32 -03:00
parent d3b9013966
commit 6711a4055f
7 changed files with 31 additions and 29 deletions
@@ -0,0 +1,182 @@
+package user
+
+import (
+	"encoding/json"
+	"log"
+	"net/http"
+	"time"
+
+	"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/api/presenter"
+
+	"github.com/eminetto/clean-architecture-go-v2/domain/entity"
+
+	"github.com/codegangsta/negroni"
+	"github.com/gorilla/mux"
+)
+
+func listUsers(service user.UseCase) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		errorMessage := "Error reading users"
+		var data []*entity.User
+		var err error
+		name := r.URL.Query().Get("name")
+		switch {
+		case name == "":
+			data, err = service.ListUsers()
+		default:
+			data, err = service.SearchUsers(name)
+		}
+		w.Header().Set("Content-Type", "application/json")
+		if err != nil && err != domain.ErrNotFound {
+			w.WriteHeader(http.StatusInternalServerError)
+			w.Write([]byte(errorMessage))
+			return
+		}
+
+		if data == nil {
+			w.WriteHeader(http.StatusNotFound)
+			w.Write([]byte(errorMessage))
+			return
+		}
+		var toJ []*presenter.User
+		for _, d := range data {
+			toJ = append(toJ, &presenter.User{
+				ID:        d.ID,
+				Email:     d.Email,
+				FirstName: d.FirstName,
+				LastName:  d.LastName,
+			})
+		}
+		if err := json.NewEncoder(w).Encode(toJ); err != nil {
+			w.WriteHeader(http.StatusInternalServerError)
+			w.Write([]byte(errorMessage))
+		}
+	})
+}
+
+func createUser(service user.UseCase) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		errorMessage := "Error adding user"
+		var input struct {
+			Email     string `json:"email"`
+			Password  string `json:"password"`
+			FirstName string `json:"first_name"`
+			LastName  string `json:"last_name"`
+		}
+		err := json.NewDecoder(r.Body).Decode(&input)
+		if err != nil {
+			log.Println(err.Error())
+			w.WriteHeader(http.StatusInternalServerError)
+			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)
+		if err != nil {
+			log.Println(err.Error())
+			w.WriteHeader(http.StatusInternalServerError)
+			w.Write([]byte(errorMessage))
+			return
+		}
+		toJ := &presenter.User{
+			ID:        u.ID,
+			Email:     u.Email,
+			FirstName: u.FirstName,
+			LastName:  u.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
+		}
+	})
+}
+
+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)
+		id, err := entity.StringToID(vars["id"])
+		if err != nil {
+			w.WriteHeader(http.StatusInternalServerError)
+			w.Write([]byte(errorMessage))
+			return
+		}
+		data, err := service.GetUser(id)
+		w.Header().Set("Content-Type", "application/json")
+		if err != nil && err != domain.ErrNotFound {
+			w.WriteHeader(http.StatusInternalServerError)
+			w.Write([]byte(errorMessage))
+			return
+		}
+
+		if data == nil {
+			w.WriteHeader(http.StatusNotFound)
+			w.Write([]byte(errorMessage))
+			return
+		}
+		toJ := &presenter.User{
+			ID:        data.ID,
+			Email:     data.Email,
+			FirstName: data.FirstName,
+			LastName:  data.LastName,
+		}
+		if err := json.NewEncoder(w).Encode(toJ); err != nil {
+			w.WriteHeader(http.StatusInternalServerError)
+			w.Write([]byte(errorMessage))
+		}
+	})
+}
+
+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)
+		id, err := entity.StringToID(vars["id"])
+		if err != nil {
+			w.WriteHeader(http.StatusInternalServerError)
+			w.Write([]byte(errorMessage))
+			return
+		}
+		err = service.DeleteUser(id)
+		if err != nil {
+			w.WriteHeader(http.StatusInternalServerError)
+			w.Write([]byte(errorMessage))
+			return
+		}
+	})
+}
+
+//MakeHandlers make url handlers
+func MakeHandlers(r *mux.Router, n negroni.Negroni, service user.UseCase) {
+	r.Handle("/v1/user", n.With(
+		negroni.Wrap(listUsers(service)),
+	)).Methods("GET", "OPTIONS").Name("listUsers")
+
+	r.Handle("/v1/user", n.With(
+		negroni.Wrap(createUser(service)),
+	)).Methods("POST", "OPTIONS").Name("createUser")
+
+	r.Handle("/v1/user/{id}", n.With(
+		negroni.Wrap(getUser(service)),
+	)).Methods("GET", "OPTIONS").Name("getUser")
+
+	r.Handle("/v1/user/{id}", n.With(
+		negroni.Wrap(deleteUser(service)),
+	)).Methods("DELETE", "OPTIONS").Name("deleteUser")
+}
@@ -0,0 +1,149 @@
+package user
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+
+	"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/golang/mock/gomock"
+	"github.com/gorilla/mux"
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_listUsers(t *testing.T) {
+	controller := gomock.NewController(t)
+	defer controller.Finish()
+	m := mock.NewMockUseCase(controller)
+	r := mux.NewRouter()
+	n := negroni.New()
+	MakeHandlers(r, *n, m)
+	path, err := r.GetRoute("listUsers").GetPathTemplate()
+	assert.Nil(t, err)
+	assert.Equal(t, "/v1/user", path)
+	u := entity.NewFixtureUser()
+	m.EXPECT().
+		ListUsers().
+		Return([]*entity.User{u}, nil)
+	ts := httptest.NewServer(listUsers(m))
+	defer ts.Close()
+	res, err := http.Get(ts.URL)
+	assert.Nil(t, err)
+	assert.Equal(t, http.StatusOK, res.StatusCode)
+}
+
+func Test_listUsers_NotFound(t *testing.T) {
+	controller := gomock.NewController(t)
+	defer controller.Finish()
+	m := mock.NewMockUseCase(controller)
+	ts := httptest.NewServer(listUsers(m))
+	defer ts.Close()
+	m.EXPECT().
+		SearchUsers("dio").
+		Return(nil, domain.ErrNotFound)
+	res, err := http.Get(ts.URL + "?name=dio")
+	assert.Nil(t, err)
+	assert.Equal(t, http.StatusNotFound, res.StatusCode)
+}
+
+func Test_listUsers_Search(t *testing.T) {
+	controller := gomock.NewController(t)
+	defer controller.Finish()
+	m := mock.NewMockUseCase(controller)
+	u := entity.NewFixtureUser()
+	m.EXPECT().
+		SearchUsers("ozzy").
+		Return([]*entity.User{u}, nil)
+	ts := httptest.NewServer(listUsers(m))
+	defer ts.Close()
+	res, err := http.Get(ts.URL + "?name=ozzy")
+	assert.Nil(t, err)
+	assert.Equal(t, http.StatusOK, res.StatusCode)
+}
+
+func Test_createUser(t *testing.T) {
+	controller := gomock.NewController(t)
+	defer controller.Finish()
+	m := mock.NewMockUseCase(controller)
+	r := mux.NewRouter()
+	n := negroni.New()
+	MakeHandlers(r, *n, m)
+	path, err := r.GetRoute("createUser").GetPathTemplate()
+	assert.Nil(t, err)
+	assert.Equal(t, "/v1/user", path)
+
+	m.EXPECT().
+		CreateUser(gomock.Any()).
+		Return(entity.NewID(), nil)
+	h := createUser(m)
+
+	ts := httptest.NewServer(h)
+	defer ts.Close()
+	payload := fmt.Sprintf(`{
+"name": "ozzy",
+"email": "[email protected]",
+"password": "asasa",
+"first_name":"Ozzy",
+"last_name":"Osbourne"
+}`)
+	resp, _ := http.Post(ts.URL+"/v1/user", "application/json", strings.NewReader(payload))
+	assert.Equal(t, http.StatusCreated, resp.StatusCode)
+
+	var u *presenter.User
+	json.NewDecoder(resp.Body).Decode(&u)
+	assert.Equal(t, "Ozzy Osbourne", fmt.Sprintf("%s %s", u.FirstName, u.LastName))
+}
+
+func Test_getUser(t *testing.T) {
+	controller := gomock.NewController(t)
+	defer controller.Finish()
+	m := mock.NewMockUseCase(controller)
+	r := mux.NewRouter()
+	n := negroni.New()
+	MakeHandlers(r, *n, m)
+	path, err := r.GetRoute("getUser").GetPathTemplate()
+	assert.Nil(t, err)
+	assert.Equal(t, "/v1/user/{id}", path)
+	u := entity.NewFixtureUser()
+	m.EXPECT().
+		GetUser(u.ID).
+		Return(u, nil)
+	handler := getUser(m)
+	r.Handle("/v1/user/{id}", handler)
+	ts := httptest.NewServer(r)
+	defer ts.Close()
+	res, err := http.Get(ts.URL + "/v1/user/" + u.ID.String())
+	assert.Nil(t, err)
+	assert.Equal(t, http.StatusOK, res.StatusCode)
+	var d *presenter.User
+	json.NewDecoder(res.Body).Decode(&d)
+	assert.NotNil(t, d)
+	assert.Equal(t, u.ID, d.ID)
+}
+
+func Test_deleteUser(t *testing.T) {
+	controller := gomock.NewController(t)
+	defer controller.Finish()
+	m := mock.NewMockUseCase(controller)
+	r := mux.NewRouter()
+	n := negroni.New()
+	MakeHandlers(r, *n, m)
+	path, err := r.GetRoute("deleteUser").GetPathTemplate()
+	assert.Nil(t, err)
+	assert.Equal(t, "/v1/user/{id}", path)
+	u := entity.NewFixtureUser()
+	m.EXPECT().DeleteUser(u.ID).Return(nil)
+	handler := deleteUser(m)
+	req, _ := http.NewRequest("DELETE", "/v1/user/"+u.ID.String(), nil)
+	r.Handle("/v1/user/{id}", handler).Methods("DELETE", "OPTIONS")
+	rr := httptest.NewRecorder()
+	r.ServeHTTP(rr, req)
+	assert.Equal(t, http.StatusOK, rr.Code)
+}