upstream/mattermost
1
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-05-28 04:35:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix getAllChannels api not returning DMs/GMs (#31362)

Browse source 
Automatic Merge
This commit is contained in:
Daniel Espino García 2025-06-17 08:16:06 +02:00 committed by GitHub
parent 761bc7549b
commit fc14fa0e87
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 47 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
server/channels/store/sqlstore/channel_store.go
View file

@ -1143,13 +1143,11 @@ func (s SqlChannelStore) GetChannels(teamId string, userId string, opts *model.C
func (s SqlChannelStore) GetChannelsByUser(userId string, includeDeleted bool, lastDeleteAt, pageSize int, fromChannelID string) (model.ChannelList, error) {
query := s.getQueryBuilder().
Select(channelSliceColumns(true, "Channels")...).
From("Channels, ChannelMembers, Teams").
From("Channels").
InnerJoin("ChannelMembers ON (Channels.Id = ChannelMembers.ChannelId)").
LeftJoin("Teams ON (Channels.TeamId = Teams.Id)").
Where(
sq.And{
sq.Expr("Channels.Id = ChannelMembers.ChannelId"),
sq.Expr("Channels.TeamId = Teams.Id"),
sq.Eq{"ChannelMembers.UserId": userId},
},
sq.Eq{"ChannelMembers.UserId": userId},
).
OrderBy("Channels.Id ASC")
@ -1170,6 +1168,7 @@ func (s SqlChannelStore) GetChannelsByUser(userId string, includeDeleted bool, l
sq.GtOrEq{"Channels.DeleteAt": lastDeleteAt},
},
sq.Or{
sq.Eq{"Teams.Id": nil},
sq.Eq{"Teams.DeleteAt": 0},
sq.GtOrEq{"Teams.DeleteAt": lastDeleteAt},
},
@ -1180,7 +1179,10 @@ func (s SqlChannelStore) GetChannelsByUser(userId string, includeDeleted bool, l
// Don't include archived channels or channels from deleted teams
query = query.Where(sq.And{
sq.Eq{"Channels.DeleteAt": 0},
sq.Eq{"Teams.DeleteAt": 0},
sq.Or{
sq.Eq{"Teams.DeleteAt": 0},
sq.Eq{"Teams.Id": nil},
},
})
}

66
server/channels/store/storetest/channel_store.go
View file

@ -3882,6 +3882,7 @@ func testChannelStoreGetChannels(t *testing.T, rctx request.CTX, ss store.Store)
}
func testChannelStoreGetChannelsByUser(t *testing.T, rctx request.CTX, ss store.Store) {
userID := model.NewId()
team := &model.Team{
DisplayName: "Team1",
Name: NewTestID(),
@ -3922,9 +3923,12 @@ func testChannelStoreGetChannelsByUser(t *testing.T, rctx request.CTX, ss store.
_, nErr = ss.Channel().Save(rctx, &o3, -1)
require.NoError(t, nErr)
o4, nErr := ss.Channel().CreateDirectChannel(rctx, &model.User{Id: userID}, &model.User{Id: model.NewId()})
require.NoError(t, nErr)
m1 := model.ChannelMember{}
m1.ChannelId = o1.Id
m1.UserId = model.NewId()
m1.UserId = userID
m1.NotifyProps = model.GetDefaultChannelNotifyProps()
_, err = ss.Channel().SaveMember(rctx, &m1)
require.NoError(t, err)
@ -3938,22 +3942,25 @@ func testChannelStoreGetChannelsByUser(t *testing.T, rctx request.CTX, ss store.
m3 := model.ChannelMember{}
m3.ChannelId = o2.Id
m3.UserId = m1.UserId
m3.UserId = userID
m3.NotifyProps = model.GetDefaultChannelNotifyProps()
_, err = ss.Channel().SaveMember(rctx, &m3)
require.NoError(t, err)
m4 := model.ChannelMember{}
m4.ChannelId = o3.Id
m4.UserId = m1.UserId
m4.UserId = userID
m4.NotifyProps = model.GetDefaultChannelNotifyProps()
_, err = ss.Channel().SaveMember(rctx, &m4)
require.NoError(t, err)
list, nErr := ss.Channel().GetChannelsByUser(m1.UserId, false, 0, -1, "")
// No need to save member for direct channel
// since create direct channel already saves the members
list, nErr := ss.Channel().GetChannelsByUser(userID, false, 0, -1, "")
require.NoError(t, nErr)
require.Len(t, list, 3)
require.ElementsMatch(t, []string{o1.Id, o2.Id, o3.Id}, []string{list[0].Id, list[1].Id, list[2].Id}, "channels did not match")
require.Len(t, list, 4)
require.ElementsMatch(t, []string{o1.Id, o2.Id, o3.Id, o4.Id}, []string{list[0].Id, list[1].Id, list[2].Id, list[3].Id}, "channels did not match")
nErr = ss.Channel().Delete(o2.Id, 10)
require.NoError(t, nErr)
@ -3962,36 +3969,39 @@ func testChannelStoreGetChannelsByUser(t *testing.T, rctx request.CTX, ss store.
require.NoError(t, nErr)
// should return 1
list, nErr = ss.Channel().GetChannelsByUser(m1.UserId, false, 0, -1, "")
require.NoError(t, nErr)
require.Len(t, list, 1)
require.Equal(t, o1.Id, list[0].Id, "missing channel")
// Should return all
list, nErr = ss.Channel().GetChannelsByUser(m1.UserId, true, 0, -1, "")
require.NoError(t, nErr)
require.Len(t, list, 3)
require.ElementsMatch(t, []string{o1.Id, o2.Id, o3.Id}, []string{list[0].Id, list[1].Id, list[2].Id}, "channels did not match")
// Should still return all
list, nErr = ss.Channel().GetChannelsByUser(m1.UserId, true, 10, -1, "")
require.NoError(t, nErr)
require.Len(t, list, 3)
require.ElementsMatch(t, []string{o1.Id, o2.Id, o3.Id}, []string{list[0].Id, list[1].Id, list[2].Id}, "channels did not match")
// Should return 2
list, nErr = ss.Channel().GetChannelsByUser(m1.UserId, true, 20, -1, "")
list, nErr = ss.Channel().GetChannelsByUser(userID, false, 0, -1, "")
require.NoError(t, nErr)
require.Len(t, list, 2)
require.ElementsMatch(t, []string{o1.Id, o3.Id}, []string{list[0].Id, list[1].Id}, "channels did not match")
require.ElementsMatch(t, []string{o1.Id, o4.Id}, []string{list[0].Id, list[1].Id}, "channels did not match")
// Archive team and verify channels don't show up
// Should return all
list, nErr = ss.Channel().GetChannelsByUser(userID, true, 0, -1, "")
require.NoError(t, nErr)
require.Len(t, list, 4)
require.ElementsMatch(t, []string{o1.Id, o2.Id, o3.Id, o4.Id}, []string{list[0].Id, list[1].Id, list[2].Id, list[3].Id}, "channels did not match")
// Should still return all
list, nErr = ss.Channel().GetChannelsByUser(userID, true, 10, -1, "")
require.NoError(t, nErr)
require.Len(t, list, 4)
require.ElementsMatch(t, []string{o1.Id, o2.Id, o3.Id, o4.Id}, []string{list[0].Id, list[1].Id, list[2].Id, list[3].Id}, "channels did not match")
// Should return 2
list, nErr = ss.Channel().GetChannelsByUser(userID, true, 20, -1, "")
require.NoError(t, nErr)
require.Len(t, list, 3)
require.ElementsMatch(t, []string{o1.Id, o3.Id, o4.Id}, []string{list[0].Id, list[1].Id, list[2].Id}, "channels did not match")
// Archive team and delete DM and verify channels don't show up
team.DeleteAt = model.GetMillis()
_, nErr = ss.Team().Update(team)
require.NoError(t, nErr)
nErr = ss.Channel().Delete(o4.Id, 30)
require.NoError(t, nErr)
// Should return an error since team is archived and there are no results
_, nErr = ss.Channel().GetChannelsByUser(m1.UserId, false, 0, -1, "")
_, nErr = ss.Channel().GetChannelsByUser(userID, false, 0, -1, "")
require.Error(t, nErr)
}