fix(saved-recipes): resolve FK constraint, null title, and load reliability
- Migration 039: drop saved_recipes.recipe_id FK (SQLite table rebuild).
The FK referenced main.recipes but corpus lives in an ATTACH'd DB — caused
500 on every POST /recipes/saved in cloud mode.
- _to_summary: row.get("title") or "" to handle corpus JOIN returning NULL
title (e.g. placeholder recipe_id 99999).
- list_collections: return [] for Free tier instead of 403 — prevents
Promise.all in savedStore.load() from aborting the saved-recipes fetch.
- savedStore.load(): switched to Promise.allSettled so a collections failure
never blocks the saved list from populating.
- RecipesView: star indicator now reflects savedStore.isSaved() (server-side
saved state) rather than localStorage bookmarks; changed to <span> since
the star is now read-only visual feedback.
- Removed { immediate: true } from saved-tab watcher — premature bounce to
Build Your Own before onMounted load() completes.
This commit is contained in:
parent
f6b29693c8
commit
ed04b655be
4 changed files with 49 additions and 12 deletions
|
|
@ -35,7 +35,7 @@ def _to_summary(row: dict, store: Store) -> SavedRecipeSummary:
|
||||||
return SavedRecipeSummary(
|
return SavedRecipeSummary(
|
||||||
id=row["id"],
|
id=row["id"],
|
||||||
recipe_id=row["recipe_id"],
|
recipe_id=row["recipe_id"],
|
||||||
title=row.get("title", ""),
|
title=row.get("title") or "",
|
||||||
saved_at=row["saved_at"],
|
saved_at=row["saved_at"],
|
||||||
notes=row.get("notes"),
|
notes=row.get("notes"),
|
||||||
rating=row.get("rating"),
|
rating=row.get("rating"),
|
||||||
|
|
@ -104,8 +104,10 @@ async def list_saved_recipes(
|
||||||
async def list_collections(
|
async def list_collections(
|
||||||
session: CloudUser = Depends(get_session),
|
session: CloudUser = Depends(get_session),
|
||||||
) -> list[CollectionSummary]:
|
) -> list[CollectionSummary]:
|
||||||
|
# Free users can list (they'll always have zero — creating requires Paid).
|
||||||
|
# Returning 403 here breaks savedStore.load() via Promise.all for non-Paid users.
|
||||||
if not can_use("recipe_collections", session.tier):
|
if not can_use("recipe_collections", session.tier):
|
||||||
raise HTTPException(status_code=403, detail="Collections require Paid tier.")
|
return []
|
||||||
rows = await asyncio.to_thread(
|
rows = await asyncio.to_thread(
|
||||||
_in_thread, session.db, lambda s: s.get_collections()
|
_in_thread, session.db, lambda s: s.get_collections()
|
||||||
)
|
)
|
||||||
|
|
|
||||||
31
app/db/migrations/039_saved_recipes_drop_fk.sql
Normal file
31
app/db/migrations/039_saved_recipes_drop_fk.sql
Normal file
|
|
@ -0,0 +1,31 @@
|
||||||
|
-- Migration 039: Drop FK constraint on saved_recipes.recipe_id.
|
||||||
|
--
|
||||||
|
-- In cloud mode the recipe corpus is ATTACHed as a separate database.
|
||||||
|
-- SQLite FK constraints only resolve against the `main` schema, so
|
||||||
|
-- `REFERENCES recipes(id)` was always failing for cloud saves (the
|
||||||
|
-- main.recipes table is empty; all data lives in corpus.recipes).
|
||||||
|
-- The corpus is read-only and never modified by the app, so cascade-on-delete
|
||||||
|
-- is meaningless anyway. Remove the constraint without changing any data.
|
||||||
|
|
||||||
|
PRAGMA foreign_keys = OFF;
|
||||||
|
|
||||||
|
CREATE TABLE saved_recipes_new (
|
||||||
|
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||||
|
recipe_id INTEGER NOT NULL,
|
||||||
|
saved_at TEXT NOT NULL DEFAULT (datetime('now')),
|
||||||
|
notes TEXT,
|
||||||
|
rating INTEGER CHECK (rating IS NULL OR (rating >= 0 AND rating <= 5)),
|
||||||
|
style_tags TEXT NOT NULL DEFAULT '[]',
|
||||||
|
UNIQUE (recipe_id)
|
||||||
|
);
|
||||||
|
|
||||||
|
INSERT INTO saved_recipes_new SELECT * FROM saved_recipes;
|
||||||
|
|
||||||
|
DROP TABLE saved_recipes;
|
||||||
|
|
||||||
|
ALTER TABLE saved_recipes_new RENAME TO saved_recipes;
|
||||||
|
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_saved_recipes_saved_at ON saved_recipes (saved_at DESC);
|
||||||
|
CREATE INDEX IF NOT EXISTS idx_saved_recipes_rating ON saved_recipes (rating);
|
||||||
|
|
||||||
|
PRAGMA foreign_keys = ON;
|
||||||
|
|
@ -513,12 +513,12 @@
|
||||||
<span v-if="recipe.estimated_time_min" class="status-badge status-neutral">~{{ recipe.estimated_time_min }}m</span>
|
<span v-if="recipe.estimated_time_min" class="status-badge status-neutral">~{{ recipe.estimated_time_min }}m</span>
|
||||||
<span class="status-badge status-info">Level {{ recipe.level }}</span>
|
<span class="status-badge status-info">Level {{ recipe.level }}</span>
|
||||||
<span v-if="recipe.is_wildcard" class="status-badge status-info">Wildcard</span>
|
<span v-if="recipe.is_wildcard" class="status-badge status-info">Wildcard</span>
|
||||||
<button
|
<span
|
||||||
v-if="recipe.id"
|
v-if="recipe.id"
|
||||||
:class="['btn-icon', 'btn-bookmark', { active: recipesStore.isBookmarked(recipe.id) }]"
|
:class="['btn-icon', 'btn-bookmark', { active: savedStore.isSaved(recipe.id) }]"
|
||||||
@click="recipesStore.toggleBookmark(recipe)"
|
:aria-label="savedStore.isSaved(recipe.id) ? 'Saved: ' + recipe.title : recipe.title"
|
||||||
:aria-label="recipesStore.isBookmarked(recipe.id) ? 'Remove bookmark: ' + recipe.title : 'Bookmark: ' + recipe.title"
|
:title="savedStore.isSaved(recipe.id) ? 'Saved' : 'Not saved'"
|
||||||
>{{ recipesStore.isBookmarked(recipe.id) ? '★' : '☆' }}</button>
|
>{{ savedStore.isSaved(recipe.id) ? '★' : '☆' }}</span>
|
||||||
<button
|
<button
|
||||||
v-if="recipe.id"
|
v-if="recipe.id"
|
||||||
class="btn-icon btn-dismiss"
|
class="btn-icon btn-dismiss"
|
||||||
|
|
@ -1212,7 +1212,9 @@ onMounted(async () => {
|
||||||
await savedStore.load()
|
await savedStore.load()
|
||||||
})
|
})
|
||||||
|
|
||||||
// If Saved tab is empty after loading, bounce to Build Your Own
|
// If Saved tab is empty after loading, bounce to Build Your Own.
|
||||||
|
// No immediate: true — the immediate fire happens before onMounted runs load(),
|
||||||
|
// so loading=false and count=0 is the initial unloaded state, not "empty after load".
|
||||||
watch(
|
watch(
|
||||||
() => ({ loading: savedStore.loading, count: savedStore.saved.length }),
|
() => ({ loading: savedStore.loading, count: savedStore.saved.length }),
|
||||||
({ loading, count }) => {
|
({ loading, count }) => {
|
||||||
|
|
@ -1220,7 +1222,6 @@ watch(
|
||||||
activeTab.value = 'build'
|
activeTab.value = 'build'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{ immediate: true },
|
|
||||||
)
|
)
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -27,12 +27,15 @@ export const useSavedRecipesStore = defineStore('savedRecipes', () => {
|
||||||
async function load() {
|
async function load() {
|
||||||
loading.value = true
|
loading.value = true
|
||||||
try {
|
try {
|
||||||
const [items, cols] = await Promise.all([
|
// Fetch independently — a collections 403 (Free tier) must not prevent
|
||||||
|
// saved recipes from loading. Backend now returns [] for Free, but guard
|
||||||
|
// here too in case an older API version is deployed.
|
||||||
|
const [itemsResult, colsResult] = await Promise.allSettled([
|
||||||
savedRecipesAPI.list({ sort_by: sortBy.value, collection_id: activeCollectionId.value ?? undefined }),
|
savedRecipesAPI.list({ sort_by: sortBy.value, collection_id: activeCollectionId.value ?? undefined }),
|
||||||
savedRecipesAPI.listCollections(),
|
savedRecipesAPI.listCollections(),
|
||||||
])
|
])
|
||||||
saved.value = items
|
if (itemsResult.status === 'fulfilled') saved.value = itemsResult.value
|
||||||
collections.value = cols
|
if (colsResult.status === 'fulfilled') collections.value = colsResult.value
|
||||||
} finally {
|
} finally {
|
||||||
loading.value = false
|
loading.value = false
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue