Skip to content

feat(store): org scoped searches report nothing for a deleted organization #1953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AmanGIT07 merged 2 commits into from
Sep 29, 2026
Merged

feat(store): org scoped searches report nothing for a deleted organization #1953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d2b7b5
feat(store): org scoped searches report nothing for a deleted organiz…
AmanGIT07 Sep 28, 2026
45a3a72
test(store): a soft-deleted organization reports no rows from the org…
AmanGIT07 Sep 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions internal/store/postgres/org_projects_repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,18 @@ func (r OrgProjectsRepository) baseQuery(orgID string) *goqu.SelectDataset {
goqu.T(TABLE_USERS),
goqu.On(goqu.I(TABLE_POLICIES+"."+COLUMN_PRINCIPAL_ID).Eq(goqu.I(TABLE_USERS+"."+COLUMN_ID))),
).
InnerJoin(
goqu.T(TABLE_ORGANIZATIONS),
goqu.On(goqu.I(TABLE_PROJECTS+"."+COLUMN_ORG_ID).Eq(goqu.I(TABLE_ORGANIZATIONS+"."+COLUMN_ID))),
).
Where(
goqu.Ex{
TABLE_PROJECTS + "." + COLUMN_ORG_ID: orgID,
COLUMN_PRINCIPAL_TYPE: PRINCIPAL_TYPE_USER,
},
live(TABLE_PROJECTS),
live(TABLE_USERS),
live(TABLE_ORGANIZATIONS),
)
}

Expand Down
10 changes: 5 additions & 5 deletions internal/store/postgres/org_projects_repository_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func TestOrgProjectsRepository_prepareDataQuery(t *testing.T) {
Limit: 10,
Offset: 0,
},
wantSQL: `SELECT "projects"."id", "projects"."name", "projects"."title", "projects"."state", "projects"."created_at", "projects"."org_id", COUNT(DISTINCT("policies"."principal_id")) AS "member_count", array_agg(DISTINCT users.id) AS "user_ids" FROM "policies" INNER JOIN "projects" ON ("policies"."resource_id" = "projects"."id") INNER JOIN "users" ON ("policies"."principal_id" = "users"."id") WHERE (("policies"."deleted_at" IS NULL) AND (("principal_type" = $1) AND ("projects"."org_id" = $2)) AND ("projects"."deleted_at" IS NULL) AND ("users"."deleted_at" IS NULL)) GROUP BY "projects"."id", "projects"."name", "projects"."title", "projects"."state", "projects"."created_at", "projects"."org_id" LIMIT $3`,
wantSQL: `SELECT "projects"."id", "projects"."name", "projects"."title", "projects"."state", "projects"."created_at", "projects"."org_id", COUNT(DISTINCT("policies"."principal_id")) AS "member_count", array_agg(DISTINCT users.id) AS "user_ids" FROM "policies" INNER JOIN "projects" ON ("policies"."resource_id" = "projects"."id") INNER JOIN "users" ON ("policies"."principal_id" = "users"."id") INNER JOIN "organizations" ON ("projects"."org_id" = "organizations"."id") WHERE (("policies"."deleted_at" IS NULL) AND (("principal_type" = $1) AND ("projects"."org_id" = $2)) AND ("projects"."deleted_at" IS NULL) AND ("users"."deleted_at" IS NULL) AND ("organizations"."deleted_at" IS NULL)) GROUP BY "projects"."id", "projects"."name", "projects"."title", "projects"."state", "projects"."created_at", "projects"."org_id" LIMIT $3`,
wantArgs: []any{"app/user", "org123", int64(10)},
wantErr: false,
},
Expand All @@ -42,7 +42,7 @@ func TestOrgProjectsRepository_prepareDataQuery(t *testing.T) {
Limit: 10,
Offset: 0,
},
wantSQL: `SELECT "projects"."id", "projects"."name", "projects"."title", "projects"."state", "projects"."created_at", "projects"."org_id", COUNT(DISTINCT("policies"."principal_id")) AS "member_count", array_agg(DISTINCT users.id) AS "user_ids" FROM "policies" INNER JOIN "projects" ON ("policies"."resource_id" = "projects"."id") INNER JOIN "users" ON ("policies"."principal_id" = "users"."id") WHERE (("policies"."deleted_at" IS NULL) AND (("principal_type" = $1) AND ("projects"."org_id" = $2)) AND ("projects"."deleted_at" IS NULL) AND ("users"."deleted_at" IS NULL) AND ("projects"."name" = $3)) GROUP BY "projects"."id", "projects"."name", "projects"."title", "projects"."state", "projects"."created_at", "projects"."org_id" LIMIT $4`,
wantSQL: `SELECT "projects"."id", "projects"."name", "projects"."title", "projects"."state", "projects"."created_at", "projects"."org_id", COUNT(DISTINCT("policies"."principal_id")) AS "member_count", array_agg(DISTINCT users.id) AS "user_ids" FROM "policies" INNER JOIN "projects" ON ("policies"."resource_id" = "projects"."id") INNER JOIN "users" ON ("policies"."principal_id" = "users"."id") INNER JOIN "organizations" ON ("projects"."org_id" = "organizations"."id") WHERE (("policies"."deleted_at" IS NULL) AND (("principal_type" = $1) AND ("projects"."org_id" = $2)) AND ("projects"."deleted_at" IS NULL) AND ("users"."deleted_at" IS NULL) AND ("organizations"."deleted_at" IS NULL) AND ("projects"."name" = $3)) GROUP BY "projects"."id", "projects"."name", "projects"."title", "projects"."state", "projects"."created_at", "projects"."org_id" LIMIT $4`,
wantArgs: []any{"app/user", "org123", "test-project", int64(10)},
wantErr: false,
},
Expand All @@ -60,7 +60,7 @@ func TestOrgProjectsRepository_prepareDataQuery(t *testing.T) {
Limit: 10,
Offset: 0,
},
wantSQL: `SELECT "projects"."id", "projects"."name", "projects"."title", "projects"."state", "projects"."created_at", "projects"."org_id", COUNT(DISTINCT("policies"."principal_id")) AS "member_count", array_agg(DISTINCT users.id) AS "user_ids" FROM "policies" INNER JOIN "projects" ON ("policies"."resource_id" = "projects"."id") INNER JOIN "users" ON ("policies"."principal_id" = "users"."id") WHERE (("policies"."deleted_at" IS NULL) AND (("principal_type" = $1) AND ("projects"."org_id" = $2)) AND ("projects"."deleted_at" IS NULL) AND ("users"."deleted_at" IS NULL) AND ("projects"."created_at" > CAST($3 AS TIMESTAMP))) GROUP BY "projects"."id", "projects"."name", "projects"."title", "projects"."state", "projects"."created_at", "projects"."org_id" LIMIT $4`,
wantSQL: `SELECT "projects"."id", "projects"."name", "projects"."title", "projects"."state", "projects"."created_at", "projects"."org_id", COUNT(DISTINCT("policies"."principal_id")) AS "member_count", array_agg(DISTINCT users.id) AS "user_ids" FROM "policies" INNER JOIN "projects" ON ("policies"."resource_id" = "projects"."id") INNER JOIN "users" ON ("policies"."principal_id" = "users"."id") INNER JOIN "organizations" ON ("projects"."org_id" = "organizations"."id") WHERE (("policies"."deleted_at" IS NULL) AND (("principal_type" = $1) AND ("projects"."org_id" = $2)) AND ("projects"."deleted_at" IS NULL) AND ("users"."deleted_at" IS NULL) AND ("organizations"."deleted_at" IS NULL) AND ("projects"."created_at" > CAST($3 AS TIMESTAMP))) GROUP BY "projects"."id", "projects"."name", "projects"."title", "projects"."state", "projects"."created_at", "projects"."org_id" LIMIT $4`,
wantArgs: []any{"app/user", "org123", "2023-11-02T12:10:21.470756Z", int64(10)},
wantErr: false,
},
Expand All @@ -71,7 +71,7 @@ func TestOrgProjectsRepository_prepareDataQuery(t *testing.T) {
Search: "test",
Limit: 10,
},
wantSQL: `SELECT "projects"."id", "projects"."name", "projects"."title", "projects"."state", "projects"."created_at", "projects"."org_id", COUNT(DISTINCT("policies"."principal_id")) AS "member_count", array_agg(DISTINCT users.id) AS "user_ids" FROM "policies" INNER JOIN "projects" ON ("policies"."resource_id" = "projects"."id") INNER JOIN "users" ON ("policies"."principal_id" = "users"."id") WHERE (("policies"."deleted_at" IS NULL) AND (("principal_type" = $1) AND ("projects"."org_id" = $2)) AND ("projects"."deleted_at" IS NULL) AND ("users"."deleted_at" IS NULL) AND (("projects"."title" ILIKE $3) OR ("projects"."name" ILIKE $4) OR ("projects"."state" ILIKE $5))) GROUP BY "projects"."id", "projects"."name", "projects"."title", "projects"."state", "projects"."created_at", "projects"."org_id" LIMIT $6`,
wantSQL: `SELECT "projects"."id", "projects"."name", "projects"."title", "projects"."state", "projects"."created_at", "projects"."org_id", COUNT(DISTINCT("policies"."principal_id")) AS "member_count", array_agg(DISTINCT users.id) AS "user_ids" FROM "policies" INNER JOIN "projects" ON ("policies"."resource_id" = "projects"."id") INNER JOIN "users" ON ("policies"."principal_id" = "users"."id") INNER JOIN "organizations" ON ("projects"."org_id" = "organizations"."id") WHERE (("policies"."deleted_at" IS NULL) AND (("principal_type" = $1) AND ("projects"."org_id" = $2)) AND ("projects"."deleted_at" IS NULL) AND ("users"."deleted_at" IS NULL) AND ("organizations"."deleted_at" IS NULL) AND (("projects"."title" ILIKE $3) OR ("projects"."name" ILIKE $4) OR ("projects"."state" ILIKE $5))) GROUP BY "projects"."id", "projects"."name", "projects"."title", "projects"."state", "projects"."created_at", "projects"."org_id" LIMIT $6`,
wantArgs: []any{"app/user", "org123", "%test%", "%test%", "%test%", int64(10)},
wantErr: false,
},
Expand All @@ -87,7 +87,7 @@ func TestOrgProjectsRepository_prepareDataQuery(t *testing.T) {
},
Limit: 10,
},
wantSQL: `SELECT "projects"."id", "projects"."name", "projects"."title", "projects"."state", "projects"."created_at", "projects"."org_id", COUNT(DISTINCT("policies"."principal_id")) AS "member_count", array_agg(DISTINCT users.id) AS "user_ids" FROM "policies" INNER JOIN "projects" ON ("policies"."resource_id" = "projects"."id") INNER JOIN "users" ON ("policies"."principal_id" = "users"."id") WHERE (("policies"."deleted_at" IS NULL) AND (("principal_type" = $1) AND ("projects"."org_id" = $2)) AND ("projects"."deleted_at" IS NULL) AND ("users"."deleted_at" IS NULL)) GROUP BY "projects"."id", "projects"."name", "projects"."title", "projects"."state", "projects"."created_at", "projects"."org_id" ORDER BY "created_at" DESC LIMIT $3`,
wantSQL: `SELECT "projects"."id", "projects"."name", "projects"."title", "projects"."state", "projects"."created_at", "projects"."org_id", COUNT(DISTINCT("policies"."principal_id")) AS "member_count", array_agg(DISTINCT users.id) AS "user_ids" FROM "policies" INNER JOIN "projects" ON ("policies"."resource_id" = "projects"."id") INNER JOIN "users" ON ("policies"."principal_id" = "users"."id") INNER JOIN "organizations" ON ("projects"."org_id" = "organizations"."id") WHERE (("policies"."deleted_at" IS NULL) AND (("principal_type" = $1) AND ("projects"."org_id" = $2)) AND ("projects"."deleted_at" IS NULL) AND ("users"."deleted_at" IS NULL) AND ("organizations"."deleted_at" IS NULL)) GROUP BY "projects"."id", "projects"."name", "projects"."title", "projects"."state", "projects"."created_at", "projects"."org_id" ORDER BY "created_at" DESC LIMIT $3`,
wantArgs: []any{"app/user", "org123", int64(10)},
wantErr: false,
},
Expand Down
5 changes: 5 additions & 0 deletions internal/store/postgres/org_users_repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ func (r OrgUsersRepository) buildBaseQuery(orgID string) *goqu.SelectDataset {
goqu.I(TABLE_POLICIES + "." + COLUMN_PRINCIPAL_TYPE).Eq("app/user"),
live(TABLE_USERS),
live(TABLE_ROLES),
live(TABLE_ORGANIZATIONS),
}

return fromLive(TABLE_POLICIES).Prepared(true).
Expand All @@ -204,6 +205,10 @@ func (r OrgUsersRepository) buildBaseQuery(orgID string) *goqu.SelectDataset {
goqu.T(TABLE_ROLES),
goqu.On(goqu.I(TABLE_ROLES+"."+COLUMN_ID).Eq(goqu.I(TABLE_POLICIES+"."+COLUMN_ROLE_ID))),
).
Join(
goqu.T(TABLE_ORGANIZATIONS),
goqu.On(goqu.I(TABLE_ORGANIZATIONS+"."+COLUMN_ID).Eq(goqu.I(TABLE_POLICIES+"."+COLUMN_RESOURCE_ID))),
).
Where(baseConditions...).
Select(querySelects...).
GroupBy(r.getGroupByColumns()...)
Expand Down
Loading
Loading