feat: new handlers - WIP

2020-06-26 15:51:51 -03:00
parent adc2331b89
commit bf36e4cc88
5 changed files with 126 additions and 63 deletions
@@ -8,11 +8,10 @@ import (
 	"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/codegangsta/negroni"
 	"github.com/eminetto/clean-architecture-go-v2/domain/entity/user"
 	"github.com/eminetto/clean-architecture-go-v2/domain/entity/user/mock"
 	"github.com/golang/mock/gomock"
@@ -20,32 +19,32 @@ import (
 	"github.com/stretchr/testify/assert"
 )

-func Test_UserIndex(t *testing.T) {
+func Test_listUsers(t *testing.T) {
 	controller := gomock.NewController(t)
 	defer controller.Finish()
 	service := mock.NewMockUseCase(controller)
 	r := mux.NewRouter()
 	n := negroni.New()
 	MakeUserHandlers(r, *n, service)
-	path, err := r.GetRoute("userIndex").GetPathTemplate()
+	path, err := r.GetRoute("listUsers").GetPathTemplate()
 	assert.Nil(t, err)
 	assert.Equal(t, "/v1/user", path)
 	u := user.NewFixtureUser()
 	service.EXPECT().
 		List().
 		Return([]*user.User{u}, nil)
-	ts := httptest.NewServer(userIndex(service))
+	ts := httptest.NewServer(listUsers(service))
 	defer ts.Close()
 	res, err := http.Get(ts.URL)
 	assert.Nil(t, err)
 	assert.Equal(t, http.StatusOK, res.StatusCode)
 }

-func Test_UserIndexNotFound(t *testing.T) {
+func Test_listUsers_NotFound(t *testing.T) {
 	controller := gomock.NewController(t)
 	defer controller.Finish()
 	service := mock.NewMockUseCase(controller)
-	ts := httptest.NewServer(userIndex(service))
+	ts := httptest.NewServer(listUsers(service))
 	defer ts.Close()
 	service.EXPECT().
 		Search("dio").
@@ -55,7 +54,7 @@ func Test_UserIndexNotFound(t *testing.T) {
 	assert.Equal(t, http.StatusNotFound, res.StatusCode)
 }

-func Test_UserSearch(t *testing.T) {
+func Test_listUsers_Search(t *testing.T) {
 	controller := gomock.NewController(t)
 	defer controller.Finish()
 	service := mock.NewMockUseCase(controller)
@@ -63,37 +62,37 @@ func Test_UserSearch(t *testing.T) {
 	service.EXPECT().
 		Search("ozzy").
 		Return([]*user.User{u}, nil)
-	ts := httptest.NewServer(userIndex(service))
+	ts := httptest.NewServer(listUsers(service))
 	defer ts.Close()
 	res, err := http.Get(ts.URL + "?name=ozzy")
 	assert.Nil(t, err)
 	assert.Equal(t, http.StatusOK, res.StatusCode)
 }

-func Test_UserAdd(t *testing.T) {
+func Test_createUser(t *testing.T) {
 	controller := gomock.NewController(t)
 	defer controller.Finish()
 	service := mock.NewMockUseCase(controller)
 	r := mux.NewRouter()
 	n := negroni.New()
 	MakeUserHandlers(r, *n, service)
-	path, err := r.GetRoute("userAdd").GetPathTemplate()
+	path, err := r.GetRoute("createUser").GetPathTemplate()
 	assert.Nil(t, err)
 	assert.Equal(t, "/v1/user", path)

 	service.EXPECT().
 		Create(gomock.Any()).
 		Return(entity.NewID(), nil)
-	h := userAdd(service)
+	h := createUser(service)

 	ts := httptest.NewServer(h)
 	defer ts.Close()
 	payload := fmt.Sprintf(`{
- "name": "ozzy",
- "email": "[email protected]",
- "password": "asasa",
- "first_name":"Ozzy",
- "last_name":"Osbourne"
+"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)
@@ -103,57 +102,49 @@ func Test_UserAdd(t *testing.T) {
 	assert.Equal(t, "Ozzy Osbourne", fmt.Sprintf("%s %s", u.FirstName, u.LastName))
 }

-func Test_UserFind(t *testing.T) {
+func Test_getUser(t *testing.T) {
 	controller := gomock.NewController(t)
 	defer controller.Finish()
 	service := mock.NewMockUseCase(controller)
 	r := mux.NewRouter()
 	n := negroni.New()
 	MakeUserHandlers(r, *n, service)
-	path, err := r.GetRoute("userFind").GetPathTemplate()
+	path, err := r.GetRoute("getUser").GetPathTemplate()
 	assert.Nil(t, err)
 	assert.Equal(t, "/v1/user/{id}", path)
 	u := user.NewFixtureUser()
 	service.EXPECT().
 		Get(u.ID).
 		Return(u, nil)
-	handler := userFind(service)
-	r.Handle("/v1/bookmark/{id}", handler)
+	handler := getUser(service)
+	r.Handle("/v1/user/{id}", handler)
 	ts := httptest.NewServer(r)
 	defer ts.Close()
-	res, err := http.Get(ts.URL + "/v1/bookmark/" + b.ID.String())
+	res, err := http.Get(ts.URL + "/v1/user/" + u.ID.String())
 	assert.Nil(t, err)
 	assert.Equal(t, http.StatusOK, res.StatusCode)
-	var d *entity.Bookmark
+	var d *presenter.User
 	json.NewDecoder(res.Body).Decode(&d)
 	assert.NotNil(t, d)
-	assert.Equal(t, b.ID, d.ID)
+	assert.Equal(t, u.ID, d.ID)
 }

-//
-//func TestBookmarkRemove(t *testing.T) {
-//	controller := gomock.NewController(t)
-//	defer controller.Finish()
-//	service := mock.NewMockUseCase(controller)
-//	r := mux.NewRouter()
-//	n := negroni.New()
-//	MakeBookmarkHandlers(r, *n, service)
-//	path, err := r.GetRoute("bookmarkDelete").GetPathTemplate()
-//	assert.Nil(t, err)
-//	assert.Equal(t, "/v1/bookmark/{id}", path)
-//	b := &entity.Bookmark{
-//		ID:          entity.NewID(),
-//		Name:        "Elton Minetto",
-//		Description: "Minetto's page",
-//		Link:        "http://www.eltonminetto.net",
-//		Tags:        []string{"golang", "php", "linux", "mac"},
-//		Favorite:    false,
-//	}
-//	service.EXPECT().Delete(b.ID).Return(nil)
-//	handler := bookmarkDelete(service)
-//	req, _ := http.NewRequest("DELETE", "/v1/bookmark/"+b.ID.String(), nil)
-//	r.Handle("/v1/bookmark/{id}", handler).Methods("DELETE", "OPTIONS")
-//	rr := httptest.NewRecorder()
-//	r.ServeHTTP(rr, req)
-//	assert.Equal(t, http.StatusOK, rr.Code)
-//}
+func Test_deleteUser(t *testing.T) {
+	controller := gomock.NewController(t)
+	defer controller.Finish()
+	service := mock.NewMockUseCase(controller)
+	r := mux.NewRouter()
+	n := negroni.New()
+	MakeUserHandlers(r, *n, service)
+	path, err := r.GetRoute("deleteUser").GetPathTemplate()
+	assert.Nil(t, err)
+	assert.Equal(t, "/v1/user/{id}", path)
+	u := user.NewFixtureUser()
+	service.EXPECT().Delete(u.ID).Return(nil)
+	handler := deleteUser(service)
+	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)
+}