Fix wrapper request body struct.

Author: Illicitus

server/server.go

@@ -12,10 +12,7 @@ var strategyHandler func(tradehook string, payload []byte)
 
 // strategyWrapper retrieve tradehook information from response body and send it to customer strategy
 func strategyWrapper(w http.ResponseWriter, r *http.Request) {
-	var requestBody struct {
-		Tradehook string `json:"tradehook"`
-		Payload   []byte `json:"payload"`
-	}
+	var requestBody map[string]interface{}
 
 	body, err := ioutil.ReadAll(r.Body)
 	if err != nil {
@@ -26,8 +23,13 @@ func strategyWrapper(w http.ResponseWriter, r *http.Request) {
 	if err != nil {
 		log.Fatal(err)
 	}
+	rawData := requestBody["data"]
+	data, err := json.Marshal(&rawData)
+	if err != nil {
+		log.Fatal(err)
+	}
 
-	strategyHandler(requestBody.Tradehook, requestBody.Payload)
+	strategyHandler(fmt.Sprintf("%v", requestBody["event"]), data)
 
 	w.WriteHeader(200)
 	_, err = w.Write([]byte(http.StatusText(http.StatusOK)))

server/server_test.go

@@ -22,18 +22,15 @@ func TestRunServerWithStrategy(t *testing.T) {
 
 	// Create handler
 	strategy := func(tradehook string, payload []byte) {
-		var payloadData struct {
-			Assets []string    `json:"assets"`
-			Bars   interface{} `json:"bars"`
-		}
+		var payloadData map[string]interface{}
 
 		err := json.Unmarshal(payload, &payloadData)
 		if err != nil {
 			assert.NoError(t, err)
 		}
 
 		assert.Equal(t, "bars", tradehook, invalidErrorMsg)
-		assert.NotEqualf(t, 0, len(payloadData.Assets), invalidErrorMsg)
+		assert.NotEqualf(t, 0, len(payloadData), invalidErrorMsg)
 	}
 
 	// Start server
@@ -53,11 +50,11 @@ func TestRunServerWithStrategy(t *testing.T) {
 
 	// Post request
 	data, err := json.Marshal(struct {
-		Tradehook string
-		Payload   []byte
+		Event string            `json:"event"`
+		Data  map[string]string `json:"data"`
 	}{
-		Tradehook: "bars",
-		Payload:   []byte("{\n  \"assets\": [\"AAPL:US\", \"BTCUSD:BMEX\", \"...\"],\n  \"bars\": {\n    \"YYYY-MM-01\": {\n      \"AAPL\": {\n        \"o\": \"113.79\",\n        \"h\": \"117.26\",\n        \"l\": \"113.62\",\n        \"c\": \"115.56\",\n        \"v\": 136210200,\n        \"t\": 782692,\n        \"w\": \"116.11665173913042\"\n      },\n      \"BTCUSD:BMEX\": {\n        \"o\": \"...\",\n        \"h\": \"...\",\n        \"l\": \"...\",\n        \"c\": \"...\",\n        \"v\": \"...\",\n        \"t\": \"...\",\n        \"w\": \"...\"\n      }\n    }\n  }\n}"),
+		Event: "bars",
+		Data:  map[string]string{"foo": "boo", "boo": "foo"},
 	})
 
 	res, err = http.Post(fmt.Sprintf("%s/", server.URL), "", ioutil.NopCloser(bytes.NewBuffer(data)))