[MM-28985] Remove pointers to slice (part 1) (#18034)
* Remove pointers to slice (part 1) * Remove use of pointers to slice from model package (#18045) * Fix after merge
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
132f114793
Коммит
04b27ce93c
@@ -957,7 +957,7 @@ func searchChannelsForTeam(c *Context, w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
var channels *model.ChannelList
|
||||
var channels model.ChannelList
|
||||
var appErr *model.AppError
|
||||
if c.App.SessionHasPermissionToTeam(*c.AppContext.Session(), c.Params.TeamId, model.PermissionListTeamChannels) {
|
||||
channels, appErr = c.App.SearchChannels(c.Params.TeamId, props.Term)
|
||||
@@ -996,7 +996,7 @@ func searchArchivedChannelsForTeam(c *Context, w http.ResponseWriter, r *http.Re
|
||||
return
|
||||
}
|
||||
|
||||
var channels *model.ChannelList
|
||||
var channels model.ChannelList
|
||||
var appErr *model.AppError
|
||||
if c.App.SessionHasPermissionToTeam(*c.AppContext.Session(), c.Params.TeamId, model.PermissionListTeamChannels) {
|
||||
channels, appErr = c.App.SearchArchivedChannels(c.Params.TeamId, props.Term, c.AppContext.Session().UserId)
|
||||
|
||||
@@ -208,12 +208,12 @@ func validateSidebarCategories(c *Context, teamId, userId string, categories []*
|
||||
return nil
|
||||
}
|
||||
|
||||
func validateSidebarCategoryChannels(userId string, channelIds []string, channels *model.ChannelList) []string {
|
||||
func validateSidebarCategoryChannels(userId string, channelIds []string, channels model.ChannelList) []string {
|
||||
var filtered []string
|
||||
|
||||
for _, channelId := range channelIds {
|
||||
found := false
|
||||
for _, channel := range *channels {
|
||||
for _, channel := range channels {
|
||||
if channel.Id == channelId {
|
||||
found = true
|
||||
break
|
||||
|
||||
@@ -543,7 +543,7 @@ func TestCreateGroupChannel(t *testing.T) {
|
||||
require.Equal(t, model.ChannelTypeGroup, rgc.Type, "should have created a channel of group type")
|
||||
|
||||
m, _ := th.App.GetChannelMembersPage(rgc.Id, 0, 10)
|
||||
require.Len(t, *m, 3, "should have 3 channel members")
|
||||
require.Len(t, m, 3, "should have 3 channel members")
|
||||
|
||||
// saving duplicate group channel
|
||||
rgc2, _, err := client.CreateGroupChannel([]string{user3.Id, user2.Id})
|
||||
@@ -1044,48 +1044,48 @@ func TestGetAllChannels(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
|
||||
// At least, all the not-deleted channels created during the InitBasic
|
||||
require.True(t, len(*channels) >= 3)
|
||||
for _, c := range *channels {
|
||||
require.True(t, len(channels) >= 3)
|
||||
for _, c := range channels {
|
||||
require.NotEqual(t, c.TeamId, "")
|
||||
}
|
||||
|
||||
channels, _, err = client.GetAllChannels(0, 10, "")
|
||||
require.NoError(t, err)
|
||||
require.True(t, len(*channels) >= 3)
|
||||
require.True(t, len(channels) >= 3)
|
||||
|
||||
channels, _, err = client.GetAllChannels(1, 1, "")
|
||||
require.NoError(t, err)
|
||||
require.Len(t, *channels, 1)
|
||||
require.Len(t, channels, 1)
|
||||
|
||||
channels, _, err = client.GetAllChannels(10000, 10000, "")
|
||||
require.NoError(t, err)
|
||||
require.Empty(t, *channels)
|
||||
require.Empty(t, channels)
|
||||
|
||||
channels, _, err = client.GetAllChannels(0, 10000, "")
|
||||
require.NoError(t, err)
|
||||
beforeCount := len(*channels)
|
||||
beforeCount := len(channels)
|
||||
|
||||
firstChannel := (*channels)[0].Channel
|
||||
firstChannel := channels[0].Channel
|
||||
|
||||
_, err = client.DeleteChannel(firstChannel.Id)
|
||||
require.NoError(t, err)
|
||||
|
||||
channels, _, err = client.GetAllChannels(0, 10000, "")
|
||||
var ids []string
|
||||
for _, item := range *channels {
|
||||
for _, item := range channels {
|
||||
ids = append(ids, item.Channel.Id)
|
||||
}
|
||||
require.NoError(t, err)
|
||||
require.Len(t, *channels, beforeCount-1)
|
||||
require.Len(t, channels, beforeCount-1)
|
||||
require.NotContains(t, ids, firstChannel.Id)
|
||||
|
||||
channels, _, err = client.GetAllChannelsIncludeDeleted(0, 10000, "")
|
||||
ids = []string{}
|
||||
for _, item := range *channels {
|
||||
for _, item := range channels {
|
||||
ids = append(ids, item.Channel.Id)
|
||||
}
|
||||
require.NoError(t, err)
|
||||
require.True(t, len(*channels) > beforeCount)
|
||||
require.True(t, len(channels) > beforeCount)
|
||||
require.Contains(t, ids, firstChannel.Id)
|
||||
})
|
||||
|
||||
@@ -1096,7 +1096,7 @@ func TestGetAllChannels(t *testing.T) {
|
||||
sysManagerChannels, resp, err := th.SystemManagerClient.GetAllChannels(0, 10000, "")
|
||||
require.NoError(t, err)
|
||||
CheckOKStatus(t, resp)
|
||||
policyChannel := (*sysManagerChannels)[0]
|
||||
policyChannel := (sysManagerChannels)[0]
|
||||
policy, err := th.App.Srv().Store.RetentionPolicy().Save(&model.RetentionPolicyWithTeamAndChannelIDs{
|
||||
RetentionPolicy: model.RetentionPolicy{
|
||||
DisplayName: "Policy 1",
|
||||
@@ -1115,7 +1115,7 @@ func TestGetAllChannels(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
CheckOKStatus(t, resp)
|
||||
found := false
|
||||
for _, channel := range *channels {
|
||||
for _, channel := range channels {
|
||||
if channel.Id == policyChannel.Id {
|
||||
found = true
|
||||
break
|
||||
@@ -1129,7 +1129,7 @@ func TestGetAllChannels(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
CheckOKStatus(t, resp)
|
||||
found := false
|
||||
for _, channel := range *channels {
|
||||
for _, channel := range channels {
|
||||
if channel.Id == policyChannel.Id {
|
||||
found = true
|
||||
require.Nil(t, channel.PolicyID)
|
||||
@@ -1144,7 +1144,7 @@ func TestGetAllChannels(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
CheckOKStatus(t, resp)
|
||||
found := false
|
||||
for _, channel := range *channels {
|
||||
for _, channel := range channels {
|
||||
if channel.Id == policyChannel.Id {
|
||||
found = true
|
||||
require.Equal(t, *channel.PolicyID, policy.ID)
|
||||
@@ -1164,23 +1164,23 @@ func TestGetAllChannelsWithCount(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
|
||||
// At least, all the not-deleted channels created during the InitBasic
|
||||
require.True(t, len(*channels) >= 3)
|
||||
for _, c := range *channels {
|
||||
require.True(t, len(channels) >= 3)
|
||||
for _, c := range channels {
|
||||
require.NotEqual(t, c.TeamId, "")
|
||||
}
|
||||
require.Equal(t, int64(6), total)
|
||||
|
||||
channels, _, _, err = th.SystemAdminClient.GetAllChannelsWithCount(0, 10, "")
|
||||
require.NoError(t, err)
|
||||
require.True(t, len(*channels) >= 3)
|
||||
require.True(t, len(channels) >= 3)
|
||||
|
||||
channels, _, _, err = th.SystemAdminClient.GetAllChannelsWithCount(1, 1, "")
|
||||
require.NoError(t, err)
|
||||
require.Len(t, *channels, 1)
|
||||
require.Len(t, channels, 1)
|
||||
|
||||
channels, _, _, err = th.SystemAdminClient.GetAllChannelsWithCount(10000, 10000, "")
|
||||
require.NoError(t, err)
|
||||
require.Empty(t, *channels)
|
||||
require.Empty(t, channels)
|
||||
|
||||
_, _, resp, err := client.GetAllChannelsWithCount(0, 20, "")
|
||||
require.Error(t, err)
|
||||
@@ -1505,12 +1505,12 @@ func TestSearchAllChannels(t *testing.T) {
|
||||
}
|
||||
for _, testCase := range testCases {
|
||||
t.Run(testCase.Description, func(t *testing.T) {
|
||||
var channels *model.ChannelListWithTeamData
|
||||
var channels model.ChannelListWithTeamData
|
||||
channels, _, err = th.SystemAdminClient.SearchAllChannels(testCase.Search)
|
||||
require.NoError(t, err)
|
||||
assert.Equal(t, len(testCase.ExpectedChannelIds), len(*channels))
|
||||
assert.Equal(t, len(testCase.ExpectedChannelIds), len(channels))
|
||||
actualChannelIds := []string{}
|
||||
for _, channelWithTeamData := range *channels {
|
||||
for _, channelWithTeamData := range channels {
|
||||
actualChannelIds = append(actualChannelIds, channelWithTeamData.Channel.Id)
|
||||
}
|
||||
assert.ElementsMatch(t, testCase.ExpectedChannelIds, actualChannelIds)
|
||||
@@ -1520,7 +1520,7 @@ func TestSearchAllChannels(t *testing.T) {
|
||||
// Searching with no terms returns all default channels
|
||||
allChannels, _, err := th.SystemAdminClient.SearchAllChannels(&model.ChannelSearch{Term: ""})
|
||||
require.NoError(t, err)
|
||||
assert.True(t, len(*allChannels) >= 3)
|
||||
assert.True(t, len(allChannels) >= 3)
|
||||
|
||||
_, resp, err := client.SearchAllChannels(&model.ChannelSearch{Term: ""})
|
||||
require.Error(t, err)
|
||||
@@ -1530,7 +1530,7 @@ func TestSearchAllChannels(t *testing.T) {
|
||||
sysManagerChannels, resp, err := th.SystemManagerClient.GetAllChannels(0, 10000, "")
|
||||
require.NoError(t, err)
|
||||
CheckOKStatus(t, resp)
|
||||
policyChannel := (*sysManagerChannels)[0]
|
||||
policyChannel := sysManagerChannels[0]
|
||||
policy, savePolicyErr := th.App.Srv().Store.RetentionPolicy().Save(&model.RetentionPolicyWithTeamAndChannelIDs{
|
||||
RetentionPolicy: model.RetentionPolicy{
|
||||
DisplayName: "Policy 1",
|
||||
@@ -1545,7 +1545,7 @@ func TestSearchAllChannels(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
CheckOKStatus(t, resp)
|
||||
found := false
|
||||
for _, channel := range *channels {
|
||||
for _, channel := range channels {
|
||||
if channel.Id == policyChannel.Id {
|
||||
found = true
|
||||
require.Nil(t, channel.PolicyID)
|
||||
@@ -1559,7 +1559,7 @@ func TestSearchAllChannels(t *testing.T) {
|
||||
require.NoError(t, err)
|
||||
CheckOKStatus(t, resp)
|
||||
found := false
|
||||
for _, channel := range *channels {
|
||||
for _, channel := range channels {
|
||||
if channel.Id == policyChannel.Id {
|
||||
found = true
|
||||
require.Equal(t, *channel.PolicyID, policy.ID)
|
||||
@@ -1581,7 +1581,7 @@ func TestSearchAllChannelsPaged(t *testing.T) {
|
||||
search.PerPage = model.NewInt(2)
|
||||
channelsWithCount, _, err := th.SystemAdminClient.SearchAllChannelsPaged(search)
|
||||
require.NoError(t, err)
|
||||
require.Len(t, *channelsWithCount.Channels, 2)
|
||||
require.Len(t, channelsWithCount.Channels, 2)
|
||||
|
||||
search.Term = th.BasicChannel.Name
|
||||
_, resp, err := client.SearchAllChannels(search)
|
||||
@@ -2101,19 +2101,19 @@ func TestGetChannelMembers(t *testing.T) {
|
||||
th.TestForAllClients(t, func(t *testing.T, client *model.Client4) {
|
||||
members, _, err := client.GetChannelMembers(th.BasicChannel.Id, 0, 60, "")
|
||||
require.NoError(t, err)
|
||||
require.Len(t, *members, 3, "should only be 3 users in channel")
|
||||
require.Len(t, members, 3, "should only be 3 users in channel")
|
||||
|
||||
members, _, err = client.GetChannelMembers(th.BasicChannel.Id, 0, 2, "")
|
||||
require.NoError(t, err)
|
||||
require.Len(t, *members, 2, "should only be 2 users")
|
||||
require.Len(t, members, 2, "should only be 2 users")
|
||||
|
||||
members, _, err = client.GetChannelMembers(th.BasicChannel.Id, 1, 1, "")
|
||||
require.NoError(t, err)
|
||||
require.Len(t, *members, 1, "should only be 1 user")
|
||||
require.Len(t, members, 1, "should only be 1 user")
|
||||
|
||||
members, _, err = client.GetChannelMembers(th.BasicChannel.Id, 1000, 100000, "")
|
||||
require.NoError(t, err)
|
||||
require.Empty(t, *members, "should be 0 users")
|
||||
require.Empty(t, members, "should be 0 users")
|
||||
|
||||
_, resp, err := client.GetChannelMembers("junk", 0, 60, "")
|
||||
require.Error(t, err)
|
||||
@@ -2150,7 +2150,7 @@ func TestGetChannelMembersByIds(t *testing.T) {
|
||||
|
||||
cm, _, err := client.GetChannelMembersByIds(th.BasicChannel.Id, []string{th.BasicUser.Id})
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, th.BasicUser.Id, (*cm)[0].UserId, "returned wrong user")
|
||||
require.Equal(t, th.BasicUser.Id, cm[0].UserId, "returned wrong user")
|
||||
|
||||
_, resp, err := client.GetChannelMembersByIds(th.BasicChannel.Id, []string{})
|
||||
require.Error(t, err)
|
||||
@@ -2158,15 +2158,15 @@ func TestGetChannelMembersByIds(t *testing.T) {
|
||||
|
||||
cm1, _, err := client.GetChannelMembersByIds(th.BasicChannel.Id, []string{"junk"})
|
||||
require.NoError(t, err)
|
||||
require.Empty(t, *cm1, "no users should be returned")
|
||||
require.Empty(t, cm1, "no users should be returned")
|
||||
|
||||
cm1, _, err = client.GetChannelMembersByIds(th.BasicChannel.Id, []string{"junk", th.BasicUser.Id})
|
||||
require.NoError(t, err)
|
||||
require.Len(t, *cm1, 1, "1 member should be returned")
|
||||
require.Len(t, cm1, 1, "1 member should be returned")
|
||||
|
||||
cm1, _, err = client.GetChannelMembersByIds(th.BasicChannel.Id, []string{th.BasicUser2.Id, th.BasicUser.Id})
|
||||
require.NoError(t, err)
|
||||
require.Len(t, *cm1, 2, "2 members should be returned")
|
||||
require.Len(t, cm1, 2, "2 members should be returned")
|
||||
|
||||
_, resp, err = client.GetChannelMembersByIds("junk", []string{th.BasicUser.Id})
|
||||
require.Error(t, err)
|
||||
@@ -2241,7 +2241,7 @@ func TestGetChannelMembersForUser(t *testing.T) {
|
||||
|
||||
members, _, err := client.GetChannelMembersForUser(th.BasicUser.Id, th.BasicTeam.Id, "")
|
||||
require.NoError(t, err)
|
||||
require.Len(t, *members, 6, "should have 6 members on team")
|
||||
require.Len(t, members, 6, "should have 6 members on team")
|
||||
|
||||
_, resp, err := client.GetChannelMembersForUser("", th.BasicTeam.Id, "")
|
||||
require.Error(t, err)
|
||||
@@ -3289,8 +3289,8 @@ func TestAutocompleteChannels(t *testing.T) {
|
||||
t.Run(tc.description, func(t *testing.T) {
|
||||
channels, _, err := th.Client.AutocompleteChannelsForTeam(tc.teamId, tc.fragment)
|
||||
require.NoError(t, err)
|
||||
names := make([]string, len(*channels))
|
||||
for i, c := range *channels {
|
||||
names := make([]string, len(channels))
|
||||
for i, c := range channels {
|
||||
names[i] = c.Name
|
||||
}
|
||||
for _, name := range tc.expectedIncludes {
|
||||
@@ -3404,8 +3404,8 @@ func TestAutocompleteChannelsForSearch(t *testing.T) {
|
||||
t.Run(tc.description, func(t *testing.T) {
|
||||
channels, _, err := th.Client.AutocompleteChannelsForTeamForSearch(tc.teamID, tc.fragment)
|
||||
require.NoError(t, err)
|
||||
names := make([]string, len(*channels))
|
||||
for i, c := range *channels {
|
||||
names := make([]string, len(channels))
|
||||
for i, c := range channels {
|
||||
names[i] = c.Name
|
||||
}
|
||||
for _, name := range tc.expectedIncludes {
|
||||
@@ -3536,8 +3536,8 @@ func TestAutocompleteChannelsForSearchGuestUsers(t *testing.T) {
|
||||
t.Run(tc.description, func(t *testing.T) {
|
||||
channels, _, err := th.Client.AutocompleteChannelsForTeamForSearch(tc.teamID, tc.fragment)
|
||||
require.NoError(t, err)
|
||||
names := make([]string, len(*channels))
|
||||
for i, c := range *channels {
|
||||
names := make([]string, len(channels))
|
||||
for i, c := range channels {
|
||||
names[i] = c.Name
|
||||
}
|
||||
for _, name := range tc.expectedIncludes {
|
||||
|
||||
@@ -1228,10 +1228,10 @@ func TestGetFlaggedPostsForUser(t *testing.T) {
|
||||
Name: post1.Id,
|
||||
Value: "true",
|
||||
}
|
||||
_, err := client.UpdatePreferences(user.Id, &model.Preferences{preference})
|
||||
_, err := client.UpdatePreferences(user.Id, model.Preferences{preference})
|
||||
require.NoError(t, err)
|
||||
preference.Name = post2.Id
|
||||
_, err = client.UpdatePreferences(user.Id, &model.Preferences{preference})
|
||||
_, err = client.UpdatePreferences(user.Id, model.Preferences{preference})
|
||||
require.NoError(t, err)
|
||||
|
||||
opl := model.NewPostList()
|
||||
@@ -1292,7 +1292,7 @@ func TestGetFlaggedPostsForUser(t *testing.T) {
|
||||
post4 := th.CreatePostWithClient(client, channel3)
|
||||
|
||||
preference.Name = post4.Id
|
||||
client.UpdatePreferences(user.Id, &model.Preferences{preference})
|
||||
client.UpdatePreferences(user.Id, model.Preferences{preference})
|
||||
|
||||
opl.AddPost(post4)
|
||||
opl.AddOrder(post4.Id)
|
||||
@@ -1318,7 +1318,7 @@ func TestGetFlaggedPostsForUser(t *testing.T) {
|
||||
post5 := th.CreatePostWithClient(th.SystemAdminClient, channel4)
|
||||
|
||||
preference.Name = post5.Id
|
||||
resp, err := client.UpdatePreferences(user.Id, &model.Preferences{preference})
|
||||
resp, err := client.UpdatePreferences(user.Id, model.Preferences{preference})
|
||||
require.Error(t, err)
|
||||
CheckForbiddenStatus(t, resp)
|
||||
|
||||
@@ -1328,7 +1328,7 @@ func TestGetFlaggedPostsForUser(t *testing.T) {
|
||||
require.Equal(t, opl.Posts, rpl.Posts, "posts should have matched")
|
||||
|
||||
th.AddUserToChannel(user, channel4)
|
||||
_, err = client.UpdatePreferences(user.Id, &model.Preferences{preference})
|
||||
_, err = client.UpdatePreferences(user.Id, model.Preferences{preference})
|
||||
require.NoError(t, err)
|
||||
|
||||
rpl, _, err = client.GetFlaggedPostsForUser(user.Id, 0, 10)
|
||||
|
||||
@@ -44,7 +44,7 @@ func TestGetPreferences(t *testing.T) {
|
||||
},
|
||||
}
|
||||
|
||||
client.UpdatePreferences(user1.Id, &preferences1)
|
||||
client.UpdatePreferences(user1.Id, preferences1)
|
||||
|
||||
prefs, _, err := client.GetPreferences(user1.Id)
|
||||
require.NoError(t, err)
|
||||
@@ -102,7 +102,7 @@ func TestGetPreferencesByCategory(t *testing.T) {
|
||||
},
|
||||
}
|
||||
|
||||
client.UpdatePreferences(user1.Id, &preferences1)
|
||||
client.UpdatePreferences(user1.Id, preferences1)
|
||||
|
||||
prefs, _, err := client.GetPreferencesByCategory(user1.Id, category)
|
||||
require.NoError(t, err)
|
||||
@@ -160,7 +160,7 @@ func TestGetPreferenceByCategoryAndName(t *testing.T) {
|
||||
},
|
||||
}
|
||||
|
||||
client.UpdatePreferences(user.Id, &preferences)
|
||||
client.UpdatePreferences(user.Id, preferences)
|
||||
|
||||
pref, _, err := client.GetPreferenceByCategoryAndName(user.Id, model.PreferenceCategoryDirectChannelShow, name)
|
||||
require.NoError(t, err)
|
||||
@@ -170,7 +170,7 @@ func TestGetPreferenceByCategoryAndName(t *testing.T) {
|
||||
require.Equal(t, preferences[0].Name, pref.Name, "Name preference not saved")
|
||||
|
||||
preferences[0].Value = model.NewId()
|
||||
client.UpdatePreferences(user.Id, &preferences)
|
||||
client.UpdatePreferences(user.Id, preferences)
|
||||
|
||||
_, resp, err := client.GetPreferenceByCategoryAndName(user.Id, "junk", preferences[0].Name)
|
||||
require.Error(t, err)
|
||||
@@ -221,7 +221,7 @@ func TestUpdatePreferences(t *testing.T) {
|
||||
},
|
||||
}
|
||||
|
||||
_, err := client.UpdatePreferences(user1.Id, &preferences1)
|
||||
_, err := client.UpdatePreferences(user1.Id, preferences1)
|
||||
require.NoError(t, err)
|
||||
|
||||
preferences := model.Preferences{
|
||||
@@ -232,7 +232,7 @@ func TestUpdatePreferences(t *testing.T) {
|
||||
},
|
||||
}
|
||||
|
||||
resp, err := client.UpdatePreferences(user1.Id, &preferences)
|
||||
resp, err := client.UpdatePreferences(user1.Id, preferences)
|
||||
require.Error(t, err)
|
||||
CheckForbiddenStatus(t, resp)
|
||||
|
||||
@@ -243,16 +243,16 @@ func TestUpdatePreferences(t *testing.T) {
|
||||
},
|
||||
}
|
||||
|
||||
resp, err = client.UpdatePreferences(user1.Id, &preferences)
|
||||
resp, err = client.UpdatePreferences(user1.Id, preferences)
|
||||
require.Error(t, err)
|
||||
CheckBadRequestStatus(t, resp)
|
||||
|
||||
resp, err = client.UpdatePreferences(th.BasicUser2.Id, &preferences)
|
||||
resp, err = client.UpdatePreferences(th.BasicUser2.Id, preferences)
|
||||
require.Error(t, err)
|
||||
CheckForbiddenStatus(t, resp)
|
||||
|
||||
client.Logout()
|
||||
resp, err = client.UpdatePreferences(user1.Id, &preferences1)
|
||||
resp, err = client.UpdatePreferences(user1.Id, preferences1)
|
||||
require.Error(t, err)
|
||||
CheckUnauthorizedStatus(t, resp)
|
||||
}
|
||||
@@ -270,7 +270,7 @@ func TestUpdatePreferencesWebsocket(t *testing.T) {
|
||||
require.Equal(t, wsResp.Status, model.StatusOk, "expected OK from auth challenge")
|
||||
|
||||
userId := th.BasicUser.Id
|
||||
preferences := &model.Preferences{
|
||||
preferences := model.Preferences{
|
||||
{
|
||||
UserId: userId,
|
||||
Category: model.NewId(),
|
||||
@@ -300,7 +300,7 @@ func TestUpdatePreferencesWebsocket(t *testing.T) {
|
||||
received, err := model.PreferencesFromJson(strings.NewReader(event.GetData()["preferences"].(string)))
|
||||
require.NoError(t, err)
|
||||
|
||||
for i, p := range *preferences {
|
||||
for i, p := range preferences {
|
||||
require.Equal(t, received[i].UserId, p.UserId, "received incorrect UserId")
|
||||
require.Equal(t, received[i].Category, p.Category, "received incorrect Category")
|
||||
require.Equal(t, received[i].Name, p.Name, "received incorrect Name")
|
||||
@@ -338,7 +338,7 @@ func TestUpdateSidebarPreferences(t *testing.T) {
|
||||
require.Contains(t, categories.Categories[1].Channels, channel.Id)
|
||||
|
||||
// Favorite the channel
|
||||
_, err = th.Client.UpdatePreferences(user.Id, &model.Preferences{
|
||||
_, err = th.Client.UpdatePreferences(user.Id, model.Preferences{
|
||||
{
|
||||
UserId: user.Id,
|
||||
Category: model.PreferenceCategoryFavoriteChannel,
|
||||
@@ -357,7 +357,7 @@ func TestUpdateSidebarPreferences(t *testing.T) {
|
||||
assert.NotContains(t, categories.Categories[1].Channels, channel.Id)
|
||||
|
||||
// And unfavorite the channel
|
||||
_, err = th.Client.UpdatePreferences(user.Id, &model.Preferences{
|
||||
_, err = th.Client.UpdatePreferences(user.Id, model.Preferences{
|
||||
{
|
||||
UserId: user.Id,
|
||||
Category: model.PreferenceCategoryFavoriteChannel,
|
||||
@@ -391,7 +391,7 @@ func TestUpdateSidebarPreferences(t *testing.T) {
|
||||
dmChannel := th.CreateDmChannel(user2)
|
||||
|
||||
// Favorite the channel
|
||||
_, err := th.Client.UpdatePreferences(user.Id, &model.Preferences{
|
||||
_, err := th.Client.UpdatePreferences(user.Id, model.Preferences{
|
||||
{
|
||||
UserId: user.Id,
|
||||
Category: model.PreferenceCategoryFavoriteChannel,
|
||||
@@ -417,7 +417,7 @@ func TestUpdateSidebarPreferences(t *testing.T) {
|
||||
assert.NotContains(t, categories.Categories[2].Channels, dmChannel.Id)
|
||||
|
||||
// And unfavorite the channel
|
||||
_, err = th.Client.UpdatePreferences(user.Id, &model.Preferences{
|
||||
_, err = th.Client.UpdatePreferences(user.Id, model.Preferences{
|
||||
{
|
||||
UserId: user.Id,
|
||||
Category: model.PreferenceCategoryFavoriteChannel,
|
||||
@@ -482,7 +482,7 @@ func TestUpdateSidebarPreferences(t *testing.T) {
|
||||
require.Contains(t, categories.Categories[1].Channels, channel.Id)
|
||||
|
||||
// Favorite the channel
|
||||
_, err = th.Client.UpdatePreferences(user.Id, &model.Preferences{
|
||||
_, err = th.Client.UpdatePreferences(user.Id, model.Preferences{
|
||||
{
|
||||
UserId: user.Id,
|
||||
Category: model.PreferenceCategoryFavoriteChannel,
|
||||
@@ -501,7 +501,7 @@ func TestUpdateSidebarPreferences(t *testing.T) {
|
||||
assert.Contains(t, categories.Categories[1].Channels, channel.Id)
|
||||
|
||||
// Favorite the channel for the second user
|
||||
_, err = client2.UpdatePreferences(user2.Id, &model.Preferences{
|
||||
_, err = client2.UpdatePreferences(user2.Id, model.Preferences{
|
||||
{
|
||||
UserId: user2.Id,
|
||||
Category: model.PreferenceCategoryFavoriteChannel,
|
||||
@@ -520,7 +520,7 @@ func TestUpdateSidebarPreferences(t *testing.T) {
|
||||
assert.NotContains(t, categories.Categories[1].Channels, channel.Id)
|
||||
|
||||
// And unfavorite the channel
|
||||
_, err = th.Client.UpdatePreferences(user.Id, &model.Preferences{
|
||||
_, err = th.Client.UpdatePreferences(user.Id, model.Preferences{
|
||||
{
|
||||
UserId: user.Id,
|
||||
Category: model.PreferenceCategoryFavoriteChannel,
|
||||
@@ -561,21 +561,21 @@ func TestDeletePreferences(t *testing.T) {
|
||||
preferences = append(preferences, preference)
|
||||
}
|
||||
|
||||
client.UpdatePreferences(th.BasicUser.Id, &preferences)
|
||||
client.UpdatePreferences(th.BasicUser.Id, preferences)
|
||||
|
||||
// delete 10 preferences
|
||||
th.LoginBasic2()
|
||||
|
||||
resp, err := client.DeletePreferences(th.BasicUser2.Id, &preferences)
|
||||
resp, err := client.DeletePreferences(th.BasicUser2.Id, preferences)
|
||||
require.Error(t, err)
|
||||
CheckForbiddenStatus(t, resp)
|
||||
|
||||
th.LoginBasic()
|
||||
|
||||
_, err = client.DeletePreferences(th.BasicUser.Id, &preferences)
|
||||
_, err = client.DeletePreferences(th.BasicUser.Id, preferences)
|
||||
require.NoError(t, err)
|
||||
|
||||
resp, err = client.DeletePreferences(th.BasicUser2.Id, &preferences)
|
||||
resp, err = client.DeletePreferences(th.BasicUser2.Id, preferences)
|
||||
require.Error(t, err)
|
||||
CheckForbiddenStatus(t, resp)
|
||||
|
||||
@@ -583,7 +583,7 @@ func TestDeletePreferences(t *testing.T) {
|
||||
require.Len(t, prefs, originalCount, "should've deleted preferences")
|
||||
|
||||
client.Logout()
|
||||
resp, err = client.DeletePreferences(th.BasicUser.Id, &preferences)
|
||||
resp, err = client.DeletePreferences(th.BasicUser.Id, preferences)
|
||||
require.Error(t, err)
|
||||
CheckUnauthorizedStatus(t, resp)
|
||||
}
|
||||
@@ -593,7 +593,7 @@ func TestDeletePreferencesWebsocket(t *testing.T) {
|
||||
defer th.TearDown()
|
||||
|
||||
userId := th.BasicUser.Id
|
||||
preferences := &model.Preferences{
|
||||
preferences := model.Preferences{
|
||||
{
|
||||
UserId: userId,
|
||||
Category: model.NewId(),
|
||||
@@ -632,7 +632,7 @@ func TestDeletePreferencesWebsocket(t *testing.T) {
|
||||
received, err := model.PreferencesFromJson(strings.NewReader(event.GetData()["preferences"].(string)))
|
||||
require.NoError(t, err)
|
||||
|
||||
for i, preference := range *preferences {
|
||||
for i, preference := range preferences {
|
||||
require.Equal(t, preference.UserId, received[i].UserId)
|
||||
require.Equal(t, preference.Category, received[i].Category)
|
||||
require.Equal(t, preference.Name, received[i].Name)
|
||||
@@ -670,7 +670,7 @@ func TestDeleteSidebarPreferences(t *testing.T) {
|
||||
require.Contains(t, categories.Categories[1].Channels, channel.Id)
|
||||
|
||||
// Favorite the channel
|
||||
_, err = th.Client.UpdatePreferences(user.Id, &model.Preferences{
|
||||
_, err = th.Client.UpdatePreferences(user.Id, model.Preferences{
|
||||
{
|
||||
UserId: user.Id,
|
||||
Category: model.PreferenceCategoryFavoriteChannel,
|
||||
@@ -688,7 +688,7 @@ func TestDeleteSidebarPreferences(t *testing.T) {
|
||||
assert.NotContains(t, categories.Categories[1].Channels, channel.Id)
|
||||
|
||||
// And unfavorite the channel by deleting the preference
|
||||
_, err = th.Client.DeletePreferences(user.Id, &model.Preferences{
|
||||
_, err = th.Client.DeletePreferences(user.Id, model.Preferences{
|
||||
{
|
||||
UserId: user.Id,
|
||||
Category: model.PreferenceCategoryFavoriteChannel,
|
||||
@@ -721,7 +721,7 @@ func TestDeleteSidebarPreferences(t *testing.T) {
|
||||
dmChannel := th.CreateDmChannel(user2)
|
||||
|
||||
// Favorite the channel
|
||||
_, err := th.Client.UpdatePreferences(user.Id, &model.Preferences{
|
||||
_, err := th.Client.UpdatePreferences(user.Id, model.Preferences{
|
||||
{
|
||||
UserId: user.Id,
|
||||
Category: model.PreferenceCategoryFavoriteChannel,
|
||||
@@ -747,7 +747,7 @@ func TestDeleteSidebarPreferences(t *testing.T) {
|
||||
assert.NotContains(t, categories.Categories[2].Channels, dmChannel.Id)
|
||||
|
||||
// And unfavorite the channel by deleting the preference
|
||||
_, err = th.Client.DeletePreferences(user.Id, &model.Preferences{
|
||||
_, err = th.Client.DeletePreferences(user.Id, model.Preferences{
|
||||
{
|
||||
UserId: user.Id,
|
||||
Category: model.PreferenceCategoryFavoriteChannel,
|
||||
@@ -811,7 +811,7 @@ func TestDeleteSidebarPreferences(t *testing.T) {
|
||||
require.Contains(t, categories.Categories[1].Channels, channel.Id)
|
||||
|
||||
// Favorite the channel for both users
|
||||
_, err = th.Client.UpdatePreferences(user.Id, &model.Preferences{
|
||||
_, err = th.Client.UpdatePreferences(user.Id, model.Preferences{
|
||||
{
|
||||
UserId: user.Id,
|
||||
Category: model.PreferenceCategoryFavoriteChannel,
|
||||
@@ -821,7 +821,7 @@ func TestDeleteSidebarPreferences(t *testing.T) {
|
||||
})
|
||||
require.NoError(t, err)
|
||||
|
||||
_, err = client2.UpdatePreferences(user2.Id, &model.Preferences{
|
||||
_, err = client2.UpdatePreferences(user2.Id, model.Preferences{
|
||||
{
|
||||
UserId: user2.Id,
|
||||
Category: model.PreferenceCategoryFavoriteChannel,
|
||||
@@ -840,7 +840,7 @@ func TestDeleteSidebarPreferences(t *testing.T) {
|
||||
assert.NotContains(t, categories.Categories[1].Channels, channel.Id)
|
||||
|
||||
// And unfavorite the channel for the first user by deleting the preference
|
||||
_, err = th.Client.UpdatePreferences(user.Id, &model.Preferences{
|
||||
_, err = th.Client.UpdatePreferences(user.Id, model.Preferences{
|
||||
{
|
||||
UserId: user.Id,
|
||||
Category: model.PreferenceCategoryFavoriteChannel,
|
||||
|
||||
Ссылка в новой задаче
Block a user