From df87d91361a9f2cd43f1681d71dd8b01ccf8a0a1 Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Wed, 21 Feb 2024 17:16:08 -0600 Subject: [PATCH 1/2] test: fetching user orgs fails if multi orgs in pg db --- coderd/organizations_test.go | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/coderd/organizations_test.go b/coderd/organizations_test.go index 6fc98d7c9add9..b146925667cbf 100644 --- a/coderd/organizations_test.go +++ b/coderd/organizations_test.go @@ -12,6 +12,28 @@ import ( "github.com/coder/coder/v2/testutil" ) +func TestMultiOrgFetch(t *testing.T) { + t.Parallel() + client := coderdtest.New(t, nil) + _ = coderdtest.CreateFirstUser(t, client) + + ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong) + defer cancel() + + makeOrgs := []string{"foo", "bar", "baz"} + for _, name := range makeOrgs { + _, err := client.CreateOrganization(ctx, codersdk.CreateOrganizationRequest{ + Name: name, + }) + require.NoError(t, err) + } + + orgs, err := client.OrganizationsByUser(ctx, codersdk.Me) + require.NoError(t, err) + require.NotNil(t, orgs) + require.Len(t, orgs, len(makeOrgs)+1) +} + func TestOrganizationsByUser(t *testing.T) { t.Parallel() client := coderdtest.New(t, nil) From e04a1ab09fc018f42eff715dc110c42548be27de Mon Sep 17 00:00:00 2001 From: Steven Masley Date: Wed, 21 Feb 2024 17:17:03 -0600 Subject: [PATCH 2/2] fix: GetOrganizationsByUserID fixed if multi orgs exist --- coderd/database/queries.sql.go | 2 +- coderd/database/queries/organizations.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go index a4ce07d09b900..135add0251e40 100644 --- a/coderd/database/queries.sql.go +++ b/coderd/database/queries.sql.go @@ -3540,7 +3540,7 @@ SELECT FROM organizations WHERE - id = ( + id = ANY( SELECT organization_id FROM diff --git a/coderd/database/queries/organizations.sql b/coderd/database/queries/organizations.sql index 7f901b003bf44..e809b386926a3 100644 --- a/coderd/database/queries/organizations.sql +++ b/coderd/database/queries/organizations.sql @@ -38,7 +38,7 @@ SELECT FROM organizations WHERE - id = ( + id = ANY( SELECT organization_id FROM