coder
diff --git a/‎coderd/apidoc/docs.go
Lines changed: 8 additions & 46 deletions b/‎coderd/apidoc/docs.go
Lines changed: 8 additions & 46 deletions
diff --git a/‎coderd/apidoc/swagger.json
Lines changed: 7 additions & 45 deletions b/‎coderd/apidoc/swagger.json
Lines changed: 7 additions & 45 deletions
diff --git a/‎coderd/database/db2sdk/db2sdk.go
Lines changed: 12 additions & 19 deletions b/‎coderd/database/db2sdk/db2sdk.go
Lines changed: 12 additions & 19 deletions
diff --git a/‎codersdk/groups.go
Lines changed: 6 additions & 10 deletions b/‎codersdk/groups.go
Lines changed: 6 additions & 10 deletions
@@ -208,26 +208,19 @@ func Users(users []database.User, organizationIDs map[uuid.UUID][]uuid.UUID) []c
 	})
 }
 
-func Group(group database.Group, members []database.GroupMember, totalMemberCount int) codersdk.Group {
+func Group(row database.GetGroupsRow, members []database.GroupMember, totalMemberCount int) codersdk.Group {
 	return codersdk.Group{
-		ID:               group.ID,
-		Name:             group.Name,
-		DisplayName:      group.DisplayName,
-		OrganizationID:   group.OrganizationID,
-		AvatarURL:        group.AvatarURL,
-		Members:          ReducedUsersFromGroupMembers(members),
-		TotalMemberCount: totalMemberCount,
-		QuotaAllowance:   int(group.QuotaAllowance),
-		Source:           codersdk.GroupSource(group.Source),
-	}
-}
-
-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,
+		ID:                      row.Group.ID,
+		Name:                    row.Group.Name,
+		DisplayName:             row.Group.DisplayName,
+		OrganizationID:          row.Group.OrganizationID,
+		AvatarURL:               row.Group.AvatarURL,
+		Members:                 ReducedUsersFromGroupMembers(members),
+		TotalMemberCount:        totalMemberCount,
+		QuotaAllowance:          int(row.Group.QuotaAllowance),
+		Source:                  codersdk.GroupSource(row.Group.Source),
+		OrganizationName:        row.OrganizationName,
+		OrganizationDisplayName: row.OrganizationDisplayName,
 	}
 }
 
 
@@ -34,16 +34,12 @@ type Group struct {
 	// 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)`.
-	TotalMemberCount int         `json:"total_member_count"`
-	AvatarURL        string      `json:"avatar_url"`
-	QuotaAllowance   int         `json:"quota_allowance"`
-	Source           GroupSource `json:"source"`
-}
-
-type GroupWithOrganizationInfo struct {
-	Group
-	OrganizationName        string `json:"organization_name"`
-	OrganizationDisplayName string `json:"organization_display_name"`
+	TotalMemberCount        int         `json:"total_member_count"`
+	AvatarURL               string      `json:"avatar_url"`
+	QuotaAllowance          int         `json:"quota_allowance"`
+	Source                  GroupSource `json:"source"`
+	OrganizationName        string      `json:"organization_name"`
+	OrganizationDisplayName string      `json:"organization_display_name"`
 }
 
 func (g Group) IsEveryone() bool {