Add removing service

Author: aperezg

cmd/gopherapi/main.go

@@ -6,6 +6,8 @@ import (
 	"log"
 	"net/http"
 
+	"github.com/friendsofgo/gopherapi/pkg/removing"
+
 	"github.com/friendsofgo/gopherapi/pkg/modifying"
 
 	"github.com/friendsofgo/gopherapi/pkg/adding"
@@ -32,8 +34,9 @@ func main() {
 	fS := fetching.NewService(repo)
 	aS := adding.NewService(repo)
 	mS := modifying.NewService(repo)
+	rS := removing.NewService(repo)
 
-	s := server.New(fS, aS, mS)
+	s := server.New(fS, aS, mS, rS)
 
 	fmt.Println("The gopher server is on tap now: http://localhost:8080")
 	log.Fatal(http.ListenAndServe(":8080", s.Router()))

pkg/removing/service.go

@@ -0,0 +1,24 @@
+package removing
+
+import (
+	gopher "github.com/friendsofgo/gopherapi/pkg"
+)
+
+// Service provides removing operations.
+type Service interface {
+	RemoveGopher(ID string) error
+}
+
+type service struct {
+	repository gopher.Repository
+}
+
+// NewService creates a removing service with the necessary dependencies
+func NewService(repository gopher.Repository) Service {
+	return &service{repository}
+}
+
+// RemoveGopher remove gopher from the storage
+func (s *service) RemoveGopher(ID string) error {
+	return s.repository.DeleteGopher(ID)
+}

pkg/server/api.go

@@ -7,6 +7,7 @@ import (
 	"github.com/friendsofgo/gopherapi/pkg/adding"
 	"github.com/friendsofgo/gopherapi/pkg/fetching"
 	"github.com/friendsofgo/gopherapi/pkg/modifying"
+	"github.com/friendsofgo/gopherapi/pkg/removing"
 
 	"github.com/gorilla/mux"
 )
@@ -16,6 +17,7 @@ type api struct {
 	fetching  fetching.Service
 	adding    adding.Service
 	modifying modifying.Service
+	removing  removing.Service
 }
 
 // Server representation of gopher server
@@ -25,17 +27,19 @@ type Server interface {
 	FetchGopher(w http.ResponseWriter, r *http.Request)
 	AddGopher(w http.ResponseWriter, r *http.Request)
 	ModifyGopher(w http.ResponseWriter, r *http.Request)
+	RemoveGopher(w http.ResponseWriter, r *http.Request)
 }
 
 // New initialize the server
-func New(fS fetching.Service, aS adding.Service, mS modifying.Service) Server {
-	a := &api{fetching: fS, adding: aS, modifying: mS}
+func New(fS fetching.Service, aS adding.Service, mS modifying.Service, rS removing.Service) Server {
+	a := &api{fetching: fS, adding: aS, modifying: mS, removing: rS}
 
 	r := mux.NewRouter()
 	r.HandleFunc("/gophers", a.FetchGophers).Methods(http.MethodGet)
 	r.HandleFunc("/gophers/{ID:[a-zA-Z0-9_]+}", a.FetchGopher).Methods(http.MethodGet)
 	r.HandleFunc("/gophers", a.AddGopher).Methods(http.MethodPost)
 	r.HandleFunc("/gophers/{ID:[a-zA-Z0-9_]+}", a.ModifyGopher).Methods(http.MethodPut)
+	r.HandleFunc("/gophers/{ID:[a-zA-Z0-9_]+}", a.RemoveGopher).Methods(http.MethodDelete)
 
 	a.router = r
 	return a
@@ -125,3 +129,11 @@ func (a *api) ModifyGopher(w http.ResponseWriter, r *http.Request) {
 
 	w.WriteHeader(http.StatusNoContent)
 }
+
+// RemoveGopher remove a gopher
+func (a *api) RemoveGopher(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	a.removing.RemoveGopher(vars["ID"])
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(http.StatusNoContent)
+}

pkg/server/api_test.go

@@ -9,6 +9,8 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	"github.com/friendsofgo/gopherapi/pkg/removing"
+
 	"github.com/friendsofgo/gopherapi/pkg/adding"
 	"github.com/friendsofgo/gopherapi/pkg/fetching"
 	"github.com/friendsofgo/gopherapi/pkg/modifying"
@@ -128,6 +130,50 @@ func TestAddGopher(t *testing.T) {
 	}
 }
 
+func TestModifyGopher(t *testing.T) {
+	bodyJSON := []byte(`{
+        "name": "Eustaqio",
+        "image": "https://storage.googleapis.com/gopherizeme.appspot.com/gophers/f73f25d73c06cc81c482821391a85c4b7dd34ba5.png",
+        "age": 99
+    }`)
+	req, err := http.NewRequest("PUT", "/gophers/01D3XZ89NFJZ9QT2DHVD462AC2", bytes.NewBuffer(bodyJSON))
+	if err != nil {
+		t.Fatalf("could not created request: %v", err)
+	}
+	s := buildServer()
+	rec := httptest.NewRecorder()
+
+	s.ModifyGopher(rec, req)
+	res := rec.Result()
+	defer res.Body.Close()
+
+	if res.StatusCode != http.StatusNoContent {
+		t.Errorf("expected %d, got: %d", http.StatusNoContent, res.StatusCode)
+	}
+}
+
+func TestRemoveGopher(t *testing.T) {
+
+	uri := fmt.Sprintf("/gophers/%s", "01D3XZ89NFJZ9QT2DHVD462AC2")
+	req, err := http.NewRequest("DELETE", uri, nil)
+	if err != nil {
+		t.Fatalf("could not created request: %v", err)
+	}
+
+	s := buildServer()
+
+	rec := httptest.NewRecorder()
+	s.Router().ServeHTTP(rec, req)
+
+	res := rec.Result()
+
+	defer res.Body.Close()
+	if http.StatusNoContent != res.StatusCode {
+		t.Errorf("expected %d, got: %d", http.StatusNoContent, res.StatusCode)
+	}
+
+}
+
 func gopherSample() *gopher.Gopher {
 	return &gopher.Gopher{
 		ID:    "01D3XZ3ZHCP3KG9VT4FGAD8KDR",
@@ -142,6 +188,7 @@ func buildServer() Server {
 	fetching := fetching.NewService(repo)
 	adding := adding.NewService(repo)
 	modifying := modifying.NewService(repo)
+	removing := removing.NewService(repo)
 
-	return New(fetching, adding, modifying)
+	return New(fetching, adding, modifying, removing)
 }