Add notification preferences and alternate dues payment options
Notification preferences (migration 048): - Per-member opt-out of muteable categories (bookings, classes, forms, admin alerts); billing is always-on. Opt-out model, default on. - Dispatcher reads prefs and marks muted outbox rows 'skipped' instead of sending; pure isMuted logic, fail-open on a prefs lookup error. - notification_preferences table (default-deny RLS); /me toggles and self-view via validated service-client actions. Alternate dues payment methods (migration 049): - Admin sets external pay-here URLs per platform (PayPal/Zeffy/Venmo) in /settings; members see active ones on /me and pay off-platform; the treasurer reconciles manually (platform pre-tagged). https-only. - dues_payment_methods table (SELECT space member, write admin/board). /me visual pass: - Restore the chip/preset profile editor (skills/interests/willing-to/ affiliations); promote ChipInput and presets to shared modules. - Gate the Stripe pay-dues button on whether the space has Stripe configured; show external links or a contact-admin note otherwise.
This commit is contained in:
@@ -0,0 +1,124 @@
|
||||
'use server'
|
||||
|
||||
import { revalidatePath } from 'next/cache'
|
||||
import { createClient } from '@/lib/supabase/server'
|
||||
import { requireMember, requireMemberWithRole, parseInput } from '@/lib/auth-helpers'
|
||||
import { ADMIN_ROLES } from '@/lib/permissions'
|
||||
import { duesPaymentMethodSchema } from '@/lib/validations'
|
||||
|
||||
export type DuesPaymentMethod = {
|
||||
platform: string
|
||||
url: string
|
||||
instructions: string | null
|
||||
isActive: boolean
|
||||
sortOrder: number
|
||||
}
|
||||
|
||||
// Member-facing: the ACTIVE external dues payment links for the caller's space,
|
||||
// in display order. RLS (SELECT = space member) scopes this; we still pin
|
||||
// space_id for clarity. Used by the /me dues UI to render click-out buttons.
|
||||
export async function listActiveDuesPaymentMethods(): Promise<
|
||||
{ data: DuesPaymentMethod[] } | { error: string }
|
||||
> {
|
||||
const supabase = await createClient()
|
||||
const auth = await requireMember(supabase)
|
||||
if (!auth.ok) return { error: auth.error }
|
||||
const { member } = auth
|
||||
|
||||
const { data } = await supabase
|
||||
.from('dues_payment_methods')
|
||||
.select('platform, url, instructions, is_active, sort_order')
|
||||
.eq('space_id', member.space_id)
|
||||
.eq('is_active', true)
|
||||
.order('sort_order', { ascending: true })
|
||||
|
||||
return { data: (data ?? []).map(toMethod) }
|
||||
}
|
||||
|
||||
// Admin-facing: every configured method (active + inactive) for the management
|
||||
// UI in /settings.
|
||||
export async function listDuesPaymentMethods(): Promise<
|
||||
{ data: DuesPaymentMethod[] } | { error: string }
|
||||
> {
|
||||
const supabase = await createClient()
|
||||
const auth = await requireMemberWithRole(supabase, ADMIN_ROLES, 'Admin access required')
|
||||
if (!auth.ok) return { error: auth.error }
|
||||
const { member } = auth
|
||||
|
||||
const { data } = await supabase
|
||||
.from('dues_payment_methods')
|
||||
.select('platform, url, instructions, is_active, sort_order')
|
||||
.eq('space_id', member.space_id)
|
||||
.order('sort_order', { ascending: true })
|
||||
|
||||
return { data: (data ?? []).map(toMethod) }
|
||||
}
|
||||
|
||||
// Admin: create or update the link for one platform (idempotent on
|
||||
// (space_id, platform)). The RLS write policies re-check the admin/board role.
|
||||
export async function upsertDuesPaymentMethod(
|
||||
input: unknown,
|
||||
): Promise<{ ok: true } | { error: string }> {
|
||||
const supabase = await createClient()
|
||||
const auth = await requireMemberWithRole(supabase, ADMIN_ROLES, 'Admin access required')
|
||||
if (!auth.ok) return { error: auth.error }
|
||||
const { member } = auth
|
||||
|
||||
const v = parseInput(duesPaymentMethodSchema, input)
|
||||
if (!v.ok) return { error: v.error }
|
||||
const s = v.data
|
||||
|
||||
const { error } = await supabase.from('dues_payment_methods').upsert(
|
||||
{
|
||||
space_id: member.space_id,
|
||||
platform: s.platform,
|
||||
url: s.url,
|
||||
instructions: s.instructions ?? null,
|
||||
is_active: s.is_active ?? true,
|
||||
sort_order: s.sort_order ?? 0,
|
||||
},
|
||||
{ onConflict: 'space_id,platform' },
|
||||
)
|
||||
if (error) return { error: 'Could not save the payment method.' }
|
||||
|
||||
revalidatePath('/settings')
|
||||
revalidatePath('/me')
|
||||
return { ok: true }
|
||||
}
|
||||
|
||||
// Admin: remove the link for one platform entirely.
|
||||
export async function deleteDuesPaymentMethod(input: {
|
||||
platform: string
|
||||
}): Promise<{ ok: true } | { error: string }> {
|
||||
const supabase = await createClient()
|
||||
const auth = await requireMemberWithRole(supabase, ADMIN_ROLES, 'Admin access required')
|
||||
if (!auth.ok) return { error: auth.error }
|
||||
const { member } = auth
|
||||
|
||||
const { error } = await supabase
|
||||
.from('dues_payment_methods')
|
||||
.delete()
|
||||
.eq('space_id', member.space_id)
|
||||
.eq('platform', input.platform)
|
||||
if (error) return { error: 'Could not remove the payment method.' }
|
||||
|
||||
revalidatePath('/settings')
|
||||
revalidatePath('/me')
|
||||
return { ok: true }
|
||||
}
|
||||
|
||||
function toMethod(r: {
|
||||
platform: string
|
||||
url: string
|
||||
instructions: string | null
|
||||
is_active: boolean
|
||||
sort_order: number
|
||||
}): DuesPaymentMethod {
|
||||
return {
|
||||
platform: r.platform,
|
||||
url: r.url,
|
||||
instructions: r.instructions ?? null,
|
||||
isActive: r.is_active,
|
||||
sortOrder: r.sort_order,
|
||||
}
|
||||
}
|
||||
@@ -71,3 +71,6 @@ export * from './stripe'
|
||||
|
||||
// Transactional notifications outbox (product spine Phase 2)
|
||||
export * from './notifications'
|
||||
|
||||
// Alternate dues payment methods (admin-configured external links)
|
||||
export * from './dues-payments'
|
||||
|
||||
@@ -1,8 +1,15 @@
|
||||
'use server'
|
||||
|
||||
import { revalidatePath } from 'next/cache'
|
||||
import { createClient } from '@/lib/supabase/server'
|
||||
import { createAdminClient } from '@/lib/supabase/admin'
|
||||
import { requireMember } from '@/lib/auth-helpers'
|
||||
import { notificationPreferenceSchema } from '@/lib/validations'
|
||||
import {
|
||||
MUTEABLE_CATEGORIES,
|
||||
type NotificationCategory,
|
||||
type PrefMap,
|
||||
} from '@/lib/notifications-prefs-logic'
|
||||
|
||||
// The caller's own notification history. The notifications RLS SELECT is
|
||||
// admin/board/treasurer only (mirrors member_billing), so the member
|
||||
@@ -32,3 +39,63 @@ export async function getMyNotifications() {
|
||||
})),
|
||||
}
|
||||
}
|
||||
|
||||
// The caller's own notification preferences as a category -> enabled map.
|
||||
// notification_preferences has no client policy (same convention as
|
||||
// notifications / member_billing), so the read goes through the service client
|
||||
// scoped to the caller's own member row. Absent categories are the default
|
||||
// (enabled); only muteable categories are ever stored or returned.
|
||||
export async function getMyNotificationPreferences(): Promise<{ data: PrefMap } | { error: string }> {
|
||||
const supabase = await createClient()
|
||||
const auth = await requireMember(supabase)
|
||||
if (!auth.ok) return { error: auth.error }
|
||||
const { member } = auth
|
||||
|
||||
const { data } = await createAdminClient()
|
||||
.from('notification_preferences')
|
||||
.select('category, enabled')
|
||||
.eq('space_id', member.space_id)
|
||||
.eq('member_id', member.id)
|
||||
|
||||
const prefs: PrefMap = {}
|
||||
for (const c of MUTEABLE_CATEGORIES) prefs[c] = true
|
||||
for (const row of data ?? []) {
|
||||
const cat = row.category as NotificationCategory
|
||||
if ((MUTEABLE_CATEGORIES as readonly NotificationCategory[]).includes(cat)) {
|
||||
prefs[cat] = row.enabled as boolean
|
||||
}
|
||||
}
|
||||
return { data: prefs }
|
||||
}
|
||||
|
||||
// Set one muteable category on/off for the caller. Billing is never settable
|
||||
// (the Zod enum excludes it). Upserts the caller's own row through the service
|
||||
// client; the (space_id, member_id, category) PK makes a re-toggle idempotent.
|
||||
export async function setMyNotificationPreference(input: {
|
||||
category: string
|
||||
enabled: boolean
|
||||
}): Promise<{ ok: true } | { error: string }> {
|
||||
const supabase = await createClient()
|
||||
const auth = await requireMember(supabase)
|
||||
if (!auth.ok) return { error: auth.error }
|
||||
const { member } = auth
|
||||
|
||||
const parsed = notificationPreferenceSchema.safeParse(input)
|
||||
if (!parsed.success) return { error: 'Invalid notification preference' }
|
||||
|
||||
const { error } = await createAdminClient()
|
||||
.from('notification_preferences')
|
||||
.upsert(
|
||||
{
|
||||
space_id: member.space_id,
|
||||
member_id: member.id,
|
||||
category: parsed.data.category,
|
||||
enabled: parsed.data.enabled,
|
||||
},
|
||||
{ onConflict: 'space_id,member_id,category' },
|
||||
)
|
||||
if (error) return { error: 'Could not save preference' }
|
||||
|
||||
revalidatePath('/me')
|
||||
return { ok: true }
|
||||
}
|
||||
|
||||
+13
-8
@@ -220,20 +220,25 @@ export async function getMyBilling() {
|
||||
if (!auth.ok) return { error: auth.error }
|
||||
const { member } = auth
|
||||
|
||||
const { data } = await createAdminClient()
|
||||
const admin = createAdminClient()
|
||||
// Whether the space has Stripe dues set up at all, so the /me UI can hide the
|
||||
// "Pay dues" (Stripe Checkout) button when there is no Stripe to check out to.
|
||||
const cfg = await getStripeConfig(admin, member.space_id)
|
||||
const configured = isStripeConfigured(cfg ?? {})
|
||||
|
||||
const { data } = await admin
|
||||
.from('member_billing')
|
||||
.select('subscription_status, current_period_end, stripe_customer_id')
|
||||
.eq('space_id', member.space_id)
|
||||
.eq('member_id', member.id)
|
||||
.maybeSingle()
|
||||
return {
|
||||
data: data
|
||||
? {
|
||||
status: (data.subscription_status as string | null) ?? null,
|
||||
currentPeriodEnd: (data.current_period_end as string | null) ?? null,
|
||||
hasCustomer: !!data.stripe_customer_id,
|
||||
}
|
||||
: null,
|
||||
data: {
|
||||
status: (data?.subscription_status as string | null) ?? null,
|
||||
currentPeriodEnd: (data?.current_period_end as string | null) ?? null,
|
||||
hasCustomer: !!data?.stripe_customer_id,
|
||||
configured,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user