USEFULL
/
drone
mirror of https://github.com/harness/drone.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Exclude soft deleted spaces on membership listing (#2059)

ui/diff-word-wrap
Atefeh Mohseni Ejiyeh 2024-05-22 18:15:51 +00:00 committed by Harness
parent 2f2388aa42
commit 831cf18abc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/store/database/membership.go
View File

@ -297,7 +297,7 @@ func (s *MembershipStore) CountSpaces(ctx context.Context,
Select("count(*)"). Select("count(*)").
From("memberships"). From("memberships").
InnerJoin("spaces ON spaces.space_id = membership_space_id"). InnerJoin("spaces ON spaces.space_id = membership_space_id").
Where("membership_principal_id = ?", userID) Where("membership_principal_id = ? AND spaces.space_deleted IS NULL", userID)
stmt = applyMembershipSpaceFilter(stmt, filter) stmt = applyMembershipSpaceFilter(stmt, filter)
@ -327,7 +327,7 @@ func (s *MembershipStore) ListSpaces(ctx context.Context,
Select(columns). Select(columns).
From("memberships"). From("memberships").
InnerJoin("spaces ON spaces.space_id = membership_space_id"). InnerJoin("spaces ON spaces.space_id = membership_space_id").
Where("membership_principal_id = ?", userID) Where("membership_principal_id = ? AND spaces.space_deleted IS NULL", userID)
stmt = applyMembershipSpaceFilter(stmt, filter) stmt = applyMembershipSpaceFilter(stmt, filter)
stmt = stmt.Limit(database.Limit(filter.Size)) stmt = stmt.Limit(database.Limit(filter.Size))