RequestDataでfieldを指定する形にする

Author: taiyoh

notifier_test.go

@@ -94,7 +94,7 @@ func TestNotificationHandler(t *testing.T) {
 		notifyTestCase{
 			Label:           "success",
 			Method:          "POST",
-			Body:            `{"channel":"foo","users":["hoge","fuga"],"payload":{"aaa":"iii","uu":{"ee":"oo"}}}`,
+			Body:            `{"channel":"foo","users":["hoge","fuga"],"field":"foo","payload":{"aaa":"iii","uu":{"ee":"oo"}}}`,
 			ContentType:     "application/json",
 			StatusCode:      http.StatusOK,
 			ResponseSuccess: true,

request.go

@@ -7,6 +7,7 @@ import (
 
 type RequestData struct {
 	Users   []string    `json:"users"`
+	Field   string      `json:"field"`
 	Channel string      `json:"channel"`
 	Payload interface{} `json:"payload"`
 }
@@ -18,6 +19,9 @@ func (d *RequestData) Validate() error {
 	if d.Payload == nil {
 		return errors.New("require payload")
 	}
+	if d.Field == "" {
+		return errors.New("require field")
+	}
 	return nil
 }
 

request_test.go

@@ -24,7 +24,15 @@ func TestValidation(t *testing.T) {
 
 	r.Payload = "foo"
 	err = r.Validate()
-	if err != nil {
+	if err == nil {
+		t.Error("error should exists")
+	}
+	if err.Error() != "require field" {
+		t.Error("unexpected error message")
+	}
+
+	r.Field = "hoge"
+	if err == nil {
 		t.Error("error should not exists")
 	}
 }
@@ -51,7 +59,7 @@ func TestReadFromBytes(t *testing.T) {
 		t.Error("unexpected error message")
 	}
 
-	d, err = NewRequestDataFromBytes([]byte(`{"users":["hoge","fuga"],"channel":"foo","payload":"bar"}`))
+	d, err = NewRequestDataFromBytes([]byte(`{"users":["hoge","fuga"],"channel":"foo","field":"hey","payload":"bar"}`))
 	if d == nil {
 		t.Error("data should exists")
 	}
@@ -70,4 +78,7 @@ func TestReadFromBytes(t *testing.T) {
 	if d.Payload.(string) != "bar" {
 		t.Error("payload data is wrong")
 	}
+	if d.Field != "hey" {
+		t.Error("field data is wrong")
+	}
 }