Bump version 5.4.0, add method to parse event object updates. Fix bug…

… in parse invoice objects from events that had a empty array for metadata

README.md

@@ -24,7 +24,7 @@ go get -u https://github.com/Invoiced/invoiced-go
 - >= Go 1.11
 
 ## Version
-5.3.0
+5.4.0
 ```go
 //Will print out the version.
 invd.Version()

connector.go

@@ -17,7 +17,7 @@ const devRequestURL = "https://api.sandbox.invoiced.com"
 const requestType = "application/json"
 const InvoicedTokenString = "invoicedToken"
 
-const version = "5.3.0"
+const version = "5.4.0"
 
 func Version() string {
 	return version

invdendpoint/events.go

@@ -3,6 +3,7 @@ package invdendpoint
 import (
 	"encoding/json"
 	"errors"
+	"strings"
 )
 
 const EventsEndPoint = "/events"
@@ -18,9 +19,10 @@ type Event struct {
 
 type EventObject struct {
 	Object *json.RawMessage  `json:"object,omitempty"`
+	PreviousObject *json.RawMessage `json:"previous,omitempty"`
 }
 
-func (e *Event) ParseEventObject() (*json.RawMessage,error) {
+func (e *Event) ParseEventObject() (*json.RawMessage, error) {
 	data := e.Data
 
 	eo := new(EventObject)
@@ -31,7 +33,7 @@ func (e *Event) ParseEventObject() (*json.RawMessage,error) {
 		return nil, err
 	}
 
-	err = json.Unmarshal(b,eo)
+	err = json.Unmarshal(b, eo)
 
 	if err != nil {
 		return nil, err
@@ -41,7 +43,32 @@ func (e *Event) ParseEventObject() (*json.RawMessage,error) {
 		return nil, errors.New("Could not parse event object")
 	}
 
-	return eo.Object,nil
+	return eo.Object, nil
+
+}
+
+func (e *Event) ParseEventPreviousObject() (*json.RawMessage, error) {
+	data := e.Data
+
+	eo := new(EventObject)
+
+	b, err := data.MarshalJSON()
+
+	if err != nil {
+		return nil, err
+	}
+
+	err = json.Unmarshal(b, eo)
+
+	if err != nil {
+		return nil, err
+	}
+
+	if eo.Object == nil {
+		return nil, errors.New("Could not parse event object")
+	}
+
+	return eo.PreviousObject, nil
 
 }
 
@@ -55,18 +82,57 @@ func (e *Event) ParseInvoiceEvent() (*Invoice,error) {
 
 	b, err := eoData.MarshalJSON()
 
+	if err != nil {
+		return nil, err
+	}
+
+	bClean := CleanMetaDataArray(b)
+
+	ie := new(Invoice)
+
+	err = json.Unmarshal(bClean,ie)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return ie, nil
+}
+
+func (e *Event) ParseInvoicePreviousEvent() (*Invoice,error) {
+	eoData, err := e.ParseEventPreviousObject()
+
+	if err != nil {
+		return nil, err
+	}
+
+	if eoData == nil {
+		return nil, err
+	}
+
+	b, err := eoData.MarshalJSON()
+
 
 	if err != nil {
 		return nil, err
 	}
 
+	bClean := CleanMetaDataArray(b)
+
 	ie := new(Invoice)
 
-	err = json.Unmarshal(b,ie)
+	err = json.Unmarshal(bClean,ie)
 
 	if err != nil {
 		return nil, err
 	}
 
 	return ie, nil
+}
+
+func CleanMetaDataArray(b []byte)[]byte {
+	s := string(b)
+	s1 := strings.Replace(s,`"metadata": []`,` "metadata": null`,-1)
+	s1 = strings.Replace(s1,`"metadata":[]`,` "metadata": null`,-1)
+	return []byte(s1)
 }