gitea/omotomo_site
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rest API added

Browse Source
This commit is contained in:
gitea
2026-02-14 15:13:26 +01:00
parent c8ff07b490
commit d99b051a07
30 changed files with 1872 additions and 616 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/Navbar.svelte
+3 -2
View File
@@ -3,6 +3,7 @@
import { push, location } from 'svelte-spa-router';
import { auth } from './stores/auth.js';
import { navContext } from './stores/navContext.js';
import { supabase } from './supabase.js';
import { getProfile } from './api/profile.js';
$: loc = $location || '';
@@ -78,7 +79,7 @@
userMenuOpen = !userMenuOpen;
if (userMenuOpen && $auth.user?.id && !profileLoading) {
profileLoading = true;
getProfile($auth.user.id).then((p) => {
getProfile(supabase, $auth.user.id).then((p) => {
profile = p;
profileLoading = false;
}).catch(() => { profileLoading = false; });
@@ -98,7 +99,7 @@
/** Load profile (including avatar) when user is logged in, so avatar shows after refresh */
$: if (!$auth.loading && $auth.user?.id && !profile && !profileLoading) {
profileLoading = true;
getProfile($auth.user.id)
getProfile(supabase, $auth.user.id)
.then((p) => {
profile = p;
profileLoading = false;
src/lib/Navbar.test.js
+1 -1
View File
@@ -119,7 +119,7 @@ describe('Navbar', () => {
expect(screen.getByRole('menu')).toBeInTheDocument()
expect(screen.getByRole('menuitem', { name: 'Settings' })).toBeInTheDocument()
expect(screen.getByRole('menuitem', { name: 'Logout' })).toBeInTheDocument()
await waitFor(() => expect(getProfile).toHaveBeenCalledWith('u1'))
await waitFor(() => expect(getProfile).toHaveBeenCalledWith(expect.anything(), 'u1'))
})
it('goSettings: Settings link calls push and closes menu', async () => {
src/lib/api/decks-core.js
+517
View File
@@ -0,0 +1,517 @@
export async function fetchMyDecks(client, userId) {
const { data, error } = await client
.from('decks')
.select('id, title, description, config, published, created_at, updated_at, copied_from_deck_id, version, copied_from_version')
.eq('owner_id', userId)
.order('updated_at', { ascending: false });
if (error) throw error;
const decks = data ?? [];
if (decks.length === 0) return [];
const deckIds = decks.map((d) => d.id);
const sourceDeckIds = [...new Set(decks.map((d) => d.copied_from_deck_id).filter(Boolean))];
const ratingDeckIds = [...new Set([...deckIds, ...sourceDeckIds])];
const [questionCounts, ratingsRows, sourceTitlesRows] = await Promise.all([
Promise.all(
decks.map(async (d) => {
const { count, error: e } = await client
.from('questions')
.select('*', { count: 'exact', head: true })
.eq('deck_id', d.id);
if (e) return 0;
return count ?? 0;
})
),
ratingDeckIds.length > 0
? client.from('deck_ratings').select('deck_id, rating').in('deck_id', ratingDeckIds)
: Promise.resolve({ data: [] }),
sourceDeckIds.length > 0
? client.from('decks').select('id, title, version, updated_at').in('id', sourceDeckIds)
: Promise.resolve({ data: [] }),
]);
const ratingByDeck = new Map();
for (const r of ratingsRows.data ?? []) {
if (!ratingByDeck.has(r.deck_id)) ratingByDeck.set(r.deck_id, []);
ratingByDeck.get(r.deck_id).push(r.rating);
}
const getRating = (deckId) => {
const arr = ratingByDeck.get(deckId);
if (!arr?.length) return { average_rating: 0, rating_count: 0 };
const sum = arr.reduce((a, b) => a + b, 0);
return { average_rating: Math.round((sum / arr.length) * 100) / 100, rating_count: arr.length };
};
const sourceById = new Map((sourceTitlesRows.data ?? []).map((d) => [d.id, d]));
return decks.map((d, i) => {
const showRatingDeckId = d.copied_from_deck_id || d.id;
const rating = getRating(showRatingDeckId);
const canRate = !!d.copied_from_deck_id;
const sourceDeck = d.copied_from_deck_id ? sourceById.get(d.copied_from_deck_id) : null;
const source_deck_title = sourceDeck?.title ?? 'Deck';
const source_version = sourceDeck?.version ?? 1;
const my_version = d.copied_from_version ?? 0;
const versionOutdated = source_version > my_version;
const sourceNewerByTime =
sourceDeck?.updated_at &&
d.updated_at &&
new Date(sourceDeck.updated_at).getTime() > new Date(d.updated_at).getTime();
const needs_update =
!!d.copied_from_deck_id && (versionOutdated || sourceNewerByTime);
return {
...d,
question_count: questionCounts[i],
...rating,
can_rate: canRate,
rateable_deck_id: d.copied_from_deck_id || null,
source_deck_title,
source_version,
needs_update,
};
});
}
/**
* @param {string | null | undefined} [userId] - Current user id; when set, each deck gets user_has_this (true if user owns it or already has a copy).
*/
export async function fetchPublishedDecks(client, userId) {
const { data, error } = await client
.from('decks')
.select('id, title, description, config, published, created_at, updated_at, owner_id')
.eq('published', true)
.order('updated_at', { ascending: false });
if (error) throw error;
const decks = data ?? [];
if (decks.length === 0) return [];
const deckIds = decks.map((d) => d.id);
const ownerIds = [...new Set(decks.map((d) => d.owner_id).filter(Boolean))];
const promises = [
Promise.all(
decks.map(async (d) => {
const { count, error: e } = await client
.from('questions')
.select('*', { count: 'exact', head: true })
.eq('deck_id', d.id);
if (e) return 0;
return count ?? 0;
})
),
ownerIds.length > 0
? client.from('profiles').select('id, display_name, email').in('id', ownerIds)
: Promise.resolve({ data: [] }),
client.from('deck_ratings').select('deck_id, rating').in('deck_id', deckIds),
];
if (userId) {
promises.push(
client
.from('decks')
.select('copied_from_deck_id')
.eq('owner_id', userId)
.not('copied_from_deck_id', 'is', null)
);
}
const results = await Promise.all(promises);
const [questionCounts, profilesRows, ratingsRows, myDecksRows] = results;
const myCopiedFromIds = new Set();
if (userId && myDecksRows?.data) {
for (const row of myDecksRows.data) {
if (row.copied_from_deck_id) myCopiedFromIds.add(row.copied_from_deck_id);
}
}
const profilesById = new Map(
(profilesRows.data ?? []).map((p) => [p.id, { display_name: p.display_name, email: p.email }])
);
const ratingByDeck = new Map();
for (const r of ratingsRows.data ?? []) {
if (!ratingByDeck.has(r.deck_id)) ratingByDeck.set(r.deck_id, []);
ratingByDeck.get(r.deck_id).push(r.rating);
}
const getRating = (deckId) => {
const arr = ratingByDeck.get(deckId);
if (!arr?.length) return { average_rating: 0, rating_count: 0 };
const sum = arr.reduce((a, b) => a + b, 0);
return { average_rating: Math.round((sum / arr.length) * 100) / 100, rating_count: arr.length };
};
return decks.map((d, i) => {
const profile = profilesById.get(d.owner_id);
const owner_email = profile?.email ?? profile?.display_name ?? 'User';
const user_has_this =
!!userId && (d.owner_id === userId || myCopiedFromIds.has(d.id));
return {
...d,
question_count: questionCounts[i],
owner_display_name: profile?.display_name ?? 'User',
owner_email,
...getRating(d.id),
user_has_this,
};
});
}
/**
* @param {string} ownerId - Owner of the decks to list.
* @param {string | null | undefined} [viewerId] - Current user id; when set, each deck gets user_has_this (true if viewer owns it or already has a copy).
*/
export async function fetchPublishedDecksByOwner(client, ownerId, viewerId) {
const { data: decks, error } = await client
.from('decks')
.select('id, title, description, config, published, created_at, updated_at, owner_id')
.eq('published', true)
.eq('owner_id', ownerId)
.order('updated_at', { ascending: false });
if (error) throw error;
const deckList = decks ?? [];
if (deckList.length === 0) {
const { data: profile } = await client.from('profiles').select('id, display_name, email').eq('id', ownerId).single();
return {
decks: [],
owner_email: profile?.email ?? profile?.display_name ?? 'User',
owner_display_name: profile?.display_name ?? profile?.email ?? 'User',
};
}
const deckIds = deckList.map((d) => d.id);
const promises = [
Promise.all(
deckList.map(async (d) => {
const { count, error: e } = await client
.from('questions')
.select('*', { count: 'exact', head: true })
.eq('deck_id', d.id);
if (e) return 0;
return count ?? 0;
})
),
client.from('deck_ratings').select('deck_id, rating').in('deck_id', deckIds),
];
if (viewerId && viewerId !== ownerId) {
promises.push(
client
.from('decks')
.select('copied_from_deck_id')
.eq('owner_id', viewerId)
.not('copied_from_deck_id', 'is', null)
);
}
const results = await Promise.all(promises);
const [questionCounts, ratingsRows, myDecksRows] = results;
const myCopiedFromIds = new Set();
if (viewerId && viewerId !== ownerId && myDecksRows?.data) {
for (const row of myDecksRows.data) {
if (row.copied_from_deck_id) myCopiedFromIds.add(row.copied_from_deck_id);
}
}
const ratingByDeck = new Map();
for (const r of ratingsRows.data ?? []) {
if (!ratingByDeck.has(r.deck_id)) ratingByDeck.set(r.deck_id, []);
ratingByDeck.get(r.deck_id).push(r.rating);
}
const getRating = (deckId) => {
const arr = ratingByDeck.get(deckId);
if (!arr?.length) return { average_rating: 0, rating_count: 0 };
const sum = arr.reduce((a, b) => a + b, 0);
return { average_rating: Math.round((sum / arr.length) * 100) / 100, rating_count: arr.length };
};
const { data: profile } = await client.from('profiles').select('id, display_name, email').eq('id', ownerId).single();
const owner_email = profile?.email ?? profile?.display_name ?? 'User';
const owner_display_name = profile?.display_name ?? profile?.email ?? 'User';
const decksWithMeta = deckList.map((d, i) => {
const user_has_this =
!!viewerId &&
(viewerId === ownerId || myCopiedFromIds.has(d.id));
return {
...d,
question_count: questionCounts[i],
owner_email,
owner_display_name,
...getRating(d.id),
user_has_this,
};
});
return { decks: decksWithMeta, owner_email, owner_display_name };
}
export async function fetchDeckWithQuestions(client, deckId) {
const { data: deck, error: deckError } = await client
.from('decks')
.select('*')
.eq('id', deckId)
.single();
if (deckError || !deck) throw deckError || new Error('Deck not found');
const { data: questions, error: qError } = await client
.from('questions')
.select('*')
.eq('deck_id', deckId)
.order('sort_order', { ascending: true });
if (qError) throw qError;
return { ...deck, questions: questions ?? [] };
}
/** Copy a published deck (and its questions) into the current user's account. New deck is unpublished. */
export async function copyDeckToUser(client, deckId, userId) {
const source = await fetchDeckWithQuestions(client, deckId);
if (!source.published) throw new Error('Deck is not available to copy');
const questions = (source.questions ?? []).map((q) => ({
prompt: q.prompt ?? '',
explanation: q.explanation ?? '',
answers: Array.isArray(q.answers) ? q.answers : [],
correct_answer_indices: Array.isArray(q.correct_answer_indices) ? q.correct_answer_indices : [],
}));
return createDeck(client, userId, {
title: source.title,
description: source.description ?? '',
config: source.config ?? {},
questions,
copiedFromDeckId: deckId,
copiedFromVersion: source.version ?? 1,
});
}
export async function createDeck(client, ownerId, { title, description, config, questions, copiedFromDeckId, copiedFromVersion }) {
const row = {
owner_id: ownerId,
title: title.trim(),
description: (description ?? '').trim(),
config: config ?? {},
};
if (copiedFromDeckId != null) row.copied_from_deck_id = copiedFromDeckId;
if (copiedFromVersion != null) row.copied_from_version = copiedFromVersion;
const { data: deck, error: deckError } = await client
.from('decks')
.insert(row)
.select('id')
.single();
if (deckError || !deck) throw deckError || new Error('Failed to create deck');
if (questions && questions.length > 0) {
const rows = questions.map((q, i) => ({
deck_id: deck.id,
sort_order: i,
prompt: (q.prompt ?? '').trim(),
explanation: (q.explanation ?? '').trim() || null,
answers: Array.isArray(q.answers) ? q.answers : [],
correct_answer_indices: Array.isArray(q.correct_answer_indices) ? q.correct_answer_indices : [],
}));
const { error: qError } = await client.from('questions').insert(rows);
if (qError) throw qError;
}
return deck.id;
}
export async function updateDeck(client, deckId, { title, description, config, questions }) {
const { data: current, error: fetchErr } = await client
.from('decks')
.select('version, published')
.eq('id', deckId)
.single();
if (fetchErr) throw fetchErr;
const bumpVersion = current?.published === true;
const nextVersion = bumpVersion ? (current?.version ?? 1) + 1 : (current?.version ?? 1);
const updatePayload = {
title: title.trim(),
description: (description ?? '').trim(),
config: config ?? {},
version: nextVersion,
};
const { error: deckError } = await client
.from('decks')
.update(updatePayload)
.eq('id', deckId);
if (deckError) throw deckError;
const { error: delError } = await client.from('questions').delete().eq('deck_id', deckId);
if (delError) throw delError;
if (questions && questions.length > 0) {
const rows = questions.map((q, i) => ({
deck_id: deckId,
sort_order: i,
prompt: (q.prompt ?? '').trim(),
explanation: (q.explanation ?? '').trim() || null,
answers: Array.isArray(q.answers) ? q.answers : [],
correct_answer_indices: Array.isArray(q.correct_answer_indices) ? q.correct_answer_indices : [],
}));
const { error: qError } = await client.from('questions').insert(rows);
if (qError) throw qError;
}
}
export async function togglePublished(client, deckId, published) {
const { error } = await client.from('decks').update({ published }).eq('id', deckId);
if (error) throw error;
}
export async function deleteDeck(client, deckId) {
const { error } = await client.from('decks').delete().eq('id', deckId);
if (error) throw error;
}
/**
* Get source deck and copy deck with questions for the "Update from community" preview.
* Copy must be owned by userId and have copied_from_deck_id.
* @returns {{ source: object, copy: object, changes: string[] }}
*/
export async function getSourceUpdatePreview(client, copyDeckId, userId) {
const { data: copy, error: copyErr } = await client
.from('decks')
.select('*')
.eq('id', copyDeckId)
.eq('owner_id', userId)
.single();
if (copyErr || !copy?.copied_from_deck_id) throw new Error('Deck not found or not a copy');
const sourceId = copy.copied_from_deck_id;
const [source, copyQuestionsRows] = await Promise.all([
fetchDeckWithQuestions(client, sourceId),
client.from('questions').select('*').eq('deck_id', copyDeckId).order('sort_order', { ascending: true }),
]);
if (!source.published) throw new Error('Source deck is no longer available');
const copyQuestions = copyQuestionsRows.data ?? [];
const copyWithQuestions = { ...copy, questions: copyQuestions };
const changes = [];
if ((source.title ?? '').trim() !== (copy.title ?? '').trim()) {
changes.push(`Title: "${(copy.title ?? '').trim()}" → "${(source.title ?? '').trim()}"`);
}
if ((source.description ?? '').trim() !== (copy.description ?? '').trim()) {
changes.push('Description updated');
}
const srcLen = (source.questions ?? []).length;
const copyLen = copyQuestions.length;
if (srcLen !== copyLen) {
changes.push(`Questions: ${copyLen} → ${srcLen}`);
} else {
const anyDifferent = (source.questions ?? []).some((sq, i) => {
const cq = copyQuestions[i];
if (!cq) return true;
return (sq.prompt ?? '') !== (cq.prompt ?? '') || (sq.explanation ?? '') !== (cq.explanation ?? '');
});
if (anyDifferent) changes.push('Some question content updated');
}
if (changes.length === 0) changes.push('Content is in sync (version metadata will update)');
return { source, copy: copyWithQuestions, changes };
}
/**
* Update a community copy to match the current source deck (title, description, config, questions, copied_from_version).
*/
export async function applySourceUpdate(client, copyDeckId, userId) {
const { data: copy, error: copyErr } = await client
.from('decks')
.select('id, copied_from_deck_id')
.eq('id', copyDeckId)
.eq('owner_id', userId)
.single();
if (copyErr || !copy?.copied_from_deck_id) throw new Error('Deck not found or not a copy');
const source = await fetchDeckWithQuestions(client, copy.copied_from_deck_id);
if (!source.published) throw new Error('Source deck is no longer available');
const { error: deckError } = await client
.from('decks')
.update({
title: source.title ?? '',
description: source.description ?? '',
config: source.config ?? {},
copied_from_version: source.version ?? 1,
})
.eq('id', copyDeckId);
if (deckError) throw deckError;
const { error: delError } = await client.from('questions').delete().eq('deck_id', copyDeckId);
if (delError) throw delError;
const questions = source.questions ?? [];
if (questions.length > 0) {
const rows = questions.map((q, i) => ({
deck_id: copyDeckId,
sort_order: i,
prompt: (q.prompt ?? '').trim(),
explanation: (q.explanation ?? '').trim() || null,
answers: Array.isArray(q.answers) ? q.answers : [],
correct_answer_indices: Array.isArray(q.correct_answer_indices) ? q.correct_answer_indices : [],
}));
const { error: qError } = await client.from('questions').insert(rows);
if (qError) throw qError;
}
}
/** True if the user already has this deck (owns it or has added a copy). */
export async function userHasDeck(client, deckId, userId) {
if (!userId) return false;
const { data, error } = await client
.from('decks')
.select('id')
.eq('owner_id', userId)
.or(`id.eq.${deckId},copied_from_deck_id.eq.${deckId}`)
.limit(1);
if (error) throw error;
return (data?.length ?? 0) > 0;
}
/** Get all reviews (ratings + comments) for a deck with reviewer display names. */
export async function getDeckReviews(client, deckId) {
const { data: ratings, error: rError } = await client
.from('deck_ratings')
.select('user_id, rating, comment, created_at')
.eq('deck_id', deckId)
.order('created_at', { ascending: false });
if (rError) throw rError;
const list = ratings ?? [];
if (list.length === 0) return [];
const userIds = [...new Set(list.map((r) => r.user_id).filter(Boolean))];
const { data: profiles } = await client
.from('profiles')
.select('id, display_name, email, avatar_url')
.in('id', userIds);
const byId = new Map((profiles ?? []).map((p) => [p.id, p]));
return list.map((r) => {
const p = byId.get(r.user_id);
return {
rating: r.rating,
comment: r.comment || null,
user_id: r.user_id,
display_name: p?.display_name ?? null,
email: p?.email ?? null,
avatar_url: p?.avatar_url ?? null,
};
});
}
/** Get the current user's rating (and comment) for a deck, or null if none. */
export async function getMyDeckRating(client, deckId, userId) {
if (!userId) return null;
const { data, error } = await client
.from('deck_ratings')
.select('rating, comment')
.eq('deck_id', deckId)
.eq('user_id', userId)
.maybeSingle();
if (error) throw error;
return data;
}
/** Submit or update rating (and optional comment) for a deck. Upserts by (deck_id, user_id). */
export async function submitDeckRating(client, deckId, userId, { rating, comment }) {
const row = {
deck_id: deckId,
user_id: userId,
rating: Math.min(5, Math.max(1, Math.round(rating))),
comment: (comment ?? '').trim() || null,
};
const { error } = await client.from('deck_ratings').upsert(row, {
onConflict: 'deck_id,user_id',
});
if (error) throw error;
}
src/lib/api/decks.js
+1 -517
View File
@@ -1,519 +1,3 @@
import { supabase } from '../supabase.js';
export async function fetchMyDecks(userId) {
const { data, error } = await supabase
.from('decks')
.select('id, title, description, config, published, created_at, updated_at, copied_from_deck_id, version, copied_from_version')
.eq('owner_id', userId)
.order('updated_at', { ascending: false });
if (error) throw error;
const decks = data ?? [];
if (decks.length === 0) return [];
const deckIds = decks.map((d) => d.id);
const sourceDeckIds = [...new Set(decks.map((d) => d.copied_from_deck_id).filter(Boolean))];
const ratingDeckIds = [...new Set([...deckIds, ...sourceDeckIds])];
const [questionCounts, ratingsRows, sourceTitlesRows] = await Promise.all([
Promise.all(
decks.map(async (d) => {
const { count, error: e } = await supabase
.from('questions')
.select('*', { count: 'exact', head: true })
.eq('deck_id', d.id);
if (e) return 0;
return count ?? 0;
})
),
ratingDeckIds.length > 0
? supabase.from('deck_ratings').select('deck_id, rating').in('deck_id', ratingDeckIds)
: Promise.resolve({ data: [] }),
sourceDeckIds.length > 0
? supabase.from('decks').select('id, title, version, updated_at').in('id', sourceDeckIds)
: Promise.resolve({ data: [] }),
]);
const ratingByDeck = new Map();
for (const r of ratingsRows.data ?? []) {
if (!ratingByDeck.has(r.deck_id)) ratingByDeck.set(r.deck_id, []);
ratingByDeck.get(r.deck_id).push(r.rating);
}
const getRating = (deckId) => {
const arr = ratingByDeck.get(deckId);
if (!arr?.length) return { average_rating: 0, rating_count: 0 };
const sum = arr.reduce((a, b) => a + b, 0);
return { average_rating: Math.round((sum / arr.length) * 100) / 100, rating_count: arr.length };
};
const sourceById = new Map((sourceTitlesRows.data ?? []).map((d) => [d.id, d]));
return decks.map((d, i) => {
const showRatingDeckId = d.copied_from_deck_id || d.id;
const rating = getRating(showRatingDeckId);
const canRate = !!d.copied_from_deck_id;
const sourceDeck = d.copied_from_deck_id ? sourceById.get(d.copied_from_deck_id) : null;
const source_deck_title = sourceDeck?.title ?? 'Deck';
const source_version = sourceDeck?.version ?? 1;
const my_version = d.copied_from_version ?? 0;
const versionOutdated = source_version > my_version;
const sourceNewerByTime =
sourceDeck?.updated_at &&
d.updated_at &&
new Date(sourceDeck.updated_at).getTime() > new Date(d.updated_at).getTime();
const needs_update =
!!d.copied_from_deck_id && (versionOutdated || sourceNewerByTime);
return {
...d,
question_count: questionCounts[i],
...rating,
can_rate: canRate,
rateable_deck_id: d.copied_from_deck_id || null,
source_deck_title,
source_version,
needs_update,
};
});
}
/**
* @param {string | null | undefined} [userId] - Current user id; when set, each deck gets user_has_this (true if user owns it or already has a copy).
*/
export async function fetchPublishedDecks(userId) {
const { data, error } = await supabase
.from('decks')
.select('id, title, description, config, published, created_at, updated_at, owner_id')
.eq('published', true)
.order('updated_at', { ascending: false });
if (error) throw error;
const decks = data ?? [];
if (decks.length === 0) return [];
const deckIds = decks.map((d) => d.id);
const ownerIds = [...new Set(decks.map((d) => d.owner_id).filter(Boolean))];
const promises = [
Promise.all(
decks.map(async (d) => {
const { count, error: e } = await supabase
.from('questions')
.select('*', { count: 'exact', head: true })
.eq('deck_id', d.id);
if (e) return 0;
return count ?? 0;
})
),
ownerIds.length > 0
? supabase.from('profiles').select('id, display_name, email').in('id', ownerIds)
: Promise.resolve({ data: [] }),
supabase.from('deck_ratings').select('deck_id, rating').in('deck_id', deckIds),
];
if (userId) {
promises.push(
supabase
.from('decks')
.select('copied_from_deck_id')
.eq('owner_id', userId)
.not('copied_from_deck_id', 'is', null)
);
}
const results = await Promise.all(promises);
const [questionCounts, profilesRows, ratingsRows, myDecksRows] = results;
const myCopiedFromIds = new Set();
if (userId && myDecksRows?.data) {
for (const row of myDecksRows.data) {
if (row.copied_from_deck_id) myCopiedFromIds.add(row.copied_from_deck_id);
}
}
const profilesById = new Map(
(profilesRows.data ?? []).map((p) => [p.id, { display_name: p.display_name, email: p.email }])
);
const ratingByDeck = new Map();
for (const r of ratingsRows.data ?? []) {
if (!ratingByDeck.has(r.deck_id)) ratingByDeck.set(r.deck_id, []);
ratingByDeck.get(r.deck_id).push(r.rating);
}
const getRating = (deckId) => {
const arr = ratingByDeck.get(deckId);
if (!arr?.length) return { average_rating: 0, rating_count: 0 };
const sum = arr.reduce((a, b) => a + b, 0);
return { average_rating: Math.round((sum / arr.length) * 100) / 100, rating_count: arr.length };
};
return decks.map((d, i) => {
const profile = profilesById.get(d.owner_id);
const owner_email = profile?.email ?? profile?.display_name ?? 'User';
const user_has_this =
!!userId && (d.owner_id === userId || myCopiedFromIds.has(d.id));
return {
...d,
question_count: questionCounts[i],
owner_display_name: profile?.display_name ?? 'User',
owner_email,
...getRating(d.id),
user_has_this,
};
});
}
/**
* @param {string} ownerId - Owner of the decks to list.
* @param {string | null | undefined} [viewerId] - Current user id; when set, each deck gets user_has_this (true if viewer owns it or already has a copy).
*/
export async function fetchPublishedDecksByOwner(ownerId, viewerId) {
const { data: decks, error } = await supabase
.from('decks')
.select('id, title, description, config, published, created_at, updated_at, owner_id')
.eq('published', true)
.eq('owner_id', ownerId)
.order('updated_at', { ascending: false });
if (error) throw error;
const deckList = decks ?? [];
if (deckList.length === 0) {
const { data: profile } = await supabase.from('profiles').select('id, display_name, email').eq('id', ownerId).single();
return {
decks: [],
owner_email: profile?.email ?? profile?.display_name ?? 'User',
owner_display_name: profile?.display_name ?? profile?.email ?? 'User',
};
}
const deckIds = deckList.map((d) => d.id);
const promises = [
Promise.all(
deckList.map(async (d) => {
const { count, error: e } = await supabase
.from('questions')
.select('*', { count: 'exact', head: true })
.eq('deck_id', d.id);
if (e) return 0;
return count ?? 0;
})
),
supabase.from('deck_ratings').select('deck_id, rating').in('deck_id', deckIds),
];
if (viewerId && viewerId !== ownerId) {
promises.push(
supabase
.from('decks')
.select('copied_from_deck_id')
.eq('owner_id', viewerId)
.not('copied_from_deck_id', 'is', null)
);
}
const results = await Promise.all(promises);
const [questionCounts, ratingsRows, myDecksRows] = results;
const myCopiedFromIds = new Set();
if (viewerId && viewerId !== ownerId && myDecksRows?.data) {
for (const row of myDecksRows.data) {
if (row.copied_from_deck_id) myCopiedFromIds.add(row.copied_from_deck_id);
}
}
const ratingByDeck = new Map();
for (const r of ratingsRows.data ?? []) {
if (!ratingByDeck.has(r.deck_id)) ratingByDeck.set(r.deck_id, []);
ratingByDeck.get(r.deck_id).push(r.rating);
}
const getRating = (deckId) => {
const arr = ratingByDeck.get(deckId);
if (!arr?.length) return { average_rating: 0, rating_count: 0 };
const sum = arr.reduce((a, b) => a + b, 0);
return { average_rating: Math.round((sum / arr.length) * 100) / 100, rating_count: arr.length };
};
const { data: profile } = await supabase.from('profiles').select('id, display_name, email').eq('id', ownerId).single();
const owner_email = profile?.email ?? profile?.display_name ?? 'User';
const owner_display_name = profile?.display_name ?? profile?.email ?? 'User';
const decksWithMeta = deckList.map((d, i) => {
const user_has_this =
!!viewerId &&
(viewerId === ownerId || myCopiedFromIds.has(d.id));
return {
...d,
question_count: questionCounts[i],
owner_email,
owner_display_name,
...getRating(d.id),
user_has_this,
};
});
return { decks: decksWithMeta, owner_email, owner_display_name };
}
export async function fetchDeckWithQuestions(deckId) {
const { data: deck, error: deckError } = await supabase
.from('decks')
.select('*')
.eq('id', deckId)
.single();
if (deckError || !deck) throw deckError || new Error('Deck not found');
const { data: questions, error: qError } = await supabase
.from('questions')
.select('*')
.eq('deck_id', deckId)
.order('sort_order', { ascending: true });
if (qError) throw qError;
return { ...deck, questions: questions ?? [] };
}
/** Copy a published deck (and its questions) into the current user's account. New deck is unpublished. */
export async function copyDeckToUser(deckId, userId) {
const source = await fetchDeckWithQuestions(deckId);
if (!source.published) throw new Error('Deck is not available to copy');
const questions = (source.questions ?? []).map((q) => ({
prompt: q.prompt ?? '',
explanation: q.explanation ?? '',
answers: Array.isArray(q.answers) ? q.answers : [],
correct_answer_indices: Array.isArray(q.correct_answer_indices) ? q.correct_answer_indices : [],
}));
return createDeck(userId, {
title: source.title,
description: source.description ?? '',
config: source.config ?? {},
questions,
copiedFromDeckId: deckId,
copiedFromVersion: source.version ?? 1,
});
}
export async function createDeck(ownerId, { title, description, config, questions, copiedFromDeckId, copiedFromVersion }) {
const row = {
owner_id: ownerId,
title: title.trim(),
description: (description ?? '').trim(),
config: config ?? {},
};
if (copiedFromDeckId != null) row.copied_from_deck_id = copiedFromDeckId;
if (copiedFromVersion != null) row.copied_from_version = copiedFromVersion;
const { data: deck, error: deckError } = await supabase
.from('decks')
.insert(row)
.select('id')
.single();
if (deckError || !deck) throw deckError || new Error('Failed to create deck');
if (questions && questions.length > 0) {
const rows = questions.map((q, i) => ({
deck_id: deck.id,
sort_order: i,
prompt: (q.prompt ?? '').trim(),
explanation: (q.explanation ?? '').trim() || null,
answers: Array.isArray(q.answers) ? q.answers : [],
correct_answer_indices: Array.isArray(q.correct_answer_indices) ? q.correct_answer_indices : [],
}));
const { error: qError } = await supabase.from('questions').insert(rows);
if (qError) throw qError;
}
return deck.id;
}
export async function updateDeck(deckId, { title, description, config, questions }) {
const { data: current, error: fetchErr } = await supabase
.from('decks')
.select('version, published')
.eq('id', deckId)
.single();
if (fetchErr) throw fetchErr;
const bumpVersion = current?.published === true;
const nextVersion = bumpVersion ? (current?.version ?? 1) + 1 : (current?.version ?? 1);
const updatePayload = {
title: title.trim(),
description: (description ?? '').trim(),
config: config ?? {},
version: nextVersion,
};
const { error: deckError } = await supabase
.from('decks')
.update(updatePayload)
.eq('id', deckId);
if (deckError) throw deckError;
const { error: delError } = await supabase.from('questions').delete().eq('deck_id', deckId);
if (delError) throw delError;
if (questions && questions.length > 0) {
const rows = questions.map((q, i) => ({
deck_id: deckId,
sort_order: i,
prompt: (q.prompt ?? '').trim(),
explanation: (q.explanation ?? '').trim() || null,
answers: Array.isArray(q.answers) ? q.answers : [],
correct_answer_indices: Array.isArray(q.correct_answer_indices) ? q.correct_answer_indices : [],
}));
const { error: qError } = await supabase.from('questions').insert(rows);
if (qError) throw qError;
}
}
export async function togglePublished(deckId, published) {
const { error } = await supabase.from('decks').update({ published }).eq('id', deckId);
if (error) throw error;
}
export async function deleteDeck(deckId) {
const { error } = await supabase.from('decks').delete().eq('id', deckId);
if (error) throw error;
}
/**
* Get source deck and copy deck with questions for the "Update from community" preview.
* Copy must be owned by userId and have copied_from_deck_id.
* @returns {{ source: object, copy: object, changes: string[] }}
*/
export async function getSourceUpdatePreview(copyDeckId, userId) {
const { data: copy, error: copyErr } = await supabase
.from('decks')
.select('*')
.eq('id', copyDeckId)
.eq('owner_id', userId)
.single();
if (copyErr || !copy?.copied_from_deck_id) throw new Error('Deck not found or not a copy');
const sourceId = copy.copied_from_deck_id;
const [source, copyQuestionsRows] = await Promise.all([
fetchDeckWithQuestions(sourceId),
supabase.from('questions').select('*').eq('deck_id', copyDeckId).order('sort_order', { ascending: true }),
]);
if (!source.published) throw new Error('Source deck is no longer available');
const copyQuestions = copyQuestionsRows.data ?? [];
const copyWithQuestions = { ...copy, questions: copyQuestions };
const changes = [];
if ((source.title ?? '').trim() !== (copy.title ?? '').trim()) {
changes.push(`Title: "${(copy.title ?? '').trim()}" → "${(source.title ?? '').trim()}"`);
}
if ((source.description ?? '').trim() !== (copy.description ?? '').trim()) {
changes.push('Description updated');
}
const srcLen = (source.questions ?? []).length;
const copyLen = copyQuestions.length;
if (srcLen !== copyLen) {
changes.push(`Questions: ${copyLen} → ${srcLen}`);
} else {
const anyDifferent = (source.questions ?? []).some((sq, i) => {
const cq = copyQuestions[i];
if (!cq) return true;
return (sq.prompt ?? '') !== (cq.prompt ?? '') || (sq.explanation ?? '') !== (cq.explanation ?? '');
});
if (anyDifferent) changes.push('Some question content updated');
}
if (changes.length === 0) changes.push('Content is in sync (version metadata will update)');
return { source, copy: copyWithQuestions, changes };
}
/**
* Update a community copy to match the current source deck (title, description, config, questions, copied_from_version).
*/
export async function applySourceUpdate(copyDeckId, userId) {
const { data: copy, error: copyErr } = await supabase
.from('decks')
.select('id, copied_from_deck_id')
.eq('id', copyDeckId)
.eq('owner_id', userId)
.single();
if (copyErr || !copy?.copied_from_deck_id) throw new Error('Deck not found or not a copy');
const source = await fetchDeckWithQuestions(copy.copied_from_deck_id);
if (!source.published) throw new Error('Source deck is no longer available');
const { error: deckError } = await supabase
.from('decks')
.update({
title: source.title ?? '',
description: source.description ?? '',
config: source.config ?? {},
copied_from_version: source.version ?? 1,
})
.eq('id', copyDeckId);
if (deckError) throw deckError;
const { error: delError } = await supabase.from('questions').delete().eq('deck_id', copyDeckId);
if (delError) throw delError;
const questions = source.questions ?? [];
if (questions.length > 0) {
const rows = questions.map((q, i) => ({
deck_id: copyDeckId,
sort_order: i,
prompt: (q.prompt ?? '').trim(),
explanation: (q.explanation ?? '').trim() || null,
answers: Array.isArray(q.answers) ? q.answers : [],
correct_answer_indices: Array.isArray(q.correct_answer_indices) ? q.correct_answer_indices : [],
}));
const { error: qError } = await supabase.from('questions').insert(rows);
if (qError) throw qError;
}
}
/** True if the user already has this deck (owns it or has added a copy). */
export async function userHasDeck(deckId, userId) {
if (!userId) return false;
const { data, error } = await supabase
.from('decks')
.select('id')
.eq('owner_id', userId)
.or(`id.eq.${deckId},copied_from_deck_id.eq.${deckId}`)
.limit(1);
if (error) throw error;
return (data?.length ?? 0) > 0;
}
/** Get all reviews (ratings + comments) for a deck with reviewer display names. */
export async function getDeckReviews(deckId) {
const { data: ratings, error: rError } = await supabase
.from('deck_ratings')
.select('user_id, rating, comment, created_at')
.eq('deck_id', deckId)
.order('created_at', { ascending: false });
if (rError) throw rError;
const list = ratings ?? [];
if (list.length === 0) return [];
const userIds = [...new Set(list.map((r) => r.user_id).filter(Boolean))];
const { data: profiles } = await supabase
.from('profiles')
.select('id, display_name, email, avatar_url')
.in('id', userIds);
const byId = new Map((profiles ?? []).map((p) => [p.id, p]));
return list.map((r) => {
const p = byId.get(r.user_id);
return {
rating: r.rating,
comment: r.comment || null,
user_id: r.user_id,
display_name: p?.display_name ?? null,
email: p?.email ?? null,
avatar_url: p?.avatar_url ?? null,
};
});
}
/** Get the current user's rating (and comment) for a deck, or null if none. */
export async function getMyDeckRating(deckId, userId) {
if (!userId) return null;
const { data, error } = await supabase
.from('deck_ratings')
.select('rating, comment')
.eq('deck_id', deckId)
.eq('user_id', userId)
.maybeSingle();
if (error) throw error;
return data;
}
/** Submit or update rating (and optional comment) for a deck. Upserts by (deck_id, user_id). */
export async function submitDeckRating(deckId, userId, { rating, comment }) {
const row = {
deck_id: deckId,
user_id: userId,
rating: Math.min(5, Math.max(1, Math.round(rating))),
comment: (comment ?? '').trim() || null,
};
const { error } = await supabase.from('deck_ratings').upsert(row, {
onConflict: 'deck_id,user_id',
});
if (error) throw error;
}
export * from './decks-core.js';
src/lib/api/decks.test.js
+29 -28
View File
@@ -1,4 +1,5 @@
import { describe, it, expect, vi, beforeEach } from 'vitest'
import { supabase } from '../supabase.js'
import * as decksApi from './decks.js'
const nextResults = []
@@ -53,7 +54,7 @@ describe('decks API', () => {
describe('fetchMyDecks', () => {
it('returns empty array when no decks', async () => {
nextResults.push({ data: [], error: null })
const result = await decksApi.fetchMyDecks('user1')
const result = await decksApi.fetchMyDecks(supabase, 'user1')
expect(result).toEqual([])
})
@@ -63,7 +64,7 @@ describe('decks API', () => {
]
nextResults.push({ data: decks, error: null }, { data: [], error: null }, { data: [], error: null })
countResults.push({ count: 3, error: null })
const result = await decksApi.fetchMyDecks('user1')
const result = await decksApi.fetchMyDecks(supabase, 'user1')
expect(result).toHaveLength(1)
expect(result[0].question_count).toBe(3)
expect(result[0].title).toBe('Deck 1')
@@ -73,7 +74,7 @@ describe('decks API', () => {
describe('fetchPublishedDecks', () => {
it('returns empty array when no published decks', async () => {
nextResults.push({ data: [], error: null })
const result = await decksApi.fetchPublishedDecks()
const result = await decksApi.fetchPublishedDecks(supabase)
expect(result).toEqual([])
})
})
@@ -83,91 +84,91 @@ describe('decks API', () => {
const deck = { id: 'd1', title: 'Deck', version: 1 }
const questions = [{ id: 'q1', prompt: 'Q?', sort_order: 0 }]
nextResults.push({ data: deck, error: null }, { data: questions, error: null })
const result = await decksApi.fetchDeckWithQuestions('d1')
const result = await decksApi.fetchDeckWithQuestions(supabase, 'd1')
expect(result).toMatchObject({ ...deck, questions })
expect(result.questions).toHaveLength(1)
})
it('throws when deck not found', async () => {
nextResults.push({ data: null, error: new Error('Not found') })
await expect(decksApi.fetchDeckWithQuestions('bad')).rejects.toThrow()
await expect(decksApi.fetchDeckWithQuestions(supabase, 'bad')).rejects.toThrow()
})
})
describe('userHasDeck', () => {
it('returns false when userId is null', async () => {
expect(await decksApi.userHasDeck('d1', null)).toBe(false)
expect(await decksApi.userHasDeck(supabase, 'd1', null)).toBe(false)
})
it('returns true when user has deck', async () => {
nextResults.push({ data: [{ id: 'd1' }], error: null })
expect(await decksApi.userHasDeck('d1', 'user1')).toBe(true)
expect(await decksApi.userHasDeck(supabase, 'd1', 'user1')).toBe(true)
})
it('returns false when no match', async () => {
nextResults.push({ data: [], error: null })
expect(await decksApi.userHasDeck('d1', 'user1')).toBe(false)
expect(await decksApi.userHasDeck(supabase, 'd1', 'user1')).toBe(false)
})
})
describe('togglePublished', () => {
it('calls update and throws on error', async () => {
nextResults.push({ error: new Error('DB error') })
await expect(decksApi.togglePublished('d1', true)).rejects.toThrow('DB error')
await expect(decksApi.togglePublished(supabase, 'd1', true)).rejects.toThrow('DB error')
})
it('succeeds when no error', async () => {
nextResults.push({ error: null })
await expect(decksApi.togglePublished('d1', false)).resolves.toBeUndefined()
await expect(decksApi.togglePublished(supabase, 'd1', false)).resolves.toBeUndefined()
})
})
describe('deleteDeck', () => {
it('throws on error', async () => {
nextResults.push({ error: new Error('FK violation') })
await expect(decksApi.deleteDeck('d1')).rejects.toThrow('FK violation')
await expect(decksApi.deleteDeck(supabase, 'd1')).rejects.toThrow('FK violation')
})
it('succeeds when no error', async () => {
nextResults.push({ error: null })
await expect(decksApi.deleteDeck('d1')).resolves.toBeUndefined()
await expect(decksApi.deleteDeck(supabase, 'd1')).resolves.toBeUndefined()
})
})
describe('getMyDeckRating', () => {
it('returns null when userId is null', async () => {
expect(await decksApi.getMyDeckRating('d1', null)).toBe(null)
expect(await decksApi.getMyDeckRating(supabase, 'd1', null)).toBe(null)
})
it('returns rating and comment when present', async () => {
nextResults.push({ data: { rating: 4, comment: 'Great!' }, error: null })
const result = await decksApi.getMyDeckRating('d1', 'user1')
const result = await decksApi.getMyDeckRating(supabase, 'd1', 'user1')
expect(result).toEqual({ rating: 4, comment: 'Great!' })
})
it('returns null when no rating', async () => {
nextResults.push({ data: null, error: null })
expect(await decksApi.getMyDeckRating('d1', 'user1')).toBe(null)
expect(await decksApi.getMyDeckRating(supabase, 'd1', 'user1')).toBe(null)
})
})
describe('submitDeckRating', () => {
it('clamps rating to 1-5 and trims comment', async () => {
nextResults.push({ error: null })
await decksApi.submitDeckRating('d1', 'user1', { rating: 10, comment: ' ok ' })
await decksApi.submitDeckRating(supabase, 'd1', 'user1', { rating: 10, comment: ' ok ' })
expect(nextResults.length).toBe(0)
})
it('throws on error', async () => {
nextResults.push({ error: new Error('Unique violation') })
await expect(decksApi.submitDeckRating('d1', 'user1', { rating: 3 })).rejects.toThrow('Unique violation')
await expect(decksApi.submitDeckRating(supabase, 'd1', 'user1', { rating: 3 })).rejects.toThrow('Unique violation')
})
})
describe('getDeckReviews', () => {
it('returns empty array when no ratings', async () => {
nextResults.push({ data: [], error: null })
const result = await decksApi.getDeckReviews('d1')
const result = await decksApi.getDeckReviews(supabase, 'd1')
expect(result).toEqual([])
})
@@ -176,7 +177,7 @@ describe('decks API', () => {
{ data: [{ user_id: 'u1', rating: 5, comment: 'Nice', created_at: '2025-01-01' }], error: null },
{ data: [{ id: 'u1', display_name: 'Alice', email: '[email protected]', avatar_url: null }], error: null }
)
const result = await decksApi.getDeckReviews('d1')
const result = await decksApi.getDeckReviews(supabase, 'd1')
expect(result).toHaveLength(1)
expect(result[0]).toMatchObject({ rating: 5, comment: 'Nice', display_name: 'Alice', email: '[email protected]' })
})
@@ -185,13 +186,13 @@ describe('decks API', () => {
describe('createDeck', () => {
it('creates deck and returns id', async () => {
nextResults.push({ data: { id: 'new-id' }, error: null })
const id = await decksApi.createDeck('user1', { title: 'Title', description: 'Desc', config: {} })
const id = await decksApi.createDeck(supabase, 'user1', { title: 'Title', description: 'Desc', config: {} })
expect(id).toBe('new-id')
})
it('throws when insert fails', async () => {
nextResults.push({ data: null, error: new Error('Failed') })
await expect(decksApi.createDeck('user1', { title: 'T', description: '', config: {} })).rejects.toThrow()
await expect(decksApi.createDeck(supabase, 'user1', { title: 'T', description: '', config: {} })).rejects.toThrow()
})
})
@@ -202,7 +203,7 @@ describe('decks API', () => {
{ error: null },
{ error: null }
)
await decksApi.updateDeck('d1', { title: 'New', description: '', config: {}, questions: [] })
await decksApi.updateDeck(supabase, 'd1', { title: 'New', description: '', config: {}, questions: [] })
expect(nextResults.length).toBe(0)
})
@@ -212,7 +213,7 @@ describe('decks API', () => {
{ error: null },
{ error: null }
)
await decksApi.updateDeck('d1', { title: 'T', description: '', config: {}, questions: [] })
await decksApi.updateDeck(supabase, 'd1', { title: 'T', description: '', config: {}, questions: [] })
expect(nextResults.length).toBe(0)
})
})
@@ -223,7 +224,7 @@ describe('decks API', () => {
{ data: { id: 's1', title: 'S', published: false, questions: [] }, error: null },
{ data: [], error: null }
)
await expect(decksApi.copyDeckToUser('s1', 'user1')).rejects.toThrow('not available to copy')
await expect(decksApi.copyDeckToUser(supabase, 's1', 'user1')).rejects.toThrow('not available to copy')
})
it('creates copy and returns new deck id', async () => {
@@ -232,7 +233,7 @@ describe('decks API', () => {
{ data: [], error: null },
{ data: { id: 'new-id' }, error: null }
)
const id = await decksApi.copyDeckToUser('s1', 'user1')
const id = await decksApi.copyDeckToUser(supabase, 's1', 'user1')
expect(id).toBe('new-id')
})
})
@@ -240,7 +241,7 @@ describe('decks API', () => {
describe('getSourceUpdatePreview', () => {
it('throws when deck not found or not a copy', async () => {
nextResults.push({ data: null, error: new Error('Not found') })
await expect(decksApi.getSourceUpdatePreview('d1', 'user1')).rejects.toThrow('not found or not a copy')
await expect(decksApi.getSourceUpdatePreview(supabase, 'd1', 'user1')).rejects.toThrow('not found or not a copy')
})
it('returns source, copy and changes', async () => {
@@ -251,7 +252,7 @@ describe('decks API', () => {
{ data: sourceDeck, error: null },
{ data: [{ prompt: 'Q' }], error: null }
)
const result = await decksApi.getSourceUpdatePreview('c1', 'user1')
const result = await decksApi.getSourceUpdatePreview(supabase, 'c1', 'user1')
expect(result.source).toBeDefined()
expect(result.copy).toBeDefined()
expect(result.changes).toEqual(expect.any(Array))
@@ -261,7 +262,7 @@ describe('decks API', () => {
describe('applySourceUpdate', () => {
it('throws when deck not a copy', async () => {
nextResults.push({ data: null, error: new Error('Not found') })
await expect(decksApi.applySourceUpdate('d1', 'user1')).rejects.toThrow()
await expect(decksApi.applySourceUpdate(supabase, 'd1', 'user1')).rejects.toThrow()
})
})
})
src/lib/api/profile.js
+6 -6
View File
@@ -1,10 +1,10 @@
import { supabase } from '../supabase.js';
/** Resolve email for login when user enters a username (display_name). Returns null if not found. */
export async function getEmailForUsername(username) {
export async function getEmailForUsername(client, username) {
const trimmed = (username ?? '').trim();
if (!trimmed) return null;
const { data, error } = await supabase
const { data, error } = await client
.from('profiles')
.select('email')
.ilike('display_name', trimmed)
@@ -13,8 +13,8 @@ export async function getEmailForUsername(username) {
return data[0].email;
}
export async function getProfile(userId) {
const { data, error } = await supabase
export async function getProfile(client, userId) {
const { data, error } = await client
.from('profiles')
.select('id, display_name, email, avatar_url')
.eq('id', userId)
@@ -23,13 +23,13 @@ export async function getProfile(userId) {
return data ?? null;
}
export async function updateProfile(userId, { display_name, avatar_url }) {
export async function updateProfile(client, userId, { display_name, avatar_url }) {
const updates = {};
if (display_name !== undefined) updates.display_name = display_name?.trim() || null;
if (avatar_url !== undefined) updates.avatar_url = avatar_url || null;
updates.updated_at = new Date().toISOString();
const { data, error } = await supabase
const { data, error } = await client
.from('profiles')
.update(updates)
.eq('id', userId)
src/lib/api/profile.test.js
+14 -13
View File
@@ -1,4 +1,5 @@
import { describe, it, expect, vi, beforeEach } from 'vitest'
import { supabase } from '../supabase.js'
import * as profileApi from './profile.js'
const nextResults = []
@@ -38,24 +39,24 @@ describe('profile API', () => {
describe('getEmailForUsername', () => {
it('returns null for empty or whitespace username', async () => {
expect(await profileApi.getEmailForUsername('')).toBe(null)
expect(await profileApi.getEmailForUsername(' ')).toBe(null)
expect(await profileApi.getEmailForUsername(null)).toBe(null)
expect(await profileApi.getEmailForUsername(supabase, '')).toBe(null)
expect(await profileApi.getEmailForUsername(supabase, ' ')).toBe(null)
expect(await profileApi.getEmailForUsername(supabase, null)).toBe(null)
})
it('returns email when profile found', async () => {
nextResults.push({ data: [{ email: '[email protected]' }], error: null })
const email = await profileApi.getEmailForUsername('johndoe')
const email = await profileApi.getEmailForUsername(supabase, 'johndoe')
expect(email).toBe('[email protected]')
})
it('returns null when error or no data', async () => {
nextResults.push({ data: [], error: null })
expect(await profileApi.getEmailForUsername('x')).toBe(null)
expect(await profileApi.getEmailForUsername(supabase, 'x')).toBe(null)
nextResults.push({ data: null, error: { message: 'err' } })
expect(await profileApi.getEmailForUsername('y')).toBe(null)
expect(await profileApi.getEmailForUsername(supabase, 'y')).toBe(null)
nextResults.push({ data: [{}], error: null })
expect(await profileApi.getEmailForUsername('z')).toBe(null)
expect(await profileApi.getEmailForUsername(supabase, 'z')).toBe(null)
})
})
@@ -63,19 +64,19 @@ describe('profile API', () => {
it('returns profile when found', async () => {
const p = { id: 'u1', display_name: 'Alice', email: '[email protected]', avatar_url: null }
nextResults.push({ data: p, error: null })
const result = await profileApi.getProfile('u1')
const result = await profileApi.getProfile(supabase, 'u1')
expect(result).toEqual(p)
})
it('returns null when not found (PGRST116)', async () => {
nextResults.push({ data: null, error: { code: 'PGRST116' } })
const result = await profileApi.getProfile('u1')
const result = await profileApi.getProfile(supabase, 'u1')
expect(result).toBe(null)
})
it('throws when other error', async () => {
nextResults.push({ data: null, error: new Error('Network error') })
await expect(profileApi.getProfile('u1')).rejects.toThrow('Network error')
await expect(profileApi.getProfile(supabase, 'u1')).rejects.toThrow('Network error')
})
})
@@ -83,19 +84,19 @@ describe('profile API', () => {
it('updates display_name and returns data', async () => {
const updated = { id: 'u1', display_name: 'New Name', email: '[email protected]', avatar_url: null }
nextResults.push({ data: updated, error: null })
const result = await profileApi.updateProfile('u1', { display_name: 'New Name' })
const result = await profileApi.updateProfile(supabase, 'u1', { display_name: 'New Name' })
expect(result).toEqual(updated)
})
it('trims display_name and allows avatar_url', async () => {
nextResults.push({ data: { id: 'u1' }, error: null })
await profileApi.updateProfile('u1', { display_name: ' Trim ', avatar_url: 'path/to/av.jpg' })
await profileApi.updateProfile(supabase, 'u1', { display_name: ' Trim ', avatar_url: 'path/to/av.jpg' })
expect(nextResults.length).toBe(0)
})
it('throws on error', async () => {
nextResults.push({ data: null, error: new Error('DB error') })
await expect(profileApi.updateProfile('u1', { display_name: 'X' })).rejects.toThrow('DB error')
await expect(profileApi.updateProfile(supabase, 'u1', { display_name: 'X' })).rejects.toThrow('DB error')
})
})
src/lib/stores/auth.js
+2 -2
View File
@@ -44,7 +44,7 @@ function createAuthStore() {
return false;
}
if (!email.includes('@')) {
const resolved = await getEmailForUsername(email);
const resolved = await getEmailForUsername(supabase, email);
if (!resolved) {
update((s) => ({ ...s, error: 'No account with that username.' }));
return false;
@@ -79,7 +79,7 @@ function createAuthStore() {
update((s) => ({ ...s, error: null }));
if (data?.user?.id && data?.session && (displayName || '').trim()) {
try {
await updateProfile(data.user.id, { display_name: (displayName || '').trim() });
await updateProfile(supabase, data.user.id, { display_name: (displayName || '').trim() });
} catch (_) {}
}
const needsConfirmation = data?.user && !data?.session;
src/lib/stores/auth.test.js
+2 -2
View File
@@ -67,7 +67,7 @@ describe('auth store', () => {
mockGetEmailForUsername.mockResolvedValue('[email protected]')
mockSignInWithPassword.mockResolvedValue({ error: null })
const result = await auth.login('username', 'pass')
expect(mockGetEmailForUsername).toHaveBeenCalledWith('username')
expect(mockGetEmailForUsername).toHaveBeenCalledWith(expect.anything(), 'username')
expect(mockSignInWithPassword).toHaveBeenCalledWith({
email: '[email protected]',
password: 'pass',
@@ -112,7 +112,7 @@ describe('auth store', () => {
mockSignUp.mockResolvedValue({ data: { user, session: {} }, error: null })
mockUpdateProfile.mockResolvedValue(undefined)
await auth.register('[email protected]', 'pass', 'Alice')
expect(mockUpdateProfile).toHaveBeenCalledWith('u1', { display_name: 'Alice' })
expect(mockUpdateProfile).toHaveBeenCalledWith(expect.anything(), 'u1', { display_name: 'Alice' })
})
it('register with signUp error returns success false', async () => {
src/routes/Community.svelte
+5 -4
View File
@@ -3,6 +3,7 @@
import { push } from 'svelte-spa-router';
import { auth } from '../lib/stores/auth.js';
import { navContext } from '../lib/stores/navContext.js';
import { supabase } from '../lib/supabase.js';
import { fetchPublishedDecks, copyDeckToUser, getMyDeckRating, submitDeckRating } from '../lib/api/decks.js';
import RatingModal from '../lib/RatingModal.svelte';
@@ -88,7 +89,7 @@
useError = null;
ratingDeck = { id: deck.id, title: deck.title };
try {
const data = await getMyDeckRating(deck.id, userId);
const data = await getMyDeckRating(supabase, deck.id, userId);
ratingInitial = { rating: data?.rating ?? 0, comment: data?.comment ?? '' };
} catch (_) {
ratingInitial = { rating: 0, comment: '' };
@@ -102,7 +103,7 @@
async function handleRatingSubmit(payload) {
if (!ratingDeck || !userId) return;
try {
await submitDeckRating(ratingDeck.id, userId, payload);
await submitDeckRating(supabase, ratingDeck.id, userId, payload);
await load();
} catch (e) {
useError = e?.message ?? 'Failed to save rating';
@@ -118,7 +119,7 @@
if (addingDeckId) return;
addingDeckId = deckId;
try {
await copyDeckToUser(deckId, userId);
await copyDeckToUser(supabase, deckId, userId);
await load();
} catch (e) {
useError = e?.message ?? 'Failed to add deck';
@@ -131,7 +132,7 @@
loading = true;
error = null;
try {
decks = await fetchPublishedDecks(userId ?? undefined);
decks = await fetchPublishedDecks(supabase, userId ?? undefined);
} catch (e) {
error = e?.message ?? 'Failed to load community decks';
decks = [];
src/routes/Community.test.js
+1 -1
View File
@@ -86,7 +86,7 @@ describe('Community', () => {
render(Community)
await waitFor(() => expect(screen.getByRole('button', { name: 'Add' })).toBeInTheDocument())
await fireEvent.click(screen.getByRole('button', { name: 'Add' }))
await waitFor(() => expect(mockCopyDeckToUser).toHaveBeenCalledWith('d1', 'u1'))
await waitFor(() => expect(mockCopyDeckToUser).toHaveBeenCalledWith(expect.anything(), 'd1', 'u1'))
await waitFor(() => expect(screen.getByText('In My decks')).toBeInTheDocument())
})
})
src/routes/CommunityUser.svelte
+5 -4
View File
@@ -3,6 +3,7 @@
import { push } from 'svelte-spa-router';
import { auth } from '../lib/stores/auth.js';
import { navContext } from '../lib/stores/navContext.js';
import { supabase } from '../lib/supabase.js';
import { fetchPublishedDecksByOwner, copyDeckToUser, getMyDeckRating, submitDeckRating } from '../lib/api/decks.js';
import RatingModal from '../lib/RatingModal.svelte';
@@ -46,7 +47,7 @@
useError = null;
ratingDeck = { id: deck.id, title: deck.title };
try {
const data = await getMyDeckRating(deck.id, userId);
const data = await getMyDeckRating(supabase, deck.id, userId);
ratingInitial = { rating: data?.rating ?? 0, comment: data?.comment ?? '' };
} catch (_) {
ratingInitial = { rating: 0, comment: '' };
@@ -60,7 +61,7 @@
async function handleRatingSubmit(payload) {
if (!ratingDeck || !userId) return;
try {
await submitDeckRating(ratingDeck.id, userId, payload);
await submitDeckRating(supabase, ratingDeck.id, userId, payload);
await load();
} catch (e) {
useError = e?.message ?? 'Failed to save rating';
@@ -76,7 +77,7 @@
if (addingDeckId) return;
addingDeckId = deckId;
try {
await copyDeckToUser(deckId, userId);
await copyDeckToUser(supabase, deckId, userId);
await load();
} catch (e) {
useError = e?.message ?? 'Failed to add deck';
@@ -95,7 +96,7 @@
loading = true;
error = null;
try {
const result = await fetchPublishedDecksByOwner(ownerId, userId ?? undefined);
const result = await fetchPublishedDecksByOwner(supabase, ownerId, userId ?? undefined);
decks = result.decks ?? [];
ownerName = result.owner_display_name ?? result.owner_email ?? 'User';
} catch (e) {
src/routes/CommunityUser.test.js
+1 -1
View File
@@ -40,7 +40,7 @@ describe('CommunityUser', () => {
render(CommunityUser, { props: { params: { id: 'owner1' } } })
expect(screen.getByText('Loading…')).toBeInTheDocument()
await waitFor(() => expect(screen.getByText(/Decks by Test User/)).toBeInTheDocument())
expect(mockFetchPublishedDecksByOwner).toHaveBeenCalledWith('owner1', 'u1')
expect(mockFetchPublishedDecksByOwner).toHaveBeenCalledWith(expect.anything(), 'owner1', 'u1')
})
it('shows error when fetch fails', async () => {
src/routes/CreateDeck.svelte
+2 -1
View File
@@ -3,6 +3,7 @@
import { push } from 'svelte-spa-router';
import { auth } from '../lib/stores/auth.js';
import { navContext } from '../lib/stores/navContext.js';
import { supabase } from '../lib/supabase.js';
import { createDeck } from '../lib/api/decks.js';
import { DEFAULT_DECK_CONFIG } from '../lib/deckConfig.js';
import QuestionEditor from '../lib/QuestionEditor.svelte';
@@ -112,7 +113,7 @@
saving = true;
error = null;
try {
const id = await createDeck(userId, {
const id = await createDeck(supabase, userId, {
title: t,
description: description.trim(),
config,
src/routes/CreateDeck.test.js
+1 -1
View File
@@ -94,7 +94,7 @@ describe('CreateDeck', () => {
await fireEvent.input(screen.getByPlaceholderText('Answer 1'), { target: { value: 'Yes' } })
await fireEvent.click(screen.getByRole('button', { name: 'Save deck' }))
await waitFor(() => expect(mockCreateDeck).toHaveBeenCalled())
expect(mockCreateDeck).toHaveBeenCalledWith('u1', expect.objectContaining({ title: 'My Deck' }))
expect(mockCreateDeck).toHaveBeenCalledWith(expect.anything(), 'u1', expect.objectContaining({ title: 'My Deck' }))
expect(mockPush).toHaveBeenCalledWith('/')
})
src/routes/DeckPreview.svelte
+4 -3
View File
@@ -2,6 +2,7 @@
import { push } from 'svelte-spa-router';
import { auth } from '../lib/stores/auth.js';
import { navContext } from '../lib/stores/navContext.js';
import { supabase } from '../lib/supabase.js';
import { fetchDeckWithQuestions, copyDeckToUser, userHasDeck } from '../lib/api/decks.js';
export let params = {};
@@ -28,7 +29,7 @@
addError = null;
userAlreadyHasDeck = false;
try {
deck = await fetchDeckWithQuestions(deckId);
deck = await fetchDeckWithQuestions(supabase, deckId);
const isMyCopy = !!(userId && deck.owner_id === userId && deck.copied_from_deck_id);
const isOwnDeckLoad = !!(userId && deck.owner_id === userId && !deck.copied_from_deck_id);
const canView = deck.published || isMyCopy || isOwnDeckLoad;
@@ -40,7 +41,7 @@
if (isMyCopy) {
userAlreadyHasDeck = true;
} else if (userId) {
userAlreadyHasDeck = await userHasDeck(deckId, userId);
userAlreadyHasDeck = await userHasDeck(supabase, deckId, userId);
}
}
} catch (e) {
@@ -77,7 +78,7 @@
}
adding = true;
try {
await copyDeckToUser(deckId, userId);
await copyDeckToUser(supabase, deckId, userId);
userAlreadyHasDeck = true;
} catch (e) {
addError = e?.message ?? 'Failed to add deck';
src/routes/DeckPreview.test.js
+2 -2
View File
@@ -43,7 +43,7 @@ describe('DeckPreview', () => {
render(DeckPreview, { props: { params: { id: 'd1' } } })
expect(screen.getByText('Loading deck…')).toBeInTheDocument()
await waitFor(() => expect(screen.getByText('Preview Deck')).toBeInTheDocument())
expect(mockFetchDeckWithQuestions).toHaveBeenCalledWith('d1')
expect(mockFetchDeckWithQuestions).toHaveBeenCalledWith(expect.anything(), 'd1')
})
it('shows error when deck not available', async () => {
@@ -71,7 +71,7 @@ describe('DeckPreview', () => {
const addBtn = screen.getByRole('button', { name: /Add to My decks/i })
mockCopyDeckToUser.mockResolvedValue(undefined)
await fireEvent.click(addBtn)
await waitFor(() => expect(mockCopyDeckToUser).toHaveBeenCalledWith('d1', 'u1'))
await waitFor(() => expect(mockCopyDeckToUser).toHaveBeenCalledWith(expect.anything(), 'd1', 'u1'))
})
it('addToMyDecks without userId shows sign in error', async () => {
src/routes/DeckReviews.svelte
+3 -2
View File
@@ -1,5 +1,6 @@
<script>
import { push } from 'svelte-spa-router';
import { supabase } from '../lib/supabase.js';
import { fetchDeckWithQuestions, getDeckReviews } from '../lib/api/decks.js';
export let params = {};
@@ -22,8 +23,8 @@
error = null;
try {
const [deckData, reviewsData] = await Promise.all([
fetchDeckWithQuestions(deckId),
getDeckReviews(deckId),
fetchDeckWithQuestions(supabase, deckId),
getDeckReviews(supabase, deckId),
]);
if (!deckData.published) {
error = 'This deck is not available.';
src/routes/DeckReviews.test.js
+2 -2
View File
@@ -31,8 +31,8 @@ describe('DeckReviews', () => {
expect(screen.getByText('Loading…')).toBeInTheDocument()
await waitFor(() => expect(screen.getByText('Test Deck')).toBeInTheDocument())
expect(screen.getByText('No reviews yet.')).toBeInTheDocument()
expect(mockFetchDeckWithQuestions).toHaveBeenCalledWith('d1')
expect(mockGetDeckReviews).toHaveBeenCalledWith('d1')
expect(mockFetchDeckWithQuestions).toHaveBeenCalledWith(expect.anything(), 'd1')
expect(mockGetDeckReviews).toHaveBeenCalledWith(expect.anything(), 'd1')
})
it('shows error when deck fetch fails', async () => {
src/routes/EditDeck.svelte
+5 -4
View File
@@ -3,6 +3,7 @@
import { push } from 'svelte-spa-router';
import { auth } from '../lib/stores/auth.js';
import { navContext } from '../lib/stores/navContext.js';
import { supabase } from '../lib/supabase.js';
import { fetchDeckWithQuestions, updateDeck, togglePublished, deleteDeck } from '../lib/api/decks.js';
import { DEFAULT_DECK_CONFIG } from '../lib/deckConfig.js';
import QuestionEditor from '../lib/QuestionEditor.svelte';
@@ -46,7 +47,7 @@
loading = true;
error = null;
try {
const deck = await fetchDeckWithQuestions(deckId);
const deck = await fetchDeckWithQuestions(supabase, deckId);
if (deck.owner_id !== userId) {
push('/');
return;
@@ -112,7 +113,7 @@
saving = true;
error = null;
try {
await updateDeck(deckId, {
await updateDeck(supabase, deckId, {
title: t,
description: description.trim(),
config,
@@ -129,7 +130,7 @@
async function togglePublish() {
if (!deckId) return;
try {
await togglePublished(deckId, !published);
await togglePublished(supabase, deckId, !published);
published = !published;
} catch (e) {
error = e?.message ?? 'Failed to update publish status';
@@ -149,7 +150,7 @@
if (!deckId) return;
closeDeleteConfirm();
try {
await deleteDeck(deckId);
await deleteDeck(supabase, deckId);
push('/');
} catch (e) {
error = e?.message ?? 'Failed to delete deck';
src/routes/EditDeck.test.js
+1 -1
View File
@@ -66,7 +66,7 @@ describe('EditDeck', () => {
render(EditDeck, { props: { params: { id: 'd1' } } })
await waitFor(() => expect(screen.getByDisplayValue('My Deck')).toBeInTheDocument())
await fireEvent.click(screen.getByRole('button', { name: 'Save' }))
await waitFor(() => expect(mockUpdateDeck).toHaveBeenCalledWith('d1', expect.any(Object)))
await waitFor(() => expect(mockUpdateDeck).toHaveBeenCalledWith(expect.anything(), 'd1', expect.any(Object)))
expect(mockPush).toHaveBeenCalledWith('/')
})
})
src/routes/MyDecks.svelte
+9 -8
View File
@@ -3,6 +3,7 @@
import { push } from 'svelte-spa-router';
import { auth } from '../lib/stores/auth.js';
import { navContext } from '../lib/stores/navContext.js';
import { supabase } from '../lib/supabase.js';
import { fetchMyDecks, togglePublished, getMyDeckRating, submitDeckRating, getSourceUpdatePreview, applySourceUpdate, deleteDeck } from '../lib/api/decks.js';
import RatingModal from '../lib/RatingModal.svelte';
import ConfirmModal from '../lib/ConfirmModal.svelte';
@@ -38,7 +39,7 @@
if (!deck.can_rate || !deck.rateable_deck_id || !userId) return;
ratingDeck = { id: deck.rateable_deck_id, title: deck.source_deck_title ?? 'Deck' };
try {
const data = await getMyDeckRating(deck.rateable_deck_id, userId);
const data = await getMyDeckRating(supabase, deck.rateable_deck_id, userId);
ratingInitial = { rating: data?.rating ?? 0, comment: data?.comment ?? '' };
} catch (_) {
ratingInitial = { rating: 0, comment: '' };
@@ -52,7 +53,7 @@
async function handleRatingSubmit(payload) {
if (!ratingDeck || !userId) return;
try {
await submitDeckRating(ratingDeck.id, userId, payload);
await submitDeckRating(supabase, ratingDeck.id, userId, payload);
await load();
} catch (_) {}
}
@@ -71,7 +72,7 @@
loading = true;
error = null;
try {
decks = await fetchMyDecks(userId);
decks = await fetchMyDecks(supabase, userId);
} catch (e) {
error = e?.message ?? 'Failed to load decks';
decks = [];
@@ -95,7 +96,7 @@
if (togglingId === deck.id) return;
togglingId = deck.id;
try {
await togglePublished(deck.id, true);
await togglePublished(supabase, deck.id, true);
decks = decks.map((d) => (d.id === deck.id ? { ...d, published: true } : d));
} catch (err) {
error = err?.message ?? 'Failed to update publish status';
@@ -122,7 +123,7 @@
closeUnpublishConfirm();
togglingId = deck.id;
try {
await togglePublished(deck.id, false);
await togglePublished(supabase, deck.id, false);
decks = decks.map((d) => (d.id === deck.id ? { ...d, published: false } : d));
} catch (err) {
error = err?.message ?? 'Failed to update publish status';
@@ -141,7 +142,7 @@
updateError = null;
updateLoading = true;
try {
updatePreview = await getSourceUpdatePreview(deck.id, userId);
updatePreview = await getSourceUpdatePreview(supabase, deck.id, userId);
} catch (err) {
updateError = err?.message ?? 'Failed to load update preview';
} finally {
@@ -162,7 +163,7 @@
updateApplying = true;
updateError = null;
try {
await applySourceUpdate(updateDeck.id, userId);
await applySourceUpdate(supabase, updateDeck.id, userId);
await load();
closeUpdateModal();
} catch (err) {
@@ -190,7 +191,7 @@
const deck = deckToRemove;
closeRemoveConfirm();
try {
await deleteDeck(deck.id);
await deleteDeck(supabase, deck.id);
await load();
} catch (err) {
error = err?.message ?? 'Failed to remove deck';
src/routes/MyDecks.test.js
+1 -1
View File
@@ -46,7 +46,7 @@ describe('MyDecks', () => {
render(MyDecks)
expect(screen.getByText(/Loading/)).toBeInTheDocument()
await waitFor(() => expect(screen.getByText(/No decks yet/)).toBeInTheDocument())
expect(mockFetchMyDecks).toHaveBeenCalledWith('u1')
expect(mockFetchMyDecks).toHaveBeenCalledWith(expect.anything(), 'u1')
})
it('shows error when fetch fails', async () => {
src/routes/Settings.svelte
+4 -3
View File
@@ -2,6 +2,7 @@
import { onMount } from 'svelte';
import { push } from 'svelte-spa-router';
import { auth } from '../lib/stores/auth.js';
import { supabase } from '../lib/supabase.js';
import { getProfile, updateProfile, uploadAvatar } from '../lib/api/profile.js';
let profile = null;
@@ -29,7 +30,7 @@
loading = true;
error = null;
try {
profile = await getProfile(userId);
profile = await getProfile(supabase, userId);
displayName = profile?.display_name ?? '';
avatarPreview = profile?.avatar_url ?? null;
} catch (e) {
@@ -73,11 +74,11 @@
} else if (avatarPreview === null && profile?.avatar_url) {
avatarUrl = null;
}
await updateProfile(userId, {
await updateProfile(supabase, userId, {
display_name: displayName.trim() || null,
avatar_url: avatarUrl,
});
profile = await getProfile(userId);
profile = await getProfile(supabase, userId);
displayName = profile?.display_name ?? '';
avatarPreview = profile?.avatar_url ?? null;
avatarFile = null;
src/routes/Settings.test.js
+2 -2
View File
@@ -39,7 +39,7 @@ describe('Settings', () => {
it('loads profile and shows display name', async () => {
render(Settings)
await waitFor(() => expect(screen.getByDisplayValue('Test User')).toBeInTheDocument())
expect(mockGetProfile).toHaveBeenCalledWith('u1')
expect(mockGetProfile).toHaveBeenCalledWith(expect.anything(), 'u1')
})
it('Cancel button calls push to home', async () => {
@@ -69,7 +69,7 @@ describe('Settings', () => {
await fireEvent.input(nameInput, { target: { value: 'New Name' } })
await fireEvent.click(screen.getByRole('button', { name: 'Save' }))
await waitFor(() =>
expect(mockUpdateProfile).toHaveBeenCalledWith('u1', { display_name: 'New Name', avatar_url: null })
expect(mockUpdateProfile).toHaveBeenCalledWith(expect.anything(), 'u1', { display_name: 'New Name', avatar_url: null })
)
await waitFor(() => expect(screen.getByText('Settings saved.')).toBeInTheDocument())
})