MM-56083 Add PatchMultipleMembersNotifyProps plugin API (#25690)
* Add ChannelStore.UpdateMultipleMembersNotifyProps * Make UpdateMultipleMembersNotifyProps return updated values from the DB * Add UpdateChannelMembersNotifications plugin API * Extract i18n * Fix style * Make layers * Change to PatchMultipleMembersNotifyProps * Add limit to PatchChannelMembersNotifyProps * Add additional unit tests * Address feedback * Lowercase decodeJSON * Have PatchMultipleMembersNotifyProps update LastUpdateAt * Fix tests that relied on unreliable return order * Fix i18n
Этот коммит содержится в:
Harrison Healey
коммит произвёл
GitHub
GitHub
родитель
aafe7439af
Коммит
4d96c11314
@@ -2670,3 +2670,130 @@ func TestConvertGroupMessageToChannel(t *testing.T) {
|
||||
require.Nil(t, appErr)
|
||||
require.Equal(t, model.ChannelTypePrivate, convertedChannel.Type)
|
||||
}
|
||||
|
||||
func TestPatchChannelMembersNotifyProps(t *testing.T) {
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
|
||||
t.Run("should update multiple users' notify props", func(t *testing.T) {
|
||||
user1 := th.CreateUser()
|
||||
user2 := th.CreateUser()
|
||||
|
||||
channel1 := th.CreateChannel(th.Context, th.BasicTeam)
|
||||
channel2 := th.CreateChannel(th.Context, th.BasicTeam)
|
||||
|
||||
th.LinkUserToTeam(user1, th.BasicTeam)
|
||||
th.LinkUserToTeam(user2, th.BasicTeam)
|
||||
th.AddUserToChannel(user1, channel1)
|
||||
th.AddUserToChannel(user1, channel2)
|
||||
th.AddUserToChannel(user2, channel1)
|
||||
th.AddUserToChannel(user2, channel2)
|
||||
|
||||
result, appErr := th.App.PatchChannelMembersNotifyProps(th.Context, []*model.ChannelMemberIdentifier{
|
||||
{UserId: user1.Id, ChannelId: channel1.Id},
|
||||
{UserId: user1.Id, ChannelId: channel2.Id},
|
||||
{UserId: user2.Id, ChannelId: channel1.Id},
|
||||
}, map[string]string{
|
||||
model.DesktopNotifyProp: model.ChannelNotifyNone,
|
||||
"custom_key": "custom_value",
|
||||
})
|
||||
|
||||
require.Nil(t, appErr)
|
||||
|
||||
// Confirm specified fields were updated
|
||||
assert.Equal(t, model.ChannelNotifyNone, result[0].NotifyProps[model.DesktopNotifyProp])
|
||||
assert.Equal(t, "custom_value", result[0].NotifyProps["custom_key"])
|
||||
assert.Equal(t, model.ChannelNotifyNone, result[1].NotifyProps[model.DesktopNotifyProp])
|
||||
assert.Equal(t, "custom_value", result[1].NotifyProps["custom_key"])
|
||||
assert.Equal(t, model.ChannelNotifyNone, result[2].NotifyProps[model.DesktopNotifyProp])
|
||||
assert.Equal(t, "custom_value", result[2].NotifyProps["custom_key"])
|
||||
|
||||
// Confirm unspecified fields were unchanged
|
||||
assert.Equal(t, model.ChannelNotifyDefault, result[0].NotifyProps[model.PushNotifyProp])
|
||||
assert.Equal(t, model.ChannelNotifyDefault, result[1].NotifyProps[model.PushNotifyProp])
|
||||
assert.Equal(t, model.ChannelNotifyDefault, result[2].NotifyProps[model.PushNotifyProp])
|
||||
|
||||
// Confirm other members were unchanged
|
||||
otherMember, appErr := th.App.GetChannelMember(th.Context, channel2.Id, user2.Id)
|
||||
|
||||
require.Nil(t, appErr)
|
||||
|
||||
assert.Equal(t, model.ChannelNotifyDefault, otherMember.NotifyProps[model.DesktopNotifyProp])
|
||||
assert.Equal(t, "", otherMember.NotifyProps["custom_key"])
|
||||
assert.Equal(t, model.ChannelNotifyDefault, otherMember.NotifyProps[model.PushNotifyProp])
|
||||
})
|
||||
|
||||
t.Run("should send WS events for each user", func(t *testing.T) {
|
||||
user1 := th.CreateUser()
|
||||
user2 := th.CreateUser()
|
||||
|
||||
channel1 := th.CreateChannel(th.Context, th.BasicTeam)
|
||||
channel2 := th.CreateChannel(th.Context, th.BasicTeam)
|
||||
|
||||
th.LinkUserToTeam(user1, th.BasicTeam)
|
||||
th.LinkUserToTeam(user2, th.BasicTeam)
|
||||
th.AddUserToChannel(user1, channel1)
|
||||
th.AddUserToChannel(user1, channel2)
|
||||
th.AddUserToChannel(user2, channel1)
|
||||
|
||||
messages1, closeWS1 := connectFakeWebSocket(t, th, user1.Id, "")
|
||||
defer closeWS1()
|
||||
messages2, closeWS2 := connectFakeWebSocket(t, th, user2.Id, "")
|
||||
defer closeWS2()
|
||||
|
||||
_, appErr := th.App.PatchChannelMembersNotifyProps(th.Context, []*model.ChannelMemberIdentifier{
|
||||
{UserId: user1.Id, ChannelId: channel1.Id},
|
||||
{UserId: user1.Id, ChannelId: channel2.Id},
|
||||
{UserId: user2.Id, ChannelId: channel1.Id},
|
||||
}, map[string]string{
|
||||
model.DesktopNotifyProp: model.ChannelNotifyNone,
|
||||
"custom_key": "custom_value",
|
||||
})
|
||||
|
||||
require.Nil(t, appErr)
|
||||
|
||||
// User1, Channel1
|
||||
received := <-messages1
|
||||
assert.Equal(t, model.WebsocketEventChannelMemberUpdated, received.EventType())
|
||||
|
||||
member := decodeJSON(received.GetData()["channelMember"], &model.ChannelMember{})
|
||||
assert.Equal(t, user1.Id, member.UserId)
|
||||
assert.Contains(t, []string{channel1.Id, channel2.Id}, member.ChannelId)
|
||||
assert.Equal(t, model.ChannelNotifyNone, member.NotifyProps[model.DesktopNotifyProp])
|
||||
assert.Equal(t, "custom_value", member.NotifyProps["custom_key"])
|
||||
assert.Equal(t, model.ChannelNotifyDefault, member.NotifyProps[model.PushNotifyProp])
|
||||
|
||||
// User1, Channel2
|
||||
received = <-messages1
|
||||
assert.Equal(t, model.WebsocketEventChannelMemberUpdated, received.EventType())
|
||||
|
||||
member = decodeJSON(received.GetData()["channelMember"], &model.ChannelMember{})
|
||||
assert.Equal(t, user1.Id, member.UserId)
|
||||
assert.Contains(t, []string{channel1.Id, channel2.Id}, member.ChannelId)
|
||||
assert.Equal(t, model.ChannelNotifyNone, member.NotifyProps[model.DesktopNotifyProp])
|
||||
assert.Equal(t, "custom_value", member.NotifyProps["custom_key"])
|
||||
assert.Equal(t, model.ChannelNotifyDefault, member.NotifyProps[model.PushNotifyProp])
|
||||
|
||||
// User2, Channel1
|
||||
received = <-messages2
|
||||
assert.Equal(t, model.WebsocketEventChannelMemberUpdated, received.EventType())
|
||||
|
||||
member = decodeJSON(received.GetData()["channelMember"], &model.ChannelMember{})
|
||||
assert.Equal(t, user2.Id, member.UserId)
|
||||
assert.Equal(t, channel1.Id, member.ChannelId)
|
||||
assert.Equal(t, model.ChannelNotifyNone, member.NotifyProps[model.DesktopNotifyProp])
|
||||
assert.Equal(t, "custom_value", member.NotifyProps["custom_key"])
|
||||
assert.Equal(t, model.ChannelNotifyDefault, member.NotifyProps[model.PushNotifyProp])
|
||||
})
|
||||
|
||||
t.Run("should return an error when trying to update too many users at once", func(t *testing.T) {
|
||||
identifiers := make([]*model.ChannelMemberIdentifier, 201)
|
||||
for i := 0; i < len(identifiers); i++ {
|
||||
identifiers[i] = &model.ChannelMemberIdentifier{UserId: "fakeuser", ChannelId: "fakechannel"}
|
||||
}
|
||||
|
||||
_, appErr := th.App.PatchChannelMembersNotifyProps(th.Context, identifiers, map[string]string{})
|
||||
|
||||
assert.NotNil(t, appErr)
|
||||
})
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user