* MM-48614: saves priority for drafts Adds a new column in the drafts table, "priority". This way we can save post's priority in the draft. Fixes OmitConnectionId, which when you published a ws event for a user was getting bypassed. Fixes Get for drafts returns deleted ones as well, which is needed for upsert. * Adds test case for the OmitConnectionId * Addresses review comments, removes DeleteAt * Vets * Adds missing translation * Re-instates DeleteAt column * Adds separate case to get draft including deleted * Fixes Update Draft * Empty
261 строка
6.4 KiB
Go
261 строка
6.4 KiB
Go
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
|
|
// See LICENSE.txt for license information.
|
|
|
|
package sqlstore
|
|
|
|
import (
|
|
"database/sql"
|
|
"sync"
|
|
|
|
sq "github.com/mattermost/squirrel"
|
|
"github.com/pkg/errors"
|
|
|
|
"github.com/mattermost/mattermost-server/v6/einterfaces"
|
|
"github.com/mattermost/mattermost-server/v6/model"
|
|
"github.com/mattermost/mattermost-server/v6/shared/mlog"
|
|
"github.com/mattermost/mattermost-server/v6/store"
|
|
)
|
|
|
|
type SqlDraftStore struct {
|
|
*SqlStore
|
|
metrics einterfaces.MetricsInterface
|
|
maxDraftSizeOnce sync.Once
|
|
maxDraftSizeCached int
|
|
}
|
|
|
|
func draftSliceColumns() []string {
|
|
return []string{
|
|
"CreateAt",
|
|
"UpdateAt",
|
|
"DeleteAt",
|
|
"Message",
|
|
"RootId",
|
|
"ChannelId",
|
|
"UserId",
|
|
"FileIds",
|
|
"Props",
|
|
"Priority",
|
|
}
|
|
}
|
|
|
|
func draftToSlice(draft *model.Draft) []interface{} {
|
|
return []interface{}{
|
|
draft.CreateAt,
|
|
draft.UpdateAt,
|
|
draft.DeleteAt,
|
|
draft.Message,
|
|
draft.RootId,
|
|
draft.ChannelId,
|
|
draft.UserId,
|
|
model.ArrayToJSON(draft.FileIds),
|
|
model.StringInterfaceToJSON(draft.Props),
|
|
model.StringInterfaceToJSON(draft.Priority),
|
|
}
|
|
}
|
|
|
|
func newSqlDraftStore(sqlStore *SqlStore, metrics einterfaces.MetricsInterface) store.DraftStore {
|
|
return &SqlDraftStore{
|
|
SqlStore: sqlStore,
|
|
metrics: metrics,
|
|
maxDraftSizeCached: model.PostMessageMaxRunesV1,
|
|
}
|
|
}
|
|
|
|
func (s *SqlDraftStore) Get(userId, channelId, rootId string, includeDeleted bool) (*model.Draft, error) {
|
|
query := s.getQueryBuilder().
|
|
Select(draftSliceColumns()...).
|
|
From("Drafts").
|
|
Where(sq.Eq{
|
|
"UserId": userId,
|
|
"ChannelId": channelId,
|
|
"RootId": rootId,
|
|
})
|
|
|
|
if !includeDeleted {
|
|
query = query.Where(sq.Eq{"DeleteAt": 0})
|
|
}
|
|
|
|
dt := model.Draft{}
|
|
err := s.GetReplicaX().GetBuilder(&dt, query)
|
|
|
|
if err != nil {
|
|
if err == sql.ErrNoRows {
|
|
return nil, store.NewErrNotFound("Draft", channelId)
|
|
}
|
|
return nil, errors.Wrapf(err, "failed to find draft with channelid = %s", channelId)
|
|
}
|
|
|
|
return &dt, nil
|
|
}
|
|
|
|
func (s *SqlDraftStore) Save(draft *model.Draft) (*model.Draft, error) {
|
|
draft.PreSave()
|
|
maxDraftSize := s.GetMaxDraftSize()
|
|
if err := draft.IsValid(maxDraftSize); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
builder := s.getQueryBuilder().Insert("Drafts").Columns(draftSliceColumns()...).Values(draftToSlice(draft)...)
|
|
query, args, err := builder.ToSql()
|
|
|
|
if err != nil {
|
|
return nil, errors.Wrap(err, "save_draft_tosql")
|
|
}
|
|
|
|
if _, err = s.GetMasterX().Exec(query, args...); err != nil {
|
|
return nil, errors.Wrap(err, "failed to save Draft")
|
|
}
|
|
|
|
return draft, nil
|
|
}
|
|
|
|
func (s *SqlDraftStore) Update(draft *model.Draft) (*model.Draft, error) {
|
|
draft.PreUpdate()
|
|
|
|
maxDraftSize := s.GetMaxDraftSize()
|
|
if err := draft.IsValid(maxDraftSize); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
query := s.getQueryBuilder().
|
|
Update("Drafts").
|
|
Set("UpdateAt", draft.UpdateAt).
|
|
Set("Message", draft.Message).
|
|
Set("Props", draft.Props).
|
|
Set("FileIds", draft.FileIds).
|
|
Set("Priority", draft.Priority).
|
|
Set("DeleteAt", 0).
|
|
Where(sq.Eq{
|
|
"UserId": draft.UserId,
|
|
"ChannelId": draft.ChannelId,
|
|
"RootId": draft.RootId,
|
|
})
|
|
|
|
if _, err := s.GetMasterX().ExecBuilder(query); err != nil {
|
|
return nil, errors.Wrapf(err, "failed to update Draft with channelid=%s", draft.ChannelId)
|
|
}
|
|
|
|
return draft, nil
|
|
}
|
|
|
|
func (s *SqlDraftStore) GetDraftsForUser(userID, teamID string) ([]*model.Draft, error) {
|
|
var drafts []*model.Draft
|
|
|
|
query := s.getQueryBuilder().
|
|
Select(
|
|
"Drafts.CreateAt",
|
|
"Drafts.UpdateAt",
|
|
"Drafts.Message",
|
|
"Drafts.RootId",
|
|
"Drafts.ChannelId",
|
|
"Drafts.UserId",
|
|
"Drafts.FileIds",
|
|
"Drafts.Props",
|
|
"Drafts.Priority",
|
|
).
|
|
From("Drafts").
|
|
InnerJoin("ChannelMembers ON ChannelMembers.ChannelId = Drafts.ChannelId").
|
|
Where(sq.And{
|
|
sq.Eq{"Drafts.DeleteAt": 0},
|
|
sq.Eq{"Drafts.UserId": userID},
|
|
sq.Eq{"ChannelMembers.UserId": userID},
|
|
}).
|
|
OrderBy("Drafts.UpdateAt DESC")
|
|
|
|
if teamID != "" {
|
|
query = query.
|
|
Join("Channels ON Drafts.ChannelId = Channels.Id").
|
|
Where(sq.Or{
|
|
sq.Eq{"Channels.TeamId": teamID},
|
|
sq.Eq{"Channels.TeamId": ""},
|
|
})
|
|
}
|
|
|
|
err := s.GetReplicaX().SelectBuilder(&drafts, query)
|
|
|
|
if err != nil {
|
|
return nil, errors.Wrap(err, "failed to get user drafts")
|
|
}
|
|
|
|
return drafts, nil
|
|
}
|
|
|
|
func (s *SqlDraftStore) Delete(userID, channelID, rootID string) error {
|
|
time := model.GetMillis()
|
|
query := s.getQueryBuilder().
|
|
Update("Drafts").
|
|
Set("UpdateAt", time).
|
|
Set("DeleteAt", time).
|
|
Where(sq.Eq{
|
|
"UserId": userID,
|
|
"ChannelId": channelID,
|
|
"RootId": rootID,
|
|
})
|
|
|
|
sql, args, err := query.ToSql()
|
|
if err != nil {
|
|
return errors.Wrapf(err, "failed to convert to sql")
|
|
}
|
|
|
|
_, err = s.GetMasterX().Exec(sql, args...)
|
|
|
|
if err != nil {
|
|
return errors.Wrap(err, "failed to delete Draft")
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// GetMaxDraftSize returns the maximum number of runes that may be stored in a post.
|
|
func (s *SqlDraftStore) GetMaxDraftSize() int {
|
|
s.maxDraftSizeOnce.Do(func() {
|
|
s.maxDraftSizeCached = s.determineMaxDraftSize()
|
|
})
|
|
return s.maxDraftSizeCached
|
|
}
|
|
|
|
func (s *SqlDraftStore) determineMaxDraftSize() int {
|
|
var maxDraftSizeBytes int32
|
|
|
|
if s.DriverName() == model.DatabaseDriverPostgres {
|
|
// The Draft.Message column in Postgres has historically been VARCHAR(4000), but
|
|
// may be manually enlarged to support longer drafts.
|
|
if err := s.GetReplicaX().Get(&maxDraftSizeBytes, `
|
|
SELECT
|
|
COALESCE(character_maximum_length, 0)
|
|
FROM
|
|
information_schema.columns
|
|
WHERE
|
|
table_name = 'drafts'
|
|
AND column_name = 'message'
|
|
`); err != nil {
|
|
mlog.Warn("Unable to determine the maximum supported draft size", mlog.Err(err))
|
|
}
|
|
} else if s.DriverName() == model.DatabaseDriverMysql {
|
|
// The Draft.Message column in MySQL has historically been TEXT, with a maximum
|
|
// limit of 65535.
|
|
if err := s.GetReplicaX().Get(&maxDraftSizeBytes, `
|
|
SELECT
|
|
COALESCE(CHARACTER_MAXIMUM_LENGTH, 0)
|
|
FROM
|
|
INFORMATION_SCHEMA.COLUMNS
|
|
WHERE
|
|
table_schema = DATABASE()
|
|
AND table_name = 'Drafts'
|
|
AND column_name = 'Message'
|
|
LIMIT 0, 1
|
|
`); err != nil {
|
|
mlog.Warn("Unable to determine the maximum supported draft size", mlog.Err(err))
|
|
}
|
|
} else {
|
|
mlog.Warn("No implementation found to determine the maximum supported draft size")
|
|
}
|
|
|
|
// Assume a worst-case representation of four bytes per rune.
|
|
maxDraftSize := int(maxDraftSizeBytes) / 4
|
|
|
|
mlog.Info("Draft.Message has size restrictions", mlog.Int("max_characters", maxDraftSize), mlog.Int32("max_bytes", maxDraftSizeBytes))
|
|
|
|
return maxDraftSize
|
|
}
|