fix: recipe/storage tier limits are lifetime totals, not monthly (v0.58.0)
Recipe count and storage usage shared the monthly user_usage bucket with AI calls, so both incorrectly reset every month even though nothing was deleted. Only AI calls should be monthly. Recipe count and storage are now derived live from real data (recipes, recipe/review photos, avatar) instead of a counter — deleting a photo or recipe is itself the "decrement", no extra wiring needed. Storage size is tracked per-row (recipePhotos.sizeMb, ratings.photoSizeMb, users.avatarSizeMb) and threaded through presign -> upload -> save. Also fixes avatar removal silently no-oping (client sent a field the PATCH schema didn't recognize). Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
@@ -70,6 +70,7 @@ export default async function EditRecipePage({ params }: Params) {
|
||||
key: photo.storageKey,
|
||||
isCover: photo.isCover,
|
||||
preview: getPublicUrl(photo.storageKey),
|
||||
sizeMb: photo.sizeMb,
|
||||
})),
|
||||
coverIcon: recipe.coverIcon,
|
||||
coverColor: recipe.coverColor,
|
||||
|
||||
@@ -2,7 +2,7 @@ import type { Metadata } from "next";
|
||||
import { headers } from "next/headers";
|
||||
import { auth } from "@/lib/auth/server";
|
||||
import { db, userAiKeys, userModelPrefs, users, tierDefinitions, userUsage, eq, and } from "@epicure/db";
|
||||
import { UNLIMITED } from "@/lib/tiers";
|
||||
import { UNLIMITED, getRecipeCount, getStorageUsedMb } from "@/lib/tiers";
|
||||
import { ByokManager } from "@/components/settings/byok-manager";
|
||||
import { ModelPrefsForm } from "@/components/settings/model-prefs-form";
|
||||
import { UsageQuotaSection } from "@/components/settings/usage-quota-section";
|
||||
@@ -30,9 +30,11 @@ export default async function AiSettingsPage() {
|
||||
db.query.users.findFirst({ where: eq(users.id, session.user.id), columns: { tier: true } }),
|
||||
]);
|
||||
|
||||
const [tierDef, usage] = await Promise.all([
|
||||
const [tierDef, usage, recipeCount, storageUsedMb] = await Promise.all([
|
||||
db.query.tierDefinitions.findFirst({ where: eq(tierDefinitions.tier, dbUser?.tier ?? "free") }),
|
||||
db.query.userUsage.findFirst({ where: and(eq(userUsage.userId, session.user.id), eq(userUsage.month, currentMonth)) }),
|
||||
getRecipeCount(session.user.id),
|
||||
getStorageUsedMb(session.user.id),
|
||||
]);
|
||||
|
||||
const asLimit = (n: number | undefined) => (n === undefined || n === UNLIMITED ? null : n);
|
||||
@@ -46,13 +48,13 @@ export default async function AiSettingsPage() {
|
||||
},
|
||||
{
|
||||
label: m.settings.usage.recipes,
|
||||
used: usage?.recipeCount ?? 0,
|
||||
used: recipeCount,
|
||||
limit: asLimit(tierDef?.maxRecipes),
|
||||
unlimitedLabel: m.settings.usage.unlimited,
|
||||
},
|
||||
{
|
||||
label: m.settings.usage.storage,
|
||||
used: usage?.storageUsedMb ?? 0,
|
||||
used: storageUsedMb,
|
||||
limit: asLimit(tierDef?.storageMb),
|
||||
unit: " MB",
|
||||
unlimitedLabel: m.settings.usage.unlimited,
|
||||
|
||||
Reference in New Issue
Block a user