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 book
+
+import (
+	"encoding/json"
+	"log"
+	"net/http"
+	"time"
+
+	"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/api/presenter"
+
+	"github.com/codegangsta/negroni"
+	"github.com/eminetto/clean-architecture-go-v2/domain/entity"
+	"github.com/gorilla/mux"
+)
+
+func listBooks(service book.UseCase) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		errorMessage := "Error reading books"
+		var data []*entity.Book
+		var err error
+		title := r.URL.Query().Get("title")
+		switch {
+		case title == "":
+			data, err = service.ListBooks()
+		default:
+			data, err = service.SearchBooks(title)
+		}
+		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.Book
+		for _, d := range data {
+			toJ = append(toJ, &presenter.Book{
+				ID:       d.ID,
+				Title:    d.Title,
+				Author:   d.Author,
+				Pages:    d.Pages,
+				Quantity: d.Quantity,
+			})
+		}
+		if err := json.NewEncoder(w).Encode(toJ); err != nil {
+			w.WriteHeader(http.StatusInternalServerError)
+			w.Write([]byte(errorMessage))
+		}
+	})
+}
+
+func createBook(service book.UseCase) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		errorMessage := "Error adding book"
+		var input struct {
+			Title    string `json:"title"`
+			Author   string `json:"author"`
+			Pages    int    `json:"pages"`
+			Quantity int    `json:"quantity"`
+		}
+		err := json.NewDecoder(r.Body).Decode(&input)
+		if err != nil {
+			log.Println(err.Error())
+			w.WriteHeader(http.StatusInternalServerError)
+			w.Write([]byte(errorMessage))
+			return
+		}
+		b := &entity.Book{
+			ID:        entity.NewID(),
+			Title:     input.Title,
+			Author:    input.Author,
+			Pages:     input.Pages,
+			Quantity:  input.Quantity,
+			CreatedAt: time.Now(),
+		}
+		b.ID, err = service.CreateBook(b)
+		if err != nil {
+			log.Println(err.Error())
+			w.WriteHeader(http.StatusInternalServerError)
+			w.Write([]byte(errorMessage))
+			return
+		}
+		toJ := &presenter.Book{
+			ID:       b.ID,
+			Title:    b.Title,
+			Author:   b.Author,
+			Pages:    b.Pages,
+			Quantity: b.Quantity,
+		}
+
+		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 getBook(service book.UseCase) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		errorMessage := "Error reading book"
+		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.GetBook(id)
+		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.Book{
+			ID:       data.ID,
+			Title:    data.Title,
+			Author:   data.Author,
+			Pages:    data.Pages,
+			Quantity: data.Quantity,
+		}
+		if err := json.NewEncoder(w).Encode(toJ); err != nil {
+			w.WriteHeader(http.StatusInternalServerError)
+			w.Write([]byte(errorMessage))
+		}
+	})
+}
+
+func deleteBook(service book.UseCase) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		errorMessage := "Error removing bookmark"
+		vars := mux.Vars(r)
+		id, err := entity.StringToID(vars["id"])
+		if err != nil {
+			w.WriteHeader(http.StatusInternalServerError)
+			w.Write([]byte(errorMessage))
+			return
+		}
+		err = service.DeleteBook(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 book.UseCase) {
+	r.Handle("/v1/book", n.With(
+		negroni.Wrap(listBooks(service)),
+	)).Methods("GET", "OPTIONS").Name("listBooks")
+
+	r.Handle("/v1/book", n.With(
+		negroni.Wrap(createBook(service)),
+	)).Methods("POST", "OPTIONS").Name("createBook")
+
+	r.Handle("/v1/book/{id}", n.With(
+		negroni.Wrap(getBook(service)),
+	)).Methods("GET", "OPTIONS").Name("getBook")
+
+	r.Handle("/v1/book/{id}", n.With(
+		negroni.Wrap(deleteBook(service)),
+	)).Methods("DELETE", "OPTIONS").Name("deleteBook")
+}
@@ -0,0 +1,148 @@
+package book
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"strings"
+	"testing"
+
+	"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/usecase/book/mock"
+	"github.com/golang/mock/gomock"
+	"github.com/gorilla/mux"
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_listBooks(t *testing.T) {
+	controller := gomock.NewController(t)
+	defer controller.Finish()
+	manager := mock.NewMockUseCase(controller)
+	r := mux.NewRouter()
+	n := negroni.New()
+	MakeHandlers(r, *n, manager)
+	path, err := r.GetRoute("listBooks").GetPathTemplate()
+	assert.Nil(t, err)
+	assert.Equal(t, "/v1/book", path)
+	b := entity.NewFixtureBook()
+	manager.EXPECT().
+		ListBooks().
+		Return([]*entity.Book{b}, nil)
+	ts := httptest.NewServer(listBooks(manager))
+	defer ts.Close()
+	res, err := http.Get(ts.URL)
+	assert.Nil(t, err)
+	assert.Equal(t, http.StatusOK, res.StatusCode)
+}
+
+func Test_listBooks_NotFound(t *testing.T) {
+	controller := gomock.NewController(t)
+	defer controller.Finish()
+	manager := mock.NewMockUseCase(controller)
+	ts := httptest.NewServer(listBooks(manager))
+	defer ts.Close()
+	manager.EXPECT().
+		SearchBooks("book of books").
+		Return(nil, domain.ErrNotFound)
+	res, err := http.Get(ts.URL + "?title=book+of+books")
+	assert.Nil(t, err)
+	assert.Equal(t, http.StatusNotFound, res.StatusCode)
+}
+
+func Test_listBooks_Search(t *testing.T) {
+	controller := gomock.NewController(t)
+	defer controller.Finish()
+	manager := mock.NewMockUseCase(controller)
+	b := entity.NewFixtureBook()
+	manager.EXPECT().
+		SearchBooks("ozzy").
+		Return([]*entity.Book{b}, nil)
+	ts := httptest.NewServer(listBooks(manager))
+	defer ts.Close()
+	res, err := http.Get(ts.URL + "?title=ozzy")
+	assert.Nil(t, err)
+	assert.Equal(t, http.StatusOK, res.StatusCode)
+}
+
+func Test_createBook(t *testing.T) {
+	controller := gomock.NewController(t)
+	defer controller.Finish()
+	manager := mock.NewMockUseCase(controller)
+	r := mux.NewRouter()
+	n := negroni.New()
+	MakeHandlers(r, *n, manager)
+	path, err := r.GetRoute("createBook").GetPathTemplate()
+	assert.Nil(t, err)
+	assert.Equal(t, "/v1/book", path)
+
+	manager.EXPECT().
+		CreateBook(gomock.Any()).
+		Return(entity.NewID(), nil)
+	h := createBook(manager)
+
+	ts := httptest.NewServer(h)
+	defer ts.Close()
+	payload := fmt.Sprintf(`{
+  "title": "I Am Ozzy",
+  "author": "Ozzy Osbourne",
+  "pages": 294,
+  "quantity":1
+}`)
+	resp, _ := http.Post(ts.URL+"/v1/book", "application/json", strings.NewReader(payload))
+	assert.Equal(t, http.StatusCreated, resp.StatusCode)
+
+	var b *entity.Book
+	json.NewDecoder(resp.Body).Decode(&b)
+	assert.Equal(t, "Ozzy Osbourne", b.Author)
+}
+
+func Test_getBook(t *testing.T) {
+	controller := gomock.NewController(t)
+	defer controller.Finish()
+	manager := mock.NewMockUseCase(controller)
+	r := mux.NewRouter()
+	n := negroni.New()
+	MakeHandlers(r, *n, manager)
+	path, err := r.GetRoute("getBook").GetPathTemplate()
+	assert.Nil(t, err)
+	assert.Equal(t, "/v1/book/{id}", path)
+	b := entity.NewFixtureBook()
+	manager.EXPECT().
+		GetBook(b.ID).
+		Return(b, nil)
+	handler := getBook(manager)
+	r.Handle("/v1/book/{id}", handler)
+	ts := httptest.NewServer(r)
+	defer ts.Close()
+	res, err := http.Get(ts.URL + "/v1/book/" + b.ID.String())
+	assert.Nil(t, err)
+	assert.Equal(t, http.StatusOK, res.StatusCode)
+	var d *entity.Book
+	json.NewDecoder(res.Body).Decode(&d)
+	assert.NotNil(t, d)
+	assert.Equal(t, b.ID, d.ID)
+}
+
+func Test_deleteBook(t *testing.T) {
+	controller := gomock.NewController(t)
+	defer controller.Finish()
+	manager := mock.NewMockUseCase(controller)
+	r := mux.NewRouter()
+	n := negroni.New()
+	MakeHandlers(r, *n, manager)
+	path, err := r.GetRoute("deleteBook").GetPathTemplate()
+	assert.Nil(t, err)
+	assert.Equal(t, "/v1/book/{id}", path)
+	b := entity.NewFixtureBook()
+	manager.EXPECT().DeleteBook(b.ID).Return(nil)
+	handler := deleteBook(manager)
+	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)
+}