somethin'

coder · aslilac · Aug 29, 2024 · Aug 26, 2024 · Aug 27, 2024 · Aug 27, 2024
commit d0cf4540a38738bd7a48b3db70f4e40d31b8cc4e
diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/database/db2sdk/db2sdk.go b/coderd/database/db2sdk/db2sdk.go
@@ -222,10 +222,11 @@ func Group(group database.Group, members []database.GroupMember, totalMemberCoun
 	}
 }
 
-func GroupWithOrganizationInfo(group database.Group, orgDisplayName string, members []database.GroupMember, totalMemberCount int) codersdk.GroupWithOrganizationInfo {
+func GroupWithOrganizationInfo(group database.Group, orgName, orgDisplayName string, members []database.GroupMember, totalMemberCount int) codersdk.GroupWithOrganizationInfo {
 	sdkGroup := Group(group, members, totalMemberCount)
 	return codersdk.GroupWithOrganizationInfo{
 		Group:                   sdkGroup,
+		OrganizationName:        orgName,
 		OrganizationDisplayName: orgDisplayName,
 	}
 }

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,7 +22,9 @@ LIMIT
 
 -- name: GetGroups :many
 SELECT
-		sqlc.embed(groups), organizations.display_name AS organization_display_name
+		sqlc.embed(groups),
+		organizations.name AS organization_name,
+		organizations.display_name AS organization_display_name
 FROM
 		groups
 INNER JOIN

diff --git a/coderd/telemetry/telemetry.go b/coderd/telemetry/telemetry.go
@@ -373,7 +373,7 @@ func (r *remoteReporter) createSnapshot() (*Snapshot, error) {
 		}
 		snapshot.Groups = make([]Group, 0, len(groups))
 		for _, group := range groups {
-			snapshot.Groups = append(snapshot.Groups, ConvertGroup(group))
+			snapshot.Groups = append(snapshot.Groups, ConvertGroup(group.Group))
 		}
 		return nil
 	})
@@ -669,15 +669,15 @@ func ConvertUser(dbUser database.User) User {
 	}
 }
 
-func ConvertGroup(row database.GetGroupsRow) Group {
+func ConvertGroup(group database.Group) Group {
 	return Group{
-		ID:             row.Group.ID,
-		Name:           row.Group.Name,
-		OrganizationID: row.Group.OrganizationID,
-		AvatarURL:      row.Group.AvatarURL,
-		QuotaAllowance: row.Group.QuotaAllowance,
-		DisplayName:    row.Group.DisplayName,
-		Source:         row.Group.Source,
+		ID:             group.ID,
+		Name:           group.Name,
+		OrganizationID: group.OrganizationID,
+		AvatarURL:      group.AvatarURL,
+		QuotaAllowance: group.QuotaAllowance,
+		DisplayName:    group.DisplayName,
+		Source:         group.Source,
 	}
 }
 

diff --git a/codersdk/groups.go b/codersdk/groups.go
@@ -26,12 +26,11 @@ 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"`
-	OrganizationDisplayName string        `json:"organization_display_name"`
-	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"`
+	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)`.
@@ -43,6 +42,7 @@ type Group struct {
 
 type GroupWithOrganizationInfo struct {
 	Group
+	OrganizationName        string `json:"organization_name"`
 	OrganizationDisplayName string `json:"organization_display_name"`
 }