hmm

coder · aslilac · Aug 29, 2024 · Aug 26, 2024 · Aug 27, 2024 · Aug 27, 2024
commit 013b4223cd17d12e6b0d5910d5f1e6b704cebdd4
diff --git a/coderd/database/db2sdk/db2sdk.go b/coderd/database/db2sdk/db2sdk.go
@@ -208,17 +208,18 @@ 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(group 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),
+		ID:                      group.Group.ID,
+		Name:                    group.Group.Name,
+		DisplayName:             group.Group.DisplayName,
+		OrganizationID:          group.Group.OrganizationID,
+		OrganizationDisplayName: group.OrganizationDisplayName,
+		AvatarURL:               group.Group.AvatarURL,
+		Members:                 ReducedUsersFromGroupMembers(members),
+		TotalMemberCount:        totalMemberCount,
+		QuotaAllowance:          int(group.Group.QuotaAllowance),
+		Source:                  codersdk.GroupSource(group.Group.Source),
 	}
 }
 

diff --git a/coderd/database/modelmethods.go b/coderd/database/modelmethods.go
@@ -183,6 +183,10 @@ func (g Group) RBACObject() rbac.Object {
 		})
 }
 
+func (g GetGroupsRow) RBACObject() rbac.Object {
+	return g.Group.RBACObject()
+}
+
 func (gm GroupMember) RBACObject() rbac.Object {
 	return rbac.ResourceGroupMember.WithID(gm.UserID).InOrg(gm.OrganizationID).WithOwner(gm.UserID.String())
 }

diff --git a/coderd/provisionerdserver/provisionerdserver.go b/coderd/provisionerdserver/provisionerdserver.go
@@ -490,7 +490,7 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo
 		}
 		ownerGroupNames := []string{}
 		for _, group := range ownerGroups {
-			ownerGroupNames = append(ownerGroupNames, group.Name)
+			ownerGroupNames = append(ownerGroupNames, group.Group.Name)
 		}
 		err = s.Pubsub.Publish(codersdk.WorkspaceNotifyChannel(workspace.ID), []byte{})
 		if err != nil {

diff --git a/enterprise/coderd/groups.go b/enterprise/coderd/groups.go
@@ -78,7 +78,7 @@
 	var emptyMembers []database.GroupMember
 	aReq.New = group.Auditable(emptyMembers)

 	httpapi.Write(ctx, rw, http.StatusCreated, db2sdk.Group(group, nil, 0))
 }

 // @Summary Update group by name
@@ -289,7 +289,7 @@
 		return
 	}

 	httpapi.Write(ctx, rw, http.StatusOK, db2sdk.Group(group, patchedMembers, int(memberCount)))
 }

 // @Summary Delete group by name
@@ -380,7 +380,7 @@
 		return
 	}

 	httpapi.Write(ctx, rw, http.StatusOK, db2sdk.Group(group, users, int(memberCount)))
 }

 // @Summary Get groups by organization
@@ -456,12 +456,12 @@
 
 	resp := make([]codersdk.Group, 0, len(groups))
 	for _, group := range groups {
-		members, err := api.Database.GetGroupMembersByGroupID(ctx, group.ID)
+		members, err := api.Database.GetGroupMembersByGroupID(ctx, group.Group.ID)
 		if err != nil {
 			httpapi.InternalServerError(rw, err)
 			return
 		}
-		memberCount, err := api.Database.GetGroupMembersCountByGroupID(ctx, group.ID)
+		memberCount, err := api.Database.GetGroupMembersCountByGroupID(ctx, group.Group.ID)
 		if err != nil {
 			httpapi.InternalServerError(rw, err)
 			return

diff --git a/enterprise/coderd/templates.go b/enterprise/coderd/templates.go
@@ -61,12 +61,12 @@
 	sdkGroups := make([]codersdk.Group, 0, len(groups))
 	for _, group := range groups {
 		// nolint:gocritic
 		members, err := api.Database.GetGroupMembersByGroupID(dbauthz.AsSystemRestricted(ctx), group.ID)
 		if err != nil {
 			httpapi.InternalServerError(rw, err)
 			return
 		}
 		memberCount, err := api.Database.GetGroupMembersCountByGroupID(ctx, group.ID)
 		if err != nil {
 			httpapi.InternalServerError(rw, err)
 			return
@@ -147,7 +147,7 @@
 			return
 		}
 		groups = append(groups, codersdk.TemplateGroup{
-			Group: db2sdk.Group(group.Group, members, int(memberCount)),
+			Group: db2sdk.Group(group, members, int(memberCount)),
 			Role:  convertToTemplateRole(group.Actions),
 		})
 	}