IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Do not send categories for teams deleted or not member of (#21038)

Browse Source 
* Do not send categories for teams deleted or not member of

* Fix tests and add test for deleted teams and memberships
This commit is contained in:
Daniel Espino García
2022-10-11 15:33:29 +02:00
committed by GitHub
parent f72540c68f
commit 79651874ea
2 changed files with 282 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
store/sqlstore/channel_store_categories.go
View File

@@ -535,6 +535,13 @@ func (s SqlChannelStore) getSidebarCategoriesT(db dbSelecter, userId string, opt
Select("SidebarCategories.*", "SidebarChannels.ChannelId").
From("SidebarCategories").
LeftJoin("SidebarChannels ON SidebarChannels.CategoryId=Id").
InnerJoin("Teams ON Teams.Id=SidebarCategories.TeamId").
InnerJoin("TeamMembers ON TeamMembers.TeamId=SidebarCategories.TeamId").
Where(sq.And{
sq.Eq{"TeamMembers.UserId": userId},
sq.Eq{"TeamMembers.DeleteAt": 0},
sq.Eq{"Teams.DeleteAt": 0},
}).
Where(sq.And{
sq.Eq{"SidebarCategories.UserId": userId},
}).

457
store/storetest/channel_store_categories.go
View File

File diff suppressed because it is too large Load Diff