coder · aslilac · Aug 29, 2024 · Aug 26, 2024 · Aug 27, 2024 · Aug 27, 2024
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -1503,7 +1503,7 @@
 	return memberCount, nil
 }
 
-func (q *querier) GetGroups(ctx context.Context, arg database.GetGroupsParams) ([]database.Group, error) {
+func (q *querier) GetGroups(ctx context.Context, arg database.GetGroupsParams) ([]database.GetGroupsRow, error) {
 	if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceSystem); err == nil {
 		// Optimize this query for system users as it is used in telemetry.
 		// Calling authz on all groups in a deployment for telemetry jobs is
@@ -1512,7 +1512,7 @@
 		return q.db.GetGroups(ctx, arg)
 	}

 	return fetchWithPostFilter(q.auth, policy.ActionRead, q.db.GetGroups)(ctx, arg)
 }

 func (q *querier) GetHealthSettings(ctx context.Context) (string, error) {

diff --git a/coderd/database/dbmem/dbmem.go b/coderd/database/dbmem/dbmem.go
@@ -2609,7 +2609,7 @@ func (q *FakeQuerier) GetGroupMembersCountByGroupID(ctx context.Context, groupID
 	return int64(len(users)), nil
 }
 
-func (q *FakeQuerier) GetGroups(_ context.Context, arg database.GetGroupsParams) ([]database.Group, error) {
+func (q *FakeQuerier) GetGroups(_ context.Context, arg database.GetGroupsParams) ([]database.GetGroupsRow, error) {
 	err := validateDatabaseType(arg)
 	if err != nil {
 		return nil, err
@@ -2632,9 +2632,11 @@ func (q *FakeQuerier) GetGroups(_ context.Context, arg database.GetGroupsParams)
 				groupIDs[orgMember.OrganizationID] = struct{}{}
 			}
 		}
+
 	}
 
-	filtered := make([]database.Group, 0)
+	organizationDisplayNames := make(map[uuid.UUID]string)
+	filtered := make([]database.GetGroupsRow, 0)
 	for _, group := range q.groups {
 		if arg.OrganizationID != uuid.Nil && group.OrganizationID != arg.OrganizationID {
 			continue
@@ -2645,7 +2647,27 @@ func (q *FakeQuerier) GetGroups(_ context.Context, arg database.GetGroupsParams)
 			continue
 		}
 
-		filtered = append(filtered, group)
+		orgDisplayName, ok := organizationDisplayNames[group.ID]
+		if !ok {
+			for _, org := range q.organizations {
+				if group.OrganizationID == org.ID {
+					orgDisplayName = org.DisplayName
+					break
+				}
+			}
+			organizationDisplayNames[group.ID] = orgDisplayName
+		}
+
+		filtered = append(filtered, database.GetGroupsRow{
+			ID:                      group.ID,
+			Name:                    group.Name,
+			OrganizationID:          group.OrganizationID,
+			AvatarURL:               group.AvatarURL,
+			QuotaAllowance:          group.QuotaAllowance,
+			DisplayName:             group.DisplayName,
+			Source:                  group.Source,
+			OrganizationDisplayName: orgDisplayName,
+		})
 	}
 
 	return filtered, nil

diff --git a/coderd/database/dbmetrics/dbmetrics.go b/coderd/database/dbmetrics/dbmetrics.go
diff --git a/coderd/database/dbmock/dbmock.go b/coderd/database/dbmock/dbmock.go
diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/groups.sql b/coderd/database/queries/groups.sql
@@ -22,32 +22,34 @@ LIMIT
 
 -- name: GetGroups :many
 SELECT
-    *
+		groups.*, organizations.display_name AS organization_display_name
 FROM
-    groups
+		groups
+INNER JOIN
+		organizations ON ((groups.organization_id = organizations.id))
 WHERE
-    true
-    AND CASE
-        WHEN @organization_id:: uuid != '00000000-0000-0000-0000-000000000000'::uuid THEN
-            groups.organization_id = @organization_id
-        ELSE true
-    END
-    AND CASE
-        -- Filter to only include groups a user is a member of
-        WHEN @has_member_id::uuid != '00000000-0000-0000-0000-000000000000'::uuid THEN
-            EXISTS (
-                SELECT
-                    1
-                FROM
-                    -- this view handles the 'everyone' group in orgs.
-                    group_members_expanded
-                WHERE
-                    group_members_expanded.group_id = groups.id
-                AND
-                    group_members_expanded.user_id = @has_member_id
-            )
-        ELSE true
-    END
+		true
+		AND CASE
+				WHEN @organization_id:: uuid != '00000000-0000-0000-0000-000000000000'::uuid THEN
+						groups.organization_id = @organization_id
+				ELSE true
+		END
+		AND CASE
+				-- Filter to only include groups a user is a member of
+				WHEN @has_member_id::uuid != '00000000-0000-0000-0000-000000000000'::uuid THEN
+						EXISTS (
+								SELECT
+										1
+								FROM
+										-- this view handles the 'everyone' group in orgs.
+										group_members_expanded
+								WHERE
+										group_members_expanded.group_id = groups.id
+								AND
+										group_members_expanded.user_id = @has_member_id
+						)
+				ELSE true
+		END
 ;
 
 -- name: InsertGroup :one
@@ -70,15 +72,15 @@ INSERT INTO groups (
 	id,
 	name,
 	organization_id,
-    	    	source
+						source
 )
 SELECT
-    	    	gen_random_uuid(),
-    	    	group_name,
-    	    	@organization_id,
-    	    	@source
+						gen_random_uuid(),
+						group_name,
+						@organization_id,
+						@source
 FROM
-    	    	UNNEST(@group_names :: text[]) AS group_name
+						UNNEST(@group_names :: text[]) AS group_name
 -- If the name conflicts, do nothing.
 ON CONFLICT DO NOTHING
 RETURNING *;
@@ -113,5 +115,3 @@ DELETE FROM
 	groups
 WHERE
 	id = $1;
-
-
diff --git a/codersdk/groups.go b/codersdk/groups.go
@@ -26,11 +26,12 @@ type CreateGroupRequest struct {
 }
 
 type Group struct {
-	ID             uuid.UUID     `json:"id" format:"uuid"`
-	Name           string        `json:"name"`
-	DisplayName    string        `json:"display_name"`
-	OrganizationID uuid.UUID     `json:"organization_id" format:"uuid"`
-	Members        []ReducedUser `json:"members"`
+	ID                      uuid.UUID     `json:"id" format:"uuid"`
+	Name                    string        `json:"name"`
+	DisplayName             string        `json:"display_name"`
+	OrganizationID          uuid.UUID     `json:"organization_id" format:"uuid"`
+	OrganizationDisplayName string        `json:"organization_display_name"`
+	Members                 []ReducedUser `json:"members"`
 	// How many members are in this group. Shows the total count,
 	// even if the user is not authorized to read group member details.
 	// May be greater than `len(Group.Members)`.

diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -1603,14 +1603,20 @@ class ApiMethods {
 		return response.data;
 	};
 
+	getGroups = async (): Promise<TypesGen.Group[]> => {
+		const response = await this.axios.get("/api/v2/groups");
+		return response.data;
+	};
+
 	/**
 	 * @param organization Can be the organization's ID or name
 	 */
-	getGroups = async (organization: string): Promise<TypesGen.Group[]> => {
+	getGroupsByOrganization = async (
+		organization: string,
+	): Promise<TypesGen.Group[]> => {
 		const response = await this.axios.get(
-			`/api/v2/organizations/${organization}/groups`,
+			`/api/v2/organization/${organization}/groups`,
 		);
-
 		return response.data;
 	};