1 Commits
Author SHA1 Message Date
Corey Blais 55353e4d46 Add flock exports, sharing invitations, and improved flock switching
Deploy / deploy-prod (push) Skipped
Deploy / deploy-dev (push) Successful in 3m53s
2026-10-08 11:19:50 -04:00
28 changed files with 1671 additions and 295 deletions

No files matched your search

+3 -10
View File
@@ -3,14 +3,13 @@ name: Deploy
on:
push:
branches:
- main
- dev
- develop
workflow_dispatch:
jobs:
deploy-dev:
if: ${{ github.event_name == 'push' && (github.ref_name == 'dev' || github.ref_name == 'develop') }}
if: ${{ github.event_name == 'push' }}
runs-on: ubuntu-latest
container:
volumes:
@@ -114,7 +113,7 @@ jobs:
"$DISCORD_WEBHOOK_URL" || echo "Discord notification failed."
deploy-prod:
if: ${{ github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && github.ref_name == 'main') }}
if: ${{ github.event_name == 'workflow_dispatch' }}
runs-on: ubuntu-latest
container:
volumes:
@@ -154,13 +153,7 @@ jobs:
run: |
set -e
cd /docker/FlockPal
docker compose -f docker-compose.prod.yml up -d --build --wait --wait-timeout 180
- name: Verify production API readiness
run: |
set -e
cd /docker/FlockPal
docker compose -f docker-compose.prod.yml exec -T backend node dist/healthcheck.js api-ready
docker compose -f docker-compose.prod.yml up -d --build
- name: Notify Discord
if: always()
-17
View File
@@ -47,23 +47,6 @@ The default `docker-compose.yml` is development-only. It mounts source files, in
## Operations
### Health checks
Monitor these production checks:
- Frontend: `GET https://your-host/healthz`
- Verifies Nginx is serving the frontend container.
- Backend liveness: `GET https://your-host/api/health/live`
- Verifies the API process is running.
- Backend readiness: `GET https://your-host/api/health/ready`
- Verifies the API can reach Postgres and Redis. Returns `503` if either dependency is unavailable.
- Backend metrics: `GET https://your-host/api/metrics`
- Admin-authenticated process, request, and queue metrics.
- Postgres and Redis:
- Use the Docker health checks in `docker-compose.prod.yml`.
- Worker:
- Use the Docker health check in `docker-compose.prod.yml`; it validates worker dependencies. The worker does not expose HTTP.
### Backups
Create a compressed Postgres backup from the Docker Compose Postgres service:
+270 -38
View File
@@ -1,3 +1,6 @@
import { canUpdateWorkspaceSettings, subscriptionAllowsWrite } from './workspaceAccess.js';
import { buildWorkspaceInviteEmail } from './emails/workspaceInviteEmail.js';
import { exportFlock } from './repositories/flockExportRepository.js';
import { unassignedBirdMatchSchema, claimBirdSchema } from './birdMembershipSchemas.js';
import { hasUnassignedBird, removeBirdFromFlock, claimUnassignedBird } from './repositories/birdMembershipRepository.js';
import { behaviorTypeSchema, behaviorOccurrenceSchema, behaviorRangeSchema } from './behaviorSchemas.js';
@@ -55,7 +58,6 @@ import nodemailer from 'nodemailer';
import Stripe from 'stripe';
import { z } from 'zod';
import { db } from './db/client.js';
import { ensureSchema } from './db/schema.js';
import { adoptionReportQueueEvents, enqueueAdoptionReportJob } from './queues/adoptionReportQueue.js';
import { enqueueBirdMilestoneReminderJob, getBirdMilestoneReminderQueueCounts } from './queues/birdMilestoneReminderQueue.js';
@@ -121,6 +123,19 @@ import {
listAuditLogEntries,
listFlockNotes,
} from './repositories/auditRepository.js';
import {
deleteDailyEducation,
deleteEducationQuestion,
createEducationQuestion,
getDailyEducationForDate,
getEducationOptOut,
listDailyEducationForAdmin,
listDailyEducationQuestions,
listEducationQuestionsForAdmin,
updateEducationOptOut,
updateEducationQuestion,
upsertDailyEducation,
} from './repositories/educationRepository.js';
import {
buildBirdPhotoObjectKey,
getImageExtensionFromContentType,
@@ -160,6 +175,8 @@ import type {
AuditLogEntryRow,
BillingInterval,
BillingPlan,
DailyEducationRow,
EducationQuestionRow,
BirdGender,
BirdMilestoneReminderCandidateRow,
BirdRow,
@@ -357,6 +374,27 @@ const integrationTokenCreateSchema = z.object({
expiresInDays: z.coerce.number().int().min(1).max(3650).optional(),
});
const educationQuestionSchema = z
.object({
prompt: z.string().trim().min(1).max(500),
options: z.array(z.string().trim().min(1).max(240)).min(2).max(4),
correctAnswerIndex: z.coerce.number().int().min(0).max(3),
explanation: z.string().trim().max(800).optional().or(z.literal('')),
})
.refine((value) => value.correctAnswerIndex < value.options.length, {
message: 'Correct answer must match one of the quiz options.',
path: ['correctAnswerIndex'],
});
const dailyEducationSchema = z.object({
publishDate: dateStringSchema,
fact: z.string().trim().min(1).max(2000),
});
const educationPreferenceSchema = z.object({
educationOptOut: z.boolean(),
});
const emptyToNull = (value?: string) => {
const trimmed = value?.trim() ?? '';
return trimmed ? trimmed : null;
@@ -551,6 +589,25 @@ const normalizeWorkspaceMember = (row: WorkspaceMemberRow) => ({
createdAt: row.created_at,
});
const normalizeEducationQuestion = (row: EducationQuestionRow) => ({
id: row.id,
prompt: row.prompt,
options: row.options,
correctAnswerIndex: Number(row.correct_answer_index),
explanation: row.explanation ?? null,
createdAt: row.created_at,
updatedAt: row.updated_at,
});
const normalizeDailyEducation = (row: DailyEducationRow, questions: EducationQuestionRow[] = []) => ({
id: row.id,
publishDate: row.publish_date,
fact: row.fact,
quizQuestions: questions.map(normalizeEducationQuestion),
createdAt: row.created_at,
updatedAt: row.updated_at,
});
const signBirdPhotoAccessToken = (row: BirdRow) => {
if (!row.photo_object_key) {
return '';
@@ -986,14 +1043,6 @@ const normalizeWorkspaceMembershipList = async (userId: string) =>
const isAdminUser = (user: UserRow) => adminEmails.has(normalizeEmail(user.email));
const subscriptionAllowsWrite = (workspace: WorkspaceRow) => {
if (workspace.workspace_type === 'rescue') {
return workspace.rescue_verification_status === 'approved';
}
return workspace.subscription_status === 'active' || workspace.subscription_status === 'trialing';
};
const mapStripeSubscriptionStatus = (status: Stripe.Subscription.Status): SubscriptionStatus => {
if (status === 'active' || status === 'trialing' || status === 'past_due' || status === 'canceled' || status === 'unpaid') {
return status;
@@ -2214,33 +2263,10 @@ const writeBirdTimelineEvent = async ({
}
};
const isBillingOnlyWorkspaceUpdate = (
workspace: WorkspaceRow,
payload: z.infer<typeof workspaceSchema>,
) => workspace.workspace_type === 'standard' && payload.workspaceType === 'standard' && payload.name === workspace.name;
app.get('/api/health', (_req: Request, res: Response) => {
res.json({ ok: true });
});
app.get('/api/health/live', (_req: Request, res: Response) => {
res.json({ ok: true, status: 'live' });
});
app.get('/api/health/ready', async (_req: Request, res: Response) => {
try {
await Promise.all([
db.query('SELECT 1'),
getBirdMilestoneReminderQueueCounts(),
getMedicationReminderQueueCounts(),
]);
res.json({ ok: true, status: 'ready' });
} catch (error) {
console.error('Readiness check failed', error);
res.status(503).json({ ok: false, status: 'not_ready' });
}
});
app.get('/api/metrics', requireAuth, requireAdmin, async (_req: Request, res: Response, next: NextFunction) => {
const memoryUsage = process.memoryUsage();
const averageDurationMs = requestMetrics.totalRequests > 0 ? requestMetrics.totalDurationMs / requestMetrics.totalRequests : 0;
@@ -2686,6 +2712,149 @@ app.get('/api/admin/rescue-workspaces', requireAuth, requireSessionAuth, require
}
});
app.get('/api/admin/daily-education', requireAuth, requireSessionAuth, requireAdmin, async (_req: Request, res: Response, next: NextFunction) => {
try {
const education = await listDailyEducationForAdmin();
res.json({ education: education.map((entry) => normalizeDailyEducation(entry)) });
} catch (error) {
next(error);
}
});
app.get('/api/admin/education-questions', requireAuth, requireSessionAuth, requireAdmin, async (_req: Request, res: Response, next: NextFunction) => {
try {
const questions = await listEducationQuestionsForAdmin();
res.json({ questions: questions.map(normalizeEducationQuestion) });
} catch (error) {
next(error);
}
});
app.put('/api/admin/daily-education', requireAuth, requireSessionAuth, requireAdmin, async (req: Request, res: Response, next: NextFunction) => {
const parsed = dailyEducationSchema.safeParse(req.body);
if (!parsed.success) {
res.status(400).json({ error: 'Invalid daily education payload', details: parsed.error.flatten() });
return;
}
try {
const education = await upsertDailyEducation({
publishDate: parsed.data.publishDate,
fact: parsed.data.fact,
createdByUserId: req.auth!.user.id,
});
res.json({ education: normalizeDailyEducation(education) });
} catch (error) {
next(error);
}
});
app.post('/api/admin/education-questions', requireAuth, requireSessionAuth, requireAdmin, async (req: Request, res: Response, next: NextFunction) => {
const parsed = educationQuestionSchema.safeParse(req.body);
if (!parsed.success) {
res.status(400).json({ error: 'Invalid education question payload', details: parsed.error.flatten() });
return;
}
try {
const question = await createEducationQuestion({
question: { ...parsed.data, explanation: emptyToNull(parsed.data.explanation) },
createdByUserId: req.auth!.user.id,
});
res.status(201).json({ question: normalizeEducationQuestion(question) });
} catch (error) {
next(error);
}
});
app.put('/api/admin/education-questions/:questionId', requireAuth, requireSessionAuth, requireAdmin, async (req: Request, res: Response, next: NextFunction) => {
const parsed = educationQuestionSchema.safeParse(req.body);
if (!parsed.success) {
res.status(400).json({ error: 'Invalid education question payload', details: parsed.error.flatten() });
return;
}
try {
const question = await updateEducationQuestion(req.params.questionId, {
...parsed.data,
explanation: emptyToNull(parsed.data.explanation),
});
if (!question) {
res.status(404).json({ error: 'Education question not found.' });
return;
}
res.json({ question: normalizeEducationQuestion(question) });
} catch (error) {
next(error);
}
});
app.delete('/api/admin/education-questions/:questionId', requireAuth, requireSessionAuth, requireAdmin, async (req: Request, res: Response, next: NextFunction) => {
try {
const deleted = await deleteEducationQuestion(req.params.questionId);
if (!deleted) {
res.status(404).json({ error: 'Education question not found.' });
return;
}
res.status(204).send();
} catch (error) {
next(error);
}
});
app.delete('/api/admin/daily-education/:educationId', requireAuth, requireSessionAuth, requireAdmin, async (req: Request, res: Response, next: NextFunction) => {
try {
const deleted = await deleteDailyEducation(req.params.educationId);
if (!deleted) {
res.status(404).json({ error: 'Daily education item not found.' });
return;
}
res.status(204).send();
} catch (error) {
next(error);
}
});
app.get('/api/education/today', requireAuth, requireSessionAuth, async (req: Request, res: Response, next: NextFunction) => {
try {
const educationOptOut = await getEducationOptOut(req.auth!.user.id);
const education = educationOptOut ? null : await getDailyEducationForDate();
const questions = education ? await listDailyEducationQuestions(education.publish_date) : [];
res.json({
educationOptOut,
education: education ? normalizeDailyEducation(education, questions) : null,
});
} catch (error) {
next(error);
}
});
app.patch('/api/education/preferences', requireAuth, requireSessionAuth, async (req: Request, res: Response, next: NextFunction) => {
const parsed = educationPreferenceSchema.safeParse(req.body);
if (!parsed.success) {
res.status(400).json({ error: 'Invalid education preference payload', details: parsed.error.flatten() });
return;
}
try {
const educationOptOut = await updateEducationOptOut(req.auth!.user.id, parsed.data.educationOptOut);
res.json({ educationOptOut });
} catch (error) {
next(error);
}
});
app.patch('/api/admin/rescue-workspaces/:workspaceId', requireAuth, requireAdmin, requireWriteAccess, async (req: Request, res: Response, next: NextFunction) => {
const parsed = z.object({ rescueVerificationStatus: rescueVerificationStatusSchema }).safeParse(req.body);
@@ -2964,6 +3133,40 @@ app.post('/api/workspaces', requireAuth, requireSessionAuth, async (req: Request
}
});
app.get('/api/workspace/export', requireAuth, requireSessionAuth, async (req: Request, res: Response, next: NextFunction) => {
try {
const parsed = z.object({ birdId: z.string().uuid().optional() }).safeParse(req.query);
if (!parsed.success) {
res.status(400).json({ error: 'Invalid bird selection.' });
return;
}
const { birdId } = parsed.data;
const data = await exportFlock(req.auth!.workspace.id, birdId);
if (birdId && data.birds.length === 0) {
res.status(404).json({ error: 'Bird not found in this flock.' });
return;
}
for (const bird of data.birds) {
if (bird.photo_object_key) {
const config = getS3ImageStorageConfig();
if (!config) throw new Error('Image storage is not configured. Unable to export flock photos.');
const response = await fetch(getSignedS3ObjectUrl({ config, objectKey: bird.photo_object_key, expiresInSeconds: 300 }), {
signal: AbortSignal.timeout(30_000),
});
if (!response.ok) throw new Error('Unable to export a flock photo. Please try again.');
const contentType = bird.photo_content_type || response.headers.get('content-type') || 'application/octet-stream';
bird.photo_data_url = `data:${contentType};base64,${Buffer.from(await response.arrayBuffer()).toString('base64')}`;
}
delete bird.photo_object_key;
}
res.setHeader('Cache-Control', 'no-store');
res.attachment(`flockpal-${birdId ? `bird-${birdId}` : `flock-${req.auth!.workspace.id}`}-${new Date().toISOString().slice(0, 10)}.json`);
res.json(data);
} catch (error) {
next(error);
}
});
app.get('/api/workspace', requireAuth, async (req: Request, res: Response) => {
res.json({ workspace: normalizeWorkspace(req.auth!.workspace) });
});
@@ -2981,10 +3184,7 @@ app.put('/api/workspace', requireAuth, requireSessionAuth, requireWorkspaceRole(
const billingPlan = resolveBillingPlan(parsed.data.workspaceType, parsed.data.billingPlan ?? currentWorkspace.billing_plan);
const billingInterval = parsed.data.workspaceType === 'rescue' ? 'monthly' : (parsed.data.billingInterval ?? currentWorkspace.billing_interval);
const isConvertingToRescue = currentWorkspace.workspace_type !== 'rescue' && parsed.data.workspaceType === 'rescue';
const canUpdateWorkspace =
isAdminUser(req.auth!.user) ||
subscriptionAllowsWrite(currentWorkspace) ||
isBillingOnlyWorkspaceUpdate(currentWorkspace, parsed.data);
const canUpdateWorkspace = canUpdateWorkspaceSettings(currentWorkspace, parsed.data, isAdminUser(req.auth!.user));
if (!canUpdateWorkspace) {
res.status(402).json({
@@ -3130,6 +3330,37 @@ app.get('/api/workspace/members', requireAuth, async (req: Request, res: Respons
}
});
const sendWorkspaceInvitation = async (auth: AuthContext, member: WorkspaceMemberRow) => {
if (!mailTransport) return { sent: false, message: 'Access is saved, but email delivery is not configured. Share the sign-in instructions directly.' };
try {
const result = await mailTransport.sendMail({
from: smtpFromName ? `"${smtpFromName}" <${smtpFromEmail}>` : smtpFromEmail,
to: member.invite_email,
...await buildWorkspaceInviteEmail({
name: member.name, email: member.invite_email, inviterName: auth.user.name,
flockName: auth.workspace.name, role: member.role, frontendUrl: frontendBaseUrl,
}),
});
if (!result.accepted?.length) throw new Error('Invitation email was not accepted.');
return { sent: true, message: 'Invitation email sent. Access is ready when they sign in with the invited email address.' };
} catch {
return { sent: false, message: 'Access is saved, but the invitation email could not be sent. Use Resend invitation to try again.' };
}
};
app.post('/api/workspace/members/:memberId/invitation', requireAuth, requireSessionAuth, requireWriteAccess, requireWorkspaceRole(['owner', 'assistant']), async (req: Request, res: Response, next: NextFunction) => {
try {
const member = (await listWorkspaceMembers(req.auth!.workspace.id)).find((entry) => entry.id === req.params.memberId);
if (!member) {
res.status(404).json({ error: 'Flock member not found.' });
return;
}
const invitation = await sendWorkspaceInvitation(req.auth!, member);
await writeAuditLog(req.auth!, 'workspace_member.invitation_resent', 'workspace_member', member.id, member.name, { sent: invitation.sent });
res.json({ invitation });
} catch (error) { next(error); }
});
app.post('/api/workspace/members', requireAuth, requireWriteAccess, requireWorkspaceRole(['owner', 'assistant']), async (req: Request, res: Response, next: NextFunction) => {
const parsed = workspaceMemberSchema.safeParse(req.body);
@@ -3153,7 +3384,8 @@ app.post('/api/workspace/members', requireAuth, requireWriteAccess, requireWorks
inviteEmail: member!.invite_email,
role: member!.role,
});
res.status(201).json({ member: normalizeWorkspaceMember(member!) });
const invitation = await sendWorkspaceInvitation(req.auth!, member!);
res.status(201).json({ member: normalizeWorkspaceMember(member!), invitation });
} catch (error) {
next(error);
}
@@ -3963,7 +4195,7 @@ app.put('/api/birds/:birdId', requireAuth, requireWriteAccess, requireWorkspaceR
}
});
app.delete('/api/birds/:birdId', requireAuth, requireWriteAccess, requireWorkspaceRole(['owner', 'assistant', 'caregiver']), async (req: Request, res: Response, next: NextFunction) => {
app.delete('/api/birds/:birdId', requireAuth, requireWriteAccess, requireWorkspaceRole(['owner', 'assistant']), async (req: Request, res: Response, next: NextFunction) => {
try {
const bird = await getBirdById(req.params.birdId, req.auth!.workspace.id);
+34
View File
@@ -30,6 +30,9 @@ export const ensureSchema = async (database: DatabaseClient = db) => {
ALTER TABLE workspaces
DROP CONSTRAINT IF EXISTS workspaces_id_check;
ALTER TABLE users
ADD COLUMN IF NOT EXISTS education_opt_out BOOLEAN NOT NULL DEFAULT FALSE;
ALTER TABLE workspaces
ADD COLUMN IF NOT EXISTS billing_email VARCHAR(255),
ADD COLUMN IF NOT EXISTS billing_plan VARCHAR(32) NOT NULL DEFAULT 'household_basic',
@@ -139,6 +142,37 @@ export const ensureSchema = async (database: DatabaseClient = db) => {
CREATE INDEX IF NOT EXISTS idx_auth_sessions_created_user
ON auth_sessions (created_at DESC, user_id);
CREATE TABLE IF NOT EXISTS daily_education (
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
publish_date DATE NOT NULL UNIQUE,
fact TEXT NOT NULL,
quiz_questions JSONB NOT NULL DEFAULT '[]'::jsonb,
created_by_user_id UUID REFERENCES users(id) ON DELETE SET NULL,
created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
updated_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
);
ALTER TABLE daily_education
ALTER COLUMN quiz_questions SET DEFAULT '[]'::jsonb;
CREATE INDEX IF NOT EXISTS idx_daily_education_publish_date
ON daily_education (publish_date DESC);
CREATE TABLE IF NOT EXISTS education_question_bank (
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
prompt VARCHAR(500) NOT NULL,
options JSONB NOT NULL,
correct_answer_index INTEGER NOT NULL,
explanation VARCHAR(800),
created_by_user_id UUID REFERENCES users(id) ON DELETE SET NULL,
created_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
updated_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP,
CHECK (correct_answer_index >= 0 AND correct_answer_index <= 3)
);
CREATE INDEX IF NOT EXISTS idx_education_question_bank_created
ON education_question_bank (created_at DESC);
CREATE TABLE IF NOT EXISTS integration_tokens (
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
user_id UUID NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+17
View File
@@ -115,3 +115,20 @@ test('Swagger UI, initialization, assets and specification are served locally wi
assert.equal(redirect.status, 301);
assert.equal(redirect.headers.get('location'), '/api/docs/');
});
test('bird removal is restricted to owners and assistants in the API and its documentation', () => {
const route = ast.statements.find((statement) =>
ts.isExpressionStatement(statement) && ts.isCallExpression(statement.expression) &&
statement.expression.expression.getText(ast) === 'app.delete' &&
statement.expression.arguments[0]?.getText(ast) === "'/api/birds/:birdId'"
);
assert.ok(route && ts.isExpressionStatement(route) && ts.isCallExpression(route.expression));
const guard = route.expression.arguments.find((arg) =>
ts.isCallExpression(arg) && arg.expression.getText(ast) === 'requireWorkspaceRole'
);
assert.ok(guard && ts.isCallExpression(guard));
assert.equal(guard.arguments[0].getText(ast), "['owner', 'assistant']");
const description = customerOpenApi.paths['/birds/{birdId}']!.delete!.description!;
assert.match(description, /Allowed roles: owner, assistant\./);
assert.doesNotMatch(description, /caregiver/);
});
+2 -2
View File
@@ -63,7 +63,7 @@ const one = (name: string, model: z.ZodTypeAny) => z.object({ [name]: model });
const many = (name: string, model: z.ZodTypeAny) => one(name, z.array(model));
endpoint({ method: 'get', path: '/workspace', summary: 'Get the token’s workspace', tag: 'Workspace', response: one('workspace', models.workspaceResponse) });
endpoint({ method: 'get', path: '/workspace/members', summary: 'List workspace members', tag: 'Workspace', response: many('members', models.memberResponse) });
endpoint({ method: 'post', path: '/workspace/members', summary: 'Add or update a workspace member', tag: 'Workspace', body: registry.register('MemberInput', workspaceMemberSchema), response: one('member', models.memberResponse), roles: ['owner', 'assistant'] });
endpoint({ method: 'post', path: '/workspace/members', summary: 'Add or update a workspace member', tag: 'Workspace', body: registry.register('MemberInput', workspaceMemberSchema), response: z.object({ member: models.memberResponse, invitation: z.object({ sent: z.boolean(), message: z.string() }) }), roles: ['owner', 'assistant'], description: 'Saves access and attempts to send a branded invitation email. Check invitation.sent for email submission status; access remains saved if email delivery fails.' });
endpoint({ method: 'put', path: '/workspace/members/{memberId}', summary: 'Change a member’s role', tag: 'Workspace', body: z.object({ role: workspaceRoleSchema }), response: one('member', models.memberResponse), roles: ['owner', 'assistant'], errors: [404], description: 'Only the billing owner can promote collaborators to owner. Additional protections apply to changing your own or the billing owner’s membership.' });
endpoint({ method: 'delete', path: '/workspace/members/{memberId}', summary: 'Remove a workspace member', tag: 'Workspace', roles: ['owner', 'assistant'], errors: [404], description: 'Protected memberships cannot be removed.' });
endpoint({ method: 'get', path: '/notes', summary: 'List flock notes', tag: 'Notes', response: many('notes', models.noteResponse) });
@@ -77,7 +77,7 @@ const birdInput = registry.register('BirdInput', birdSchema);
const birdDescription = 'motivators and demotivators each allow up to three non-empty lines. hatchDay takes precedence over the legacy dateOfBirth field. photoDataUrl accepts an image data URL or HTTP(S) URL; returned photo links may expire.';
endpoint({ method: 'post', path: '/birds', summary: 'Create a bird', tag: 'Birds', body: birdInput, response: one('bird', models.birdResponse), errors: [409], description: birdDescription, example: { name: 'Yoda', species: 'African grey' } });
endpoint({ method: 'put', path: '/birds/{birdId}', summary: 'Update a bird', tag: 'Birds', body: birdInput, response: one('bird', models.birdResponse), errors: [404, 409], description: `Submit the full editable profile: omitted optional fields may be cleared or reset. ${birdDescription}` });
endpoint({ method: 'delete', path: '/birds/{birdId}', summary: 'Remove a bird from its flock', tag: 'Birds', errors: [404, 409], description: 'Unassigns the bird without deleting its profile, photo, or care history. Bird-specific notes follow the bird; flock-wide notes and workspace audit logs stay in the old flock. Public sharing is disabled and pending transfers are revoked. An exact band ID match can later bring the bird and its history into a flock.' });
endpoint({ method: 'delete', path: '/birds/{birdId}', summary: 'Remove a bird from its flock', roles: ['owner', 'assistant'], tag: 'Birds', errors: [404, 409], description: 'Unassigns the bird without deleting its profile, photo, or care history. Bird-specific notes follow the bird; flock-wide notes and workspace audit logs stay in the old flock. Public sharing is disabled and pending transfers are revoked. An exact band ID match can later bring the bird and its history into a flock.' });
endpoint({ method: 'get', path: '/birds/{birdId}/timeline', summary: 'List bird timeline events', tag: 'Birds', response: many('events', models.timelineResponse), errors: [404] });
for (const resource of [
{ path: 'weights', single: 'weight', plural: 'weights', id: 'weightId', tag: 'Weights', input: weightSchema, model: models.weightResponse },
+1
View File
@@ -26,3 +26,4 @@ export const loadWeightReminderPortrait = async (bird: Pick<WeightReminder, 'bir
}
return thumbnail(await readFile(asset('yoda-default.png')));
};
@@ -0,0 +1,29 @@
import assert from 'node:assert/strict';
import test from 'node:test';
import { buildWorkspaceInviteEmail } from './workspaceInviteEmail.js';
const input = { name: '<Pat>', email: 'pat@example.test', inviterName: 'Alex & Sam', flockName: '<Rescue>', role: 'caregiver' as const, frontendUrl: 'https://flockpal.test/' };
test('invitation uses branded layout, escaped copy, and email-specific sign-in instructions', async () => {
const mail = await buildWorkspaceInviteEmail(input);
assert.match(String(mail.html), /&lt;Pat&gt;/);
assert.match(String(mail.html), /Alex &amp; Sam/);
assert.match(String(mail.html), /&lt;Rescue&gt;/);
assert.match(String(mail.html), /cid:flockpal-logo/);
assert.equal(mail.attachments?.length, 1);
assert.match(mail.text, /Sign in to FlockPal using pat@example.test/);
assert.match(mail.text, /cannot remove birds/);
assert.match(mail.text, /flock switcher/);
assert.match(String(mail.html), /href="https:\/\/flockpal.test\/"/);
});
test('invitation describes each assigned role and prevents multiline subjects', async () => {
for (const role of ['viewer', 'caregiver', 'assistant', 'owner'] as const) {
const mail = await buildWorkspaceInviteEmail({ ...input, role, flockName: 'Rescue\r\nFlock' });
assert.doesNotMatch(mail.subject, /[\r\n]/);
assert.ok(mail.text.includes(role.charAt(0).toUpperCase() + role.slice(1)));
if (role === 'viewer') assert.match(mail.text, /cannot edit records/);
if (role === 'assistant') assert.match(mail.text, /remove and transfer birds/);
if (role === 'owner') assert.match(mail.text, /does not change the billing owner/);
}
});
@@ -0,0 +1,26 @@
import { buildEmailLayout, escapeHtml } from './emailLayout.js';
import type { WorkspaceRole } from '../types.js';
const permissions: Record<WorkspaceRole, string> = {
viewer: 'You can view all birds and care histories, and export flock data. You cannot edit records.',
caregiver: 'You can view and export flock data, add and edit birds, log daily care, and delete supported care records. You cannot remove birds or manage sharing, billing, or transfers.',
assistant: 'You can manage birds and care records, remove and transfer birds, manage collaborators, flock settings and billing, and view the audit log.',
owner: 'You have full flock control, including bird removal, transfers, sharing, billing management, memorializing birds, and deleting an empty flock. This does not change the billing owner.',
};
export const buildWorkspaceInviteEmail = async ({ name, email, inviterName, flockName, role, frontendUrl }: {
name: string; email: string; inviterName: string; flockName: string; role: WorkspaceRole; frontendUrl: string;
}) => {
const roleLabel = role.charAt(0).toUpperCase() + role.slice(1);
const instructions = `Sign in to FlockPal using ${email}. If you do not have an account, use that email to get started. After signing in, choose ${flockName} in the flock switcher in the navigation or Settings → Flock profile. If you are already signed in and the flock is missing, sign out and sign back in.`;
return {
subject: `You’re invited to ${flockName.replace(/[\r\n]+/g, ' ')} on FlockPal`,
text: `Hi ${name},\n\n${inviterName} has invited you to ${flockName} as a ${roleLabel}.\n\n${permissions[role]}\n\n${instructions}\n\nOpen FlockPal: ${frontendUrl}\n\nIf you were not expecting this invitation, you can ignore this email.`,
...await buildEmailLayout({
eyebrow: 'Shared flock invitation', headline: `You’re invited to ${flockName}`,
contentHtml: `<p>Hi ${escapeHtml(name)},</p><p>${escapeHtml(inviterName)} has invited you to <strong>${escapeHtml(flockName)}</strong> as a <strong>${roleLabel}</strong>.</p><p>${escapeHtml(permissions[role])}</p><p>${escapeHtml(instructions)}</p>`,
action: { url: frontendUrl, label: 'Open FlockPal' },
footer: 'If you were not expecting this invitation, you can ignore this email.',
}),
};
};
-54
View File
@@ -1,54 +0,0 @@
import { db } from './db/client.js';
import { closeBirdMilestoneReminderQueue, getBirdMilestoneReminderQueueCounts } from './queues/birdMilestoneReminderQueue.js';
const timeoutMs = Number(process.env.HEALTHCHECK_TIMEOUT_MS ?? 5_000);
const withTimeout = async <T>(operation: Promise<T>, label: string): Promise<T> => {
let timeout: NodeJS.Timeout | undefined;
try {
return await Promise.race([
operation,
new Promise<never>((_resolve, reject) => {
timeout = setTimeout(() => reject(new Error(`${label} timed out`)), timeoutMs);
}),
]);
} finally {
if (timeout) {
clearTimeout(timeout);
}
}
};
const checkHttp = async (path: string) => {
const port = process.env.PORT ?? '5000';
const response = await withTimeout(fetch(`http://127.0.0.1:${port}${path}`), path);
if (!response.ok) {
throw new Error(`${path} returned ${response.status}`);
}
};
const checkWorkerDependencies = async () => {
await withTimeout(db.query('SELECT 1'), 'postgres');
await withTimeout(getBirdMilestoneReminderQueueCounts(), 'redis');
};
const mode = process.argv[2] ?? 'api-ready';
try {
if (mode === 'api-live') {
await checkHttp('/api/health/live');
} else if (mode === 'api-ready') {
await checkHttp('/api/health/ready');
} else if (mode === 'worker') {
await checkWorkerDependencies();
} else {
throw new Error(`Unknown healthcheck mode: ${mode}`);
}
} catch (error) {
console.error(error instanceof Error ? error.message : error);
process.exitCode = 1;
} finally {
await Promise.allSettled([closeBirdMilestoneReminderQueue(), db.close()]);
}
@@ -6,9 +6,7 @@ import {
createBird,
createPendingBirdTransfer,
getBirdById,
getOpenBirdTransferCode,
listWeightsForBird,
markBirdTransferCodeCompleted,
transferBirdToWorkspace,
} from './birdRepository.js';
import { mockDb } from '../test/mockDb.js';
@@ -255,25 +253,3 @@ test('completePendingBirdTransfersForOwner moves pending birds and marks complet
null,
]);
});
test('getOpenBirdTransferCode only returns unconsumed codes', async () => {
const { calls } = mockDb({ rowCount: 0, rows: [] });
const transferCode = await getOpenBirdTransferCode('ADOPT-123');
assert.equal(transferCode, null);
assert.deepEqual(calls[0].params, ['ADOPT-123']);
assert.match(calls[0].text, /bird_transfer_codes\.completed_at IS NULL/);
assert.match(calls[0].text, /bird_transfer_codes\.revoked_at IS NULL/);
assert.match(calls[0].text, /birds\.workspace_id = bird_transfer_codes\.source_workspace_id/);
});
test('markBirdTransferCodeCompleted consumes a code for the receiving workspace', async () => {
const { calls } = mockDb({ rowCount: 1, rows: [] });
await markBirdTransferCodeCompleted('code-1', 22);
assert.deepEqual(calls[0].params, ['code-1', 22]);
assert.match(calls[0].text, /SET completed_at = CURRENT_TIMESTAMP/);
assert.match(calls[0].text, /completed_workspace_id = \$2/);
});
@@ -0,0 +1,153 @@
import { db } from '../db/client.js';
import type { DailyEducationQuestion, DailyEducationRow, EducationQuestionRow } from '../types.js';
export const getEducationOptOut = async (userId: string) => {
const result = await db.query<{ education_opt_out: boolean }>(
`SELECT education_opt_out
FROM users
WHERE id = $1`,
[userId],
);
return result.rows[0]?.education_opt_out ?? false;
};
export const updateEducationOptOut = async (userId: string, educationOptOut: boolean) => {
const result = await db.query<{ education_opt_out: boolean }>(
`UPDATE users
SET education_opt_out = $2
WHERE id = $1
RETURNING education_opt_out`,
[userId, educationOptOut],
);
return result.rows[0]?.education_opt_out ?? educationOptOut;
};
export const getDailyEducationForDate = async (publishDate?: string) => {
const result = publishDate
? await db.query<DailyEducationRow>(
`SELECT id, publish_date::text, fact, quiz_questions, created_by_user_id, created_at, updated_at
FROM daily_education
WHERE publish_date = $1`,
[publishDate],
)
: await db.query<DailyEducationRow>(
`SELECT id, publish_date::text, fact, quiz_questions, created_by_user_id, created_at, updated_at
FROM daily_education
WHERE publish_date = CURRENT_DATE`,
);
return result.rows[0] ?? null;
};
export const listDailyEducationForAdmin = async () => {
const result = await db.query<DailyEducationRow>(
`SELECT id, publish_date::text, fact, quiz_questions, created_by_user_id, created_at, updated_at
FROM daily_education
ORDER BY publish_date DESC
LIMIT 120`,
);
return result.rows;
};
export const upsertDailyEducation = async ({
publishDate,
fact,
createdByUserId,
}: {
publishDate: string;
fact: string;
createdByUserId: string;
}) => {
const result = await db.query<DailyEducationRow>(
`INSERT INTO daily_education (publish_date, fact, created_by_user_id)
VALUES ($1, $2, $3)
ON CONFLICT (publish_date) DO UPDATE
SET fact = EXCLUDED.fact,
updated_at = CURRENT_TIMESTAMP
RETURNING id, publish_date::text, fact, quiz_questions, created_by_user_id, created_at, updated_at`,
[publishDate, fact, createdByUserId],
);
return result.rows[0];
};
export const listEducationQuestionsForAdmin = async () => {
const result = await db.query<EducationQuestionRow>(
`SELECT id, prompt, options, correct_answer_index, explanation, created_by_user_id, created_at, updated_at
FROM education_question_bank
ORDER BY updated_at DESC, created_at DESC
LIMIT 400`,
);
return result.rows;
};
export const listDailyEducationQuestions = async (seedDate?: string) => {
const result = await db.query<EducationQuestionRow>(
`SELECT id, prompt, options, correct_answer_index, explanation, created_by_user_id, created_at, updated_at
FROM education_question_bank
ORDER BY md5(COALESCE($1::text, CURRENT_DATE::text) || id::text)
LIMIT 4`,
[seedDate ?? null],
);
return result.rows;
};
export const createEducationQuestion = async ({
question,
createdByUserId,
}: {
question: DailyEducationQuestion;
createdByUserId: string;
}) => {
const result = await db.query<EducationQuestionRow>(
`INSERT INTO education_question_bank (prompt, options, correct_answer_index, explanation, created_by_user_id)
VALUES ($1, $2::jsonb, $3, $4, $5)
RETURNING id, prompt, options, correct_answer_index, explanation, created_by_user_id, created_at, updated_at`,
[question.prompt, JSON.stringify(question.options), question.correctAnswerIndex, question.explanation, createdByUserId],
);
return result.rows[0];
};
export const updateEducationQuestion = async (questionId: string, question: DailyEducationQuestion) => {
const result = await db.query<EducationQuestionRow>(
`UPDATE education_question_bank
SET prompt = $2,
options = $3::jsonb,
correct_answer_index = $4,
explanation = $5,
updated_at = CURRENT_TIMESTAMP
WHERE id = $1
RETURNING id, prompt, options, correct_answer_index, explanation, created_by_user_id, created_at, updated_at`,
[questionId, question.prompt, JSON.stringify(question.options), question.correctAnswerIndex, question.explanation],
);
return result.rows[0] ?? null;
};
export const deleteEducationQuestion = async (questionId: string) => {
const result = await db.query<{ id: string }>(
`DELETE FROM education_question_bank
WHERE id = $1
RETURNING id`,
[questionId],
);
return Boolean(result.rowCount);
};
export const deleteDailyEducation = async (educationId: string) => {
const result = await db.query<{ id: string }>(
`DELETE FROM daily_education
WHERE id = $1
RETURNING id`,
[educationId],
);
return Boolean(result.rowCount);
};
@@ -0,0 +1,31 @@
import assert from 'node:assert/strict';
import test from 'node:test';
import { exportFlock } from './flockExportRepository.js';
import { mockDb } from '../test/mockDb.js';
test('export scopes every history to the selected flock without date or memorial filters', async () => {
const data = { formatVersion: 1, birds: [], workspace: { id: 42, name: 'Flock' } };
const { calls } = mockDb({ rows: [{ data }] });
assert.deepEqual(await exportFlock(42), data);
assert.equal(calls.length, 1);
const { text, params } = calls[0];
assert.deepEqual(params, [42, null]);
assert.match(text, /SELECT \* FROM birds WHERE workspace_id = \$1/);
for (const table of ['weight_records', 'vet_visits', 'medications', 'medication_administrations', 'behavior_occurrences', 'bird_timeline_events']) {
assert.ok(text.includes(`FROM ${table} r JOIN flock_birds b ON b.id = r.bird_id`));
}
assert.match(text, /FROM flock_notes n WHERE n.workspace_id = \$1/);
assert.doesNotMatch(text, /LIMIT|memorialized_at IS NULL|INTERVAL/);
assert.doesNotMatch(text, /auth_sessions|integration_tokens|stripe|magic_link/);
});
test('single member export restricts profiles, notes, and behavior types to the selected bird', async () => {
const birdId = 'd0ab1d12-7859-4a64-a354-dd58bf738b94';
const data = { birds: [{ id: birdId }] };
const { calls } = mockDb({ rows: [{ data }] });
assert.deepEqual(await exportFlock(42, birdId), data);
assert.deepEqual(calls[0].params, [42, birdId]);
assert.ok(calls[0].text.includes('workspace_id = $1 AND ($2::uuid IS NULL OR id = $2)'));
assert.ok(calls[0].text.includes('AND ($2::uuid IS NULL OR n.bird_id IN (SELECT id FROM flock_birds))'));
assert.ok(calls[0].text.includes('WHERE ($2::uuid IS NULL AND (t.is_default OR t.workspace_id = $1)) OR EXISTS'));
});
@@ -0,0 +1,48 @@
import { db } from '../db/client.js';
type ExportBird = Record<string, unknown> & {
photo_object_key?: string | null;
photo_content_type?: string | null;
photo_data_url?: string | null;
};
export type FlockExport = {
formatVersion: number;
exportedAt: string;
workspace: { id: number; name: string };
birds: ExportBird[];
[key: string]: unknown;
};
// A single statement provides a consistent snapshot, including all dates and memorialized birds.
export const exportFlock = async (workspaceId: number, birdId?: string): Promise<FlockExport> => {
const birdTables = {
weights: 'weight_records',
vetVisits: 'vet_visits',
medications: 'medications',
medicationAdministrations: 'medication_administrations',
behaviors: 'behavior_occurrences',
timeline: 'bird_timeline_events',
};
const histories = Object.entries(birdTables).map(([key, table]) =>
`'${key}', (SELECT COALESCE(jsonb_agg(to_jsonb(r) ORDER BY r.id), '[]'::jsonb)
FROM ${table} r JOIN flock_birds b ON b.id = r.bird_id)`
);
const result = await db.query<{ data: FlockExport }>(`
WITH flock_birds AS (SELECT * FROM birds WHERE workspace_id = $1 AND ($2::uuid IS NULL OR id = $2))
SELECT jsonb_build_object(
'formatVersion', 1,
'exportedAt', CURRENT_TIMESTAMP,
'workspace', (SELECT jsonb_build_object('id', id, 'name', name) FROM workspaces WHERE id = $1),
'birds', (SELECT COALESCE(jsonb_agg(to_jsonb(b) ORDER BY b.id), '[]'::jsonb) FROM flock_birds b),
'notes', (SELECT COALESCE(jsonb_agg(to_jsonb(n) ORDER BY n.id), '[]'::jsonb)
FROM flock_notes n WHERE n.workspace_id = $1
AND ($2::uuid IS NULL OR n.bird_id IN (SELECT id FROM flock_birds))),
'behaviorTypes', (SELECT COALESCE(jsonb_agg(to_jsonb(t) - 'workspace_id' ORDER BY t.id), '[]'::jsonb)
FROM behavior_types t WHERE ($2::uuid IS NULL AND (t.is_default OR t.workspace_id = $1)) OR EXISTS (
SELECT 1 FROM behavior_occurrences o JOIN flock_birds b ON b.id = o.bird_id
WHERE o.behavior_type_id = t.id)),
${histories.join(',\n')}
) AS data`, [workspaceId, birdId ?? null]);
return result.rows[0].data;
};
+1
View File
@@ -208,3 +208,4 @@ export const flockNoteSchema = z.object({
birdId: z.string().uuid().optional().nullable().or(z.literal('')),
body: z.string().trim().min(1).max(5000),
});
+30
View File
@@ -0,0 +1,30 @@
import assert from 'node:assert/strict';
import test from 'node:test';
import { canUpdateWorkspaceSettings, subscriptionAllowsWrite } from '../workspaceAccess.js';
import type { WorkspaceRow } from '../types.js';
type Access = Pick<WorkspaceRow, 'name' | 'workspace_type' | 'subscription_status' | 'rescue_verification_status'>;
const household: Access = { name: 'Our flock', workspace_type: 'standard', subscription_status: 'none', rescue_verification_status: 'not_required' };
test('unsubscribed households can request rescue verification, including a new flock name', () => {
for (const subscription_status of ['none', 'past_due', 'canceled', 'unpaid', 'active', 'trialing'] as const) {
assert.equal(canUpdateWorkspaceSettings({ ...household, subscription_status }, { name: 'Our rescue', workspaceType: 'rescue' }, false), true);
}
});
test('conversion does not make unverified rescues writable, even with an active subscription', () => {
for (const rescue_verification_status of ['pending', 'rejected', 'not_required'] as const) {
const rescue: Access = { ...household, workspace_type: 'rescue', subscription_status: 'active', rescue_verification_status };
assert.equal(subscriptionAllowsWrite(rescue), false);
assert.equal(canUpdateWorkspaceSettings(rescue, { name: rescue.name, workspaceType: 'rescue' }, false), false);
}
assert.equal(subscriptionAllowsWrite({ ...household, workspace_type: 'rescue', rescue_verification_status: 'approved' }), true);
});
test('household edits remain subscription gated while billing recovery and admin access still work', () => {
assert.equal(subscriptionAllowsWrite(household), false);
assert.equal(canUpdateWorkspaceSettings(household, { name: 'Renamed', workspaceType: 'standard' }, false), false);
assert.equal(canUpdateWorkspaceSettings(household, { name: household.name, workspaceType: 'standard' }, false), true);
assert.equal(canUpdateWorkspaceSettings(household, { name: 'Renamed', workspaceType: 'standard' }, true), true);
assert.equal(subscriptionAllowsWrite({ ...household, subscription_status: 'active' }), true);
});
+29
View File
@@ -13,9 +13,38 @@ export type UserRow = {
email: string;
password_hash: string | null;
name: string;
education_opt_out?: boolean;
created_at: string;
};
export type DailyEducationQuestion = {
prompt: string;
options: string[];
correctAnswerIndex: number;
explanation: string | null;
};
export type DailyEducationRow = {
id: string;
publish_date: string;
fact: string;
quiz_questions: DailyEducationQuestion[];
created_by_user_id: string | null;
created_at: string;
updated_at: string;
};
export type EducationQuestionRow = {
id: string;
prompt: string;
options: string[];
correct_answer_index: number;
explanation: string | null;
created_by_user_id: string | null;
created_at: string;
updated_at: string;
};
export type WorkspaceRow = {
id: number;
name: string;
+22
View File
@@ -0,0 +1,22 @@
import type { WorkspaceRow, WorkspaceType } from './types.js';
type WorkspaceAccess = Pick<WorkspaceRow, 'name' | 'workspace_type' | 'subscription_status' | 'rescue_verification_status'>;
export const subscriptionAllowsWrite = (workspace: WorkspaceAccess) => {
if (workspace.workspace_type === 'rescue') {
return workspace.rescue_verification_status === 'approved';
}
return workspace.subscription_status === 'active' || workspace.subscription_status === 'trialing';
};
export const canUpdateWorkspaceSettings = (
workspace: WorkspaceAccess,
payload: { name: string; workspaceType: WorkspaceType },
isAdmin: boolean,
) => {
// Requesting rescue verification must not require buying a household subscription.
// The route still validates onboarding and the repository marks the rescue pending.
const requestingRescue = workspace.workspace_type === 'standard' && payload.workspaceType === 'rescue';
const billingOnly = workspace.workspace_type === 'standard' && payload.workspaceType === 'standard' && payload.name === workspace.name;
return isAdmin || subscriptionAllowsWrite(workspace) || requestingRescue || billingOnly;
};
+1 -1
View File
@@ -22,7 +22,7 @@ try {
for (let i = 0; i < 3; i++) {
const workspace = baseId + i, user = randomUUID(), token = randomUUID(), email = `${user}@example.test`;
await db.query(`INSERT INTO workspaces (id, name, workspace_type, rescue_verification_status) VALUES ($1, $2, 'rescue', 'approved')`, [workspace, `Membership test ${i}`]);
await db.query(`INSERT INTO users (id, email, name) VALUES ($1, $2, 'Tester')`, [user, email]);
await db.query(`INSERT INTO users (id, email, name, education_opt_out) VALUES ($1, $2, 'Tester', TRUE)`, [user, email]);
await db.query(`INSERT INTO workspace_members (workspace_id, user_id, invite_email, name, role, accepted_at) VALUES ($1, $2, $3, 'Tester', 'owner', NOW())`, [workspace, user, email]);
await db.query(`INSERT INTO auth_sessions (user_id, active_workspace_id, token_hash, expires_at) VALUES ($1, $2, $3, NOW() + INTERVAL '1 hour')`, [user, workspace, createHash('sha256').update(token).digest('hex')]);
accounts.push({ workspace, user, token });
-18
View File
@@ -98,12 +98,6 @@ services:
condition: service_healthy
redis:
condition: service_healthy
healthcheck:
test: ["CMD", "node", "dist/healthcheck.js", "api-ready"]
interval: 30s
timeout: 10s
retries: 3
start_period: 30s
labels:
- traefik.enable=true
- traefik.docker.network=traefik
@@ -164,12 +158,6 @@ services:
condition: service_healthy
redis:
condition: service_healthy
healthcheck:
test: ["CMD", "node", "dist/healthcheck.js", "worker"]
interval: 30s
timeout: 10s
retries: 3
start_period: 30s
restart: unless-stopped
frontend:
@@ -181,12 +169,6 @@ services:
container_name: flockpal-frontend
depends_on:
- backend
healthcheck:
test: ["CMD-SHELL", "wget -q -O /dev/null http://127.0.0.1/healthz"]
interval: 30s
timeout: 5s
retries: 3
start_period: 10s
labels:
- traefik.enable=true
- traefik.docker.network=traefik
-7
View File
@@ -96,12 +96,6 @@ services:
condition: service_healthy
redis:
condition: service_healthy
healthcheck:
test: ["CMD-SHELL", "node -e \"fetch('http://127.0.0.1:5000/api/health/ready').then(r => { if (!r.ok) process.exit(1) }).catch(() => process.exit(1))\""]
interval: 30s
timeout: 10s
retries: 3
start_period: 30s
ports:
- "5000:5000"
command: >
@@ -110,7 +104,6 @@ services:
volumes:
- ./backend:/app
- /app/node_modules
restart: unless-stopped
worker:
build:
+2 -35
View File
@@ -344,47 +344,14 @@ Validation failures return `400` with this shape:
#### `GET /api/health`
Public readiness-compatible health check. Verifies backend dependencies.
Public health check.
Response `200`:
```json
{
"ok": true,
"service": "flockpal-backend",
"status": "ready",
"checkedAt": "2026-06-06T00:00:00.000Z",
"dependencies": {
"postgres": { "ok": true, "latencyMs": 3 },
"redis": { "ok": true, "latencyMs": 4 }
}
}
{ "ok": true }
```
Response `503` when Postgres or Redis is unavailable.
#### `GET /api/health/live`
Public liveness check. Verifies the backend process is running without checking dependencies.
Response `200`:
```json
{
"ok": true,
"service": "flockpal-backend",
"status": "live",
"uptimeSeconds": 120,
"checkedAt": "2026-06-06T00:00:00.000Z"
}
```
#### `GET /api/health/ready`
Public readiness check. Verifies the backend can reach Postgres and Redis.
Response `200` uses the same shape as `GET /api/health`; response `503` means at least one dependency failed.
### Metrics
#### `GET /api/metrics`
-6
View File
@@ -12,12 +12,6 @@ server {
add_header X-Frame-Options "SAMEORIGIN" always;
add_header Permissions-Policy "camera=(), microphone=(), geolocation=()" always;
location = /healthz {
access_log off;
add_header Content-Type text/plain;
return 200 "ok\n";
}
location / {
try_files $uri $uri/ /index.html;
}
+716 -40
View File
@@ -1,3 +1,4 @@
import { FlockSwitcher } from './FlockSwitcher';
import { combineLocationOwnerMarkers } from './birdTimeline';
import { BehaviorJournal } from './BehaviorJournal';
import { useEffect, useMemo, useState, type CSSProperties, type Dispatch, type SetStateAction } from 'react';
@@ -194,6 +195,23 @@ type AdminRescueWorkspace = {
memberCount: number;
};
type DailyEducationQuestion = {
id: string;
prompt: string;
options: string[];
correctAnswerIndex: number;
explanation: string | null;
};
type DailyEducation = {
id: string;
publishDate: string;
fact: string;
quizQuestions: DailyEducationQuestion[];
createdAt: string;
updatedAt: string;
};
type IntegrationTokenSummary = {
id: string;
userId: string;
@@ -393,6 +411,18 @@ type BillingNotice = {
message: string;
};
type DailyEducationQuestionFormState = {
prompt: string;
options: [string, string, string, string];
correctAnswerIndex: number;
explanation: string;
};
type DailyEducationFormState = {
publishDate: string;
fact: string;
};
type BulkWeightRowState = {
weightGrams: string;
};
@@ -915,6 +945,18 @@ const emptyFlockNoteForm: FlockNoteFormState = {
body: '',
};
const emptyDailyEducationQuestion = (): DailyEducationQuestionFormState => ({
prompt: '',
options: ['', '', '', ''],
correctAnswerIndex: 0,
explanation: '',
});
const emptyDailyEducationForm = (): DailyEducationFormState => ({
publishDate: new Date().toISOString().slice(0, 10),
fact: '',
});
const defaultAuthProviders: AuthProvider[] = [
{ providerKey: 'google', displayName: 'Google', enabled: false },
{ providerKey: 'microsoft', displayName: 'Microsoft', enabled: false },
@@ -1799,6 +1841,20 @@ const formatRescueVerificationStatus = (status: RescueVerificationStatus) => {
return 'Pending verification';
};
const workspaceRoleDescriptions: Record<WorkspaceRole, string> = {
viewer: 'Can view every bird and their care history, and download flock or individual bird exports. Cannot edit birds or care records.',
caregiver: 'Can view and export, add and edit birds, record daily care, and delete supported care records. Cannot remove birds from the flock or manage sharing, billing, or bird transfers.',
assistant: 'Can do everything a Caregiver can, plus remove birds from the flock, manage collaborators, flock settings and billing, transfer birds, and view the audit log. Cannot memorialize birds or delete the flock.',
owner: 'Can do everything an Assistant can, plus memorialize birds, manage memorial reminders, and delete an empty flock. Owner access does not change the billing owner.',
};
const workspaceRoleLabels: Record<WorkspaceRole, string> = {
viewer: 'Viewer — view and export',
caregiver: 'Caregiver — birds and daily care',
assistant: 'Assistant — flock management',
owner: 'Owner — full flock control',
};
const formatWorkspaceRole = (role: WorkspaceRole) => {
if (role === 'owner') {
return 'Owner';
@@ -2143,6 +2199,20 @@ function App() {
const [birdTimelineEventForm, setBirdTimelineEventForm] = useState<BirdTimelineEventFormState>(emptyBirdTimelineEventForm);
const [adminSummary, setAdminSummary] = useState<AdminSummary | null>(null);
const [adminRescueWorkspaces, setAdminRescueWorkspaces] = useState<AdminRescueWorkspace[]>([]);
const [adminDailyEducation, setAdminDailyEducation] = useState<DailyEducation[]>([]);
const [adminEducationQuestions, setAdminEducationQuestions] = useState<DailyEducationQuestion[]>([]);
const [dailyEducationForm, setDailyEducationForm] = useState<DailyEducationFormState>(emptyDailyEducationForm);
const [educationQuestionForm, setEducationQuestionForm] = useState<DailyEducationQuestionFormState>(emptyDailyEducationQuestion);
const [editingEducationQuestionId, setEditingEducationQuestionId] = useState('');
const [savingDailyEducation, setSavingDailyEducation] = useState(false);
const [savingEducationQuestion, setSavingEducationQuestion] = useState(false);
const [deletingDailyEducationId, setDeletingDailyEducationId] = useState('');
const [deletingEducationQuestionId, setDeletingEducationQuestionId] = useState('');
const [todayEducation, setTodayEducation] = useState<DailyEducation | null>(null);
const [educationOptOut, setEducationOptOut] = useState(false);
const [savingEducationPreference, setSavingEducationPreference] = useState(false);
const [educationAnswers, setEducationAnswers] = useState<Record<number, number>>({});
const [dailyEducationOpen, setDailyEducationOpen] = useState(false);
const [birds, setBirds] = useState<Bird[]>([]);
const [memorializedBirds, setMemorializedBirds] = useState<Bird[]>([]);
const [selectedBirdId, setSelectedBirdId] = useState<string>('');
@@ -2172,6 +2242,9 @@ function App() {
const [birdImportPreview, setBirdImportPreview] = useState<BirdImportPreview | null>(null);
const [birdImportFileName, setBirdImportFileName] = useState('');
const [exportBirdId, setExportBirdId] = useState('');
const [exportingFlock, setExportingFlock] = useState(false);
const [flockExportError, setFlockExportError] = useState('');
const [birdImportNotice, setBirdImportNotice] = useState('');
const [importingBirds, setImportingBirds] = useState(false);
const [memorializeBirdForm, setMemorializeBirdForm] = useState<MemorializeBirdFormState>(emptyMemorializeBirdForm);
@@ -2183,6 +2256,8 @@ function App() {
const [savingWorkspace, setSavingWorkspace] = useState(false);
const [cancelingRescueRequest, setCancelingRescueRequest] = useState(false);
const [billingRedirecting, setBillingRedirecting] = useState(false);
const [invitationNotice, setInvitationNotice] = useState<{ sent: boolean; message: string } | null>(null);
const [resendingInvitationId, setResendingInvitationId] = useState<string | null>(null);
const [savingWorkspaceMember, setSavingWorkspaceMember] = useState(false);
const [creatingWorkspace, setCreatingWorkspace] = useState(false);
const [deletingWorkspace, setDeletingWorkspace] = useState(false);
@@ -2781,6 +2856,15 @@ function App() {
setAuditLogEntries([]);
setAdminSummary(null);
setAdminRescueWorkspaces([]);
setAdminDailyEducation([]);
setAdminEducationQuestions([]);
setDailyEducationForm(emptyDailyEducationForm());
setEducationQuestionForm(emptyDailyEducationQuestion());
setEditingEducationQuestionId('');
setTodayEducation(null);
setEducationOptOut(false);
setEducationAnswers({});
setDailyEducationOpen(false);
setBirds([]);
setMemorializedBirds([]);
setWeights([]);
@@ -3080,20 +3164,27 @@ function App() {
const loadAdminDashboard = async () => {
try {
const [summaryResponse, rescuesResponse] = await Promise.all([
const [summaryResponse, rescuesResponse, educationResponse, educationQuestionsResponse] = await Promise.all([
apiFetch('/admin/summary', authToken),
apiFetch('/admin/rescue-workspaces', authToken),
apiFetch('/admin/daily-education', authToken),
apiFetch('/admin/education-questions', authToken),
]);
if (!summaryResponse.ok || !rescuesResponse.ok) {
if (!summaryResponse.ok || !rescuesResponse.ok || !educationResponse.ok || !educationQuestionsResponse.ok) {
throw new Error('Unable to load admin dashboard.');
}
const summaryData = (await readJsonSafely<{ summary?: AdminSummary }>(summaryResponse)) ?? {};
const rescuesData = (await readJsonSafely<{ rescueWorkspaces?: AdminRescueWorkspace[] }>(rescuesResponse)) ?? {};
const educationData = (await readJsonSafely<{ education?: DailyEducation[] }>(educationResponse)) ?? {};
const educationQuestionsData =
(await readJsonSafely<{ questions?: DailyEducationQuestion[] }>(educationQuestionsResponse)) ?? {};
setAdminSummary(summaryData.summary ?? null);
setAdminRescueWorkspaces(rescuesData.rescueWorkspaces ?? []);
setAdminDailyEducation(educationData.education ?? []);
setAdminEducationQuestions(educationQuestionsData.questions ?? []);
} catch (adminError) {
setError(adminError instanceof Error ? adminError.message : 'Unable to load admin dashboard.');
}
@@ -3102,6 +3193,34 @@ function App() {
void loadAdminDashboard();
}, [activePage, authSession?.isAdmin, authToken]);
useEffect(() => {
if (!authToken || !authSession) {
return;
}
const loadTodayEducation = async () => {
try {
const response = await apiFetch('/education/today', authToken);
if (!response.ok) {
throw new Error(await readErrorMessage(response, 'Unable to load daily education.'));
}
const data =
(await readJsonSafely<{ education?: DailyEducation | null; educationOptOut?: boolean }>(response)) ?? {};
setEducationOptOut(Boolean(data.educationOptOut));
setTodayEducation(data.education ?? null);
setEducationAnswers({});
setDailyEducationOpen(false);
} catch (educationError) {
setError(educationError instanceof Error ? educationError.message : 'Unable to load daily education.');
}
};
void loadTodayEducation();
}, [authSession, authToken]);
useEffect(() => {
if (!selectedBird?.id) {
setWeights([]);
@@ -3389,7 +3508,7 @@ function App() {
};
const handleWorkspaceSwitch = async (workspaceId: number, nextActivePage: AppPage = 'overview') => {
if (!authToken || workspaceId === workspace?.id) {
if (!authToken || switchingWorkspaceId !== null || workspaceId === workspace?.id) {
return;
}
@@ -3622,6 +3741,221 @@ function App() {
}
};
const loadDailyEducationIntoForm = (education: DailyEducation) => {
setDailyEducationForm({
publishDate: education.publishDate,
fact: education.fact,
});
};
const loadEducationQuestionIntoForm = (question: DailyEducationQuestion) => {
setEditingEducationQuestionId(question.id);
setEducationQuestionForm({
prompt: question.prompt,
options: [
question.options[0] ?? '',
question.options[1] ?? '',
question.options[2] ?? '',
question.options[3] ?? '',
],
correctAnswerIndex: question.correctAnswerIndex,
explanation: question.explanation ?? '',
});
};
const resetEducationQuestionForm = () => {
setEditingEducationQuestionId('');
setEducationQuestionForm(emptyDailyEducationQuestion());
};
const handleDailyEducationSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
event.preventDefault();
if (!authToken) {
return;
}
setError('');
setSavingDailyEducation(true);
try {
const response = await apiFetch('/admin/daily-education', authToken, {
method: 'PUT',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({
publishDate: dailyEducationForm.publishDate,
fact: dailyEducationForm.fact.trim(),
}),
});
if (!response.ok) {
throw new Error(await readErrorMessage(response, 'Unable to save daily education.'));
}
const data = (await readJsonSafely<{ education?: DailyEducation }>(response)) ?? {};
if (!data.education) {
throw new Error('Unable to save daily education.');
}
setAdminDailyEducation((current) =>
[data.education!, ...current.filter((education) => education.id !== data.education!.id && education.publishDate !== data.education!.publishDate)]
.sort((left, right) => right.publishDate.localeCompare(left.publishDate)),
);
if (data.education.publishDate === new Date().toISOString().slice(0, 10) && !educationOptOut) {
const todayResponse = await apiFetch('/education/today', authToken);
const todayData = todayResponse.ok
? await readJsonSafely<{ education?: DailyEducation | null }>(todayResponse)
: null;
setTodayEducation(todayData?.education ?? null);
setEducationAnswers({});
}
setDailyEducationForm(emptyDailyEducationForm());
} catch (educationError) {
setError(educationError instanceof Error ? educationError.message : 'Unable to save daily education.');
} finally {
setSavingDailyEducation(false);
}
};
const handleEducationQuestionSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
event.preventDefault();
if (!authToken) {
return;
}
setError('');
setSavingEducationQuestion(true);
try {
const response = await apiFetch(
editingEducationQuestionId ? `/admin/education-questions/${editingEducationQuestionId}` : '/admin/education-questions',
authToken,
{
method: editingEducationQuestionId ? 'PUT' : 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({
prompt: educationQuestionForm.prompt.trim(),
options: educationQuestionForm.options.map((option) => option.trim()),
correctAnswerIndex: educationQuestionForm.correctAnswerIndex,
explanation: educationQuestionForm.explanation.trim(),
}),
},
);
if (!response.ok) {
throw new Error(await readErrorMessage(response, 'Unable to save education question.'));
}
const data = (await readJsonSafely<{ question?: DailyEducationQuestion }>(response)) ?? {};
if (!data.question) {
throw new Error('Unable to save education question.');
}
setAdminEducationQuestions((current) => [
data.question!,
...current.filter((question) => question.id !== data.question!.id),
]);
resetEducationQuestionForm();
} catch (educationError) {
setError(educationError instanceof Error ? educationError.message : 'Unable to save education question.');
} finally {
setSavingEducationQuestion(false);
}
};
const handleDeleteEducationQuestion = async (questionId: string) => {
if (!authToken) {
return;
}
setError('');
setDeletingEducationQuestionId(questionId);
try {
const response = await apiFetch(`/admin/education-questions/${questionId}`, authToken, { method: 'DELETE' });
if (!response.ok) {
throw new Error(await readErrorMessage(response, 'Unable to delete education question.'));
}
setAdminEducationQuestions((current) => current.filter((question) => question.id !== questionId));
if (editingEducationQuestionId === questionId) {
resetEducationQuestionForm();
}
} catch (educationError) {
setError(educationError instanceof Error ? educationError.message : 'Unable to delete education question.');
} finally {
setDeletingEducationQuestionId('');
}
};
const handleDeleteDailyEducation = async (educationId: string) => {
if (!authToken) {
return;
}
setError('');
setDeletingDailyEducationId(educationId);
try {
const response = await apiFetch(`/admin/daily-education/${educationId}`, authToken, { method: 'DELETE' });
if (!response.ok) {
throw new Error(await readErrorMessage(response, 'Unable to delete daily education.'));
}
setAdminDailyEducation((current) => current.filter((education) => education.id !== educationId));
if (todayEducation?.id === educationId) {
setTodayEducation(null);
}
} catch (educationError) {
setError(educationError instanceof Error ? educationError.message : 'Unable to delete daily education.');
} finally {
setDeletingDailyEducationId('');
}
};
const handleEducationPreferenceChange = async (nextEducationOptOut: boolean) => {
if (!authToken) {
return;
}
setError('');
setSavingEducationPreference(true);
try {
const response = await apiFetch('/education/preferences', authToken, {
method: 'PATCH',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ educationOptOut: nextEducationOptOut }),
});
if (!response.ok) {
throw new Error(await readErrorMessage(response, 'Unable to save education preference.'));
}
setEducationOptOut(nextEducationOptOut);
if (nextEducationOptOut) {
setTodayEducation(null);
setDailyEducationOpen(false);
} else {
const todayResponse = await apiFetch('/education/today', authToken);
const data = todayResponse.ok
? await readJsonSafely<{ education?: DailyEducation | null }>(todayResponse)
: null;
setTodayEducation(data?.education ?? null);
}
setEducationAnswers({});
} catch (educationError) {
setError(educationError instanceof Error ? educationError.message : 'Unable to save education preference.');
} finally {
setSavingEducationPreference(false);
}
};
const handleCreateWorkspace = async (event: React.FormEvent<HTMLFormElement>) => {
event.preventDefault();
@@ -3841,6 +4175,34 @@ function App() {
}
};
useEffect(() => {
setExportBirdId('');
setFlockExportError('');
setInvitationNotice(null);
}, [workspace?.id]);
const handleFlockExport = async () => {
if (exportingFlock) return;
setExportingFlock(true);
setFlockExportError('');
try {
const response = await apiFetch(`/workspace/export${exportBirdId ? `?birdId=${encodeURIComponent(exportBirdId)}` : ''}`, authToken);
if (!response.ok) throw new Error(await readErrorMessage(response, 'Unable to export flock data.'));
const url = URL.createObjectURL(await response.blob());
const link = document.createElement('a');
link.href = url;
link.download = `flockpal-${exportBirdId ? `bird-${exportBirdId}` : `flock-${workspace?.id ?? 'export'}`}-${new Date().toISOString().slice(0, 10)}.json`;
document.body.appendChild(link);
link.click();
link.remove();
window.setTimeout(() => URL.revokeObjectURL(url), 60_000);
} catch (exportError) {
setFlockExportError(exportError instanceof Error ? exportError.message : 'Unable to export flock data.');
} finally {
setExportingFlock(false);
}
};
const handleBirdImportSubmit = async () => {
if (!birdImportPreview || birdImportPreview.errors.length || importingBirds) {
return;
@@ -4594,7 +4956,7 @@ function App() {
};
const handleRemoveBird = async () => {
if (!selectedBird || deletingBird) {
if (!selectedBird || deletingBird || !['owner', 'assistant'].includes(activeMembership?.role ?? '')) {
return;
}
@@ -5506,6 +5868,7 @@ function App() {
const handleWorkspaceMemberSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
event.preventDefault();
setError('');
setInvitationNotice(null);
setSavingWorkspaceMember(true);
try {
@@ -5519,7 +5882,7 @@ function App() {
throw new Error(await readErrorMessage(response, 'Unable to add rescue team member.'));
}
const data = (await readJsonSafely<{ member?: WorkspaceMember }>(response)) ?? {};
const data = (await readJsonSafely<{ member?: WorkspaceMember; invitation?: { sent: boolean; message: string } }>(response)) ?? {};
if (!data.member) {
throw new Error('Unable to add rescue team member.');
@@ -5540,6 +5903,7 @@ function App() {
return current.map((member) => (member.id === nextMember.id ? nextMember : member));
});
setWorkspaceMemberForm(emptyWorkspaceMemberForm);
setInvitationNotice(data.invitation ?? null);
} catch (memberError) {
setError(memberError instanceof Error ? memberError.message : 'Unable to add rescue team member.');
} finally {
@@ -5547,6 +5911,21 @@ function App() {
}
};
const handleResendInvitation = async (memberId: string) => {
setResendingInvitationId(memberId);
setInvitationNotice(null);
try {
const response = await apiFetch(`/workspace/members/${memberId}/invitation`, authToken, { method: 'POST' });
if (!response.ok) throw new Error(await readErrorMessage(response, 'Unable to resend invitation.'));
const data = await response.json() as { invitation: { sent: boolean; message: string } };
setInvitationNotice(data.invitation);
} catch (error) {
setInvitationNotice({ sent: false, message: error instanceof Error ? error.message : 'Unable to resend invitation.' });
} finally {
setResendingInvitationId(null);
}
};
const handleUpdateWorkspaceMemberRole = async (memberId: string, role: WorkspaceRole) => {
setError('');
setUpdatingWorkspaceMemberId(memberId);
@@ -5947,6 +6326,15 @@ function App() {
<img className="side-nav-logo" src={flockPalLandingArt} alt="FlockPal" />
</div>
<aside className="side-nav panel">
{showWorkspaceSwitcher ? (
<FlockSwitcher
entries={authSession.workspaces}
currentId={workspace?.id}
switching={switchingWorkspaceId !== null}
disabled={switchingWorkspaceId !== null || savingWorkspace || deletingWorkspace}
onSwitch={(id) => { void handleWorkspaceSwitch(id); }}
/>
) : null}
<div className="page-tabs" role="tablist" aria-label="Main navigation">
<button data-tab="overview" className={`page-tab ${activePage === 'overview' ? 'active' : ''}`} onClick={() => setActivePage('overview')} type="button">
Overview
@@ -5964,26 +6352,6 @@ function App() {
) : null}
</div>
{showWorkspaceSwitcher ? (
<section className="workspace-switcher">
<div className="workspace-switcher-list">
{authSession.workspaces.map((entry) => (
<button
key={`${entry.workspace.id}-${entry.membership.id}`}
className={`workspace-switcher-item ${entry.workspace.id === workspace?.id ? 'active' : ''}`}
onClick={() => handleWorkspaceSwitch(entry.workspace.id)}
type="button"
disabled={switchingWorkspaceId === entry.workspace.id}
>
<span>{entry.workspace.name}</span>
<small>
{formatBillingPlanName(entry.workspace.billingPlan)} • {formatWorkspaceRole(entry.membership.role)}
</small>
</button>
))}
</div>
</section>
) : null}
<button className="secondary-button" onClick={handleLogout} type="button">
Log out
</button>
@@ -6185,6 +6553,74 @@ function App() {
</div>
</section>
{todayEducation ? (
<article className={dailyEducationOpen ? 'panel daily-education-panel open' : 'panel daily-education-panel condensed'}>
<div className="panel-header">
<div>
<p className="eyebrow">Fid fact of the day</p>
<h2>{dailyEducationOpen ? formatDate(todayEducation.publishDate) : 'Daily learning'}</h2>
</div>
<button className="secondary-button" onClick={() => setDailyEducationOpen((current) => !current)} type="button">
{dailyEducationOpen ? 'Close' : 'Open'}
</button>
</div>
{dailyEducationOpen ? (
<>
<p className="daily-fact">{todayEducation.fact}</p>
<section className="daily-quiz" aria-label="Daily education quiz">
{todayEducation.quizQuestions.map((question, questionIndex) => {
const selectedAnswer = educationAnswers[questionIndex];
const hasAnswer = selectedAnswer !== undefined;
return (
<fieldset key={`${todayEducation.id}-${question.id}`} className="quiz-question">
<legend>{question.prompt}</legend>
<div className="quiz-options">
{question.options.map((option, optionIndex) => (
<label
key={`${question.id}-${optionIndex}`}
className={
hasAnswer && optionIndex === question.correctAnswerIndex
? 'quiz-option correct'
: hasAnswer && optionIndex === selectedAnswer
? 'quiz-option incorrect'
: 'quiz-option'
}
>
<input
type="radio"
name={`daily-question-${question.id}`}
checked={selectedAnswer === optionIndex}
onChange={() =>
setEducationAnswers((current) => ({
...current,
[questionIndex]: optionIndex,
}))
}
/>
<span>{option}</span>
</label>
))}
</div>
{hasAnswer ? (
<p className={selectedAnswer === question.correctAnswerIndex ? 'quiz-feedback correct' : 'quiz-feedback'}>
{selectedAnswer === question.correctAnswerIndex ? 'Correct.' : 'Correct answer shown.'}{' '}
{question.explanation}
</p>
) : null}
</fieldset>
);
})}
</section>
</>
) : (
<p className="muted daily-education-teaser">
Open today&apos;s fact and {todayEducation.quizQuestions.length || 'the'} quiz questions.
</p>
)}
</article>
) : null}
<section className="forms-grid">
<article className="panel form-panel pulse-panel">
<div className="panel-header">
@@ -6341,6 +6777,168 @@ function App() {
)}
</div>
</article>
<article className="panel admin-education-panel">
<div className="panel-header">
<div>
<p className="eyebrow">Education</p>
<h2>Fid facts</h2>
</div>
<button className="secondary-button" onClick={() => setDailyEducationForm(emptyDailyEducationForm())} type="button">
New date
</button>
</div>
<form className="form-panel" onSubmit={handleDailyEducationSubmit}>
<div className="education-admin-basics">
<label>
Publish date
<input
type="date"
value={dailyEducationForm.publishDate}
onChange={(event) => setDailyEducationForm({ ...dailyEducationForm, publishDate: event.target.value })}
required
/>
</label>
<label>
Fid fact
<textarea
value={dailyEducationForm.fact}
onChange={(event) => setDailyEducationForm({ ...dailyEducationForm, fact: event.target.value })}
rows={3}
required
/>
</label>
</div>
<button className="primary-button" type="submit" disabled={savingDailyEducation}>
{savingDailyEducation ? 'Saving...' : 'Save fact'}
</button>
</form>
<div className="recent-list education-admin-list">
{adminDailyEducation.length ? (
adminDailyEducation.map((education) => (
<article key={education.id} className="vet-visit-card">
<strong>{formatDate(education.publishDate)}</strong>
<span>{education.fact}</span>
<div className="button-row">
<button className="secondary-button" type="button" onClick={() => loadDailyEducationIntoForm(education)}>
Edit
</button>
<button
className="secondary-button"
type="button"
onClick={() => handleDeleteDailyEducation(education.id)}
disabled={deletingDailyEducationId === education.id}
>
{deletingDailyEducationId === education.id ? 'Deleting...' : 'Delete'}
</button>
</div>
</article>
))
) : (
<article className="vet-visit-card empty-card">
<strong>No scheduled facts yet</strong>
<small>Add a dated Fid fact for the overview page.</small>
</article>
)}
</div>
</article>
<article className="panel admin-education-panel">
<div className="panel-header">
<div>
<p className="eyebrow">Education</p>
<h2>Quiz question bank</h2>
</div>
<button className="secondary-button" onClick={resetEducationQuestionForm} type="button">
New question
</button>
</div>
<p className="muted">Each day the quiz uses a stable random selection of four saved questions.</p>
<form className="form-panel" onSubmit={handleEducationQuestionSubmit}>
<fieldset className="settings-nested-card quiz-editor-question">
<legend>{editingEducationQuestionId ? 'Edit question' : 'Add question'}</legend>
<label>
Prompt
<input
value={educationQuestionForm.prompt}
onChange={(event) => setEducationQuestionForm({ ...educationQuestionForm, prompt: event.target.value })}
required
/>
</label>
<div className="quiz-editor-options">
{educationQuestionForm.options.map((option, optionIndex) => (
<label key={`bank-option-${optionIndex}`}>
Option {optionIndex + 1}
<input
value={option}
onChange={(event) => {
const options = [...educationQuestionForm.options] as DailyEducationQuestionFormState['options'];
options[optionIndex] = event.target.value;
setEducationQuestionForm({ ...educationQuestionForm, options });
}}
required
/>
</label>
))}
</div>
<label>
Correct option
<select
value={educationQuestionForm.correctAnswerIndex}
onChange={(event) =>
setEducationQuestionForm({ ...educationQuestionForm, correctAnswerIndex: Number(event.target.value) })
}
>
{educationQuestionForm.options.map((_, optionIndex) => (
<option key={`bank-correct-${optionIndex}`} value={optionIndex}>
Option {optionIndex + 1}
</option>
))}
</select>
</label>
<label>
Explanation
<textarea
value={educationQuestionForm.explanation}
onChange={(event) => setEducationQuestionForm({ ...educationQuestionForm, explanation: event.target.value })}
rows={2}
/>
</label>
</fieldset>
<button className="primary-button" type="submit" disabled={savingEducationQuestion}>
{savingEducationQuestion ? 'Saving...' : editingEducationQuestionId ? 'Save question changes' : 'Add question'}
</button>
</form>
<div className="recent-list education-admin-list">
{adminEducationQuestions.length ? (
adminEducationQuestions.map((question) => (
<article key={question.id} className="vet-visit-card">
<strong>{question.prompt}</strong>
<span>Answer: {question.options[question.correctAnswerIndex]}</span>
<small>{question.options.length} options</small>
<div className="button-row">
<button className="secondary-button" type="button" onClick={() => loadEducationQuestionIntoForm(question)}>
Edit
</button>
<button
className="secondary-button"
type="button"
onClick={() => handleDeleteEducationQuestion(question.id)}
disabled={deletingEducationQuestionId === question.id}
>
{deletingEducationQuestionId === question.id ? 'Deleting...' : 'Delete'}
</button>
</div>
</article>
))
) : (
<article className="vet-visit-card empty-card">
<strong>No quiz questions yet</strong>
<small>Add at least four questions before the daily quiz can use a full set.</small>
</article>
)}
</div>
</article>
</section>
) : null}
@@ -7015,9 +7613,9 @@ function App() {
</button>
</div>
</form>
<p className="muted">Removing only takes this bird out of your flock. Its profile, photo, notes, and care history are retained and can be brought into a flock later using its exact band ID.</p>
<p className="muted">Only Owners and Assistants can remove birds. Removing only takes this bird out of your flock. Its profile, photo, notes, and care history are retained and can be brought into a flock later using its exact band ID.</p>
<div className="button-row">
<button className="danger-button" onClick={handleRemoveBird} type="button" disabled={deletingBird}>
<button className="danger-button" onClick={handleRemoveBird} type="button" disabled={deletingBird || !['owner', 'assistant'].includes(activeMembership?.role ?? '')}>
{deletingBird ? 'Removing...' : 'Remove from flock'}
</button>
</div>
@@ -8492,6 +9090,27 @@ function App() {
</div>
<div className="settings-column settings-column-right">
<article className="panel form-panel">
<div className="panel-header">
<div>
<p className="eyebrow">Education</p>
<h2>Daily learning</h2>
</div>
</div>
<label className="toggle-card">
<input
type="checkbox"
checked={!educationOptOut}
onChange={(event) => handleEducationPreferenceChange(!event.target.checked)}
disabled={savingEducationPreference}
/>
<span>
<strong>Show daily education</strong>
<small>Display the Fid fact of the day and four-question quiz on Overview.</small>
</span>
</label>
</article>
<article className="panel form-panel settings-card-collaborators">
<div className="panel-header">
<div>
@@ -8512,9 +9131,26 @@ function App() {
{expandedSettingsSection === 'collaborators' ? (
<>
<p className="muted">
Invite other people to help manage this flock. Rescue flocks support teams, and household flocks can also support
co-caregivers without changing who owns the billing.
Give someone access to this flock using their email address. Their role applies to every bird in this flock,
including memorialized birds. Every role can download flock data. Sharing access does not change the billing owner.
</p>
<details className="summary-card">
<summary>Compare shared flock roles</summary>
<div className="recent-list">
{(['viewer', 'caregiver', 'assistant', 'owner'] as const).map((role) => (
<div key={role}>
<strong>{workspaceRoleLabels[role]}</strong>
<p>{workspaceRoleDescriptions[role]}</p>
</div>
))}
</div>
<p className="muted">
Memorialized bird records remain read-only. Editing also depends on the flock’s subscription or rescue verification status.
</p>
</details>
{invitationNotice ? (
<p className={invitationNotice.sent ? 'success-banner' : 'error-banner'} role="status">{invitationNotice.message}</p>
) : null}
<form className="form-panel" onSubmit={handleWorkspaceMemberSubmit}>
<label>
Team member name
@@ -8537,6 +9173,7 @@ function App() {
Role
<select
value={workspaceMemberForm.role}
aria-describedby="invite-role-description"
onChange={(event) =>
setWorkspaceMemberForm({
...workspaceMemberForm,
@@ -8544,14 +9181,17 @@ function App() {
})
}
>
{isBillingOwner ? <option value="owner">Owner</option> : null}
<option value="assistant">Assistant</option>
<option value="caregiver">Caregiver</option>
<option value="viewer">Viewer</option>
{isBillingOwner ? <option value="owner">{workspaceRoleLabels.owner}</option> : null}
<option value="assistant">{workspaceRoleLabels.assistant}</option>
<option value="caregiver">{workspaceRoleLabels.caregiver}</option>
<option value="viewer">{workspaceRoleLabels.viewer}</option>
</select>
</label>
<p id="invite-role-description" className="muted" aria-live="polite">
{workspaceRoleDescriptions[workspaceMemberForm.role]}
</p>
<button className="primary-button" type="submit" disabled={savingWorkspaceMember}>
{savingWorkspaceMember ? 'Adding member...' : 'Add collaborator'}
{savingWorkspaceMember ? 'Sending invitation...' : 'Add collaborator and send invitation'}
</button>
</form>
@@ -8583,6 +9223,7 @@ function App() {
Role
<select
value={member.role}
aria-describedby={`member-role-description-${member.id}`}
onChange={(event) => handleUpdateWorkspaceMemberRole(member.id, event.target.value as WorkspaceRole)}
disabled={
(member.role === 'owner' && !canChangeOwnerRole) ||
@@ -8590,12 +9231,21 @@ function App() {
removingWorkspaceMemberId === member.id
}
>
{member.role === 'owner' || canPromoteToOwner ? <option value="owner">Owner</option> : null}
<option value="assistant">Assistant</option>
<option value="caregiver">Caregiver</option>
<option value="viewer">Viewer</option>
{member.role === 'owner' || canPromoteToOwner ? <option value="owner">{workspaceRoleLabels.owner}</option> : null}
<option value="assistant">{workspaceRoleLabels.assistant}</option>
<option value="caregiver">{workspaceRoleLabels.caregiver}</option>
<option value="viewer">{workspaceRoleLabels.viewer}</option>
</select>
</label>
<p id={`member-role-description-${member.id}`} className="muted" aria-live="polite">
{workspaceRoleDescriptions[member.role]}
</p>
{['owner', 'assistant'].includes(activeMembership?.role ?? '') ? (
<button className="secondary-button" type="button" onClick={() => handleResendInvitation(member.id)}
disabled={resendingInvitationId !== null || removingWorkspaceMemberId === member.id}>
{resendingInvitationId === member.id ? 'Sending...' : 'Resend invitation'}
</button>
) : null}
<button
className="danger-button"
onClick={() => handleRemoveWorkspaceMember(member.id)}
@@ -8735,8 +9385,8 @@ function App() {
<article className="panel form-panel settings-card-bird-import">
<div className="panel-header">
<div>
<p className="eyebrow">Import</p>
<h2>Bulk Import</h2>
<p className="eyebrow">Flock data</p>
<h2>Bulk actions</h2>
</div>
<button
className="secondary-button"
@@ -8751,6 +9401,32 @@ function App() {
</div>
{expandedSettingsSection === 'bird-import' ? (
<>
<h3>Bulk export</h3>
<p className="muted">
Download all information for {workspace?.name ?? 'this flock'}, including active and memorialized bird profiles,
photos, all weights, vet visits, medications and doses, behaviors, timeline history, and flock notes.
Choose a single flock member to export only their profile and records, including their bird-specific notes.
The JSON file preserves your complete records. Export each flock separately if you have multiple flocks.
JSON exports cannot be uploaded through the Excel import below.
</p>
<label>
Export scope
<select value={exportBirdId} onChange={(event) => setExportBirdId(event.target.value)} disabled={exportingFlock}>
<option value="">All flock members</option>
{flockBirds.map((bird) => (
<option key={bird.id} value={bird.id}>
{bird.name}{bird.tagId ? ` — ${bird.tagId}` : ''}{bird.memorializedAt ? ' (In memory)' : ''}
</option>
))}
</select>
</label>
<div className="button-row">
<button className="primary-button" type="button" onClick={handleFlockExport} disabled={exportingFlock}>
{exportingFlock ? 'Exporting...' : exportBirdId ? 'Export selected flock member' : 'Export all flock data'}
</button>
</div>
{flockExportError ? <p className="error-banner" role="alert">{flockExportError}</p> : null}
<h3>Bulk import</h3>
<p className="muted">
Import the first worksheet from an Excel file. Use one row per weight entry and repeat the Bird Name for rows that belong to the
same profile.
+68
View File
@@ -0,0 +1,68 @@
import { useEffect, useRef, useState } from 'react';
type FlockEntry = { workspace: { id: number; name: string }; membership: { role: string } };
const roleName = (role: string) => role.charAt(0).toUpperCase() + role.slice(1);
export function FlockSwitcher({ entries, currentId, switching, disabled, onSwitch }: {
entries: FlockEntry[]; currentId?: number; switching: boolean; disabled: boolean; onSwitch: (id: number) => void;
}) {
const [open, setOpen] = useState(false);
const container = useRef<HTMLElement>(null);
const trigger = useRef<HTMLButtonElement>(null);
const current = entries.find((entry) => entry.workspace.id === currentId);
useEffect(() => { setOpen(false); }, [currentId, disabled]);
useEffect(() => {
if (!open) return;
const closeOutside = (event: PointerEvent) => {
if (!container.current?.contains(event.target as Node)) setOpen(false);
};
document.addEventListener('pointerdown', closeOutside);
return () => document.removeEventListener('pointerdown', closeOutside);
}, [open]);
return (
<section className="workspace-switcher" aria-label="Flock selection" ref={container}
onBlur={(event) => { if (!event.currentTarget.contains(event.relatedTarget)) setOpen(false); }}
onKeyDown={(event) => {
if (event.key === 'Escape' && open) {
event.preventDefault();
setOpen(false);
trigger.current?.focus();
}
}}>
<span className="workspace-switcher-label">Current flock</span>
<button className="flock-switcher-trigger" ref={trigger} type="button" disabled={disabled}
aria-expanded={open} aria-controls="flock-switcher-options" onClick={() => setOpen(!open)}>
<span className="flock-switcher-avatar" aria-hidden="true">{current?.workspace.name.trim().charAt(0).toUpperCase() || 'F'}</span>
<span className="flock-switcher-copy">
<strong>{current?.workspace.name ?? 'Choose a flock'}</strong>
<small>{current ? roleName(current.membership.role) : 'Switch flocks'}</small>
</span>
<svg className={`flock-switcher-chevron ${open ? 'is-open' : ''}`} width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" aria-hidden="true"><path d="m6 9 6 6 6-6" /></svg>
</button>
<span className="flock-switcher-status" role="status">{switching ? 'Switching flocks…' : ''}</span>
{open ? (
<div id="flock-switcher-options" className="flock-switcher-options">
<p className="flock-switcher-heading">Switch flock</p>
{[
{ label: 'My flocks', items: entries.filter((entry) => entry.membership.role === 'owner') },
{ label: 'Shared with me', items: entries.filter((entry) => entry.membership.role !== 'owner') },
].filter((group) => group.items.length).map((group) => (
<div className="flock-switcher-group" key={group.label} role="group" aria-label={group.label}>
<p>{group.label}</p>
{group.items.map((entry) => (
<button className="flock-switcher-option" key={entry.workspace.id} type="button"
aria-current={entry.workspace.id === currentId ? 'true' : undefined}
onClick={() => { setOpen(false); trigger.current?.focus(); onSwitch(entry.workspace.id); }}>
<span className="flock-switcher-copy"><strong>{entry.workspace.name}</strong><small>{roleName(entry.membership.role)}</small></span>
{entry.workspace.id === currentId ? <span className="flock-switcher-check" aria-label="Current flock">✓</span> : null}
</button>
))}
</div>
))}
</div>
) : null}
</section>
);
}
+186 -41
View File
@@ -216,6 +216,7 @@ textarea {
}
.side-rail {
z-index: 30;
position: sticky;
top: 2rem;
display: grid;
@@ -792,6 +793,123 @@ textarea {
align-content: start;
}
.daily-education-panel,
.daily-quiz,
.quiz-options,
.education-question-editor {
display: grid;
gap: 1rem;
}
.daily-education-panel.condensed {
gap: 0.35rem;
padding-block: 1rem;
}
.daily-education-panel.condensed .panel-header {
margin-bottom: 0;
}
.daily-education-teaser {
margin: 0;
}
.daily-fact {
margin: 0;
padding: 1rem;
border-left: 4px solid var(--accent-gold);
border-radius: 0 8px 8px 0;
background: rgba(255, 254, 250, 0.7);
font-size: 1.08rem;
}
.daily-quiz {
grid-template-columns: repeat(auto-fit, minmax(min(290px, 100%), 1fr));
}
.quiz-question,
.quiz-editor-question {
min-width: 0;
margin: 0;
border: 1px solid var(--button-border);
}
.quiz-question {
display: grid;
gap: 0.85rem;
padding: 1rem;
border-radius: 8px;
background: rgba(255, 254, 250, 0.64);
}
.quiz-question legend,
.quiz-editor-question legend {
padding: 0 0.35rem;
font-weight: 700;
}
.quiz-option {
display: grid;
grid-template-columns: auto minmax(0, 1fr);
align-items: start;
gap: 0.65rem;
min-width: 0;
padding: 0.7rem;
border: 1px solid rgba(39, 105, 179, 0.12);
border-radius: 8px;
background: rgba(255, 255, 255, 0.58);
}
.quiz-option.correct {
border-color: rgba(35, 138, 90, 0.42);
background: rgba(223, 247, 229, 0.82);
}
.quiz-option.incorrect {
border-color: rgba(203, 58, 53, 0.36);
background: rgba(255, 236, 232, 0.82);
}
.quiz-option input {
width: auto;
margin: 0.25rem 0 0;
}
.quiz-feedback {
margin: 0;
color: var(--accent-red);
}
.quiz-feedback.correct {
color: var(--accent-green);
}
.admin-education-panel,
.education-admin-basics,
.quiz-editor-question,
.education-admin-list {
display: grid;
gap: 1rem;
}
.education-admin-basics {
grid-template-columns: minmax(180px, 0.35fr) minmax(0, 1fr);
}
.quiz-editor-question {
padding: 1rem;
}
.quiz-editor-options {
display: grid;
grid-template-columns: repeat(2, minmax(0, 1fr));
gap: 0.8rem;
}
.education-admin-list span {
overflow-wrap: anywhere;
}
.button-row {
display: flex;
gap: 0.75rem;
@@ -856,33 +974,77 @@ textarea {
.workspace-switcher {
display: grid;
gap: 0.9rem;
gap: 0.45rem;
min-width: 0;
padding-bottom: 1rem;
border-bottom: 1px solid rgba(39, 105, 179, 0.16);
}
.workspace-switcher-item small {
.workspace-switcher-label {
color: var(--muted);
font-size: 0.78rem;
font-weight: 700;
letter-spacing: 0.06em;
text-transform: uppercase;
}
.workspace-switcher-list {
display: grid;
gap: 0.75rem;
}
.workspace-switcher { position: relative; }
.workspace-switcher-item {
.flock-switcher-trigger {
display: flex;
align-items: center;
gap: 0.7rem;
width: 100%;
min-width: 0;
padding: 0.8rem;
color: var(--ink);
text-align: left;
border: 1px solid rgba(39, 105, 179, 0.12);
border-radius: 18px;
padding: 0.85rem 0.95rem;
background: rgba(255, 255, 255, 0.58);
display: grid;
gap: 0.2rem;
background: rgba(255, 255, 255, 0.65);
border: 1px solid var(--panel-border);
border-radius: 16px;
box-shadow: 0 3px 10px rgba(53, 90, 66, 0.05);
}
.workspace-switcher-item.active {
background: linear-gradient(135deg, rgba(203, 58, 53, 0.16), rgba(39, 105, 179, 0.18));
border-color: rgba(39, 105, 179, 0.24);
.flock-switcher-trigger:hover:not(:disabled) { background: #fffaf0; border-color: var(--accent-green); }
.flock-switcher-trigger:focus-visible, .flock-switcher-option:focus-visible { outline: 2px solid var(--accent-green); outline-offset: 3px; }
.flock-switcher-avatar {
display: grid;
place-items: center;
flex: 0 0 36px;
height: 36px;
border-radius: 11px;
background: #e1eee2;
color: #276b48;
font-weight: 800;
}
.flock-switcher-copy { display: grid; gap: 0.15rem; min-width: 0; flex: 1; }
.flock-switcher-copy strong { font-size: 0.95rem; line-height: 1.35; overflow-wrap: anywhere; }
.flock-switcher-copy small { color: var(--muted); font-size: 0.76rem; font-weight: 400; }
.flock-switcher-chevron { flex-shrink: 0; color: var(--muted); }
.flock-switcher-chevron.is-open { transform: rotate(180deg); }
.flock-switcher-status:empty { display: none; }
.flock-switcher-status { color: var(--muted); font-size: 0.78rem; }
.flock-switcher-options {
position: absolute;
top: calc(100% - 0.5rem);
left: 0;
z-index: 50;
width: max(100%, 280px);
max-width: calc(100vw - 3rem);
max-height: min(420px, 60dvh);
overflow-y: auto;
padding: 0.65rem;
border: 1px solid var(--panel-border);
border-radius: 18px;
background: #fffaf1;
box-shadow: 0 18px 45px rgba(35, 65, 45, 0.2);
}
.flock-switcher-heading { margin: 0; padding: 0.35rem 0.5rem 0.6rem; font-size: 0.9rem; font-weight: 700; }
.flock-switcher-group + .flock-switcher-group { border-top: 1px solid var(--panel-border); margin-top: 0.5rem; padding-top: 0.35rem; }
.flock-switcher-group > p { margin: 0; padding: 0.4rem 0.5rem; color: var(--muted); font-size: 0.72rem; font-weight: 700; letter-spacing: 0.05em; text-transform: uppercase; }
.flock-switcher-option { display: flex; align-items: center; gap: 0.7rem; width: 100%; min-height: 54px; padding: 0.65rem; border: 0; border-radius: 11px; background: transparent; color: var(--ink); text-align: left; }
.flock-switcher-option:hover, .flock-switcher-option[aria-current="true"] { background: #e8f1e7; }
.flock-switcher-check { color: #276b48; font-weight: 800; }
.integration-token-secret {
gap: 0.75rem;
@@ -2505,6 +2667,11 @@ label {
}
@media (max-width: 980px) {
.education-admin-basics,
.quiz-editor-options {
grid-template-columns: 1fr;
}
.app-shell,
.auth-panel,
.hero-card,
@@ -2623,25 +2790,12 @@ label {
.workspace-switcher {
grid-column: 1 / -1;
gap: 0.5rem;
gap: 0.4rem;
padding-bottom: 0.65rem;
}
.workspace-switcher-list {
display: flex;
gap: 0.45rem;
overflow-x: auto;
padding-bottom: 0.1rem;
}
.workspace-switcher-item {
min-width: 160px;
padding: 0.55rem 0.7rem;
border-radius: 14px;
}
.workspace-switcher-item small {
display: none;
}
}
@media (max-width: 720px) {
@@ -2787,17 +2941,7 @@ label {
gap: 0.4rem;
}
.workspace-switcher-list {
margin: 0 -0.2rem;
padding: 0 0.2rem 0.2rem;
}
.workspace-switcher-item {
min-width: min(180px, 78vw);
padding: 0.5rem 0.65rem;
border-radius: 999px;
font-size: 0.86rem;
}
.top-alert-notification {
gap: 0.65rem;
@@ -2922,6 +3066,7 @@ label {
.inline-form,
.settings-nested-grid,
.education-admin-basics,
.quiz-editor-options,
.dose-schedule-row,
.verified-location-search-row,
@@ -27,7 +27,7 @@ try {
const workspace = 100000 + Math.floor(Math.random() * 1000000000);
const user = randomUUID(), bird = randomUUID(), secondBird = randomUUID(), token = randomUUID();
await db.query(`INSERT INTO workspaces (id, name, workspace_type, rescue_verification_status) VALUES ($1, 'Browser test', 'rescue', 'approved')`, [workspace]);
await db.query(`INSERT INTO users (id, email, name) VALUES ($1, $2, 'Browser tester')`, [user, `${user}@example.test`]);
await db.query(`INSERT INTO users (id, email, name, education_opt_out) VALUES ($1, $2, 'Browser tester', TRUE)`, [user, `${user}@example.test`]);
await db.query(`INSERT INTO workspace_members (workspace_id, user_id, invite_email, name, role, accepted_at) VALUES ($1, $2, $3, 'Browser tester', 'owner', NOW())`, [workspace, user, `${user}@example.test`]);
await db.query(`INSERT INTO auth_sessions (user_id, active_workspace_id, token_hash, expires_at) VALUES ($1, $2, $3, NOW() + INTERVAL '1 hour')`, [user, workspace, createHash('sha256').update(token).digest('hex')]);
await db.query(`INSERT INTO birds (id, workspace_id, name, species) VALUES ($1, $2, 'Piper', 'Parrot'), ($3, $2, 'Willow', 'Parrot')`, [bird, workspace, secondBird]);
+1 -1
View File
@@ -28,7 +28,7 @@ try {
for (let i = 0; i < 2; i++) {
const workspace = baseId + i, user = randomUUID(), token = randomUUID(), email = `${user}@example.test`;
await db.query(`INSERT INTO workspaces (id, name, workspace_type, rescue_verification_status) VALUES ($1, $2, 'rescue', 'approved')`, [workspace, `Browser membership ${i}`]);
await db.query(`INSERT INTO users (id, email, name) VALUES ($1, $2, 'Browser tester')`, [user, email]);
await db.query(`INSERT INTO users (id, email, name, education_opt_out) VALUES ($1, $2, 'Browser tester', TRUE)`, [user, email]);
await db.query(`INSERT INTO workspace_members (workspace_id, user_id, invite_email, name, role, accepted_at) VALUES ($1, $2, $3, 'Browser tester', 'owner', NOW())`, [workspace, user, email]);
await db.query(`INSERT INTO auth_sessions (user_id, active_workspace_id, token_hash, expires_at) VALUES ($1, $2, $3, NOW() + INTERVAL '1 hour')`, [user, workspace, createHash('sha256').update(token).digest('hex')]);
accounts.push({ workspace, token });