Finished last test case; over, embarrassing but over

internal/server/data/server.go

@@ -1,6 +1,7 @@
 package data
 
 import (
+	"io/ioutil"
 	"net/http"
 
 	"github.com/BBVA/kapow/internal/server/model"
@@ -8,45 +9,43 @@ import (
 )
 
 // Rutas a registrar:
-// /handlers/{handler_id}/{resource_path}/request GET
+// /handlers/{handlerId}/response/headers/{item} GET|PUT
-// /handlers/{handler_id}/{resource_path}/response PUT
+// /handlers/{handlerId}/response/cookies/{item} GET|PUT
-//func configRouter() *mux.Router {
+// /handlers/{handlerId}/request/headers/{item} GET|PUT
-//	r := mux.NewRouter()
+// /handlers/{handlerId}/request/cookies/{item} GET|PUT
-//
-//	r.HandleFunc("/handlers/{handler_id}/response/headers/", updateResource).Methods("PUT")
-//	r.HandleFunc("/handlers/{handler_id}/response/headers/{key}", updateResource).Methods("PUT")
-//	return r
-//}
-//
-//func Run(bindAddr string) {
-//	r := configRouter()
-//
-//	log.Fatal(http.ListenAndServe(bindAddr, r))
-//}
-//
-//func readResource(res http.ResponseWriter, req *http.Request) {
-//
-//}
 
 var getHandlerId func(string) (*model.Handler, bool) = Handlers.Get
 
 func updateResource(res http.ResponseWriter, req *http.Request) {
 	vars := mux.Vars(req)
-	hID := vars["handler_id"]
+	hID := vars["handlerId"]
 
-	if _, ok := getHandlerId(hID); !ok {
+	hnd, ok := getHandlerId(hID)
+	if !ok {
 		res.WriteHeader(http.StatusNotFound)
 		return
 	}
 
-	if resource := vars["resource"]; resource == "response/headers" || resource == "response/cookies" {
+	resource := vars["resource"]
+	if resource == "response/headers" || resource == "response/cookies" {
 		res.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
+	bodyBytes, err := ioutil.ReadAll(req.Body)
+	if err != nil {
+		res.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	req.Body.Close()
+	value := string(bodyBytes)
+
+	if hnd != nil {
+		hnd.Writing.Lock()
+		hnd.Writer.Header().Add("pepe", value)
+		hnd.Writing.Unlock()
 	}
 
 	res.WriteHeader(http.StatusOK)
-	//
-	//if _, ok := vars["key"]; !ok {
-	//	res.WriteHeader(http.StatusBadRequest)
-	//	return
-	//}
 }

internal/server/data/server_test.go

@@ -11,18 +11,18 @@ import (
 )
 
 func TestUpdateResourceNotFoundWhenInvalidHandlerID(t *testing.T) {
-	request := httptest.NewRequest(http.MethodPut, "/handlers/HANDLER_YYYYYYYYYYYYYYYY/response/headers/name", strings.NewReader("value"))
+	request := httptest.NewRequest(http.MethodPut, "/handlers/HANDLER_XXXXXXXXXXXXXXXX/response/headers/name", strings.NewReader("value"))
 	response := httptest.NewRecorder()
 	handler := mux.NewRouter()
-	handler.HandleFunc("/handlers/{handler_id}/{resource:.*$}", updateResource).
+	handler.HandleFunc("/handlers/{handlerId}/{resource:.*$}", updateResource).
 		Methods("PUT")
 
 	getHandlerId = func(id string) (*model.Handler, bool) {
 		if id == "HANDLER_YYYYYYYYYYYYYYYY" {
-			return nil, false
+			return createMockHandler(id, httptest.NewRecorder()), true
 		}
 
-		return nil, true
+		return nil, false
 	}
 
 	handler.ServeHTTP(response, request)
@@ -31,38 +31,16 @@ func TestUpdateResourceNotFoundWhenInvalidHandlerID(t *testing.T) {
 	}
 }
 
-func TestUpdateResourceBadRequestWhenInvalidUrl(t *testing.T) {
-
-	request := httptest.NewRequest(http.MethodPut, "/handlers/HANDLER_YYYYYYYYYYYYYYYY/response/headers", strings.NewReader("value"))
-	response := httptest.NewRecorder()
-	handler := mux.NewRouter()
-	handler.HandleFunc("/handlers/{handler_id}/{resource:.*$}", updateResource).
-		Methods("PUT")
-
-	getHandlerId = func(id string) (*model.Handler, bool) {
-		if id == "HANDLER_YYYYYYYYYYYYYYYY" {
-			return nil, true
-		}
-
-		return nil, false
-	}
-
-	handler.ServeHTTP(response, request)
-	if response.Code != http.StatusBadRequest {
-		t.Errorf("HTTP Status mismatch. Expected: %d, got: %d", http.StatusBadRequest, response.Code)
-	}
-}
-
 func TestUpdateResourceOkWhenValidHandlerID(t *testing.T) {
-	request := httptest.NewRequest(http.MethodPut, "/handlers/HANDLER_XXXXXXXXXXXX/response/headers/name", strings.NewReader("value"))
+	request := httptest.NewRequest(http.MethodPut, "/handlers/HANDLER_YYYYYYYYYYYY/response/headers/name", strings.NewReader("value"))
 	response := httptest.NewRecorder()
 	handler := mux.NewRouter()
-	handler.HandleFunc("/handlers/{handler_id}/{resource:.*$}", updateResource).
+	handler.HandleFunc("/handlers/{handlerId}/{resource:.*$}", updateResource).
 		Methods("PUT")
 
 	getHandlerId = func(id string) (*model.Handler, bool) {
-		if id == "HANDLER_XXXXXXXXXXXX" {
+		if id == "HANDLER_YYYYYYYYYYYY" {
-			return nil, true
+			return createMockHandler(id, httptest.NewRecorder()), true
 		}
 
 		return nil, false
@@ -74,17 +52,37 @@ func TestUpdateResourceOkWhenValidHandlerID(t *testing.T) {
 	}
 }
 
-func TestUpdateResourceBadRequestWhenInvalidCookiesUrl(t *testing.T) {
+func TestUpdateResourceBadRequestWhenInvalidUrl(t *testing.T) {
-
+	request := httptest.NewRequest(http.MethodPut, "/handlers/HANDLER_YYYYYYYYYYYYYYYY/response/headers", strings.NewReader("value"))
-	request := httptest.NewRequest(http.MethodPut, "/handlers/HANDLER_YYYYYYYYYYYYYYYY/response/cookies", strings.NewReader("value"))
 	response := httptest.NewRecorder()
 	handler := mux.NewRouter()
-	handler.HandleFunc("/handlers/{handler_id}/{resource:.*$}", updateResource).
+	handler.HandleFunc("/handlers/{handlerId}/{resource:.*$}", updateResource).
 		Methods("PUT")
 
 	getHandlerId = func(id string) (*model.Handler, bool) {
 		if id == "HANDLER_YYYYYYYYYYYYYYYY" {
-			return nil, true
+			return createMockHandler(id, httptest.NewRecorder()), true
+		}
+
+		return nil, false
+	}
+
+	handler.ServeHTTP(response, request)
+	if response.Code != http.StatusBadRequest {
+		t.Errorf("HTTP Status mismatch. Expected: %d, got: %d", http.StatusBadRequest, response.Code)
+	}
+}
+
+func TestUpdateResourceBadRequestWhenInvalidCookiesUrl(t *testing.T) {
+	request := httptest.NewRequest(http.MethodPut, "/handlers/HANDLER_YYYYYYYYYYYY/response/cookies", strings.NewReader("value"))
+	response := httptest.NewRecorder()
+	handler := mux.NewRouter()
+	handler.HandleFunc("/handlers/{handlerId}/{resource:.*$}", updateResource).
+		Methods("PUT")
+
+	getHandlerId = func(id string) (*model.Handler, bool) {
+		if id == "HANDLER_YYYYYYYYYYYY" {
+			return createMockHandler(id, httptest.NewRecorder()), true
 		}
 
 		return nil, false
@@ -97,21 +95,16 @@ func TestUpdateResourceBadRequestWhenInvalidCookiesUrl(t *testing.T) {
 }
 
 func TestUpdateResourceAddHeaderWhenRecieved(t *testing.T) {
-	t.Skip("**** WIP ****")
+	request := httptest.NewRequest(http.MethodPut, "/handlers/HANDLER_YYYYYYYYYYYY/response/headers/pepe", strings.NewReader("mola"))
-	request := httptest.NewRequest(http.MethodPut, "/handlers/HANDLER_YYYYYYYYYYYYYYYY/response/header/pepe", strings.NewReader("mola"))
 	response := httptest.NewRecorder()
 	handler := mux.NewRouter()
-	handler.HandleFunc("/handlers/{handler_id}/{resource:.*$}", updateResource).
+	handler.HandleFunc("/handlers/{handlerId}/{resource:.*$}", updateResource).
 		Methods("PUT")
 
-	handlerResponse := httptest.NewRecorder()
+	handlerInResponse := httptest.NewRecorder()
-	myHandler := &model.Handler{
-		ID:     "HANDLER_YYYYYYYYYYYYYYYY",
-		Writer: handlerResponse,
-	}
 	getHandlerId = func(id string) (*model.Handler, bool) {
-		if id == "HANDLER_YYYYYYYYYYYYYYYY" {
+		if id == "HANDLER_YYYYYYYYYYYY" {
-			return myHandler, true
+			return createMockHandler(id, handlerInResponse), true
 		}
 
 		return nil, false
@@ -122,8 +115,15 @@ func TestUpdateResourceAddHeaderWhenRecieved(t *testing.T) {
 		t.Errorf("HTTP Status mismatch. Expected: %d, got: %d", http.StatusOK, response.Code)
 	}
 
-	headerValue := handlerResponse.Header().Get("pepe")
+	headerValue := handlerInResponse.Result().Header.Get("pepe")
 	if headerValue != "mola" {
-		t.Errorf("Invalid Cookie value. Expected: %s, got: %s", "mola", headerValue)
+		t.Errorf("Invalid Header value. Expected: %s, got: %s", "mola", headerValue)
+	}
+}
+
+func createMockHandler(id string, writer http.ResponseWriter) *model.Handler {
+	return &model.Handler{
+		ID:     id,
+		Writer: writer,
 	}
 }