From 46f969e5ddbe4404dbc82dbe78ab2fa101d9922e Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Thu, 21 Jun 2018 13:42:20 -0400
Subject: MM-10425 Include active_channel in cluster update user status
 messages (#8967)

* Include active_channel in cluster update user status messages

* Update to use new ToJson method

* Update tests
---
 model/status.go | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'model/status.go')

diff --git a/model/status.go b/model/status.go
index cf5899446..7888c60a4 100644
--- a/model/status.go
+++ b/model/status.go
@@ -24,10 +24,18 @@ type Status struct {
 	Status         string `json:"status"`
 	Manual         bool   `json:"manual"`
 	LastActivityAt int64  `json:"last_activity_at"`
-	ActiveChannel  string `json:"-" db:"-"`
+	ActiveChannel  string `json:"active_channel,omitempty" db:"-"`
 }
 
 func (o *Status) ToJson() string {
+	tempChannelId := o.ActiveChannel
+	o.ActiveChannel = ""
+	b, _ := json.Marshal(o)
+	o.ActiveChannel = tempChannelId
+	return string(b)
+}
+
+func (o *Status) ToClusterJson() string {
 	b, _ := json.Marshal(o)
 	return string(b)
 }
@@ -39,7 +47,18 @@ func StatusFromJson(data io.Reader) *Status {
 }
 
 func StatusListToJson(u []*Status) string {
+	activeChannels := make([]string, len(u))
+	for index, s := range u {
+		activeChannels[index] = s.ActiveChannel
+		s.ActiveChannel = ""
+	}
+
 	b, _ := json.Marshal(u)
+
+	for index, s := range u {
+		s.ActiveChannel = activeChannels[index]
+	}
+
 	return string(b)
 }
 
-- 
cgit v1.2.3-1-g7c22