MM-57867 Don't delete existing DM on invitation error (#27357)

* ensure channel invitations create new channels; don't delete pre-existing channels on failure cleanup

* update comment
Этот коммит содержится в:
Doug Lauder
2024-06-19 10:20:46 -04:00
коммит произвёл GitHub
родитель f41e8ad756
Коммит 8181a9ddff
2 изменённых файлов: 68 добавлений и 19 удалений

Просмотреть файл

@@ -141,7 +141,9 @@ func TestOnReceiveChannelInvite(t *testing.T) {
Payload: payload,
}
mockChannelStore := mocks.ChannelStore{}
channel := &model.Channel{}
channel := &model.Channel{
Id: invitation.ChannelId,
}
mockChannelStore.On("Get", invitation.ChannelId, true).Return(nil, &store.ErrNotFound{})
mockStore.On("Channel").Return(&mockChannelStore)
@@ -204,7 +206,9 @@ func TestOnReceiveChannelInvite(t *testing.T) {
}
mockChannelStore := mocks.ChannelStore{}
mockSharedChannelStore := mocks.SharedChannelStore{}
channel := &model.Channel{}
channel := &model.Channel{
Id: invitation.ChannelId,
}
mockUserStore := mocks.UserStore{}
mockUserStore.On("Get", mockTypeContext, tc.user1.Id).
@@ -213,6 +217,8 @@ func TestOnReceiveChannelInvite(t *testing.T) {
Return(tc.user2, nil)
mockChannelStore.On("Get", invitation.ChannelId, true).Return(nil, errors.New("boom"))
mockChannelStore.On("GetByName", "", mockTypeString, true).Return(nil, &store.ErrNotFound{})
mockSharedChannelStore.On("Save", mock.Anything).Return(nil, nil)
mockSharedChannelStore.On("SaveRemote", mock.Anything).Return(nil, nil)
mockStore.On("Channel").Return(&mockChannelStore)