coder
diff --git a/‎coderd/apidoc/docs.go
Lines changed: 0 additions & 3 deletions b/‎coderd/apidoc/docs.go
Lines changed: 0 additions & 3 deletions
diff --git a/‎coderd/apidoc/swagger.json
Lines changed: 0 additions & 3 deletions b/‎coderd/apidoc/swagger.json
Lines changed: 0 additions & 3 deletions
diff --git a/‎coderd/database/db2sdk/db2sdk.go
Lines changed: 2 additions & 1 deletion b/‎coderd/database/db2sdk/db2sdk.go
Lines changed: 2 additions & 1 deletion
diff --git a/‎coderd/database/queries.sql.go
Lines changed: 5 additions & 1 deletion b/‎coderd/database/queries.sql.go
Lines changed: 5 additions & 1 deletion
diff --git a/‎coderd/database/queries/groups.sql
Lines changed: 3 additions & 1 deletion b/‎coderd/database/queries/groups.sql
Lines changed: 3 additions & 1 deletion
diff --git a/‎coderd/telemetry/telemetry.go
Lines changed: 9 additions & 9 deletions b/‎coderd/telemetry/telemetry.go
Lines changed: 9 additions & 9 deletions
diff --git a/‎codersdk/groups.go
Lines changed: 6 additions & 6 deletions b/‎codersdk/groups.go
Lines changed: 6 additions & 6 deletions
@@ -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,
 	}
 }
 
@@ -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
 
@@ -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,
 	}
 }
 
 
@@ -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"`
 }
Original file line number	Diff line number	Diff line change
`@@ -222,10 +222,11 @@ func Group(group database.Group, members []database.GroupMember, totalMemberCoun`
`222`	`222`	`}`
`223`	`223`	`}`
`224`	`224`
`225`		`-func GroupWithOrganizationInfo(group database.Group, orgDisplayName string, members []database.GroupMember, totalMemberCount int) codersdk.GroupWithOrganizationInfo {`
	`225`	`+func GroupWithOrganizationInfo(group database.Group, orgName, orgDisplayName string, members []database.GroupMember, totalMemberCount int) codersdk.GroupWithOrganizationInfo {`
`226`	`226`	`sdkGroup := Group(group, members, totalMemberCount)`
`227`	`227`	`return codersdk.GroupWithOrganizationInfo{`
`228`	`228`	`Group: sdkGroup,`
	`229`	`+ OrganizationName: orgName,`
`229`	`230`	`OrganizationDisplayName: orgDisplayName,`
`230`	`231`	`}`
`231`	`232`	`}`
Original file line number	Diff line number	Diff line change
`@@ -373,7 +373,7 @@ func (r remoteReporter) createSnapshot() (Snapshot, error) {`
`373`	`373`	`}`
`374`	`374`	`snapshot.Groups = make([]Group, 0, len(groups))`
`375`	`375`	`for _, group := range groups {`
`376`		`- snapshot.Groups = append(snapshot.Groups, ConvertGroup(group))`
	`376`	`+ snapshot.Groups = append(snapshot.Groups, ConvertGroup(group.Group))`
`377`	`377`	`}`
`378`	`378`	`return nil`
`379`	`379`	`})`
`@@ -669,15 +669,15 @@ func ConvertUser(dbUser database.User) User {`
`669`	`669`	`}`
`670`	`670`	`}`
`671`	`671`
`672`		`-func ConvertGroup(row database.GetGroupsRow) Group {`
	`672`	`+func ConvertGroup(group database.Group) Group {`
`673`	`673`	`return Group{`
`674`		`- ID: row.Group.ID,`
`675`		`- Name: row.Group.Name,`
`676`		`- OrganizationID: row.Group.OrganizationID,`
`677`		`- AvatarURL: row.Group.AvatarURL,`
`678`		`- QuotaAllowance: row.Group.QuotaAllowance,`
`679`		`- DisplayName: row.Group.DisplayName,`
`680`		`- Source: row.Group.Source,`
	`674`	`+ ID: group.ID,`
	`675`	`+ Name: group.Name,`
	`676`	`+ OrganizationID: group.OrganizationID,`
	`677`	`+ AvatarURL: group.AvatarURL,`
	`678`	`+ QuotaAllowance: group.QuotaAllowance,`
	`679`	`+ DisplayName: group.DisplayName,`
	`680`	`+ Source: group.Source,`
`681`	`681`	`}`
`682`	`682`	`}`
`683`	`683`