5e5769c4ee
* MM-23881: global drafts endpoints and ws events Adds endpoints: - create/update drafts - delete draft - get drafts Adds WS events: - draft_updated - draft_created - draft_deleted * Ordering and WS event name fixes * Adds PostID to the drafts table In the future the drafts will include edited posts, this commit adds the post id in the combined pkey of the table. * Fixes route for deleting a thread draft * Fixes failed checks * Fixes migrations * Fixes migration * Extract translation strings * Removes PostID since we won't sync editing posts * Fixes tests * Fixes i18n * Update migrations for global drafts * update branch with latest master changes * Add feature flag for global drafts * Set global drafts feature flag default to true * Added support for files in drafts * Fix failing i18n check * Added support for deleting files in drafts * Revert "Added support for deleting files in drafts" This reverts commit 45dfd04a760359de2e8814d652c9ef46daf994f6. * Triggering new test server * Add config setting 'AllowSyncedDrafts' for syncing drafts with server * Triggering new test server * Triggering new test server * Add guard for config setting and add initial tests * Fix i18n and lint errors * Triggering new test server * Add tests for drafts * fix lint issues * Add tests for model/draft * Triggering new test server * Triggering new test server * Trigger new test server * Address PR comments * Change left join to regular join in GetDraftsForUser * Fix broken test Maybe consider adding an inclDeleted field if we want to get deleted drafts in the future * fix translations * Add store tests for drafts * fix test naming * remove comment * update migrations * set feature flag default to false * update migrations Co-authored-by: Mylon Suren <mylonsuren@gmail.com> Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
233 строки
6.7 KiB
Go
233 строки
6.7 KiB
Go
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
package api4
|
|
|
|
import (
|
|
"os"
|
|
"testing"
|
|
|
|
"github.com/mattermost/mattermost-server/v6/model"
|
|
"github.com/mattermost/mattermost-server/v6/utils/testutils"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestUpsertDraft(t *testing.T) {
|
|
os.Setenv("MM_FEATUREFLAGS_GLOBALDRAFTS", "true")
|
|
defer os.Unsetenv("MM_FEATUREFLAGS_GLOBALDRAFTS")
|
|
os.Setenv("MM_SERVICESETTINGS_ALLOWSYNCEDDRAFTS", "true")
|
|
defer os.Unsetenv("MM_SERVICESETTINGS_ALLOWSYNCEDDRAFTS")
|
|
|
|
th := Setup(t).InitBasic()
|
|
defer th.TearDown()
|
|
|
|
// set config
|
|
th.App.UpdateConfig(func(cfg *model.Config) { cfg.FeatureFlags.GlobalDrafts = true })
|
|
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.AllowSyncedDrafts = true })
|
|
|
|
client := th.Client
|
|
channel := th.BasicChannel
|
|
user := th.BasicUser
|
|
|
|
draft := &model.Draft{
|
|
CreateAt: 12345,
|
|
UpdateAt: 12345,
|
|
DeleteAt: 0,
|
|
UserId: user.Id,
|
|
ChannelId: channel.Id,
|
|
Message: "original",
|
|
}
|
|
|
|
// try to upsert draft
|
|
draftResp, _, err := client.UpsertDraft(draft)
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, draft.UserId, draftResp.UserId)
|
|
assert.Equal(t, draft.Message, draftResp.Message)
|
|
assert.Equal(t, draft.ChannelId, draftResp.ChannelId)
|
|
|
|
// upload file
|
|
sent, err := testutils.ReadTestFile("test.png")
|
|
require.NoError(t, err)
|
|
|
|
fileResp, _, err := client.UploadFile(sent, channel.Id, "test.png")
|
|
require.NoError(t, err)
|
|
|
|
draftWithFiles := draft
|
|
draftWithFiles.FileIds = []string{fileResp.FileInfos[0].Id}
|
|
|
|
// try to upsert draft with file
|
|
draftResp, _, err = client.UpsertDraft(draftWithFiles)
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, draftWithFiles.UserId, draftResp.UserId)
|
|
assert.Equal(t, draftWithFiles.Message, draftResp.Message)
|
|
assert.Equal(t, draftWithFiles.ChannelId, draftResp.ChannelId)
|
|
assert.ElementsMatch(t, draftWithFiles.FileIds, draftResp.FileIds)
|
|
|
|
// try to upsert draft for invalid channel
|
|
draftInvalidChannel := draft
|
|
draftInvalidChannel.ChannelId = "12345"
|
|
|
|
_, resp, err := client.UpsertDraft(draft)
|
|
require.Error(t, err)
|
|
CheckForbiddenStatus(t, resp)
|
|
|
|
// try to upsert draft without config setting set to true
|
|
os.Setenv("MM_SERVICESETTINGS_ALLOWSYNCEDDRAFTS", "false")
|
|
defer os.Unsetenv("MM_SERVICESETTINGS_ALLOWSYNCEDDRAFTS")
|
|
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.AllowSyncedDrafts = false })
|
|
|
|
_, resp, err = client.UpsertDraft(draft)
|
|
require.Error(t, err)
|
|
CheckNotImplementedStatus(t, resp)
|
|
}
|
|
|
|
func TestGetDrafts(t *testing.T) {
|
|
os.Setenv("MM_FEATUREFLAGS_GLOBALDRAFTS", "true")
|
|
defer os.Unsetenv("MM_FEATUREFLAGS_GLOBALDRAFTS")
|
|
os.Setenv("MM_SERVICESETTINGS_ALLOWSYNCEDDRAFTS", "true")
|
|
defer os.Unsetenv("MM_SERVICESETTINGS_ALLOWSYNCEDDRAFTS")
|
|
|
|
th := Setup(t).InitBasic()
|
|
defer th.TearDown()
|
|
|
|
th.App.UpdateConfig(func(cfg *model.Config) { cfg.FeatureFlags.GlobalDrafts = true })
|
|
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.AllowSyncedDrafts = true })
|
|
|
|
client := th.Client
|
|
channel1 := th.BasicChannel
|
|
channel2 := th.BasicChannel2
|
|
user := th.BasicUser
|
|
team := th.BasicTeam
|
|
|
|
draft1 := &model.Draft{
|
|
CreateAt: 00001,
|
|
UpdateAt: 00001,
|
|
DeleteAt: 0,
|
|
UserId: user.Id,
|
|
ChannelId: channel1.Id,
|
|
Message: "draft1",
|
|
}
|
|
|
|
draft2 := &model.Draft{
|
|
CreateAt: 11111,
|
|
UpdateAt: 32222,
|
|
DeleteAt: 0,
|
|
UserId: user.Id,
|
|
ChannelId: channel2.Id,
|
|
Message: "draft2",
|
|
}
|
|
|
|
th.App.UpdateConfig(func(cfg *model.Config) { cfg.FeatureFlags.GlobalDrafts = true })
|
|
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.AllowSyncedDrafts = true })
|
|
|
|
// upsert draft1
|
|
_, _, err := client.UpsertDraft(draft1)
|
|
require.NoError(t, err)
|
|
|
|
// upsert draft2
|
|
_, _, err = client.UpsertDraft(draft2)
|
|
require.NoError(t, err)
|
|
|
|
// try to get drafts
|
|
draftResp, _, err := client.GetDrafts(user.Id, team.Id)
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, draft2.UserId, draftResp[0].UserId)
|
|
assert.Equal(t, draft2.Message, draftResp[0].Message)
|
|
assert.Equal(t, draft2.ChannelId, draftResp[0].ChannelId)
|
|
|
|
assert.Equal(t, draft1.UserId, draftResp[1].UserId)
|
|
assert.Equal(t, draft1.Message, draftResp[1].Message)
|
|
assert.Equal(t, draft1.ChannelId, draftResp[1].ChannelId)
|
|
|
|
assert.Len(t, draftResp, 2)
|
|
|
|
// try to get drafts on invalid team
|
|
_, resp, err := client.GetDrafts(user.Id, "12345")
|
|
require.Error(t, err)
|
|
CheckForbiddenStatus(t, resp)
|
|
|
|
// try to get drafts when config is turned off
|
|
os.Setenv("MM_SERVICESETTINGS_ALLOWSYNCEDDRAFTS", "false")
|
|
defer os.Unsetenv("MM_SERVICESETTINGS_ALLOWSYNCEDDRAFTS")
|
|
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.AllowSyncedDrafts = false })
|
|
_, resp, err = client.GetDrafts(user.Id, team.Id)
|
|
require.Error(t, err)
|
|
CheckNotImplementedStatus(t, resp)
|
|
}
|
|
|
|
func TestDeleteDraft(t *testing.T) {
|
|
os.Setenv("MM_FEATUREFLAGS_GLOBALDRAFTS", "true")
|
|
defer os.Unsetenv("MM_FEATUREFLAGS_GLOBALDRAFTS")
|
|
os.Setenv("MM_SERVICESETTINGS_ALLOWSYNCEDDRAFTS", "true")
|
|
defer os.Unsetenv("MM_SERVICESETTINGS_ALLOWSYNCEDDRAFTS")
|
|
|
|
th := Setup(t).InitBasic()
|
|
defer th.TearDown()
|
|
|
|
th.App.UpdateConfig(func(cfg *model.Config) { cfg.FeatureFlags.GlobalDrafts = true })
|
|
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.AllowSyncedDrafts = true })
|
|
|
|
client := th.Client
|
|
channel1 := th.BasicChannel
|
|
channel2 := th.BasicChannel2
|
|
user := th.BasicUser
|
|
team := th.BasicTeam
|
|
|
|
draft1 := &model.Draft{
|
|
CreateAt: 00001,
|
|
UpdateAt: 00001,
|
|
DeleteAt: 0,
|
|
UserId: user.Id,
|
|
ChannelId: channel1.Id,
|
|
Message: "draft1",
|
|
RootId: "",
|
|
}
|
|
|
|
draft2 := &model.Draft{
|
|
CreateAt: 11111,
|
|
UpdateAt: 32222,
|
|
DeleteAt: 0,
|
|
UserId: user.Id,
|
|
ChannelId: channel2.Id,
|
|
Message: "draft2",
|
|
RootId: model.NewId(),
|
|
}
|
|
|
|
// upsert draft1
|
|
_, _, err := client.UpsertDraft(draft1)
|
|
require.NoError(t, err)
|
|
|
|
// upsert draft2
|
|
_, _, err = client.UpsertDraft(draft2)
|
|
require.NoError(t, err)
|
|
|
|
//get drafts
|
|
draftResp, _, err := client.GetDrafts(user.Id, team.Id)
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, draft2.UserId, draftResp[0].UserId)
|
|
assert.Equal(t, draft2.Message, draftResp[0].Message)
|
|
assert.Equal(t, draft2.ChannelId, draftResp[0].ChannelId)
|
|
|
|
assert.Equal(t, draft1.UserId, draftResp[1].UserId)
|
|
assert.Equal(t, draft1.Message, draftResp[1].Message)
|
|
assert.Equal(t, draft1.ChannelId, draftResp[1].ChannelId)
|
|
|
|
// try to delete draft1
|
|
_, _, err = client.DeleteDraft(user.Id, channel1.Id, draft1.RootId)
|
|
require.NoError(t, err)
|
|
|
|
//get drafts
|
|
draftResp, _, err = client.GetDrafts(user.Id, team.Id)
|
|
require.NoError(t, err)
|
|
|
|
assert.Equal(t, draft2.UserId, draftResp[0].UserId)
|
|
assert.Equal(t, draft2.Message, draftResp[0].Message)
|
|
assert.Equal(t, draft2.ChannelId, draftResp[0].ChannelId)
|
|
assert.Len(t, draftResp, 1)
|
|
}
|