mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

[MM-16751] golint model (#17896)

Просмотр исходного кода
Этот коммит содержится в:
Ben Schumacher
2021-07-12 20:05:36 +02:00
коммит произвёл Claudio Costa
родитель 953eebdef4
Коммит 97ccf0bdf6
472 изменённых файлов: 9126 добавлений и 9132 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

90
store/localcachelayer/layer.go
Просмотреть файл

@@ -26,7 +26,7 @@ const (
FileInfoCacheSize = 25000
FileInfoCacheSec = 30 * 60
ChannelGuestCountCacheSize = model.CHANNEL_CACHE_SIZE
ChannelGuestCountCacheSize = model.ChannelCacheSize
ChannelGuestCountCacheSec = 30 * 60
WebhookCacheSize = 25000
@@ -35,10 +35,10 @@ const (
EmojiCacheSize = 5000
EmojiCacheSec = 30 * 60
ChannelPinnedPostsCounsCacheSize = model.CHANNEL_CACHE_SIZE
ChannelPinnedPostsCounsCacheSize = model.ChannelCacheSize
ChannelPinnedPostsCountsCacheSec = 30 * 60
ChannelMembersCountsCacheSize = model.CHANNEL_CACHE_SIZE
ChannelMembersCountsCacheSize = model.ChannelCacheSize
ChannelMembersCountsCacheSec = 30 * 60
LastPostsCacheSize = 20000
@@ -52,8 +52,8 @@ const (
UserProfileByIDCacheSize = 20000
UserProfileByIDSec = 30 * 60
ProfilesInChannelCacheSize = model.CHANNEL_CACHE_SIZE
PROFILES_IN_ChannelCacheSec = 15 * 60
ProfilesInChannelCacheSize = model.ChannelCacheSize
ProfilesInChannelCacheSec = 15 * 60
TeamCacheSize = 20000
TeamCacheSec = 30 * 60
@@ -120,7 +120,7 @@ func NewLocalCacheLayer(baseStore store.Store, metrics einterfaces.MetricsInterf
Size: ReactionCacheSize,
Name: "Reaction",
DefaultExpiry: ReactionCacheSec * time.Second,
InvalidateClusterEvent: model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_REACTIONS,
InvalidateClusterEvent: model.ClusterEventInvalidateCacheForReactions,
}); err != nil {
return
}
@@ -131,7 +131,7 @@ func NewLocalCacheLayer(baseStore store.Store, metrics einterfaces.MetricsInterf
Size: RoleCacheSize,
Name: "Role",
DefaultExpiry: RoleCacheSec * time.Second,
InvalidateClusterEvent: model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_ROLES,
InvalidateClusterEvent: model.ClusterEventInvalidateCacheForRoles,
Striped: true,
StripedBuckets: maxInt(runtime.NumCPU()-1, 1),
}); err != nil {
@@ -141,7 +141,7 @@ func NewLocalCacheLayer(baseStore store.Store, metrics einterfaces.MetricsInterf
Size: RoleCacheSize,
Name: "RolePermission",
DefaultExpiry: RoleCacheSec * time.Second,
InvalidateClusterEvent: model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_ROLE_PERMISSIONS,
InvalidateClusterEvent: model.ClusterEventInvalidateCacheForRolePermissions,
}); err != nil {
return
}
@@ -152,7 +152,7 @@ func NewLocalCacheLayer(baseStore store.Store, metrics einterfaces.MetricsInterf
Size: SchemeCacheSize,
Name: "Scheme",
DefaultExpiry: SchemeCacheSec * time.Second,
InvalidateClusterEvent: model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_SCHEMES,
InvalidateClusterEvent: model.ClusterEventInvalidateCacheForSchemes,
}); err != nil {
return
}
@@ -163,7 +163,7 @@ func NewLocalCacheLayer(baseStore store.Store, metrics einterfaces.MetricsInterf
Size: FileInfoCacheSize,
Name: "FileInfo",
DefaultExpiry: FileInfoCacheSec * time.Second,
InvalidateClusterEvent: model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_FILE_INFOS,
InvalidateClusterEvent: model.ClusterEventInvalidateCacheForFileInfos,
}); err != nil {
return
}
@@ -174,7 +174,7 @@ func NewLocalCacheLayer(baseStore store.Store, metrics einterfaces.MetricsInterf
Size: WebhookCacheSize,
Name: "Webhook",
DefaultExpiry: WebhookCacheSec * time.Second,
InvalidateClusterEvent: model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_WEBHOOKS,
InvalidateClusterEvent: model.ClusterEventInvalidateCacheForWebhooks,
}); err != nil {
return
}
@@ -185,7 +185,7 @@ func NewLocalCacheLayer(baseStore store.Store, metrics einterfaces.MetricsInterf
Size: EmojiCacheSize,
Name: "EmojiById",
DefaultExpiry: EmojiCacheSec * time.Second,
InvalidateClusterEvent: model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_EMOJIS_BY_ID,
InvalidateClusterEvent: model.ClusterEventInvalidateCacheForEmojisById,
}); err != nil {
return
}
@@ -193,7 +193,7 @@ func NewLocalCacheLayer(baseStore store.Store, metrics einterfaces.MetricsInterf
Size: EmojiCacheSize,
Name: "EmojiByName",
DefaultExpiry: EmojiCacheSec * time.Second,
InvalidateClusterEvent: model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_EMOJIS_ID_BY_NAME,
InvalidateClusterEvent: model.ClusterEventInvalidateCacheForEmojisIdByName,
}); err != nil {
return
}
@@ -209,7 +209,7 @@ func NewLocalCacheLayer(baseStore store.Store, metrics einterfaces.MetricsInterf
Size: ChannelPinnedPostsCounsCacheSize,
Name: "ChannelPinnedPostsCounts",
DefaultExpiry: ChannelPinnedPostsCountsCacheSec * time.Second,
InvalidateClusterEvent: model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_CHANNEL_PINNEDPOSTS_COUNTS,
InvalidateClusterEvent: model.ClusterEventInvalidateCacheForChannelPinnedpostsCounts,
}); err != nil {
return
}
@@ -217,7 +217,7 @@ func NewLocalCacheLayer(baseStore store.Store, metrics einterfaces.MetricsInterf
Size: ChannelMembersCountsCacheSize,
Name: "ChannelMemberCounts",
DefaultExpiry: ChannelMembersCountsCacheSec * time.Second,
InvalidateClusterEvent: model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_CHANNEL_MEMBER_COUNTS,
InvalidateClusterEvent: model.ClusterEventInvalidateCacheForChannelMemberCounts,
}); err != nil {
return
}
@@ -225,15 +225,15 @@ func NewLocalCacheLayer(baseStore store.Store, metrics einterfaces.MetricsInterf
Size: ChannelGuestCountCacheSize,
Name: "ChannelGuestsCount",
DefaultExpiry: ChannelGuestCountCacheSec * time.Second,
InvalidateClusterEvent: model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_CHANNEL_GUEST_COUNT,
InvalidateClusterEvent: model.ClusterEventInvalidateCacheForChannelGuestCount,
}); err != nil {
return
}
if localCacheStore.channelByIdCache, err = cacheProvider.NewCache(&cache.CacheOptions{
Size: model.CHANNEL_CACHE_SIZE,
Size: model.ChannelCacheSize,
Name: "channelById",
DefaultExpiry: ChannelCacheSec * time.Second,
InvalidateClusterEvent: model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_CHANNEL,
InvalidateClusterEvent: model.ClusterEventInvalidateCacheForChannel,
}); err != nil {
return
}
@@ -244,7 +244,7 @@ func NewLocalCacheLayer(baseStore store.Store, metrics einterfaces.MetricsInterf
Size: LastPostsCacheSize,
Name: "LastPost",
DefaultExpiry: LastPostsCacheSec * time.Second,
InvalidateClusterEvent: model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_LAST_POSTS,
InvalidateClusterEvent: model.ClusterEventInvalidateCacheForLastPosts,
}); err != nil {
return
}
@@ -252,7 +252,7 @@ func NewLocalCacheLayer(baseStore store.Store, metrics einterfaces.MetricsInterf
Size: LastPostTimeCacheSize,
Name: "LastPostTime",
DefaultExpiry: LastPostTimeCacheSec * time.Second,
InvalidateClusterEvent: model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_LAST_POST_TIME,
InvalidateClusterEvent: model.ClusterEventInvalidateCacheForLastPostTime,
}); err != nil {
return
}
@@ -263,7 +263,7 @@ func NewLocalCacheLayer(baseStore store.Store, metrics einterfaces.MetricsInterf
Size: TermsOfServiceCacheSize,
Name: "TermsOfService",
DefaultExpiry: TermsOfServiceCacheSec * time.Second,
InvalidateClusterEvent: model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_TERMS_OF_SERVICE,
InvalidateClusterEvent: model.ClusterEventInvalidateCacheForTermsOfService,
}); err != nil {
return
}
@@ -274,7 +274,7 @@ func NewLocalCacheLayer(baseStore store.Store, metrics einterfaces.MetricsInterf
Size: UserProfileByIDCacheSize,
Name: "UserProfileByIds",
DefaultExpiry: UserProfileByIDSec * time.Second,
InvalidateClusterEvent: model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_PROFILE_BY_IDS,
InvalidateClusterEvent: model.ClusterEventInvalidateCacheForProfileByIds,
Striped: true,
StripedBuckets: maxInt(runtime.NumCPU()-1, 1),
}); err != nil {
@@ -283,8 +283,8 @@ func NewLocalCacheLayer(baseStore store.Store, metrics einterfaces.MetricsInterf
if localCacheStore.profilesInChannelCache, err = cacheProvider.NewCache(&cache.CacheOptions{
Size: ProfilesInChannelCacheSize,
Name: "ProfilesInChannel",
DefaultExpiry: PROFILES_IN_ChannelCacheSec * time.Second,
InvalidateClusterEvent: model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_PROFILE_IN_CHANNEL,
DefaultExpiry: ProfilesInChannelCacheSec * time.Second,
InvalidateClusterEvent: model.ClusterEventInvalidateCacheForProfileInChannel,
}); err != nil {
return
}
@@ -299,31 +299,31 @@ func NewLocalCacheLayer(baseStore store.Store, metrics einterfaces.MetricsInterf
Size: TeamCacheSize,
Name: "Team",
DefaultExpiry: TeamCacheSec * time.Second,
InvalidateClusterEvent: model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_TEAMS,
InvalidateClusterEvent: model.ClusterEventInvalidateCacheForTeams,
}); err != nil {
return
}
localCacheStore.team = LocalCacheTeamStore{TeamStore: baseStore.Team(), rootStore: &localCacheStore}
if cluster != nil {
cluster.RegisterClusterMessageHandler(model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_REACTIONS, localCacheStore.reaction.handleClusterInvalidateReaction)
cluster.RegisterClusterMessageHandler(model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_ROLES, localCacheStore.role.handleClusterInvalidateRole)
cluster.RegisterClusterMessageHandler(model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_ROLE_PERMISSIONS, localCacheStore.role.handleClusterInvalidateRolePermissions)
cluster.RegisterClusterMessageHandler(model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_SCHEMES, localCacheStore.scheme.handleClusterInvalidateScheme)
cluster.RegisterClusterMessageHandler(model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_FILE_INFOS, localCacheStore.fileInfo.handleClusterInvalidateFileInfo)
cluster.RegisterClusterMessageHandler(model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_LAST_POST_TIME, localCacheStore.post.handleClusterInvalidateLastPostTime)
cluster.RegisterClusterMessageHandler(model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_WEBHOOKS, localCacheStore.webhook.handleClusterInvalidateWebhook)
cluster.RegisterClusterMessageHandler(model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_EMOJIS_BY_ID, localCacheStore.emoji.handleClusterInvalidateEmojiById)
cluster.RegisterClusterMessageHandler(model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_EMOJIS_ID_BY_NAME, localCacheStore.emoji.handleClusterInvalidateEmojiIdByName)
cluster.RegisterClusterMessageHandler(model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_CHANNEL_PINNEDPOSTS_COUNTS, localCacheStore.channel.handleClusterInvalidateChannelPinnedPostCount)
cluster.RegisterClusterMessageHandler(model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_CHANNEL_MEMBER_COUNTS, localCacheStore.channel.handleClusterInvalidateChannelMemberCounts)
cluster.RegisterClusterMessageHandler(model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_CHANNEL_GUEST_COUNT, localCacheStore.channel.handleClusterInvalidateChannelGuestCounts)
cluster.RegisterClusterMessageHandler(model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_CHANNEL, localCacheStore.channel.handleClusterInvalidateChannelById)
cluster.RegisterClusterMessageHandler(model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_LAST_POSTS, localCacheStore.post.handleClusterInvalidateLastPosts)
cluster.RegisterClusterMessageHandler(model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_TERMS_OF_SERVICE, localCacheStore.termsOfService.handleClusterInvalidateTermsOfService)
cluster.RegisterClusterMessageHandler(model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_PROFILE_BY_IDS, localCacheStore.user.handleClusterInvalidateScheme)
cluster.RegisterClusterMessageHandler(model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_PROFILE_IN_CHANNEL, localCacheStore.user.handleClusterInvalidateProfilesInChannel)
cluster.RegisterClusterMessageHandler(model.CLUSTER_EVENT_INVALIDATE_CACHE_FOR_TEAMS, localCacheStore.team.handleClusterInvalidateTeam)
cluster.RegisterClusterMessageHandler(model.ClusterEventInvalidateCacheForReactions, localCacheStore.reaction.handleClusterInvalidateReaction)
cluster.RegisterClusterMessageHandler(model.ClusterEventInvalidateCacheForRoles, localCacheStore.role.handleClusterInvalidateRole)
cluster.RegisterClusterMessageHandler(model.ClusterEventInvalidateCacheForRolePermissions, localCacheStore.role.handleClusterInvalidateRolePermissions)
cluster.RegisterClusterMessageHandler(model.ClusterEventInvalidateCacheForSchemes, localCacheStore.scheme.handleClusterInvalidateScheme)
cluster.RegisterClusterMessageHandler(model.ClusterEventInvalidateCacheForFileInfos, localCacheStore.fileInfo.handleClusterInvalidateFileInfo)
cluster.RegisterClusterMessageHandler(model.ClusterEventInvalidateCacheForLastPostTime, localCacheStore.post.handleClusterInvalidateLastPostTime)
cluster.RegisterClusterMessageHandler(model.ClusterEventInvalidateCacheForWebhooks, localCacheStore.webhook.handleClusterInvalidateWebhook)
cluster.RegisterClusterMessageHandler(model.ClusterEventInvalidateCacheForEmojisById, localCacheStore.emoji.handleClusterInvalidateEmojiById)
cluster.RegisterClusterMessageHandler(model.ClusterEventInvalidateCacheForEmojisIdByName, localCacheStore.emoji.handleClusterInvalidateEmojiIdByName)
cluster.RegisterClusterMessageHandler(model.ClusterEventInvalidateCacheForChannelPinnedpostsCounts, localCacheStore.channel.handleClusterInvalidateChannelPinnedPostCount)
cluster.RegisterClusterMessageHandler(model.ClusterEventInvalidateCacheForChannelMemberCounts, localCacheStore.channel.handleClusterInvalidateChannelMemberCounts)
cluster.RegisterClusterMessageHandler(model.ClusterEventInvalidateCacheForChannelGuestCount, localCacheStore.channel.handleClusterInvalidateChannelGuestCounts)
cluster.RegisterClusterMessageHandler(model.ClusterEventInvalidateCacheForChannel, localCacheStore.channel.handleClusterInvalidateChannelById)
cluster.RegisterClusterMessageHandler(model.ClusterEventInvalidateCacheForLastPosts, localCacheStore.post.handleClusterInvalidateLastPosts)
cluster.RegisterClusterMessageHandler(model.ClusterEventInvalidateCacheForTermsOfService, localCacheStore.termsOfService.handleClusterInvalidateTermsOfService)
cluster.RegisterClusterMessageHandler(model.ClusterEventInvalidateCacheForProfileByIds, localCacheStore.user.handleClusterInvalidateScheme)
cluster.RegisterClusterMessageHandler(model.ClusterEventInvalidateCacheForProfileInChannel, localCacheStore.user.handleClusterInvalidateProfilesInChannel)
cluster.RegisterClusterMessageHandler(model.ClusterEventInvalidateCacheForTeams, localCacheStore.team.handleClusterInvalidateTeam)
}
return
}
@@ -389,7 +389,7 @@ func (s *LocalCacheStore) doInvalidateCacheCluster(cache cache.Cache, key string
if s.cluster != nil {
msg := &model.ClusterMessage{
Event: cache.GetInvalidateClusterEvent(),
SendType: model.CLUSTER_SEND_BEST_EFFORT,
SendType: model.ClusterSendBestEffort,
Data: key,
}
s.cluster.SendClusterMessage(msg)
@@ -419,7 +419,7 @@ func (s *LocalCacheStore) doClearCacheCluster(cache cache.Cache) {
if s.cluster != nil {
msg := &model.ClusterMessage{
Event: cache.GetInvalidateClusterEvent(),
SendType: model.CLUSTER_SEND_BEST_EFFORT,
SendType: model.ClusterSendBestEffort,
Data: ClearCacheMessageData,
}
s.cluster.SendClusterMessage(msg)

8
store/localcachelayer/layer_test.go
Просмотреть файл

@@ -76,13 +76,13 @@ func initStores() {
if os.Getenv("IS_CI") == "true" {
switch os.Getenv("MM_SQLSETTINGS_DRIVERNAME") {
case "mysql":
storeTypes = append(storeTypes, newStoreType("LocalCache+MySQL", model.DATABASE_DRIVER_MYSQL))
storeTypes = append(storeTypes, newStoreType("LocalCache+MySQL", model.DatabaseDriverMysql))
case "postgres":
storeTypes = append(storeTypes, newStoreType("LocalCache+PostgreSQL", model.DATABASE_DRIVER_POSTGRES))
storeTypes = append(storeTypes, newStoreType("LocalCache+PostgreSQL", model.DatabaseDriverPostgres))
}
} else {
storeTypes = append(storeTypes, newStoreType("LocalCache+MySQL", model.DATABASE_DRIVER_MYSQL),
newStoreType("LocalCache+PostgreSQL", model.DATABASE_DRIVER_POSTGRES))
storeTypes = append(storeTypes, newStoreType("LocalCache+MySQL", model.DatabaseDriverMysql),
newStoreType("LocalCache+PostgreSQL", model.DatabaseDriverPostgres))
}
defer func() {

4
store/searchlayer/channel_layer.go
Просмотреть файл

@@ -20,7 +20,7 @@ type SearchChannelStore struct {
}
func (c *SearchChannelStore) deleteChannelIndex(channel *model.Channel) {
if channel.Type == model.CHANNEL_OPEN {
if channel.Type == model.ChannelTypeOpen {
for _, engine := range c.rootStore.searchEngine.GetActiveEngines() {
if engine.IsIndexingEnabled() {
runIndexFn(engine, func(engineCopy searchengine.SearchEngineInterface) {
@@ -36,7 +36,7 @@ func (c *SearchChannelStore) deleteChannelIndex(channel *model.Channel) {
}
func (c *SearchChannelStore) indexChannel(channel *model.Channel) {
if channel.Type == model.CHANNEL_OPEN {
if channel.Type == model.ChannelTypeOpen {
for _, engine := range c.rootStore.searchEngine.GetActiveEngines() {
if engine.IsIndexingEnabled() {
runIndexFn(engine, func(engineCopy searchengine.SearchEngineInterface) {

2
store/searchlayer/layer_test.go
Просмотреть файл

@@ -21,7 +21,7 @@ import (
func TestUpdateConfigRace(t *testing.T) {
driverName := os.Getenv("MM_SQLSETTINGS_DRIVERNAME")
if driverName == "" {
driverName = model.DATABASE_DRIVER_POSTGRES
driverName = model.DatabaseDriverPostgres
}
settings := storetest.MakeSqlSettings(driverName, false)
store := sqlstore.New(*settings, nil)

20
store/searchtest/channel_layer.go
Просмотреть файл

@@ -76,7 +76,7 @@ func TestSearchChannelStore(t *testing.T, s store.Store, testEngine *SearchTestE
}
func testAutocompleteChannelByName(t *testing.T, th *SearchTestHelper) {
alternate, err := th.createChannel(th.Team.Id, "channel-alternate", "Channel Alternate", "Channel Alternate", model.CHANNEL_OPEN, false)
alternate, err := th.createChannel(th.Team.Id, "channel-alternate", "Channel Alternate", "Channel Alternate", model.ChannelTypeOpen, false)
require.NoError(t, err)
defer th.deleteChannel(alternate)
res, err := th.Store.Channel().AutocompleteInTeam(th.Team.Id, "channel-a", false)
@@ -85,7 +85,7 @@ func testAutocompleteChannelByName(t *testing.T, th *SearchTestHelper) {
}
func testAutocompleteChannelByDisplayName(t *testing.T, th *SearchTestHelper) {
alternate, err := th.createChannel(th.Team.Id, "channel-alternate", "ChannelAlternate", "", model.CHANNEL_OPEN, false)
alternate, err := th.createChannel(th.Team.Id, "channel-alternate", "ChannelAlternate", "", model.ChannelTypeOpen, false)
require.NoError(t, err)
defer th.deleteChannel(alternate)
res, err := th.Store.Channel().AutocompleteInTeam(th.Team.Id, "ChannelA", false)
@@ -94,7 +94,7 @@ func testAutocompleteChannelByDisplayName(t *testing.T, th *SearchTestHelper) {
}
func testAutocompleteChannelByNameSplittedWithDashChar(t *testing.T, th *SearchTestHelper) {
alternate, err := th.createChannel(th.Team.Id, "channel-alternate", "ChannelAlternate", "", model.CHANNEL_OPEN, false)
alternate, err := th.createChannel(th.Team.Id, "channel-alternate", "ChannelAlternate", "", model.ChannelTypeOpen, false)
require.NoError(t, err)
defer th.deleteChannel(alternate)
res, err := th.Store.Channel().AutocompleteInTeam(th.Team.Id, "channel-a", false)
@@ -103,7 +103,7 @@ func testAutocompleteChannelByNameSplittedWithDashChar(t *testing.T, th *SearchT
}
func testAutocompleteChannelByNameSplittedWithUnderscoreChar(t *testing.T, th *SearchTestHelper) {
alternate, err := th.createChannel(th.Team.Id, "channel_alternate", "ChannelAlternate", "", model.CHANNEL_OPEN, false)
alternate, err := th.createChannel(th.Team.Id, "channel_alternate", "ChannelAlternate", "", model.ChannelTypeOpen, false)
require.NoError(t, err)
defer th.deleteChannel(alternate)
res, err := th.Store.Channel().AutocompleteInTeam(th.Team.Id, "channel_a", false)
@@ -112,7 +112,7 @@ func testAutocompleteChannelByNameSplittedWithUnderscoreChar(t *testing.T, th *S
}
func testAutocompleteChannelByDisplayNameSplittedByWhitespaces(t *testing.T, th *SearchTestHelper) {
alternate, err := th.createChannel(th.Team.Id, "channel-alternate", "Channel Alternate", "", model.CHANNEL_OPEN, false)
alternate, err := th.createChannel(th.Team.Id, "channel-alternate", "Channel Alternate", "", model.ChannelTypeOpen, false)
require.NoError(t, err)
defer th.deleteChannel(alternate)
@@ -121,9 +121,9 @@ func testAutocompleteChannelByDisplayNameSplittedByWhitespaces(t *testing.T, th
th.checkChannelIdsMatch(t, []string{alternate.Id}, res)
}
func testAutocompleteAllChannelsIfTermIsEmpty(t *testing.T, th *SearchTestHelper) {
alternate, err := th.createChannel(th.Team.Id, "channel-alternate", "Channel Alternate", "", model.CHANNEL_OPEN, false)
alternate, err := th.createChannel(th.Team.Id, "channel-alternate", "Channel Alternate", "", model.ChannelTypeOpen, false)
require.NoError(t, err)
other, err := th.createChannel(th.Team.Id, "other-channel", "Other Channel", "", model.CHANNEL_OPEN, false)
other, err := th.createChannel(th.Team.Id, "other-channel", "Other Channel", "", model.ChannelTypeOpen, false)
require.NoError(t, err)
defer th.deleteChannel(alternate)
defer th.deleteChannel(other)
@@ -133,7 +133,7 @@ func testAutocompleteAllChannelsIfTermIsEmpty(t *testing.T, th *SearchTestHelper
}
func testSearchChannelsInCaseInsensitiveManner(t *testing.T, th *SearchTestHelper) {
alternate, err := th.createChannel(th.Team.Id, "channel-alternate", "ChannelAlternate", "", model.CHANNEL_OPEN, false)
alternate, err := th.createChannel(th.Team.Id, "channel-alternate", "ChannelAlternate", "", model.ChannelTypeOpen, false)
require.NoError(t, err)
defer th.deleteChannel(alternate)
res, err := th.Store.Channel().AutocompleteInTeam(th.Team.Id, "channela", false)
@@ -145,7 +145,7 @@ func testSearchChannelsInCaseInsensitiveManner(t *testing.T, th *SearchTestHelpe
}
func testSearchOnlyPublicChannels(t *testing.T, th *SearchTestHelper) {
alternate, err := th.createChannel(th.Team.Id, "channel-alternate", "ChannelAlternate", "", model.CHANNEL_PRIVATE, false)
alternate, err := th.createChannel(th.Team.Id, "channel-alternate", "ChannelAlternate", "", model.ChannelTypePrivate, false)
require.NoError(t, err)
defer th.deleteChannel(alternate)
res, err := th.Store.Channel().AutocompleteInTeam(th.Team.Id, "channel-a", false)
@@ -154,7 +154,7 @@ func testSearchOnlyPublicChannels(t *testing.T, th *SearchTestHelper) {
}
func testSearchShouldSupportHavingHyphenAsLastCharacter(t *testing.T, th *SearchTestHelper) {
alternate, err := th.createChannel(th.Team.Id, "channel-alternate", "ChannelAlternate", "", model.CHANNEL_OPEN, false)
alternate, err := th.createChannel(th.Team.Id, "channel-alternate", "ChannelAlternate", "", model.ChannelTypeOpen, false)
require.NoError(t, err)
defer th.deleteChannel(alternate)
res, err := th.Store.Channel().AutocompleteInTeam(th.Team.Id, "channel-", false)

92
store/searchtest/file_info_layer.go
Просмотреть файл

@@ -200,11 +200,11 @@ func testFileInfoSearchFileInfosIncludingDMs(t *testing.T, th *SearchTestHelper)
require.NoError(t, err)
defer th.deleteChannel(direct)
post, err := th.createPost(th.User.Id, direct.Id, "dm test", "", model.POST_DEFAULT, 0, false)
post, err := th.createPost(th.User.Id, direct.Id, "dm test", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
post2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "dm test", "", model.POST_DEFAULT, 0, false)
post2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "dm test", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p1, err := th.createFileInfo(th.User.Id, post.Id, "dm test filename", "dm contenttest filename", "jpg", "image/jpeg", 0, 1)
@@ -241,11 +241,11 @@ func testFileInfoSearchFileInfosWithPagination(t *testing.T, th *SearchTestHelpe
require.NoError(t, err)
defer th.deleteChannel(direct)
post, err := th.createPost(th.User.Id, direct.Id, "dm test", "", model.POST_DEFAULT, 10000, false)
post, err := th.createPost(th.User.Id, direct.Id, "dm test", "", model.PostTypeDefault, 10000, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
post2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "dm test", "", model.POST_DEFAULT, 20000, false)
post2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "dm test", "", model.PostTypeDefault, 20000, false)
require.NoError(t, err)
p1, err := th.createFileInfo(th.User.Id, post.Id, "dm test filename", "dm contenttest filename", "jpg", "image/jpeg", 10000, 0)
@@ -288,7 +288,7 @@ func testFileInfoSearchFileInfosWithPagination(t *testing.T, th *SearchTestHelpe
}
func testFileInfoSearchExactPhraseInQuotes(t *testing.T, th *SearchTestHelper) {
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -318,7 +318,7 @@ func testFileInfoSearchExactPhraseInQuotes(t *testing.T, th *SearchTestHelper) {
}
func testFileInfoSearchEmailAddresses(t *testing.T, th *SearchTestHelper) {
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -369,7 +369,7 @@ func testFileInfoSearchEmailAddresses(t *testing.T, th *SearchTestHelper) {
}
func testFileInfoSearchMarkdownUnderscores(t *testing.T, th *SearchTestHelper) {
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -415,7 +415,7 @@ func testFileInfoSearchMarkdownUnderscores(t *testing.T, th *SearchTestHelper) {
}
func testFileInfoSearchNonLatinWords(t *testing.T, th *SearchTestHelper) {
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -546,7 +546,7 @@ func testFileInfoSearchNonLatinWords(t *testing.T, th *SearchTestHelper) {
}
func testFileInfoSearchAlternativeSpellings(t *testing.T, th *SearchTestHelper) {
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -574,7 +574,7 @@ func testFileInfoSearchAlternativeSpellings(t *testing.T, th *SearchTestHelper)
}
func testFileInfoSearchAlternativeSpellingsAccents(t *testing.T, th *SearchTestHelper) {
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -608,7 +608,7 @@ func testFileInfoSearchAlternativeSpellingsAccents(t *testing.T, th *SearchTestH
}
func testFileInfoSearchOrExcludeFileInfosBySpecificUser(t *testing.T, th *SearchTestHelper) {
post, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -628,10 +628,10 @@ func testFileInfoSearchOrExcludeFileInfosBySpecificUser(t *testing.T, th *Search
}
func testFileInfoSearchOrExcludeFileInfosInChannel(t *testing.T, th *SearchTestHelper) {
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
post2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -659,9 +659,9 @@ func testFileInfoSearchOrExcludeFileInfosInDMGM(t *testing.T, th *SearchTestHelp
require.NoError(t, err)
defer th.deleteChannel(group)
post1, err := th.createPost(th.User.Id, direct.Id, "test fromuser", "", model.POST_DEFAULT, 0, false)
post1, err := th.createPost(th.User.Id, direct.Id, "test fromuser", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
post2, err := th.createPost(th.User2.Id, group.Id, "test fromuser 2", "", model.POST_DEFAULT, 0, false)
post2, err := th.createPost(th.User2.Id, group.Id, "test fromuser 2", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
defer th.deleteUserPosts(th.User2.Id)
@@ -712,7 +712,7 @@ func testFileInfoSearchOrExcludeFileInfosInDMGM(t *testing.T, th *SearchTestHelp
}
func testFileInfoSearchOrExcludeByExtensions(t *testing.T, th *SearchTestHelper) {
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -780,9 +780,9 @@ func testFileInfoSearchOrExcludeByExtensions(t *testing.T, th *SearchTestHelper)
}
func testFileInfoFilterFilesInSpecificDate(t *testing.T, th *SearchTestHelper) {
post1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
post2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -823,9 +823,9 @@ func testFileInfoFilterFilesInSpecificDate(t *testing.T, th *SearchTestHelper) {
}
func testFileInfoFilterFilesBeforeSpecificDate(t *testing.T, th *SearchTestHelper) {
post1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
post2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -867,9 +867,9 @@ func testFileInfoFilterFilesBeforeSpecificDate(t *testing.T, th *SearchTestHelpe
}
func testFileInfoFilterFilesAfterSpecificDate(t *testing.T, th *SearchTestHelper) {
post1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
post2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -911,9 +911,9 @@ func testFileInfoFilterFilesAfterSpecificDate(t *testing.T, th *SearchTestHelper
}
func testFileInfoFilterFilesWithATerm(t *testing.T, th *SearchTestHelper) {
post1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
post2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -952,7 +952,7 @@ func testFileInfoFilterFilesWithATerm(t *testing.T, th *SearchTestHelper) {
}
func testFileInfoSearchUsingBooleanOperators(t *testing.T, th *SearchTestHelper) {
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -991,9 +991,9 @@ func testFileInfoSearchUsingBooleanOperators(t *testing.T, th *SearchTestHelper)
}
func testFileInfoSearchUsingCombinedFilters(t *testing.T, th *SearchTestHelper) {
post1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
post2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1063,7 +1063,7 @@ func testFileInfoSearchUsingCombinedFilters(t *testing.T, th *SearchTestHelper)
}
func testFileInfoSearchIgnoringStopWords(t *testing.T, th *SearchTestHelper) {
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1125,7 +1125,7 @@ func testFileInfoSearchIgnoringStopWords(t *testing.T, th *SearchTestHelper) {
}
func testFileInfoSupportStemming(t *testing.T, th *SearchTestHelper) {
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1149,7 +1149,7 @@ func testFileInfoSupportStemming(t *testing.T, th *SearchTestHelper) {
}
func testFileInfoSupportWildcards(t *testing.T, th *SearchTestHelper) {
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1186,7 +1186,7 @@ func testFileInfoSupportWildcards(t *testing.T, th *SearchTestHelper) {
}
func testFileInfoNotSupportPrecedingWildcards(t *testing.T, th *SearchTestHelper) {
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1208,7 +1208,7 @@ func testFileInfoNotSupportPrecedingWildcards(t *testing.T, th *SearchTestHelper
}
func testFileInfoSearchDiscardWildcardAlone(t *testing.T, th *SearchTestHelper) {
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1229,7 +1229,7 @@ func testFileInfoSearchDiscardWildcardAlone(t *testing.T, th *SearchTestHelper)
}
func testFileInfoSupportTermsWithDash(t *testing.T, th *SearchTestHelper) {
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1263,7 +1263,7 @@ func testFileInfoSupportTermsWithDash(t *testing.T, th *SearchTestHelper) {
}
func testFileInfoSupportTermsWithUnderscore(t *testing.T, th *SearchTestHelper) {
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1297,13 +1297,13 @@ func testFileInfoSupportTermsWithUnderscore(t *testing.T, th *SearchTestHelper)
}
func testFileInfoSearchInDeletedOrArchivedChannels(t *testing.T, th *SearchTestHelper) {
post1, err := th.createPost(th.User.Id, th.ChannelDeleted.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post1, err := th.createPost(th.User.Id, th.ChannelDeleted.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
post2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
post3, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post3, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1378,7 +1378,7 @@ func testFileInfoSearchInDeletedOrArchivedChannels(t *testing.T, th *SearchTestH
}
func testFileInfoSearchTermsWithDashes(t *testing.T, th *SearchTestHelper) {
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1427,7 +1427,7 @@ func testFileInfoSearchTermsWithDashes(t *testing.T, th *SearchTestHelper) {
}
func testFileInfoSearchTermsWithDots(t *testing.T, th *SearchTestHelper) {
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1476,7 +1476,7 @@ func testFileInfoSearchTermsWithDots(t *testing.T, th *SearchTestHelper) {
}
func testFileInfoSearchTermsWithUnderscores(t *testing.T, th *SearchTestHelper) {
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1525,10 +1525,10 @@ func testFileInfoSearchTermsWithUnderscores(t *testing.T, th *SearchTestHelper)
}
func testFileInfoSupportStemmingAndWildcards(t *testing.T, th *SearchTestHelper) {
post1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
post2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1562,10 +1562,10 @@ func testFileInfoSupportStemmingAndWildcards(t *testing.T, th *SearchTestHelper)
}
func testFileInfoSupportWildcardOutsideQuotes(t *testing.T, th *SearchTestHelper) {
post1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
post2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p1, err := th.createFileInfo(th.User.Id, post1.Id, "hello world", "hello world", "jpg", "image/jpeg", 0, 0)
@@ -1596,7 +1596,7 @@ func testFileInfoSupportWildcardOutsideQuotes(t *testing.T, th *SearchTestHelper
}
func testFileInfoSlashShouldNotBeCharSeparator(t *testing.T, th *SearchTestHelper) {
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1627,7 +1627,7 @@ func testFileInfoSlashShouldNotBeCharSeparator(t *testing.T, th *SearchTestHelpe
}
func testFileInfoSearchEmailsWithoutQuotes(t *testing.T, th *SearchTestHelper) {
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.POST_DEFAULT, 0, false)
post, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "testmessage", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)

18
store/searchtest/helper.go
Просмотреть файл

@@ -36,11 +36,11 @@ func (th *SearchTestHelper) SetupBasicFixtures() error {
}
// Create teams
team, err := th.createTeam("searchtest-team", "Searchtest team", model.TEAM_OPEN)
team, err := th.createTeam("searchtest-team", "Searchtest team", model.TeamOpen)
if err != nil {
return err
}
anotherTeam, err := th.createTeam("another-searchtest-team", "Another Searchtest team", model.TEAM_OPEN)
anotherTeam, err := th.createTeam("another-searchtest-team", "Another Searchtest team", model.TeamOpen)
if err != nil {
return err
}
@@ -60,19 +60,19 @@ func (th *SearchTestHelper) SetupBasicFixtures() error {
}
// Create channels
channelBasic, err := th.createChannel(team.Id, "channel-a", "ChannelA", "", model.CHANNEL_OPEN, false)
channelBasic, err := th.createChannel(team.Id, "channel-a", "ChannelA", "", model.ChannelTypeOpen, false)
if err != nil {
return err
}
channelPrivate, err := th.createChannel(team.Id, "channel-private", "ChannelPrivate", "", model.CHANNEL_PRIVATE, false)
channelPrivate, err := th.createChannel(team.Id, "channel-private", "ChannelPrivate", "", model.ChannelTypePrivate, false)
if err != nil {
return err
}
channelDeleted, err := th.createChannel(team.Id, "channel-deleted", "ChannelA (deleted)", "", model.CHANNEL_OPEN, true)
channelDeleted, err := th.createChannel(team.Id, "channel-deleted", "ChannelA (deleted)", "", model.ChannelTypeOpen, true)
if err != nil {
return err
}
channelAnotherTeam, err := th.createChannel(anotherTeam.Id, "channel-a", "ChannelA", "", model.CHANNEL_OPEN, false)
channelAnotherTeam, err := th.createChannel(anotherTeam.Id, "channel-a", "ChannelA", "", model.ChannelTypeOpen, false)
if err != nil {
return err
}
@@ -185,7 +185,7 @@ func (th *SearchTestHelper) createGuest(username, nickname, firstName, lastName
FirstName: firstName,
LastName: lastName,
Email: th.makeEmail(),
Roles: model.SYSTEM_GUEST_ROLE_ID,
Roles: model.SystemGuestRoleId,
})
}
@@ -266,7 +266,7 @@ func (th *SearchTestHelper) createDirectChannel(teamID, name, displayName string
TeamId: teamID,
Name: name,
DisplayName: displayName,
Type: model.CHANNEL_DIRECT,
Type: model.ChannelTypeDirect,
}
m1 := &model.ChannelMember{}
@@ -296,7 +296,7 @@ func (th *SearchTestHelper) createGroupChannel(teamID, displayName string, users
TeamId: teamID,
Name: model.GetGroupNameFromUserIds(userIDS),
DisplayName: displayName,
Type: model.CHANNEL_GROUP,
Type: model.ChannelTypeGroup,
}
channel, err := th.Store.Channel().Save(group, 10000)

250
store/searchtest/post_layer.go
Просмотреть файл

@@ -280,11 +280,11 @@ func testSearchPostsIncludingDMs(t *testing.T, th *SearchTestHelper) {
require.NoError(t, err)
defer th.deleteChannel(direct)
p1, err := th.createPost(th.User.Id, direct.Id, "dm test", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, direct.Id, "dm test", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
_, err = th.createPost(th.User.Id, direct.Id, "dm other", "", model.POST_DEFAULT, 0, false)
_, err = th.createPost(th.User.Id, direct.Id, "dm other", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "channel test", "", model.POST_DEFAULT, 0, false)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "channel test", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -302,11 +302,11 @@ func testSearchPostsWithPagination(t *testing.T, th *SearchTestHelper) {
require.NoError(t, err)
defer th.deleteChannel(direct)
p1, err := th.createPost(th.User.Id, direct.Id, "dm test", "", model.POST_DEFAULT, 10000, false)
p1, err := th.createPost(th.User.Id, direct.Id, "dm test", "", model.PostTypeDefault, 10000, false)
require.NoError(t, err)
_, err = th.createPost(th.User.Id, direct.Id, "dm other", "", model.POST_DEFAULT, 20000, false)
_, err = th.createPost(th.User.Id, direct.Id, "dm other", "", model.PostTypeDefault, 20000, false)
require.NoError(t, err)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "channel test", "", model.POST_DEFAULT, 0, false)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "channel test", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -325,9 +325,9 @@ func testSearchPostsWithPagination(t *testing.T, th *SearchTestHelper) {
}
func testSearchReturnPinnedAndUnpinned(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "channel test unpinned", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "channel test unpinned", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "channel test pinned", "", model.POST_DEFAULT, 0, true)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "channel test pinned", "", model.PostTypeDefault, 0, true)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -341,13 +341,13 @@ func testSearchReturnPinnedAndUnpinned(t *testing.T, th *SearchTestHelper) {
}
func testSearchExactPhraseInQuotes(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "channel test 1 2 3", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "channel test 1 2 3", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "channel test 123", "", model.POST_DEFAULT, 0, false)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "channel test 123", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "channel something test 1 2 3", "", model.POST_DEFAULT, 0, false)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "channel something test 1 2 3", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "channel 1 2 3", "", model.POST_DEFAULT, 0, false)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "channel 1 2 3", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -361,9 +361,9 @@ func testSearchExactPhraseInQuotes(t *testing.T, th *SearchTestHelper) {
}
func testSearchEmailAddresses(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test email test@test.com", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test email test@test.com", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "test email test2@test.com", "", model.POST_DEFAULT, 0, false)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "test email test2@test.com", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -387,7 +387,7 @@ func testSearchEmailAddresses(t *testing.T, th *SearchTestHelper) {
}
func testSearchMarkdownUnderscores(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "_start middle end_ _another_", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "_start middle end_ _another_", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -430,9 +430,9 @@ func testSearchMarkdownUnderscores(t *testing.T, th *SearchTestHelper) {
func testSearchNonLatinWords(t *testing.T, th *SearchTestHelper) {
t.Run("Should be able to search chinese words", func(t *testing.T) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "你好", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "你好", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "你", "", model.POST_DEFAULT, 0, false)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "你", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -463,7 +463,7 @@ func testSearchNonLatinWords(t *testing.T, th *SearchTestHelper) {
})
})
t.Run("Should be able to search cyrillic words", func(t *testing.T) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "слово test", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "слово test", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -486,9 +486,9 @@ func testSearchNonLatinWords(t *testing.T, th *SearchTestHelper) {
})
t.Run("Should be able to search japanese words", func(t *testing.T) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "本", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "本", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "本木", "", model.POST_DEFAULT, 0, false)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "本木", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -521,9 +521,9 @@ func testSearchNonLatinWords(t *testing.T, th *SearchTestHelper) {
})
t.Run("Should be able to search korean words", func(t *testing.T) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "불", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "불", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "불다", "", model.POST_DEFAULT, 0, false)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "불다", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -556,9 +556,9 @@ func testSearchNonLatinWords(t *testing.T, th *SearchTestHelper) {
}
func testSearchAlternativeSpellings(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "Straße test", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "Straße test", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "Strasse test", "", model.POST_DEFAULT, 0, false)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "Strasse test", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -580,9 +580,9 @@ func testSearchAlternativeSpellings(t *testing.T, th *SearchTestHelper) {
}
func testSearchAlternativeSpellingsAccents(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "café", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "café", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "café", "", model.POST_DEFAULT, 0, false)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "café", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -610,9 +610,9 @@ func testSearchAlternativeSpellingsAccents(t *testing.T, th *SearchTestHelper) {
}
func testSearchOrExcludePostsBySpecificUser(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "test fromuser", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "test fromuser", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
_, err = th.createPost(th.User2.Id, th.ChannelPrivate.Id, "test fromuser 2", "", model.POST_DEFAULT, 0, false)
_, err = th.createPost(th.User2.Id, th.ChannelPrivate.Id, "test fromuser 2", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
defer th.deleteUserPosts(th.User2.Id)
@@ -629,9 +629,9 @@ func testSearchOrExcludePostsBySpecificUser(t *testing.T, th *SearchTestHelper)
}
func testSearchOrExcludePostsInChannel(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test fromuser", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test fromuser", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
_, err = th.createPost(th.User2.Id, th.ChannelPrivate.Id, "test fromuser 2", "", model.POST_DEFAULT, 0, false)
_, err = th.createPost(th.User2.Id, th.ChannelPrivate.Id, "test fromuser 2", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
defer th.deleteUserPosts(th.User2.Id)
@@ -656,9 +656,9 @@ func testSearchOrExcludePostsInDMGM(t *testing.T, th *SearchTestHelper) {
require.NoError(t, err)
defer th.deleteChannel(group)
p1, err := th.createPost(th.User.Id, direct.Id, "test fromuser", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, direct.Id, "test fromuser", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p2, err := th.createPost(th.User2.Id, group.Id, "test fromuser 2", "", model.POST_DEFAULT, 0, false)
p2, err := th.createPost(th.User2.Id, group.Id, "test fromuser 2", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
defer th.deleteUserPosts(th.User2.Id)
@@ -703,13 +703,13 @@ func testSearchOrExcludePostsInDMGM(t *testing.T, th *SearchTestHelper) {
func testFilterMessagesInSpecificDate(t *testing.T, th *SearchTestHelper) {
creationDate := model.GetMillisForTime(time.Date(2020, 03, 22, 12, 0, 0, 0, time.UTC))
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test in specific date", "", model.POST_DEFAULT, creationDate, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test in specific date", "", model.PostTypeDefault, creationDate, false)
require.NoError(t, err)
creationDate2 := model.GetMillisForTime(time.Date(2020, 03, 23, 0, 0, 0, 0, time.UTC))
p2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "test in the present", "", model.POST_DEFAULT, creationDate2, false)
p2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "test in the present", "", model.PostTypeDefault, creationDate2, false)
require.NoError(t, err)
creationDate3 := model.GetMillisForTime(time.Date(2020, 03, 21, 23, 59, 59, 0, time.UTC))
p3, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test in the present", "", model.POST_DEFAULT, creationDate3, false)
p3, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test in the present", "", model.PostTypeDefault, creationDate3, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -740,13 +740,13 @@ func testFilterMessagesInSpecificDate(t *testing.T, th *SearchTestHelper) {
func testFilterMessagesBeforeSpecificDate(t *testing.T, th *SearchTestHelper) {
creationDate := model.GetMillisForTime(time.Date(2020, 03, 01, 12, 0, 0, 0, time.UTC))
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test in specific date", "", model.POST_DEFAULT, creationDate, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test in specific date", "", model.PostTypeDefault, creationDate, false)
require.NoError(t, err)
creationDate2 := model.GetMillisForTime(time.Date(2020, 03, 22, 23, 59, 59, 0, time.UTC))
p2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "test in specific date 2", "", model.POST_DEFAULT, creationDate2, false)
p2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "test in specific date 2", "", model.PostTypeDefault, creationDate2, false)
require.NoError(t, err)
creationDate3 := model.GetMillisForTime(time.Date(2020, 03, 26, 16, 55, 0, 0, time.UTC))
p3, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test in the present", "", model.POST_DEFAULT, creationDate3, false)
p3, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test in the present", "", model.PostTypeDefault, creationDate3, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -778,13 +778,13 @@ func testFilterMessagesBeforeSpecificDate(t *testing.T, th *SearchTestHelper) {
func testFilterMessagesAfterSpecificDate(t *testing.T, th *SearchTestHelper) {
creationDate := model.GetMillisForTime(time.Date(2020, 03, 01, 12, 0, 0, 0, time.UTC))
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test in specific date", "", model.POST_DEFAULT, creationDate, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test in specific date", "", model.PostTypeDefault, creationDate, false)
require.NoError(t, err)
creationDate2 := model.GetMillisForTime(time.Date(2020, 03, 22, 23, 59, 59, 0, time.UTC))
p2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "test in specific date 2", "", model.POST_DEFAULT, creationDate2, false)
p2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "test in specific date 2", "", model.PostTypeDefault, creationDate2, false)
require.NoError(t, err)
creationDate3 := model.GetMillisForTime(time.Date(2020, 03, 26, 16, 55, 0, 0, time.UTC))
p3, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test in the present", "", model.POST_DEFAULT, creationDate3, false)
p3, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test in the present", "", model.PostTypeDefault, creationDate3, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -815,11 +815,11 @@ func testFilterMessagesAfterSpecificDate(t *testing.T, th *SearchTestHelper) {
}
func testFilterMessagesWithATerm(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "one two three", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "one two three", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "one four five six", "", model.POST_DEFAULT, 0, false)
p2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "one four five six", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "one seven eight nine", "", model.POST_DEFAULT, 0, false)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "one seven eight nine", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -850,11 +850,11 @@ func testFilterMessagesWithATerm(t *testing.T, th *SearchTestHelper) {
}
func testSearchUsingBooleanOperators(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "one two three message", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "one two three message", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "two messages", "", model.POST_DEFAULT, 0, false)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "two messages", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "another message", "", model.POST_DEFAULT, 0, false)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "another message", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -886,13 +886,13 @@ func testSearchUsingBooleanOperators(t *testing.T, th *SearchTestHelper) {
func testSearchUsingCombinedFilters(t *testing.T, th *SearchTestHelper) {
creationDate := model.GetMillisForTime(time.Date(2020, 03, 01, 12, 0, 0, 0, time.UTC))
p1, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "one two three message", "", model.POST_DEFAULT, creationDate, false)
p1, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "one two three message", "", model.PostTypeDefault, creationDate, false)
require.NoError(t, err)
creationDate2 := model.GetMillisForTime(time.Date(2020, 03, 10, 12, 0, 0, 0, time.UTC))
p2, err := th.createPost(th.User2.Id, th.ChannelPrivate.Id, "two messages", "", model.POST_DEFAULT, creationDate2, false)
p2, err := th.createPost(th.User2.Id, th.ChannelPrivate.Id, "two messages", "", model.PostTypeDefault, creationDate2, false)
require.NoError(t, err)
creationDate3 := model.GetMillisForTime(time.Date(2020, 03, 20, 12, 0, 0, 0, time.UTC))
p3, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "two another message", "", model.POST_DEFAULT, creationDate3, false)
p3, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "two another message", "", model.PostTypeDefault, creationDate3, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
defer th.deleteUserPosts(th.User2.Id)
@@ -951,13 +951,13 @@ func testSearchUsingCombinedFilters(t *testing.T, th *SearchTestHelper) {
}
func testSearchIgnoringStopWords(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "the search for a bunch of stop words", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "the search for a bunch of stop words", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "the objective is to avoid a bunch of stop words", "", model.POST_DEFAULT, 0, false)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "the objective is to avoid a bunch of stop words", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p3, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "in the a on to where you", "", model.POST_DEFAULT, 0, false)
p3, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "in the a on to where you", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p4, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "where is the car?", "", model.POST_DEFAULT, 0, false)
p4, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "where is the car?", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1009,11 +1009,11 @@ func testSearchIgnoringStopWords(t *testing.T, th *SearchTestHelper) {
}
func testSupportStemming(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "search post", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "search post", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching post", "", model.POST_DEFAULT, 0, false)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching post", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "another post", "", model.POST_DEFAULT, 0, false)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "another post", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1029,11 +1029,11 @@ func testSupportStemming(t *testing.T, th *SearchTestHelper) {
}
func testSupportWildcards(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "search post", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "search post", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching", "", model.POST_DEFAULT, 0, false)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "another post", "", model.POST_DEFAULT, 0, false)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "another post", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1062,11 +1062,11 @@ func testSupportWildcards(t *testing.T, th *SearchTestHelper) {
}
func testNotSupportPrecedingWildcards(t *testing.T, th *SearchTestHelper) {
_, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "search post", "", model.POST_DEFAULT, 0, false)
_, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "search post", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "searching post", "", model.POST_DEFAULT, 0, false)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "searching post", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "another post", "", model.POST_DEFAULT, 0, false)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "another post", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1080,9 +1080,9 @@ func testNotSupportPrecedingWildcards(t *testing.T, th *SearchTestHelper) {
}
func testSearchDiscardWildcardAlone(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "qwerty", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "qwerty", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "qwertyjkl", "", model.POST_DEFAULT, 0, false)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "qwertyjkl", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1097,9 +1097,9 @@ func testSearchDiscardWildcardAlone(t *testing.T, th *SearchTestHelper) {
}
func testSupportTermsWithDash(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "search term-with-dash", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "search term-with-dash", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "searching term with dash", "", model.POST_DEFAULT, 0, false)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "searching term with dash", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1127,9 +1127,9 @@ func testSupportTermsWithDash(t *testing.T, th *SearchTestHelper) {
}
func testSupportTermsWithUnderscore(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "search term_with_underscore", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "search term_with_underscore", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "searching term with underscore", "", model.POST_DEFAULT, 0, false)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "searching term with underscore", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1157,11 +1157,11 @@ func testSupportTermsWithUnderscore(t *testing.T, th *SearchTestHelper) {
}
func testSearchOrExcludePostsWithHashtags(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "search post with #hashtag", "#hashtag", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "search post with #hashtag", "#hashtag", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching term with hashtag", "", model.POST_DEFAULT, 0, false)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching term with hashtag", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p3, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching term with", "#hashtag", model.POST_DEFAULT, 0, false)
p3, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching term with", "#hashtag", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1193,15 +1193,15 @@ func testSearchOrExcludePostsWithHashtags(t *testing.T, th *SearchTestHelper) {
}
func testSearchHashtagWithMarkdown(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtag", "#hashtag", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtag", "#hashtag", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching term with `#hashtag`", "#hashtag", model.POST_DEFAULT, 0, false)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching term with `#hashtag`", "#hashtag", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p3, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching term with **#hashtag**", "#hashtag", model.POST_DEFAULT, 0, false)
p3, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching term with **#hashtag**", "#hashtag", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p4, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching term with ~~#hashtag~~", "#hashtag", model.POST_DEFAULT, 0, false)
p4, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching term with ~~#hashtag~~", "#hashtag", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p5, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching term with _#hashtag_", "#hashtag", model.POST_DEFAULT, 0, false)
p5, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching term with _#hashtag_", "#hashtag", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1221,9 +1221,9 @@ func testSearchHashtagWithMarkdown(t *testing.T, th *SearchTestHelper) {
}
func testSearcWithMultipleHashtags(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtag", "#hashtwo #hashone", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtag", "#hashtwo #hashone", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching term with `#hashtag`", "#hashtwo #hashthree", model.POST_DEFAULT, 0, false)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching term with `#hashtag`", "#hashtwo #hashthree", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1255,7 +1255,7 @@ func testSearcWithMultipleHashtags(t *testing.T, th *SearchTestHelper) {
}
func testSearchPostsWithDotsInHashtags(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtag.dot", "#hashtag.dot", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtag.dot", "#hashtag.dot", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1271,11 +1271,11 @@ func testSearchPostsWithDotsInHashtags(t *testing.T, th *SearchTestHelper) {
}
func testSearchHashtagCaseInsensitive(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #HaShTaG", "#HaShTaG", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #HaShTaG", "#HaShTaG", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtag", "#hashtag", model.POST_DEFAULT, 0, false)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtag", "#hashtag", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p3, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #HASHTAG", "#HASHTAG", model.POST_DEFAULT, 0, false)
p3, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #HASHTAG", "#HASHTAG", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1323,9 +1323,9 @@ func testSearchHashtagCaseInsensitive(t *testing.T, th *SearchTestHelper) {
}
func testSearchHashtagWithDash(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtag-test", "#hashtag-test", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtag-test", "#hashtag-test", model.PostTypeDefault, 0, false)
require.NoError(t, err)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtagtest", "#hashtagtest", model.POST_DEFAULT, 0, false)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtagtest", "#hashtagtest", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1341,9 +1341,9 @@ func testSearchHashtagWithDash(t *testing.T, th *SearchTestHelper) {
}
func testSearchHashtagWithNumbers(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #h4sht4g", "#h4sht4g", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #h4sht4g", "#h4sht4g", model.PostTypeDefault, 0, false)
require.NoError(t, err)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtag", "#hashtag", model.POST_DEFAULT, 0, false)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtag", "#hashtag", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1359,9 +1359,9 @@ func testSearchHashtagWithNumbers(t *testing.T, th *SearchTestHelper) {
}
func testSearchHashtagWithDots(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtag.test", "#hashtag.test", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtag.test", "#hashtag.test", model.PostTypeDefault, 0, false)
require.NoError(t, err)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtagtest", "#hashtagtest", model.POST_DEFAULT, 0, false)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtagtest", "#hashtagtest", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1377,9 +1377,9 @@ func testSearchHashtagWithDots(t *testing.T, th *SearchTestHelper) {
}
func testSearchHashtagWithUnderscores(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtag_test", "#hashtag_test", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtag_test", "#hashtag_test", model.PostTypeDefault, 0, false)
require.NoError(t, err)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtagtest", "#hashtagtest", model.POST_DEFAULT, 0, false)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "searching hashtag #hashtagtest", "#hashtagtest", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1395,17 +1395,17 @@ func testSearchHashtagWithUnderscores(t *testing.T, th *SearchTestHelper) {
}
func testSearchShouldExcludeSytemMessages(t *testing.T, th *SearchTestHelper) {
_, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test system message one", "", model.POST_JOIN_CHANNEL, 0, false)
_, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test system message one", "", model.PostTypeJoinChannel, 0, false)
require.NoError(t, err)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "test system message two", "", model.POST_LEAVE_CHANNEL, 0, false)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "test system message two", "", model.PostTypeLeaveChannel, 0, false)
require.NoError(t, err)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "test system message three", "", model.POST_LEAVE_TEAM, 0, false)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "test system message three", "", model.PostTypeLeaveTeam, 0, false)
require.NoError(t, err)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "test system message four", "", model.POST_ADD_TO_CHANNEL, 0, false)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "test system message four", "", model.PostTypeAddToChannel, 0, false)
require.NoError(t, err)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "test system message five", "", model.POST_ADD_TO_TEAM, 0, false)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "test system message five", "", model.PostTypeAddToTeam, 0, false)
require.NoError(t, err)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "test system message six", "", model.POST_HEADER_CHANGE, 0, false)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "test system message six", "", model.PostTypeHeaderChange, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1417,11 +1417,11 @@ func testSearchShouldExcludeSytemMessages(t *testing.T, th *SearchTestHelper) {
}
func testSearchShouldBeAbleToMatchByMentions(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test system @testuser", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test system @testuser", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test system testuser", "", model.POST_DEFAULT, 0, false)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test system testuser", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p3, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test system #testuser", "#testuser", model.POST_DEFAULT, 0, false)
p3, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "test system #testuser", "#testuser", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1436,11 +1436,11 @@ func testSearchShouldBeAbleToMatchByMentions(t *testing.T, th *SearchTestHelper)
}
func testSearchInDeletedOrArchivedChannels(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelDeleted.Id, "message in deleted channel", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelDeleted.Id, "message in deleted channel", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message in regular channel", "", model.POST_DEFAULT, 0, false)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message in regular channel", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p3, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "message in private channel", "", model.POST_DEFAULT, 0, false)
p3, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "message in private channel", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1507,9 +1507,9 @@ func testSearchInDeletedOrArchivedChannels(t *testing.T, th *SearchTestHelper) {
}
func testSearchTermsWithDashes(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message with-dash-term", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message with-dash-term", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message with dash term", "", model.POST_DEFAULT, 0, false)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message with dash term", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1552,9 +1552,9 @@ func testSearchTermsWithDashes(t *testing.T, th *SearchTestHelper) {
}
func testSearchTermsWithDots(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message with.dots.term", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message with.dots.term", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message with dots term", "", model.POST_DEFAULT, 0, false)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message with dots term", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1597,9 +1597,9 @@ func testSearchTermsWithDots(t *testing.T, th *SearchTestHelper) {
}
func testSearchTermsWithUnderscores(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message with_underscores_term", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message with_underscores_term", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message with underscores term", "", model.POST_DEFAULT, 0, false)
p2, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message with underscores term", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1647,9 +1647,9 @@ func testSearchBotAccountsPosts(t *testing.T, th *SearchTestHelper) {
defer th.deleteBot(bot.UserId)
err = th.addUserToTeams(model.UserFromBot(bot), []string{th.Team.Id})
require.NoError(t, err)
p1, err := th.createPost(bot.UserId, th.ChannelBasic.Id, "bot test message", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(bot.UserId, th.ChannelBasic.Id, "bot test message", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p2, err := th.createPost(bot.UserId, th.ChannelPrivate.Id, "bot test message in private", "", model.POST_DEFAULT, 0, false)
p2, err := th.createPost(bot.UserId, th.ChannelPrivate.Id, "bot test message in private", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(bot.UserId)
@@ -1663,11 +1663,11 @@ func testSearchBotAccountsPosts(t *testing.T, th *SearchTestHelper) {
}
func testSupportStemmingAndWildcards(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "approve", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "approve", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "approved", "", model.POST_DEFAULT, 0, false)
p2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "approved", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p3, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "approvedz", "", model.POST_DEFAULT, 0, false)
p3, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "approvedz", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1693,9 +1693,9 @@ func testSupportStemmingAndWildcards(t *testing.T, th *SearchTestHelper) {
}
func testSupportWildcardOutsideQuotes(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "hello world", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "hello world", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "hell or heaven", "", model.POST_DEFAULT, 0, false)
p2, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "hell or heaven", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1721,11 +1721,11 @@ func testSupportWildcardOutsideQuotes(t *testing.T, th *SearchTestHelper) {
}
func testHashtagSearchShouldSupportThreeOrMoreCharacters(t *testing.T, th *SearchTestHelper) {
_, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "one char hashtag #1", "#1", model.POST_DEFAULT, 0, false)
_, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "one char hashtag #1", "#1", model.PostTypeDefault, 0, false)
require.NoError(t, err)
_, err = th.createPost(th.User.Id, th.ChannelPrivate.Id, "two chars hashtag #12", "#12", model.POST_DEFAULT, 0, false)
_, err = th.createPost(th.User.Id, th.ChannelPrivate.Id, "two chars hashtag #12", "#12", model.PostTypeDefault, 0, false)
require.NoError(t, err)
p3, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "three chars hashtag #123", "#123", model.POST_DEFAULT, 0, false)
p3, err := th.createPost(th.User.Id, th.ChannelPrivate.Id, "three chars hashtag #123", "#123", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1738,7 +1738,7 @@ func testHashtagSearchShouldSupportThreeOrMoreCharacters(t *testing.T, th *Searc
}
func testSlashShouldNotBeCharSeparator(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "alpha/beta gamma, theta", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "alpha/beta gamma, theta", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1765,9 +1765,9 @@ func testSlashShouldNotBeCharSeparator(t *testing.T, th *SearchTestHelper) {
}
func testSearchEmailsWithoutQuotes(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message test@test.com", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message test@test.com", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "message test2@test.com", "", model.POST_DEFAULT, 0, false)
_, err = th.createPost(th.User.Id, th.ChannelBasic.Id, "message test2@test.com", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1780,7 +1780,7 @@ func testSearchEmailsWithoutQuotes(t *testing.T, th *SearchTestHelper) {
}
func testSupportSearchInComments(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message test@test.com", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message test@test.com", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
r1, err := th.createReply(th.User.Id, "reply check", "", p1, 0, false)
require.NoError(t, err)
@@ -1795,7 +1795,7 @@ func testSupportSearchInComments(t *testing.T, th *SearchTestHelper) {
}
func testSupportSearchTermsWithinLinks(t *testing.T, th *SearchTestHelper) {
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message with link http://www.wikipedia.org/dolphins", "", model.POST_DEFAULT, 0, false)
p1, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message with link http://www.wikipedia.org/dolphins", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)
@@ -1808,7 +1808,7 @@ func testSupportSearchTermsWithinLinks(t *testing.T, th *SearchTestHelper) {
}
func testShouldNotReturnLinksEmbeddedInMarkdown(t *testing.T, th *SearchTestHelper) {
_, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message with link [here](http://www.wikipedia.org/dolphins)", "", model.POST_DEFAULT, 0, false)
_, err := th.createPost(th.User.Id, th.ChannelBasic.Id, "message with link [here](http://www.wikipedia.org/dolphins)", "", model.PostTypeDefault, 0, false)
require.NoError(t, err)
defer th.deleteUserPosts(th.User.Id)

4
store/searchtest/user_layer.go
Просмотреть файл

@@ -167,7 +167,7 @@ func TestSearchUserStore(t *testing.T, s store.Store, testEngine *SearchTestEngi
func testGetAllUsersInChannelWithEmptyTerm(t *testing.T, th *SearchTestHelper) {
options := &model.UserSearchOptions{
AllowFullNames: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Limit: model.UserSearchDefaultLimit,
}
users, err := th.Store.User().AutocompleteUsersInChannel(th.Team.Id, th.ChannelBasic.Id, "", options)
require.NoError(t, err)
@@ -870,6 +870,6 @@ func createDefaultOptions(allowFullName, allowEmails, allowInactive bool) *model
AllowFullNames: allowFullName,
AllowEmails: allowEmails,
AllowInactive: allowInactive,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Limit: model.UserSearchDefaultLimit,
}
}

2
store/sqlstore/bot_store.go
Просмотреть файл

@@ -57,7 +57,7 @@ func newSqlBotStore(sqlStore *SqlStore, metrics einterfaces.MetricsInterface) st
table := db.AddTableWithName(bot{}, "Bots").SetKeys(false, "UserId")
table.ColMap("UserId").SetMaxSize(26)
table.ColMap("Description").SetMaxSize(1024)
table.ColMap("OwnerId").SetMaxSize(model.BOT_CREATOR_ID_MAX_RUNES)
table.ColMap("OwnerId").SetMaxSize(model.BotCreatorIdMaxRunes)
}
return us

2
store/sqlstore/channel_member_history_store.go
Просмотреть файл

@@ -212,7 +212,7 @@ func (s SqlChannelMemberHistoryStore) PermanentDeleteBatch(endTime int64, limit
err error
)
if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if s.DriverName() == model.DatabaseDriverPostgres {
var innerSelect string
innerSelect, args, err = s.getQueryBuilder().
Select("ctid").

96
store/sqlstore/channel_store.go
Просмотреть файл

@@ -24,10 +24,10 @@ import (
)
const (
AllChannelMembersForUserCacheSize = model.SESSION_CACHE_SIZE
AllChannelMembersForUserCacheSize = model.SessionCacheSize
AllChannelMembersForUserCacheDuration = 15 * time.Minute // 15 mins
AllChannelMembersNotifyPropsForChannelCacheSize = model.SESSION_CACHE_SIZE
AllChannelMembersNotifyPropsForChannelCacheSize = model.SessionCacheSize
AllChannelMembersNotifyPropsForChannelCacheDuration = 30 * time.Minute // 30 mins
ChannelCacheDuration = 15 * time.Minute // 15 mins
@@ -132,11 +132,11 @@ func getChannelRoles(schemeGuest, schemeUser, schemeAdmin bool, defaultTeamGuest
// them from ExplicitRoles field.
for _, role := range roles {
switch role {
case model.CHANNEL_GUEST_ROLE_ID:
case model.ChannelGuestRoleId:
result.schemeGuest = true
case model.CHANNEL_USER_ROLE_ID:
case model.ChannelUserRoleId:
result.schemeUser = true
case model.CHANNEL_ADMIN_ROLE_ID:
case model.ChannelAdminRoleId:
result.schemeAdmin = true
default:
result.explicitRoles = append(result.explicitRoles, role)
@@ -153,7 +153,7 @@ func getChannelRoles(schemeGuest, schemeUser, schemeAdmin bool, defaultTeamGuest
} else if defaultTeamGuestRole != "" {
schemeImpliedRoles = append(schemeImpliedRoles, defaultTeamGuestRole)
} else {
schemeImpliedRoles = append(schemeImpliedRoles, model.CHANNEL_GUEST_ROLE_ID)
schemeImpliedRoles = append(schemeImpliedRoles, model.ChannelGuestRoleId)
}
}
if result.schemeUser {
@@ -162,7 +162,7 @@ func getChannelRoles(schemeGuest, schemeUser, schemeAdmin bool, defaultTeamGuest
} else if defaultTeamUserRole != "" {
schemeImpliedRoles = append(schemeImpliedRoles, defaultTeamUserRole)
} else {
schemeImpliedRoles = append(schemeImpliedRoles, model.CHANNEL_USER_ROLE_ID)
schemeImpliedRoles = append(schemeImpliedRoles, model.ChannelUserRoleId)
}
}
if result.schemeAdmin {
@@ -171,7 +171,7 @@ func getChannelRoles(schemeGuest, schemeUser, schemeAdmin bool, defaultTeamGuest
} else if defaultTeamAdminRole != "" {
schemeImpliedRoles = append(schemeImpliedRoles, defaultTeamAdminRole)
} else {
schemeImpliedRoles = append(schemeImpliedRoles, model.CHANNEL_ADMIN_ROLE_ID)
schemeImpliedRoles = append(schemeImpliedRoles, model.ChannelAdminRoleId)
}
}
for _, impliedRole := range schemeImpliedRoles {
@@ -288,7 +288,7 @@ func (db allChannelMember) Process() (string, string) {
} else if db.TeamSchemeDefaultGuestRole.Valid && db.TeamSchemeDefaultGuestRole.String != "" {
schemeImpliedRoles = append(schemeImpliedRoles, db.TeamSchemeDefaultGuestRole.String)
} else {
schemeImpliedRoles = append(schemeImpliedRoles, model.CHANNEL_GUEST_ROLE_ID)
schemeImpliedRoles = append(schemeImpliedRoles, model.ChannelGuestRoleId)
}
}
if db.SchemeUser.Valid && db.SchemeUser.Bool {
@@ -297,7 +297,7 @@ func (db allChannelMember) Process() (string, string) {
} else if db.TeamSchemeDefaultUserRole.Valid && db.TeamSchemeDefaultUserRole.String != "" {
schemeImpliedRoles = append(schemeImpliedRoles, db.TeamSchemeDefaultUserRole.String)
} else {
schemeImpliedRoles = append(schemeImpliedRoles, model.CHANNEL_USER_ROLE_ID)
schemeImpliedRoles = append(schemeImpliedRoles, model.ChannelUserRoleId)
}
}
if db.SchemeAdmin.Valid && db.SchemeAdmin.Bool {
@@ -306,7 +306,7 @@ func (db allChannelMember) Process() (string, string) {
} else if db.TeamSchemeDefaultAdminRole.Valid && db.TeamSchemeDefaultAdminRole.String != "" {
schemeImpliedRoles = append(schemeImpliedRoles, db.TeamSchemeDefaultAdminRole.String)
} else {
schemeImpliedRoles = append(schemeImpliedRoles, model.CHANNEL_ADMIN_ROLE_ID)
schemeImpliedRoles = append(schemeImpliedRoles, model.ChannelAdminRoleId)
}
}
for _, impliedRole := range schemeImpliedRoles {
@@ -353,7 +353,7 @@ var allChannelMembersNotifyPropsForChannelCache = cache.NewLRU(cache.LRUOptions{
Size: AllChannelMembersNotifyPropsForChannelCacheSize,
})
var channelByNameCache = cache.NewLRU(cache.LRUOptions{
Size: model.CHANNEL_CACHE_SIZE,
Size: model.ChannelCacheSize,
})
func (s SqlChannelStore) ClearCaches() {
@@ -425,7 +425,7 @@ func (s SqlChannelStore) createIndexesIfNotExists() {
s.CreateIndexIfNotExists("idx_channels_create_at", "Channels", "CreateAt")
s.CreateIndexIfNotExists("idx_channels_delete_at", "Channels", "DeleteAt")
if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if s.DriverName() == model.DatabaseDriverPostgres {
s.CreateIndexIfNotExists("idx_channels_name_lower", "Channels", "lower(Name)")
s.CreateIndexIfNotExists("idx_channels_displayname_lower", "Channels", "lower(DisplayName)")
}
@@ -436,7 +436,7 @@ func (s SqlChannelStore) createIndexesIfNotExists() {
s.CreateIndexIfNotExists("idx_publicchannels_team_id", "PublicChannels", "TeamId")
s.CreateIndexIfNotExists("idx_publicchannels_delete_at", "PublicChannels", "DeleteAt")
if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if s.DriverName() == model.DatabaseDriverPostgres {
s.CreateIndexIfNotExists("idx_publicchannels_name_lower", "PublicChannels", "lower(Name)")
s.CreateIndexIfNotExists("idx_publicchannels_displayname_lower", "PublicChannels", "lower(DisplayName)")
}
@@ -477,7 +477,7 @@ func (s SqlChannelStore) upsertPublicChannelT(transaction *gorp.Transaction, cha
Purpose: channel.Purpose,
}
if channel.Type != model.CHANNEL_OPEN {
if channel.Type != model.ChannelTypeOpen {
if _, err := transaction.Delete(publicChannel); err != nil {
return errors.Wrap(err, "failed to delete public channel")
}
@@ -495,7 +495,7 @@ func (s SqlChannelStore) upsertPublicChannelT(transaction *gorp.Transaction, cha
"Purpose": publicChannel.Purpose,
}
var err error
if s.DriverName() == model.DATABASE_DRIVER_MYSQL {
if s.DriverName() == model.DatabaseDriverMysql {
_, err = transaction.Exec(`
INSERT INTO
PublicChannels(Id, DeleteAt, TeamId, DisplayName, Name, Header, Purpose)
@@ -537,7 +537,7 @@ func (s SqlChannelStore) Save(channel *model.Channel, maxChannelsPerTeam int64)
return nil, store.NewErrInvalidInput("Channel", "DeleteAt", channel.DeleteAt)
}
if channel.Type == model.CHANNEL_DIRECT {
if channel.Type == model.ChannelTypeDirect {
return nil, store.NewErrInvalidInput("Channel", "Type", channel.Type)
}
@@ -577,7 +577,7 @@ func (s SqlChannelStore) CreateDirectChannel(user *model.User, otherUser *model.
channel.Name = model.GetDMNameFromIds(otherUser.Id, user.Id)
channel.Header = ""
channel.Type = model.CHANNEL_DIRECT
channel.Type = model.ChannelTypeDirect
channel.Shared = model.NewBool(user.IsRemote() || otherUser.IsRemote())
channel.CreatorId = user.Id
@@ -602,7 +602,7 @@ func (s SqlChannelStore) SaveDirectChannel(directChannel *model.Channel, member1
return nil, store.NewErrInvalidInput("Channel", "DeleteAt", directChannel.DeleteAt)
}
if directChannel.Type != model.CHANNEL_DIRECT {
if directChannel.Type != model.ChannelTypeDirect {
return nil, store.NewErrInvalidInput("Channel", "Type", directChannel.Type)
}
@@ -649,7 +649,7 @@ func (s SqlChannelStore) saveChannelT(transaction *gorp.Transaction, channel *mo
return nil, err // we just pass through the error as-is for now.
}
if channel.Type != model.CHANNEL_DIRECT && channel.Type != model.CHANNEL_GROUP && maxChannelsPerTeam >= 0 {
if channel.Type != model.ChannelTypeDirect && channel.Type != model.ChannelTypeGroup && maxChannelsPerTeam >= 0 {
if count, err := transaction.SelectInt("SELECT COUNT(0) FROM Channels WHERE TeamId = :TeamId AND DeleteAt = 0 AND (Type = 'O' OR Type = 'P')", map[string]interface{}{"TeamId": channel.TeamId}); err != nil {
return nil, errors.Wrapf(err, "save_channel_count: teamId=%s", channel.TeamId)
} else if count >= maxChannelsPerTeam {
@@ -1043,7 +1043,7 @@ func (s SqlChannelStore) getAllChannelsQuery(opts store.ChannelSearchOpts, forCo
query := s.getQueryBuilder().
Select(selectStr).
From("Channels AS c").
Where(sq.Eq{"c.Type": []string{model.CHANNEL_PRIVATE, model.CHANNEL_OPEN}})
Where(sq.Eq{"c.Type": []string{model.ChannelTypePrivate, model.ChannelTypeOpen}})
if !forCount {
query = query.Join("Teams ON Teams.Id = c.TeamId")
@@ -1119,7 +1119,7 @@ func (s SqlChannelStore) GetPrivateChannelsForTeam(teamId string, offset int, li
builder := s.getQueryBuilder().
Select("*").
From("Channels").
Where(sq.Eq{"Type": model.CHANNEL_PRIVATE, "TeamId": teamId, "DeleteAt": 0}).
Where(sq.Eq{"Type": model.ChannelTypePrivate, "TeamId": teamId, "DeleteAt": 0}).
OrderBy("DisplayName").
Limit(uint64(limit)).
Offset(uint64(offset))
@@ -1907,7 +1907,7 @@ func (s SqlChannelStore) GetMemberCountsByGroup(ctx context.Context, channelID s
manualTimezone := `LOCATE(',', Users.Timezone) + 19`
manualTimezoneEnd := `LOCATE('useAutomaticTimezone', Users.Timezone) - 22 - LOCATE(',', Users.Timezone)`
if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if s.DriverName() == model.DatabaseDriverPostgres {
autoTimezone = `POSITION(':' IN Users.Timezone) + 2`
autoTimezoneEnd = `POSITION(',' IN Users.Timezone) - POSITION(':' IN Users.Timezone) - 3`
manualTimezone = `POSITION(',' IN Users.Timezone) + 19`
@@ -2096,7 +2096,7 @@ func (s SqlChannelStore) UpdateLastViewedAt(channelIds []string, userId string,
query := `SELECT Id, LastPostAt, TotalMsgCount, TotalMsgCountRoot FROM Channels WHERE Id IN ` + keys
// TODO: use a CTE for mysql too when version 8 becomes the minimum supported version.
if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if s.DriverName() == model.DatabaseDriverPostgres {
query = `WITH c AS ( ` + query + `),
updated AS (
UPDATE
@@ -2125,7 +2125,7 @@ func (s SqlChannelStore) UpdateLastViewedAt(channelIds []string, userId string,
}
times := map[string]int64{}
if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if s.DriverName() == model.DatabaseDriverPostgres {
for _, t := range lastPostAtTimes {
times[t.Id] = t.LastPostAt
}
@@ -2181,16 +2181,16 @@ func (s SqlChannelStore) UpdateLastViewedAt(channelIds []string, userId string,
func (s SqlChannelStore) CountPostsAfter(channelId string, timestamp int64, userId string) (int, int, error) {
joinLeavePostTypes := []string{
// These types correspond to the ones checked by Post.IsJoinLeaveMessage
model.POST_JOIN_LEAVE,
model.POST_ADD_REMOVE,
model.POST_JOIN_CHANNEL,
model.POST_LEAVE_CHANNEL,
model.POST_JOIN_TEAM,
model.POST_LEAVE_TEAM,
model.POST_ADD_TO_CHANNEL,
model.POST_REMOVE_FROM_CHANNEL,
model.POST_ADD_TO_TEAM,
model.POST_REMOVE_FROM_TEAM,
model.PostTypeJoinLeave,
model.PostTypeAddRemove,
model.PostTypeJoinChannel,
model.PostTypeLeaveChannel,
model.PostTypeJoinTeam,
model.PostTypeLeaveTeam,
model.PostTypeAddToChannel,
model.PostTypeRemoveFromChannel,
model.PostTypeAddToTeam,
model.PostTypeRemoveFromTeam,
}
query := s.getQueryBuilder().Select("count(*)").From("Posts").Where(sq.Eq{"ChannelId": channelId}).Where(sq.Gt{"CreateAt": timestamp}).Where(sq.NotEq{"Type": joinLeavePostTypes}).Where(sq.Eq{"DeleteAt": 0})
@@ -2444,7 +2444,7 @@ func (s SqlChannelStore) AutocompleteInTeam(teamId string, term string, includeD
Channels.TeamId = :TeamId
` + deleteFilter + `
%v
LIMIT ` + strconv.Itoa(model.CHANNEL_SEARCH_DEFAULT_LIMIT)
LIMIT ` + strconv.Itoa(model.ChannelSearchDefaultLimit)
var channels model.ChannelList
@@ -2764,11 +2764,11 @@ func (s SqlChannelStore) channelSearchQuery(opts *store.ChannelSearchOpts) sq.Se
if opts.Public && !opts.Private {
query = query.InnerJoin("PublicChannels ON c.Id = PublicChannels.Id")
} else if opts.Private && !opts.Public {
query = query.Where(sq.Eq{"c.Type": model.CHANNEL_PRIVATE})
query = query.Where(sq.Eq{"c.Type": model.ChannelTypePrivate})
} else {
query = query.Where(sq.Or{
sq.Eq{"c.Type": model.CHANNEL_OPEN},
sq.Eq{"c.Type": model.CHANNEL_PRIVATE},
sq.Eq{"c.Type": model.ChannelTypeOpen},
sq.Eq{"c.Type": model.ChannelTypePrivate},
})
}
@@ -2848,7 +2848,7 @@ func (s SqlChannelStore) buildLIKEClause(term string, searchColumns string) (lik
// Prepare the LIKE portion of the query.
var searchFields []string
for _, field := range strings.Split(searchColumns, ", ") {
if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if s.DriverName() == model.DatabaseDriverPostgres {
searchFields = append(searchFields, fmt.Sprintf("lower(%s) LIKE lower(%s) escape '*'", field, ":LikeTerm"))
} else {
searchFields = append(searchFields, fmt.Sprintf("%s LIKE %s escape '*'", field, ":LikeTerm"))
@@ -2870,7 +2870,7 @@ func (s SqlChannelStore) buildFulltextClause(term string, searchColumns string)
}
// Prepare the FULLTEXT portion of the query.
if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if s.DriverName() == model.DatabaseDriverPostgres {
fulltextTerm = strings.Replace(fulltextTerm, "|", "", -1)
splitTerm := strings.Fields(fulltextTerm)
@@ -2885,7 +2885,7 @@ func (s SqlChannelStore) buildFulltextClause(term string, searchColumns string)
fulltextTerm = strings.Join(splitTerm, " ")
fulltextClause = fmt.Sprintf("((to_tsvector('english', %s)) @@ to_tsquery('english', :FulltextTerm))", convertMySQLFullTextColumnsToPostgres(searchColumns))
} else if s.DriverName() == model.DATABASE_DRIVER_MYSQL {
} else if s.DriverName() == model.DatabaseDriverMysql {
splitTerm := strings.Fields(fulltextTerm)
for i, t := range strings.Fields(fulltextTerm) {
splitTerm[i] = "+" + t + "*"
@@ -2958,7 +2958,7 @@ func (s SqlChannelStore) getSearchGroupChannelsQuery(userId, term string, isPost
HAVING
%s
LIMIT
` + strconv.Itoa(model.CHANNEL_SEARCH_DEFAULT_LIMIT) + `
` + strconv.Itoa(model.ChannelSearchDefaultLimit) + `
)`
} else {
baseLikeClause = "GROUP_CONCAT(u.Username SEPARATOR ', ') LIKE %s"
@@ -2990,7 +2990,7 @@ func (s SqlChannelStore) getSearchGroupChannelsQuery(userId, term string, isPost
HAVING
%s
LIMIT
` + strconv.Itoa(model.CHANNEL_SEARCH_DEFAULT_LIMIT)
` + strconv.Itoa(model.ChannelSearchDefaultLimit)
}
var likeClauses []string
@@ -3009,7 +3009,7 @@ func (s SqlChannelStore) getSearchGroupChannelsQuery(userId, term string, isPost
}
func (s SqlChannelStore) SearchGroupChannels(userId, term string) (*model.ChannelList, error) {
isPostgreSQL := s.DriverName() == model.DATABASE_DRIVER_POSTGRES
isPostgreSQL := s.DriverName() == model.DatabaseDriverPostgres
queryString, args := s.getSearchGroupChannelsQuery(userId, term, isPostgreSQL)
var groupChannels model.ChannelList
@@ -3091,11 +3091,11 @@ func (s SqlChannelStore) MigrateChannelMembers(fromChannelId string, fromUserId
member.SchemeGuest = sql.NullBool{Bool: false, Valid: true}
}
for _, role := range roles {
if role == model.CHANNEL_ADMIN_ROLE_ID {
if role == model.ChannelAdminRoleId {
member.SchemeAdmin = sql.NullBool{Bool: true, Valid: true}
} else if role == model.CHANNEL_USER_ROLE_ID {
} else if role == model.ChannelUserRoleId {
member.SchemeUser = sql.NullBool{Bool: true, Valid: true}
} else if role == model.CHANNEL_GUEST_ROLE_ID {
} else if role == model.ChannelGuestRoleId {
member.SchemeGuest = sql.NullBool{Bool: true, Valid: true}
} else {
newRoles = append(newRoles, role)

28
store/sqlstore/channel_store_categories.go
Просмотреть файл

@@ -157,7 +157,7 @@ func (s SqlChannelStore) migrateFavoritesToSidebarT(transaction *gorp.Transactio
Join("ChannelMembers on Preferences.Name = ChannelMembers.ChannelId and Preferences.UserId = ChannelMembers.UserId").
Where(sq.Eq{
"Preferences.UserId": userId,
"Preferences.Category": model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL,
"Preferences.Category": model.PreferenceCategoryFavoriteChannel,
"Preferences.Value": "true",
}).
Where(sq.Or{
@@ -203,7 +203,7 @@ func (s SqlChannelStore) MigrateFavoritesToSidebarChannels(lastUserId string, ru
Select("Preferences.UserId", "Preferences.Name AS ChannelId", "SidebarCategories.Id AS CategoryId").
From("Preferences").
Where(sq.And{
sq.Eq{"Preferences.Category": model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL},
sq.Eq{"Preferences.Category": model.PreferenceCategoryFavoriteChannel},
sq.NotEq{"Preferences.Value": "false"},
sq.NotEq{"SidebarCategories.Id": nil},
sq.Gt{"Preferences.UserId": lastUserId},
@@ -288,7 +288,7 @@ func (s SqlChannelStore) CreateSidebarCategory(userId, teamId string, newCategor
// Remove any channels from their previous categories and add them to the new one
var deleteQuery string
if s.DriverName() == model.DATABASE_DRIVER_MYSQL {
if s.DriverName() == model.DatabaseDriverMysql {
deleteQuery = `
DELETE
SidebarChannels
@@ -378,11 +378,11 @@ func (s SqlChannelStore) completePopulatingCategoryChannelsT(db dbSelecter, cate
var channelTypeFilter sq.Sqlizer
if category.Type == model.SidebarCategoryDirectMessages {
// any DM/GM channels that aren't in any category should be returned as part of the Direct Messages category
channelTypeFilter = sq.Eq{"Channels.Type": []string{model.CHANNEL_DIRECT, model.CHANNEL_GROUP}}
channelTypeFilter = sq.Eq{"Channels.Type": []string{model.ChannelTypeDirect, model.ChannelTypeGroup}}
} else if category.Type == model.SidebarCategoryChannels {
// any public/private channels that are on the current team and aren't in any category should be returned as part of the Channels category
channelTypeFilter = sq.And{
sq.Eq{"Channels.Type": []string{model.CHANNEL_OPEN, model.CHANNEL_PRIVATE}},
sq.Eq{"Channels.Type": []string{model.ChannelTypeOpen, model.ChannelTypePrivate}},
sq.Eq{"Channels.TeamId": category.TeamId},
}
}
@@ -705,7 +705,7 @@ func (s SqlChannelStore) UpdateSidebarCategories(userId, teamId string, categori
sq.Eq{
"UserId": userId,
"Name": originalCategory.Channels,
"Category": model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL,
"Category": model.PreferenceCategoryFavoriteChannel,
},
).ToSql()
@@ -720,7 +720,7 @@ func (s SqlChannelStore) UpdateSidebarCategories(userId, teamId string, categori
if err = s.Preference().(*SqlPreferenceStore).save(transaction, &model.Preference{
Name: channelID,
UserId: userId,
Category: model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL,
Category: model.PreferenceCategoryFavoriteChannel,
Value: "true",
}); err != nil {
return nil, nil, errors.Wrap(err, "failed to save Preference")
@@ -732,7 +732,7 @@ func (s SqlChannelStore) UpdateSidebarCategories(userId, teamId string, categori
sq.Eq{
"UserId": userId,
"Name": category.Channels,
"Category": model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL,
"Category": model.PreferenceCategoryFavoriteChannel,
},
).ToSql()
if nErr != nil {
@@ -777,7 +777,7 @@ func (s SqlChannelStore) UpdateSidebarChannelsByPreferences(preferences *model.P
for _, preference := range *preferences {
preference := preference
if preference.Category != model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL {
if preference.Category != model.PreferenceCategoryFavoriteChannel {
continue
}
@@ -801,7 +801,7 @@ func (s SqlChannelStore) UpdateSidebarChannelsByPreferences(preferences *model.P
}
func (s SqlChannelStore) removeSidebarEntriesForPreferenceT(transaction *gorp.Transaction, preference *model.Preference) error {
if preference.Category != model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL {
if preference.Category != model.PreferenceCategoryFavoriteChannel {
return nil
}
@@ -813,7 +813,7 @@ func (s SqlChannelStore) removeSidebarEntriesForPreferenceT(transaction *gorp.Tr
"CategoryType": model.SidebarCategoryFavorites,
}
var query string
if s.DriverName() == model.DATABASE_DRIVER_MYSQL {
if s.DriverName() == model.DatabaseDriverMysql {
query = `
DELETE
SidebarChannels
@@ -846,7 +846,7 @@ func (s SqlChannelStore) removeSidebarEntriesForPreferenceT(transaction *gorp.Tr
}
func (s SqlChannelStore) addChannelToFavoritesCategoryT(transaction *gorp.Transaction, preference *model.Preference) error {
if preference.Category != model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL {
if preference.Category != model.PreferenceCategoryFavoriteChannel {
return nil
}
@@ -928,7 +928,7 @@ func (s SqlChannelStore) DeleteSidebarChannelsByPreferences(preferences *model.P
for _, preference := range *preferences {
preference := preference
if preference.Category != model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL {
if preference.Category != model.PreferenceCategoryFavoriteChannel {
continue
}
@@ -961,7 +961,7 @@ func (s SqlChannelStore) ClearSidebarOnTeamLeave(userId, teamId string) error {
}
var deleteQuery string
if s.DriverName() == model.DATABASE_DRIVER_MYSQL {
if s.DriverName() == model.DatabaseDriverMysql {
deleteQuery = "DELETE SidebarChannels FROM SidebarChannels LEFT JOIN SidebarCategories ON SidebarCategories.Id = SidebarChannels.CategoryId WHERE SidebarCategories.TeamId=:TeamId AND SidebarCategories.UserId=:UserId"
} else {
deleteQuery = `

4
store/sqlstore/cluster_discovery_store.go
Просмотреть файл

@@ -92,7 +92,7 @@ func (s sqlClusterDiscoveryStore) GetAll(ClusterDiscoveryType, clusterName strin
From("ClusterDiscovery").
Where(sq.Eq{"Type": ClusterDiscoveryType}).
Where(sq.Eq{"ClusterName": clusterName}).
Where(sq.Gt{"LastPingAt": model.GetMillis() - model.CDS_OFFLINE_AFTER_MILLIS})
Where(sq.Gt{"LastPingAt": model.GetMillis() - model.CDSOfflineAfterMillis})
queryString, args, err := query.ToSql()
if err != nil {
@@ -128,7 +128,7 @@ func (s sqlClusterDiscoveryStore) SetLastPingAt(ClusterDiscovery *model.ClusterD
func (s sqlClusterDiscoveryStore) Cleanup() error {
query := s.getQueryBuilder().
Delete("ClusterDiscovery").
Where(sq.Lt{"LastPingAt": model.GetMillis() - model.CDS_OFFLINE_AFTER_MILLIS})
Where(sq.Lt{"LastPingAt": model.GetMillis() - model.CDSOfflineAfterMillis})
queryString, args, err := query.ToSql()
if err != nil {

4
store/sqlstore/command_webhook_store.go
Просмотреть файл

@@ -58,7 +58,7 @@ func (s SqlCommandWebhookStore) Save(webhook *model.CommandWebhook) (*model.Comm
func (s SqlCommandWebhookStore) Get(id string) (*model.CommandWebhook, error) {
var webhook model.CommandWebhook
exptime := model.GetMillis() - model.COMMAND_WEBHOOK_LIFETIME
exptime := model.GetMillis() - model.CommandWebhookLifetime
query := s.getQueryBuilder().
Select("*").
@@ -104,7 +104,7 @@ func (s SqlCommandWebhookStore) TryUse(id string, limit int) error {
func (s SqlCommandWebhookStore) Cleanup() {
mlog.Debug("Cleaning up command webhook store.")
exptime := model.GetMillis() - model.COMMAND_WEBHOOK_LIFETIME
exptime := model.GetMillis() - model.CommandWebhookLifetime
query := s.getQueryBuilder().
Delete("CommandWebhooks").

2
store/sqlstore/emoji_store.go
Просмотреть файл

@@ -88,7 +88,7 @@ func (es SqlEmojiStore) GetList(offset, limit int, sort string) ([]*model.Emoji,
query := "SELECT * FROM Emoji WHERE DeleteAt = 0"
if sort == model.EMOJI_SORT_BY_NAME {
if sort == model.EmojiSortByName {
query += " ORDER BY Name"
}

12
store/sqlstore/file_info_store.go
Просмотреть файл

@@ -81,7 +81,7 @@ func (fs SqlFileInfoStore) createIndexesIfNotExists() {
fs.CreateIndexIfNotExists("idx_fileinfo_postid_at", "FileInfo", "PostId")
fs.CreateIndexIfNotExists("idx_fileinfo_extension_at", "FileInfo", "Extension")
fs.CreateFullTextIndexIfNotExists("idx_fileinfo_name_txt", "FileInfo", "Name")
if fs.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if fs.DriverName() == model.DatabaseDriverPostgres {
fs.CreateFullTextFuncIndexIfNotExists("idx_fileinfo_name_splitted", "FileInfo", "Translate(Name, '.,-', ' ')")
}
fs.CreateFullTextIndexIfNotExists("idx_fileinfo_content_txt", "FileInfo", "Content")
@@ -210,7 +210,7 @@ func (fs SqlFileInfoStore) GetWithOptions(page, perPage int, opt *model.GetFileI
}
if opt.SortBy == "" {
opt.SortBy = model.FILEINFO_SORT_BY_CREATED
opt.SortBy = model.FileinfoSortByCreated
}
sortDirection := "ASC"
if opt.SortDescending {
@@ -218,9 +218,9 @@ func (fs SqlFileInfoStore) GetWithOptions(page, perPage int, opt *model.GetFileI
}
switch opt.SortBy {
case model.FILEINFO_SORT_BY_CREATED:
case model.FileinfoSortByCreated:
query = query.OrderBy("FileInfo.CreateAt " + sortDirection)
case model.FILEINFO_SORT_BY_SIZE:
case model.FileinfoSortBySize:
query = query.OrderBy("FileInfo.Size " + sortDirection)
default:
return nil, store.NewErrInvalidInput("FileInfo", "<sortOption>", opt.SortBy)
@@ -528,7 +528,7 @@ func (fs SqlFileInfoStore) Search(paramsList []*model.SearchParams, userId, team
if terms == "" && excludedTerms == "" {
// we've already confirmed that we have a channel or user to search for
} else if fs.DriverName() == model.DATABASE_DRIVER_POSTGRES {
} else if fs.DriverName() == model.DatabaseDriverPostgres {
// Parse text for wildcards
if wildcard, err := regexp.Compile(`\*($| )`); err == nil {
terms = wildcard.ReplaceAllLiteralString(terms, ":* ")
@@ -552,7 +552,7 @@ func (fs SqlFileInfoStore) Search(paramsList []*model.SearchParams, userId, team
sq.Expr("to_tsvector('english', Translate(FileInfo.Name, '.,-', ' ')) @@ to_tsquery('english', ?)", queryTerms),
sq.Expr("to_tsvector('english', FileInfo.Content) @@ to_tsquery('english', ?)", queryTerms),
})
} else if fs.DriverName() == model.DATABASE_DRIVER_MYSQL {
} else if fs.DriverName() == model.DatabaseDriverMysql {
var err error
terms, err = removeMysqlStopWordsFromTerms(terms)
if err != nil {

14
store/sqlstore/group_store.go
Просмотреть файл

@@ -411,9 +411,9 @@ func (s *SqlGroupStore) UpsertMember(groupID string, userID string) (*model.Grou
Columns("GroupId", "UserId", "CreateAt", "DeleteAt").
Values(member.GroupId, member.UserId, member.CreateAt, member.DeleteAt)
if s.DriverName() == model.DATABASE_DRIVER_MYSQL {
if s.DriverName() == model.DatabaseDriverMysql {
query = query.SuffixExpr(sq.Expr("ON DUPLICATE KEY UPDATE CreateAt = ?, DeleteAt = ?", member.CreateAt, member.DeleteAt))
} else if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
} else if s.DriverName() == model.DatabaseDriverPostgres {
query = query.SuffixExpr(sq.Expr("ON CONFLICT (groupid, userid) DO UPDATE SET CreateAt = ?, DeleteAt = ?", member.CreateAt, member.DeleteAt))
}
@@ -1010,7 +1010,7 @@ func (s *SqlGroupStore) groupsBySyncableBaseQuery(st model.GroupSyncableType, t
if opts.Q != "" {
pattern := fmt.Sprintf("%%%s%%", sanitizeSearchTerm(opts.Q, "\\"))
operatorKeyword := "ILIKE"
if s.DriverName() == model.DATABASE_DRIVER_MYSQL {
if s.DriverName() == model.DatabaseDriverMysql {
operatorKeyword = "LIKE"
}
query = query.Where(fmt.Sprintf("(ug.Name %[1]s ? OR ug.DisplayName %[1]s ?)", operatorKeyword), pattern, pattern)
@@ -1075,7 +1075,7 @@ func (s *SqlGroupStore) getGroupsAssociatedToChannelsByTeam(teamID string, opts
if opts.Q != "" {
pattern := fmt.Sprintf("%%%s%%", sanitizeSearchTerm(opts.Q, "\\"))
operatorKeyword := "ILIKE"
if s.DriverName() == model.DATABASE_DRIVER_MYSQL {
if s.DriverName() == model.DatabaseDriverMysql {
operatorKeyword = "LIKE"
}
query = query.Where(fmt.Sprintf("(ug.Name %[1]s ? OR ug.DisplayName %[1]s ?)", operatorKeyword), pattern, pattern)
@@ -1195,7 +1195,7 @@ func (s *SqlGroupStore) GetGroups(page, perPage int, opts model.GroupSearchOpts)
if opts.Q != "" {
pattern := fmt.Sprintf("%%%s%%", sanitizeSearchTerm(opts.Q, "\\"))
operatorKeyword := "ILIKE"
if s.DriverName() == model.DATABASE_DRIVER_MYSQL {
if s.DriverName() == model.DatabaseDriverMysql {
operatorKeyword = "LIKE"
}
groupsQuery = groupsQuery.Where(fmt.Sprintf("(g.Name %[1]s ? OR g.DisplayName %[1]s ?)", operatorKeyword), pattern, pattern)
@@ -1284,7 +1284,7 @@ func (s *SqlGroupStore) teamMembersMinusGroupMembersQuery(teamID string, groupID
selectStr = "count(DISTINCT Users.Id)"
} else {
tmpl := "Users.*, coalesce(TeamMembers.SchemeGuest, false), TeamMembers.SchemeAdmin, TeamMembers.SchemeUser, %s AS GroupIDs"
if s.DriverName() == model.DATABASE_DRIVER_MYSQL {
if s.DriverName() == model.DatabaseDriverMysql {
selectStr = fmt.Sprintf(tmpl, "group_concat(UserGroups.Id)")
} else {
selectStr = fmt.Sprintf(tmpl, "string_agg(UserGroups.Id, ',')")
@@ -1362,7 +1362,7 @@ func (s *SqlGroupStore) channelMembersMinusGroupMembersQuery(channelID string, g
selectStr = "count(DISTINCT Users.Id)"
} else {
tmpl := "Users.*, coalesce(ChannelMembers.SchemeGuest, false), ChannelMembers.SchemeAdmin, ChannelMembers.SchemeUser, %s AS GroupIDs"
if s.DriverName() == model.DATABASE_DRIVER_MYSQL {
if s.DriverName() == model.DatabaseDriverMysql {
selectStr = fmt.Sprintf(tmpl, "group_concat(UserGroups.Id)")
} else {
selectStr = fmt.Sprintf(tmpl, "string_agg(UserGroups.Id, ',')")

4
store/sqlstore/integrity.go
Просмотреть файл

@@ -215,7 +215,7 @@ func checkTeamsChannelsIntegrity(ss *SqlStore) model.IntegrityCheckResult {
parentIdAttr: "TeamId",
childName: "Channels",
childIdAttr: "Id",
filter: sq.NotEq{"CT.Type": []string{model.CHANNEL_DIRECT, model.CHANNEL_GROUP}},
filter: sq.NotEq{"CT.Type": []string{model.ChannelTypeDirect, model.ChannelTypeGroup}},
})
res2 := checkParentChildIntegrity(ss, relationalCheckConfig{
parentName: "Teams",
@@ -223,7 +223,7 @@ func checkTeamsChannelsIntegrity(ss *SqlStore) model.IntegrityCheckResult {
childName: "Channels",
childIdAttr: "Id",
canParentIdBeEmpty: true,
filter: sq.Eq{"CT.Type": []string{model.CHANNEL_DIRECT, model.CHANNEL_GROUP}},
filter: sq.Eq{"CT.Type": []string{model.ChannelTypeDirect, model.ChannelTypeGroup}},
})
data1 := res1.Data.(model.RelationalIntegrityCheckData)
data2 := res2.Data.(model.RelationalIntegrityCheckData)

64
store/sqlstore/integrity_test.go
Просмотреть файл

@@ -29,7 +29,7 @@ func createChannel(ss store.Store, teamId, creatorId string) *model.Channel {
m.CreatorId = creatorId
m.DisplayName = "Name"
m.Name = "zz" + model.NewId() + "b"
m.Type = model.CHANNEL_OPEN
m.Type = model.ChannelTypeOpen
c, _ := ss.Channel().Save(&m, -1)
return c
}
@@ -41,7 +41,7 @@ func createChannelWithSchemeId(ss store.Store, schemeId *string) *model.Channel
m.CreatorId = model.NewId()
m.DisplayName = "Name"
m.Name = "zz" + model.NewId() + "b"
m.Type = model.CHANNEL_OPEN
m.Type = model.ChannelTypeOpen
c, _ := ss.Channel().Save(&m, -1)
return c
}
@@ -49,7 +49,7 @@ func createChannelWithSchemeId(ss store.Store, schemeId *string) *model.Channel
func createCommand(ss store.Store, userId, teamId string) *model.Command {
m := model.Command{}
m.CreatorId = userId
m.Method = model.COMMAND_METHOD_POST
m.Method = model.CommandMethodPost
m.TeamId = teamId
m.URL = "http://nowhere.com/"
m.Trigger = "trigger"
@@ -99,10 +99,10 @@ func createCompliance(ss store.Store, userId string) *model.Compliance {
m := model.Compliance{}
m.UserId = userId
m.Desc = "Audit"
m.Status = model.COMPLIANCE_STATUS_FAILED
m.Status = model.ComplianceStatusFailed
m.StartAt = model.GetMillis() - 1
m.EndAt = model.GetMillis() + 1
m.Type = model.COMPLIANCE_TYPE_ADHOC
m.Type = model.ComplianceTypeAdhoc
c, _ := ss.Compliance().Save(&m)
return c
}
@@ -200,7 +200,7 @@ func createPreferences(ss store.Store, userId string) *model.Preferences {
{
UserId: userId,
Name: model.NewId(),
Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW,
Category: model.PreferenceCategoryDirectChannelShow,
Value: "somevalue",
},
}
@@ -220,54 +220,54 @@ func createReaction(ss store.Store, userId, postId string) *model.Reaction {
func createDefaultRoles(ss store.Store) {
ss.Role().Save(&model.Role{
Name: model.TEAM_ADMIN_ROLE_ID,
DisplayName: model.TEAM_ADMIN_ROLE_ID,
Name: model.TeamAdminRoleId,
DisplayName: model.TeamAdminRoleId,
Permissions: []string{
model.PERMISSION_DELETE_OTHERS_POSTS.Id,
model.PermissionDeleteOthersPosts.Id,
},
})
ss.Role().Save(&model.Role{
Name: model.TEAM_USER_ROLE_ID,
DisplayName: model.TEAM_USER_ROLE_ID,
Name: model.TeamUserRoleId,
DisplayName: model.TeamUserRoleId,
Permissions: []string{
model.PERMISSION_VIEW_TEAM.Id,
model.PERMISSION_ADD_USER_TO_TEAM.Id,
model.PermissionViewTeam.Id,
model.PermissionAddUserToTeam.Id,
},
})
ss.Role().Save(&model.Role{
Name: model.TEAM_GUEST_ROLE_ID,
DisplayName: model.TEAM_GUEST_ROLE_ID,
Name: model.TeamGuestRoleId,
DisplayName: model.TeamGuestRoleId,
Permissions: []string{
model.PERMISSION_VIEW_TEAM.Id,
model.PermissionViewTeam.Id,
},
})
ss.Role().Save(&model.Role{
Name: model.CHANNEL_ADMIN_ROLE_ID,
DisplayName: model.CHANNEL_ADMIN_ROLE_ID,
Name: model.ChannelAdminRoleId,
DisplayName: model.ChannelAdminRoleId,
Permissions: []string{
model.PERMISSION_MANAGE_PUBLIC_CHANNEL_MEMBERS.Id,
model.PERMISSION_MANAGE_PRIVATE_CHANNEL_MEMBERS.Id,
model.PermissionManagePublicChannelMembers.Id,
model.PermissionManagePrivateChannelMembers.Id,
},
})
ss.Role().Save(&model.Role{
Name: model.CHANNEL_USER_ROLE_ID,
DisplayName: model.CHANNEL_USER_ROLE_ID,
Name: model.ChannelUserRoleId,
DisplayName: model.ChannelUserRoleId,
Permissions: []string{
model.PERMISSION_READ_CHANNEL.Id,
model.PERMISSION_CREATE_POST.Id,
model.PermissionReadChannel.Id,
model.PermissionCreatePost.Id,
},
})
ss.Role().Save(&model.Role{
Name: model.CHANNEL_GUEST_ROLE_ID,
DisplayName: model.CHANNEL_GUEST_ROLE_ID,
Name: model.ChannelGuestRoleId,
DisplayName: model.ChannelGuestRoleId,
Permissions: []string{
model.PERMISSION_READ_CHANNEL.Id,
model.PERMISSION_CREATE_POST.Id,
model.PermissionReadChannel.Id,
model.PermissionCreatePost.Id,
},
})
}
@@ -277,7 +277,7 @@ func createScheme(ss store.Store) *model.Scheme {
m.DisplayName = model.NewId()
m.Name = model.NewId()
m.Description = model.NewId()
m.Scope = model.SCHEME_SCOPE_CHANNEL
m.Scope = model.SchemeScopeChannel
s, _ := ss.Scheme().Save(&m)
return s
}
@@ -292,7 +292,7 @@ func createSession(ss store.Store, userId string) *model.Session {
func createStatus(ss store.Store, userId string) *model.Status {
m := model.Status{}
m.UserId = userId
m.Status = model.STATUS_ONLINE
m.Status = model.StatusOnline
ss.Status().SaveOrUpdate(&m)
return &m
}
@@ -300,7 +300,7 @@ func createStatus(ss store.Store, userId string) *model.Status {
func createTeam(ss store.Store) *model.Team {
m := model.Team{}
m.DisplayName = "DisplayName"
m.Type = model.TEAM_OPEN
m.Type = model.TeamOpen
m.Email = "test@example.com"
m.Name = "z-z-z" + model.NewRandomTeamName() + "b"
t, _ := ss.Team().Save(&m)
@@ -319,7 +319,7 @@ func createTeamWithSchemeId(ss store.Store, schemeId *string) *model.Team {
m := model.Team{}
m.SchemeId = schemeId
m.DisplayName = "DisplayName"
m.Type = model.TEAM_OPEN
m.Type = model.TeamOpen
m.Email = "test@example.com"
m.Name = "z-z-z" + model.NewId() + "b"
t, _ := ss.Team().Save(&m)

2
store/sqlstore/job_store.go
Просмотреть файл

@@ -97,7 +97,7 @@ func (jss SqlJobStore) UpdateStatusOptimistically(id string, currentStatus strin
Set("Status", newStatus).
Where(sq.Eq{"Id": id, "Status": currentStatus})
if newStatus == model.JOB_STATUS_IN_PROGRESS {
if newStatus == model.JobStatusInProgress {
builder = builder.Set("StartAt", model.GetMillis())
}
query, args, err := builder.ToSql()

2
store/sqlstore/link_metadata_store.go
Просмотреть файл

@@ -31,7 +31,7 @@ func newSqlLinkMetadataStore(sqlStore *SqlStore) store.LinkMetadataStore {
}
func (s SqlLinkMetadataStore) createIndexesIfNotExists() {
if s.DriverName() == model.DATABASE_DRIVER_MYSQL {
if s.DriverName() == model.DatabaseDriverMysql {
s.CreateCompositeIndexIfNotExists("idx_link_metadata_url_timestamp", "LinkMetadata", []string{"URL(512)", "Timestamp"})
} else {
s.CreateCompositeIndexIfNotExists("idx_link_metadata_url_timestamp", "LinkMetadata", []string{"URL", "Timestamp"})

6
store/sqlstore/oauth_store.go
Просмотреть файл

@@ -296,9 +296,9 @@ func (as SqlOAuthStore) deleteApp(transaction *gorp.Transaction, clientId string
func (as SqlOAuthStore) deleteOAuthAppSessions(transaction *gorp.Transaction, clientId string) error {
query := ""
if as.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if as.DriverName() == model.DatabaseDriverPostgres {
query = "DELETE FROM Sessions s USING OAuthAccessData o WHERE o.Token = s.Token AND o.ClientId = :Id"
} else if as.DriverName() == model.DATABASE_DRIVER_MYSQL {
} else if as.DriverName() == model.DatabaseDriverMysql {
query = "DELETE s.* FROM Sessions s INNER JOIN OAuthAccessData o ON o.Token = s.Token WHERE o.ClientId = :Id"
}
@@ -323,7 +323,7 @@ func (as SqlOAuthStore) deleteAppExtras(transaction *gorp.Transaction, clientId
Preferences
WHERE
Category = :Category
AND Name = :Name`, map[string]interface{}{"Category": model.PREFERENCE_CATEGORY_AUTHORIZED_OAUTH_APP, "Name": clientId}); err != nil {
AND Name = :Name`, map[string]interface{}{"Category": model.PreferenceCategoryAuthorizedOAuthApp, "Name": clientId}); err != nil {
return errors.Wrapf(err, "failed to delete Preferences with name=%s", clientId)
}

6
store/sqlstore/plugin_store.go
Просмотреть файл

@@ -58,9 +58,9 @@ func (ps SqlPluginStore) SaveOrUpdate(kv *model.PluginKeyValue) (*model.PluginKe
Insert("PluginKeyValueStore").
Columns("PluginId", "PKey", "PValue", "ExpireAt").
Values(kv.PluginId, kv.Key, kv.Value, kv.ExpireAt)
if ps.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if ps.DriverName() == model.DatabaseDriverPostgres {
query = query.SuffixExpr(sq.Expr("ON CONFLICT (pluginid, pkey) DO UPDATE SET PValue = ?, ExpireAt = ?", kv.Value, kv.ExpireAt))
} else if ps.DriverName() == model.DATABASE_DRIVER_MYSQL {
} else if ps.DriverName() == model.DatabaseDriverMysql {
query = query.SuffixExpr(sq.Expr("ON DUPLICATE KEY UPDATE PValue = ?, ExpireAt = ?", kv.Value, kv.ExpireAt))
}
@@ -144,7 +144,7 @@ func (ps SqlPluginStore) CompareAndSet(kv *model.PluginKeyValue, oldValue []byte
// Failed to update
return false, errors.Wrap(err, "unable to get rows affected")
} else if rowsAffected == 0 {
if ps.DriverName() == model.DATABASE_DRIVER_MYSQL && bytes.Equal(oldValue, kv.Value) {
if ps.DriverName() == model.DatabaseDriverMysql && bytes.Equal(oldValue, kv.Value) {
// ROW_COUNT on MySQL is zero even if the row existed but no changes to the row were required.
// Check if the row exists with the required value to distinguish this case. Strictly speaking,
// this isn't a good use of CompareAndSet anyway, since there's no corresponding guarantee of

46
store/sqlstore/post_store.go
Просмотреть файл

@@ -132,7 +132,7 @@ func newSqlPostStore(sqlStore *SqlStore, metrics einterfaces.MetricsInterface) s
s := &SqlPostStore{
SqlStore: sqlStore,
metrics: metrics,
maxPostSizeCached: model.POST_MESSAGE_MAX_RUNES_V1,
maxPostSizeCached: model.PostMessageMaxRunesV1,
}
for _, db := range sqlStore.GetAllConns() {
@@ -143,11 +143,11 @@ func newSqlPostStore(sqlStore *SqlStore, metrics einterfaces.MetricsInterface) s
table.ColMap("RootId").SetMaxSize(26)
table.ColMap("ParentId").SetMaxSize(26)
table.ColMap("OriginalId").SetMaxSize(26)
table.ColMap("Message").SetMaxSize(model.POST_MESSAGE_MAX_BYTES_V2)
table.ColMap("Message").SetMaxSize(model.PostMessageMaxBytesV2)
table.ColMap("Type").SetMaxSize(26)
table.ColMap("Hashtags").SetMaxSize(1000)
table.ColMap("Props").SetMaxSize(8000)
table.ColMap("Filenames").SetMaxSize(model.POST_FILENAMES_MAX_RUNES)
table.ColMap("Filenames").SetMaxSize(model.PostFilenamesMaxRunes)
table.ColMap("FileIds").SetMaxSize(300)
table.ColMap("RemoteId").SetMaxSize(26)
}
@@ -418,7 +418,7 @@ func (s *SqlPostStore) GetFlaggedPosts(userId string, offset int, limit int) (*m
pl := model.NewPostList()
var posts []*model.Post
if _, err := s.GetReplica().Select(&posts, "SELECT *, (SELECT count(Posts.Id) FROM Posts WHERE Posts.RootId = (CASE WHEN p.RootId = '' THEN p.Id ELSE p.RootId END) AND Posts.DeleteAt = 0) as ReplyCount FROM Posts p WHERE Id IN (SELECT Name FROM Preferences WHERE UserId = :UserId AND Category = :Category) AND DeleteAt = 0 ORDER BY CreateAt DESC LIMIT :Limit OFFSET :Offset", map[string]interface{}{"UserId": userId, "Category": model.PREFERENCE_CATEGORY_FLAGGED_POST, "Offset": offset, "Limit": limit}); err != nil {
if _, err := s.GetReplica().Select(&posts, "SELECT *, (SELECT count(Posts.Id) FROM Posts WHERE Posts.RootId = (CASE WHEN p.RootId = '' THEN p.Id ELSE p.RootId END) AND Posts.DeleteAt = 0) as ReplyCount FROM Posts p WHERE Id IN (SELECT Name FROM Preferences WHERE UserId = :UserId AND Category = :Category) AND DeleteAt = 0 ORDER BY CreateAt DESC LIMIT :Limit OFFSET :Offset", map[string]interface{}{"UserId": userId, "Category": model.PreferenceCategoryFlaggedPost, "Offset": offset, "Limit": limit}); err != nil {
return nil, errors.Wrap(err, "failed to find Posts")
}
@@ -461,7 +461,7 @@ func (s *SqlPostStore) GetFlaggedPostsForTeam(userId, teamId string, offset int,
ORDER BY CreateAt DESC
LIMIT :Limit OFFSET :Offset`
if _, err := s.GetReplica().Select(&posts, query, map[string]interface{}{"UserId": userId, "Category": model.PREFERENCE_CATEGORY_FLAGGED_POST, "Offset": offset, "Limit": limit, "TeamId": teamId}); err != nil {
if _, err := s.GetReplica().Select(&posts, query, map[string]interface{}{"UserId": userId, "Category": model.PreferenceCategoryFlaggedPost, "Offset": offset, "Limit": limit, "TeamId": teamId}); err != nil {
return nil, errors.Wrap(err, "failed to find Posts")
}
@@ -488,7 +488,7 @@ func (s *SqlPostStore) GetFlaggedPostsForChannel(userId, channelId string, offse
ORDER BY CreateAt DESC
LIMIT :Limit OFFSET :Offset`
if _, err := s.GetReplica().Select(&posts, query, map[string]interface{}{"UserId": userId, "Category": model.PREFERENCE_CATEGORY_FLAGGED_POST, "ChannelId": channelId, "Offset": offset, "Limit": limit}); err != nil {
if _, err := s.GetReplica().Select(&posts, query, map[string]interface{}{"UserId": userId, "Category": model.PreferenceCategoryFlaggedPost, "ChannelId": channelId, "Offset": offset, "Limit": limit}); err != nil {
return nil, errors.Wrap(err, "failed to find Posts")
}
for _, post := range posts {
@@ -669,7 +669,7 @@ func (s *SqlPostStore) Delete(postId string, time int64, deleteByID string) erro
return errors.Wrapf(err, "failed to delete Post with id=%s", postId)
}
post.AddProp(model.POST_PROPS_DELETE_BY, deleteByID)
post.AddProp(model.PostPropsDeleteBy, deleteByID)
_, err = s.GetMaster().Exec("UPDATE Posts SET DeleteAt = :DeleteAt, UpdateAt = :UpdateAt, Props = :Props WHERE Id = :Id OR RootId = :RootId", map[string]interface{}{"DeleteAt": time, "UpdateAt": time, "Id": postId, "RootId": postId, "Props": model.StringInterfaceToJson(post.GetProps())})
if err != nil {
@@ -980,7 +980,7 @@ func (s *SqlPostStore) GetPostsSince(options model.GetPostsSinceOptions, allowFr
var query string
// union of IDs and then join to get full posts is faster in mysql
if s.DriverName() == model.DATABASE_DRIVER_MYSQL {
if s.DriverName() == model.DatabaseDriverMysql {
query = `SELECT *` + replyCountQuery1 + ` FROM Posts p1 JOIN (
(SELECT
Id
@@ -1008,7 +1008,7 @@ func (s *SqlPostStore) GetPostsSince(options model.GetPostsSinceOptions, allowFr
LIMIT 1000) temp_tab))
) j ON p1.Id = j.Id
ORDER BY CreateAt ` + order
} else if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
} else if s.DriverName() == model.DatabaseDriverPostgres {
query = `WITH cte AS (SELECT
*
FROM
@@ -1058,7 +1058,7 @@ func (s *SqlPostStore) HasAutoResponsePostByUserSince(options model.GetPostsSinc
"ChannelId": options.ChannelId,
"Time": options.Time,
"UserId": userId,
"Type": model.POST_AUTO_RESPONDER,
"Type": model.PostTypeAutoResponder,
})
if err != nil {
@@ -1141,7 +1141,7 @@ func (s *SqlPostStore) getPostsAround(before bool, options model.GetPostsOptions
// We force MySQL to use the right index to prevent it from accidentally
// using the index_merge_intersection optimization.
// See MM-27575.
if s.DriverName() == model.DATABASE_DRIVER_MYSQL {
if s.DriverName() == model.DatabaseDriverMysql {
table += " USE INDEX(idx_posts_channel_id_delete_at_create_at)"
}
columns := []string{"p.*"}
@@ -1256,7 +1256,7 @@ func (s *SqlPostStore) getPostIdAroundTime(channelId string, time int64, before
// We force MySQL to use the right index to prevent it from accidentally
// using the index_merge_intersection optimization.
// See MM-27575.
if s.DriverName() == model.DATABASE_DRIVER_MYSQL {
if s.DriverName() == model.DatabaseDriverMysql {
table += " USE INDEX(idx_posts_channel_id_delete_at_create_at)"
}
@@ -1298,7 +1298,7 @@ func (s *SqlPostStore) GetPostAfterTime(channelId string, time int64, collapsedT
// We force MySQL to use the right index to prevent it from accidentally
// using the index_merge_intersection optimization.
// See MM-27575.
if s.DriverName() == model.DATABASE_DRIVER_MYSQL {
if s.DriverName() == model.DatabaseDriverMysql {
table += " USE INDEX(idx_posts_channel_id_delete_at_create_at)"
}
conditions := sq.And{
@@ -1350,7 +1350,7 @@ func (s *SqlPostStore) getRootPosts(channelId string, offset int, limit int, ski
}
func (s *SqlPostStore) getParentsPosts(channelId string, offset int, limit int, skipFetchThreads bool) ([]*model.Post, error) {
if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if s.DriverName() == model.DatabaseDriverPostgres {
return s.getParentsPostsPostgreSQL(channelId, offset, limit, skipFetchThreads)
}
@@ -1630,7 +1630,7 @@ func (s *SqlPostStore) search(teamId string, userId string, params *model.Search
Posts q2
WHERE
DeleteAt = 0
AND Type NOT LIKE '` + model.POST_SYSTEM_MESSAGE_PREFIX + `%'
AND Type NOT LIKE '` + model.PostSystemMessagePrefix + `%'
POST_FILTER
AND ChannelId IN (
SELECT
@@ -1683,7 +1683,7 @@ func (s *SqlPostStore) search(teamId string, userId string, params *model.Search
if terms == "" && excludedTerms == "" {
// we've already confirmed that we have a channel or user to search for
searchQuery = strings.Replace(searchQuery, "SEARCH_CLAUSE", "", 1)
} else if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
} else if s.DriverName() == model.DatabaseDriverPostgres {
// Parse text for wildcards
if wildcard, err := regexp.Compile(`\*($| )`); err == nil {
terms = wildcard.ReplaceAllLiteralString(terms, ":* ")
@@ -1705,7 +1705,7 @@ func (s *SqlPostStore) search(teamId string, userId string, params *model.Search
searchClause := fmt.Sprintf("AND to_tsvector('english', %s) @@ to_tsquery('english', :Terms)", searchType)
searchQuery = strings.Replace(searchQuery, "SEARCH_CLAUSE", searchClause, 1)
} else if s.DriverName() == model.DATABASE_DRIVER_MYSQL {
} else if s.DriverName() == model.DatabaseDriverMysql {
if searchType == "Message" {
var err error
terms, err = removeMysqlStopWordsFromTerms(terms)
@@ -1800,7 +1800,7 @@ func (s *SqlPostStore) AnalyticsUserCountsWithPostsByDay(teamId string) (model.A
ORDER BY Name DESC
LIMIT 30`
if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if s.DriverName() == model.DatabaseDriverPostgres {
query =
`SELECT
TO_CHAR(DATE(TO_TIMESTAMP(Posts.CreateAt / 1000)), 'YYYY-MM-DD') AS Name, COUNT(DISTINCT Posts.UserId) AS Value
@@ -1856,7 +1856,7 @@ func (s *SqlPostStore) AnalyticsPostCountsByDay(options *model.AnalyticsPostCoun
ORDER BY Name DESC
LIMIT 30`
if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if s.DriverName() == model.DatabaseDriverPostgres {
query =
`SELECT
TO_CHAR(DATE(TO_TIMESTAMP(Posts.CreateAt / 1000)), 'YYYY-MM-DD') AS Name, Count(Posts.Id) AS Value
@@ -2068,7 +2068,7 @@ func (s *SqlPostStore) GetOldest() (*model.Post, error) {
func (s *SqlPostStore) determineMaxPostSize() int {
var maxPostSizeBytes int32
if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if s.DriverName() == model.DatabaseDriverPostgres {
// The Post.Message column in Postgres has historically been VARCHAR(4000), but
// may be manually enlarged to support longer posts.
if err := s.GetReplica().SelectOne(&maxPostSizeBytes, `
@@ -2082,7 +2082,7 @@ func (s *SqlPostStore) determineMaxPostSize() int {
`); err != nil {
mlog.Warn("Unable to determine the maximum supported post size", mlog.Err(err))
}
} else if s.DriverName() == model.DATABASE_DRIVER_MYSQL {
} else if s.DriverName() == model.DatabaseDriverMysql {
// The Post.Message column in MySQL has historically been TEXT, with a maximum
// limit of 65535.
if err := s.GetReplica().SelectOne(&maxPostSizeBytes, `
@@ -2108,8 +2108,8 @@ func (s *SqlPostStore) determineMaxPostSize() int {
// To maintain backwards compatibility, don't yield a maximum post
// size smaller than the previous limit, even though it wasn't
// actually possible to store 4000 runes in all cases.
if maxPostSize < model.POST_MESSAGE_MAX_RUNES_V1 {
maxPostSize = model.POST_MESSAGE_MAX_RUNES_V1
if maxPostSize < model.PostMessageMaxRunesV1 {
maxPostSize = model.PostMessageMaxRunesV1
}
mlog.Info("Post.Message has size restrictions", mlog.Int("max_characters", maxPostSize), mlog.Int32("max_bytes", maxPostSizeBytes))

12
store/sqlstore/preference_store.go
Просмотреть файл

@@ -39,7 +39,7 @@ func (s SqlPreferenceStore) deleteUnusedFeatures() {
mlog.Debug("Deleting any unused pre-release features")
sql, args, err := s.getQueryBuilder().
Delete("Preferences").
Where(sq.Eq{"Category": model.PREFERENCE_CATEGORY_ADVANCED_SETTINGS}).
Where(sq.Eq{"Category": model.PreferenceCategoryAdvancedSettings}).
Where(sq.Eq{"Value": "false"}).
Where(sq.Like{"Name": store.FeatureTogglePrefix + "%"}).ToSql()
if err != nil {
@@ -84,9 +84,9 @@ func (s SqlPreferenceStore) save(transaction *gorp.Transaction, preference *mode
Columns("UserId", "Category", "Name", "Value").
Values(preference.UserId, preference.Category, preference.Name, preference.Value)
if s.DriverName() == model.DATABASE_DRIVER_MYSQL {
if s.DriverName() == model.DatabaseDriverMysql {
query = query.SuffixExpr(sq.Expr("ON DUPLICATE KEY UPDATE Value = ?", preference.Value))
} else if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
} else if s.DriverName() == model.DatabaseDriverPostgres {
query = query.SuffixExpr(sq.Expr("ON CONFLICT (userid, category, name) DO UPDATE SET Value = ?", preference.Value))
} else {
return store.NewErrNotImplemented("failed to update preference because of missing driver")
@@ -237,7 +237,7 @@ func (s *SqlPreferenceStore) DeleteOrphanedRows(limit int) (deleted int64, err e
LIMIT :Limit
) AS A
)`
props := map[string]interface{}{"Limit": limit, "Category": model.PREFERENCE_CATEGORY_FLAGGED_POST}
props := map[string]interface{}{"Limit": limit, "Category": model.PreferenceCategoryFlaggedPost}
result, err := s.GetMaster().Exec(query, props)
if err != nil {
return
@@ -257,7 +257,7 @@ func (s SqlPreferenceStore) CleanupFlagsBatch(limit int64) (int64, error) {
sq.Select("Preferences.Name").
From("Preferences").
LeftJoin("Posts ON Preferences.Name = Posts.Id").
Where(sq.Eq{"Preferences.Category": model.PREFERENCE_CATEGORY_FLAGGED_POST}).
Where(sq.Eq{"Preferences.Category": model.PreferenceCategoryFlaggedPost}).
Where(sq.Eq{"Posts.Id": nil}).
Limit(uint64(limit)),
"t").
@@ -266,7 +266,7 @@ func (s SqlPreferenceStore) CleanupFlagsBatch(limit int64) (int64, error) {
return int64(0), errors.Wrap(err, "could not build nested sql query to delete preference")
}
query, args, err := s.getQueryBuilder().Delete("Preferences").
Where(sq.Eq{"Category": model.PREFERENCE_CATEGORY_FLAGGED_POST}).
Where(sq.Eq{"Category": model.PreferenceCategoryFlaggedPost}).
Where(sq.Expr("name IN ("+nameInQ+")", nameInArgs...)).
ToSql()

6
store/sqlstore/preference_store_test.go
Просмотреть файл

@@ -21,7 +21,7 @@ func TestDeleteUnusedFeatures(t *testing.T) {
StoreTest(t, func(t *testing.T, ss store.Store) {
userId1 := model.NewId()
userId2 := model.NewId()
category := model.PREFERENCE_CATEGORY_ADVANCED_SETTINGS
category := model.PreferenceCategoryAdvancedSettings
feature1 := "feature1"
feature2 := "feature2"
@@ -62,7 +62,7 @@ func TestDeleteUnusedFeatures(t *testing.T) {
FROM Preferences
WHERE Category = :Category
AND Value = :Val
AND Name LIKE '`+store.FeatureTogglePrefix+`%'`, map[string]interface{}{"Category": model.PREFERENCE_CATEGORY_ADVANCED_SETTINGS, "Val": "false"}); err != nil {
AND Name LIKE '`+store.FeatureTogglePrefix+`%'`, map[string]interface{}{"Category": model.PreferenceCategoryAdvancedSettings, "Val": "false"}); err != nil {
require.NoError(t, err)
} else if val != 0 {
require.Fail(t, "Found %d features with value 'false', expected all to be deleted", val)
@@ -73,7 +73,7 @@ func TestDeleteUnusedFeatures(t *testing.T) {
FROM Preferences
WHERE Category = :Category
AND Value = :Val
AND Name LIKE '`+store.FeatureTogglePrefix+`%'`, map[string]interface{}{"Category": model.PREFERENCE_CATEGORY_ADVANCED_SETTINGS, "Val": "true"}); err != nil {
AND Name LIKE '`+store.FeatureTogglePrefix+`%'`, map[string]interface{}{"Category": model.PreferenceCategoryAdvancedSettings, "Val": "true"}); err != nil {
require.NoError(t, err)
} else if val == 0 {
require.Fail(t, "Found %d features with value 'true', expected to find at least %d features", val, 2)

4
store/sqlstore/reaction_store.go
Просмотреть файл

@@ -260,7 +260,7 @@ func (s *SqlReactionStore) saveReactionAndUpdatePost(transaction *gorp.Transacti
"RemoteId": reaction.RemoteId,
}
if s.DriverName() == model.DATABASE_DRIVER_MYSQL {
if s.DriverName() == model.DatabaseDriverMysql {
if _, err := transaction.Exec(
`INSERT INTO
Reactions
@@ -271,7 +271,7 @@ func (s *SqlReactionStore) saveReactionAndUpdatePost(transaction *gorp.Transacti
UpdateAt = :UpdateAt, DeleteAt = 0, RemoteId = :RemoteId`, params); err != nil {
return err
}
} else if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
} else if s.DriverName() == model.DatabaseDriverPostgres {
if _, err := transaction.Exec(
`INSERT INTO
Reactions

2
store/sqlstore/remote_cluster_store.go
Просмотреть файл

@@ -180,7 +180,7 @@ func (s sqlRemoteClusterStore) SetLastPingAt(remoteClusterId string) error {
func (s *sqlRemoteClusterStore) createIndexesIfNotExists() {
uniquenessColumns := []string{"SiteUrl", "RemoteTeamId"}
if s.DriverName() == model.DATABASE_DRIVER_MYSQL {
if s.DriverName() == model.DatabaseDriverMysql {
uniquenessColumns = []string{"RemoteTeamId", "SiteUrl(168)"}
}
s.CreateUniqueCompositeIndexIfNotExists(RemoteClusterSiteURLUniqueIndex, "RemoteClusters", uniquenessColumns)

2
store/sqlstore/retention_policy_store.go
Просмотреть файл

@@ -793,7 +793,7 @@ func genericRetentionPoliciesDeletion(
if err != nil {
return 0, errors.Wrap(err, r.Table+"_tosql")
}
if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if s.DriverName() == model.DatabaseDriverPostgres {
primaryKeysStr := "(" + strings.Join(r.PrimaryKeys, ",") + ")"
query = `
DELETE FROM ` + r.Table + ` WHERE ` + primaryKeysStr + ` IN (

16
store/sqlstore/role_store.go
Просмотреть файл

@@ -325,9 +325,9 @@ func (s *SqlRoleStore) channelHigherScopedPermissionsQuery(roleNames []string) s
return fmt.Sprintf(
sqlTmpl,
strings.Join(roleNames, "', '"),
model.CHANNEL_GUEST_ROLE_ID,
model.CHANNEL_USER_ROLE_ID,
model.CHANNEL_ADMIN_ROLE_ID,
model.ChannelGuestRoleId,
model.ChannelUserRoleId,
model.ChannelAdminRoleId,
)
}
@@ -342,9 +342,9 @@ func (s *SqlRoleStore) ChannelHigherScopedPermissions(roleNames []string) (map[s
roleNameHigherScopedPermissions := map[string]*model.RolePermissions{}
for _, rp := range rolesPermissions {
roleNameHigherScopedPermissions[rp.GuestRoleName] = &model.RolePermissions{RoleID: model.CHANNEL_GUEST_ROLE_ID, Permissions: strings.Split(rp.HigherScopedGuestPermissions, " ")}
roleNameHigherScopedPermissions[rp.UserRoleName] = &model.RolePermissions{RoleID: model.CHANNEL_USER_ROLE_ID, Permissions: strings.Split(rp.HigherScopedUserPermissions, " ")}
roleNameHigherScopedPermissions[rp.AdminRoleName] = &model.RolePermissions{RoleID: model.CHANNEL_ADMIN_ROLE_ID, Permissions: strings.Split(rp.HigherScopedAdminPermissions, " ")}
roleNameHigherScopedPermissions[rp.GuestRoleName] = &model.RolePermissions{RoleID: model.ChannelGuestRoleId, Permissions: strings.Split(rp.HigherScopedGuestPermissions, " ")}
roleNameHigherScopedPermissions[rp.UserRoleName] = &model.RolePermissions{RoleID: model.ChannelUserRoleId, Permissions: strings.Split(rp.HigherScopedUserPermissions, " ")}
roleNameHigherScopedPermissions[rp.AdminRoleName] = &model.RolePermissions{RoleID: model.ChannelAdminRoleId, Permissions: strings.Split(rp.HigherScopedAdminPermissions, " ")}
}
return roleNameHigherScopedPermissions, nil
@@ -355,7 +355,7 @@ func (s *SqlRoleStore) AllChannelSchemeRoles() ([]*model.Role, error) {
Select("Roles.*").
From("Schemes").
Join("Roles ON Schemes.DefaultChannelGuestRole = Roles.Name OR Schemes.DefaultChannelUserRole = Roles.Name OR Schemes.DefaultChannelAdminRole = Roles.Name").
Where(sq.Eq{"Schemes.Scope": model.SCHEME_SCOPE_CHANNEL}).
Where(sq.Eq{"Schemes.Scope": model.SchemeScopeChannel}).
Where(sq.Eq{"Roles.DeleteAt": 0}).
Where(sq.Eq{"Schemes.DeleteAt": 0})
@@ -387,7 +387,7 @@ func (s *SqlRoleStore) ChannelRolesUnderTeamRole(roleName string) ([]*model.Role
Join("Channels ON Channels.TeamId = Teams.Id").
Join("Schemes AS ChannelSchemes ON Channels.SchemeId = ChannelSchemes.Id").
Join("Roles AS ChannelSchemeRoles ON (ChannelSchemeRoles.Name = ChannelSchemes.DefaultChannelGuestRole OR ChannelSchemeRoles.Name = ChannelSchemes.DefaultChannelUserRole OR ChannelSchemeRoles.Name = ChannelSchemes.DefaultChannelAdminRole)").
Where(sq.Eq{"HigherScopedSchemes.Scope": model.SCHEME_SCOPE_TEAM}).
Where(sq.Eq{"HigherScopedSchemes.Scope": model.SchemeScopeTeam}).
Where(sq.Eq{"HigherScopedRoles.Name": roleName}).
Where(sq.Eq{"HigherScopedRoles.DeleteAt": 0}).
Where(sq.Eq{"HigherScopedSchemes.DeleteAt": 0}).

60
store/sqlstore/scheme_store.go
Просмотреть файл

@@ -25,9 +25,9 @@ func newSqlSchemeStore(sqlStore *SqlStore) store.SchemeStore {
for _, db := range sqlStore.GetAllConns() {
table := db.AddTableWithName(model.Scheme{}, "Schemes").SetKeys(false, "Id")
table.ColMap("Id").SetMaxSize(26)
table.ColMap("Name").SetMaxSize(model.SCHEME_NAME_MAX_LENGTH).SetUnique(true)
table.ColMap("DisplayName").SetMaxSize(model.SCHEME_DISPLAY_NAME_MAX_LENGTH)
table.ColMap("Description").SetMaxSize(model.SCHEME_DESCRIPTION_MAX_LENGTH)
table.ColMap("Name").SetMaxSize(model.SchemeNameMaxLength).SetUnique(true)
table.ColMap("DisplayName").SetMaxSize(model.SchemeDisplayNameMaxLength)
table.ColMap("Description").SetMaxSize(model.SchemeDescriptionMaxLength)
table.ColMap("Scope").SetMaxSize(32)
table.ColMap("DefaultTeamAdminRole").SetMaxSize(64)
table.ColMap("DefaultTeamUserRole").SetMaxSize(64)
@@ -83,7 +83,7 @@ func (s *SqlSchemeStore) Save(scheme *model.Scheme) (*model.Scheme, error) {
func (s *SqlSchemeStore) createScheme(scheme *model.Scheme, transaction *gorp.Transaction) (*model.Scheme, error) {
// Fetch the default system scheme roles to populate default permissions.
defaultRoleNames := []string{model.TEAM_ADMIN_ROLE_ID, model.TEAM_USER_ROLE_ID, model.TEAM_GUEST_ROLE_ID, model.CHANNEL_ADMIN_ROLE_ID, model.CHANNEL_USER_ROLE_ID, model.CHANNEL_GUEST_ROLE_ID}
defaultRoleNames := []string{model.TeamAdminRoleId, model.TeamUserRoleId, model.TeamGuestRoleId, model.ChannelAdminRoleId, model.ChannelUserRoleId, model.ChannelGuestRoleId}
defaultRoles := make(map[string]*model.Role)
roles, err := s.SqlStore.Role().GetByNames(defaultRoleNames)
if err != nil {
@@ -92,18 +92,18 @@ func (s *SqlSchemeStore) createScheme(scheme *model.Scheme, transaction *gorp.Tr
for _, role := range roles {
switch role.Name {
case model.TEAM_ADMIN_ROLE_ID:
defaultRoles[model.TEAM_ADMIN_ROLE_ID] = role
case model.TEAM_USER_ROLE_ID:
defaultRoles[model.TEAM_USER_ROLE_ID] = role
case model.TEAM_GUEST_ROLE_ID:
defaultRoles[model.TEAM_GUEST_ROLE_ID] = role
case model.CHANNEL_ADMIN_ROLE_ID:
defaultRoles[model.CHANNEL_ADMIN_ROLE_ID] = role
case model.CHANNEL_USER_ROLE_ID:
defaultRoles[model.CHANNEL_USER_ROLE_ID] = role
case model.CHANNEL_GUEST_ROLE_ID:
defaultRoles[model.CHANNEL_GUEST_ROLE_ID] = role
case model.TeamAdminRoleId:
defaultRoles[model.TeamAdminRoleId] = role
case model.TeamUserRoleId:
defaultRoles[model.TeamUserRoleId] = role
case model.TeamGuestRoleId:
defaultRoles[model.TeamGuestRoleId] = role
case model.ChannelAdminRoleId:
defaultRoles[model.ChannelAdminRoleId] = role
case model.ChannelUserRoleId:
defaultRoles[model.ChannelUserRoleId] = role
case model.ChannelGuestRoleId:
defaultRoles[model.ChannelGuestRoleId] = role
}
}
@@ -112,12 +112,12 @@ func (s *SqlSchemeStore) createScheme(scheme *model.Scheme, transaction *gorp.Tr
}
// Create the appropriate default roles for the scheme.
if scheme.Scope == model.SCHEME_SCOPE_TEAM {
if scheme.Scope == model.SchemeScopeTeam {
// Team Admin Role
teamAdminRole := &model.Role{
Name: model.NewId(),
DisplayName: fmt.Sprintf("Team Admin Role for Scheme %s", scheme.Name),
Permissions: defaultRoles[model.TEAM_ADMIN_ROLE_ID].Permissions,
Permissions: defaultRoles[model.TeamAdminRoleId].Permissions,
SchemeManaged: true,
}
@@ -131,7 +131,7 @@ func (s *SqlSchemeStore) createScheme(scheme *model.Scheme, transaction *gorp.Tr
teamUserRole := &model.Role{
Name: model.NewId(),
DisplayName: fmt.Sprintf("Team User Role for Scheme %s", scheme.Name),
Permissions: defaultRoles[model.TEAM_USER_ROLE_ID].Permissions,
Permissions: defaultRoles[model.TeamUserRoleId].Permissions,
SchemeManaged: true,
}
@@ -145,7 +145,7 @@ func (s *SqlSchemeStore) createScheme(scheme *model.Scheme, transaction *gorp.Tr
teamGuestRole := &model.Role{
Name: model.NewId(),
DisplayName: fmt.Sprintf("Team Guest Role for Scheme %s", scheme.Name),
Permissions: defaultRoles[model.TEAM_GUEST_ROLE_ID].Permissions,
Permissions: defaultRoles[model.TeamGuestRoleId].Permissions,
SchemeManaged: true,
}
@@ -156,16 +156,16 @@ func (s *SqlSchemeStore) createScheme(scheme *model.Scheme, transaction *gorp.Tr
scheme.DefaultTeamGuestRole = savedRole.Name
}
if scheme.Scope == model.SCHEME_SCOPE_TEAM || scheme.Scope == model.SCHEME_SCOPE_CHANNEL {
if scheme.Scope == model.SchemeScopeTeam || scheme.Scope == model.SchemeScopeChannel {
// Channel Admin Role
channelAdminRole := &model.Role{
Name: model.NewId(),
DisplayName: fmt.Sprintf("Channel Admin Role for Scheme %s", scheme.Name),
Permissions: defaultRoles[model.CHANNEL_ADMIN_ROLE_ID].Permissions,
Permissions: defaultRoles[model.ChannelAdminRoleId].Permissions,
SchemeManaged: true,
}
if scheme.Scope == model.SCHEME_SCOPE_CHANNEL {
if scheme.Scope == model.SchemeScopeChannel {
channelAdminRole.Permissions = []string{}
}
@@ -179,11 +179,11 @@ func (s *SqlSchemeStore) createScheme(scheme *model.Scheme, transaction *gorp.Tr
channelUserRole := &model.Role{
Name: model.NewId(),
DisplayName: fmt.Sprintf("Channel User Role for Scheme %s", scheme.Name),
Permissions: defaultRoles[model.CHANNEL_USER_ROLE_ID].Permissions,
Permissions: defaultRoles[model.ChannelUserRoleId].Permissions,
SchemeManaged: true,
}
if scheme.Scope == model.SCHEME_SCOPE_CHANNEL {
if scheme.Scope == model.SchemeScopeChannel {
channelUserRole.Permissions = filterModerated(channelUserRole.Permissions)
}
@@ -197,11 +197,11 @@ func (s *SqlSchemeStore) createScheme(scheme *model.Scheme, transaction *gorp.Tr
channelGuestRole := &model.Role{
Name: model.NewId(),
DisplayName: fmt.Sprintf("Channel Guest Role for Scheme %s", scheme.Name),
Permissions: defaultRoles[model.CHANNEL_GUEST_ROLE_ID].Permissions,
Permissions: defaultRoles[model.ChannelGuestRoleId].Permissions,
SchemeManaged: true,
}
if scheme.Scope == model.SCHEME_SCOPE_CHANNEL {
if scheme.Scope == model.SchemeScopeChannel {
channelGuestRole.Permissions = filterModerated(channelGuestRole.Permissions)
}
@@ -277,13 +277,13 @@ func (s *SqlSchemeStore) Delete(schemeId string) (*model.Scheme, error) {
}
// Update any teams or channels using this scheme to the default scheme.
if scheme.Scope == model.SCHEME_SCOPE_TEAM {
if scheme.Scope == model.SchemeScopeTeam {
if _, err := s.GetMaster().Exec("UPDATE Teams SET SchemeId = '' WHERE SchemeId = :SchemeId", map[string]interface{}{"SchemeId": schemeId}); err != nil {
return nil, errors.Wrapf(err, "failed to update Teams with schemeId=%s", schemeId)
}
s.Team().ClearCaches()
} else if scheme.Scope == model.SCHEME_SCOPE_CHANNEL {
} else if scheme.Scope == model.SchemeScopeChannel {
if _, err := s.GetMaster().Exec("UPDATE Channels SET SchemeId = '' WHERE SchemeId = :SchemeId", map[string]interface{}{"SchemeId": schemeId}); err != nil {
return nil, errors.Wrapf(err, "failed to update Channels with schemeId=%s", schemeId)
}
@@ -294,7 +294,7 @@ func (s *SqlSchemeStore) Delete(schemeId string) (*model.Scheme, error) {
// Delete the roles belonging to the scheme.
roleNames := []string{scheme.DefaultChannelGuestRole, scheme.DefaultChannelUserRole, scheme.DefaultChannelAdminRole}
if scheme.Scope == model.SCHEME_SCOPE_TEAM {
if scheme.Scope == model.SchemeScopeTeam {
roleNames = append(roleNames, scheme.DefaultTeamGuestRole, scheme.DefaultTeamUserRole, scheme.DefaultTeamAdminRole)
}

2
store/sqlstore/session_store.go
Просмотреть файл

@@ -283,7 +283,7 @@ func (me SqlSessionStore) Cleanup(expiryTime int64, batchSize int64) {
mlog.Debug("Cleaning up session store.")
var query string
if me.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if me.DriverName() == model.DatabaseDriverPostgres {
query = "DELETE FROM Sessions WHERE Id = any (array (SELECT Id FROM Sessions WHERE ExpiresAt != 0 AND :ExpiresAt > ExpiresAt LIMIT :Limit))"
} else {
query = "DELETE FROM Sessions WHERE ExpiresAt != 0 AND :ExpiresAt > ExpiresAt LIMIT :Limit"

8
store/sqlstore/shared_channel_store.go
Просмотреть файл

@@ -654,7 +654,7 @@ func (s SqlSharedChannelStore) UpdateUserLastSyncAt(userID string, channelID str
args := map[string]interface{}{"UserId": userID, "ChannelId": channelID, "RemoteId": remoteID}
var query string
if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if s.DriverName() == model.DatabaseDriverPostgres {
query = `
UPDATE
SharedChannelUsers AS scu
@@ -665,7 +665,7 @@ func (s SqlSharedChannelStore) UpdateUserLastSyncAt(userID string, channelID str
WHERE
Users.Id = scu.UserId AND scu.UserId = :UserId AND scu.ChannelId = :ChannelId AND scu.RemoteId = :RemoteId
`
} else if s.DriverName() == model.DATABASE_DRIVER_MYSQL {
} else if s.DriverName() == model.DatabaseDriverMysql {
query = `
UPDATE
SharedChannelUsers AS scu
@@ -725,7 +725,7 @@ func (s SqlSharedChannelStore) UpsertAttachment(attachment *model.SharedChannelA
"LastSyncAt": attachment.LastSyncAt,
}
if s.DriverName() == model.DATABASE_DRIVER_MYSQL {
if s.DriverName() == model.DatabaseDriverMysql {
if _, err := s.GetMaster().Exec(
`INSERT INTO
SharedChannelAttachments
@@ -736,7 +736,7 @@ func (s SqlSharedChannelStore) UpsertAttachment(attachment *model.SharedChannelA
LastSyncAt = :LastSyncAt`, params); err != nil {
return "", err
}
} else if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
} else if s.DriverName() == model.DatabaseDriverPostgres {
if _, err := s.GetMaster().Exec(
`INSERT INTO
SharedChannelAttachments

16
store/sqlstore/status_store.go
Просмотреть файл

@@ -110,7 +110,7 @@ func (s SqlStatusStore) updateExpiredStatuses(t *gorp.Transaction) ([]*model.Sta
From("Status").
Where(
sq.And{
sq.Eq{"Status": model.STATUS_DND},
sq.Eq{"Status": model.StatusDnd},
sq.Gt{"DNDEndTime": 0},
sq.LtOrEq{"DNDEndTime": currUnixTime},
},
@@ -126,13 +126,13 @@ func (s SqlStatusStore) updateExpiredStatuses(t *gorp.Transaction) ([]*model.Sta
Update("Status").
Where(
sq.And{
sq.Eq{"Status": model.STATUS_DND},
sq.Eq{"Status": model.StatusDnd},
sq.Gt{"DNDEndTime": 0},
sq.LtOrEq{"DNDEndTime": currUnixTime},
},
).
Set("Status", sq.Expr("PrevStatus")).
Set("PrevStatus", model.STATUS_DND).
Set("PrevStatus", model.StatusDnd).
Set("DNDEndTime", 0).
Set("Manual", false).
ToSql()
@@ -149,7 +149,7 @@ func (s SqlStatusStore) updateExpiredStatuses(t *gorp.Transaction) ([]*model.Sta
}
func (s SqlStatusStore) UpdateExpiredDNDStatuses() ([]*model.Status, error) {
if s.DriverName() == model.DATABASE_DRIVER_MYSQL {
if s.DriverName() == model.DatabaseDriverMysql {
transaction, err := s.GetMaster().Begin()
if err != nil {
return nil, errors.Wrap(err, "UpdateExpiredDNDStatuses: begin_transaction")
@@ -165,7 +165,7 @@ func (s SqlStatusStore) UpdateExpiredDNDStatuses() ([]*model.Status, error) {
for _, status := range statuses {
status.Status = status.PrevStatus
status.PrevStatus = model.STATUS_DND
status.PrevStatus = model.StatusDnd
status.DNDEndTime = 0
status.Manual = false
}
@@ -177,13 +177,13 @@ func (s SqlStatusStore) UpdateExpiredDNDStatuses() ([]*model.Status, error) {
Update("Status").
Where(
sq.And{
sq.Eq{"Status": model.STATUS_DND},
sq.Eq{"Status": model.StatusDnd},
sq.Gt{"DNDEndTime": 0},
sq.LtOrEq{"DNDEndTime": time.Now().UTC().Unix()},
},
).
Set("Status", sq.Expr("PrevStatus")).
Set("PrevStatus", model.STATUS_DND).
Set("PrevStatus", model.StatusDnd).
Set("DNDEndTime", 0).
Set("Manual", false).
Suffix("RETURNING *").
@@ -215,7 +215,7 @@ func (s SqlStatusStore) UpdateExpiredDNDStatuses() ([]*model.Status, error) {
}
func (s SqlStatusStore) ResetAll() error {
if _, err := s.GetMaster().Exec("UPDATE Status SET Status = :Status WHERE Manual = false", map[string]interface{}{"Status": model.STATUS_OFFLINE}); err != nil {
if _, err := s.GetMaster().Exec("UPDATE Status SET Status = :Status WHERE Manual = false", map[string]interface{}{"Status": model.StatusOffline}); err != nil {
return errors.Wrap(err, "failed to update Statuses")
}
return nil

82
store/sqlstore/store.go
Просмотреть файл

@@ -179,7 +179,7 @@ func New(settings model.SqlSettings, metrics einterfaces.MetricsInterface) *SqlS
store.initConnection()
if *settings.DriverName == model.DATABASE_DRIVER_POSTGRES {
if *settings.DriverName == model.DatabaseDriverPostgres {
ver, err := store.GetDbVersion(true)
if err != nil {
mlog.Critical("Cannot get DB version.", mlog.Err(err))
@@ -347,14 +347,14 @@ func getDBMap(settings *model.SqlSettings, db *dbsql.DB) *gorp.DbMap {
connectionTimeout := time.Duration(*settings.QueryTimeout) * time.Second
var dbMap *gorp.DbMap
switch *settings.DriverName {
case model.DATABASE_DRIVER_MYSQL:
case model.DatabaseDriverMysql:
dbMap = &gorp.DbMap{
Db: db,
TypeConverter: mattermConverter{},
Dialect: gorp.MySQLDialect{Engine: "InnoDB", Encoding: "UTF8MB4"},
QueryTimeout: connectionTimeout,
}
case model.DATABASE_DRIVER_POSTGRES:
case model.DatabaseDriverPostgres:
dbMap = &gorp.DbMap{
Db: db,
TypeConverter: mattermConverter{},
@@ -383,7 +383,7 @@ func (ss *SqlStore) Context() context.Context {
func (ss *SqlStore) initConnection() {
dataSource := *ss.settings.DataSource
if ss.DriverName() == model.DATABASE_DRIVER_MYSQL {
if ss.DriverName() == model.DatabaseDriverMysql {
// TODO: We ignore the readTimeout datasource parameter for MySQL since QueryTimeout
// covers that already. Ideally we'd like to do this only for the upgrade
// step. To be reviewed in MM-35789.
@@ -437,13 +437,13 @@ func (ss *SqlStore) GetCurrentSchemaVersion() string {
// that can be parsed by callers.
func (ss *SqlStore) GetDbVersion(numerical bool) (string, error) {
var sqlVersion string
if ss.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if ss.DriverName() == model.DatabaseDriverPostgres {
if numerical {
sqlVersion = `SHOW server_version_num`
} else {
sqlVersion = `SHOW server_version`
}
} else if ss.DriverName() == model.DATABASE_DRIVER_MYSQL {
} else if ss.DriverName() == model.DatabaseDriverMysql {
sqlVersion = `SELECT version()`
} else {
return "", errors.New("Not supported driver")
@@ -564,15 +564,15 @@ func (ss *SqlStore) MarkSystemRanUnitTests() {
return
}
unitTests := props[model.SYSTEM_RAN_UNIT_TESTS]
unitTests := props[model.SystemRanUnitTests]
if unitTests == "" {
systemTests := &model.System{Name: model.SYSTEM_RAN_UNIT_TESTS, Value: "1"}
systemTests := &model.System{Name: model.SystemRanUnitTests, Value: "1"}
ss.System().Save(systemTests)
}
}
func (ss *SqlStore) DoesTableExist(tableName string) bool {
if ss.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if ss.DriverName() == model.DatabaseDriverPostgres {
count, err := ss.GetMaster().SelectInt(
`SELECT count(relname) FROM pg_class WHERE relname=$1`,
strings.ToLower(tableName),
@@ -586,7 +586,7 @@ func (ss *SqlStore) DoesTableExist(tableName string) bool {
return count > 0
} else if ss.DriverName() == model.DATABASE_DRIVER_MYSQL {
} else if ss.DriverName() == model.DatabaseDriverMysql {
count, err := ss.GetMaster().SelectInt(
`SELECT
@@ -617,7 +617,7 @@ func (ss *SqlStore) DoesTableExist(tableName string) bool {
}
func (ss *SqlStore) DoesColumnExist(tableName string, columnName string) bool {
if ss.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if ss.DriverName() == model.DatabaseDriverPostgres {
count, err := ss.GetMaster().SelectInt(
`SELECT COUNT(0)
FROM pg_attribute
@@ -640,7 +640,7 @@ func (ss *SqlStore) DoesColumnExist(tableName string, columnName string) bool {
return count > 0
} else if ss.DriverName() == model.DATABASE_DRIVER_MYSQL {
} else if ss.DriverName() == model.DatabaseDriverMysql {
count, err := ss.GetMaster().SelectInt(
`SELECT
@@ -674,7 +674,7 @@ func (ss *SqlStore) DoesColumnExist(tableName string, columnName string) bool {
// GetColumnInfo returns data type information about the given column.
func (ss *SqlStore) GetColumnInfo(tableName, columnName string) (*ColumnInfo, error) {
var columnInfo ColumnInfo
if ss.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if ss.DriverName() == model.DatabaseDriverPostgres {
err := ss.GetMaster().SelectOne(&columnInfo,
`SELECT data_type as DataType,
COALESCE(character_maximum_length, 0) as CharMaximumLength
@@ -686,7 +686,7 @@ func (ss *SqlStore) GetColumnInfo(tableName, columnName string) (*ColumnInfo, er
return nil, err
}
return &columnInfo, nil
} else if ss.DriverName() == model.DATABASE_DRIVER_MYSQL {
} else if ss.DriverName() == model.DatabaseDriverMysql {
err := ss.GetMaster().SelectOne(&columnInfo,
`SELECT data_type as DataType,
COALESCE(character_maximum_length, 0) as CharMaximumLength
@@ -706,11 +706,11 @@ func (ss *SqlStore) GetColumnInfo(tableName, columnName string) (*ColumnInfo, er
// IsVarchar returns true if the column type matches one of the varchar types
// either in MySQL or PostgreSQL.
func (ss *SqlStore) IsVarchar(columnType string) bool {
if ss.DriverName() == model.DATABASE_DRIVER_POSTGRES && columnType == "character varying" {
if ss.DriverName() == model.DatabaseDriverPostgres && columnType == "character varying" {
return true
}
if ss.DriverName() == model.DATABASE_DRIVER_MYSQL && columnType == "varchar" {
if ss.DriverName() == model.DatabaseDriverMysql && columnType == "varchar" {
return true
}
@@ -718,7 +718,7 @@ func (ss *SqlStore) IsVarchar(columnType string) bool {
}
func (ss *SqlStore) DoesTriggerExist(triggerName string) bool {
if ss.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if ss.DriverName() == model.DatabaseDriverPostgres {
count, err := ss.GetMaster().SelectInt(`
SELECT
COUNT(0)
@@ -736,7 +736,7 @@ func (ss *SqlStore) DoesTriggerExist(triggerName string) bool {
return count > 0
} else if ss.DriverName() == model.DATABASE_DRIVER_MYSQL {
} else if ss.DriverName() == model.DatabaseDriverMysql {
count, err := ss.GetMaster().SelectInt(`
SELECT
COUNT(0)
@@ -769,7 +769,7 @@ func (ss *SqlStore) CreateColumnIfNotExists(tableName string, columnName string,
return false
}
if ss.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if ss.DriverName() == model.DatabaseDriverPostgres {
_, err := ss.GetMaster().ExecNoTimeout("ALTER TABLE " + tableName + " ADD " + columnName + " " + postgresColType + " DEFAULT '" + defaultValue + "'")
if err != nil {
mlog.Critical("Failed to create column", mlog.Err(err))
@@ -779,7 +779,7 @@ func (ss *SqlStore) CreateColumnIfNotExists(tableName string, columnName string,
return true
} else if ss.DriverName() == model.DATABASE_DRIVER_MYSQL {
} else if ss.DriverName() == model.DatabaseDriverMysql {
_, err := ss.GetMaster().ExecNoTimeout("ALTER TABLE " + tableName + " ADD " + columnName + " " + mySqlColType + " DEFAULT '" + defaultValue + "'")
if err != nil {
mlog.Critical("Failed to create column", mlog.Err(err))
@@ -803,7 +803,7 @@ func (ss *SqlStore) CreateColumnIfNotExistsNoDefault(tableName string, columnNam
return false
}
if ss.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if ss.DriverName() == model.DatabaseDriverPostgres {
_, err := ss.GetMaster().ExecNoTimeout("ALTER TABLE " + tableName + " ADD " + columnName + " " + postgresColType)
if err != nil {
mlog.Critical("Failed to create column", mlog.Err(err))
@@ -813,7 +813,7 @@ func (ss *SqlStore) CreateColumnIfNotExistsNoDefault(tableName string, columnNam
return true
} else if ss.DriverName() == model.DATABASE_DRIVER_MYSQL {
} else if ss.DriverName() == model.DatabaseDriverMysql {
_, err := ss.GetMaster().ExecNoTimeout("ALTER TABLE " + tableName + " ADD " + columnName + " " + mySqlColType)
if err != nil {
mlog.Critical("Failed to create column", mlog.Err(err))
@@ -868,9 +868,9 @@ func (ss *SqlStore) RenameColumnIfExists(tableName string, oldColumnName string,
}
var err error
if ss.DriverName() == model.DATABASE_DRIVER_MYSQL {
if ss.DriverName() == model.DatabaseDriverMysql {
_, err = ss.GetMaster().ExecNoTimeout("ALTER TABLE " + tableName + " CHANGE " + oldColumnName + " " + newColumnName + " " + colType)
} else if ss.DriverName() == model.DATABASE_DRIVER_POSTGRES {
} else if ss.DriverName() == model.DatabaseDriverPostgres {
_, err = ss.GetMaster().ExecNoTimeout("ALTER TABLE " + tableName + " RENAME COLUMN " + oldColumnName + " TO " + newColumnName)
}
@@ -890,9 +890,9 @@ func (ss *SqlStore) GetMaxLengthOfColumnIfExists(tableName string, columnName st
var result string
var err error
if ss.DriverName() == model.DATABASE_DRIVER_MYSQL {
if ss.DriverName() == model.DatabaseDriverMysql {
result, err = ss.GetMaster().SelectStr("SELECT CHARACTER_MAXIMUM_LENGTH FROM information_schema.columns WHERE table_name = '" + tableName + "' AND COLUMN_NAME = '" + columnName + "'")
} else if ss.DriverName() == model.DATABASE_DRIVER_POSTGRES {
} else if ss.DriverName() == model.DatabaseDriverPostgres {
result, err = ss.GetMaster().SelectStr("SELECT character_maximum_length FROM information_schema.columns WHERE table_name = '" + strings.ToLower(tableName) + "' AND column_name = '" + strings.ToLower(columnName) + "'")
}
@@ -911,9 +911,9 @@ func (ss *SqlStore) AlterColumnTypeIfExists(tableName string, columnName string,
}
var err error
if ss.DriverName() == model.DATABASE_DRIVER_MYSQL {
if ss.DriverName() == model.DatabaseDriverMysql {
_, err = ss.GetMaster().ExecNoTimeout("ALTER TABLE " + tableName + " MODIFY " + columnName + " " + mySqlColType)
} else if ss.DriverName() == model.DATABASE_DRIVER_POSTGRES {
} else if ss.DriverName() == model.DatabaseDriverPostgres {
_, err = ss.GetMaster().ExecNoTimeout("ALTER TABLE " + strings.ToLower(tableName) + " ALTER COLUMN " + strings.ToLower(columnName) + " TYPE " + postgresColType)
}
@@ -948,14 +948,14 @@ func (ss *SqlStore) AlterDefaultIfColumnExists(tableName string, columnName stri
}
var defaultValue string
if ss.DriverName() == model.DATABASE_DRIVER_MYSQL {
if ss.DriverName() == model.DatabaseDriverMysql {
// Some column types in MySQL cannot have defaults, so don't try to configure anything.
if mySqlColDefault == nil {
return true
}
defaultValue = *mySqlColDefault
} else if ss.DriverName() == model.DATABASE_DRIVER_POSTGRES {
} else if ss.DriverName() == model.DatabaseDriverPostgres {
// Postgres doesn't have the same limitation, but preserve the interface.
if postgresColDefault == nil {
return true
@@ -992,7 +992,7 @@ func (ss *SqlStore) AlterPrimaryKey(tableName string, columnNames []string) bool
var err error
// get the current primary key as a comma separated list of columns
switch ss.DriverName() {
case model.DATABASE_DRIVER_MYSQL:
case model.DatabaseDriverMysql:
query := `
SELECT GROUP_CONCAT(column_name ORDER BY seq_in_index) AS PK
FROM
@@ -1004,7 +1004,7 @@ func (ss *SqlStore) AlterPrimaryKey(tableName string, columnNames []string) bool
GROUP BY
index_name`
currentPrimaryKey, err = ss.GetMaster().SelectStr(query, tableName)
case model.DATABASE_DRIVER_POSTGRES:
case model.DatabaseDriverPostgres:
query := `
SELECT string_agg(a.attname, ',') AS pk
FROM
@@ -1031,9 +1031,9 @@ func (ss *SqlStore) AlterPrimaryKey(tableName string, columnNames []string) bool
}
// alter primary key
var alterQuery string
if ss.DriverName() == model.DATABASE_DRIVER_MYSQL {
if ss.DriverName() == model.DatabaseDriverMysql {
alterQuery = "ALTER TABLE " + tableName + " DROP PRIMARY KEY, ADD PRIMARY KEY (" + primaryKey + ")"
} else if ss.DriverName() == model.DATABASE_DRIVER_POSTGRES {
} else if ss.DriverName() == model.DatabaseDriverPostgres {
alterQuery = "ALTER TABLE " + tableName + " DROP CONSTRAINT " + strings.ToLower(tableName) + "_pkey, ADD PRIMARY KEY (" + strings.ToLower(primaryKey) + ")"
}
_, err = ss.GetMaster().ExecNoTimeout(alterQuery)
@@ -1076,7 +1076,7 @@ func (ss *SqlStore) createIndexIfNotExists(indexName string, tableName string, c
uniqueStr = "UNIQUE "
}
if ss.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if ss.DriverName() == model.DatabaseDriverPostgres {
_, errExists := ss.GetMaster().SelectStr("SELECT $1::regclass", indexName)
// It should fail if the index does not exist
if errExists == nil {
@@ -1109,7 +1109,7 @@ func (ss *SqlStore) createIndexIfNotExists(indexName string, tableName string, c
time.Sleep(time.Second)
os.Exit(ExitCreateIndexPostgres)
}
} else if ss.DriverName() == model.DATABASE_DRIVER_MYSQL {
} else if ss.DriverName() == model.DatabaseDriverMysql {
count, err := ss.GetMaster().SelectInt("SELECT COUNT(0) AS index_exists FROM information_schema.statistics WHERE TABLE_SCHEMA = DATABASE() and table_name = ? AND index_name = ?", tableName, indexName)
if err != nil {
@@ -1168,7 +1168,7 @@ func (ss *SqlStore) CreateForeignKeyIfNotExists(
func (ss *SqlStore) RemoveIndexIfExists(indexName string, tableName string) bool {
if ss.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if ss.DriverName() == model.DatabaseDriverPostgres {
_, err := ss.GetMaster().SelectStr("SELECT $1::regclass", indexName)
// It should fail if the index does not exist
if err != nil {
@@ -1183,7 +1183,7 @@ func (ss *SqlStore) RemoveIndexIfExists(indexName string, tableName string) bool
}
return true
} else if ss.DriverName() == model.DATABASE_DRIVER_MYSQL {
} else if ss.DriverName() == model.DatabaseDriverMysql {
count, err := ss.GetMaster().SelectInt("SELECT COUNT(0) AS index_exists FROM information_schema.statistics WHERE TABLE_SCHEMA = DATABASE() and table_name = ? AND index_name = ?", tableName, indexName)
if err != nil {
@@ -1443,7 +1443,7 @@ func (ss *SqlStore) DropAllTables() {
func (ss *SqlStore) getQueryBuilder() sq.StatementBuilderType {
builder := sq.StatementBuilder.PlaceholderFormat(sq.Question)
if ss.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if ss.DriverName() == model.DatabaseDriverPostgres {
builder = builder.PlaceholderFormat(sq.Dollar)
}
return builder
@@ -1478,7 +1478,7 @@ func (ss *SqlStore) migrate(direction migrationDirection) error {
conn := setupConnection("migrations", dataSource, ss.settings)
defer conn.Db.Close()
if ss.DriverName() == model.DATABASE_DRIVER_MYSQL {
if ss.DriverName() == model.DatabaseDriverMysql {
driver, err = mysqlmigrate.WithInstance(conn.Db, &mysqlmigrate.Config{})
if err != nil {
return err
@@ -1535,7 +1535,7 @@ func (ss *SqlStore) migrate(direction migrationDirection) error {
func (ss *SqlStore) appendMultipleStatementsFlag(dataSource string) (string, error) {
// We need to tell the MySQL driver that we want to use multiStatements
// in order to make migrations work.
if ss.DriverName() == model.DATABASE_DRIVER_MYSQL {
if ss.DriverName() == model.DatabaseDriverMysql {
config, err := mysql.ParseDSN(dataSource)
if err != nil {
return "", err

68
store/sqlstore/store_test.go
Просмотреть файл

@@ -104,14 +104,14 @@ func initStores() {
if os.Getenv("IS_CI") == "true" {
switch os.Getenv("MM_SQLSETTINGS_DRIVERNAME") {
case "mysql":
storeTypes = append(storeTypes, newStoreType("MySQL", model.DATABASE_DRIVER_MYSQL))
storeTypes = append(storeTypes, newStoreType("MySQL", model.DatabaseDriverMysql))
case "postgres":
storeTypes = append(storeTypes, newStoreType("PostgreSQL", model.DATABASE_DRIVER_POSTGRES))
storeTypes = append(storeTypes, newStoreType("PostgreSQL", model.DatabaseDriverPostgres))
}
} else {
storeTypes = append(storeTypes,
newStoreType("MySQL", model.DATABASE_DRIVER_MYSQL),
newStoreType("PostgreSQL", model.DATABASE_DRIVER_POSTGRES),
newStoreType("MySQL", model.DatabaseDriverMysql),
newStoreType("PostgreSQL", model.DatabaseDriverPostgres),
)
}
@@ -165,7 +165,7 @@ func tearDownStores() {
// before the fix in MM-28397.
// Keeping it here to help avoiding future regressions.
func TestStoreLicenseRace(t *testing.T) {
settings := makeSqlSettings(model.DATABASE_DRIVER_POSTGRES)
settings := makeSqlSettings(model.DatabaseDriverPostgres)
store := New(*settings, nil)
defer func() {
store.Close()
@@ -251,7 +251,7 @@ func TestGetReplica(t *testing.T) {
testCase := testCase
t.Run(testCase.Description+" with license", func(t *testing.T) {
settings := makeSqlSettings(model.DATABASE_DRIVER_POSTGRES)
settings := makeSqlSettings(model.DatabaseDriverPostgres)
dataSourceReplicas := []string{}
dataSourceSearchReplicas := []string{}
for i := 0; i < testCase.DataSourceReplicaNum; i++ {
@@ -321,7 +321,7 @@ func TestGetReplica(t *testing.T) {
t.Run(testCase.Description+" without license", func(t *testing.T) {
settings := makeSqlSettings(model.DATABASE_DRIVER_POSTGRES)
settings := makeSqlSettings(model.DatabaseDriverPostgres)
dataSourceReplicas := []string{}
dataSourceSearchReplicas := []string{}
for i := 0; i < testCase.DataSourceReplicaNum; i++ {
@@ -389,8 +389,8 @@ func TestGetReplica(t *testing.T) {
func TestGetDbVersion(t *testing.T) {
testDrivers := []string{
model.DATABASE_DRIVER_POSTGRES,
model.DATABASE_DRIVER_MYSQL,
model.DatabaseDriverPostgres,
model.DatabaseDriverMysql,
}
for _, driver := range testDrivers {
@@ -408,8 +408,8 @@ func TestGetDbVersion(t *testing.T) {
func TestUpAndDownMigrations(t *testing.T) {
testDrivers := []string{
model.DATABASE_DRIVER_POSTGRES,
model.DATABASE_DRIVER_MYSQL,
model.DatabaseDriverPostgres,
model.DatabaseDriverMysql,
}
for _, driver := range testDrivers {
@@ -493,7 +493,7 @@ func TestGetAllConns(t *testing.T) {
testCase := testCase
t.Run(testCase.Description, func(t *testing.T) {
t.Parallel()
settings := makeSqlSettings(model.DATABASE_DRIVER_POSTGRES)
settings := makeSqlSettings(model.DatabaseDriverPostgres)
dataSourceReplicas := []string{}
dataSourceSearchReplicas := []string{}
for i := 0; i < testCase.DataSourceReplicaNum; i++ {
@@ -560,8 +560,8 @@ func TestVersionString(t *testing.T) {
func TestReplicaLagQuery(t *testing.T) {
testDrivers := []string{
model.DATABASE_DRIVER_POSTGRES,
model.DATABASE_DRIVER_MYSQL,
model.DatabaseDriverPostgres,
model.DatabaseDriverMysql,
}
for _, driver := range testDrivers {
@@ -570,10 +570,10 @@ func TestReplicaLagQuery(t *testing.T) {
var tableName string
// Just any random query which returns a row in (string, int) format.
switch driver {
case model.DATABASE_DRIVER_POSTGRES:
case model.DatabaseDriverPostgres:
query = `SELECT relname, count(relname) FROM pg_class WHERE relname='posts' GROUP BY relname`
tableName = "posts"
case model.DATABASE_DRIVER_MYSQL:
case model.DatabaseDriverMysql:
query = `SELECT table_name, count(table_name) FROM information_schema.tables WHERE table_name='Posts' and table_schema=Database() GROUP BY table_name`
tableName = "Posts"
}
@@ -621,19 +621,19 @@ func TestAppendMultipleStatementsFlagMysql(t *testing.T) {
"Should append multiStatements param to the DSN path with existing params",
"user:rand?&ompasswith@character@unix(/var/run/mysqld/mysqld.sock)/mattermost?writeTimeout=30s",
"user:rand?&ompasswith@character@unix(/var/run/mysqld/mysqld.sock)/mattermost?writeTimeout=30s&multiStatements=true",
model.DATABASE_DRIVER_MYSQL,
model.DatabaseDriverMysql,
},
{
"Should append multiStatements param to the DSN path with no existing params",
"user:rand?&ompasswith@character@unix(/var/run/mysqld/mysqld.sock)/mattermost",
"user:rand?&ompasswith@character@unix(/var/run/mysqld/mysqld.sock)/mattermost?multiStatements=true",
model.DATABASE_DRIVER_MYSQL,
model.DatabaseDriverMysql,
},
{
"Should not multiStatements param to the DSN when driver is not MySQL",
"user:rand?&ompasswith@character@unix(/var/run/mysqld/mysqld.sock)/mattermost",
"user:rand?&ompasswith@character@unix(/var/run/mysqld/mysqld.sock)/mattermost",
model.DATABASE_DRIVER_POSTGRES,
model.DatabaseDriverPostgres,
},
}
@@ -649,9 +649,9 @@ func TestAppendMultipleStatementsFlagMysql(t *testing.T) {
func makeSqlSettings(driver string) *model.SqlSettings {
switch driver {
case model.DATABASE_DRIVER_POSTGRES:
case model.DatabaseDriverPostgres:
return storetest.MakeSqlSettings(driver, false)
case model.DATABASE_DRIVER_MYSQL:
case model.DatabaseDriverMysql:
return storetest.MakeSqlSettings(driver, false)
}
@@ -667,9 +667,9 @@ func TestExecNoTimeout(t *testing.T) {
defer func() {
sqlStore.master.QueryTimeout = timeout
}()
if sqlStore.DriverName() == model.DATABASE_DRIVER_MYSQL {
if sqlStore.DriverName() == model.DatabaseDriverMysql {
query = `SELECT SLEEP(2);`
} else if sqlStore.DriverName() == model.DATABASE_DRIVER_POSTGRES {
} else if sqlStore.DriverName() == model.DatabaseDriverPostgres {
query = `SELECT pg_sleep(2);`
}
_, err := sqlStore.GetMaster().ExecNoTimeout(query)
@@ -678,7 +678,7 @@ func TestExecNoTimeout(t *testing.T) {
}
func TestMySQLReadTimeout(t *testing.T) {
settings := makeSqlSettings(model.DATABASE_DRIVER_MYSQL)
settings := makeSqlSettings(model.DatabaseDriverMysql)
dataSource := *settings.DataSource
config, err := mysql.ParseDSN(dataSource)
require.NoError(t, err)
@@ -741,13 +741,13 @@ func TestAlterDefaultIfColumnExists(t *testing.T) {
ok := sqlStore.AlterDefaultIfColumnExists("Posts", "Id", model.NewString(""), model.NewString(""))
require.True(t, ok)
if sqlStore.DriverName() == model.DATABASE_DRIVER_MYSQL {
if sqlStore.DriverName() == model.DatabaseDriverMysql {
query = `SELECT column_default
FROM information_schema.columns
WHERE table_schema = DATABASE()
AND table_name = 'Posts'
AND column_name = 'Id'`
} else if sqlStore.DriverName() == model.DATABASE_DRIVER_POSTGRES {
} else if sqlStore.DriverName() == model.DatabaseDriverPostgres {
query = `SELECT column_default
FROM information_schema.columns
WHERE table_name = 'posts'
@@ -757,9 +757,9 @@ func TestAlterDefaultIfColumnExists(t *testing.T) {
err := sqlStore.GetMaster().SelectOne(&def, query)
require.NoError(t, err)
require.NotNil(t, def)
if sqlStore.DriverName() == model.DATABASE_DRIVER_MYSQL {
if sqlStore.DriverName() == model.DatabaseDriverMysql {
require.Equal(t, "", *def)
} else if sqlStore.DriverName() == model.DATABASE_DRIVER_POSTGRES {
} else if sqlStore.DriverName() == model.DatabaseDriverPostgres {
require.Equal(t, "''::character varying", *def)
}
})
@@ -771,9 +771,9 @@ func TestAlterDefaultIfColumnExists(t *testing.T) {
err := sqlStore.GetMaster().SelectOne(&def, query)
require.NoError(t, err)
require.NotNil(t, def)
if sqlStore.DriverName() == model.DATABASE_DRIVER_MYSQL {
if sqlStore.DriverName() == model.DatabaseDriverMysql {
require.Equal(t, "", *def)
} else if sqlStore.DriverName() == model.DATABASE_DRIVER_POSTGRES {
} else if sqlStore.DriverName() == model.DatabaseDriverPostgres {
require.Equal(t, "''::character varying", *def)
}
})
@@ -794,9 +794,9 @@ func TestAlterDefaultIfColumnExists(t *testing.T) {
err := sqlStore.GetMaster().SelectOne(&def, query)
require.NoError(t, err)
require.NotNil(t, def)
if sqlStore.DriverName() == model.DATABASE_DRIVER_MYSQL {
if sqlStore.DriverName() == model.DatabaseDriverMysql {
require.Equal(t, "test", *def)
} else if sqlStore.DriverName() == model.DATABASE_DRIVER_POSTGRES {
} else if sqlStore.DriverName() == model.DatabaseDriverPostgres {
require.Equal(t, "'test'::character varying", *def)
}
@@ -808,13 +808,13 @@ func TestAlterDefaultIfColumnExists(t *testing.T) {
ok := sqlStore.AlterDefaultIfColumnExists("Posts", "UpdateAt", model.NewString("0"), model.NewString("0"))
require.True(t, ok)
if sqlStore.DriverName() == model.DATABASE_DRIVER_MYSQL {
if sqlStore.DriverName() == model.DatabaseDriverMysql {
query = `SELECT column_default
FROM information_schema.columns
WHERE table_schema = DATABASE()
AND table_name = 'Posts'
AND column_name = 'UpdateAt'`
} else if sqlStore.DriverName() == model.DATABASE_DRIVER_POSTGRES {
} else if sqlStore.DriverName() == model.DatabaseDriverPostgres {
query = `SELECT column_default
FROM information_schema.columns
WHERE table_name = 'posts'

6
store/sqlstore/system_store.go
Просмотреть файл

@@ -68,9 +68,9 @@ func (s SqlSystemStore) SaveOrUpdateWithWarnMetricHandling(system *model.System)
}
}
if strings.HasPrefix(system.Name, model.WARN_METRIC_STATUS_STORE_PREFIX) && (system.Value == model.WARN_METRIC_STATUS_RUNONCE || system.Value == model.WARN_METRIC_STATUS_LIMIT_REACHED) {
if err := s.SaveOrUpdate(&model.System{Name: model.SYSTEM_WARN_METRIC_LAST_RUN_TIMESTAMP_KEY, Value: strconv.FormatInt(utils.MillisFromTime(time.Now()), 10)}); err != nil {
return errors.Wrapf(err, "failed to save system property with name=%s", model.SYSTEM_WARN_METRIC_LAST_RUN_TIMESTAMP_KEY)
if strings.HasPrefix(system.Name, model.WarnMetricStatusStorePrefix) && (system.Value == model.WarnMetricStatusRunonce || system.Value == model.WarnMetricStatusLimitReached) {
if err := s.SaveOrUpdate(&model.System{Name: model.SystemWarnMetricLastRunTimestampKey, Value: strconv.FormatInt(utils.MillisFromTime(time.Now()), 10)}); err != nil {
return errors.Wrapf(err, "failed to save system property with name=%s", model.SystemWarnMetricLastRunTimestampKey)
}
}

20
store/sqlstore/team_store.go
Просмотреть файл

@@ -105,11 +105,11 @@ func getTeamRoles(schemeGuest, schemeUser, schemeAdmin bool, defaultTeamGuestRol
// them from ExplicitRoles field.
for _, role := range roles {
switch role {
case model.TEAM_GUEST_ROLE_ID:
case model.TeamGuestRoleId:
result.schemeGuest = true
case model.TEAM_USER_ROLE_ID:
case model.TeamUserRoleId:
result.schemeUser = true
case model.TEAM_ADMIN_ROLE_ID:
case model.TeamAdminRoleId:
result.schemeAdmin = true
default:
result.explicitRoles = append(result.explicitRoles, role)
@@ -124,21 +124,21 @@ func getTeamRoles(schemeGuest, schemeUser, schemeAdmin bool, defaultTeamGuestRol
if defaultTeamGuestRole != "" {
schemeImpliedRoles = append(schemeImpliedRoles, defaultTeamGuestRole)
} else {
schemeImpliedRoles = append(schemeImpliedRoles, model.TEAM_GUEST_ROLE_ID)
schemeImpliedRoles = append(schemeImpliedRoles, model.TeamGuestRoleId)
}
}
if result.schemeUser {
if defaultTeamUserRole != "" {
schemeImpliedRoles = append(schemeImpliedRoles, defaultTeamUserRole)
} else {
schemeImpliedRoles = append(schemeImpliedRoles, model.TEAM_USER_ROLE_ID)
schemeImpliedRoles = append(schemeImpliedRoles, model.TeamUserRoleId)
}
}
if result.schemeAdmin {
if defaultTeamAdminRole != "" {
schemeImpliedRoles = append(schemeImpliedRoles, defaultTeamAdminRole)
} else {
schemeImpliedRoles = append(schemeImpliedRoles, model.TEAM_ADMIN_ROLE_ID)
schemeImpliedRoles = append(schemeImpliedRoles, model.TeamAdminRoleId)
}
}
for _, impliedRole := range schemeImpliedRoles {
@@ -400,7 +400,7 @@ func (s SqlTeamStore) teamSearchQuery(opts *model.TeamSearch, countQuery bool) s
term = wildcardSearchTerm(term)
operatorKeyword := "ILIKE"
if s.DriverName() == model.DATABASE_DRIVER_MYSQL {
if s.DriverName() == model.DatabaseDriverMysql {
operatorKeyword = "LIKE"
}
@@ -1264,11 +1264,11 @@ func (s SqlTeamStore) MigrateTeamMembers(fromTeamId string, fromUserId string) (
member.SchemeGuest = sql.NullBool{Bool: false, Valid: true}
}
for _, role := range roles {
if role == model.TEAM_ADMIN_ROLE_ID {
if role == model.TeamAdminRoleId {
member.SchemeAdmin = sql.NullBool{Bool: true, Valid: true}
} else if role == model.TEAM_USER_ROLE_ID {
} else if role == model.TeamUserRoleId {
member.SchemeUser = sql.NullBool{Bool: true, Valid: true}
} else if role == model.TEAM_GUEST_ROLE_ID {
} else if role == model.TeamGuestRoleId {
member.SchemeGuest = sql.NullBool{Bool: true, Valid: true}
} else {
newRoles = append(newRoles, role)

2
store/sqlstore/terms_of_service_store.go
Просмотреть файл

@@ -25,7 +25,7 @@ func newSqlTermsOfServiceStore(sqlStore *SqlStore, metrics einterfaces.MetricsIn
table := db.AddTableWithName(model.TermsOfService{}, "TermsOfService").SetKeys(false, "Id")
table.ColMap("Id").SetMaxSize(26)
table.ColMap("UserId").SetMaxSize(26)
table.ColMap("Text").SetMaxSize(model.POST_MESSAGE_MAX_BYTES_V2)
table.ColMap("Text").SetMaxSize(model.PostMessageMaxBytesV2)
}
return s

2
store/sqlstore/tokens_store.go
Просмотреть файл

@@ -69,7 +69,7 @@ func (s SqlTokenStore) GetByToken(tokenString string) (*model.Token, error) {
func (s SqlTokenStore) Cleanup() {
mlog.Debug("Cleaning up token store.")
deltime := model.GetMillis() - model.MAX_TOKEN_EXIPRY_TIME
deltime := model.GetMillis() - model.MaxTokenExipryTime
if _, err := s.GetMaster().Exec("DELETE FROM Tokens WHERE CreateAt < :DelTime", map[string]interface{}{"DelTime": deltime}); err != nil {
mlog.Error("Unable to cleanup token store.")
}

38
store/sqlstore/upgrade.go
Просмотреть файл

@@ -273,7 +273,7 @@ func upgradeDatabaseToVersion33(sqlStore *SqlStore) {
if shouldPerformUpgrade(sqlStore, Version320, Version330) {
if sqlStore.DoesColumnExist("Users", "ThemeProps") {
params := map[string]interface{}{
"Category": model.PREFERENCE_CATEGORY_THEME,
"Category": model.PreferenceCategoryTheme,
"Name": "",
}
@@ -284,12 +284,12 @@ func upgradeDatabaseToVersion33(sqlStore *SqlStore) {
defer finalizeTransaction(transaction)
// increase size of Value column of Preferences table to match the size of the ThemeProps column
if sqlStore.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if sqlStore.DriverName() == model.DatabaseDriverPostgres {
if _, err := transaction.ExecNoTimeout("ALTER TABLE Preferences ALTER COLUMN Value TYPE varchar(2000)"); err != nil {
themeMigrationFailed(err)
return
}
} else if sqlStore.DriverName() == model.DATABASE_DRIVER_MYSQL {
} else if sqlStore.DriverName() == model.DatabaseDriverMysql {
if _, err := transaction.ExecNoTimeout("ALTER TABLE Preferences MODIFY Value text"); err != nil {
themeMigrationFailed(err)
return
@@ -301,7 +301,7 @@ func upgradeDatabaseToVersion33(sqlStore *SqlStore) {
`INSERT INTO
Preferences(UserId, Category, Name, Value)
SELECT
Id, '`+model.PREFERENCE_CATEGORY_THEME+`', '', ThemeProps
Id, '`+model.PreferenceCategoryTheme+`', '', ThemeProps
FROM
Users
WHERE
@@ -323,7 +323,7 @@ func upgradeDatabaseToVersion33(sqlStore *SqlStore) {
// rename solarized_* code themes to solarized-* to match client changes in 3.0
var data model.Preferences
if _, err := sqlStore.GetMaster().Select(&data, "SELECT * FROM Preferences WHERE Category = '"+model.PREFERENCE_CATEGORY_THEME+"' AND Value LIKE '%solarized_%'"); err == nil {
if _, err := sqlStore.GetMaster().Select(&data, "SELECT * FROM Preferences WHERE Category = '"+model.PreferenceCategoryTheme+"' AND Value LIKE '%solarized_%'"); err == nil {
for i := range data {
data[i].Value = strings.Replace(data[i].Value, "solarized_", "solarized-", -1)
}
@@ -418,7 +418,7 @@ func upgradeDatabaseToVersion38(sqlStore *SqlStore) {
func upgradeDatabaseToVersion39(sqlStore *SqlStore) {
if shouldPerformUpgrade(sqlStore, Version380, Version390) {
sqlStore.CreateColumnIfNotExists("OAuthAccessData", "Scope", "varchar(128)", "varchar(128)", model.DEFAULT_SCOPE)
sqlStore.CreateColumnIfNotExists("OAuthAccessData", "Scope", "varchar(128)", "varchar(128)", model.DefaultScope)
sqlStore.RemoveTableIfExists("PasswordRecovery")
saveSchemaVersion(sqlStore, Version390)
@@ -635,7 +635,7 @@ func upgradeDatabaseToVersion56(sqlStore *SqlStore) {
// migrating user's accepted terms of service data into the new table
sqlStore.GetMaster().ExecNoTimeout("INSERT INTO UserTermsOfService SELECT Id, AcceptedTermsOfServiceId as TermsOfServiceId, :CreateAt FROM Users WHERE AcceptedTermsOfServiceId != \"\" AND AcceptedTermsOfServiceId IS NOT NULL", map[string]interface{}{"CreateAt": model.GetMillis()})
if sqlStore.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if sqlStore.DriverName() == model.DatabaseDriverPostgres {
sqlStore.RemoveIndexIfExists("idx_users_email_lower", "lower(Email)")
sqlStore.RemoveIndexIfExists("idx_users_username_lower", "lower(Username)")
sqlStore.RemoveIndexIfExists("idx_users_nickname_lower", "lower(Nickname)")
@@ -667,7 +667,7 @@ func upgradeDatabaseToVersion58(sqlStore *SqlStore) {
sqlStore.AlterColumnTypeIfExists("IncomingWebhooks", "Description", "text", "VARCHAR(500)")
sqlStore.AlterColumnTypeIfExists("OutgoingWebhooks", "IconURL", "text", "VARCHAR(1024)")
sqlStore.RemoveDefaultIfColumnExists("OutgoingWebhooks", "Username")
if sqlStore.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if sqlStore.DriverName() == model.DatabaseDriverPostgres {
sqlStore.RemoveDefaultIfColumnExists("OutgoingWebhooks", "IconURL")
}
sqlStore.AlterDefaultIfColumnExists("OutgoingWebhooks", "Username", model.NewString("NULL"), nil)
@@ -751,9 +751,9 @@ func upgradeDatabaseToVersion515(sqlStore *SqlStore) {
func upgradeDatabaseToVersion516(sqlStore *SqlStore) {
if shouldPerformUpgrade(sqlStore, Version5150, Version5160) {
if sqlStore.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if sqlStore.DriverName() == model.DatabaseDriverPostgres {
sqlStore.GetMaster().ExecNoTimeout("ALTER TABLE Tokens ALTER COLUMN Extra TYPE varchar(2048)")
} else if sqlStore.DriverName() == model.DATABASE_DRIVER_MYSQL {
} else if sqlStore.DriverName() == model.DatabaseDriverMysql {
sqlStore.GetMaster().ExecNoTimeout("ALTER TABLE Tokens MODIFY Extra text")
}
saveSchemaVersion(sqlStore, Version5160)
@@ -952,7 +952,7 @@ func upgradeDatabaseToVersion529(sqlStore *SqlStore) {
sqlStore.CreateColumnIfNotExistsNoDefault("Threads", "ChannelId", "VARCHAR(26)", "VARCHAR(26)")
updateThreadChannelsQuery := "UPDATE Threads INNER JOIN Posts ON Posts.Id=Threads.PostId SET Threads.ChannelId=Posts.ChannelId WHERE Threads.ChannelId IS NULL"
if sqlStore.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if sqlStore.DriverName() == model.DatabaseDriverPostgres {
updateThreadChannelsQuery = "UPDATE Threads SET ChannelId=Posts.ChannelId FROM Posts WHERE Posts.Id=Threads.PostId AND Threads.ChannelId IS NULL"
}
if _, err := sqlStore.GetMaster().ExecNoTimeout(updateThreadChannelsQuery); err != nil {
@@ -998,7 +998,7 @@ func hasMissingMigrationsVersion532(sqlStore *SqlStore) bool {
return true
}
if sqlStore.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if sqlStore.DriverName() == model.DatabaseDriverPostgres {
if !sqlStore.IsVarchar(scIdInfo.DataType) || scIdInfo.CharMaximumLength != 300 {
return true
}
@@ -1027,7 +1027,7 @@ func upgradeDatabaseToVersion532(sqlStore *SqlStore) {
if hasMissingMigrationsVersion532(sqlStore) {
// this migration was reverted on MySQL due to performance reasons. Doing
// it only on PostgreSQL for the time being.
if sqlStore.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if sqlStore.DriverName() == model.DatabaseDriverPostgres {
// allow 10 files per post
sqlStore.AlterColumnTypeIfExists("Posts", "FileIds", "text", "varchar(300)")
}
@@ -1073,7 +1073,7 @@ func upgradeDatabaseToVersion535(sqlStore *SqlStore) {
mlog.Error("Error updating RemoteId,ReqFileId in UploadsSession table", mlog.Err(err))
}
uniquenessColumns := []string{"SiteUrl", "RemoteTeamId"}
if sqlStore.DriverName() == model.DATABASE_DRIVER_MYSQL {
if sqlStore.DriverName() == model.DatabaseDriverMysql {
uniquenessColumns = []string{"RemoteTeamId", "SiteUrl(168)"}
}
sqlStore.CreateUniqueCompositeIndexIfNotExists(RemoteClusterSiteURLUniqueIndex, "RemoteClusters", uniquenessColumns)
@@ -1114,7 +1114,7 @@ func rootCountMigration(sqlStore *SqlStore) {
ChannelMembers.MentionCount > 0
SET MentionCountRoot = ChannelMembers.MentionCount - q.UnreadMentions
`
if sqlStore.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if sqlStore.DriverName() == model.DatabaseDriverPostgres {
updateMentionCountRootQuery = `
WITH q AS (` + mentionCountRootCTE + `)
UPDATE channelmembers
@@ -1137,7 +1137,7 @@ func rootCountMigration(sqlStore *SqlStore) {
sqlStore.AlterDefaultIfColumnExists("ChannelMembers", "MsgCountRoot", model.NewString("0"), model.NewString("0"))
forceIndex := ""
if sqlStore.DriverName() == model.DATABASE_DRIVER_MYSQL {
if sqlStore.DriverName() == model.DatabaseDriverMysql {
forceIndex = "FORCE INDEX(idx_posts_channel_id_update_at)"
}
totalMsgCountRootCTE := `
@@ -1158,7 +1158,7 @@ func rootCountMigration(sqlStore *SqlStore) {
UPDATE ChannelMembers CM SET MsgCountRoot=TotalMsgCountRoot
FROM q WHERE q.id=CM.ChannelId AND LastViewedAt >= q.lastrootpostat;
`
if sqlStore.DriverName() == model.DATABASE_DRIVER_MYSQL {
if sqlStore.DriverName() == model.DatabaseDriverMysql {
updateChannels = `
UPDATE Channels
INNER Join (` + totalMsgCountRootCTE + `) as q
@@ -1246,7 +1246,7 @@ func fixCRTThreadCountsAndUnreads(sqlStore *SqlStore) {
UPDATE ThreadMemberships set LastViewed = q.CM_LastViewedAt + 1, UnreadMentions = 0, LastUpdated = :Now
FROM q WHERE ThreadMemberships.Postid = q.PostId AND ThreadMemberships.UserId = q.UserId
`
if sqlStore.DriverName() == model.DATABASE_DRIVER_MYSQL {
if sqlStore.DriverName() == model.DatabaseDriverMysql {
updateThreadMembershipQuery = `
UPDATE ThreadMemberships
INNER JOIN (` + threadMembershipsCTE + `) as q
@@ -1280,7 +1280,7 @@ func fixCRTChannelMembershipCounts(sqlStore *SqlStore) {
WHERE ChannelMembers.Channelid = Channels.Id AND ChannelMembers.LastViewedAt >= Channels.LastPostAt;
`
if sqlStore.DriverName() == model.DATABASE_DRIVER_MYSQL {
if sqlStore.DriverName() == model.DatabaseDriverMysql {
channelMembershipsCountsAndMentions = `
UPDATE ChannelMembers
INNER JOIN Channels on Channels.Id = ChannelMembers.ChannelId

2
store/sqlstore/upgrade_test.go
Просмотреть файл

@@ -146,7 +146,7 @@ func createChannelWithLastPostAt(ss store.Store, teamId, creatorId string, lastP
m.CreatorId = creatorId
m.DisplayName = "Name"
m.Name = "zz" + model.NewId() + "b"
m.Type = model.CHANNEL_OPEN
m.Type = model.ChannelTypeOpen
return ss.Channel().Save(&m, -1)
}

12
store/sqlstore/user_access_token_store.go
Просмотреть файл

@@ -71,9 +71,9 @@ func (s SqlUserAccessTokenStore) Delete(tokenId string) error {
func (s SqlUserAccessTokenStore) deleteSessionsAndTokensById(transaction *gorp.Transaction, tokenId string) error {
query := ""
if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if s.DriverName() == model.DatabaseDriverPostgres {
query = "DELETE FROM Sessions s USING UserAccessTokens o WHERE o.Token = s.Token AND o.Id = :Id"
} else if s.DriverName() == model.DATABASE_DRIVER_MYSQL {
} else if s.DriverName() == model.DatabaseDriverMysql {
query = "DELETE s.* FROM Sessions s INNER JOIN UserAccessTokens o ON o.Token = s.Token WHERE o.Id = :Id"
}
@@ -112,9 +112,9 @@ func (s SqlUserAccessTokenStore) DeleteAllForUser(userId string) error {
func (s SqlUserAccessTokenStore) deleteSessionsandTokensByUser(transaction *gorp.Transaction, userId string) error {
query := ""
if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if s.DriverName() == model.DatabaseDriverPostgres {
query = "DELETE FROM Sessions s USING UserAccessTokens o WHERE o.Token = s.Token AND o.UserId = :UserId"
} else if s.DriverName() == model.DATABASE_DRIVER_MYSQL {
} else if s.DriverName() == model.DatabaseDriverMysql {
query = "DELETE s.* FROM Sessions s INNER JOIN UserAccessTokens o ON o.Token = s.Token WHERE o.UserId = :UserId"
}
@@ -224,9 +224,9 @@ func (s SqlUserAccessTokenStore) UpdateTokenDisable(tokenId string) error {
func (s SqlUserAccessTokenStore) deleteSessionsAndDisableToken(transaction *gorp.Transaction, tokenId string) error {
query := ""
if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if s.DriverName() == model.DatabaseDriverPostgres {
query = "DELETE FROM Sessions s USING UserAccessTokens o WHERE o.Token = s.Token AND o.Id = :Id"
} else if s.DriverName() == model.DATABASE_DRIVER_MYSQL {
} else if s.DriverName() == model.DatabaseDriverMysql {
query = "DELETE s.* FROM Sessions s INNER JOIN UserAccessTokens o ON o.Token = s.Token WHERE o.Id = :Id"
}

68
store/sqlstore/user_store.go
Просмотреть файл

@@ -26,10 +26,10 @@ const (
)
var (
UserSearchTypeNames_NO_FULL_NAME = []string{"Username", "Nickname"}
UserSearchTypeNames = []string{"Username", "FirstName", "LastName", "Nickname"}
UserSearchTypeAll_NO_FULL_NAME = []string{"Username", "Nickname", "Email"}
UserSearchTypeAll = []string{"Username", "FirstName", "LastName", "Nickname", "Email"}
UserSearchTypeNamesNoFullName = []string{"Username", "Nickname"}
UserSearchTypeNames = []string{"Username", "FirstName", "LastName", "Nickname"}
UserSearchTypeAllNoFullName = []string{"Username", "Nickname", "Email"}
UserSearchTypeAll = []string{"Username", "FirstName", "LastName", "Nickname", "Email"}
)
type SqlUserStore struct {
@@ -86,7 +86,7 @@ func (us SqlUserStore) createIndexesIfNotExists() {
us.CreateIndexIfNotExists("idx_users_create_at", "Users", "CreateAt")
us.CreateIndexIfNotExists("idx_users_delete_at", "Users", "DeleteAt")
if us.DriverName() == model.DATABASE_DRIVER_POSTGRES {
if us.DriverName() == model.DatabaseDriverPostgres {
us.CreateIndexIfNotExists("idx_users_email_lower_textpattern", "Users", "lower(Email) text_pattern_ops")
us.CreateIndexIfNotExists("idx_users_username_lower_textpattern", "Users", "lower(Username) text_pattern_ops")
us.CreateIndexIfNotExists("idx_users_nickname_lower_textpattern", "Users", "lower(Nickname) text_pattern_ops")
@@ -95,9 +95,9 @@ func (us SqlUserStore) createIndexesIfNotExists() {
}
us.CreateFullTextIndexIfNotExists("idx_users_all_txt", "Users", strings.Join(UserSearchTypeAll, ", "))
us.CreateFullTextIndexIfNotExists("idx_users_all_no_full_name_txt", "Users", strings.Join(UserSearchTypeAll_NO_FULL_NAME, ", "))
us.CreateFullTextIndexIfNotExists("idx_users_all_no_full_name_txt", "Users", strings.Join(UserSearchTypeAllNoFullName, ", "))
us.CreateFullTextIndexIfNotExists("idx_users_names_txt", "Users", strings.Join(UserSearchTypeNames, ", "))
us.CreateFullTextIndexIfNotExists("idx_users_names_no_full_name_txt", "Users", strings.Join(UserSearchTypeNames_NO_FULL_NAME, ", "))
us.CreateFullTextIndexIfNotExists("idx_users_names_no_full_name_txt", "Users", strings.Join(UserSearchTypeNamesNoFullName, ", "))
}
func (us SqlUserStore) Save(user *model.User) (*model.User, error) {
@@ -464,7 +464,7 @@ func (us SqlUserStore) GetEtagForAllProfiles() string {
}
func (us SqlUserStore) GetAllProfiles(options *model.UserGetOptions) ([]*model.User, error) {
isPostgreSQL := us.DriverName() == model.DATABASE_DRIVER_POSTGRES
isPostgreSQL := us.DriverName() == model.DatabaseDriverPostgres
query := us.usersQuery.
OrderBy("u.Username ASC").
Offset(uint64(options.Page * options.PerPage)).Limit(uint64(options.PerPage))
@@ -519,10 +519,10 @@ func applyMultiRoleFilters(query sq.SelectBuilder, systemRoles []string, teamRol
for _, role := range systemRoles {
queryRole := wildcardSearchTerm(role)
switch role {
case model.SYSTEM_USER_ROLE_ID:
case model.SystemUserRoleId:
// If querying for a `system_user` ensure that the user is only a system_user.
sqOr = append(sqOr, sq.Eq{"u.Roles": role})
case model.SYSTEM_GUEST_ROLE_ID, model.SYSTEM_ADMIN_ROLE_ID, model.SYSTEM_USER_MANAGER_ROLE_ID, model.SYSTEM_READ_ONLY_ADMIN_ROLE_ID, model.SYSTEM_MANAGER_ROLE_ID:
case model.SystemGuestRoleId, model.SystemAdminRoleId, model.SystemUserManagerRoleId, model.SystemReadOnlyAdminRoleId, model.SystemManagerRoleId:
// If querying for any other roles search using a wildcard.
if isPostgreSQL {
sqOr = append(sqOr, sq.ILike{"u.Roles": queryRole})
@@ -537,19 +537,19 @@ func applyMultiRoleFilters(query sq.SelectBuilder, systemRoles []string, teamRol
if len(channelRoles) > 0 && channelRoles[0] != "" {
for _, channelRole := range channelRoles {
switch channelRole {
case model.CHANNEL_ADMIN_ROLE_ID:
case model.ChannelAdminRoleId:
if isPostgreSQL {
sqOr = append(sqOr, sq.And{sq.Eq{"cm.SchemeAdmin": true}, sq.NotILike{"u.Roles": wildcardSearchTerm(model.SYSTEM_ADMIN_ROLE_ID)}})
sqOr = append(sqOr, sq.And{sq.Eq{"cm.SchemeAdmin": true}, sq.NotILike{"u.Roles": wildcardSearchTerm(model.SystemAdminRoleId)}})
} else {
sqOr = append(sqOr, sq.And{sq.Eq{"cm.SchemeAdmin": true}, sq.NotLike{"u.Roles": wildcardSearchTerm(model.SYSTEM_ADMIN_ROLE_ID)}})
sqOr = append(sqOr, sq.And{sq.Eq{"cm.SchemeAdmin": true}, sq.NotLike{"u.Roles": wildcardSearchTerm(model.SystemAdminRoleId)}})
}
case model.CHANNEL_USER_ROLE_ID:
case model.ChannelUserRoleId:
if isPostgreSQL {
sqOr = append(sqOr, sq.And{sq.Eq{"cm.SchemeUser": true}, sq.Eq{"cm.SchemeAdmin": false}, sq.NotILike{"u.Roles": wildcardSearchTerm(model.SYSTEM_ADMIN_ROLE_ID)}})
sqOr = append(sqOr, sq.And{sq.Eq{"cm.SchemeUser": true}, sq.Eq{"cm.SchemeAdmin": false}, sq.NotILike{"u.Roles": wildcardSearchTerm(model.SystemAdminRoleId)}})
} else {
sqOr = append(sqOr, sq.And{sq.Eq{"cm.SchemeUser": true}, sq.Eq{"cm.SchemeAdmin": false}, sq.NotLike{"u.Roles": wildcardSearchTerm(model.SYSTEM_ADMIN_ROLE_ID)}})
sqOr = append(sqOr, sq.And{sq.Eq{"cm.SchemeUser": true}, sq.Eq{"cm.SchemeAdmin": false}, sq.NotLike{"u.Roles": wildcardSearchTerm(model.SystemAdminRoleId)}})
}
case model.CHANNEL_GUEST_ROLE_ID:
case model.ChannelGuestRoleId:
sqOr = append(sqOr, sq.Eq{"cm.SchemeGuest": true})
}
}
@@ -558,19 +558,19 @@ func applyMultiRoleFilters(query sq.SelectBuilder, systemRoles []string, teamRol
if len(teamRoles) > 0 && teamRoles[0] != "" {
for _, teamRole := range teamRoles {
switch teamRole {
case model.TEAM_ADMIN_ROLE_ID:
case model.TeamAdminRoleId:
if isPostgreSQL {
sqOr = append(sqOr, sq.And{sq.Eq{"tm.SchemeAdmin": true}, sq.NotILike{"u.Roles": wildcardSearchTerm(model.SYSTEM_ADMIN_ROLE_ID)}})
sqOr = append(sqOr, sq.And{sq.Eq{"tm.SchemeAdmin": true}, sq.NotILike{"u.Roles": wildcardSearchTerm(model.SystemAdminRoleId)}})
} else {
sqOr = append(sqOr, sq.And{sq.Eq{"tm.SchemeAdmin": true}, sq.NotLike{"u.Roles": wildcardSearchTerm(model.SYSTEM_ADMIN_ROLE_ID)}})
sqOr = append(sqOr, sq.And{sq.Eq{"tm.SchemeAdmin": true}, sq.NotLike{"u.Roles": wildcardSearchTerm(model.SystemAdminRoleId)}})
}
case model.TEAM_USER_ROLE_ID:
case model.TeamUserRoleId:
if isPostgreSQL {
sqOr = append(sqOr, sq.And{sq.Eq{"tm.SchemeUser": true}, sq.Eq{"tm.SchemeAdmin": false}, sq.NotILike{"u.Roles": wildcardSearchTerm(model.SYSTEM_ADMIN_ROLE_ID)}})
sqOr = append(sqOr, sq.And{sq.Eq{"tm.SchemeUser": true}, sq.Eq{"tm.SchemeAdmin": false}, sq.NotILike{"u.Roles": wildcardSearchTerm(model.SystemAdminRoleId)}})
} else {
sqOr = append(sqOr, sq.And{sq.Eq{"tm.SchemeUser": true}, sq.Eq{"tm.SchemeAdmin": false}, sq.NotLike{"u.Roles": wildcardSearchTerm(model.SYSTEM_ADMIN_ROLE_ID)}})
sqOr = append(sqOr, sq.And{sq.Eq{"tm.SchemeUser": true}, sq.Eq{"tm.SchemeAdmin": false}, sq.NotLike{"u.Roles": wildcardSearchTerm(model.SystemAdminRoleId)}})
}
case model.TEAM_GUEST_ROLE_ID:
case model.TeamGuestRoleId:
sqOr = append(sqOr, sq.Eq{"tm.SchemeGuest": true})
}
}
@@ -639,7 +639,7 @@ func (us SqlUserStore) GetEtagForProfiles(teamId string) string {
}
func (us SqlUserStore) GetProfiles(options *model.UserGetOptions) ([]*model.User, error) {
isPostgreSQL := us.DriverName() == model.DATABASE_DRIVER_POSTGRES
isPostgreSQL := us.DriverName() == model.DatabaseDriverPostgres
query := us.usersQuery.
Join("TeamMembers tm ON ( tm.UserId = u.Id AND tm.DeleteAt = 0 )").
Where("tm.TeamId = ?", options.InTeamId).
@@ -830,7 +830,7 @@ func (us SqlUserStore) GetProfilesNotInChannel(teamId string, channelId string,
}
func (us SqlUserStore) GetProfilesWithoutTeam(options *model.UserGetOptions) ([]*model.User, error) {
isPostgreSQL := us.DriverName() == model.DATABASE_DRIVER_POSTGRES
isPostgreSQL := us.DriverName() == model.DatabaseDriverPostgres
query := us.usersQuery.
Where(`(
SELECT
@@ -1018,7 +1018,7 @@ func (us SqlUserStore) GetProfileByGroupChannelIdsForUser(userId string, channel
From("Users u").
Join("ChannelMembers cm ON u.Id = cm.UserId").
Join("Channels c ON cm.ChannelId = c.Id").
Where(sq.Eq{"c.Type": model.CHANNEL_GROUP, "cm.ChannelId": channelIds}).
Where(sq.Eq{"c.Type": model.ChannelTypeGroup, "cm.ChannelId": channelIds}).
Where(isMemberQuery).
Where(sq.NotEq{"u.Id": userId}).
OrderBy("u.Username ASC")
@@ -1220,7 +1220,7 @@ func (us SqlUserStore) PermanentDelete(userId string) error {
}
func (us SqlUserStore) Count(options model.UserCountOptions) (int64, error) {
isPostgreSQL := us.DriverName() == model.DATABASE_DRIVER_POSTGRES
isPostgreSQL := us.DriverName() == model.DatabaseDriverPostgres
query := us.getQueryBuilder().Select("COUNT(DISTINCT u.Id)").From("Users AS u")
if !options.IncludeDeleted {
@@ -1465,17 +1465,17 @@ func (us SqlUserStore) performSearch(query sq.SelectBuilder, term string, option
if options.AllowFullNames {
searchType = UserSearchTypeAll
} else {
searchType = UserSearchTypeAll_NO_FULL_NAME
searchType = UserSearchTypeAllNoFullName
}
} else {
if options.AllowFullNames {
searchType = UserSearchTypeNames
} else {
searchType = UserSearchTypeNames_NO_FULL_NAME
searchType = UserSearchTypeNamesNoFullName
}
}
isPostgreSQL := us.DriverName() == model.DATABASE_DRIVER_POSTGRES
isPostgreSQL := us.DriverName() == model.DatabaseDriverPostgres
query = applyRoleFilter(query, options.Role, isPostgreSQL)
query = applyMultiRoleFilters(query, options.Roles, options.TeamRoles, options.ChannelRoles, isPostgreSQL)
@@ -1899,9 +1899,9 @@ func (us SqlUserStore) DemoteUserToGuest(userID string) (*model.User, error) {
newRoles := []string{}
for _, role := range roles {
if role == model.SYSTEM_USER_ROLE_ID {
newRoles = append(newRoles, model.SYSTEM_GUEST_ROLE_ID)
} else if role != model.SYSTEM_ADMIN_ROLE_ID {
if role == model.SystemUserRoleId {
newRoles = append(newRoles, model.SystemGuestRoleId)
} else if role != model.SystemAdminRoleId {
newRoles = append(newRoles, role)
}
}

14
store/storetest/channel_member_history_store.go
Просмотреть файл

@@ -30,7 +30,7 @@ func testLogJoinEvent(t *testing.T, ss store.Store) {
TeamId: model.NewId(),
DisplayName: "Display " + model.NewId(),
Name: "zz" + model.NewId() + "b",
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
channel, err := ss.Channel().Save(&ch, -1)
require.NoError(t, err)
@@ -56,7 +56,7 @@ func testLogLeaveEvent(t *testing.T, ss store.Store) {
TeamId: model.NewId(),
DisplayName: "Display " + model.NewId(),
Name: "zz" + model.NewId() + "b",
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
channel, err := ss.Channel().Save(&ch, -1)
require.NoError(t, err)
@@ -85,7 +85,7 @@ func testGetUsersInChannelAtChannelMemberHistory(t *testing.T, ss store.Store) {
TeamId: model.NewId(),
DisplayName: "Display " + model.NewId(),
Name: "zz" + model.NewId() + "b",
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
channel, err := ss.Channel().Save(ch, -1)
require.NoError(t, err)
@@ -181,7 +181,7 @@ func testGetUsersInChannelAtChannelMembers(t *testing.T, ss store.Store) {
TeamId: model.NewId(),
DisplayName: "Display " + model.NewId(),
Name: "zz" + model.NewId() + "b",
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
channel, err := ss.Channel().Save(channel, -1)
require.NoError(t, err)
@@ -293,7 +293,7 @@ func testPermanentDeleteBatch(t *testing.T, ss store.Store) {
TeamId: model.NewId(),
DisplayName: "Display " + model.NewId(),
Name: "zz" + model.NewId() + "b",
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
channel, err := ss.Channel().Save(channel, -1)
require.NoError(t, err)
@@ -353,14 +353,14 @@ func testPermanentDeleteBatchForRetentionPolicies(t *testing.T, ss store.Store)
DisplayName: "DisplayName",
Name: "team" + model.NewId(),
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
})
require.NoError(t, err)
channel, err := ss.Channel().Save(&model.Channel{
TeamId: team.Id,
DisplayName: "DisplayName",
Name: "channel" + model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}, -1)
require.NoError(t, err)
userID := model.NewId()

452
store/storetest/channel_store.go
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

118
store/storetest/channel_store_categories.go
Просмотреть файл

@@ -141,7 +141,7 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) {
// Set up two channels, one favorited and one not
channel1, nErr := ss.Channel().Save(&model.Channel{
TeamId: teamId,
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
Name: "channel1",
}, 1000)
require.NoError(t, nErr)
@@ -154,7 +154,7 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) {
channel2, nErr := ss.Channel().Save(&model.Channel{
TeamId: teamId,
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
Name: "channel2",
}, 1000)
require.NoError(t, nErr)
@@ -168,7 +168,7 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) {
nErr = ss.Preference().Save(&model.Preferences{
{
UserId: userId,
Category: model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL,
Category: model.PreferenceCategoryFavoriteChannel,
Name: channel1.Id,
Value: "true",
},
@@ -197,7 +197,7 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) {
// Set up two channels
channel1, nErr := ss.Channel().Save(&model.Channel{
TeamId: teamId,
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
Name: "channel1",
DisplayName: "zebra",
}, 1000)
@@ -211,7 +211,7 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) {
channel2, nErr := ss.Channel().Save(&model.Channel{
TeamId: teamId,
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
Name: "channel2",
DisplayName: "aardvark",
}, 1000)
@@ -226,13 +226,13 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) {
nErr = ss.Preference().Save(&model.Preferences{
{
UserId: userId,
Category: model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL,
Category: model.PreferenceCategoryFavoriteChannel,
Name: channel1.Id,
Value: "true",
},
{
UserId: userId,
Category: model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL,
Category: model.PreferenceCategoryFavoriteChannel,
Name: channel2.Id,
Value: "true",
},
@@ -263,7 +263,7 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) {
dmChannel1, err := ss.Channel().SaveDirectChannel(
&model.Channel{
Name: model.GetDMNameFromIds(userId, otherUserId1),
Type: model.CHANNEL_DIRECT,
Type: model.ChannelTypeDirect,
},
&model.ChannelMember{
UserId: userId,
@@ -279,7 +279,7 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) {
dmChannel2, err := ss.Channel().SaveDirectChannel(
&model.Channel{
Name: model.GetDMNameFromIds(userId, otherUserId2),
Type: model.CHANNEL_DIRECT,
Type: model.ChannelTypeDirect,
},
&model.ChannelMember{
UserId: userId,
@@ -295,7 +295,7 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) {
err = ss.Preference().Save(&model.Preferences{
{
UserId: userId,
Category: model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL,
Category: model.PreferenceCategoryFavoriteChannel,
Name: dmChannel1.Id,
Value: "true",
},
@@ -325,7 +325,7 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) {
// Set up a channel on another team and favorite it
channel1, nErr := ss.Channel().Save(&model.Channel{
TeamId: teamId2,
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
Name: "channel1",
}, 1000)
require.NoError(t, nErr)
@@ -339,7 +339,7 @@ func testCreateInitialSidebarCategories(t *testing.T, ss store.Store) {
nErr = ss.Preference().Save(&model.Preferences{
{
UserId: userId,
Category: model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL,
Category: model.PreferenceCategoryFavoriteChannel,
Name: channel1.Id,
Value: "true",
},
@@ -451,13 +451,13 @@ func testCreateSidebarCategory(t *testing.T, ss store.Store) {
// Create some channels
channel1, err := ss.Channel().Save(&model.Channel{
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
TeamId: teamId,
Name: model.NewId(),
}, 100)
require.NoError(t, err)
channel2, err := ss.Channel().Save(&model.Channel{
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
TeamId: teamId,
Name: model.NewId(),
}, 100)
@@ -498,13 +498,13 @@ func testCreateSidebarCategory(t *testing.T, ss store.Store) {
// Create some channels
channel1, nErr := ss.Channel().Save(&model.Channel{
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
TeamId: teamId,
Name: model.NewId(),
}, 100)
require.NoError(t, nErr)
channel2, nErr := ss.Channel().Save(&model.Channel{
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
TeamId: teamId,
Name: model.NewId(),
}, 100)
@@ -594,7 +594,7 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) {
Name: "channel1",
DisplayName: "DEF",
TeamId: teamId,
Type: model.CHANNEL_PRIVATE,
Type: model.ChannelTypePrivate,
}, 10)
require.NoError(t, nErr)
_, nErr = ss.Channel().SaveMember(&model.ChannelMember{
@@ -608,7 +608,7 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) {
Name: "channel2",
DisplayName: "ABC",
TeamId: teamId,
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}, 10)
require.NoError(t, nErr)
_, nErr = ss.Channel().SaveMember(&model.ChannelMember{
@@ -656,7 +656,7 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) {
channel1, nErr := ss.Channel().Save(&model.Channel{
Name: "abc",
TeamId: model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}, 10)
require.NoError(t, nErr)
defer ss.Channel().PermanentDelete(channel1.Id)
@@ -698,7 +698,7 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) {
Name: "channel1",
DisplayName: "DEF",
TeamId: teamId,
Type: model.CHANNEL_PRIVATE,
Type: model.ChannelTypePrivate,
}, 10)
require.NoError(t, nErr)
_, nErr = ss.Channel().SaveMember(&model.ChannelMember{
@@ -712,7 +712,7 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) {
Name: "channel2",
DisplayName: "ABC",
TeamId: teamId,
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}, 10)
require.NoError(t, nErr)
_, nErr = ss.Channel().SaveMember(&model.ChannelMember{
@@ -759,7 +759,7 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) {
dmChannel, nErr := ss.Channel().SaveDirectChannel(
&model.Channel{
Name: model.GetDMNameFromIds(userId, otherUserId),
Type: model.CHANNEL_DIRECT,
Type: model.ChannelTypeDirect,
},
&model.ChannelMember{
UserId: userId,
@@ -799,7 +799,7 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) {
gmChannel, nErr := ss.Channel().Save(&model.Channel{
Name: "abc",
TeamId: "",
Type: model.CHANNEL_GROUP,
Type: model.ChannelTypeGroup,
}, 10)
require.NoError(t, nErr)
defer ss.Channel().PermanentDelete(gmChannel.Id)
@@ -838,7 +838,7 @@ func testGetSidebarCategory(t *testing.T, ss store.Store, s SqlStore) {
dmChannel, nErr := ss.Channel().SaveDirectChannel(
&model.Channel{
Name: model.GetDMNameFromIds(userId, otherUserId),
Type: model.CHANNEL_DIRECT,
Type: model.ChannelTypeDirect,
},
&model.ChannelMember{
UserId: userId,
@@ -1060,7 +1060,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
// Join a channel
channel, nErr := ss.Channel().Save(&model.Channel{
Name: "channel",
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
TeamId: teamId,
}, 10)
require.NoError(t, nErr)
@@ -1080,7 +1080,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
})
assert.NoError(t, err)
res2, nErr := ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, channel.Id)
res2, nErr := ss.Preference().Get(userId, model.PreferenceCategoryFavoriteChannel, channel.Id)
assert.NoError(t, nErr)
assert.NotNil(t, res2)
assert.Equal(t, "true", res2.Value)
@@ -1097,7 +1097,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
})
assert.NoError(t, err)
res2, nErr = ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, channel.Id)
res2, nErr = ss.Preference().Get(userId, model.PreferenceCategoryFavoriteChannel, channel.Id)
assert.Error(t, nErr)
assert.True(t, errors.Is(nErr, sql.ErrNoRows))
assert.Nil(t, res2)
@@ -1124,7 +1124,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
dmChannel, nErr := ss.Channel().SaveDirectChannel(
&model.Channel{
Name: model.GetDMNameFromIds(userId, otherUserId),
Type: model.CHANNEL_DIRECT,
Type: model.ChannelTypeDirect,
},
&model.ChannelMember{
UserId: userId,
@@ -1146,7 +1146,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
})
assert.NoError(t, err)
res2, nErr := ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, dmChannel.Id)
res2, nErr := ss.Preference().Get(userId, model.PreferenceCategoryFavoriteChannel, dmChannel.Id)
assert.NoError(t, nErr)
assert.NotNil(t, res2)
assert.Equal(t, "true", res2.Value)
@@ -1163,7 +1163,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
})
assert.NoError(t, err)
res2, nErr = ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, dmChannel.Id)
res2, nErr = ss.Preference().Get(userId, model.PreferenceCategoryFavoriteChannel, dmChannel.Id)
assert.Error(t, nErr)
assert.True(t, errors.Is(nErr, sql.ErrNoRows))
assert.Nil(t, res2)
@@ -1201,7 +1201,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
dmChannel, nErr := ss.Channel().SaveDirectChannel(
&model.Channel{
Name: model.GetDMNameFromIds(userId, otherUserId),
Type: model.CHANNEL_DIRECT,
Type: model.ChannelTypeDirect,
},
&model.ChannelMember{
UserId: userId,
@@ -1223,7 +1223,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
})
assert.NoError(t, err)
res2, nErr := ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, dmChannel.Id)
res2, nErr := ss.Preference().Get(userId, model.PreferenceCategoryFavoriteChannel, dmChannel.Id)
assert.NoError(t, nErr)
assert.NotNil(t, res2)
assert.Equal(t, "true", res2.Value)
@@ -1238,7 +1238,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
assert.NoError(t, err)
assert.Equal(t, []string{dmChannel.Id}, updated[0].Channels)
res2, nErr = ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, dmChannel.Id)
res2, nErr = ss.Preference().Get(userId, model.PreferenceCategoryFavoriteChannel, dmChannel.Id)
assert.NoError(t, nErr)
assert.NotNil(t, res2)
assert.Equal(t, "true", res2.Value)
@@ -1252,7 +1252,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
})
assert.NoError(t, err)
res2, nErr = ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, dmChannel.Id)
res2, nErr = ss.Preference().Get(userId, model.PreferenceCategoryFavoriteChannel, dmChannel.Id)
require.Error(t, nErr)
assert.Nil(t, res2)
@@ -1265,7 +1265,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
})
assert.NoError(t, err)
res2, nErr = ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, dmChannel.Id)
res2, nErr = ss.Preference().Get(userId, model.PreferenceCategoryFavoriteChannel, dmChannel.Id)
require.Error(t, nErr)
assert.Nil(t, res2)
})
@@ -1305,7 +1305,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
// Have both users join a channel
channel, nErr := ss.Channel().Save(&model.Channel{
Name: "channel",
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
TeamId: teamId,
}, 10)
require.NoError(t, nErr)
@@ -1335,12 +1335,12 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
})
assert.NoError(t, err)
res2, nErr := ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, channel.Id)
res2, nErr := ss.Preference().Get(userId, model.PreferenceCategoryFavoriteChannel, channel.Id)
assert.NoError(t, nErr)
assert.NotNil(t, res2)
assert.Equal(t, "true", res2.Value)
res2, nErr = ss.Preference().Get(userId2, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, channel.Id)
res2, nErr = ss.Preference().Get(userId2, model.PreferenceCategoryFavoriteChannel, channel.Id)
assert.True(t, errors.Is(nErr, sql.ErrNoRows))
assert.Nil(t, res2)
@@ -1357,12 +1357,12 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
})
assert.NoError(t, err)
res2, nErr = ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, channel.Id)
res2, nErr = ss.Preference().Get(userId, model.PreferenceCategoryFavoriteChannel, channel.Id)
assert.NoError(t, nErr)
assert.NotNil(t, res2)
assert.Equal(t, "true", res2.Value)
res2, nErr = ss.Preference().Get(userId2, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, channel.Id)
res2, nErr = ss.Preference().Get(userId2, model.PreferenceCategoryFavoriteChannel, channel.Id)
assert.NoError(t, nErr)
assert.NotNil(t, res2)
assert.Equal(t, "true", res2.Value)
@@ -1380,11 +1380,11 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
})
assert.NoError(t, err)
res2, nErr = ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, channel.Id)
res2, nErr = ss.Preference().Get(userId, model.PreferenceCategoryFavoriteChannel, channel.Id)
assert.True(t, errors.Is(nErr, sql.ErrNoRows))
assert.Nil(t, res2)
res2, nErr = ss.Preference().Get(userId2, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, channel.Id)
res2, nErr = ss.Preference().Get(userId2, model.PreferenceCategoryFavoriteChannel, channel.Id)
assert.NoError(t, nErr)
assert.NotNil(t, res2)
assert.Equal(t, "true", res2.Value)
@@ -1402,11 +1402,11 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
})
assert.NoError(t, err)
res2, nErr = ss.Preference().Get(userId, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, channel.Id)
res2, nErr = ss.Preference().Get(userId, model.PreferenceCategoryFavoriteChannel, channel.Id)
assert.True(t, errors.Is(nErr, sql.ErrNoRows))
assert.Nil(t, res2)
res2, nErr = ss.Preference().Get(userId2, model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL, channel.Id)
res2, nErr = ss.Preference().Get(userId2, model.PreferenceCategoryFavoriteChannel, channel.Id)
assert.True(t, errors.Is(nErr, sql.ErrNoRows))
assert.Nil(t, res2)
})
@@ -1418,7 +1418,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
// Create some channels
channel, nErr := ss.Channel().Save(&model.Channel{
Name: "channel",
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
TeamId: teamId,
}, 10)
require.NoError(t, nErr)
@@ -1433,7 +1433,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
dmChannel, nErr := ss.Channel().SaveDirectChannel(
&model.Channel{
Name: model.GetDMNameFromIds(userId, otherUserId),
Type: model.CHANNEL_DIRECT,
Type: model.ChannelTypeDirect,
},
&model.ChannelMember{
UserId: userId,
@@ -1488,7 +1488,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
dmChannel, nErr := ss.Channel().SaveDirectChannel(
&model.Channel{
Name: model.GetDMNameFromIds(userId, otherUserId),
Type: model.CHANNEL_DIRECT,
Type: model.ChannelTypeDirect,
},
&model.ChannelMember{
UserId: userId,
@@ -1577,7 +1577,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
// Join a channel
channel, nErr := ss.Channel().Save(&model.Channel{
Name: "channel",
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
TeamId: teamId,
}, 10)
require.NoError(t, nErr)
@@ -1641,7 +1641,7 @@ func testUpdateSidebarCategories(t *testing.T, ss store.Store) {
// Join a channel
channel, nErr := ss.Channel().Save(&model.Channel{
Name: "channel",
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
TeamId: teamId,
}, 10)
require.NoError(t, nErr)
@@ -1734,7 +1734,7 @@ func testClearSidebarOnTeamLeave(t *testing.T, ss store.Store, s SqlStore) {
channel1, nErr := ss.Channel().Save(&model.Channel{
Name: model.NewId(),
TeamId: teamId,
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}, 1000)
require.NoError(t, nErr)
@@ -1782,7 +1782,7 @@ func testClearSidebarOnTeamLeave(t *testing.T, ss store.Store, s SqlStore) {
channel1, nErr := ss.Channel().Save(&model.Channel{
Name: model.NewId(),
TeamId: teamId,
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}, 1000)
require.NoError(t, nErr)
@@ -1844,7 +1844,7 @@ func testClearSidebarOnTeamLeave(t *testing.T, ss store.Store, s SqlStore) {
channel1, nErr := ss.Channel().Save(&model.Channel{
Name: model.NewId(),
TeamId: teamId,
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}, 1000)
require.NoError(t, nErr)
@@ -1860,7 +1860,7 @@ func testClearSidebarOnTeamLeave(t *testing.T, ss store.Store, s SqlStore) {
channel2, nErr := ss.Channel().Save(&model.Channel{
Name: model.NewId(),
TeamId: teamId2,
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}, 1000)
require.NoError(t, nErr)
@@ -1936,7 +1936,7 @@ func testDeleteSidebarCategory(t *testing.T, ss store.Store, s SqlStore) {
channel1, nErr := ss.Channel().Save(&model.Channel{
Name: model.NewId(),
TeamId: teamId,
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}, 1000)
require.NoError(t, nErr)
defer ss.Channel().PermanentDelete(channel1.Id)
@@ -1944,7 +1944,7 @@ func testDeleteSidebarCategory(t *testing.T, ss store.Store, s SqlStore) {
channel2, nErr := ss.Channel().Save(&model.Channel{
Name: model.NewId(),
TeamId: teamId,
Type: model.CHANNEL_PRIVATE,
Type: model.ChannelTypePrivate,
}, 1000)
require.NoError(t, nErr)
defer ss.Channel().PermanentDelete(channel2.Id)
@@ -2023,7 +2023,7 @@ func testUpdateSidebarChannelsByPreferences(t *testing.T, ss store.Store) {
channel, nErr := ss.Channel().Save(&model.Channel{
Name: "channel",
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
TeamId: teamId,
}, 10)
require.NoError(t, nErr)
@@ -2031,7 +2031,7 @@ func testUpdateSidebarChannelsByPreferences(t *testing.T, ss store.Store) {
err := ss.Channel().UpdateSidebarChannelsByPreferences(&model.Preferences{
model.Preference{
Name: channel.Id,
Category: model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL,
Category: model.PreferenceCategoryFavoriteChannel,
Value: "true",
},
})
@@ -2050,7 +2050,7 @@ func testUpdateSidebarChannelsByPreferences(t *testing.T, ss store.Store) {
_ = ss.Channel().UpdateSidebarChannelsByPreferences(&model.Preferences{
model.Preference{
Name: "fakeid",
Category: model.PREFERENCE_CATEGORY_FAVORITE_CHANNEL,
Category: model.PreferenceCategoryFavoriteChannel,
Value: "true",
},
})
@@ -2068,7 +2068,7 @@ func testSidebarCategoryDeadlock(t *testing.T, ss store.Store) {
// Join a channel
channel, err := ss.Channel().Save(&model.Channel{
Name: "channel",
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
TeamId: teamID,
}, 10)
require.NoError(t, err)

20
store/storetest/command_store.go
Просмотреть файл

@@ -28,7 +28,7 @@ func TestCommandStore(t *testing.T, ss store.Store) {
func testCommandStoreSave(t *testing.T, ss store.Store) {
o1 := model.Command{}
o1.CreatorId = model.NewId()
o1.Method = model.COMMAND_METHOD_POST
o1.Method = model.CommandMethodPost
o1.TeamId = model.NewId()
o1.URL = "http://nowhere.com/"
o1.Trigger = "trigger"
@@ -43,7 +43,7 @@ func testCommandStoreSave(t *testing.T, ss store.Store) {
func testCommandStoreGet(t *testing.T, ss store.Store) {
o1 := &model.Command{}
o1.CreatorId = model.NewId()
o1.Method = model.COMMAND_METHOD_POST
o1.Method = model.CommandMethodPost
o1.TeamId = model.NewId()
o1.URL = "http://nowhere.com/"
o1.Trigger = "trigger"
@@ -64,7 +64,7 @@ func testCommandStoreGet(t *testing.T, ss store.Store) {
func testCommandStoreGetByTeam(t *testing.T, ss store.Store) {
o1 := &model.Command{}
o1.CreatorId = model.NewId()
o1.Method = model.COMMAND_METHOD_POST
o1.Method = model.CommandMethodPost
o1.TeamId = model.NewId()
o1.URL = "http://nowhere.com/"
o1.Trigger = "trigger"
@@ -85,14 +85,14 @@ func testCommandStoreGetByTeam(t *testing.T, ss store.Store) {
func testCommandStoreGetByTrigger(t *testing.T, ss store.Store) {
o1 := &model.Command{}
o1.CreatorId = model.NewId()
o1.Method = model.COMMAND_METHOD_POST
o1.Method = model.CommandMethodPost
o1.TeamId = model.NewId()
o1.URL = "http://nowhere.com/"
o1.Trigger = "trigger1"
o2 := &model.Command{}
o2.CreatorId = model.NewId()
o2.Method = model.COMMAND_METHOD_POST
o2.Method = model.CommandMethodPost
o2.TeamId = model.NewId()
o2.URL = "http://nowhere.com/"
o2.Trigger = "trigger1"
@@ -120,7 +120,7 @@ func testCommandStoreGetByTrigger(t *testing.T, ss store.Store) {
func testCommandStoreDelete(t *testing.T, ss store.Store) {
o1 := &model.Command{}
o1.CreatorId = model.NewId()
o1.Method = model.COMMAND_METHOD_POST
o1.Method = model.CommandMethodPost
o1.TeamId = model.NewId()
o1.URL = "http://nowhere.com/"
o1.Trigger = "trigger"
@@ -144,7 +144,7 @@ func testCommandStoreDelete(t *testing.T, ss store.Store) {
func testCommandStoreDeleteByTeam(t *testing.T, ss store.Store) {
o1 := &model.Command{}
o1.CreatorId = model.NewId()
o1.Method = model.COMMAND_METHOD_POST
o1.Method = model.CommandMethodPost
o1.TeamId = model.NewId()
o1.URL = "http://nowhere.com/"
o1.Trigger = "trigger"
@@ -168,7 +168,7 @@ func testCommandStoreDeleteByTeam(t *testing.T, ss store.Store) {
func testCommandStoreDeleteByUser(t *testing.T, ss store.Store) {
o1 := &model.Command{}
o1.CreatorId = model.NewId()
o1.Method = model.COMMAND_METHOD_POST
o1.Method = model.CommandMethodPost
o1.TeamId = model.NewId()
o1.URL = "http://nowhere.com/"
o1.Trigger = "trigger"
@@ -192,7 +192,7 @@ func testCommandStoreDeleteByUser(t *testing.T, ss store.Store) {
func testCommandStoreUpdate(t *testing.T, ss store.Store) {
o1 := &model.Command{}
o1.CreatorId = model.NewId()
o1.Method = model.COMMAND_METHOD_POST
o1.Method = model.CommandMethodPost
o1.TeamId = model.NewId()
o1.URL = "http://nowhere.com/"
o1.Trigger = "trigger"
@@ -214,7 +214,7 @@ func testCommandStoreUpdate(t *testing.T, ss store.Store) {
func testCommandCount(t *testing.T, ss store.Store) {
o1 := &model.Command{}
o1.CreatorId = model.NewId()
o1.Method = model.COMMAND_METHOD_POST
o1.Method = model.CommandMethodPost
o1.TeamId = model.NewId()
o1.URL = "http://nowhere.com/"
o1.Trigger = "trigger"

2
store/storetest/command_webhook_store.go
Просмотреть файл

@@ -38,7 +38,7 @@ func testCommandWebhookStore(t *testing.T, ss store.Store) {
require.True(t, errors.As(nErr, &nfErr), "Should have set the status as not found for missing id")
h2 := &model.CommandWebhook{}
h2.CreateAt = model.GetMillis() - 2*model.COMMAND_WEBHOOK_LIFETIME
h2.CreateAt = model.GetMillis() - 2*model.CommandWebhookLifetime
h2.CommandId = model.NewId()
h2.UserId = model.NewId()
h2.ChannelId = model.NewId()

52
store/storetest/compliance_store.go
Просмотреть файл

@@ -60,28 +60,28 @@ func TestComplianceStore(t *testing.T, ss store.Store) {
}
func testComplianceStore(t *testing.T, ss store.Store) {
compliance1 := &model.Compliance{Desc: "Audit for federal subpoena case #22443", UserId: model.NewId(), Status: model.COMPLIANCE_STATUS_FAILED, StartAt: model.GetMillis() - 1, EndAt: model.GetMillis() + 1, Type: model.COMPLIANCE_TYPE_ADHOC}
compliance1 := &model.Compliance{Desc: "Audit for federal subpoena case #22443", UserId: model.NewId(), Status: model.ComplianceStatusFailed, StartAt: model.GetMillis() - 1, EndAt: model.GetMillis() + 1, Type: model.ComplianceTypeAdhoc}
_, err := ss.Compliance().Save(compliance1)
require.NoError(t, err)
time.Sleep(100 * time.Millisecond)
compliance2 := &model.Compliance{Desc: "Audit for federal subpoena case #11458", UserId: model.NewId(), Status: model.COMPLIANCE_STATUS_RUNNING, StartAt: model.GetMillis() - 1, EndAt: model.GetMillis() + 1, Type: model.COMPLIANCE_TYPE_ADHOC}
compliance2 := &model.Compliance{Desc: "Audit for federal subpoena case #11458", UserId: model.NewId(), Status: model.ComplianceStatusRunning, StartAt: model.GetMillis() - 1, EndAt: model.GetMillis() + 1, Type: model.ComplianceTypeAdhoc}
_, err = ss.Compliance().Save(compliance2)
require.NoError(t, err)
time.Sleep(100 * time.Millisecond)
compliances, _ := ss.Compliance().GetAll(0, 1000)
require.Equal(t, model.COMPLIANCE_STATUS_RUNNING, compliances[0].Status)
require.Equal(t, model.ComplianceStatusRunning, compliances[0].Status)
require.Equal(t, compliance2.Id, compliances[0].Id)
compliance2.Status = model.COMPLIANCE_STATUS_FAILED
compliance2.Status = model.ComplianceStatusFailed
_, err = ss.Compliance().Update(compliance2)
require.NoError(t, err)
compliances, _ = ss.Compliance().GetAll(0, 1000)
require.Equal(t, model.COMPLIANCE_STATUS_FAILED, compliances[0].Status)
require.Equal(t, model.ComplianceStatusFailed, compliances[0].Status)
require.Equal(t, compliance2.Id, compliances[0].Id)
compliances, _ = ss.Compliance().GetAll(0, 1)
@@ -106,7 +106,7 @@ func testComplianceExport(t *testing.T, ss store.Store) {
t1.DisplayName = "DisplayName"
t1.Name = "zz" + model.NewId() + "b"
t1.Email = MakeEmail()
t1.Type = model.TEAM_OPEN
t1.Type = model.TeamOpen
t1, err := ss.Team().Save(t1)
require.NoError(t, err)
@@ -130,7 +130,7 @@ func testComplianceExport(t *testing.T, ss store.Store) {
c1.TeamId = t1.Id
c1.DisplayName = "Channel2"
c1.Name = "zz" + model.NewId() + "b"
c1.Type = model.CHANNEL_OPEN
c1.Type = model.ChannelTypeOpen
c1, nErr = ss.Channel().Save(c1, -1)
require.NoError(t, nErr)
@@ -235,7 +235,7 @@ func testComplianceExportDirectMessages(t *testing.T, ss store.Store) {
t1.DisplayName = "DisplayName"
t1.Name = "zz" + model.NewId() + "b"
t1.Email = MakeEmail()
t1.Type = model.TEAM_OPEN
t1.Type = model.TeamOpen
t1, err := ss.Team().Save(t1)
require.NoError(t, err)
@@ -259,7 +259,7 @@ func testComplianceExportDirectMessages(t *testing.T, ss store.Store) {
c1.TeamId = t1.Id
c1.DisplayName = "Channel2"
c1.Name = "zz" + model.NewId() + "b"
c1.Type = model.CHANNEL_OPEN
c1.Type = model.ChannelTypeOpen
c1, nErr = ss.Channel().Save(c1, -1)
require.NoError(t, nErr)
@@ -403,7 +403,7 @@ func testMessageExportPublicChannel(t *testing.T, ss store.Store) {
DisplayName: "DisplayName",
Name: "zz" + model.NewId() + "b",
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
}
team, err = ss.Team().Save(team)
require.NoError(t, err)
@@ -438,7 +438,7 @@ func testMessageExportPublicChannel(t *testing.T, ss store.Store) {
TeamId: team.Id,
Name: model.NewId(),
DisplayName: "Public Channel",
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
channel, nErr = ss.Channel().Save(channel, -1)
require.NoError(t, nErr)
@@ -507,7 +507,7 @@ func testMessageExportPrivateChannel(t *testing.T, ss store.Store) {
DisplayName: "DisplayName",
Name: "zz" + model.NewId() + "b",
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
}
team, err = ss.Team().Save(team)
require.NoError(t, err)
@@ -542,7 +542,7 @@ func testMessageExportPrivateChannel(t *testing.T, ss store.Store) {
TeamId: team.Id,
Name: model.NewId(),
DisplayName: "Private Channel",
Type: model.CHANNEL_PRIVATE,
Type: model.ChannelTypePrivate,
}
channel, nErr = ss.Channel().Save(channel, -1)
require.NoError(t, nErr)
@@ -613,7 +613,7 @@ func testMessageExportDirectMessageChannel(t *testing.T, ss store.Store) {
DisplayName: "DisplayName",
Name: "zz" + model.NewId() + "b",
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
}
team, err = ss.Team().Save(team)
require.NoError(t, err)
@@ -694,7 +694,7 @@ func testMessageExportGroupMessageChannel(t *testing.T, ss store.Store) {
DisplayName: "DisplayName",
Name: "zz" + model.NewId() + "b",
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
}
team, err = ss.Team().Save(team)
require.NoError(t, err)
@@ -740,7 +740,7 @@ func testMessageExportGroupMessageChannel(t *testing.T, ss store.Store) {
groupMessageChannel := &model.Channel{
TeamId: team.Id,
Name: model.NewId(),
Type: model.CHANNEL_GROUP,
Type: model.ChannelTypeGroup,
}
groupMessageChannel, nErr = ss.Channel().Save(groupMessageChannel, -1)
require.NoError(t, nErr)
@@ -791,7 +791,7 @@ func testEditExportMessage(t *testing.T, ss store.Store) {
DisplayName: "DisplayName",
Name: "zz" + model.NewId() + "b",
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
}
team, err = ss.Team().Save(team)
require.NoError(t, err)
@@ -814,7 +814,7 @@ func testEditExportMessage(t *testing.T, ss store.Store) {
TeamId: team.Id,
Name: model.NewId(),
DisplayName: "Public Channel",
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
channel, nErr = ss.Channel().Save(channel, -1)
require.NoError(t, nErr)
@@ -883,7 +883,7 @@ func testEditAfterExportMessage(t *testing.T, ss store.Store) {
DisplayName: "DisplayName",
Name: "zz" + model.NewId() + "b",
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
}
team, err = ss.Team().Save(team)
require.NoError(t, err)
@@ -906,7 +906,7 @@ func testEditAfterExportMessage(t *testing.T, ss store.Store) {
TeamId: team.Id,
Name: model.NewId(),
DisplayName: "Public Channel",
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
channel, nErr = ss.Channel().Save(channel, -1)
require.NoError(t, nErr)
@@ -994,7 +994,7 @@ func testDeleteExportMessage(t *testing.T, ss store.Store) {
DisplayName: "DisplayName",
Name: "zz" + model.NewId() + "b",
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
}
team, err = ss.Team().Save(team)
require.NoError(t, err)
@@ -1017,7 +1017,7 @@ func testDeleteExportMessage(t *testing.T, ss store.Store) {
TeamId: team.Id,
Name: model.NewId(),
DisplayName: "Public Channel",
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
channel, nErr = ss.Channel().Save(channel, -1)
require.NoError(t, nErr)
@@ -1054,7 +1054,7 @@ func testDeleteExportMessage(t *testing.T, ss store.Store) {
e := json.Unmarshal([]byte(*v.PostProps), &props)
require.NoError(t, e)
_, ok := props[model.POST_PROPS_DELETE_BY]
_, ok := props[model.PostPropsDeleteBy]
assert.True(t, ok)
assert.Equal(t, post1.Message, *v.PostMessage)
@@ -1079,7 +1079,7 @@ func testDeleteAfterExportMessage(t *testing.T, ss store.Store) {
DisplayName: "DisplayName",
Name: "zz" + model.NewId() + "b",
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
}
team, err = ss.Team().Save(team)
require.NoError(t, err)
@@ -1102,7 +1102,7 @@ func testDeleteAfterExportMessage(t *testing.T, ss store.Store) {
TeamId: team.Id,
Name: model.NewId(),
DisplayName: "Public Channel",
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
channel, nErr = ss.Channel().Save(channel, -1)
require.NoError(t, nErr)
@@ -1157,7 +1157,7 @@ func testDeleteAfterExportMessage(t *testing.T, ss store.Store) {
e := json.Unmarshal([]byte(*v.PostProps), &props)
require.NoError(t, e)
_, ok := props[model.POST_PROPS_DELETE_BY]
_, ok := props[model.PostPropsDeleteBy]
assert.True(t, ok)
assert.Equal(t, post1.Message, *v.PostMessage)

4
store/storetest/emoji_store.go
Просмотреть файл

@@ -223,14 +223,14 @@ func testEmojiGetList(t *testing.T, ss store.Store) {
require.Truef(t, found, "failed to get emoji with id %v", emoji.Id)
}
remojis, err := ss.Emoji().GetList(0, 3, model.EMOJI_SORT_BY_NAME)
remojis, err := ss.Emoji().GetList(0, 3, model.EmojiSortByName)
assert.NoError(t, err)
assert.Equal(t, 3, len(remojis))
assert.Equal(t, emojis[0].Name, remojis[0].Name)
assert.Equal(t, emojis[1].Name, remojis[1].Name)
assert.Equal(t, emojis[2].Name, remojis[2].Name)
remojis, err = ss.Emoji().GetList(1, 2, model.EMOJI_SORT_BY_NAME)
remojis, err = ss.Emoji().GetList(1, 2, model.EmojiSortByName)
assert.NoError(t, err)
assert.Equal(t, 2, len(remojis))
assert.Equal(t, emojis[1].Name, remojis[0].Name)

10
store/storetest/file_info_store.go
Просмотреть файл

@@ -357,7 +357,7 @@ func testFileInfoGetWithOptions(t *testing.T, ss store.Store) {
PerPage: 10,
Opt: &model.GetFileInfosOptions{
IncludeDeleted: true,
SortBy: model.FILEINFO_SORT_BY_CREATED,
SortBy: model.FileinfoSortByCreated,
},
ExpectedFileIds: []string{file1_1.Id, file1_2.Id, file1_3.Id, file2_1.Id, file2_2.Id},
},
@@ -367,7 +367,7 @@ func testFileInfoGetWithOptions(t *testing.T, ss store.Store) {
PerPage: 10,
Opt: &model.GetFileInfosOptions{
UserIds: []string{userId1},
SortBy: model.FILEINFO_SORT_BY_CREATED,
SortBy: model.FileinfoSortByCreated,
SortDescending: true,
},
ExpectedFileIds: []string{file1_3.Id, file1_2.Id, file1_1.Id},
@@ -378,7 +378,7 @@ func testFileInfoGetWithOptions(t *testing.T, ss store.Store) {
PerPage: 3,
Opt: &model.GetFileInfosOptions{
IncludeDeleted: true,
SortBy: model.FILEINFO_SORT_BY_CREATED,
SortBy: model.FileinfoSortByCreated,
SortDescending: true,
},
ExpectedFileIds: []string{file1_2.Id, file1_1.Id},
@@ -610,14 +610,14 @@ func testFileInfoStoreGetFilesBatchForIndexing(t *testing.T, ss store.Store) {
c1.TeamId = model.NewId()
c1.DisplayName = "Channel1"
c1.Name = "zz" + model.NewId() + "b"
c1.Type = model.CHANNEL_OPEN
c1.Type = model.ChannelTypeOpen
c1, _ = ss.Channel().Save(c1, -1)
c2 := &model.Channel{}
c2.TeamId = model.NewId()
c2.DisplayName = "Channel2"
c2.Name = "zz" + model.NewId() + "b"
c2.Type = model.CHANNEL_OPEN
c2.Type = model.ChannelTypeOpen
c2, _ = ss.Channel().Save(c2, -1)
o1 := &model.Post{}

92
store/storetest/group_store.go
Просмотреть файл

@@ -702,7 +702,7 @@ func testGroupGetMemberUsersInTeam(t *testing.T, ss store.Store) {
CompanyName: "Some company name",
Name: "z-z-" + model.NewId() + "a",
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
}
team, err := ss.Team().Save(team)
require.NoError(t, err)
@@ -788,7 +788,7 @@ func testGroupGetMemberUsersNotInChannel(t *testing.T, ss store.Store) {
CompanyName: "Some company name",
Name: "z-z-" + model.NewId() + "a",
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
}
team, err := ss.Team().Save(team)
require.NoError(t, err)
@@ -839,7 +839,7 @@ func testGroupGetMemberUsersNotInChannel(t *testing.T, ss store.Store) {
TeamId: team.Id,
DisplayName: "Channel",
Name: model.NewId(),
Type: model.CHANNEL_OPEN, // Query does not look at type so this shouldn't matter.
Type: model.ChannelTypeOpen, // Query does not look at type so this shouldn't matter.
}
channel, nErr := ss.Channel().Save(channel, 9999)
require.NoError(t, nErr)
@@ -1085,7 +1085,7 @@ func testCreateGroupSyncable(t *testing.T, ss store.Store) {
InviteId: "inviteid0",
Name: "z-z-" + model.NewId() + "a",
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
}
team, nErr := ss.Team().Save(t1)
require.NoError(t, nErr)
@@ -1122,7 +1122,7 @@ func testGetGroupSyncable(t *testing.T, ss store.Store) {
InviteId: "inviteid0",
Name: "z-z-" + model.NewId() + "a",
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
}
team, nErr := ss.Team().Save(t1)
require.NoError(t, nErr)
@@ -1170,7 +1170,7 @@ func testGetAllGroupSyncablesByGroup(t *testing.T, ss store.Store) {
InviteId: "inviteid0",
Name: "z-z-" + model.NewId() + "a",
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
}
var team *model.Team
team, nErr := ss.Team().Save(t1)
@@ -1222,7 +1222,7 @@ func testUpdateGroupSyncable(t *testing.T, ss store.Store) {
InviteId: "inviteid0",
Name: "z-z-" + model.NewId() + "a",
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
}
team, nErr := ss.Team().Save(t1)
require.NoError(t, nErr)
@@ -1290,7 +1290,7 @@ func testDeleteGroupSyncable(t *testing.T, ss store.Store) {
InviteId: "inviteid0",
Name: "z-z-" + model.NewId() + "a",
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
}
team, nErr := ss.Team().Save(t1)
require.NoError(t, nErr)
@@ -1357,7 +1357,7 @@ func testTeamMembersToAdd(t *testing.T, ss store.Store) {
InviteId: "inviteid0",
Name: "z-z-" + model.NewId() + "a",
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
}
team, nErr = ss.Team().Save(team)
require.NoError(t, nErr)
@@ -1558,7 +1558,7 @@ func testTeamMembersToAddSingleTeam(t *testing.T, ss store.Store) {
InviteId: "inviteid0",
Name: "z-z-" + model.NewId() + "a",
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
}
team1, nErr = ss.Team().Save(team1)
require.NoError(t, nErr)
@@ -1571,7 +1571,7 @@ func testTeamMembersToAddSingleTeam(t *testing.T, ss store.Store) {
InviteId: "inviteid0",
Name: "z-z-" + model.NewId() + "a",
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
}
team2, nErr = ss.Team().Save(team2)
require.NoError(t, nErr)
@@ -1622,7 +1622,7 @@ func testChannelMembersToAdd(t *testing.T, ss store.Store) {
TeamId: model.NewId(),
DisplayName: "A Name",
Name: model.NewId(),
Type: model.CHANNEL_OPEN, // Query does not look at type so this shouldn't matter.
Type: model.ChannelTypeOpen, // Query does not look at type so this shouldn't matter.
}
channel, nErr = ss.Channel().Save(channel, 9999)
require.NoError(t, nErr)
@@ -1820,7 +1820,7 @@ func testChannelMembersToAddSingleChannel(t *testing.T, ss store.Store) {
channel1 := &model.Channel{
DisplayName: "Name",
Name: "z-z-" + model.NewId() + "a",
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
channel1, nErr = ss.Channel().Save(channel1, 999)
require.NoError(t, nErr)
@@ -1828,7 +1828,7 @@ func testChannelMembersToAddSingleChannel(t *testing.T, ss store.Store) {
channel2 := &model.Channel{
DisplayName: "Name",
Name: "z-z-" + model.NewId() + "a",
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
channel2, nErr = ss.Channel().Save(channel2, 999)
require.NoError(t, nErr)
@@ -1957,7 +1957,7 @@ func testTeamMembersToRemoveSingleTeam(t *testing.T, ss store.Store) {
InviteId: "inviteid0",
Name: "z-z-" + model.NewId() + "a",
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
GroupConstrained: model.NewBool(true),
}
team1, nErr := ss.Team().Save(team1)
@@ -1971,7 +1971,7 @@ func testTeamMembersToRemoveSingleTeam(t *testing.T, ss store.Store) {
InviteId: "inviteid0",
Name: "z-z-" + model.NewId() + "a",
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
GroupConstrained: model.NewBool(true),
}
team2, nErr = ss.Team().Save(team2)
@@ -2104,7 +2104,7 @@ func testChannelMembersToRemoveSingleChannel(t *testing.T, ss store.Store) {
channel1 := &model.Channel{
DisplayName: "Name",
Name: "z-z-" + model.NewId() + "a",
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
GroupConstrained: model.NewBool(true),
}
channel1, nErr := ss.Channel().Save(channel1, 999)
@@ -2113,7 +2113,7 @@ func testChannelMembersToRemoveSingleChannel(t *testing.T, ss store.Store) {
channel2 := &model.Channel{
DisplayName: "Name",
Name: "z-z-" + model.NewId() + "a",
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
GroupConstrained: model.NewBool(true),
}
channel2, nErr = ss.Channel().Save(channel2, 999)
@@ -2206,7 +2206,7 @@ func pendingMemberRemovalsDataSetup(t *testing.T, ss store.Store) *removalsData
TeamId: model.NewId(),
DisplayName: "A Name",
Name: model.NewId(),
Type: model.CHANNEL_PRIVATE,
Type: model.ChannelTypePrivate,
GroupConstrained: model.NewBool(true),
}
channelConstrained, nErr = ss.Channel().Save(channelConstrained, 9999)
@@ -2216,7 +2216,7 @@ func pendingMemberRemovalsDataSetup(t *testing.T, ss store.Store) *removalsData
TeamId: model.NewId(),
DisplayName: "A Name",
Name: model.NewId(),
Type: model.CHANNEL_PRIVATE,
Type: model.ChannelTypePrivate,
}
channelUnconstrained, nErr = ss.Channel().Save(channelUnconstrained, 9999)
require.NoError(t, nErr)
@@ -2230,7 +2230,7 @@ func pendingMemberRemovalsDataSetup(t *testing.T, ss store.Store) *removalsData
InviteId: "inviteid0",
Name: "z-z-" + model.NewId() + "a",
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_INVITE,
Type: model.TeamInvite,
GroupConstrained: model.NewBool(true),
}
teamConstrained, nErr = ss.Team().Save(teamConstrained)
@@ -2244,7 +2244,7 @@ func pendingMemberRemovalsDataSetup(t *testing.T, ss store.Store) *removalsData
InviteId: "inviteid1",
Name: "z-z-" + model.NewId() + "a",
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_INVITE,
Type: model.TeamInvite,
}
teamUnconstrained, nErr = ss.Team().Save(teamUnconstrained)
require.NoError(t, nErr)
@@ -2318,7 +2318,7 @@ func testGetGroupsByChannel(t *testing.T, ss store.Store) {
TeamId: model.NewId(),
DisplayName: "Channel1",
Name: model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
channel1, err := ss.Channel().Save(channel1, 9999)
require.NoError(t, err)
@@ -2368,7 +2368,7 @@ func testGetGroupsByChannel(t *testing.T, ss store.Store) {
TeamId: model.NewId(),
DisplayName: "Channel2",
Name: model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
channel2, nErr := ss.Channel().Save(channel2, 9999)
require.NoError(t, nErr)
@@ -2556,7 +2556,7 @@ func testGetGroupsAssociatedToChannelsByTeam(t *testing.T, ss store.Store) {
InviteId: model.NewId(),
Name: "zz" + model.NewId(),
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
}
team1, errt := ss.Team().Save(team1)
require.NoError(t, errt)
@@ -2566,7 +2566,7 @@ func testGetGroupsAssociatedToChannelsByTeam(t *testing.T, ss store.Store) {
TeamId: team1.Id,
DisplayName: "Channel1",
Name: model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
channel1, err := ss.Channel().Save(channel1, 9999)
require.NoError(t, err)
@@ -2616,7 +2616,7 @@ func testGetGroupsAssociatedToChannelsByTeam(t *testing.T, ss store.Store) {
TeamId: team1.Id,
DisplayName: "Channel2",
Name: model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
channel2, err = ss.Channel().Save(channel2, 9999)
require.NoError(t, err)
@@ -2799,7 +2799,7 @@ func testGetGroupsByTeam(t *testing.T, ss store.Store) {
InviteId: model.NewId(),
Name: "zz" + model.NewId(),
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
}
team1, err := ss.Team().Save(team1)
require.NoError(t, err)
@@ -2853,7 +2853,7 @@ func testGetGroupsByTeam(t *testing.T, ss store.Store) {
InviteId: model.NewId(),
Name: "zz" + model.NewId(),
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_INVITE,
Type: model.TeamInvite,
}
team2, err = ss.Team().Save(team2)
require.NoError(t, err)
@@ -3045,7 +3045,7 @@ func testGetGroups(t *testing.T, ss store.Store) {
InviteId: model.NewId(),
Name: "zz" + model.NewId(),
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
GroupConstrained: model.NewBool(true),
}
team1, err := ss.Team().Save(team1)
@@ -3058,7 +3058,7 @@ func testGetGroups(t *testing.T, ss store.Store) {
TeamId: model.NewId(),
DisplayName: "Channel1",
Name: model.NewId(),
Type: model.CHANNEL_PRIVATE,
Type: model.ChannelTypePrivate,
}
channel1, nErr := ss.Channel().Save(channel1, 9999)
require.NoError(t, nErr)
@@ -3112,7 +3112,7 @@ func testGetGroups(t *testing.T, ss store.Store) {
InviteId: model.NewId(),
Name: "zz" + model.NewId(),
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_INVITE,
Type: model.TeamInvite,
}
team2, err = ss.Team().Save(team2)
require.NoError(t, err)
@@ -3122,7 +3122,7 @@ func testGetGroups(t *testing.T, ss store.Store) {
TeamId: model.NewId(),
DisplayName: "Channel2",
Name: model.NewId(),
Type: model.CHANNEL_PRIVATE,
Type: model.ChannelTypePrivate,
}
channel2, nErr = ss.Channel().Save(channel2, 9999)
require.NoError(t, nErr)
@@ -3132,7 +3132,7 @@ func testGetGroups(t *testing.T, ss store.Store) {
TeamId: team1.Id,
DisplayName: "Channel3",
Name: model.NewId(),
Type: model.CHANNEL_PRIVATE,
Type: model.ChannelTypePrivate,
}
channel3, nErr = ss.Channel().Save(channel3, 9999)
require.NoError(t, nErr)
@@ -3216,7 +3216,7 @@ func testGetGroups(t *testing.T, ss store.Store) {
InviteId: model.NewId(),
Name: "zz" + model.NewId(),
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_INVITE,
Type: model.TeamInvite,
}
team3, err = ss.Team().Save(team3)
require.NoError(t, err)
@@ -3225,7 +3225,7 @@ func testGetGroups(t *testing.T, ss store.Store) {
TeamId: team3.Id,
DisplayName: "Channel4",
Name: model.NewId(),
Type: model.CHANNEL_PRIVATE,
Type: model.ChannelTypePrivate,
}
channel4, nErr = ss.Channel().Save(channel4, 9999)
require.NoError(t, nErr)
@@ -3475,7 +3475,7 @@ func testTeamMembersMinusGroupMembers(t *testing.T, ss store.Store) {
InviteId: model.NewId(),
Name: "zz" + model.NewId(),
Email: model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
GroupConstrained: model.NewBool(true),
}
team, err := ss.Team().Save(team)
@@ -3627,7 +3627,7 @@ func testChannelMembersMinusGroupMembers(t *testing.T, ss store.Store) {
TeamId: model.NewId(),
DisplayName: "A Name",
Name: model.NewId(),
Type: model.CHANNEL_PRIVATE,
Type: model.ChannelTypePrivate,
GroupConstrained: model.NewBool(true),
}
channel, err := ss.Channel().Save(channel, 9999)
@@ -3855,7 +3855,7 @@ func groupTestAdminRoleGroupsForSyncableMemberChannel(t *testing.T, ss store.Sto
TeamId: model.NewId(),
DisplayName: "A Name",
Name: model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
channel, nErr := ss.Channel().Save(channel, 9999)
require.NoError(t, nErr)
@@ -3942,7 +3942,7 @@ func groupTestAdminRoleGroupsForSyncableMemberTeam(t *testing.T, ss store.Store)
team := &model.Team{
DisplayName: "A Name",
Name: "zz" + model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
team, nErr := ss.Team().Save(team)
require.NoError(t, nErr)
@@ -4045,7 +4045,7 @@ func groupTestPermittedSyncableAdminsTeam(t *testing.T, ss store.Store) {
team := &model.Team{
DisplayName: "A Name",
Name: "zz" + model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
team, nErr := ss.Team().Save(team)
require.NoError(t, nErr)
@@ -4152,7 +4152,7 @@ func groupTestPermittedSyncableAdminsChannel(t *testing.T, ss store.Store) {
TeamId: model.NewId(),
DisplayName: "A Name",
Name: model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
channel, nErr := ss.Channel().Save(channel, 9999)
require.NoError(t, nErr)
@@ -4214,7 +4214,7 @@ func groupTestpUpdateMembersRoleTeam(t *testing.T, ss store.Store) {
InviteId: "inviteid0",
Name: "z-z-" + model.NewId() + "a",
Email: "success+" + model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
}
team, err := ss.Team().Save(team)
require.NoError(t, err)
@@ -4314,7 +4314,7 @@ func groupTestpUpdateMembersRoleChannel(t *testing.T, ss store.Store) {
TeamId: model.NewId(),
DisplayName: "A Name",
Name: model.NewId(),
Type: model.CHANNEL_OPEN, // Query does not look at type so this shouldn't matter.
Type: model.ChannelTypeOpen, // Query does not look at type so this shouldn't matter.
}
channel, err := ss.Channel().Save(channel, 9999)
require.NoError(t, err)
@@ -4455,7 +4455,7 @@ func groupTestGroupTeamCount(t *testing.T, ss store.Store) {
InviteId: model.NewId(),
Name: "zz" + model.NewId(),
Email: model.NewId() + "@simulator.amazonses.com",
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
})
require.NoError(t, err)
defer ss.Team().PermanentDelete(team.Id)
@@ -4500,7 +4500,7 @@ func groupTestGroupChannelCount(t *testing.T, ss store.Store) {
TeamId: model.NewId(),
DisplayName: model.NewId(),
Name: model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}, 9999)
require.NoError(t, err)
defer ss.Channel().Delete(channel.Id, 0)

30
store/storetest/job_store.go
Просмотреть файл

@@ -445,9 +445,9 @@ func testJobStoreGetCountByStatusAndType(t *testing.T, ss store.Store) {
func testJobUpdateOptimistically(t *testing.T, ss store.Store) {
job := &model.Job{
Id: model.NewId(),
Type: model.JOB_TYPE_DATA_RETENTION,
Type: model.JobTypeDataRetention,
CreateAt: model.GetMillis(),
Status: model.JOB_STATUS_PENDING,
Status: model.JobStatusPending,
}
_, err := ss.Job().Save(job)
@@ -455,18 +455,18 @@ func testJobUpdateOptimistically(t *testing.T, ss store.Store) {
defer ss.Job().Delete(job.Id)
job.LastActivityAt = model.GetMillis()
job.Status = model.JOB_STATUS_IN_PROGRESS
job.Status = model.JobStatusInProgress
job.Progress = 50
job.Data = map[string]string{
"Foo": "Bar",
}
updated, err := ss.Job().UpdateOptimistically(job, model.JOB_STATUS_SUCCESS)
updated, err := ss.Job().UpdateOptimistically(job, model.JobStatusSuccess)
require.False(t, err != nil && updated)
time.Sleep(2 * time.Millisecond)
updated, err = ss.Job().UpdateOptimistically(job, model.JOB_STATUS_PENDING)
updated, err = ss.Job().UpdateOptimistically(job, model.JobStatusPending)
require.NoError(t, err)
require.True(t, updated)
@@ -484,9 +484,9 @@ func testJobUpdateOptimistically(t *testing.T, ss store.Store) {
func testJobUpdateStatusUpdateStatusOptimistically(t *testing.T, ss store.Store) {
job := &model.Job{
Id: model.NewId(),
Type: model.JOB_TYPE_DATA_RETENTION,
Type: model.JobTypeDataRetention,
CreateAt: model.GetMillis(),
Status: model.JOB_STATUS_SUCCESS,
Status: model.JobStatusSuccess,
}
var lastUpdateAt int64
@@ -498,35 +498,35 @@ func testJobUpdateStatusUpdateStatusOptimistically(t *testing.T, ss store.Store)
time.Sleep(2 * time.Millisecond)
received, err = ss.Job().UpdateStatus(job.Id, model.JOB_STATUS_PENDING)
received, err = ss.Job().UpdateStatus(job.Id, model.JobStatusPending)
require.NoError(t, err)
require.Equal(t, model.JOB_STATUS_PENDING, received.Status)
require.Equal(t, model.JobStatusPending, received.Status)
require.Greater(t, received.LastActivityAt, lastUpdateAt)
lastUpdateAt = received.LastActivityAt
time.Sleep(2 * time.Millisecond)
updated, err := ss.Job().UpdateStatusOptimistically(job.Id, model.JOB_STATUS_IN_PROGRESS, model.JOB_STATUS_SUCCESS)
updated, err := ss.Job().UpdateStatusOptimistically(job.Id, model.JobStatusInProgress, model.JobStatusSuccess)
require.NoError(t, err)
require.False(t, updated)
received, err = ss.Job().Get(job.Id)
require.NoError(t, err)
require.Equal(t, model.JOB_STATUS_PENDING, received.Status)
require.Equal(t, model.JobStatusPending, received.Status)
require.Equal(t, received.LastActivityAt, lastUpdateAt)
time.Sleep(2 * time.Millisecond)
updated, err = ss.Job().UpdateStatusOptimistically(job.Id, model.JOB_STATUS_PENDING, model.JOB_STATUS_IN_PROGRESS)
updated, err = ss.Job().UpdateStatusOptimistically(job.Id, model.JobStatusPending, model.JobStatusInProgress)
require.NoError(t, err)
require.True(t, updated, "should have succeeded")
var startAtSet int64
received, err = ss.Job().Get(job.Id)
require.NoError(t, err)
require.Equal(t, model.JOB_STATUS_IN_PROGRESS, received.Status)
require.Equal(t, model.JobStatusInProgress, received.Status)
require.NotEqual(t, 0, received.StartAt)
require.Greater(t, received.LastActivityAt, lastUpdateAt)
lastUpdateAt = received.LastActivityAt
@@ -534,13 +534,13 @@ func testJobUpdateStatusUpdateStatusOptimistically(t *testing.T, ss store.Store)
time.Sleep(2 * time.Millisecond)
updated, err = ss.Job().UpdateStatusOptimistically(job.Id, model.JOB_STATUS_IN_PROGRESS, model.JOB_STATUS_SUCCESS)
updated, err = ss.Job().UpdateStatusOptimistically(job.Id, model.JobStatusInProgress, model.JobStatusSuccess)
require.NoError(t, err)
require.True(t, updated, "should have succeeded")
received, err = ss.Job().Get(job.Id)
require.NoError(t, err)
require.Equal(t, model.JOB_STATUS_SUCCESS, received.Status)
require.Equal(t, model.JobStatusSuccess, received.Status)
require.Equal(t, startAtSet, received.StartAt)
require.Greater(t, received.LastActivityAt, lastUpdateAt)
}

20
store/storetest/link_metadata_store.go
Просмотреть файл

@@ -35,7 +35,7 @@ func testLinkMetadataStoreSave(t *testing.T, ss store.Store) {
metadata := &model.LinkMetadata{
URL: "http://example.com",
Timestamp: getNextLinkMetadataTimestamp(),
Type: model.LINK_METADATA_TYPE_IMAGE,
Type: model.LinkMetadataTypeImage,
Data: &model.PostImage{},
}
@@ -62,7 +62,7 @@ func testLinkMetadataStoreSave(t *testing.T, ss store.Store) {
metadata := &model.LinkMetadata{
URL: "http://example.com",
Timestamp: getNextLinkMetadataTimestamp(),
Type: model.LINK_METADATA_TYPE_IMAGE,
Type: model.LinkMetadataTypeImage,
Data: &model.PostImage{},
}
@@ -81,7 +81,7 @@ func testLinkMetadataStoreSave(t *testing.T, ss store.Store) {
metadata := &model.LinkMetadata{
URL: "http://example.com",
Timestamp: getNextLinkMetadataTimestamp(),
Type: model.LINK_METADATA_TYPE_IMAGE,
Type: model.LinkMetadataTypeImage,
Data: &model.PostImage{},
}
@@ -100,7 +100,7 @@ func testLinkMetadataStoreSave(t *testing.T, ss store.Store) {
metadata := &model.LinkMetadata{
URL: "http://example.com",
Timestamp: getNextLinkMetadataTimestamp(),
Type: model.LINK_METADATA_TYPE_IMAGE,
Type: model.LinkMetadataTypeImage,
Data: &model.PostImage{},
}
@@ -126,7 +126,7 @@ func testLinkMetadataStoreGet(t *testing.T, ss store.Store) {
metadata := &model.LinkMetadata{
URL: "http://example.com",
Timestamp: getNextLinkMetadataTimestamp(),
Type: model.LINK_METADATA_TYPE_IMAGE,
Type: model.LinkMetadataTypeImage,
Data: &model.PostImage{},
}
@@ -144,7 +144,7 @@ func testLinkMetadataStoreGet(t *testing.T, ss store.Store) {
metadata := &model.LinkMetadata{
URL: "http://example.com",
Timestamp: getNextLinkMetadataTimestamp(),
Type: model.LINK_METADATA_TYPE_IMAGE,
Type: model.LinkMetadataTypeImage,
Data: &model.PostImage{},
}
@@ -162,7 +162,7 @@ func testLinkMetadataStoreGet(t *testing.T, ss store.Store) {
metadata := &model.LinkMetadata{
URL: "http://example.com",
Timestamp: getNextLinkMetadataTimestamp(),
Type: model.LINK_METADATA_TYPE_IMAGE,
Type: model.LinkMetadataTypeImage,
Data: &model.PostImage{},
}
@@ -182,7 +182,7 @@ func testLinkMetadataStoreTypes(t *testing.T, ss store.Store) {
metadata := &model.LinkMetadata{
URL: "http://example.com",
Timestamp: getNextLinkMetadataTimestamp(),
Type: model.LINK_METADATA_TYPE_IMAGE,
Type: model.LinkMetadataTypeImage,
Data: &model.PostImage{
Width: 123,
Height: 456,
@@ -215,7 +215,7 @@ func testLinkMetadataStoreTypes(t *testing.T, ss store.Store) {
metadata := &model.LinkMetadata{
URL: "http://example.com",
Timestamp: getNextLinkMetadataTimestamp(),
Type: model.LINK_METADATA_TYPE_OPENGRAPH,
Type: model.LinkMetadataTypeOpengraph,
Data: og,
}
@@ -236,7 +236,7 @@ func testLinkMetadataStoreTypes(t *testing.T, ss store.Store) {
metadata := &model.LinkMetadata{
URL: "http://example.com",
Timestamp: getNextLinkMetadataTimestamp(),
Type: model.LINK_METADATA_TYPE_NONE,
Type: model.LinkMetadataTypeNone,
Data: nil,
}

4
store/storetest/oauth_store.go
Просмотреть файл

@@ -302,7 +302,7 @@ func testOAuthGetAuthorizedApps(t *testing.T, ss store.Store) {
// allow the app
p := model.Preference{}
p.UserId = a1.CreatorId
p.Category = model.PREFERENCE_CATEGORY_AUTHORIZED_OAUTH_APP
p.Category = model.PreferenceCategoryAuthorizedOAuthApp
p.Name = a1.Id
p.Value = "true"
nErr := ss.Preference().Save(&model.Preferences{p})
@@ -325,7 +325,7 @@ func testOAuthGetAccessDataByUserForApp(t *testing.T, ss store.Store) {
// allow the app
p := model.Preference{}
p.UserId = a1.CreatorId
p.Category = model.PREFERENCE_CATEGORY_AUTHORIZED_OAUTH_APP
p.Category = model.PreferenceCategoryAuthorizedOAuthApp
p.Name = a1.Id
p.Value = "true"
nErr := ss.Preference().Save(&model.Preferences{p})

78
store/storetest/post_store.go
Просмотреть файл

@@ -148,7 +148,7 @@ func testPostStoreSave(t *testing.T, ss store.Store) {
channel := model.Channel{}
channel.Name = "zz" + model.NewId() + "b"
channel.DisplayName = "zz" + model.NewId() + "b"
channel.Type = model.CHANNEL_OPEN
channel.Type = model.ChannelTypeOpen
_, err := ss.Channel().Save(&channel, 100)
require.NoError(t, err)
@@ -328,7 +328,7 @@ func testPostStoreSaveMultiple(t *testing.T, ss store.Store) {
channel := model.Channel{}
channel.Name = "zz" + model.NewId() + "b"
channel.DisplayName = "zz" + model.NewId() + "b"
channel.Type = model.CHANNEL_OPEN
channel.Type = model.ChannelTypeOpen
_, err := ss.Channel().Save(&channel, 100)
require.NoError(t, err)
@@ -360,7 +360,7 @@ func testPostStoreSaveMultiple(t *testing.T, ss store.Store) {
}
func testPostStoreSaveChannelMsgCounts(t *testing.T, ss store.Store) {
c1 := &model.Channel{Name: model.NewId(), DisplayName: "posttestchannel", Type: model.CHANNEL_OPEN}
c1 := &model.Channel{Name: model.NewId(), DisplayName: "posttestchannel", Type: model.ChannelTypeOpen}
_, err := ss.Channel().Save(c1, 1000000)
require.NoError(t, err)
@@ -377,12 +377,12 @@ func testPostStoreSaveChannelMsgCounts(t *testing.T, ss store.Store) {
assert.Equal(t, int64(1), c1.TotalMsgCount, "Message count should update by 1")
o1.Id = ""
o1.Type = model.POST_ADD_TO_TEAM
o1.Type = model.PostTypeAddToTeam
_, err = ss.Post().Save(&o1)
require.NoError(t, err)
o1.Id = ""
o1.Type = model.POST_REMOVE_FROM_TEAM
o1.Type = model.PostTypeRemoveFromTeam
_, err = ss.Post().Save(&o1)
require.NoError(t, err)
@@ -634,9 +634,9 @@ func testPostStoreDelete(t *testing.T, ss store.Store) {
posts, _ := ss.Post().GetPostsCreatedAt(o1.ChannelId, o1.CreateAt)
post := posts[0]
actual := post.GetProp(model.POST_PROPS_DELETE_BY)
actual := post.GetProp(model.PostPropsDeleteBy)
assert.Equal(t, deleteByID, actual, "Expected (*Post).Props[model.POST_PROPS_DELETE_BY] to be %v but got %v.", deleteByID, actual)
assert.Equal(t, deleteByID, actual, "Expected (*Post).Props[model.PostPropsDeleteBy] to be %v but got %v.", deleteByID, actual)
r3, err := ss.Post().Get(context.Background(), o1.Id, false, false, false, "")
require.Error(t, err, "Missing id should have failed - PostList %v", r3)
@@ -1595,7 +1595,7 @@ func testPostStoreGetPostBeforeAfter(t *testing.T, ss store.Store) {
o1 := &model.Post{}
o1.ChannelId = channelId
o1.Type = model.POST_JOIN_CHANNEL
o1.Type = model.PostTypeJoinChannel
o1.UserId = model.NewId()
o1.Message = "system_join_channel message"
_, err = ss.Post().Save(o1)
@@ -1690,7 +1690,7 @@ func testUserCountsWithPostsByDay(t *testing.T, ss store.Store) {
t1.DisplayName = "DisplayName"
t1.Name = "zz" + model.NewId() + "b"
t1.Email = MakeEmail()
t1.Type = model.TEAM_OPEN
t1.Type = model.TeamOpen
t1, err := ss.Team().Save(t1)
require.NoError(t, err)
@@ -1698,7 +1698,7 @@ func testUserCountsWithPostsByDay(t *testing.T, ss store.Store) {
c1.TeamId = t1.Id
c1.DisplayName = "Channel2"
c1.Name = "zz" + model.NewId() + "b"
c1.Type = model.CHANNEL_OPEN
c1.Type = model.ChannelTypeOpen
c1, nErr := ss.Channel().Save(c1, -1)
require.NoError(t, nErr)
@@ -1749,7 +1749,7 @@ func testPostCountsByDay(t *testing.T, ss store.Store) {
t1.DisplayName = "DisplayName"
t1.Name = "zz" + model.NewId() + "b"
t1.Email = MakeEmail()
t1.Type = model.TEAM_OPEN
t1.Type = model.TeamOpen
t1, err := ss.Team().Save(t1)
require.NoError(t, err)
@@ -1757,7 +1757,7 @@ func testPostCountsByDay(t *testing.T, ss store.Store) {
c1.TeamId = t1.Id
c1.DisplayName = "Channel2"
c1.Name = "zz" + model.NewId() + "b"
c1.Type = model.CHANNEL_OPEN
c1.Type = model.ChannelTypeOpen
c1, nErr := ss.Channel().Save(c1, -1)
require.NoError(t, nErr)
@@ -1886,7 +1886,7 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, ss store.Store, s SqlStor
c1.TeamId = model.NewId()
c1.DisplayName = "Channel1"
c1.Name = "zz" + model.NewId() + "b"
c1.Type = model.CHANNEL_OPEN
c1.Type = model.ChannelTypeOpen
c1, err := ss.Channel().Save(c1, -1)
require.NoError(t, err)
@@ -1926,7 +1926,7 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, ss store.Store, s SqlStor
c2 := &model.Channel{}
c2.DisplayName = "DMChannel1"
c2.Name = "zz" + model.NewId() + "b"
c2.Type = model.CHANNEL_DIRECT
c2.Type = model.ChannelTypeDirect
m1 := &model.ChannelMember{}
m1.ChannelId = c2.Id
@@ -1957,7 +1957,7 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, ss store.Store, s SqlStor
preferences := model.Preferences{
{
UserId: o1.UserId,
Category: model.PREFERENCE_CATEGORY_FLAGGED_POST,
Category: model.PreferenceCategoryFlaggedPost,
Name: o1.Id,
Value: "true",
},
@@ -1973,7 +1973,7 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, ss store.Store, s SqlStor
preferences = model.Preferences{
{
UserId: o1.UserId,
Category: model.PREFERENCE_CATEGORY_FLAGGED_POST,
Category: model.PreferenceCategoryFlaggedPost,
Name: o2.Id,
Value: "true",
},
@@ -2001,7 +2001,7 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, ss store.Store, s SqlStor
preferences = model.Preferences{
{
UserId: o1.UserId,
Category: model.PREFERENCE_CATEGORY_FLAGGED_POST,
Category: model.PreferenceCategoryFlaggedPost,
Name: o3.Id,
Value: "true",
},
@@ -2017,7 +2017,7 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, ss store.Store, s SqlStor
preferences = model.Preferences{
{
UserId: o1.UserId,
Category: model.PREFERENCE_CATEGORY_FLAGGED_POST,
Category: model.PreferenceCategoryFlaggedPost,
Name: o4.Id,
Value: "true",
},
@@ -2036,7 +2036,7 @@ func testPostStoreGetFlaggedPostsForTeam(t *testing.T, ss store.Store, s SqlStor
preferences = model.Preferences{
{
UserId: o1.UserId,
Category: model.PREFERENCE_CATEGORY_FLAGGED_POST,
Category: model.PreferenceCategoryFlaggedPost,
Name: o5.Id,
Value: "true",
},
@@ -2085,7 +2085,7 @@ func testPostStoreGetFlaggedPosts(t *testing.T, ss store.Store) {
preferences := model.Preferences{
{
UserId: o1.UserId,
Category: model.PREFERENCE_CATEGORY_FLAGGED_POST,
Category: model.PreferenceCategoryFlaggedPost,
Name: o1.Id,
Value: "true",
},
@@ -2101,7 +2101,7 @@ func testPostStoreGetFlaggedPosts(t *testing.T, ss store.Store) {
preferences = model.Preferences{
{
UserId: o1.UserId,
Category: model.PREFERENCE_CATEGORY_FLAGGED_POST,
Category: model.PreferenceCategoryFlaggedPost,
Name: o2.Id,
Value: "true",
},
@@ -2129,7 +2129,7 @@ func testPostStoreGetFlaggedPosts(t *testing.T, ss store.Store) {
preferences = model.Preferences{
{
UserId: o1.UserId,
Category: model.PREFERENCE_CATEGORY_FLAGGED_POST,
Category: model.PreferenceCategoryFlaggedPost,
Name: o3.Id,
Value: "true",
},
@@ -2184,7 +2184,7 @@ func testPostStoreGetFlaggedPostsForChannel(t *testing.T, ss store.Store) {
preference := model.Preference{
UserId: o1.UserId,
Category: model.PREFERENCE_CATEGORY_FLAGGED_POST,
Category: model.PreferenceCategoryFlaggedPost,
Name: o1.Id,
Value: "true",
}
@@ -2556,14 +2556,14 @@ func testPostStoreGetPostsBatchForIndexing(t *testing.T, ss store.Store) {
c1.TeamId = model.NewId()
c1.DisplayName = "Channel1"
c1.Name = "zz" + model.NewId() + "b"
c1.Type = model.CHANNEL_OPEN
c1.Type = model.ChannelTypeOpen
c1, _ = ss.Channel().Save(c1, -1)
c2 := &model.Channel{}
c2.TeamId = model.NewId()
c2.DisplayName = "Channel2"
c2.Name = "zz" + model.NewId() + "b"
c2.Type = model.CHANNEL_OPEN
c2.Type = model.ChannelTypeOpen
c2, _ = ss.Channel().Save(c2, -1)
o1 := &model.Post{}
@@ -2613,14 +2613,14 @@ func testPostStorePermanentDeleteBatch(t *testing.T, ss store.Store) {
DisplayName: "DisplayName",
Name: "team" + model.NewId(),
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
})
require.NoError(t, err)
channel, err := ss.Channel().Save(&model.Channel{
TeamId: team.Id,
DisplayName: "DisplayName",
Name: "channel" + model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}, -1)
require.NoError(t, err)
@@ -2753,14 +2753,14 @@ func testPostStorePermanentDeleteBatch(t *testing.T, ss store.Store) {
c1.TeamId = model.NewId()
c1.DisplayName = "Channel1"
c1.Name = "zz" + model.NewId() + "b"
c1.Type = model.CHANNEL_OPEN
c1.Type = model.ChannelTypeOpen
c1, _ = ss.Channel().Save(c1, -1)
c2 := &model.Channel{}
c2.TeamId = model.NewId()
c2.DisplayName = "Channel2"
c2.Name = "zz" + model.NewId() + "b"
c2.Type = model.CHANNEL_OPEN
c2.Type = model.ChannelTypeOpen
c2, _ = ss.Channel().Save(c2, -1)
channelPolicy, err2 := ss.RetentionPolicy().Save(&model.RetentionPolicyWithTeamAndChannelIDs{
@@ -2846,8 +2846,8 @@ func testPostStoreGetOldest(t *testing.T, ss store.Store) {
}
func testGetMaxPostSize(t *testing.T, ss store.Store) {
assert.Equal(t, model.POST_MESSAGE_MAX_RUNES_V2, ss.Post().GetMaxPostSize())
assert.Equal(t, model.POST_MESSAGE_MAX_RUNES_V2, ss.Post().GetMaxPostSize())
assert.Equal(t, model.PostMessageMaxRunesV2, ss.Post().GetMaxPostSize())
assert.Equal(t, model.PostMessageMaxRunesV2, ss.Post().GetMaxPostSize())
}
func testPostStoreGetParentsForExportAfter(t *testing.T, ss store.Store) {
@@ -2855,7 +2855,7 @@ func testPostStoreGetParentsForExportAfter(t *testing.T, ss store.Store) {
t1.DisplayName = "Name"
t1.Name = "zz" + model.NewId()
t1.Email = MakeEmail()
t1.Type = model.TEAM_OPEN
t1.Type = model.TeamOpen
_, err := ss.Team().Save(&t1)
require.NoError(t, err)
@@ -2863,7 +2863,7 @@ func testPostStoreGetParentsForExportAfter(t *testing.T, ss store.Store) {
c1.TeamId = t1.Id
c1.DisplayName = "Channel1"
c1.Name = "zz" + model.NewId() + "b"
c1.Type = model.CHANNEL_OPEN
c1.Type = model.ChannelTypeOpen
_, nErr := ss.Channel().Save(&c1, -1)
require.NoError(t, nErr)
@@ -2904,7 +2904,7 @@ func testPostStoreGetRepliesForExport(t *testing.T, ss store.Store) {
t1.DisplayName = "Name"
t1.Name = "zz" + model.NewId()
t1.Email = MakeEmail()
t1.Type = model.TEAM_OPEN
t1.Type = model.TeamOpen
_, err := ss.Team().Save(&t1)
require.NoError(t, err)
@@ -2912,7 +2912,7 @@ func testPostStoreGetRepliesForExport(t *testing.T, ss store.Store) {
c1.TeamId = t1.Id
c1.DisplayName = "Channel1"
c1.Name = "zz" + model.NewId() + "b"
c1.Type = model.CHANNEL_OPEN
c1.Type = model.ChannelTypeOpen
_, nErr := ss.Channel().Save(&c1, -1)
require.NoError(t, nErr)
@@ -2974,7 +2974,7 @@ func testPostStoreGetDirectPostParentsForExportAfter(t *testing.T, ss store.Stor
o1.TeamId = teamId
o1.DisplayName = "Name"
o1.Name = "zz" + model.NewId() + "b"
o1.Type = model.CHANNEL_DIRECT
o1.Type = model.ChannelTypeDirect
u1 := &model.User{}
u1.Email = MakeEmail()
@@ -3028,7 +3028,7 @@ func testPostStoreGetDirectPostParentsForExportAfterDeleted(t *testing.T, ss sto
o1.TeamId = teamId
o1.DisplayName = "Name"
o1.Name = "zz" + model.NewId() + "b"
o1.Type = model.CHANNEL_DIRECT
o1.Type = model.ChannelTypeDirect
u1 := &model.User{}
u1.DeleteAt = 1
@@ -3094,7 +3094,7 @@ func testPostStoreGetDirectPostParentsForExportAfterBatched(t *testing.T, ss sto
o1.TeamId = teamId
o1.DisplayName = "Name"
o1.Name = "zz" + model.NewId() + "b"
o1.Type = model.CHANNEL_DIRECT
o1.Type = model.ChannelTypeDirect
var postIds []string
for i := 0; i < 150; i++ {
@@ -3188,7 +3188,7 @@ func testHasAutoResponsePostByUserSince(t *testing.T, ss store.Store) {
ChannelId: channelId,
UserId: userId,
Message: "auto response message",
Type: model.POST_AUTO_RESPONDER,
Type: model.PostTypeAutoResponder,
})
require.NoError(t, err)
time.Sleep(time.Millisecond)

20
store/storetest/preference_store.go
Просмотреть файл

@@ -31,13 +31,13 @@ func testPreferenceSave(t *testing.T, ss store.Store) {
preferences := model.Preferences{
{
UserId: id,
Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW,
Category: model.PreferenceCategoryDirectChannelShow,
Name: model.NewId(),
Value: "value1a",
},
{
UserId: id,
Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW,
Category: model.PreferenceCategoryDirectChannelShow,
Name: model.NewId(),
Value: "value1b",
},
@@ -63,7 +63,7 @@ func testPreferenceSave(t *testing.T, ss store.Store) {
func testPreferenceGet(t *testing.T, ss store.Store) {
userId := model.NewId()
category := model.PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW
category := model.PreferenceCategoryDirectChannelShow
name := model.NewId()
preferences := model.Preferences{
@@ -103,7 +103,7 @@ func testPreferenceGet(t *testing.T, ss store.Store) {
func testPreferenceGetCategory(t *testing.T, ss store.Store) {
userId := model.NewId()
category := model.PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW
category := model.PreferenceCategoryDirectChannelShow
name := model.NewId()
preferences := model.Preferences{
@@ -152,7 +152,7 @@ func testPreferenceGetCategory(t *testing.T, ss store.Store) {
func testPreferenceGetAll(t *testing.T, ss store.Store) {
userId := model.NewId()
category := model.PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW
category := model.PreferenceCategoryDirectChannelShow
name := model.NewId()
preferences := model.Preferences{
@@ -196,7 +196,7 @@ func testPreferenceGetAll(t *testing.T, ss store.Store) {
func testPreferenceDeleteByUser(t *testing.T, ss store.Store) {
userId := model.NewId()
category := model.PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW
category := model.PreferenceCategoryDirectChannelShow
name := model.NewId()
preferences := model.Preferences{
@@ -235,7 +235,7 @@ func testPreferenceDeleteByUser(t *testing.T, ss store.Store) {
func testPreferenceDelete(t *testing.T, ss store.Store) {
preference := model.Preference{
UserId: model.NewId(),
Category: model.PREFERENCE_CATEGORY_DIRECT_CHANNEL_SHOW,
Category: model.PreferenceCategoryDirectChannelShow,
Name: model.NewId(),
Value: "value1a",
}
@@ -336,17 +336,17 @@ func testPreferenceDeleteOrphanedRows(t *testing.T, ss store.Store) {
DisplayName: "DisplayName",
Name: "team" + model.NewId(),
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
})
require.NoError(t, err)
channel, err := ss.Channel().Save(&model.Channel{
TeamId: team.Id,
DisplayName: "DisplayName",
Name: "channel" + model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}, -1)
require.NoError(t, err)
category := model.PREFERENCE_CATEGORY_FLAGGED_POST
category := model.PreferenceCategoryFlaggedPost
userId := model.NewId()
olderPost, err := ss.Post().Save(&model.Post{

18
store/storetest/reaction_store.go
Просмотреть файл

@@ -391,13 +391,13 @@ func forceUpdateAt(reaction *model.Reaction, updateAt int64, s SqlStore) error {
}
sqlResult, err := s.GetMaster().Exec(`
UPDATE
Reactions
SET
UpdateAt=:UpdateAt
WHERE
UserId = :UserId AND
PostId = :PostId AND
UPDATE
Reactions
SET
UpdateAt=:UpdateAt
WHERE
UserId = :UserId AND
PostId = :PostId AND
EmojiName = :EmojiName`, params,
)
@@ -527,14 +527,14 @@ func testReactionStorePermanentDeleteBatch(t *testing.T, ss store.Store) {
DisplayName: "DisplayName",
Name: "team" + model.NewId(),
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
})
require.NoError(t, err)
channel, err := ss.Channel().Save(&model.Channel{
TeamId: team.Id,
DisplayName: "DisplayName",
Name: "channel" + model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}, -1)
require.NoError(t, err)
olderPost, err := ss.Post().Save(&model.Post{

4
store/storetest/retention_policy_store.go
Просмотреть файл

@@ -116,7 +116,7 @@ func createChannelsForRetentionPolicy(t *testing.T, ss store.Store, teamId strin
TeamId: teamId,
DisplayName: "Channel " + name,
Name: name,
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
channel, err := ss.Channel().Save(channel, -1)
require.NoError(t, err)
@@ -132,7 +132,7 @@ func createTeamsForRetentionPolicy(t *testing.T, ss store.Store, numTeams int) (
team := &model.Team{
DisplayName: "Team " + name,
Name: name,
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
}
team, err := ss.Team().Save(team)
require.NoError(t, err)

26
store/storetest/role_store.go
Просмотреть файл

@@ -368,7 +368,7 @@ func testRoleStoreLowerScopedChannelSchemeRoles(t *testing.T, ss store.Store) {
DisplayName: model.NewId(),
Name: model.NewId(),
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_TEAM,
Scope: model.SchemeScopeTeam,
}
teamScheme1, err := ss.Scheme().Save(teamScheme1)
require.NoError(t, err)
@@ -378,7 +378,7 @@ func testRoleStoreLowerScopedChannelSchemeRoles(t *testing.T, ss store.Store) {
DisplayName: model.NewId(),
Name: model.NewId(),
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_TEAM,
Scope: model.SchemeScopeTeam,
}
teamScheme2, err = ss.Scheme().Save(teamScheme2)
require.NoError(t, err)
@@ -388,7 +388,7 @@ func testRoleStoreLowerScopedChannelSchemeRoles(t *testing.T, ss store.Store) {
DisplayName: model.NewId(),
Name: model.NewId(),
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_CHANNEL,
Scope: model.SchemeScopeChannel,
}
channelScheme1, err = ss.Scheme().Save(channelScheme1)
require.NoError(t, err)
@@ -398,7 +398,7 @@ func testRoleStoreLowerScopedChannelSchemeRoles(t *testing.T, ss store.Store) {
DisplayName: model.NewId(),
Name: model.NewId(),
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_CHANNEL,
Scope: model.SchemeScopeChannel,
}
channelScheme2, err = ss.Scheme().Save(channelScheme2)
require.NoError(t, err)
@@ -408,7 +408,7 @@ func testRoleStoreLowerScopedChannelSchemeRoles(t *testing.T, ss store.Store) {
DisplayName: "Name",
Name: "zz" + model.NewId(),
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
SchemeId: &teamScheme1.Id,
}
team1, err = ss.Team().Save(team1)
@@ -419,7 +419,7 @@ func testRoleStoreLowerScopedChannelSchemeRoles(t *testing.T, ss store.Store) {
DisplayName: "Name",
Name: "zz" + model.NewId(),
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
SchemeId: &teamScheme2.Id,
}
team2, err = ss.Team().Save(team2)
@@ -430,7 +430,7 @@ func testRoleStoreLowerScopedChannelSchemeRoles(t *testing.T, ss store.Store) {
TeamId: team1.Id,
DisplayName: "Display " + model.NewId(),
Name: "zz" + model.NewId() + "b",
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
SchemeId: &channelScheme1.Id,
}
channel1, nErr := ss.Channel().Save(channel1, -1)
@@ -441,7 +441,7 @@ func testRoleStoreLowerScopedChannelSchemeRoles(t *testing.T, ss store.Store) {
TeamId: team2.Id,
DisplayName: "Display " + model.NewId(),
Name: "zz" + model.NewId() + "b",
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
SchemeId: &channelScheme2.Id,
}
channel2, nErr = ss.Channel().Save(channel2, -1)
@@ -522,7 +522,7 @@ func testRoleStoreChannelHigherScopedPermissionsBlankTeamSchemeChannelGuest(t *t
DisplayName: model.NewId(),
Name: model.NewId(),
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_TEAM,
Scope: model.SchemeScopeTeam,
}
teamScheme, err := ss.Scheme().Save(teamScheme)
require.NoError(t, err)
@@ -532,7 +532,7 @@ func testRoleStoreChannelHigherScopedPermissionsBlankTeamSchemeChannelGuest(t *t
DisplayName: model.NewId(),
Name: model.NewId(),
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_CHANNEL,
Scope: model.SchemeScopeChannel,
}
channelScheme, err = ss.Scheme().Save(channelScheme)
require.NoError(t, err)
@@ -542,7 +542,7 @@ func testRoleStoreChannelHigherScopedPermissionsBlankTeamSchemeChannelGuest(t *t
DisplayName: "Name",
Name: "zz" + model.NewId(),
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
SchemeId: &teamScheme.Id,
}
team, err = ss.Team().Save(team)
@@ -553,7 +553,7 @@ func testRoleStoreChannelHigherScopedPermissionsBlankTeamSchemeChannelGuest(t *t
TeamId: team.Id,
DisplayName: "Display " + model.NewId(),
Name: "zz" + model.NewId() + "b",
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
SchemeId: &channelScheme.Id,
}
channel, nErr := ss.Channel().Save(channel, -1)
@@ -568,7 +568,7 @@ func testRoleStoreChannelHigherScopedPermissionsBlankTeamSchemeChannelGuest(t *t
teamSchemeUserRole, err := ss.Role().GetByName(context.Background(), teamScheme.DefaultChannelUserRole)
require.NoError(t, err)
teamSchemeUserRole.Permissions = []string{model.PERMISSION_UPLOAD_FILE.Id}
teamSchemeUserRole.Permissions = []string{model.PermissionUploadFile.Id}
_, err = ss.Role().Save(teamSchemeUserRole)
require.NoError(t, err)

108
store/storetest/scheme_store.go
Просмотреть файл

@@ -29,54 +29,54 @@ func TestSchemeStore(t *testing.T, ss store.Store) {
func createDefaultRoles(ss store.Store) {
ss.Role().Save(&model.Role{
Name: model.TEAM_ADMIN_ROLE_ID,
DisplayName: model.TEAM_ADMIN_ROLE_ID,
Name: model.TeamAdminRoleId,
DisplayName: model.TeamAdminRoleId,
Permissions: []string{
model.PERMISSION_DELETE_OTHERS_POSTS.Id,
model.PermissionDeleteOthersPosts.Id,
},
})
ss.Role().Save(&model.Role{
Name: model.TEAM_USER_ROLE_ID,
DisplayName: model.TEAM_USER_ROLE_ID,
Name: model.TeamUserRoleId,
DisplayName: model.TeamUserRoleId,
Permissions: []string{
model.PERMISSION_VIEW_TEAM.Id,
model.PERMISSION_ADD_USER_TO_TEAM.Id,
model.PermissionViewTeam.Id,
model.PermissionAddUserToTeam.Id,
},
})
ss.Role().Save(&model.Role{
Name: model.TEAM_GUEST_ROLE_ID,
DisplayName: model.TEAM_GUEST_ROLE_ID,
Name: model.TeamGuestRoleId,
DisplayName: model.TeamGuestRoleId,
Permissions: []string{
model.PERMISSION_VIEW_TEAM.Id,
model.PermissionViewTeam.Id,
},
})
ss.Role().Save(&model.Role{
Name: model.CHANNEL_ADMIN_ROLE_ID,
DisplayName: model.CHANNEL_ADMIN_ROLE_ID,
Name: model.ChannelAdminRoleId,
DisplayName: model.ChannelAdminRoleId,
Permissions: []string{
model.PERMISSION_MANAGE_PUBLIC_CHANNEL_MEMBERS.Id,
model.PERMISSION_MANAGE_PRIVATE_CHANNEL_MEMBERS.Id,
model.PermissionManagePublicChannelMembers.Id,
model.PermissionManagePrivateChannelMembers.Id,
},
})
ss.Role().Save(&model.Role{
Name: model.CHANNEL_USER_ROLE_ID,
DisplayName: model.CHANNEL_USER_ROLE_ID,
Name: model.ChannelUserRoleId,
DisplayName: model.ChannelUserRoleId,
Permissions: []string{
model.PERMISSION_READ_CHANNEL.Id,
model.PERMISSION_CREATE_POST.Id,
model.PermissionReadChannel.Id,
model.PermissionCreatePost.Id,
},
})
ss.Role().Save(&model.Role{
Name: model.CHANNEL_GUEST_ROLE_ID,
DisplayName: model.CHANNEL_GUEST_ROLE_ID,
Name: model.ChannelGuestRoleId,
DisplayName: model.ChannelGuestRoleId,
Permissions: []string{
model.PERMISSION_READ_CHANNEL.Id,
model.PERMISSION_CREATE_POST.Id,
model.PermissionReadChannel.Id,
model.PermissionCreatePost.Id,
},
})
}
@@ -87,7 +87,7 @@ func testSchemeStoreSave(t *testing.T, ss store.Store) {
DisplayName: model.NewId(),
Name: model.NewId(),
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_TEAM,
Scope: model.SchemeScopeTeam,
}
// Check all fields saved correctly.
@@ -165,7 +165,7 @@ func testSchemeStoreSave(t *testing.T, ss store.Store) {
DisplayName: model.NewId(),
Name: model.NewId(),
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_TEAM,
Scope: model.SchemeScopeTeam,
}
_, err = ss.Scheme().Save(s3)
@@ -178,7 +178,7 @@ func testSchemeStoreGet(t *testing.T, ss store.Store) {
DisplayName: model.NewId(),
Name: model.NewId(),
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_TEAM,
Scope: model.SchemeScopeTeam,
}
d1, err := ss.Scheme().Save(s1)
@@ -214,7 +214,7 @@ func testSchemeStoreGetByName(t *testing.T, ss store.Store) {
DisplayName: model.NewId(),
Name: model.NewId(),
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_TEAM,
Scope: model.SchemeScopeTeam,
}
d1, err := ss.Scheme().Save(s1)
@@ -251,25 +251,25 @@ func testSchemeStoreGetAllPage(t *testing.T, ss store.Store) {
DisplayName: model.NewId(),
Name: model.NewId(),
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_TEAM,
Scope: model.SchemeScopeTeam,
},
{
DisplayName: model.NewId(),
Name: model.NewId(),
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_CHANNEL,
Scope: model.SchemeScopeChannel,
},
{
DisplayName: model.NewId(),
Name: model.NewId(),
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_TEAM,
Scope: model.SchemeScopeTeam,
},
{
DisplayName: model.NewId(),
Name: model.NewId(),
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_CHANNEL,
Scope: model.SchemeScopeChannel,
},
}
@@ -315,7 +315,7 @@ func testSchemeStoreDelete(t *testing.T, ss store.Store) {
DisplayName: model.NewId(),
Name: model.NewId(),
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_TEAM,
Scope: model.SchemeScopeTeam,
}
// Check all fields saved correctly.
@@ -406,7 +406,7 @@ func testSchemeStoreDelete(t *testing.T, ss store.Store) {
DisplayName: model.NewId(),
Name: model.NewId(),
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_TEAM,
Scope: model.SchemeScopeTeam,
}
d4, err := ss.Scheme().Save(s4)
assert.NoError(t, err)
@@ -415,7 +415,7 @@ func testSchemeStoreDelete(t *testing.T, ss store.Store) {
Name: "xx" + model.NewId(),
DisplayName: model.NewId(),
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
SchemeId: &d4.Id,
}
t4, err = ss.Team().Save(t4)
@@ -433,7 +433,7 @@ func testSchemeStoreDelete(t *testing.T, ss store.Store) {
DisplayName: model.NewId(),
Name: model.NewId(),
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_CHANNEL,
Scope: model.SchemeScopeChannel,
}
d5, err := ss.Scheme().Save(s5)
assert.NoError(t, err)
@@ -442,7 +442,7 @@ func testSchemeStoreDelete(t *testing.T, ss store.Store) {
TeamId: model.NewId(),
DisplayName: model.NewId(),
Name: model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
SchemeId: &d5.Id,
}
c5, nErr := ss.Channel().Save(c5, -1)
@@ -461,14 +461,14 @@ func testSchemeStorePermanentDeleteAll(t *testing.T, ss store.Store) {
Name: model.NewId(),
DisplayName: model.NewId(),
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_TEAM,
Scope: model.SchemeScopeTeam,
}
s2 := &model.Scheme{
Name: model.NewId(),
DisplayName: model.NewId(),
Description: model.NewId(),
Scope: model.SCHEME_SCOPE_CHANNEL,
Scope: model.SchemeScopeChannel,
}
s1, err := ss.Scheme().Save(s1)
@@ -492,11 +492,11 @@ func testSchemeStorePermanentDeleteAll(t *testing.T, ss store.Store) {
func testSchemeStoreCountByScope(t *testing.T, ss store.Store) {
testCounts := func(expectedTeamCount, expectedChannelCount int) {
actualCount, err := ss.Scheme().CountByScope(model.SCHEME_SCOPE_TEAM)
actualCount, err := ss.Scheme().CountByScope(model.SchemeScopeTeam)
require.NoError(t, err)
require.Equal(t, int64(expectedTeamCount), actualCount)
actualCount, err = ss.Scheme().CountByScope(model.SCHEME_SCOPE_CHANNEL)
actualCount, err = ss.Scheme().CountByScope(model.SchemeScopeChannel)
require.NoError(t, err)
require.Equal(t, int64(expectedChannelCount), actualCount)
}
@@ -514,17 +514,17 @@ func testSchemeStoreCountByScope(t *testing.T, ss store.Store) {
err := ss.Scheme().PermanentDeleteAll()
require.NoError(t, err)
createScheme(model.SCHEME_SCOPE_CHANNEL)
createScheme(model.SCHEME_SCOPE_TEAM)
createScheme(model.SchemeScopeChannel)
createScheme(model.SchemeScopeTeam)
testCounts(1, 1)
createScheme(model.SCHEME_SCOPE_TEAM)
createScheme(model.SchemeScopeTeam)
testCounts(2, 1)
createScheme(model.SCHEME_SCOPE_CHANNEL)
createScheme(model.SchemeScopeChannel)
testCounts(2, 2)
}
func testCountWithoutPermission(t *testing.T, ss store.Store) {
perm := model.PERMISSION_CREATE_POST.Id
perm := model.PermissionCreatePost.Id
createScheme := func(scope string) *model.Scheme {
scheme, err := ss.Scheme().Save(&model.Scheme{
@@ -548,13 +548,13 @@ func testCountWithoutPermission(t *testing.T, ss store.Store) {
return
}
teamScheme1 := createScheme(model.SCHEME_SCOPE_TEAM)
teamScheme1 := createScheme(model.SchemeScopeTeam)
defer ss.Scheme().Delete(teamScheme1.Id)
teamScheme2 := createScheme(model.SCHEME_SCOPE_TEAM)
teamScheme2 := createScheme(model.SchemeScopeTeam)
defer ss.Scheme().Delete(teamScheme2.Id)
channelScheme1 := createScheme(model.SCHEME_SCOPE_CHANNEL)
channelScheme1 := createScheme(model.SchemeScopeChannel)
defer ss.Scheme().Delete(channelScheme1.Id)
channelScheme2 := createScheme(model.SCHEME_SCOPE_CHANNEL)
channelScheme2 := createScheme(model.SchemeScopeChannel)
defer ss.Scheme().Delete(channelScheme2.Id)
ts1User, ts1Guest := getRoles(teamScheme1)
@@ -573,11 +573,11 @@ func testCountWithoutPermission(t *testing.T, ss store.Store) {
cs2Guest,
}
teamUserCount, err := ss.Scheme().CountWithoutPermission(model.SCHEME_SCOPE_TEAM, perm, model.RoleScopeChannel, model.RoleTypeUser)
teamUserCount, err := ss.Scheme().CountWithoutPermission(model.SchemeScopeTeam, perm, model.RoleScopeChannel, model.RoleTypeUser)
require.NoError(t, err)
require.Equal(t, int64(0), teamUserCount)
teamGuestCount, err := ss.Scheme().CountWithoutPermission(model.SCHEME_SCOPE_TEAM, perm, model.RoleScopeChannel, model.RoleTypeGuest)
teamGuestCount, err := ss.Scheme().CountWithoutPermission(model.SchemeScopeTeam, perm, model.RoleScopeChannel, model.RoleTypeGuest)
require.NoError(t, err)
require.Equal(t, int64(0), teamGuestCount)
@@ -614,19 +614,19 @@ func testCountWithoutPermission(t *testing.T, ss store.Store) {
for _, test := range tests {
removePermission(test.removePermissionFromRole)
count, err := ss.Scheme().CountWithoutPermission(model.SCHEME_SCOPE_TEAM, perm, model.RoleScopeChannel, model.RoleTypeUser)
count, err := ss.Scheme().CountWithoutPermission(model.SchemeScopeTeam, perm, model.RoleScopeChannel, model.RoleTypeUser)
require.NoError(t, err)
require.Equal(t, int64(test.expectTeamSchemeChannelUserCount), count)
count, err = ss.Scheme().CountWithoutPermission(model.SCHEME_SCOPE_TEAM, perm, model.RoleScopeChannel, model.RoleTypeGuest)
count, err = ss.Scheme().CountWithoutPermission(model.SchemeScopeTeam, perm, model.RoleScopeChannel, model.RoleTypeGuest)
require.NoError(t, err)
require.Equal(t, int64(test.expectTeamSchemeChannelGuestCount), count)
count, err = ss.Scheme().CountWithoutPermission(model.SCHEME_SCOPE_CHANNEL, perm, model.RoleScopeChannel, model.RoleTypeUser)
count, err = ss.Scheme().CountWithoutPermission(model.SchemeScopeChannel, perm, model.RoleScopeChannel, model.RoleTypeUser)
require.NoError(t, err)
require.Equal(t, int64(test.expectChannelSchemeChannelUserCount), count)
count, err = ss.Scheme().CountWithoutPermission(model.SCHEME_SCOPE_CHANNEL, perm, model.RoleScopeChannel, model.RoleTypeGuest)
count, err = ss.Scheme().CountWithoutPermission(model.SchemeScopeChannel, perm, model.RoleScopeChannel, model.RoleTypeGuest)
require.NoError(t, err)
require.Equal(t, int64(test.expectChannelSchemeChannelGuestCount), count)
}

8
store/storetest/session_store.go
Просмотреть файл

@@ -187,7 +187,7 @@ func testSessionUpdateDeviceId(t *testing.T, ss store.Store) {
s1, err := ss.Session().Save(s1)
require.NoError(t, err)
_, err = ss.Session().UpdateDeviceId(s1.Id, model.PUSH_NOTIFY_APPLE+":1234567890", s1.ExpiresAt)
_, err = ss.Session().UpdateDeviceId(s1.Id, model.PushNotifyApple+":1234567890", s1.ExpiresAt)
require.NoError(t, err)
s2 := &model.Session{}
@@ -196,7 +196,7 @@ func testSessionUpdateDeviceId(t *testing.T, ss store.Store) {
s2, err = ss.Session().Save(s2)
require.NoError(t, err)
_, err = ss.Session().UpdateDeviceId(s2.Id, model.PUSH_NOTIFY_APPLE+":1234567890", s1.ExpiresAt)
_, err = ss.Session().UpdateDeviceId(s2.Id, model.PushNotifyApple+":1234567890", s1.ExpiresAt)
require.NoError(t, err)
}
@@ -207,7 +207,7 @@ func testSessionUpdateDeviceId2(t *testing.T, ss store.Store) {
s1, err := ss.Session().Save(s1)
require.NoError(t, err)
_, err = ss.Session().UpdateDeviceId(s1.Id, model.PUSH_NOTIFY_APPLE_REACT_NATIVE+":1234567890", s1.ExpiresAt)
_, err = ss.Session().UpdateDeviceId(s1.Id, model.PushNotifyAppleReactNative+":1234567890", s1.ExpiresAt)
require.NoError(t, err)
s2 := &model.Session{}
@@ -216,7 +216,7 @@ func testSessionUpdateDeviceId2(t *testing.T, ss store.Store) {
s2, err = ss.Session().Save(s2)
require.NoError(t, err)
_, err = ss.Session().UpdateDeviceId(s2.Id, model.PUSH_NOTIFY_APPLE_REACT_NATIVE+":1234567890", s1.ExpiresAt)
_, err = ss.Session().UpdateDeviceId(s2.Id, model.PushNotifyAppleReactNative+":1234567890", s1.ExpiresAt)
require.NoError(t, err)
}

16
store/storetest/settings.go
Просмотреть файл

@@ -161,9 +161,9 @@ func execAsRoot(settings *model.SqlSettings, sqlCommand string) error {
var driver = *settings.DriverName
switch driver {
case model.DATABASE_DRIVER_MYSQL:
case model.DatabaseDriverMysql:
dsn = mySQLRootDSN(*settings.DataSource)
case model.DATABASE_DRIVER_POSTGRES:
case model.DatabaseDriverPostgres:
dsn = postgreSQLRootDSN(*settings.DataSource)
default:
return fmt.Errorf("unsupported driver %s", driver)
@@ -196,7 +196,7 @@ func MakeSqlSettings(driver string, withReplica bool) *model.SqlSettings {
var dbName string
switch driver {
case model.DATABASE_DRIVER_MYSQL:
case model.DatabaseDriverMysql:
settings = MySQLSettings(withReplica)
dbName = mySQLDSNDatabase(*settings.DataSource)
newDSRs := []string{}
@@ -204,7 +204,7 @@ func MakeSqlSettings(driver string, withReplica bool) *model.SqlSettings {
newDSRs = append(newDSRs, replaceMySQLDatabaseName(dataSource, dbName))
}
settings.DataSourceReplicas = newDSRs
case model.DATABASE_DRIVER_POSTGRES:
case model.DatabaseDriverPostgres:
settings = PostgreSQLSettings()
dbName = postgreSQLDSNDatabase(*settings.DataSource)
default:
@@ -216,11 +216,11 @@ func MakeSqlSettings(driver string, withReplica bool) *model.SqlSettings {
}
switch driver {
case model.DATABASE_DRIVER_MYSQL:
case model.DatabaseDriverMysql:
if err := execAsRoot(settings, "GRANT ALL PRIVILEGES ON "+dbName+".* TO 'mmuser'"); err != nil {
panic("failed to grant mmuser permission to " + dbName + ":" + err.Error())
}
case model.DATABASE_DRIVER_POSTGRES:
case model.DatabaseDriverPostgres:
if err := execAsRoot(settings, "GRANT ALL PRIVILEGES ON DATABASE \""+dbName+"\" TO mmuser"); err != nil {
panic("failed to grant mmuser permission to " + dbName + ":" + err.Error())
}
@@ -238,9 +238,9 @@ func CleanupSqlSettings(settings *model.SqlSettings) {
var dbName string
switch driver {
case model.DATABASE_DRIVER_MYSQL:
case model.DatabaseDriverMysql:
dbName = mySQLDSNDatabase(*settings.DataSource)
case model.DATABASE_DRIVER_POSTGRES:
case model.DatabaseDriverPostgres:
dbName = postgreSQLDSNDatabase(*settings.DataSource)
default:
panic("unsupported driver " + driver)

2
store/storetest/shared_channel_store.go
Просмотреть файл

@@ -791,7 +791,7 @@ func createTestChannel(ss store.Store, name string) (*model.Channel, error) {
func createSharedTestChannel(ss store.Store, name string, shared bool) (*model.Channel, error) {
channel := &model.Channel{
TeamId: model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
Name: name,
DisplayName: name + " display name",
Header: name + " header",

18
store/storetest/status_store.go
Просмотреть файл

@@ -20,7 +20,7 @@ func TestStatusStore(t *testing.T, ss store.Store) {
}
func testStatusStore(t *testing.T, ss store.Store) {
status := &model.Status{UserId: model.NewId(), Status: model.STATUS_ONLINE, Manual: false, LastActivityAt: 0, ActiveChannel: ""}
status := &model.Status{UserId: model.NewId(), Status: model.StatusOnline, Manual: false, LastActivityAt: 0, ActiveChannel: ""}
require.NoError(t, ss.Status().SaveOrUpdate(status))
status.LastActivityAt = 10
@@ -28,10 +28,10 @@ func testStatusStore(t *testing.T, ss store.Store) {
_, err := ss.Status().Get(status.UserId)
require.NoError(t, err)
status2 := &model.Status{UserId: model.NewId(), Status: model.STATUS_AWAY, Manual: false, LastActivityAt: 0, ActiveChannel: ""}
status2 := &model.Status{UserId: model.NewId(), Status: model.StatusAway, Manual: false, LastActivityAt: 0, ActiveChannel: ""}
require.NoError(t, ss.Status().SaveOrUpdate(status2))
status3 := &model.Status{UserId: model.NewId(), Status: model.STATUS_OFFLINE, Manual: false, LastActivityAt: 0, ActiveChannel: ""}
status3 := &model.Status{UserId: model.NewId(), Status: model.StatusOffline, Manual: false, LastActivityAt: 0, ActiveChannel: ""}
require.NoError(t, ss.Status().SaveOrUpdate(status3))
statuses, err := ss.Status().GetByIds([]string{status.UserId, "junk"})
@@ -43,14 +43,14 @@ func testStatusStore(t *testing.T, ss store.Store) {
statusParameter, err := ss.Status().Get(status.UserId)
require.NoError(t, err)
require.Equal(t, statusParameter.Status, model.STATUS_OFFLINE, "should be offline")
require.Equal(t, statusParameter.Status, model.StatusOffline, "should be offline")
err = ss.Status().UpdateLastActivityAt(status.UserId, 10)
require.NoError(t, err)
}
func testActiveUserCount(t *testing.T, ss store.Store) {
status := &model.Status{UserId: model.NewId(), Status: model.STATUS_ONLINE, Manual: false, LastActivityAt: model.GetMillis(), ActiveChannel: ""}
status := &model.Status{UserId: model.NewId(), Status: model.StatusOnline, Manual: false, LastActivityAt: model.GetMillis(), ActiveChannel: ""}
require.NoError(t, ss.Status().SaveOrUpdate(status))
count, err := ss.Status().GetTotalActiveUsersCount()
@@ -67,8 +67,8 @@ func (s ByUserId) Less(i, j int) bool { return s[i].UserId < s[j].UserId }
func testUpdateExpiredDNDStatuses(t *testing.T, ss store.Store) {
userID := NewTestId()
status := &model.Status{UserId: userID, Status: model.STATUS_DND, Manual: true,
DNDEndTime: time.Now().Add(5 * time.Second).Unix(), PrevStatus: model.STATUS_ONLINE}
status := &model.Status{UserId: userID, Status: model.StatusDnd, Manual: true,
DNDEndTime: time.Now().Add(5 * time.Second).Unix(), PrevStatus: model.StatusOnline}
require.NoError(t, ss.Status().SaveOrUpdate(status))
time.Sleep(2 * time.Second)
@@ -87,8 +87,8 @@ func testUpdateExpiredDNDStatuses(t *testing.T, ss store.Store) {
updatedStatus := *statuses[0]
require.Equal(t, updatedStatus.UserId, userID)
require.Equal(t, updatedStatus.Status, model.STATUS_ONLINE)
require.Equal(t, updatedStatus.Status, model.StatusOnline)
require.Equal(t, updatedStatus.DNDEndTime, int64(0))
require.Equal(t, updatedStatus.PrevStatus, model.STATUS_DND)
require.Equal(t, updatedStatus.PrevStatus, model.StatusDnd)
require.Equal(t, updatedStatus.Manual, false)
}

20
store/storetest/system_store.go
Просмотреть файл

@@ -63,29 +63,29 @@ func testSystemStoreSaveOrUpdateWithWarnMetricHandling(t *testing.T, ss store.St
err := ss.System().SaveOrUpdateWithWarnMetricHandling(system)
require.NoError(t, err)
_, err = ss.System().GetByName(model.SYSTEM_WARN_METRIC_LAST_RUN_TIMESTAMP_KEY)
_, err = ss.System().GetByName(model.SystemWarnMetricLastRunTimestampKey)
assert.Error(t, err)
system.Name = "warn_metric_number_of_active_users_100"
system.Value = model.WARN_METRIC_STATUS_RUNONCE
system.Value = model.WarnMetricStatusRunonce
err = ss.System().SaveOrUpdateWithWarnMetricHandling(system)
require.NoError(t, err)
val1, nerr := ss.System().GetByName(model.SYSTEM_WARN_METRIC_LAST_RUN_TIMESTAMP_KEY)
val1, nerr := ss.System().GetByName(model.SystemWarnMetricLastRunTimestampKey)
assert.NoError(t, nerr)
system.Name = "warn_metric_number_of_active_users_100"
system.Value = model.WARN_METRIC_STATUS_ACK
system.Value = model.WarnMetricStatusAck
err = ss.System().SaveOrUpdateWithWarnMetricHandling(system)
require.NoError(t, err)
val2, nerr := ss.System().GetByName(model.SYSTEM_WARN_METRIC_LAST_RUN_TIMESTAMP_KEY)
val2, nerr := ss.System().GetByName(model.SystemWarnMetricLastRunTimestampKey)
assert.NoError(t, nerr)
assert.Equal(t, val1, val2)
}
func testSystemStoreGetByNameNoEntries(t *testing.T, ss store.Store) {
res, nErr := ss.System().GetByName(model.SYSTEM_FIRST_ADMIN_VISIT_MARKETPLACE)
res, nErr := ss.System().GetByName(model.SystemFirstAdminVisitMarketplace)
_, ok := nErr.(*store.ErrNotFound)
require.Error(t, nErr)
assert.True(t, ok)
@@ -128,13 +128,13 @@ func testSystemStorePermanentDeleteByName(t *testing.T, ss store.Store) {
func testInsertIfExists(t *testing.T, ss store.Store) {
t.Run("Serial", func(t *testing.T) {
s1 := &model.System{Name: model.SYSTEM_CLUSTER_ENCRYPTION_KEY, Value: "somekey"}
s1 := &model.System{Name: model.SystemClusterEncryptionKey, Value: "somekey"}
s2, err := ss.System().InsertIfExists(s1)
require.NoError(t, err)
assert.Equal(t, s1.Value, s2.Value)
s1New := &model.System{Name: model.SYSTEM_CLUSTER_ENCRYPTION_KEY, Value: "anotherKey"}
s1New := &model.System{Name: model.SystemClusterEncryptionKey, Value: "anotherKey"}
s3, err := ss.System().InsertIfExists(s1New)
require.NoError(t, err)
@@ -147,7 +147,7 @@ func testInsertIfExists(t *testing.T, ss store.Store) {
wg.Add(2)
go func() {
defer wg.Done()
s1 := &model.System{Name: model.SYSTEM_CLUSTER_ENCRYPTION_KEY, Value: "firstKey"}
s1 := &model.System{Name: model.SystemClusterEncryptionKey, Value: "firstKey"}
var err error
s2, err = ss.System().InsertIfExists(s1)
require.NoError(t, err)
@@ -155,7 +155,7 @@ func testInsertIfExists(t *testing.T, ss store.Store) {
go func() {
defer wg.Done()
s1 := &model.System{Name: model.SYSTEM_CLUSTER_ENCRYPTION_KEY, Value: "secondKey"}
s1 := &model.System{Name: model.SystemClusterEncryptionKey, Value: "secondKey"}
var err error
s3, err = ss.System().InsertIfExists(s1)
require.NoError(t, err)

180
store/storetest/team_store.go
Просмотреть файл

@@ -79,7 +79,7 @@ func testTeamStoreSave(t *testing.T, ss store.Store) {
o1.DisplayName = "DisplayName"
o1.Name = NewTestId()
o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
o1.Type = model.TeamOpen
_, err := ss.Team().Save(&o1)
require.NoError(t, err, "couldn't save item")
@@ -97,7 +97,7 @@ func testTeamStoreUpdate(t *testing.T, ss store.Store) {
o1.DisplayName = "DisplayName"
o1.Name = NewTestId()
o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
o1.Type = model.TeamOpen
_, err := ss.Team().Save(&o1)
require.NoError(t, err)
@@ -120,7 +120,7 @@ func testTeamStoreGet(t *testing.T, ss store.Store) {
o1.DisplayName = "DisplayName"
o1.Name = NewTestId()
o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
o1.Type = model.TeamOpen
_, err := ss.Team().Save(&o1)
require.NoError(t, err)
@@ -137,7 +137,7 @@ func testTeamStoreGetByNames(t *testing.T, ss store.Store) {
o1.DisplayName = "DisplayName"
o1.Name = NewTestId()
o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
o1.Type = model.TeamOpen
_, err := ss.Team().Save(&o1)
require.NoError(t, err)
@@ -146,7 +146,7 @@ func testTeamStoreGetByNames(t *testing.T, ss store.Store) {
o2.DisplayName = "DisplayName2"
o2.Name = NewTestId()
o2.Email = MakeEmail()
o2.Type = model.TEAM_OPEN
o2.Type = model.TeamOpen
_, err = ss.Team().Save(&o2)
require.NoError(t, err)
@@ -190,7 +190,7 @@ func testTeamStoreGetByName(t *testing.T, ss store.Store) {
o1.DisplayName = "DisplayName"
o1.Name = NewTestId()
o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
o1.Type = model.TeamOpen
_, err := ss.Team().Save(&o1)
require.NoError(t, err)
@@ -220,7 +220,7 @@ func testTeamStoreSearchAll(t *testing.T, ss store.Store) {
o.DisplayName = "ADisplayName" + NewTestId()
o.Name = "searchterm-" + NewTestId()
o.Email = MakeEmail()
o.Type = model.TEAM_OPEN
o.Type = model.TeamOpen
o.AllowOpenInvite = true
_, err := ss.Team().Save(&o)
@@ -230,7 +230,7 @@ func testTeamStoreSearchAll(t *testing.T, ss store.Store) {
p.DisplayName = "BDisplayName" + NewTestId()
p.Name = "searchterm-" + NewTestId()
p.Email = MakeEmail()
p.Type = model.TEAM_OPEN
p.Type = model.TeamOpen
p.AllowOpenInvite = false
_, err = ss.Team().Save(&p)
@@ -240,7 +240,7 @@ func testTeamStoreSearchAll(t *testing.T, ss store.Store) {
g.DisplayName = "CDisplayName" + NewTestId()
g.Name = "searchterm-" + NewTestId()
g.Email = MakeEmail()
g.Type = model.TEAM_OPEN
g.Type = model.TeamOpen
g.AllowOpenInvite = false
g.GroupConstrained = model.NewBool(true)
@@ -251,7 +251,7 @@ func testTeamStoreSearchAll(t *testing.T, ss store.Store) {
q.DisplayName = "CHOCOLATE"
q.Name = "ilovecake"
q.Email = MakeEmail()
q.Type = model.TEAM_OPEN
q.Type = model.TeamOpen
q.AllowOpenInvite = false
q, err = ss.Team().Save(q)
@@ -407,7 +407,7 @@ func testTeamStoreSearchOpen(t *testing.T, ss store.Store) {
o.DisplayName = "ADisplayName" + NewTestId()
o.Name = NewTestId()
o.Email = MakeEmail()
o.Type = model.TEAM_OPEN
o.Type = model.TeamOpen
o.AllowOpenInvite = true
_, err := ss.Team().Save(&o)
@@ -417,7 +417,7 @@ func testTeamStoreSearchOpen(t *testing.T, ss store.Store) {
p.DisplayName = "ADisplayName" + NewTestId()
p.Name = NewTestId()
p.Email = MakeEmail()
p.Type = model.TEAM_OPEN
p.Type = model.TeamOpen
p.AllowOpenInvite = false
_, err = ss.Team().Save(&p)
@@ -427,7 +427,7 @@ func testTeamStoreSearchOpen(t *testing.T, ss store.Store) {
q.DisplayName = "PINEAPPLEPIE"
q.Name = "ihadsomepineapplepiewithstrawberry"
q.Email = MakeEmail()
q.Type = model.TEAM_OPEN
q.Type = model.TeamOpen
q.AllowOpenInvite = true
_, err = ss.Team().Save(&q)
@@ -513,7 +513,7 @@ func testTeamStoreSearchPrivate(t *testing.T, ss store.Store) {
o.DisplayName = "ADisplayName" + NewTestId()
o.Name = NewTestId()
o.Email = MakeEmail()
o.Type = model.TEAM_OPEN
o.Type = model.TeamOpen
o.AllowOpenInvite = true
_, err := ss.Team().Save(&o)
@@ -523,7 +523,7 @@ func testTeamStoreSearchPrivate(t *testing.T, ss store.Store) {
p.DisplayName = "ADisplayName" + NewTestId()
p.Name = NewTestId()
p.Email = MakeEmail()
p.Type = model.TEAM_OPEN
p.Type = model.TeamOpen
p.AllowOpenInvite = false
_, err = ss.Team().Save(&p)
@@ -533,7 +533,7 @@ func testTeamStoreSearchPrivate(t *testing.T, ss store.Store) {
q.DisplayName = "FOOBARDISPLAYNAME"
q.Name = "averylongname"
q.Email = MakeEmail()
q.Type = model.TEAM_OPEN
q.Type = model.TeamOpen
q.AllowOpenInvite = false
_, err = ss.Team().Save(&q)
@@ -619,7 +619,7 @@ func testTeamStoreGetByInviteId(t *testing.T, ss store.Store) {
o1.DisplayName = "DisplayName"
o1.Name = NewTestId()
o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
o1.Type = model.TeamOpen
o1.InviteId = model.NewId()
save1, err := ss.Team().Save(&o1)
@@ -629,7 +629,7 @@ func testTeamStoreGetByInviteId(t *testing.T, ss store.Store) {
o2.DisplayName = "DisplayName"
o2.Name = NewTestId()
o2.Email = MakeEmail()
o2.Type = model.TEAM_OPEN
o2.Type = model.TeamOpen
r1, err := ss.Team().GetByInviteId(save1.InviteId)
require.NoError(t, err)
@@ -644,7 +644,7 @@ func testTeamStoreByUserId(t *testing.T, ss store.Store) {
o1.DisplayName = "DisplayName"
o1.Name = NewTestId()
o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
o1.Type = model.TeamOpen
o1.InviteId = model.NewId()
o1, err := ss.Team().Save(o1)
require.NoError(t, err)
@@ -664,7 +664,7 @@ func testTeamStoreGetAllPage(t *testing.T, ss store.Store) {
o.DisplayName = "ADisplayName" + model.NewId()
o.Name = "zz" + model.NewId() + "a"
o.Email = MakeEmail()
o.Type = model.TEAM_OPEN
o.Type = model.TeamOpen
o.AllowOpenInvite = true
_, err := ss.Team().Save(&o)
require.NoError(t, err)
@@ -722,7 +722,7 @@ func testGetAllTeamListing(t *testing.T, ss store.Store) {
o1.DisplayName = "DisplayName"
o1.Name = NewTestId()
o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
o1.Type = model.TeamOpen
o1.AllowOpenInvite = true
_, err := ss.Team().Save(&o1)
require.NoError(t, err)
@@ -731,7 +731,7 @@ func testGetAllTeamListing(t *testing.T, ss store.Store) {
o2.DisplayName = "DisplayName"
o2.Name = NewTestId()
o2.Email = MakeEmail()
o2.Type = model.TEAM_OPEN
o2.Type = model.TeamOpen
_, err = ss.Team().Save(&o2)
require.NoError(t, err)
@@ -739,7 +739,7 @@ func testGetAllTeamListing(t *testing.T, ss store.Store) {
o3.DisplayName = "DisplayName"
o3.Name = NewTestId()
o3.Email = MakeEmail()
o3.Type = model.TEAM_INVITE
o3.Type = model.TeamInvite
o3.AllowOpenInvite = true
_, err = ss.Team().Save(&o3)
require.NoError(t, err)
@@ -748,7 +748,7 @@ func testGetAllTeamListing(t *testing.T, ss store.Store) {
o4.DisplayName = "DisplayName"
o4.Name = NewTestId()
o4.Email = MakeEmail()
o4.Type = model.TEAM_INVITE
o4.Type = model.TeamInvite
_, err = ss.Team().Save(&o4)
require.NoError(t, err)
@@ -766,7 +766,7 @@ func testGetAllTeamPageListing(t *testing.T, ss store.Store) {
o1.DisplayName = "DisplayName"
o1.Name = NewTestId()
o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
o1.Type = model.TeamOpen
o1.AllowOpenInvite = true
_, err := ss.Team().Save(&o1)
require.NoError(t, err)
@@ -775,7 +775,7 @@ func testGetAllTeamPageListing(t *testing.T, ss store.Store) {
o2.DisplayName = "DisplayName"
o2.Name = NewTestId()
o2.Email = MakeEmail()
o2.Type = model.TEAM_OPEN
o2.Type = model.TeamOpen
o2.AllowOpenInvite = false
_, err = ss.Team().Save(&o2)
require.NoError(t, err)
@@ -784,7 +784,7 @@ func testGetAllTeamPageListing(t *testing.T, ss store.Store) {
o3.DisplayName = "DisplayName"
o3.Name = NewTestId()
o3.Email = MakeEmail()
o3.Type = model.TEAM_INVITE
o3.Type = model.TeamInvite
o3.AllowOpenInvite = true
_, err = ss.Team().Save(&o3)
require.NoError(t, err)
@@ -793,7 +793,7 @@ func testGetAllTeamPageListing(t *testing.T, ss store.Store) {
o4.DisplayName = "DisplayName"
o4.Name = NewTestId()
o4.Email = MakeEmail()
o4.Type = model.TEAM_INVITE
o4.Type = model.TeamInvite
o4.AllowOpenInvite = false
_, err = ss.Team().Save(&o4)
require.NoError(t, err)
@@ -813,7 +813,7 @@ func testGetAllTeamPageListing(t *testing.T, ss store.Store) {
o5.DisplayName = "DisplayName"
o5.Name = NewTestId()
o5.Email = MakeEmail()
o5.Type = model.TEAM_OPEN
o5.Type = model.TeamOpen
o5.AllowOpenInvite = true
_, err = ss.Team().Save(&o5)
require.NoError(t, err)
@@ -842,7 +842,7 @@ func testGetAllPrivateTeamListing(t *testing.T, ss store.Store) {
o1.DisplayName = "DisplayName"
o1.Name = NewTestId()
o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
o1.Type = model.TeamOpen
o1.AllowOpenInvite = true
_, err := ss.Team().Save(&o1)
require.NoError(t, err)
@@ -851,7 +851,7 @@ func testGetAllPrivateTeamListing(t *testing.T, ss store.Store) {
o2.DisplayName = "DisplayName"
o2.Name = NewTestId()
o2.Email = MakeEmail()
o2.Type = model.TEAM_OPEN
o2.Type = model.TeamOpen
_, err = ss.Team().Save(&o2)
require.NoError(t, err)
@@ -859,7 +859,7 @@ func testGetAllPrivateTeamListing(t *testing.T, ss store.Store) {
o3.DisplayName = "DisplayName"
o3.Name = NewTestId()
o3.Email = MakeEmail()
o3.Type = model.TEAM_INVITE
o3.Type = model.TeamInvite
o3.AllowOpenInvite = true
_, err = ss.Team().Save(&o3)
require.NoError(t, err)
@@ -868,7 +868,7 @@ func testGetAllPrivateTeamListing(t *testing.T, ss store.Store) {
o4.DisplayName = "DisplayName"
o4.Name = NewTestId()
o4.Email = MakeEmail()
o4.Type = model.TEAM_INVITE
o4.Type = model.TeamInvite
_, err = ss.Team().Save(&o4)
require.NoError(t, err)
@@ -886,7 +886,7 @@ func testGetAllPrivateTeamPageListing(t *testing.T, ss store.Store) {
o1.DisplayName = "DisplayName"
o1.Name = NewTestId()
o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
o1.Type = model.TeamOpen
o1.AllowOpenInvite = true
_, err := ss.Team().Save(&o1)
require.NoError(t, err)
@@ -895,7 +895,7 @@ func testGetAllPrivateTeamPageListing(t *testing.T, ss store.Store) {
o2.DisplayName = "DisplayName"
o2.Name = NewTestId()
o2.Email = MakeEmail()
o2.Type = model.TEAM_OPEN
o2.Type = model.TeamOpen
o2.AllowOpenInvite = false
_, err = ss.Team().Save(&o2)
require.NoError(t, err)
@@ -904,7 +904,7 @@ func testGetAllPrivateTeamPageListing(t *testing.T, ss store.Store) {
o3.DisplayName = "DisplayName"
o3.Name = NewTestId()
o3.Email = MakeEmail()
o3.Type = model.TEAM_INVITE
o3.Type = model.TeamInvite
o3.AllowOpenInvite = true
_, err = ss.Team().Save(&o3)
require.NoError(t, err)
@@ -913,7 +913,7 @@ func testGetAllPrivateTeamPageListing(t *testing.T, ss store.Store) {
o4.DisplayName = "DisplayName"
o4.Name = NewTestId()
o4.Email = MakeEmail()
o4.Type = model.TEAM_INVITE
o4.Type = model.TeamInvite
o4.AllowOpenInvite = false
_, err = ss.Team().Save(&o4)
require.NoError(t, err)
@@ -932,7 +932,7 @@ func testGetAllPrivateTeamPageListing(t *testing.T, ss store.Store) {
o5.DisplayName = "DisplayName"
o5.Name = NewTestId()
o5.Email = MakeEmail()
o5.Type = model.TEAM_OPEN
o5.Type = model.TeamOpen
o5.AllowOpenInvite = true
_, err = ss.Team().Save(&o5)
require.NoError(t, err)
@@ -961,7 +961,7 @@ func testGetAllPublicTeamPageListing(t *testing.T, ss store.Store) {
o1.DisplayName = "DisplayName1"
o1.Name = NewTestId()
o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
o1.Type = model.TeamOpen
o1.AllowOpenInvite = true
t1, err := ss.Team().Save(&o1)
require.NoError(t, err)
@@ -970,7 +970,7 @@ func testGetAllPublicTeamPageListing(t *testing.T, ss store.Store) {
o2.DisplayName = "DisplayName2"
o2.Name = NewTestId()
o2.Email = MakeEmail()
o2.Type = model.TEAM_OPEN
o2.Type = model.TeamOpen
o2.AllowOpenInvite = false
_, err = ss.Team().Save(&o2)
require.NoError(t, err)
@@ -979,7 +979,7 @@ func testGetAllPublicTeamPageListing(t *testing.T, ss store.Store) {
o3.DisplayName = "DisplayName3"
o3.Name = NewTestId()
o3.Email = MakeEmail()
o3.Type = model.TEAM_INVITE
o3.Type = model.TeamInvite
o3.AllowOpenInvite = true
t3, err := ss.Team().Save(&o3)
require.NoError(t, err)
@@ -988,7 +988,7 @@ func testGetAllPublicTeamPageListing(t *testing.T, ss store.Store) {
o4.DisplayName = "DisplayName4"
o4.Name = NewTestId()
o4.Email = MakeEmail()
o4.Type = model.TEAM_INVITE
o4.Type = model.TeamInvite
o4.AllowOpenInvite = false
_, err = ss.Team().Save(&o4)
require.NoError(t, err)
@@ -1003,7 +1003,7 @@ func testGetAllPublicTeamPageListing(t *testing.T, ss store.Store) {
o5.DisplayName = "DisplayName5"
o5.Name = NewTestId()
o5.Email = MakeEmail()
o5.Type = model.TEAM_OPEN
o5.Type = model.TeamOpen
o5.AllowOpenInvite = true
t5, err := ss.Team().Save(&o5)
require.NoError(t, err)
@@ -1021,7 +1021,7 @@ func testDelete(t *testing.T, ss store.Store) {
o1.DisplayName = "DisplayName"
o1.Name = NewTestId()
o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
o1.Type = model.TeamOpen
o1.AllowOpenInvite = true
_, err := ss.Team().Save(&o1)
require.NoError(t, err)
@@ -1030,7 +1030,7 @@ func testDelete(t *testing.T, ss store.Store) {
o2.DisplayName = "DisplayName"
o2.Name = NewTestId()
o2.Email = MakeEmail()
o2.Type = model.TEAM_OPEN
o2.Type = model.TeamOpen
_, err = ss.Team().Save(&o2)
require.NoError(t, err)
@@ -1045,7 +1045,7 @@ func testPublicTeamCount(t *testing.T, ss store.Store) {
o1.DisplayName = "DisplayName"
o1.Name = NewTestId()
o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
o1.Type = model.TeamOpen
o1.AllowOpenInvite = true
_, err := ss.Team().Save(&o1)
require.NoError(t, err)
@@ -1054,7 +1054,7 @@ func testPublicTeamCount(t *testing.T, ss store.Store) {
o2.DisplayName = "DisplayName"
o2.Name = NewTestId()
o2.Email = MakeEmail()
o2.Type = model.TEAM_OPEN
o2.Type = model.TeamOpen
o2.AllowOpenInvite = false
_, err = ss.Team().Save(&o2)
require.NoError(t, err)
@@ -1063,7 +1063,7 @@ func testPublicTeamCount(t *testing.T, ss store.Store) {
o3.DisplayName = "DisplayName"
o3.Name = NewTestId()
o3.Email = MakeEmail()
o3.Type = model.TEAM_OPEN
o3.Type = model.TeamOpen
o3.AllowOpenInvite = true
_, err = ss.Team().Save(&o3)
require.NoError(t, err)
@@ -1080,7 +1080,7 @@ func testPrivateTeamCount(t *testing.T, ss store.Store) {
o1.DisplayName = "DisplayName"
o1.Name = NewTestId()
o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
o1.Type = model.TeamOpen
o1.AllowOpenInvite = false
_, err := ss.Team().Save(&o1)
require.NoError(t, err)
@@ -1089,7 +1089,7 @@ func testPrivateTeamCount(t *testing.T, ss store.Store) {
o2.DisplayName = "DisplayName"
o2.Name = NewTestId()
o2.Email = MakeEmail()
o2.Type = model.TEAM_OPEN
o2.Type = model.TeamOpen
o2.AllowOpenInvite = true
_, err = ss.Team().Save(&o2)
require.NoError(t, err)
@@ -1098,7 +1098,7 @@ func testPrivateTeamCount(t *testing.T, ss store.Store) {
o3.DisplayName = "DisplayName"
o3.Name = NewTestId()
o3.Email = MakeEmail()
o3.Type = model.TEAM_OPEN
o3.Type = model.TeamOpen
o3.AllowOpenInvite = false
_, err = ss.Team().Save(&o3)
require.NoError(t, err)
@@ -1113,7 +1113,7 @@ func testTeamCount(t *testing.T, ss store.Store) {
o1.DisplayName = "DisplayName"
o1.Name = NewTestId()
o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
o1.Type = model.TeamOpen
o1.AllowOpenInvite = true
team, err := ss.Team().Save(&o1)
require.NoError(t, err)
@@ -1381,7 +1381,7 @@ func testTeamSaveMember(t *testing.T, ss store.Store) {
DisplayName: "Name",
Name: NewTestId(),
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
}
team, nErr := ss.Team().Save(team)
@@ -1522,7 +1522,7 @@ func testTeamSaveMember(t *testing.T, ss store.Store) {
Name: NewTestId(),
DisplayName: NewTestId(),
Description: NewTestId(),
Scope: model.SCHEME_SCOPE_TEAM,
Scope: model.SchemeScopeTeam,
}
ts, nErr := ss.Scheme().Save(ts)
require.NoError(t, nErr)
@@ -1531,7 +1531,7 @@ func testTeamSaveMember(t *testing.T, ss store.Store) {
DisplayName: "Name",
Name: NewTestId(),
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
SchemeId: &ts.Id,
}
@@ -1737,7 +1737,7 @@ func testTeamSaveMultipleMembers(t *testing.T, ss store.Store) {
DisplayName: "Name",
Name: NewTestId(),
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
}
team, nErr := ss.Team().Save(team)
@@ -1890,7 +1890,7 @@ func testTeamSaveMultipleMembers(t *testing.T, ss store.Store) {
Name: NewTestId(),
DisplayName: NewTestId(),
Description: NewTestId(),
Scope: model.SCHEME_SCOPE_TEAM,
Scope: model.SchemeScopeTeam,
}
ts, nErr := ss.Scheme().Save(ts)
require.NoError(t, nErr)
@@ -1899,7 +1899,7 @@ func testTeamSaveMultipleMembers(t *testing.T, ss store.Store) {
DisplayName: "Name",
Name: NewTestId(),
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
SchemeId: &ts.Id,
}
@@ -2066,7 +2066,7 @@ func testTeamUpdateMember(t *testing.T, ss store.Store) {
DisplayName: "Name",
Name: NewTestId(),
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
}
team, nErr := ss.Team().Save(team)
@@ -2207,7 +2207,7 @@ func testTeamUpdateMember(t *testing.T, ss store.Store) {
Name: NewTestId(),
DisplayName: NewTestId(),
Description: NewTestId(),
Scope: model.SCHEME_SCOPE_TEAM,
Scope: model.SchemeScopeTeam,
}
ts, nErr := ss.Scheme().Save(ts)
require.NoError(t, nErr)
@@ -2216,7 +2216,7 @@ func testTeamUpdateMember(t *testing.T, ss store.Store) {
DisplayName: "Name",
Name: NewTestId(),
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
SchemeId: &ts.Id,
}
@@ -2375,7 +2375,7 @@ func testTeamUpdateMultipleMembers(t *testing.T, ss store.Store) {
DisplayName: "Name",
Name: NewTestId(),
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
}
team, nErr := ss.Team().Save(team)
@@ -2524,7 +2524,7 @@ func testTeamUpdateMultipleMembers(t *testing.T, ss store.Store) {
Name: NewTestId(),
DisplayName: NewTestId(),
Description: NewTestId(),
Scope: model.SCHEME_SCOPE_TEAM,
Scope: model.SchemeScopeTeam,
}
ts, nErr := ss.Scheme().Save(ts)
require.NoError(t, nErr)
@@ -2533,7 +2533,7 @@ func testTeamUpdateMultipleMembers(t *testing.T, ss store.Store) {
DisplayName: "Name",
Name: NewTestId(),
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
SchemeId: &ts.Id,
}
@@ -2834,7 +2834,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, ss store.Store) {
team, errSave := ss.Team().Save(&model.Team{
DisplayName: "DisplayName",
Name: NewTestId(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
})
require.NoError(t, errSave)
defer func() {
@@ -2956,7 +2956,7 @@ func testGetTeamMember(t *testing.T, ss store.Store) {
Name: NewTestId(),
DisplayName: NewTestId(),
Description: NewTestId(),
Scope: model.SCHEME_SCOPE_TEAM,
Scope: model.SchemeScopeTeam,
}
s2, nErr = ss.Scheme().Save(s2)
require.NoError(t, nErr)
@@ -2965,7 +2965,7 @@ func testGetTeamMember(t *testing.T, ss store.Store) {
t2, nErr := ss.Team().Save(&model.Team{
DisplayName: "DisplayName",
Name: NewTestId(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
SchemeId: &s2.Id,
})
require.NoError(t, nErr)
@@ -3078,11 +3078,11 @@ func testGetChannelUnreadsForAllTeams(t *testing.T, ss store.Store) {
_, nErr = ss.Team().SaveMember(m2, -1)
require.NoError(t, nErr)
c1 := &model.Channel{TeamId: m1.TeamId, Name: model.NewId(), DisplayName: "Town Square", Type: model.CHANNEL_OPEN, TotalMsgCount: 100}
c1 := &model.Channel{TeamId: m1.TeamId, Name: model.NewId(), DisplayName: "Town Square", Type: model.ChannelTypeOpen, TotalMsgCount: 100}
_, nErr = ss.Channel().Save(c1, -1)
require.NoError(t, nErr)
c2 := &model.Channel{TeamId: m2.TeamId, Name: model.NewId(), DisplayName: "Town Square", Type: model.CHANNEL_OPEN, TotalMsgCount: 100}
c2 := &model.Channel{TeamId: m2.TeamId, Name: model.NewId(), DisplayName: "Town Square", Type: model.ChannelTypeOpen, TotalMsgCount: 100}
_, nErr = ss.Channel().Save(c2, -1)
require.NoError(t, nErr)
@@ -3132,11 +3132,11 @@ func testGetChannelUnreadsForTeam(t *testing.T, ss store.Store) {
_, nErr := ss.Team().SaveMember(m1, -1)
require.NoError(t, nErr)
c1 := &model.Channel{TeamId: m1.TeamId, Name: model.NewId(), DisplayName: "Town Square", Type: model.CHANNEL_OPEN, TotalMsgCount: 100}
c1 := &model.Channel{TeamId: m1.TeamId, Name: model.NewId(), DisplayName: "Town Square", Type: model.ChannelTypeOpen, TotalMsgCount: 100}
_, nErr = ss.Channel().Save(c1, -1)
require.NoError(t, nErr)
c2 := &model.Channel{TeamId: m1.TeamId, Name: model.NewId(), DisplayName: "Town Square", Type: model.CHANNEL_OPEN, TotalMsgCount: 100}
c2 := &model.Channel{TeamId: m1.TeamId, Name: model.NewId(), DisplayName: "Town Square", Type: model.ChannelTypeOpen, TotalMsgCount: 100}
_, nErr = ss.Channel().Save(c2, -1)
require.NoError(t, nErr)
@@ -3163,7 +3163,7 @@ func testUpdateLastTeamIconUpdate(t *testing.T, ss store.Store) {
o1.DisplayName = "Display Name"
o1.Name = "z-z-z" + model.NewId() + "b"
o1.Email = MakeEmail()
o1.Type = model.TEAM_OPEN
o1.Type = model.TeamOpen
o1.LastTeamIconUpdate = lastTeamIconUpdateInitial
o1, err := ss.Team().Save(o1)
require.NoError(t, err)
@@ -3185,14 +3185,14 @@ func testGetTeamsByScheme(t *testing.T, ss store.Store) {
DisplayName: NewTestId(),
Name: NewTestId(),
Description: NewTestId(),
Scope: model.SCHEME_SCOPE_TEAM,
Scope: model.SchemeScopeTeam,
}
s2 := &model.Scheme{
DisplayName: NewTestId(),
Name: NewTestId(),
Description: NewTestId(),
Scope: model.SCHEME_SCOPE_TEAM,
Scope: model.SchemeScopeTeam,
}
s1, err := ss.Scheme().Save(s1)
@@ -3205,7 +3205,7 @@ func testGetTeamsByScheme(t *testing.T, ss store.Store) {
Name: NewTestId(),
DisplayName: NewTestId(),
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
SchemeId: &s1.Id,
}
@@ -3213,7 +3213,7 @@ func testGetTeamsByScheme(t *testing.T, ss store.Store) {
Name: NewTestId(),
DisplayName: NewTestId(),
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
SchemeId: &s1.Id,
}
@@ -3221,7 +3221,7 @@ func testGetTeamsByScheme(t *testing.T, ss store.Store) {
Name: NewTestId(),
DisplayName: NewTestId(),
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
}
_, err = ss.Team().Save(t1)
@@ -3255,7 +3255,7 @@ func testTeamStoreMigrateTeamMembers(t *testing.T, ss store.Store) {
DisplayName: "Name",
Name: NewTestId(),
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
InviteId: model.NewId(),
SchemeId: &s1,
}
@@ -3323,7 +3323,7 @@ func testResetAllTeamSchemes(t *testing.T, ss store.Store) {
Name: NewTestId(),
DisplayName: NewTestId(),
Description: NewTestId(),
Scope: model.SCHEME_SCOPE_TEAM,
Scope: model.SchemeScopeTeam,
}
s1, err := ss.Scheme().Save(s1)
require.NoError(t, err)
@@ -3332,7 +3332,7 @@ func testResetAllTeamSchemes(t *testing.T, ss store.Store) {
Name: NewTestId(),
DisplayName: NewTestId(),
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
SchemeId: &s1.Id,
}
@@ -3340,7 +3340,7 @@ func testResetAllTeamSchemes(t *testing.T, ss store.Store) {
Name: NewTestId(),
DisplayName: NewTestId(),
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
SchemeId: &s1.Id,
}
@@ -3414,7 +3414,7 @@ func testTeamStoreAnalyticsGetTeamCountForScheme(t *testing.T, ss store.Store) {
DisplayName: NewTestId(),
Name: NewTestId(),
Description: NewTestId(),
Scope: model.SCHEME_SCOPE_TEAM,
Scope: model.SchemeScopeTeam,
}
s1, err := ss.Scheme().Save(s1)
require.NoError(t, err)
@@ -3427,7 +3427,7 @@ func testTeamStoreAnalyticsGetTeamCountForScheme(t *testing.T, ss store.Store) {
Name: NewTestId(),
DisplayName: NewTestId(),
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
SchemeId: &s1.Id,
}
_, err = ss.Team().Save(t1)
@@ -3441,7 +3441,7 @@ func testTeamStoreAnalyticsGetTeamCountForScheme(t *testing.T, ss store.Store) {
Name: NewTestId(),
DisplayName: NewTestId(),
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
SchemeId: &s1.Id,
}
_, err = ss.Team().Save(t2)
@@ -3455,7 +3455,7 @@ func testTeamStoreAnalyticsGetTeamCountForScheme(t *testing.T, ss store.Store) {
Name: NewTestId(),
DisplayName: NewTestId(),
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
}
_, err = ss.Team().Save(t3)
require.NoError(t, err)
@@ -3468,7 +3468,7 @@ func testTeamStoreAnalyticsGetTeamCountForScheme(t *testing.T, ss store.Store) {
Name: NewTestId(),
DisplayName: NewTestId(),
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
SchemeId: &s1.Id,
DeleteAt: model.GetMillis(),
}
@@ -3485,7 +3485,7 @@ func testTeamStoreGetAllForExportAfter(t *testing.T, ss store.Store) {
t1.DisplayName = "Name"
t1.Name = NewTestId()
t1.Email = MakeEmail()
t1.Type = model.TEAM_OPEN
t1.Type = model.TeamOpen
_, err := ss.Team().Save(&t1)
require.NoError(t, err)
@@ -3509,7 +3509,7 @@ func testTeamStoreGetTeamMembersForExport(t *testing.T, ss store.Store) {
t1.DisplayName = "Name"
t1.Name = NewTestId()
t1.Email = MakeEmail()
t1.Type = model.TEAM_OPEN
t1.Type = model.TeamOpen
_, err := ss.Team().Save(&t1)
require.NoError(t, err)
@@ -3546,7 +3546,7 @@ func testGroupSyncedTeamCount(t *testing.T, ss store.Store) {
DisplayName: NewTestId(),
Name: NewTestId(),
Email: MakeEmail(),
Type: model.TEAM_INVITE,
Type: model.TeamInvite,
GroupConstrained: model.NewBool(true),
})
require.NoError(t, err)
@@ -3557,7 +3557,7 @@ func testGroupSyncedTeamCount(t *testing.T, ss store.Store) {
DisplayName: NewTestId(),
Name: "zz" + model.NewId(),
Email: MakeEmail(),
Type: model.TEAM_INVITE,
Type: model.TeamInvite,
})
require.NoError(t, err)
require.False(t, team2.IsGroupConstrained())

10
store/storetest/thread_store.go
Просмотреть файл

@@ -39,7 +39,7 @@ func testThreadStorePopulation(t *testing.T, ss store.Store) {
c, err2 := ss.Channel().Save(&model.Channel{
DisplayName: model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
Name: model.NewId(),
}, 999)
require.NoError(t, err2)
@@ -455,14 +455,14 @@ func testThreadStorePermanentDeleteBatchForRetentionPolicies(t *testing.T, ss st
DisplayName: "DisplayName",
Name: "team" + model.NewId(),
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
})
require.NoError(t, err)
channel, err := ss.Channel().Save(&model.Channel{
TeamId: team.Id,
DisplayName: "DisplayName",
Name: "channel" + model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}, -1)
require.NoError(t, err)
@@ -544,14 +544,14 @@ func testThreadStorePermanentDeleteBatchThreadMembershipsForRetentionPolicies(t
DisplayName: "DisplayName",
Name: "team" + model.NewId(),
Email: MakeEmail(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
})
require.NoError(t, err)
channel, err := ss.Channel().Save(&model.Channel{
TeamId: team.Id,
DisplayName: "DisplayName",
Name: "channel" + model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}, -1)
require.NoError(t, err)
post, err := ss.Post().Save(&model.Post{

280
store/storetest/user_store.go
Просмотреть файл

@@ -370,7 +370,7 @@ func testUserStoreGetAllProfiles(t *testing.T, ss store.Store) {
u1, err := ss.User().Save(&model.User{
Email: MakeEmail(),
Username: "u1" + model.NewId(),
Roles: model.SYSTEM_USER_ROLE_ID,
Roles: model.SystemUserRoleId,
})
require.NoError(t, err)
defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }()
@@ -378,7 +378,7 @@ func testUserStoreGetAllProfiles(t *testing.T, ss store.Store) {
u2, err := ss.User().Save(&model.User{
Email: MakeEmail(),
Username: "u2" + model.NewId(),
Roles: model.SYSTEM_USER_ROLE_ID,
Roles: model.SystemUserRoleId,
})
require.NoError(t, err)
defer func() { require.NoError(t, ss.User().PermanentDelete(u2.Id)) }()
@@ -427,7 +427,7 @@ func testUserStoreGetAllProfiles(t *testing.T, ss store.Store) {
Email: MakeEmail(),
Username: "u7" + model.NewId(),
DeleteAt: model.GetMillis(),
Roles: model.SYSTEM_USER_ROLE_ID,
Roles: model.SystemUserRoleId,
})
require.NoError(t, err)
defer func() { require.NoError(t, ss.User().PermanentDelete(u7.Id)) }()
@@ -846,7 +846,7 @@ func testUserStoreGetProfilesInChannel(t *testing.T, ss store.Store) {
TeamId: teamId,
DisplayName: "Profiles in channel",
Name: "profiles-" + model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
c1, nErr := ss.Channel().Save(ch1, -1)
require.NoError(t, nErr)
@@ -855,7 +855,7 @@ func testUserStoreGetProfilesInChannel(t *testing.T, ss store.Store) {
TeamId: teamId,
DisplayName: "Profiles in private",
Name: "profiles-" + model.NewId(),
Type: model.CHANNEL_PRIVATE,
Type: model.ChannelTypePrivate,
}
c2, nErr := ss.Channel().Save(ch2, -1)
require.NoError(t, nErr)
@@ -1013,7 +1013,7 @@ func testUserStoreGetProfilesInChannelByStatus(t *testing.T, ss store.Store, s S
TeamId: teamId,
DisplayName: "Profiles in channel",
Name: "profiles-" + model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
c1, nErr := ss.Channel().Save(ch1, -1)
require.NoError(t, nErr)
@@ -1022,7 +1022,7 @@ func testUserStoreGetProfilesInChannelByStatus(t *testing.T, ss store.Store, s S
TeamId: teamId,
DisplayName: "Profiles in private",
Name: "profiles-" + model.NewId(),
Type: model.CHANNEL_PRIVATE,
Type: model.ChannelTypePrivate,
}
c2, nErr := ss.Channel().Save(ch2, -1)
require.NoError(t, nErr)
@@ -1067,15 +1067,15 @@ func testUserStoreGetProfilesInChannelByStatus(t *testing.T, ss store.Store, s S
require.NoError(t, nErr)
require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{
UserId: u1.Id,
Status: model.STATUS_DND,
Status: model.StatusDnd,
}))
require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{
UserId: u2.Id,
Status: model.STATUS_AWAY,
Status: model.StatusAway,
}))
require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{
UserId: u3.Id,
Status: model.STATUS_ONLINE,
Status: model.StatusOnline,
}))
t.Run("get all users in channel 1, offset 0, limit 100", func(t *testing.T) {
@@ -1230,7 +1230,7 @@ func testUserStoreGetAllProfilesInChannel(t *testing.T, ss store.Store) {
TeamId: teamId,
DisplayName: "Profiles in channel",
Name: "profiles-" + model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
c1, nErr := ss.Channel().Save(ch1, -1)
require.NoError(t, nErr)
@@ -1239,7 +1239,7 @@ func testUserStoreGetAllProfilesInChannel(t *testing.T, ss store.Store) {
TeamId: teamId,
DisplayName: "Profiles in private",
Name: "profiles-" + model.NewId(),
Type: model.CHANNEL_PRIVATE,
Type: model.ChannelTypePrivate,
}
c2, nErr := ss.Channel().Save(ch2, -1)
require.NoError(t, nErr)
@@ -1356,7 +1356,7 @@ func testUserStoreGetProfilesNotInChannel(t *testing.T, ss store.Store) {
TeamId: teamId,
DisplayName: "Profiles in channel",
Name: "profiles-" + model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
c1, nErr := ss.Channel().Save(ch1, -1)
require.NoError(t, nErr)
@@ -1365,7 +1365,7 @@ func testUserStoreGetProfilesNotInChannel(t *testing.T, ss store.Store) {
TeamId: teamId,
DisplayName: "Profiles in private",
Name: "profiles-" + model.NewId(),
Type: model.CHANNEL_PRIVATE,
Type: model.ChannelTypePrivate,
}
c2, nErr := ss.Channel().Save(ch2, -1)
require.NoError(t, nErr)
@@ -1595,7 +1595,7 @@ func testUserStoreGetProfileByGroupChannelIdsForUser(t *testing.T, ss store.Stor
gc1, nErr := ss.Channel().Save(&model.Channel{
DisplayName: "Profiles in private",
Name: "profiles-" + model.NewId(),
Type: model.CHANNEL_GROUP,
Type: model.ChannelTypeGroup,
}, -1)
require.NoError(t, nErr)
@@ -1611,7 +1611,7 @@ func testUserStoreGetProfileByGroupChannelIdsForUser(t *testing.T, ss store.Stor
gc2, nErr := ss.Channel().Save(&model.Channel{
DisplayName: "Profiles in private",
Name: "profiles-" + model.NewId(),
Type: model.CHANNEL_GROUP,
Type: model.ChannelTypeGroup,
}, -1)
require.NoError(t, nErr)
@@ -1760,7 +1760,7 @@ func testUserStoreGetSystemAdminProfiles(t *testing.T, ss store.Store) {
u1, err := ss.User().Save(&model.User{
Email: MakeEmail(),
Roles: model.SYSTEM_USER_ROLE_ID + " " + model.SYSTEM_ADMIN_ROLE_ID,
Roles: model.SystemUserRoleId + " " + model.SystemAdminRoleId,
Username: "u1" + model.NewId(),
})
require.NoError(t, err)
@@ -1779,7 +1779,7 @@ func testUserStoreGetSystemAdminProfiles(t *testing.T, ss store.Store) {
u3, err := ss.User().Save(&model.User{
Email: MakeEmail(),
Roles: model.SYSTEM_USER_ROLE_ID + " " + model.SYSTEM_ADMIN_ROLE_ID,
Roles: model.SystemUserRoleId + " " + model.SystemAdminRoleId,
Username: "u3" + model.NewId(),
})
require.NoError(t, err)
@@ -2032,7 +2032,7 @@ func testUserStoreGetForLogin(t *testing.T, ss store.Store) {
u1, err := ss.User().Save(&model.User{
Email: MakeEmail(),
Username: "u1" + model.NewId(),
AuthService: model.USER_AUTH_SERVICE_GITLAB,
AuthService: model.UserAuthServiceGitlab,
AuthData: &auth,
})
@@ -2044,7 +2044,7 @@ func testUserStoreGetForLogin(t *testing.T, ss store.Store) {
u2, err := ss.User().Save(&model.User{
Email: MakeEmail(),
Username: "u2" + model.NewId(),
AuthService: model.USER_AUTH_SERVICE_LDAP,
AuthService: model.UserAuthServiceLdap,
AuthData: &auth2,
})
require.NoError(t, err)
@@ -2055,7 +2055,7 @@ func testUserStoreGetForLogin(t *testing.T, ss store.Store) {
u3, err := ss.User().Save(&model.User{
Email: MakeEmail(),
Username: "u3" + model.NewId(),
AuthService: model.USER_AUTH_SERVICE_LDAP,
AuthService: model.UserAuthServiceLdap,
AuthData: &auth3,
})
require.NoError(t, err)
@@ -2194,17 +2194,17 @@ func testUserStoreResetAuthDataToEmailForUsers(t *testing.T, ss store.Store) {
resetAuthDataToID := func() {
_, err = ss.User().UpdateAuthData(
user.Id, model.USER_AUTH_SERVICE_SAML, model.NewString("some-id"), "", false)
user.Id, model.UserAuthServiceSaml, model.NewString("some-id"), "", false)
require.NoError(t, err)
}
resetAuthDataToID()
// dry run
numAffected, err := ss.User().ResetAuthDataToEmailForUsers(model.USER_AUTH_SERVICE_SAML, nil, false, true)
numAffected, err := ss.User().ResetAuthDataToEmailForUsers(model.UserAuthServiceSaml, nil, false, true)
require.NoError(t, err)
require.Equal(t, 1, numAffected)
// real run
numAffected, err = ss.User().ResetAuthDataToEmailForUsers(model.USER_AUTH_SERVICE_SAML, nil, false, false)
numAffected, err = ss.User().ResetAuthDataToEmailForUsers(model.UserAuthServiceSaml, nil, false, false)
require.NoError(t, err)
require.Equal(t, 1, numAffected)
user, appErr := ss.User().Get(context.Background(), user.Id)
@@ -2213,10 +2213,10 @@ func testUserStoreResetAuthDataToEmailForUsers(t *testing.T, ss store.Store) {
resetAuthDataToID()
// with specific user IDs
numAffected, err = ss.User().ResetAuthDataToEmailForUsers(model.USER_AUTH_SERVICE_SAML, []string{model.NewId()}, false, true)
numAffected, err = ss.User().ResetAuthDataToEmailForUsers(model.UserAuthServiceSaml, []string{model.NewId()}, false, true)
require.NoError(t, err)
require.Equal(t, 0, numAffected)
numAffected, err = ss.User().ResetAuthDataToEmailForUsers(model.USER_AUTH_SERVICE_SAML, []string{user.Id}, false, true)
numAffected, err = ss.User().ResetAuthDataToEmailForUsers(model.UserAuthServiceSaml, []string{user.Id}, false, true)
require.NoError(t, err)
require.Equal(t, 1, numAffected)
@@ -2224,11 +2224,11 @@ func testUserStoreResetAuthDataToEmailForUsers(t *testing.T, ss store.Store) {
user.DeleteAt = model.GetMillisForTime(time.Now())
ss.User().Update(user, true)
// without deleted user
numAffected, err = ss.User().ResetAuthDataToEmailForUsers(model.USER_AUTH_SERVICE_SAML, nil, false, true)
numAffected, err = ss.User().ResetAuthDataToEmailForUsers(model.UserAuthServiceSaml, nil, false, true)
require.NoError(t, err)
require.Equal(t, 0, numAffected)
// with deleted user
numAffected, err = ss.User().ResetAuthDataToEmailForUsers(model.USER_AUTH_SERVICE_SAML, nil, true, true)
numAffected, err = ss.User().ResetAuthDataToEmailForUsers(model.UserAuthServiceSaml, nil, true, true)
require.NoError(t, err)
require.Equal(t, 1, numAffected)
}
@@ -2240,13 +2240,13 @@ func testUserUnreadCount(t *testing.T, ss store.Store) {
c1.TeamId = teamId
c1.DisplayName = "Unread Messages"
c1.Name = "unread-messages-" + model.NewId()
c1.Type = model.CHANNEL_OPEN
c1.Type = model.ChannelTypeOpen
c2 := model.Channel{}
c2.TeamId = teamId
c2.DisplayName = "Unread Direct"
c2.Name = "unread-direct-" + model.NewId()
c2.Type = model.CHANNEL_DIRECT
c2.Type = model.ChannelTypeDirect
u1 := &model.User{}
u1.Username = "user1" + model.NewId()
@@ -2414,9 +2414,9 @@ func testUserStoreGetRecentlyActiveUsersForTeam(t *testing.T, ss store.Store, s
u2.LastActivityAt = millis - 1
u1.LastActivityAt = millis - 1
require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u1.Id, Status: model.STATUS_ONLINE, Manual: false, LastActivityAt: u1.LastActivityAt, ActiveChannel: ""}))
require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u2.Id, Status: model.STATUS_ONLINE, Manual: false, LastActivityAt: u2.LastActivityAt, ActiveChannel: ""}))
require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u3.Id, Status: model.STATUS_ONLINE, Manual: false, LastActivityAt: u3.LastActivityAt, ActiveChannel: ""}))
require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u1.Id, Status: model.StatusOnline, Manual: false, LastActivityAt: u1.LastActivityAt, ActiveChannel: ""}))
require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u2.Id, Status: model.StatusOnline, Manual: false, LastActivityAt: u2.LastActivityAt, ActiveChannel: ""}))
require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u3.Id, Status: model.StatusOnline, Manual: false, LastActivityAt: u3.LastActivityAt, ActiveChannel: ""}))
t.Run("get team 1, offset 0, limit 100", func(t *testing.T) {
users, err := ss.User().GetRecentlyActiveUsersForTeam(teamId, 0, 100, nil)
@@ -2603,7 +2603,7 @@ func testUserStoreSearch(t *testing.T, ss store.Store) {
"jimb",
&model.UserSearchOptions{
AllowFullNames: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Limit: model.UserSearchDefaultLimit,
},
[]*model.User{u1, u3},
},
@@ -2613,8 +2613,8 @@ func testUserStoreSearch(t *testing.T, ss store.Store) {
"jimb",
&model.UserSearchOptions{
AllowFullNames: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
TeamRoles: []string{model.TEAM_GUEST_ROLE_ID, model.TEAM_ADMIN_ROLE_ID},
Limit: model.UserSearchDefaultLimit,
TeamRoles: []string{model.TeamGuestRoleId, model.TeamAdminRoleId},
},
[]*model.User{u3},
},
@@ -2624,9 +2624,9 @@ func testUserStoreSearch(t *testing.T, ss store.Store) {
"jimb",
&model.UserSearchOptions{
AllowFullNames: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Roles: []string{model.SYSTEM_ADMIN_ROLE_ID},
TeamRoles: []string{model.TEAM_ADMIN_ROLE_ID},
Limit: model.UserSearchDefaultLimit,
Roles: []string{model.SystemAdminRoleId},
TeamRoles: []string{model.TeamAdminRoleId},
},
[]*model.User{u1},
},
@@ -2636,8 +2636,8 @@ func testUserStoreSearch(t *testing.T, ss store.Store) {
"jim",
&model.UserSearchOptions{
AllowFullNames: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
TeamRoles: []string{model.TEAM_ADMIN_ROLE_ID},
Limit: model.UserSearchDefaultLimit,
TeamRoles: []string{model.TeamAdminRoleId},
},
[]*model.User{u2},
},
@@ -2647,8 +2647,8 @@ func testUserStoreSearch(t *testing.T, ss store.Store) {
"jim",
&model.UserSearchOptions{
AllowFullNames: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
TeamRoles: []string{model.TEAM_ADMIN_ROLE_ID, model.TEAM_GUEST_ROLE_ID},
Limit: model.UserSearchDefaultLimit,
TeamRoles: []string{model.TeamAdminRoleId, model.TeamGuestRoleId},
},
[]*model.User{u2, u3},
},
@@ -2658,9 +2658,9 @@ func testUserStoreSearch(t *testing.T, ss store.Store) {
"jim",
&model.UserSearchOptions{
AllowFullNames: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Roles: []string{model.SYSTEM_ADMIN_ROLE_ID},
TeamRoles: []string{model.TEAM_ADMIN_ROLE_ID},
Limit: model.UserSearchDefaultLimit,
Roles: []string{model.SystemAdminRoleId},
TeamRoles: []string{model.TeamAdminRoleId},
},
[]*model.User{u2, u1},
},
@@ -2670,8 +2670,8 @@ func testUserStoreSearch(t *testing.T, ss store.Store) {
"jim",
&model.UserSearchOptions{
AllowFullNames: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Roles: []string{model.SYSTEM_GUEST_ROLE_ID},
Limit: model.UserSearchDefaultLimit,
Roles: []string{model.SystemGuestRoleId},
TeamRoles: []string{},
},
[]*model.User{u3},
@@ -2748,7 +2748,7 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) {
TeamId: tid,
DisplayName: "NameName",
Name: "zz" + model.NewId() + "b",
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
c1, nErr := ss.Channel().Save(&ch1, -1)
require.NoError(t, nErr)
@@ -2757,7 +2757,7 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) {
TeamId: tid,
DisplayName: "NameName",
Name: "zz" + model.NewId() + "b",
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
c2, nErr := ss.Channel().Save(&ch2, -1)
require.NoError(t, nErr)
@@ -2796,7 +2796,7 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) {
"jimb",
&model.UserSearchOptions{
AllowFullNames: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Limit: model.UserSearchDefaultLimit,
},
[]*model.User{u1},
},
@@ -2808,7 +2808,7 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) {
&model.UserSearchOptions{
AllowFullNames: true,
AllowInactive: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Limit: model.UserSearchDefaultLimit,
},
[]*model.User{u1},
},
@@ -2819,7 +2819,7 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) {
"jimb",
&model.UserSearchOptions{
AllowFullNames: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Limit: model.UserSearchDefaultLimit,
},
[]*model.User{u1},
},
@@ -2830,7 +2830,7 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) {
"jimb",
&model.UserSearchOptions{
AllowFullNames: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Limit: model.UserSearchDefaultLimit,
},
[]*model.User{},
},
@@ -2841,7 +2841,7 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) {
"jimb",
&model.UserSearchOptions{
AllowFullNames: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Limit: model.UserSearchDefaultLimit,
},
[]*model.User{},
},
@@ -2853,7 +2853,7 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) {
&model.UserSearchOptions{
AllowFullNames: true,
AllowInactive: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Limit: model.UserSearchDefaultLimit,
},
[]*model.User{u3},
},
@@ -2864,7 +2864,7 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) {
"jimb",
&model.UserSearchOptions{
AllowFullNames: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Limit: model.UserSearchDefaultLimit,
},
[]*model.User{},
},
@@ -2875,7 +2875,7 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) {
"jimb",
&model.UserSearchOptions{
AllowFullNames: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Limit: model.UserSearchDefaultLimit,
},
[]*model.User{},
},
@@ -2886,7 +2886,7 @@ func testUserStoreSearchNotInChannel(t *testing.T, ss store.Store) {
"jim",
&model.UserSearchOptions{
AllowFullNames: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Limit: model.UserSearchDefaultLimit,
},
[]*model.User{u2, u1},
},
@@ -2977,7 +2977,7 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) {
TeamId: tid,
DisplayName: "NameName",
Name: "zz" + model.NewId() + "b",
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
c1, nErr := ss.Channel().Save(&ch1, -1)
require.NoError(t, nErr)
@@ -2986,7 +2986,7 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) {
TeamId: tid,
DisplayName: "NameName",
Name: "zz" + model.NewId() + "b",
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
c2, nErr := ss.Channel().Save(&ch2, -1)
require.NoError(t, nErr)
@@ -3029,7 +3029,7 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) {
"jimb",
&model.UserSearchOptions{
AllowFullNames: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Limit: model.UserSearchDefaultLimit,
},
[]*model.User{u1},
},
@@ -3040,7 +3040,7 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) {
&model.UserSearchOptions{
AllowFullNames: true,
AllowInactive: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Limit: model.UserSearchDefaultLimit,
},
[]*model.User{u1, u3},
},
@@ -3061,7 +3061,7 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) {
"jimb",
&model.UserSearchOptions{
AllowFullNames: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Limit: model.UserSearchDefaultLimit,
},
[]*model.User{},
},
@@ -3072,7 +3072,7 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) {
&model.UserSearchOptions{
AllowFullNames: true,
AllowInactive: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Limit: model.UserSearchDefaultLimit,
},
[]*model.User{},
},
@@ -3083,8 +3083,8 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) {
&model.UserSearchOptions{
AllowFullNames: true,
AllowInactive: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Roles: []string{model.SYSTEM_ADMIN_ROLE_ID},
Limit: model.UserSearchDefaultLimit,
Roles: []string{model.SystemAdminRoleId},
},
[]*model.User{u1},
},
@@ -3095,8 +3095,8 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) {
&model.UserSearchOptions{
AllowFullNames: true,
AllowInactive: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Roles: []string{model.SYSTEM_ADMIN_ROLE_ID, model.SYSTEM_USER_ROLE_ID},
Limit: model.UserSearchDefaultLimit,
Roles: []string{model.SystemAdminRoleId, model.SystemUserRoleId},
},
[]*model.User{u1, u3},
},
@@ -3107,8 +3107,8 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) {
&model.UserSearchOptions{
AllowFullNames: true,
AllowInactive: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
ChannelRoles: []string{model.CHANNEL_USER_ROLE_ID},
Limit: model.UserSearchDefaultLimit,
ChannelRoles: []string{model.ChannelUserRoleId},
},
[]*model.User{u3},
},
@@ -3119,8 +3119,8 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) {
&model.UserSearchOptions{
AllowFullNames: true,
AllowInactive: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
ChannelRoles: []string{model.CHANNEL_USER_ROLE_ID, model.CHANNEL_ADMIN_ROLE_ID},
Limit: model.UserSearchDefaultLimit,
ChannelRoles: []string{model.ChannelUserRoleId, model.ChannelAdminRoleId},
},
[]*model.User{u3},
},
@@ -3131,8 +3131,8 @@ func testUserStoreSearchInChannel(t *testing.T, ss store.Store) {
&model.UserSearchOptions{
AllowFullNames: true,
AllowInactive: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
ChannelRoles: []string{model.CHANNEL_USER_ROLE_ID},
Limit: model.UserSearchDefaultLimit,
ChannelRoles: []string{model.ChannelUserRoleId},
},
[]*model.User{u2},
},
@@ -3260,7 +3260,7 @@ func testUserStoreSearchNotInTeam(t *testing.T, ss store.Store) {
"simo",
&model.UserSearchOptions{
AllowFullNames: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Limit: model.UserSearchDefaultLimit,
},
[]*model.User{u4},
},
@@ -3271,7 +3271,7 @@ func testUserStoreSearchNotInTeam(t *testing.T, ss store.Store) {
"jimb",
&model.UserSearchOptions{
AllowFullNames: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Limit: model.UserSearchDefaultLimit,
},
[]*model.User{},
},
@@ -3282,7 +3282,7 @@ func testUserStoreSearchNotInTeam(t *testing.T, ss store.Store) {
&model.UserSearchOptions{
AllowFullNames: true,
AllowInactive: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Limit: model.UserSearchDefaultLimit,
},
[]*model.User{},
},
@@ -3292,7 +3292,7 @@ func testUserStoreSearchNotInTeam(t *testing.T, ss store.Store) {
"simo",
&model.UserSearchOptions{
AllowFullNames: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Limit: model.UserSearchDefaultLimit,
},
[]*model.User{},
},
@@ -3302,7 +3302,7 @@ func testUserStoreSearchNotInTeam(t *testing.T, ss store.Store) {
"jimb",
&model.UserSearchOptions{
AllowFullNames: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Limit: model.UserSearchDefaultLimit,
},
[]*model.User{u1},
},
@@ -3313,7 +3313,7 @@ func testUserStoreSearchNotInTeam(t *testing.T, ss store.Store) {
&model.UserSearchOptions{
AllowFullNames: true,
AllowInactive: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Limit: model.UserSearchDefaultLimit,
},
[]*model.User{u1, u3},
},
@@ -3403,7 +3403,7 @@ func testUserStoreSearchWithoutTeam(t *testing.T, ss store.Store) {
"",
&model.UserSearchOptions{
AllowFullNames: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Limit: model.UserSearchDefaultLimit,
},
[]*model.User{u2, u1},
},
@@ -3412,7 +3412,7 @@ func testUserStoreSearchWithoutTeam(t *testing.T, ss store.Store) {
"jim",
&model.UserSearchOptions{
AllowFullNames: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Limit: model.UserSearchDefaultLimit,
},
[]*model.User{u2, u1},
},
@@ -3421,7 +3421,7 @@ func testUserStoreSearchWithoutTeam(t *testing.T, ss store.Store) {
"* ",
&model.UserSearchOptions{
AllowFullNames: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Limit: model.UserSearchDefaultLimit,
},
[]*model.User{u2, u1},
},
@@ -3526,7 +3526,7 @@ func testUserStoreSearchInGroup(t *testing.T, ss store.Store) {
"jimb",
&model.UserSearchOptions{
AllowFullNames: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Limit: model.UserSearchDefaultLimit,
},
[]*model.User{u1},
},
@@ -3537,7 +3537,7 @@ func testUserStoreSearchInGroup(t *testing.T, ss store.Store) {
&model.UserSearchOptions{
AllowFullNames: true,
AllowInactive: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Limit: model.UserSearchDefaultLimit,
},
[]*model.User{u1, u3},
},
@@ -3558,7 +3558,7 @@ func testUserStoreSearchInGroup(t *testing.T, ss store.Store) {
"jimb",
&model.UserSearchOptions{
AllowFullNames: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Limit: model.UserSearchDefaultLimit,
},
[]*model.User{},
},
@@ -3569,7 +3569,7 @@ func testUserStoreSearchInGroup(t *testing.T, ss store.Store) {
&model.UserSearchOptions{
AllowFullNames: true,
AllowInactive: true,
Limit: model.USER_SEARCH_DEFAULT_LIMIT,
Limit: model.UserSearchDefaultLimit,
},
[]*model.User{},
},
@@ -3594,7 +3594,7 @@ func testCount(t *testing.T, ss store.Store) {
channelId := model.NewId()
regularUser := &model.User{}
regularUser.Email = MakeEmail()
regularUser.Roles = model.SYSTEM_USER_ROLE_ID
regularUser.Roles = model.SystemUserRoleId
_, err := ss.User().Save(regularUser)
require.NoError(t, err)
defer func() { require.NoError(t, ss.User().PermanentDelete(regularUser.Id)) }()
@@ -3605,7 +3605,7 @@ func testCount(t *testing.T, ss store.Store) {
guestUser := &model.User{}
guestUser.Email = MakeEmail()
guestUser.Roles = model.SYSTEM_GUEST_ROLE_ID
guestUser.Roles = model.SystemGuestRoleId
_, err = ss.User().Save(guestUser)
require.NoError(t, err)
defer func() { require.NoError(t, ss.User().PermanentDelete(guestUser.Id)) }()
@@ -3616,7 +3616,7 @@ func testCount(t *testing.T, ss store.Store) {
teamAdmin := &model.User{}
teamAdmin.Email = MakeEmail()
teamAdmin.Roles = model.SYSTEM_USER_ROLE_ID
teamAdmin.Roles = model.SystemUserRoleId
_, err = ss.User().Save(teamAdmin)
require.NoError(t, err)
defer func() { require.NoError(t, ss.User().PermanentDelete(teamAdmin.Id)) }()
@@ -3627,7 +3627,7 @@ func testCount(t *testing.T, ss store.Store) {
sysAdmin := &model.User{}
sysAdmin.Email = MakeEmail()
sysAdmin.Roles = model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID
sysAdmin.Roles = model.SystemAdminRoleId + " " + model.SystemUserRoleId
_, err = ss.User().Save(sysAdmin)
require.NoError(t, err)
defer func() { require.NoError(t, ss.User().PermanentDelete(sysAdmin.Id)) }()
@@ -3752,7 +3752,7 @@ func testCount(t *testing.T, ss store.Store) {
"Filter by system admins only",
model.UserCountOptions{
TeamId: teamId,
Roles: []string{model.SYSTEM_ADMIN_ROLE_ID},
Roles: []string{model.SystemAdminRoleId},
},
1,
},
@@ -3760,7 +3760,7 @@ func testCount(t *testing.T, ss store.Store) {
"Filter by system users only",
model.UserCountOptions{
TeamId: teamId,
Roles: []string{model.SYSTEM_USER_ROLE_ID},
Roles: []string{model.SystemUserRoleId},
},
2,
},
@@ -3768,7 +3768,7 @@ func testCount(t *testing.T, ss store.Store) {
"Filter by system guests only",
model.UserCountOptions{
TeamId: teamId,
Roles: []string{model.SYSTEM_GUEST_ROLE_ID},
Roles: []string{model.SystemGuestRoleId},
},
1,
},
@@ -3776,7 +3776,7 @@ func testCount(t *testing.T, ss store.Store) {
"Filter by system admins and system users",
model.UserCountOptions{
TeamId: teamId,
Roles: []string{model.SYSTEM_ADMIN_ROLE_ID, model.SYSTEM_USER_ROLE_ID},
Roles: []string{model.SystemAdminRoleId, model.SystemUserRoleId},
},
3,
},
@@ -3784,7 +3784,7 @@ func testCount(t *testing.T, ss store.Store) {
"Filter by system admins, system user and system guests",
model.UserCountOptions{
TeamId: teamId,
Roles: []string{model.SYSTEM_ADMIN_ROLE_ID, model.SYSTEM_USER_ROLE_ID, model.SYSTEM_GUEST_ROLE_ID},
Roles: []string{model.SystemAdminRoleId, model.SystemUserRoleId, model.SystemGuestRoleId},
},
4,
},
@@ -3792,7 +3792,7 @@ func testCount(t *testing.T, ss store.Store) {
"Filter by team admins",
model.UserCountOptions{
TeamId: teamId,
TeamRoles: []string{model.TEAM_ADMIN_ROLE_ID},
TeamRoles: []string{model.TeamAdminRoleId},
},
1,
},
@@ -3800,7 +3800,7 @@ func testCount(t *testing.T, ss store.Store) {
"Filter by team members",
model.UserCountOptions{
TeamId: teamId,
TeamRoles: []string{model.TEAM_USER_ROLE_ID},
TeamRoles: []string{model.TeamUserRoleId},
},
1,
},
@@ -3808,7 +3808,7 @@ func testCount(t *testing.T, ss store.Store) {
"Filter by team guests",
model.UserCountOptions{
TeamId: teamId,
TeamRoles: []string{model.TEAM_GUEST_ROLE_ID},
TeamRoles: []string{model.TeamGuestRoleId},
},
1,
},
@@ -3816,8 +3816,8 @@ func testCount(t *testing.T, ss store.Store) {
"Filter by team guests and any system role",
model.UserCountOptions{
TeamId: teamId,
TeamRoles: []string{model.TEAM_GUEST_ROLE_ID},
Roles: []string{model.SYSTEM_ADMIN_ROLE_ID},
TeamRoles: []string{model.TeamGuestRoleId},
Roles: []string{model.SystemAdminRoleId},
},
2,
},
@@ -3825,7 +3825,7 @@ func testCount(t *testing.T, ss store.Store) {
"Filter by channel members",
model.UserCountOptions{
ChannelId: channelId,
ChannelRoles: []string{model.CHANNEL_USER_ROLE_ID},
ChannelRoles: []string{model.ChannelUserRoleId},
},
1,
},
@@ -3833,8 +3833,8 @@ func testCount(t *testing.T, ss store.Store) {
"Filter by channel members and system admins",
model.UserCountOptions{
ChannelId: channelId,
Roles: []string{model.SYSTEM_ADMIN_ROLE_ID},
ChannelRoles: []string{model.CHANNEL_USER_ROLE_ID},
Roles: []string{model.SystemAdminRoleId},
ChannelRoles: []string{model.ChannelUserRoleId},
},
2,
},
@@ -3842,8 +3842,8 @@ func testCount(t *testing.T, ss store.Store) {
"Filter by channel members and system admins and channel admins",
model.UserCountOptions{
ChannelId: channelId,
Roles: []string{model.SYSTEM_ADMIN_ROLE_ID},
ChannelRoles: []string{model.CHANNEL_USER_ROLE_ID, model.CHANNEL_ADMIN_ROLE_ID},
Roles: []string{model.SystemAdminRoleId},
ChannelRoles: []string{model.ChannelUserRoleId, model.ChannelAdminRoleId},
},
3,
},
@@ -3851,7 +3851,7 @@ func testCount(t *testing.T, ss store.Store) {
"Filter by channel guests",
model.UserCountOptions{
ChannelId: channelId,
ChannelRoles: []string{model.CHANNEL_GUEST_ROLE_ID},
ChannelRoles: []string{model.ChannelGuestRoleId},
},
1,
},
@@ -3859,8 +3859,8 @@ func testCount(t *testing.T, ss store.Store) {
"Filter by channel guests and any system role",
model.UserCountOptions{
ChannelId: channelId,
ChannelRoles: []string{model.CHANNEL_GUEST_ROLE_ID},
Roles: []string{model.SYSTEM_ADMIN_ROLE_ID},
ChannelRoles: []string{model.ChannelGuestRoleId},
Roles: []string{model.SystemAdminRoleId},
},
2,
},
@@ -3927,11 +3927,11 @@ func testUserStoreAnalyticsActiveCount(t *testing.T, ss store.Store, s SqlStore)
// u0 last activity status is two months ago.
// u1 last activity status is two days ago.
// u2, u3, u4 last activity is within last day
require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u0.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millisTwoMonthsAgo}))
require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u1.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millisTwoDaysAgo}))
require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u2.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millis}))
require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u3.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millis}))
require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u4.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millis}))
require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u0.Id, Status: model.StatusOffline, LastActivityAt: millisTwoMonthsAgo}))
require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u1.Id, Status: model.StatusOffline, LastActivityAt: millisTwoDaysAgo}))
require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u2.Id, Status: model.StatusOffline, LastActivityAt: millis}))
require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u3.Id, Status: model.StatusOffline, LastActivityAt: millis}))
require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u4.Id, Status: model.StatusOffline, LastActivityAt: millis}))
// Daily counts (without bots)
count, err := ss.User().AnalyticsActiveCount(DayMilliseconds, model.UserCountOptions{IncludeBotAccounts: false, IncludeDeleted: true})
@@ -4015,11 +4015,11 @@ func testUserStoreAnalyticsActiveCountForPeriod(t *testing.T, ss store.Store, s
// u2 last activity is one day ago
// u3 last activity is within last day
// u4 last activity is within last day
require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u0.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millisTwoMonthsAgo}))
require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u1.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millisTwoMonthsAgo + MonthMilliseconds}))
require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u2.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millisTwoDaysAgo}))
require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u3.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millisTwoDaysAgo + DayMilliseconds}))
require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u4.Id, Status: model.STATUS_OFFLINE, LastActivityAt: millis}))
require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u0.Id, Status: model.StatusOffline, LastActivityAt: millisTwoMonthsAgo}))
require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u1.Id, Status: model.StatusOffline, LastActivityAt: millisTwoMonthsAgo + MonthMilliseconds}))
require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u2.Id, Status: model.StatusOffline, LastActivityAt: millisTwoDaysAgo}))
require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u3.Id, Status: model.StatusOffline, LastActivityAt: millisTwoDaysAgo + DayMilliseconds}))
require.NoError(t, ss.Status().SaveOrUpdate(&model.Status{UserId: u4.Id, Status: model.StatusOffline, LastActivityAt: millis}))
// Two months to two days (without bots)
count, nerr := ss.User().AnalyticsActiveCountForPeriod(millisTwoMonthsAgo, millisTwoDaysAgo, model.UserCountOptions{IncludeBotAccounts: false, IncludeDeleted: false})
@@ -4170,7 +4170,7 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, ss store.Store) {
team, err := ss.Team().Save(&model.Team{
DisplayName: "Team",
Name: "zz" + model.NewId(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
})
require.NoError(t, err)
@@ -4482,27 +4482,27 @@ func testUserStoreGetUsersBatchForIndexing(t *testing.T, ss store.Store) {
t1, err := ss.Team().Save(&model.Team{
DisplayName: "Team1",
Name: "zz" + model.NewId(),
Type: model.TEAM_OPEN,
Type: model.TeamOpen,
})
require.NoError(t, err)
ch1 := &model.Channel{
Name: model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
cPub1, nErr := ss.Channel().Save(ch1, -1)
require.NoError(t, nErr)
ch2 := &model.Channel{
Name: model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
cPub2, nErr := ss.Channel().Save(ch2, -1)
require.NoError(t, nErr)
ch3 := &model.Channel{
Name: model.NewId(),
Type: model.CHANNEL_PRIVATE,
Type: model.ChannelTypePrivate,
}
cPriv, nErr := ss.Channel().Save(ch3, -1)
@@ -4619,7 +4619,7 @@ func testUserStoreGetTeamGroupUsers(t *testing.T, ss store.Store) {
DisplayName: "dn_" + id,
Name: "n-" + id,
Email: id + "@test.com",
Type: model.TEAM_INVITE,
Type: model.TeamInvite,
})
require.NoError(t, err)
require.NotNil(t, team)
@@ -4739,7 +4739,7 @@ func testUserStoreGetChannelGroupUsers(t *testing.T, ss store.Store) {
channel, nErr := ss.Channel().Save(&model.Channel{
DisplayName: "dn_" + id,
Name: "n-" + id,
Type: model.CHANNEL_PRIVATE,
Type: model.ChannelTypePrivate,
}, 999)
require.NoError(t, nErr)
require.NotNil(t, channel)
@@ -4878,7 +4878,7 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) {
TeamId: teamId,
DisplayName: "Channel name",
Name: "channel-" + model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}, -1)
require.NoError(t, nErr)
_, nErr = ss.Channel().SaveMember(&model.ChannelMember{ChannelId: channel.Id, UserId: user.Id, SchemeGuest: true, SchemeUser: false, NotifyProps: model.GetDefaultChannelNotifyProps()})
@@ -4924,7 +4924,7 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) {
TeamId: teamId,
DisplayName: "Channel name",
Name: "channel-" + model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}, -1)
require.NoError(t, nErr)
_, nErr = ss.Channel().SaveMember(&model.ChannelMember{ChannelId: channel.Id, UserId: user.Id, SchemeGuest: true, SchemeUser: false, NotifyProps: model.GetDefaultChannelNotifyProps()})
@@ -5020,7 +5020,7 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) {
TeamId: teamId,
DisplayName: "Channel name",
Name: "channel-" + model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}, -1)
require.NoError(t, nErr)
_, nErr = ss.Channel().SaveMember(&model.ChannelMember{ChannelId: channel.Id, UserId: user.Id, SchemeGuest: true, SchemeUser: false, NotifyProps: model.GetDefaultChannelNotifyProps()})
@@ -5065,7 +5065,7 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) {
TeamId: teamId,
DisplayName: "Channel name",
Name: "channel-" + model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}, -1)
require.NoError(t, nErr)
_, nErr = ss.Channel().SaveMember(&model.ChannelMember{ChannelId: channel.Id, UserId: user.Id, SchemeGuest: true, SchemeUser: false, NotifyProps: model.GetDefaultChannelNotifyProps()})
@@ -5110,7 +5110,7 @@ func testUserStorePromoteGuestToUser(t *testing.T, ss store.Store) {
TeamId: teamId1,
DisplayName: "Channel name",
Name: "channel-" + model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}, -1)
require.NoError(t, nErr)
@@ -5193,7 +5193,7 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) {
TeamId: teamId,
DisplayName: "Channel name",
Name: "channel-" + model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}, -1)
require.NoError(t, nErr)
_, nErr = ss.Channel().SaveMember(&model.ChannelMember{ChannelId: channel.Id, UserId: user.Id, SchemeGuest: false, SchemeUser: true, NotifyProps: model.GetDefaultChannelNotifyProps()})
@@ -5237,7 +5237,7 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) {
TeamId: teamId,
DisplayName: "Channel name",
Name: "channel-" + model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}, -1)
require.NoError(t, nErr)
_, nErr = ss.Channel().SaveMember(&model.ChannelMember{ChannelId: channel.Id, UserId: user.Id, SchemeGuest: true, SchemeUser: false, NotifyProps: model.GetDefaultChannelNotifyProps()})
@@ -5327,7 +5327,7 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) {
TeamId: teamId,
DisplayName: "Channel name",
Name: "channel-" + model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}, -1)
require.NoError(t, nErr)
_, nErr = ss.Channel().SaveMember(&model.ChannelMember{ChannelId: channel.Id, UserId: user.Id, SchemeGuest: false, SchemeUser: true, NotifyProps: model.GetDefaultChannelNotifyProps()})
@@ -5370,7 +5370,7 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) {
TeamId: teamId,
DisplayName: "Channel name",
Name: "channel-" + model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}, -1)
require.NoError(t, nErr)
_, nErr = ss.Channel().SaveMember(&model.ChannelMember{ChannelId: channel.Id, UserId: user.Id, SchemeGuest: false, SchemeUser: true, NotifyProps: model.GetDefaultChannelNotifyProps()})
@@ -5413,7 +5413,7 @@ func testUserStoreDemoteUserToGuest(t *testing.T, ss store.Store) {
TeamId: teamId1,
DisplayName: "Channel name",
Name: "channel-" + model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}, -1)
require.NoError(t, nErr)
@@ -5633,7 +5633,7 @@ func testGetKnownUsers(t *testing.T, ss store.Store) {
TeamId: teamId,
DisplayName: "Profiles in channel",
Name: "profiles-" + model.NewId(),
Type: model.CHANNEL_OPEN,
Type: model.ChannelTypeOpen,
}
c1, nErr := ss.Channel().Save(ch1, -1)
require.NoError(t, nErr)
@@ -5642,7 +5642,7 @@ func testGetKnownUsers(t *testing.T, ss store.Store) {
TeamId: teamId,
DisplayName: "Profiles in private",
Name: "profiles-" + model.NewId(),
Type: model.CHANNEL_PRIVATE,
Type: model.ChannelTypePrivate,
}
c2, nErr := ss.Channel().Save(ch2, -1)
require.NoError(t, nErr)
@@ -5651,7 +5651,7 @@ func testGetKnownUsers(t *testing.T, ss store.Store) {
TeamId: teamId,
DisplayName: "Profiles in private",
Name: "profiles-" + model.NewId(),
Type: model.CHANNEL_PRIVATE,
Type: model.ChannelTypePrivate,
}
c3, nErr := ss.Channel().Save(ch3, -1)
require.NoError(t, nErr)