Hermetiska integrationstester + auto-hushall i onboarding (size, i18n, locations)

This commit is contained in:
Sven (AAMOS AI)
2026-08-06 22:06:11 +07:00
parent dd66ebedbf
commit 3696aadf98
12 changed files with 9079 additions and 44 deletions
+35
View File
@@ -47,6 +47,41 @@ export async function requireMembership(
return { role: member.role, portionFactor: member.portionFactor };
}
/** Skapa hushåll med standard-förvaringsplatser (spec §78). Återanvänds av
* både POST /v1/households och onboarding auto-create. */
export async function createHouseholdWithDefaults(
db: Database,
{
userId,
name,
size,
}: {
userId: string;
name: string;
size?: number;
},
): Promise<{ id: string; name: string }> {
const [household] = await db
.insert(schema.households)
.values({
name,
inviteCode: generateInviteCode(),
size: size ?? null,
})
.returning();
await db.insert(schema.householdMembers).values({
householdId: household!.id,
userId,
role: "owner",
});
await db.insert(schema.storageLocations).values([
{ householdId: household!.id, type: "fridge", name: "Kylen", sortOrder: 0 },
{ householdId: household!.id, type: "freezer", name: "Frysen", sortOrder: 1 },
{ householdId: household!.id, type: "pantry", name: "Skafferiet", sortOrder: 2 },
]);
return { id: household!.id, name: household!.name };
}
/** Hämta användarens aktiva hushåll (första medlemskapet) eller null. */
export async function getActiveHouseholdId(db: Database, userId: string): Promise<string | null> {
const [member] = await db
+31
View File
@@ -0,0 +1,31 @@
import { readFileSync } from "node:fs";
import path from "node:path";
import { fileURLToPath } from "node:url";
const __dirname = path.dirname(fileURLToPath(import.meta.url));
const cache: Record<string, Record<string, string>> = {};
/**
* Minimal server-side i18n lookup into the mobile app's common.json files.
* Falls back to the requested key if the translation is missing.
*/
export function t(key: string, languageTag: string): string {
const lang = (languageTag.split("-")[0] ?? languageTag).toLowerCase();
let dict = cache[lang];
if (!dict) {
try {
const file = path.resolve(
__dirname,
"../../../../apps/mobile/src/locales",
lang,
"common.json",
);
dict = JSON.parse(readFileSync(file, "utf8")) as Record<string, string>;
} catch {
dict = {};
}
cache[lang] = dict;
}
return dict[key] ?? key;
}
+21 -18
View File
@@ -13,7 +13,13 @@ import {
} from "@app/validation";
import { loadEntitlements } from "../lib/entitlements.js";
import { errors, parse } from "../lib/errors.js";
import { audit, emitEvent, generateInviteCode, requireMembership } from "../lib/helpers.js";
import {
audit,
createHouseholdWithDefaults,
emitEvent,
generateInviteCode,
requireMembership,
} from "../lib/helpers.js";
/** Hushåll (spec §7): delat lager/plan/lista, individuella mål och roller. */
export async function householdRoutes(app: FastifyInstance) {
@@ -34,23 +40,20 @@ export async function householdRoutes(app: FastifyInstance) {
app.post("/v1/households", auth, async (req, reply) => {
const input = parse(createHouseholdInputSchema, req.body);
const [household] = await app.db
.insert(schema.households)
.values({
name: input.name,
inviteCode: generateInviteCode(),
weeklyBudgetMinor: input.weeklyBudgetMinor ?? null,
...(input.currencyCode ? { currencyCode: input.currencyCode } : {}),
})
.returning();
await app.db
.insert(schema.householdMembers)
.values({ householdId: household!.id, userId: req.userId, role: "owner" });
await app.db.insert(schema.storageLocations).values([
{ householdId: household!.id, type: "fridge", name: "Kylen", sortOrder: 0 },
{ householdId: household!.id, type: "freezer", name: "Frysen", sortOrder: 1 },
{ householdId: household!.id, type: "pantry", name: "Skafferiet", sortOrder: 2 },
]);
const household = await createHouseholdWithDefaults(app.db, {
userId: req.userId,
name: input.name,
});
if (input.weeklyBudgetMinor != null || input.currencyCode) {
await app.db
.update(schema.households)
.set({
weeklyBudgetMinor: input.weeklyBudgetMinor ?? null,
...(input.currencyCode ? { currencyCode: input.currencyCode } : {}),
updatedAt: new Date(),
})
.where(eq(schema.households.id, household.id));
}
return reply.status(201).send(household);
});
+41 -18
View File
@@ -4,7 +4,13 @@ import { z } from "zod";
import { schema } from "@app/database";
import { quickStartInputSchema, onboardingInputSchema } from "@app/validation";
import { errors, parse } from "../lib/errors.js";
import { audit, generateInviteCode, getActiveHouseholdId } from "../lib/helpers.js";
import {
audit,
createHouseholdWithDefaults,
getActiveHouseholdId,
} from "../lib/helpers.js";
import { t } from "../lib/i18n.js";
import { KNOWN_FLAGS } from "@app/feature-flags";
/**
@@ -87,6 +93,24 @@ export async function onboardingRoutes(app: FastifyInstance) {
},
});
// Auto-create a household so the user can scan, shop, plan and budget
// immediately instead of hitting the "no household" wall in 21 endpoints.
let householdId = await getActiveHouseholdId(app.db, req.userId);
if (!householdId) {
const [user] = await app.db
.select({ locale: schema.users.locale })
.from(schema.users)
.where(eq(schema.users.id, req.userId))
.limit(1);
const householdName = t("onboarding.householdDefaultName", user?.locale ?? "sv-SE");
const household = await createHouseholdWithDefaults(app.db, {
userId: req.userId,
name: householdName,
size: input.persons,
});
householdId = household.id;
}
// Advance to step B
const [user] = await app.db
.update(schema.users)
@@ -101,7 +125,7 @@ export async function onboardingRoutes(app: FastifyInstance) {
await audit(app.db, {
actorUserId: req.userId,
action: "onboarding.quick_start",
metadata: { goals, primaryGoal, precisionMode: input.precisionMode },
metadata: { goals, primaryGoal, precisionMode: input.precisionMode, householdId },
ip: req.ip,
correlationId: req.correlationId,
});
@@ -110,6 +134,7 @@ export async function onboardingRoutes(app: FastifyInstance) {
ok: true,
step: user!.onboardingStep,
onboardingCompleted: user!.onboardingCompleted,
householdId,
};
});
@@ -128,22 +153,20 @@ export async function onboardingRoutes(app: FastifyInstance) {
}
let householdId: string | null = await getActiveHouseholdId(app.db, req.userId);
if (input.householdChoice.kind === "create" && !householdId) {
const [household] = await app.db
.insert(schema.households)
.values({ name: input.householdChoice.name, inviteCode: generateInviteCode() })
.returning();
await app.db.insert(schema.householdMembers).values({
householdId: household!.id,
userId: req.userId,
role: "owner",
});
await app.db.insert(schema.storageLocations).values([
{ householdId: household!.id, type: "fridge", name: "Kylen", sortOrder: 0 },
{ householdId: household!.id, type: "freezer", name: "Frysen", sortOrder: 1 },
{ householdId: household!.id, type: "pantry", name: "Skafferiet", sortOrder: 2 },
]);
householdId = household!.id;
if (input.householdChoice.kind === "create") {
if (householdId) {
// Auto-created household already exists; update name if user provided a custom one.
await app.db
.update(schema.households)
.set({ name: input.householdChoice.name, updatedAt: new Date() })
.where(eq(schema.households.id, householdId));
} else {
const household = await createHouseholdWithDefaults(app.db, {
userId: req.userId,
name: input.householdChoice.name,
});
householdId = household.id;
}
} else if (input.householdChoice.kind === "join") {
const [household] = await app.db
.select()