Fixing race in update channel (#7269)

* Fixing race in update channel

* Switching to struct copy

3 files changed, 15 insertions, 1 deletions

diff --git a/model/channel.go b/model/channel.go
index 50d487557..48abd1070 100644
--- a/model/channel.go
+++ b/model/channel.go
@@ -53,6 +53,11 @@ type ChannelPatch struct {
 	Purpose     *string `json:"purpose"`
 }
 
+func (o *Channel) DeepCopy() *Channel {
+	copy := *o
+	return &copy
+}
+
 func (o *Channel) ToJson() string {
 	b, err := json.Marshal(o)
 	if err != nil {
diff --git a/model/channel_test.go b/model/channel_test.go
index ee6a70b0d..ed6aed919 100644
--- a/model/channel_test.go
+++ b/model/channel_test.go
@@ -27,6 +27,15 @@ func TestChannelJson(t *testing.T) {
 	}
 }
 
+func TestChannelCopy(t *testing.T) {
+	o := Channel{Id: NewId(), Name: NewId()}
+	ro := o.DeepCopy()
+
+	if o.Id != ro.Id {
+		t.Fatal("Ids do not match")
+	}
+}
+
 func TestChannelPatch(t *testing.T) {
 	p := &ChannelPatch{Name: new(string), DisplayName: new(string), Header: new(string), Purpose: new(string)}
 	*p.Name = NewId()
diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go
index db9c2c1f4..690b1c176 100644
--- a/store/sql_channel_store.go
+++ b/store/sql_channel_store.go
@@ -405,7 +405,7 @@ func (s SqlChannelStore) get(id string, master bool, allowFromCache bool) StoreC
 				if metrics != nil {
 					metrics.IncrementMemCacheHitCounter("Channel")
 				}
-				result.Data = cacheItem.(*model.Channel)
+				result.Data = (cacheItem.(*model.Channel)).DeepCopy()
 				storeChannel <- result
 				close(storeChannel)
 				return