Skip to content

Fix default group not displaying on groups page #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JoshuaAFerguson merged 1 commit into from
Nov 18, 2025
Merged

Fix default group not displaying on groups page #85

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions api/internal/db/groups.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@ func (g *GroupDB) CreateGroup(ctx context.Context, req *models.CreateGroupReques
func (g *GroupDB) GetGroup(ctx context.Context, groupID string) (*models.Group, error) {
group := &models.Group{}
query := `
SELECT g.id, g.name, g.display_name, g.description, g.type, g.parent_id,
SELECT g.id, g.name, COALESCE(g.display_name, '') as display_name,
COALESCE(g.description, '') as description, g.type, g.parent_id,
g.created_at, g.updated_at, COUNT(gm.user_id) as member_count
FROM groups g
LEFT JOIN group_memberships gm ON g.id = gm.group_id
Expand All @@ -164,7 +165,8 @@ func (g *GroupDB) GetGroup(ctx context.Context, groupID string) (*models.Group,
func (g *GroupDB) GetGroupByName(ctx context.Context, name string) (*models.Group, error) {
group := &models.Group{}
query := `
SELECT g.id, g.name, g.display_name, g.description, g.type, g.parent_id,
SELECT g.id, g.name, COALESCE(g.display_name, '') as display_name,
COALESCE(g.description, '') as description, g.type, g.parent_id,
g.created_at, g.updated_at, COUNT(gm.user_id) as member_count
FROM groups g
LEFT JOIN group_memberships gm ON g.id = gm.group_id
Expand All @@ -190,7 +192,8 @@ func (g *GroupDB) GetGroupByName(ctx context.Context, name string) (*models.Grou
// ListGroups retrieves all groups with optional filtering
func (g *GroupDB) ListGroups(ctx context.Context, groupType string, parentID *string) ([]*models.Group, error) {
query := `
SELECT g.id, g.name, g.display_name, g.description, g.type, g.parent_id,
SELECT g.id, g.name, COALESCE(g.display_name, '') as display_name,
COALESCE(g.description, '') as description, g.type, g.parent_id,
g.created_at, g.updated_at, COUNT(gm.user_id) as member_count
FROM groups g
LEFT JOIN group_memberships gm ON g.id = gm.group_id
Expand Down
Loading