Skip to content

fix: resolve duplicate members and missing leader actions on chapter pages #666

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
bokelley merged 1 commit into from
Jan 7, 2026
Merged

fix: resolve duplicate members and missing leader actions on chapter pages #666

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions .changeset/giant-tires-argue.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
24 changes: 21 additions & 3 deletions server/src/db/working-group-db.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,13 @@ export class WorkingGroupDatabase {
FROM working_group_memberships wgm
LEFT JOIN users u ON wgm.workos_user_id = u.workos_user_id
LEFT JOIN organizations user_org ON u.primary_organization_id = user_org.workos_organization_id
LEFT JOIN organization_memberships om ON wgm.workos_user_id = om.workos_user_id
LEFT JOIN LATERAL (
SELECT om.first_name, om.last_name, om.email, om.workos_organization_id
FROM organization_memberships om
WHERE om.workos_user_id = wgm.workos_user_id
ORDER BY om.created_at DESC
LIMIT 1
) om ON true
LEFT JOIN organizations org ON om.workos_organization_id = org.workos_organization_id
WHERE wgm.working_group_id = $1 AND wgm.status = 'active'
ORDER BY user_name, user_email`,
Expand Down Expand Up @@ -583,7 +589,13 @@ export class WorkingGroupDatabase {
LEFT JOIN working_group_memberships wgm ON wgl.user_id = wgm.workos_user_id AND wgm.working_group_id = wgl.working_group_id
LEFT JOIN users u ON wgl.user_id = u.workos_user_id
LEFT JOIN organizations user_org ON u.primary_organization_id = user_org.workos_organization_id
LEFT JOIN organization_memberships om ON wgl.user_id = om.workos_user_id
LEFT JOIN LATERAL (
SELECT om.first_name, om.last_name, om.email, om.workos_organization_id
FROM organization_memberships om
WHERE om.workos_user_id = wgl.user_id
ORDER BY om.created_at DESC
LIMIT 1
) om ON true
LEFT JOIN organizations org ON om.workos_organization_id = org.workos_organization_id
LEFT JOIN slack_user_mappings sm ON wgl.user_id = sm.slack_user_id
WHERE wgl.working_group_id = $1
Expand Down Expand Up @@ -622,7 +634,13 @@ export class WorkingGroupDatabase {
LEFT JOIN working_group_memberships wgm ON wgl.user_id = wgm.workos_user_id AND wgm.working_group_id = wgl.working_group_id
LEFT JOIN users u ON wgl.user_id = u.workos_user_id
LEFT JOIN organizations user_org ON u.primary_organization_id = user_org.workos_organization_id
LEFT JOIN organization_memberships om ON wgl.user_id = om.workos_user_id
LEFT JOIN LATERAL (
SELECT om.first_name, om.last_name, om.email, om.workos_organization_id
FROM organization_memberships om
WHERE om.workos_user_id = wgl.user_id
ORDER BY om.created_at DESC
LIMIT 1
) om ON true
LEFT JOIN organizations org ON om.workos_organization_id = org.workos_organization_id
LEFT JOIN slack_user_mappings sm ON wgl.user_id = sm.slack_user_id
WHERE wgl.working_group_id = ANY($1)
Expand Down
1 change: 1 addition & 0 deletions server/src/http.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1304,6 +1304,7 @@ export class HTTPServer {
}

const user = req.user ? {
id: req.user.id,
email: req.user.email,
firstName: req.user.firstName,
lastName: req.user.lastName,
Expand Down