MM-11728: Avoid Archived channels editions throught Patch (#9335)

2 files changed, 11 insertions, 0 deletions

diff --git a/store/sqlstore/channel_store.go b/store/sqlstore/channel_store.go
index 6d0c7353f..fba37d7cb 100644
--- a/store/sqlstore/channel_store.go
+++ b/store/sqlstore/channel_store.go
@@ -463,6 +463,11 @@ func (s SqlChannelStore) Update(channel *model.Channel) store.StoreChannel {
 	return store.Do(func(result *store.StoreResult) {
 		channel.PreUpdate()
 
+		if channel.DeleteAt != 0 {
+			result.Err = model.NewAppError("SqlChannelStore.Update", "store.sql_channel.update.archived_channel.app_error", nil, "", http.StatusBadRequest)
+			return
+		}
+
 		if result.Err = channel.IsValid(); result.Err != nil {
 			return
 		}
diff --git a/store/storetest/channel_store.go b/store/storetest/channel_store.go
index e2f91e0c9..c827a4226 100644
--- a/store/storetest/channel_store.go
+++ b/store/storetest/channel_store.go
@@ -220,6 +220,12 @@ func testChannelStoreUpdate(t *testing.T, ss store.Store) {
 		t.Fatal(err)
 	}
 
+	o1.DeleteAt = 100
+	if err := (<-ss.Channel().Update(&o1)).Err; err == nil {
+		t.Fatal("Update should have failed because channel is archived")
+	}
+
+	o1.DeleteAt = 0
 	o1.Id = "missing"
 	if err := (<-ss.Channel().Update(&o1)).Err; err == nil {
 		t.Fatal("Update should have failed because of missing key")