Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/controlplane/pkg/biz/group.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ type ListGroupOpts struct {
Description string
// MemberEmail is the email of the member to filter by.
MemberEmail string
// UserID is the ID of the user to filter by.
UserID *uuid.UUID
}

// ListMembersOpts defines options for listing members of a group.
Expand Down
30 changes: 30 additions & 0 deletions app/controlplane/pkg/biz/group_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,7 @@ func (s *groupListIntegrationTestSuite) TearDownSubTest() {
ctx := context.Background()
// Clean up the database after each test
_, _ = s.Data.DB.Group.Delete().Exec(ctx)
_, _ = s.Data.DB.Membership.Delete().Exec(ctx)
}

// Test listing groups with various filters
Expand Down Expand Up @@ -520,6 +521,35 @@ func (s *groupListIntegrationTestSuite) TestList() {
s.Equal(group2.ID, groups[0].ID)
})

s.Run("list groups with member ID", func() {
// Create a second user
user2, err := s.User.UpsertByEmail(ctx, "user2@example.com", nil)
require.NoError(s.T(), err)

// Add user2 to organization
_, err = s.Membership.Create(ctx, s.org.ID, user2.ID)
require.NoError(s.T(), err)

// Create a group with user as maintainer
groupWithUser1 := "Group with user 1"
_, err = s.Group.Create(ctx, uuid.MustParse(s.org.ID), "group-with-user1", groupWithUser1, s.userUUID)
require.NoError(s.T(), err)

// Create a group with user2 as maintainer
groupWithUser2 := "Group with user 2"
user2UUID := uuid.MustParse(user2.ID)
group2, err := s.Group.Create(ctx, uuid.MustParse(s.org.ID), "group-with-user2", groupWithUser2, &user2UUID)
require.NoError(s.T(), err)

// Filter by member ID
filterOpts := &biz.ListGroupOpts{UserID: &user2UUID}
groups, count, err := s.Group.List(ctx, uuid.MustParse(s.org.ID), filterOpts, nil)
s.NoError(err)
s.Equal(1, len(groups))
s.Equal(1, count)
s.Equal(group2.ID, groups[0].ID)
})

s.Run("list groups with pagination", func() {
// Create several groups
for i := 1; i <= 5; i++ {
Expand Down
48 changes: 8 additions & 40 deletions app/controlplane/pkg/data/ent/client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 10 additions & 26 deletions app/controlplane/pkg/data/ent/group.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

70 changes: 18 additions & 52 deletions app/controlplane/pkg/data/ent/group/group.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 6 additions & 29 deletions app/controlplane/pkg/data/ent/group/where.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading