Revert "bug fixes and refactoring"

This reverts commit 86961cc814.

plugins/inputs/webhooks/particle/particle_webhooks.go

@@ -2,40 +2,14 @@ package particle
 
 import (
 	"encoding/json"
+	"github.com/gorilla/mux"
+	"github.com/influxdata/telegraf"
+	"io/ioutil"
 	"log"
 	"net/http"
 	"time"
-
-	"github.com/gorilla/mux"
-	"github.com/influxdata/telegraf"
 )
 
-type event struct {
-	Name        string `json:"event"`
-	Data        data   `json:"data"`
-	TTL         int    `json:"ttl"`
-	PublishedAt string `json:"published_at"`
-	Database    string `json:"influx_db"`
-}
-
-type data struct {
-	Tags   map[string]string      `json:"tags"`
-	Fields map[string]interface{} `json:"values"`
-}
-
-func newEvent() *event {
-	return &event{
-		Data: data{
-			Tags:   make(map[string]string),
-			Fields: make(map[string]interface{}),
-		},
-	}
-}
-
-func (e *event) Time() (time.Time, error) {
-	return time.Parse("2006-01-02T15:04:05Z", e.PublishedAt)
-}
-
 type ParticleWebhook struct {
 	Path string
 	acc  telegraf.Accumulator
@@ -49,19 +23,26 @@ func (rb *ParticleWebhook) Register(router *mux.Router, acc telegraf.Accumulator
 
 func (rb *ParticleWebhook) eventHandler(w http.ResponseWriter, r *http.Request) {
 	defer r.Body.Close()
-	e := newEvent()
+	data, err := ioutil.ReadAll(r.Body)
-	if err := json.NewDecoder(r.Body).Decode(e); err != nil {
+	if err != nil {
-		log.Println(err)
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
-
+	dummy := &DummyData{}
-	pTime, err := e.Time()
+	if err := json.Unmarshal(data, dummy); err != nil {
-	if err != nil {
+		w.WriteHeader(http.StatusBadRequest)
-		pTime = time.Now()
+		return
-		log.Printf("error parsing particle event time: %s. Using telegraf host time instead: %s", e.PublishedAt, pTime)
 	}
-
+	pd := &ParticleData{}
-	rb.acc.AddFields(e.Name, e.Data.Fields, e.Data.Tags, pTime)
+	if err := json.Unmarshal([]byte(dummy.Data), pd); err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+	pTime, err := dummy.Time()
+	if err != nil {
+		log.Printf("Time Conversion Error")
+		pTime = time.Now()
+	}
+	rb.acc.AddFields(dummy.InfluxDB, pd.Fields, pd.Tags, pTime)
 	w.WriteHeader(http.StatusOK)
 }

plugins/inputs/webhooks/particle/particle_webhooks_events.go

@@ -0,0 +1,22 @@
+package particle
+
+import (
+	"time"
+)
+
+type DummyData struct {
+	Event       string `json:"event"`
+	Data        string `json:"data"`
+	Ttl         int    `json:"ttl"`
+	PublishedAt string `json:"published_at"`
+	InfluxDB    string `json:"influx_db"`
+}
+type ParticleData struct {
+	Event  string                 `json:"event"`
+	Tags   map[string]string      `json:"tags"`
+	Fields map[string]interface{} `json:"values"`
+}
+
+func (d *DummyData) Time() (time.Time, error) {
+	return time.Parse("2006-01-02T15:04:05Z", d.PublishedAt)
+}

plugins/inputs/webhooks/particle/particle_webhooks_events_json_test.go

@@ -0,0 +1,39 @@
+package particle
+
+func NewItemJSON() string {
+	return `
+	{ 
+	  "event": "temperature",
+	  "data": "{ 
+		  "tags": {
+			  "id": "230035001147343438323536", 
+			  "location": "TravelingWilbury"
+		  }, 
+		  "values": {
+			  "temp_c": 26.680000, 
+			  "temp_f": 80.024001, 
+			  "humidity": 44.937500, 
+			  "pressure": 998.998901, 
+			  "altitude": 119.331436, 
+			  "broadband": 1266, 
+			  "infrared": 528, 
+			  "lux": 0
+		  }
+	  }",
+	  "ttl": 60,
+	  "published_at": "2017-09-28T21:54:10.897Z",
+	  "coreid": "123456789938323536",
+	  "userid": "1234ee123ac8e5ec1231a123d",
+	  "version": 10,
+	  "public": false,
+	  "productID": 1234,
+	  "name": "sensor"
+	  "influx_db": "mydata"
+  }`
+}
+func UnknowJSON() string {
+	return `
+    {
+      "event": "roger"
+    }`
+}

plugins/inputs/webhooks/particle/particle_webhooks_test.go

@@ -1,16 +1,17 @@
 package particle
 
 import (
+	"github.com/influxdata/telegraf/testutil"
+	"log"
 	"net/http"
 	"net/http/httptest"
 	"strings"
 	"testing"
-
-	"github.com/influxdata/telegraf/testutil"
 )
 
 func postWebhooks(rb *ParticleWebhook, eventBody string) *httptest.ResponseRecorder {
 	req, _ := http.NewRequest("POST", "/", strings.NewReader(eventBody))
+	log.Printf("eventBody: %s\n", eventBody)
 	w := httptest.NewRecorder()
 	w.Code = 500
 
@@ -20,10 +21,10 @@ func postWebhooks(rb *ParticleWebhook, eventBody string) *httptest.ResponseRecor
 }
 
 func TestNewItem(t *testing.T) {
-	t.Parallel()
 	var acc testutil.Accumulator
 	rb := &ParticleWebhook{Path: "/particle", acc: &acc}
 	resp := postWebhooks(rb, NewItemJSON())
+	log.Printf("Respnse: %s\n", resp.Body)
 	if resp.Code != http.StatusOK {
 		t.Errorf("POST new_item returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
 	}
@@ -31,12 +32,12 @@ func TestNewItem(t *testing.T) {
 	fields := map[string]interface{}{
 		"temp_c":    26.680000,
 		"temp_f":    80.024001,
-		"infrared":  528.0,
-		"lux":       0.0,
 		"humidity":  44.937500,
 		"pressure":  998.998901,
 		"altitude":  119.331436,
-		"broadband": 1266.0,
+		"broadband": 1266,
+		"infrared":  528,
+		"lux":       0,
 	}
 
 	tags := map[string]string{
@@ -44,54 +45,13 @@ func TestNewItem(t *testing.T) {
 		"location": "TravelingWilbury",
 	}
 
-	acc.AssertContainsTaggedFields(t, "temperature", fields, tags)
+	acc.AssertContainsTaggedFields(t, "particle_webhooks", fields, tags)
 }
-
 func TestUnknowItem(t *testing.T) {
-	t.Parallel()
+	rb := &ParticleWebhook{Path: "/particle"}
-	var acc testutil.Accumulator
-	rb := &ParticleWebhook{Path: "/particle", acc: &acc}
 	resp := postWebhooks(rb, UnknowJSON())
+	log.Printf("Response: %s\n", resp.Body)
 	if resp.Code != http.StatusOK {
 		t.Errorf("POST unknown returned HTTP status code %v.\nExpected %v", resp.Code, http.StatusOK)
 	}
 }
-
-func NewItemJSON() string {
-	return `
-	{
-	  "event": "temperature",
-	  "data": {
-		  "tags": {
-			  "id": "230035001147343438323536",
-			  "location": "TravelingWilbury"
-		  },
-		  "values": {
-			  "temp_c": 26.680000,
-			  "temp_f": 80.024001,
-			  "humidity": 44.937500,
-			  "pressure": 998.998901,
-			  "altitude": 119.331436,
-			  "broadband": 1266,
-			  "infrared": 528,
-			  "lux": 0
-		  }
-	  },
-	  "ttl": 60,
-	  "published_at": "2017-09-28T21:54:10.897Z",
-	  "coreid": "123456789938323536",
-	  "userid": "1234ee123ac8e5ec1231a123d",
-	  "version": 10,
-	  "public": false,
-	  "productID": 1234,
-	  "name": "sensor",
-	  "influx_db": "mydata"
-  }`
-}
-
-func UnknowJSON() string {
-	return `
-    {
-      "event": "roger"
-    }`
-}