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
@@ -90,6 +90,7 @@ func TestChannelStore(t *testing.T, rctx request.CTX, ss store.Store, s SqlStore
|
||||
t.Run("SaveMultipleMembers", func(t *testing.T) { testChannelSaveMultipleMembers(t, rctx, ss) })
|
||||
t.Run("UpdateMember", func(t *testing.T) { testChannelUpdateMember(t, rctx, ss) })
|
||||
t.Run("UpdateMemberNotifyProps", func(t *testing.T) { testChannelUpdateMemberNotifyProps(t, rctx, ss) })
|
||||
t.Run("PatchMultipleMembersNotifyProps", func(t *testing.T) { testChannelPatchMultipleMembersNotifyProps(t, rctx, ss) })
|
||||
t.Run("UpdateMultipleMembers", func(t *testing.T) { testChannelUpdateMultipleMembers(t, rctx, ss) })
|
||||
t.Run("RemoveMember", func(t *testing.T) { testChannelRemoveMember(t, rctx, ss) })
|
||||
t.Run("RemoveMembers", func(t *testing.T) { testChannelRemoveMembers(t, rctx, ss) })
|
||||
@@ -3283,6 +3284,133 @@ func testChannelUpdateMemberNotifyProps(t *testing.T, rctx request.CTX, ss store
|
||||
})
|
||||
}
|
||||
|
||||
func testChannelPatchMultipleMembersNotifyProps(t *testing.T, rctx request.CTX, ss store.Store) {
|
||||
t.Run("should save multiple channel members' notify props at once", func(t *testing.T) {
|
||||
channel1, err := ss.Channel().Save(&model.Channel{
|
||||
Name: model.NewId(),
|
||||
Type: model.ChannelTypeOpen,
|
||||
}, -1)
|
||||
require.NoError(t, err)
|
||||
channel2, err := ss.Channel().Save(&model.Channel{
|
||||
Name: model.NewId(),
|
||||
Type: model.ChannelTypeOpen,
|
||||
}, -1)
|
||||
require.NoError(t, err)
|
||||
|
||||
user1, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()})
|
||||
require.NoError(t, err)
|
||||
user2, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()})
|
||||
require.NoError(t, err)
|
||||
original1, err := ss.Channel().SaveMember(&model.ChannelMember{
|
||||
ChannelId: channel1.Id,
|
||||
UserId: user1.Id,
|
||||
NotifyProps: model.GetDefaultChannelNotifyProps(),
|
||||
})
|
||||
require.NoError(t, err)
|
||||
original2, err := ss.Channel().SaveMember(&model.ChannelMember{
|
||||
ChannelId: channel1.Id,
|
||||
UserId: user2.Id,
|
||||
NotifyProps: model.GetDefaultChannelNotifyProps(),
|
||||
})
|
||||
require.NoError(t, err)
|
||||
original3, err := ss.Channel().SaveMember(&model.ChannelMember{
|
||||
ChannelId: channel2.Id,
|
||||
UserId: user1.Id,
|
||||
NotifyProps: model.GetDefaultChannelNotifyProps(),
|
||||
})
|
||||
require.NoError(t, err)
|
||||
|
||||
require.Equal(t, model.ChannelNotifyDefault, original1.NotifyProps[model.DesktopNotifyProp])
|
||||
require.Equal(t, model.ChannelAutoFollowThreadsOff, original1.NotifyProps[model.ChannelAutoFollowThreads])
|
||||
require.Equal(t, "", original1.NotifyProps["test_key"])
|
||||
require.Equal(t, model.ChannelNotifyDefault, original2.NotifyProps[model.DesktopNotifyProp])
|
||||
require.Equal(t, model.ChannelAutoFollowThreadsOff, original2.NotifyProps[model.ChannelAutoFollowThreads])
|
||||
require.Equal(t, "", original2.NotifyProps["test_key"])
|
||||
require.Equal(t, model.ChannelNotifyDefault, original3.NotifyProps[model.DesktopNotifyProp])
|
||||
require.Equal(t, model.ChannelAutoFollowThreadsOff, original3.NotifyProps[model.ChannelAutoFollowThreads])
|
||||
require.Equal(t, "", original3.NotifyProps["test_key"])
|
||||
|
||||
// Sleep for 1ms to ensure that the LastUpdateAt will change
|
||||
time.Sleep(1 * time.Millisecond)
|
||||
|
||||
// Save the channel members
|
||||
updated, err := ss.Channel().PatchMultipleMembersNotifyProps(
|
||||
[]*model.ChannelMemberIdentifier{
|
||||
{
|
||||
ChannelId: original1.ChannelId,
|
||||
UserId: original1.UserId,
|
||||
},
|
||||
{
|
||||
ChannelId: original2.ChannelId,
|
||||
UserId: original2.UserId,
|
||||
},
|
||||
{
|
||||
ChannelId: original3.ChannelId,
|
||||
UserId: original3.UserId,
|
||||
},
|
||||
},
|
||||
map[string]string{
|
||||
model.ChannelAutoFollowThreads: model.ChannelAutoFollowThreadsOff,
|
||||
"test_key": "test_value",
|
||||
},
|
||||
)
|
||||
|
||||
require.NoError(t, err)
|
||||
|
||||
// Ensure the specified fields changed and that the unspecified fields did not
|
||||
assert.Equal(t, original1.NotifyProps[model.DesktopNotifyProp], updated[0].NotifyProps[model.DesktopNotifyProp])
|
||||
assert.Equal(t, model.ChannelAutoFollowThreadsOff, updated[0].NotifyProps[model.ChannelAutoFollowThreads])
|
||||
assert.Equal(t, "test_value", updated[0].NotifyProps["test_key"])
|
||||
assert.Equal(t, original2.NotifyProps[model.DesktopNotifyProp], updated[1].NotifyProps[model.DesktopNotifyProp])
|
||||
assert.Equal(t, model.ChannelAutoFollowThreadsOff, updated[1].NotifyProps[model.ChannelAutoFollowThreads])
|
||||
assert.Equal(t, "test_value", updated[1].NotifyProps["test_key"])
|
||||
assert.Equal(t, original3.NotifyProps[model.DesktopNotifyProp], updated[2].NotifyProps[model.DesktopNotifyProp])
|
||||
assert.Equal(t, model.ChannelAutoFollowThreadsOff, updated[2].NotifyProps[model.ChannelAutoFollowThreads])
|
||||
assert.Equal(t, "test_value", updated[2].NotifyProps["test_key"])
|
||||
|
||||
assert.Equal(t, original1.NotifyProps[model.DesktopNotifyProp], updated[0].NotifyProps[model.DesktopNotifyProp])
|
||||
assert.Equal(t, original2.NotifyProps[model.DesktopNotifyProp], updated[1].NotifyProps[model.DesktopNotifyProp])
|
||||
assert.Equal(t, original3.NotifyProps[model.DesktopNotifyProp], updated[2].NotifyProps[model.DesktopNotifyProp])
|
||||
|
||||
// Ensure that LastUpdateAt was updated
|
||||
assert.Greater(t, updated[0].LastUpdateAt, original1.LastUpdateAt)
|
||||
assert.Greater(t, updated[1].LastUpdateAt, original2.LastUpdateAt)
|
||||
assert.Greater(t, updated[2].LastUpdateAt, original3.LastUpdateAt)
|
||||
})
|
||||
|
||||
t.Run("should not allow saving invalid notify props", func(t *testing.T) {
|
||||
channel, err := ss.Channel().Save(&model.Channel{
|
||||
Name: model.NewId(),
|
||||
Type: model.ChannelTypeOpen,
|
||||
}, -1)
|
||||
require.NoError(t, err)
|
||||
|
||||
user, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()})
|
||||
require.NoError(t, err)
|
||||
_, err = ss.Channel().SaveMember(&model.ChannelMember{
|
||||
ChannelId: channel.Id,
|
||||
UserId: user.Id,
|
||||
NotifyProps: model.GetDefaultChannelNotifyProps(),
|
||||
})
|
||||
require.NoError(t, err)
|
||||
|
||||
// Save the channel member
|
||||
_, err = ss.Channel().PatchMultipleMembersNotifyProps(
|
||||
[]*model.ChannelMemberIdentifier{
|
||||
{
|
||||
ChannelId: channel.Id,
|
||||
UserId: user.Id,
|
||||
},
|
||||
},
|
||||
map[string]string{
|
||||
model.MarkUnreadNotifyProp: "garbage",
|
||||
},
|
||||
)
|
||||
|
||||
assert.Error(t, err)
|
||||
})
|
||||
}
|
||||
|
||||
func testChannelRemoveMember(t *testing.T, rctx request.CTX, ss store.Store) {
|
||||
u1, err := ss.User().Save(&model.User{Username: model.NewId(), Email: MakeEmail()})
|
||||
require.NoError(t, err)
|
||||
|
||||
@@ -1943,6 +1943,32 @@ func (_m *ChannelStore) MigrateChannelMembers(fromChannelID string, fromUserID s
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// PatchMultipleMembersNotifyProps provides a mock function with given fields: members, notifyProps
|
||||
func (_m *ChannelStore) PatchMultipleMembersNotifyProps(members []*model.ChannelMemberIdentifier, notifyProps map[string]string) ([]*model.ChannelMember, error) {
|
||||
ret := _m.Called(members, notifyProps)
|
||||
|
||||
var r0 []*model.ChannelMember
|
||||
var r1 error
|
||||
if rf, ok := ret.Get(0).(func([]*model.ChannelMemberIdentifier, map[string]string) ([]*model.ChannelMember, error)); ok {
|
||||
return rf(members, notifyProps)
|
||||
}
|
||||
if rf, ok := ret.Get(0).(func([]*model.ChannelMemberIdentifier, map[string]string) []*model.ChannelMember); ok {
|
||||
r0 = rf(members, notifyProps)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).([]*model.ChannelMember)
|
||||
}
|
||||
}
|
||||
|
||||
if rf, ok := ret.Get(1).(func([]*model.ChannelMemberIdentifier, map[string]string) error); ok {
|
||||
r1 = rf(members, notifyProps)
|
||||
} else {
|
||||
r1 = ret.Error(1)
|
||||
}
|
||||
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// PermanentDelete provides a mock function with given fields: ctx, channelID
|
||||
func (_m *ChannelStore) PermanentDelete(ctx request.CTX, channelID string) error {
|
||||
ret := _m.Called(ctx, channelID)
|
||||
|
||||
Ссылка в новой задаче
Block a user