IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

MM-56457: Update LastUpdateAt in UpdateMemberNotifyProps (#25984)

Browse Source 
PR https://github.com/mattermost/mattermost/pull/18114
mistakenly left out updating the lastUpdateAt of the field.

We fix that here.

https://mattermost.atlassian.net/browse/MM-56457
```release-note
NONE
```
This commit is contained in:
Agniva De Sarker 2024-01-24 03:01:25 +05:30 committed by GitHub
parent 467ab193d3
commit f246cd26b7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/channels/store/sqlstore/channel_store.go
View File

@ -1861,6 +1861,7 @@ func (s SqlChannelStore) UpdateMemberNotifyProps(channelID, userID string, props
sql, args, err2 := s.getQueryBuilder().
Update("channelmembers").
Set("notifyprops", sq.Expr("notifyprops || ?::jsonb", jsonNotifyProps)).
Set("LastUpdateAt", model.GetMillis()).
Where(sq.Eq{
"userid": userID,
"channelid": channelID,
@ -1884,6 +1885,7 @@ func (s SqlChannelStore) UpdateMemberNotifyProps(channelID, userID string, props
sql, args, err2 := s.getQueryBuilder().
Update("ChannelMembers").
Set("NotifyProps", jsonExpr).
Set("LastUpdateAt", model.GetMillis()).
Where(sq.Eq{
"UserId": userID,
"ChannelId": channelID,

5
server/channels/store/storetest/channel_store.go
View File

@ -3266,6 +3266,10 @@ func testChannelUpdateMemberNotifyProps(t *testing.T, rctx request.CTX, ss store
}
member, nErr = ss.Channel().SaveMember(member)
require.NoError(t, nErr)
then := member.LastUpdateAt
// Sleeping for a bit for the lastUpdateAt to be greater than before.
time.Sleep(10 * time.Millisecond)
props := member.NotifyProps
props["hello"] = "world"
@ -3274,6 +3278,7 @@ func testChannelUpdateMemberNotifyProps(t *testing.T, rctx request.CTX, ss store
require.NoError(t, nErr)
// Verify props.
assert.Equal(t, props, member.NotifyProps)
require.Greater(t, member.LastUpdateAt, then)
t.Run("should fail with invalid input if the notify props are too big", func(t *testing.T) {
props["property"] = strings.Repeat("Z", model.ChannelMemberNotifyPropsMaxRunes)