From b3e0db012b449d6e1df6307aa01dc5039466d313 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Fri, 26 Mar 2021 17:46:56 -0400
Subject: [PATCH] MM-27380 Move collapsed categories to server (#17194)

---
 model/channel_sidebar.go                   |  1 +
 store/sqlstore/channel_store_categories.go |  1 +
 store/sqlstore/upgrade.go                  | 11 +++++++++++
 3 files changed, 13 insertions(+)

diff --git a/model/channel_sidebar.go b/model/channel_sidebar.go
index f1e58eb060..35301d1e3c 100644
--- a/model/channel_sidebar.go
+++ b/model/channel_sidebar.go
@@ -47,6 +47,7 @@ type SidebarCategory struct {
 	Type        SidebarCategoryType    `json:"type"`
 	DisplayName string                 `json:"display_name"`
 	Muted       bool                   `json:"muted"`
+	Collapsed   bool                   `json:"collapsed"`
 }
 
 // SidebarCategoryWithChannels combines data from SidebarCategory table with the Channel IDs that belong to that category
diff --git a/store/sqlstore/channel_store_categories.go b/store/sqlstore/channel_store_categories.go
index 2f4fd8bd04..f616ce34c5 100644
--- a/store/sqlstore/channel_store_categories.go
+++ b/store/sqlstore/channel_store_categories.go
@@ -650,6 +650,7 @@ func (s SqlChannelStore) UpdateSidebarCategories(userId, teamId string, categori
 			Set("DisplayName", updatedCategory.DisplayName).
 			Set("Sorting", updatedCategory.Sorting).
 			Set("Muted", updatedCategory.Muted).
+			Set("Collapsed", updatedCategory.Collapsed).
 			Where(sq.Eq{"Id": updatedCategory.Id}).ToSql()
 
 		if _, err = transaction.Exec(updateQuery, updateParams...); err != nil {
diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go
index e63bc40f1d..e5dfd85865 100644
--- a/store/sqlstore/upgrade.go
+++ b/store/sqlstore/upgrade.go
@@ -20,6 +20,7 @@ import (
 
 const (
 	CurrentSchemaVersion   = Version5340
+	Version5350            = "5.35.0"
 	Version5340            = "5.34.0"
 	Version5330            = "5.33.0"
 	Version5320            = "5.32.0"
@@ -204,6 +205,7 @@ func upgradeDatabase(sqlStore *SqlStore, currentModelVersionString string) error
 	upgradeDatabaseToVersion532(sqlStore)
 	upgradeDatabaseToVersion533(sqlStore)
 	upgradeDatabaseToVersion534(sqlStore)
+	upgradeDatabaseToVersion535(sqlStore)
 
 	return nil
 }
@@ -1003,3 +1005,12 @@ func upgradeDatabaseToVersion534(sqlStore *SqlStore) {
 		saveSchemaVersion(sqlStore, Version5340)
 	}
 }
+
+func upgradeDatabaseToVersion535(sqlStore *SqlStore) {
+	// if shouldPerformUpgrade(sqlStore, Version5340, Version5350) {
+
+	sqlStore.CreateColumnIfNotExists("SidebarCategories", "Collapsed", "tinyint(1)", "boolean", "0")
+
+	// 	saveSchemaVersion(sqlStore, Version5350)
+	// }
+}