Merge pull request #16 from mokejp/event-marshaling

implements Marshaler to Event
line · Oct 3, 2016 · 547c8a8 · 547c8a8
2 parents fdf8ef7 + 4dd8100
commit 547c8a8
Show file tree

Hide file tree

Showing 2 changed files with 114 additions and 26 deletions.
diff --git a/linebot/event.go b/linebot/event.go
@@ -46,9 +46,9 @@ const (
 // EventSource type
 type EventSource struct {
 	Type    EventSourceType `json:"type"`
-	UserID  string          `json:"userId"`
-	GroupID string          `json:"groupId"`
-	RoomID  string          `json:"roomId"`
+	UserID  string          `json:"userId,omitempty"`
+	GroupID string          `json:"groupId,omitempty"`
+	RoomID  string          `json:"roomId,omitempty"`
 }
 
 // Postback type
@@ -81,41 +81,99 @@ type Event struct {
 	Beacon     *Beacon
 }
 
+type rawEvent struct {
+	ReplyToken string           `json:"replyToken,omitempty"`
+	Type       EventType        `json:"type"`
+	Timestamp  int64            `json:"timestamp"`
+	Source     *EventSource     `json:"source"`
+	Message    *rawEventMessage `json:"message,omitempty"`
+	*Postback  `json:"postback,omitempty"`
+	*Beacon    `json:"beacon,omitempty"`
+}
+
+type rawEventMessage struct {
+	ID        string      `json:"id"`
+	Type      MessageType `json:"type"`
+	Text      string      `json:"text,omitempty"`
+	Duration  int         `json:"duration,omitempty"`
+	Title     string      `json:"title,omitempty"`
+	Address   string      `json:"address,omitempty"`
+	Latitude  float64     `json:"latitude,omitempty"`
+	Longitude float64     `json:"longitude,omitempty"`
+	PackageID string      `json:"packageId,omitempty"`
+	StickerID string      `json:"stickerId,omitempty"`
+}
+
 const (
 	millisecPerSec     = int64(time.Second / time.Millisecond)
 	nanosecPerMillisec = int64(time.Millisecond / time.Nanosecond)
 )
 
+// MarshalJSON method of Event
+func (e *Event) MarshalJSON() ([]byte, error) {
+	raw := rawEvent{
+		ReplyToken: e.ReplyToken,
+		Type:       e.Type,
+		Timestamp:  e.Timestamp.Unix()*millisecPerSec + int64(e.Timestamp.Nanosecond())/int64(time.Millisecond),
+		Source:     e.Source,
+		Postback:   e.Postback,
+		Beacon:     e.Beacon,
+	}
+
+	switch m := e.Message.(type) {
+	case *TextMessage:
+		raw.Message = &rawEventMessage{
+			Type: MessageTypeText,
+			ID:   m.ID,
+			Text: m.Text,
+		}
+	case *ImageMessage:
+		raw.Message = &rawEventMessage{
+			Type: MessageTypeImage,
+			ID:   m.ID,
+		}
+	case *VideoMessage:
+		raw.Message = &rawEventMessage{
+			Type: MessageTypeVideo,
+			ID:   m.ID,
+		}
+	case *AudioMessage:
+		raw.Message = &rawEventMessage{
+			Type:     MessageTypeAudio,
+			ID:       m.ID,
+			Duration: m.Duration,
+		}
+	case *LocationMessage:
+		raw.Message = &rawEventMessage{
+			Type:      MessageTypeLocation,
+			ID:        m.ID,
+			Title:     m.Title,
+			Address:   m.Address,
+			Latitude:  m.Latitude,
+			Longitude: m.Longitude,
+		}
+	case *StickerMessage:
+		raw.Message = &rawEventMessage{
+			Type:      MessageTypeSticker,
+			ID:        m.ID,
+			PackageID: m.PackageID,
+			StickerID: m.StickerID,
+		}
+	}
+	return json.Marshal(&raw)
+}
+
 // UnmarshalJSON method of Event
 func (e *Event) UnmarshalJSON(body []byte) (err error) {
-	rawEvent := struct {
-		ReplyToken string      `json:"replyToken"`
-		Type       EventType   `json:"type"`
-		Timestamp  int64       `json:"timestamp"`
-		Source     EventSource `json:"source"`
-		Message    struct {
-			ID        string      `json:"id"`
-			Type      MessageType `json:"type"`
-			Text      string      `json:"text"`
-			Duration  int         `json:"duration"`
-			Title     string      `json:"title"`
-			Address   string      `json:"address"`
-			Latitude  float64     `json:"latitude"`
-			Longitude float64     `json:"longitude"`
-			PackageID string      `json:"packageId"`
-			StickerID string      `json:"stickerId"`
-		} `json:"message"`
-		Postback `json:"postback"`
-		Beacon   `json:"beacon"`
-	}{}
+	rawEvent := rawEvent{}
 	if err = json.Unmarshal(body, &rawEvent); err != nil {
 		return
 	}
 
 	e.ReplyToken = rawEvent.ReplyToken
 	e.Type = rawEvent.Type
 	e.Timestamp = time.Unix(rawEvent.Timestamp/millisecPerSec, (rawEvent.Timestamp%millisecPerSec)*nanosecPerMillisec).UTC()
-	e.Source = &rawEvent.Source
+	e.Source = rawEvent.Source
 
 	switch rawEvent.Type {
 	case EventTypeMessage:
@@ -154,9 +212,9 @@ func (e *Event) UnmarshalJSON(body []byte) (err error) {
 			}
 		}
 	case EventTypePostback:
-		e.Postback = &rawEvent.Postback
+		e.Postback = rawEvent.Postback
 	case EventTypeBeacon:
-		e.Beacon = &rawEvent.Beacon
+		e.Beacon = rawEvent.Beacon
 	}
 	return
 }
diff --git a/linebot/webhook_test.go b/linebot/webhook_test.go
@@ -20,6 +20,7 @@ import (
 	"crypto/sha256"
 	"crypto/tls"
 	"encoding/base64"
+	"encoding/json"
 	"net/http"
 	"net/http/httptest"
 	"reflect"
@@ -372,6 +373,35 @@ func TestParseRequest(t *testing.T) {
 	}
 }
 
+func TestEventMarshaling(t *testing.T) {
+	testCases := &struct {
+		Events []map[string]interface{} `json:"events"`
+	}{}
+	err := json.Unmarshal([]byte(webhookTestRequestBody), testCases)
+	if err != nil {
+		t.Fatal(err)
+	}
+	for i, want := range testCases.Events {
+		if err != nil {
+			t.Fatal(err)
+		}
+		e := webhookTestWantEvents[i]
+		gotJSON, err := json.Marshal(&e)
+		if err != nil {
+			t.Error(err)
+			continue
+		}
+		got := map[string]interface{}{}
+		err = json.Unmarshal(gotJSON, &got)
+		if err != nil {
+			t.Fatal(err)
+		}
+		if !reflect.DeepEqual(got, want) {
+			t.Errorf("Event marshal %d %q; want %q", i, got, want)
+		}
+	}
+}
+
 func BenchmarkParseRequest(b *testing.B) {
 	body := []byte(webhookTestRequestBody)
 	client, err := New("testsecret", "testtoken")