From f422279c2fe6fa62553417c1599a5f8f9129e30d Mon Sep 17 00:00:00 2001 From: Peter Sanchez Date: Mon, 10 Jun 2024 07:51:48 -0600 Subject: [PATCH] Only fetch active orgs for user specific fetching --- models/user.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/models/user.go b/models/user.go index 9452d19..ab69ecc 100644 --- a/models/user.go +++ b/models/user.go @@ -232,12 +232,15 @@ func (u *User) GetOrgs(ctx context.Context, perm int) ([]*Organization, error) { return nil, fmt.Errorf("User object not populated") } opts := &database.FilterOptions{ - Filter: sq.Or{ - sq.Eq{"o.owner_id": u.ID}, - sq.And{ - sq.Eq{"ou.user_id": u.ID}, - sq.GtOrEq{"ou.permission": perm}, - sq.Eq{"ou.is_active": true}, + Filter: sq.And{ + sq.Eq{"o.is_active": true}, + sq.Or{ + sq.Eq{"o.owner_id": u.ID}, + sq.And{ + sq.Eq{"ou.user_id": u.ID}, + sq.GtOrEq{"ou.permission": perm}, + sq.Eq{"ou.is_active": true}, + }, }, }, OrderBy: "o.id", -- 2.45.2