From 2b4888d062d65546325470d2d9181f4a66a2fb00 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Mon, 22 Jun 2015 14:23:59 -0400 Subject: fixes mm-1316 improves channel notifications UI and updates channellist etag --- store/sql_channel_store.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'store/sql_channel_store.go') diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go index 592657c1c..0a1ea23fe 100644 --- a/store/sql_channel_store.go +++ b/store/sql_channel_store.go @@ -37,6 +37,7 @@ func NewSqlChannelStore(sqlStore *SqlStore) ChannelStore { } func (s SqlChannelStore) UpgradeSchemaIfNeeded() { + s.CreateColumnIfNotExists("ChannelMembers", "LastUpdateAt", "NotifyLevel", "bigint(20)", "0") } func (s SqlChannelStore) CreateIndexesIfNotExists() { @@ -273,6 +274,7 @@ func (s SqlChannelStore) SaveMember(member *model.ChannelMember) StoreChannel { go func() { result := StoreResult{} + member.PreSave() if result.Err = member.IsValid(); result.Err != nil { storeChannel <- result return @@ -484,7 +486,8 @@ func (s SqlChannelStore) UpdateLastViewedAt(channelId string, userId string) Sto SET ChannelMembers.MentionCount = 0, ChannelMembers.MsgCount = Channels.TotalMsgCount, - ChannelMembers.LastViewedAt = Channels.LastPostAt + ChannelMembers.LastViewedAt = Channels.LastPostAt, + ChannelMembers.LastUpdateAt = Channels.LastPostAt WHERE Channels.Id = ChannelMembers.ChannelId AND UserId = ? @@ -533,15 +536,18 @@ func (s SqlChannelStore) UpdateNotifyLevel(channelId, userId, notifyLevel string go func() { result := StoreResult{} + updateAt := model.GetMillis() + _, err := s.GetMaster().Exec( `UPDATE ChannelMembers SET - NotifyLevel = ? + NotifyLevel = ?, + LastUpdateAt = ? WHERE UserId = ? AND ChannelId = ?`, - notifyLevel, userId, channelId) + notifyLevel, updateAt, userId, channelId) if err != nil { result.Err = model.NewAppError("SqlChannelStore.UpdateNotifyLevel", "We couldn't update the notify level", "channel_id="+channelId+", user_id="+userId+", "+err.Error()) } -- cgit v1.2.3-1-g7c22 From b3168a6db8e9eb0cea57f117b0fee9a5cb440785 Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Mon, 22 Jun 2015 14:27:01 -0400 Subject: fix indenting --- store/sql_channel_store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'store/sql_channel_store.go') diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go index 0a1ea23fe..9f1e157d8 100644 --- a/store/sql_channel_store.go +++ b/store/sql_channel_store.go @@ -487,7 +487,7 @@ func (s SqlChannelStore) UpdateLastViewedAt(channelId string, userId string) Sto ChannelMembers.MentionCount = 0, ChannelMembers.MsgCount = Channels.TotalMsgCount, ChannelMembers.LastViewedAt = Channels.LastPostAt, - ChannelMembers.LastUpdateAt = Channels.LastPostAt + ChannelMembers.LastUpdateAt = Channels.LastPostAt WHERE Channels.Id = ChannelMembers.ChannelId AND UserId = ? -- cgit v1.2.3-1-g7c22 From 5ebeaffe643e111222bf613972d4d3ce16d0d6ae Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Mon, 22 Jun 2015 14:27:35 -0400 Subject: fix more indenting --- store/sql_channel_store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'store/sql_channel_store.go') diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go index 9f1e157d8..07e39df34 100644 --- a/store/sql_channel_store.go +++ b/store/sql_channel_store.go @@ -543,7 +543,7 @@ func (s SqlChannelStore) UpdateNotifyLevel(channelId, userId, notifyLevel string ChannelMembers SET NotifyLevel = ?, - LastUpdateAt = ? + LastUpdateAt = ? WHERE UserId = ? AND ChannelId = ?`, -- cgit v1.2.3-1-g7c22 From 366557b101f318b69ad854349c2414783ce1c82a Mon Sep 17 00:00:00 2001 From: JoramWilander Date: Mon, 29 Jun 2015 08:10:59 -0400 Subject: rebase touch-ups --- store/sql_channel_store.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'store/sql_channel_store.go') diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go index 07e39df34..463fce16f 100644 --- a/store/sql_channel_store.go +++ b/store/sql_channel_store.go @@ -37,7 +37,7 @@ func NewSqlChannelStore(sqlStore *SqlStore) ChannelStore { } func (s SqlChannelStore) UpgradeSchemaIfNeeded() { - s.CreateColumnIfNotExists("ChannelMembers", "LastUpdateAt", "NotifyLevel", "bigint(20)", "0") + s.CreateColumnIfNotExists("ChannelMembers", "LastUpdateAt", "NotifyLevel", "bigint(20)", "0") // Remove after 6/7/2015 prod push } func (s SqlChannelStore) CreateIndexesIfNotExists() { -- cgit v1.2.3-1-g7c22