-
Notifications
You must be signed in to change notification settings - Fork 0
Implemented getVolunteersTable API function #80 #82
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.
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
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| /** | ||
| * Fetches all volunteers with their associated cohorts and roles. | ||
| * | ||
| * @returns A Promise resolving to an array of VolunteerTableEntry objects, | ||
| * where each entry contains: | ||
| * - volunteer: The volunteer's core information | ||
| * - cohorts: Array of cohorts the volunteer belongs to | ||
| * - roles: Array of roles assigned to the volunteer | ||
| * | ||
| * @throws Error if the Supabase query fails | ||
| * | ||
| * @example | ||
| * const volunteersData = await getVolunteersTable(); | ||
| * // Returns: | ||
| * // [ | ||
| * // { volunteer: Volunteer1, cohorts: [Cohort1, Cohort2], roles: [Role1, Role2] }, | ||
| * // { volunteer: Volunteer2, cohorts: [Cohort1], roles: [Role1] }, | ||
| * // ... | ||
| * // ] | ||
| */ | ||
| import { createClient } from "@/lib/client/supabase"; | ||
| import type { Database } from "@/lib/client/supabase/types"; | ||
| import type { PostgrestError } from "@supabase/supabase-js"; | ||
|
|
||
| type VolunteerRow = Database["public"]["Tables"]["Volunteers"]["Row"]; | ||
| type CohortRow = Database["public"]["Tables"]["Cohorts"]["Row"]; | ||
| type RoleRow = Database["public"]["Tables"]["Roles"]["Row"]; | ||
|
|
||
| export interface VolunteerTableEntry { | ||
| volunteer: VolunteerRow; | ||
| cohorts: CohortRow[]; | ||
| roles: RoleRow[]; | ||
| } | ||
|
|
||
| // Explicit type for Supabase nested select response to override incorrect inferred type | ||
| type VolunteerWithRelations = VolunteerRow & { | ||
| VolunteerCohorts: Array<{ Cohorts: CohortRow | null }>; | ||
| VolunteerRoles: Array<{ Roles: RoleRow | null }>; | ||
| }; | ||
|
|
||
| export async function getVolunteersTable(): Promise<VolunteerTableEntry[]> { | ||
| const client = await createClient(); | ||
|
|
||
| // Single query with nested selects - type assertion for proper array inference | ||
| const { data, error } = (await client.from("Volunteers").select(` | ||
| *, | ||
| VolunteerCohorts ( Cohorts (*) ), | ||
| VolunteerRoles ( Roles (*) ) | ||
| `)) as { | ||
| data: VolunteerWithRelations[] | null; | ||
| error: PostgrestError | null; | ||
| }; | ||
|
|
||
| if (error) { | ||
| throw new Error(error.message || JSON.stringify(error)); | ||
| } | ||
|
|
||
| if (!data || data.length === 0) { | ||
| return []; | ||
| } | ||
|
|
||
| // Transform nested structure to flat format | ||
| const result: VolunteerTableEntry[] = data.map((volunteerData) => { | ||
| // Extract volunteer fields and nested relation arrays | ||
| const { VolunteerCohorts, VolunteerRoles, ...volunteer } = volunteerData; | ||
|
|
||
| // Extract cohorts from nested VolunteerCohorts relation | ||
| const cohorts: CohortRow[] = (VolunteerCohorts ?? []) | ||
| .map((vc) => vc.Cohorts) | ||
| .filter((cohort): cohort is CohortRow => cohort !== null); | ||
|
|
||
| // Extract roles from nested VolunteerRoles relation | ||
| const roles: RoleRow[] = (VolunteerRoles ?? []) | ||
| .map((vr) => vr.Roles) | ||
| .filter((role): role is RoleRow => role !== null); | ||
|
|
||
| return { | ||
| volunteer: volunteer as VolunteerRow, | ||
| cohorts, | ||
| roles, | ||
| }; | ||
| }); | ||
|
|
||
| return result; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The PR title and description refer to "getVolunteersTables" (plural "Tables"), but the actual function name is "getVolunteersTable" (singular "Table"). This creates a discrepancy between the PR metadata and the implementation.