hmm

aslilac · aslilac · commit 013b4223cd17 · 2024-08-27T19:41:49.000Z
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
@@ -456,12 +456,12 @@ func (api *API) groups(rw http.ResponseWriter, r *http.Request) {
 
 	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
@@ -147,7 +147,7 @@ func (api *API) templateACL(rw http.ResponseWriter, r *http.Request) {
 			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),
 		})
 	}

Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,10 @@ func (g Group) RBACObject() rbac.Object {`
`183`	`183`	`})`
`184`	`184`	`}`
`185`	`185`
	`186`	`+func (g GetGroupsRow) RBACObject() rbac.Object {`
	`187`	`+ return g.Group.RBACObject()`
	`188`	`+}`
	`189`	`+`
`186`	`190`	`func (gm GroupMember) RBACObject() rbac.Object {`
`187`	`191`	`return rbac.ResourceGroupMember.WithID(gm.UserID).InOrg(gm.OrganizationID).WithOwner(gm.UserID.String())`
`188`	`192`	`}`
Original file line number	Diff line number	Diff line change
`@@ -490,7 +490,7 @@ func (s *server) acquireProtoJob(ctx context.Context, job database.ProvisionerJo`
`490`	`490`	`}`
`491`	`491`	`ownerGroupNames := []string{}`
`492`	`492`	`for _, group := range ownerGroups {`
`493`		`- ownerGroupNames = append(ownerGroupNames, group.Name)`
	`493`	`+ ownerGroupNames = append(ownerGroupNames, group.Group.Name)`
`494`	`494`	`}`
`495`	`495`	`err = s.Pubsub.Publish(codersdk.WorkspaceNotifyChannel(workspace.ID), []byte{})`
`496`	`496`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ func (api API) templateACL(rw http.ResponseWriter, r http.Request) {`
`147`	`147`	`return`
`148`	`148`	`}`
`149`	`149`	`groups = append(groups, codersdk.TemplateGroup{`
`150`		`- Group: db2sdk.Group(group.Group, members, int(memberCount)),`
	`150`	`+ Group: db2sdk.Group(group, members, int(memberCount)),`
`151`	`151`	`Role: convertToTemplateRole(group.Actions),`
`152`	`152`	`})`
`153`	`153`	`}`