Fas 2 steg 3: Household Trust Score (admin + i18n status i appen)
This commit is contained in:
@@ -1,11 +1,12 @@
|
||||
import type { FastifyInstance } from "fastify";
|
||||
import { and, desc, eq, ilike, sql } from "drizzle-orm";
|
||||
import { and, desc, eq, ilike, isNull, sql } from "drizzle-orm";
|
||||
import { schema } from "@app/database";
|
||||
import { z } from "zod";
|
||||
import { adminGrantInputSchema, totpCodeInputSchema } from "@app/validation";
|
||||
import { errors, parse } from "../lib/errors.js";
|
||||
import { audit } from "../lib/helpers.js";
|
||||
import { generateTotpSecret, otpauthUrl, verifyTotp } from "../lib/totp.js";
|
||||
import { householdTrustScore } from "@app/inventory-engine";
|
||||
import { BRAND } from "@app/shared-types";
|
||||
|
||||
/** Adminpanelens API (spec §57). Alla anrop kräver admin-roll och auditloggas. */
|
||||
@@ -167,6 +168,58 @@ export async function adminRoutes(app: FastifyInstance) {
|
||||
return sub;
|
||||
});
|
||||
|
||||
// --- Household trust score (Fas 2 §5.3) ---
|
||||
app.get("/admin/v1/households/:id/trust", admin, async (req) => {
|
||||
const params = z.object({ id: z.uuid() }).parse(req.params);
|
||||
|
||||
const items = await app.db
|
||||
.select()
|
||||
.from(schema.inventoryItems)
|
||||
.where(
|
||||
and(
|
||||
eq(schema.inventoryItems.householdId, params.id),
|
||||
isNull(schema.inventoryItems.depletedAt),
|
||||
),
|
||||
);
|
||||
|
||||
const thirtyDaysAgo = new Date(Date.now() - 30 * 86_400_000);
|
||||
const txStats = await app.db
|
||||
.select({
|
||||
total: sql<number>`count(*)`,
|
||||
adjustments: sql<number>`count(*) FILTER (WHERE ${schema.inventoryTransactions.type} = 'adjust')`,
|
||||
})
|
||||
.from(schema.inventoryTransactions)
|
||||
.where(
|
||||
and(
|
||||
eq(schema.inventoryTransactions.householdId, params.id),
|
||||
sql`${schema.inventoryTransactions.createdAt} >= ${thirtyDaysAgo}`,
|
||||
),
|
||||
);
|
||||
|
||||
const result = householdTrustScore(
|
||||
{
|
||||
items: items.map((i) => ({
|
||||
confidence: i.confidence,
|
||||
verifiedByUser: i.verifiedByUser,
|
||||
lastVerifiedAt: i.lastVerifiedAt,
|
||||
quantity: i.quantity,
|
||||
updatedAt: i.updatedAt,
|
||||
depletedAt: i.depletedAt,
|
||||
})),
|
||||
correctionCount30d: Number(txStats[0]?.adjustments ?? 0),
|
||||
transactionCount30d: Number(txStats[0]?.total ?? 0),
|
||||
},
|
||||
new Date(),
|
||||
);
|
||||
|
||||
return {
|
||||
householdId: params.id,
|
||||
score: result.score,
|
||||
status: result.status,
|
||||
itemCount: items.length,
|
||||
};
|
||||
});
|
||||
|
||||
// --- Jobb & systemhälsa (spec §57–58) ---
|
||||
app.get("/admin/v1/jobs/overview", admin, async () => {
|
||||
const scanStats = await app.db
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import type { FastifyInstance } from "fastify";
|
||||
import { and, desc, eq, gt, ilike, isNull, or } from "drizzle-orm";
|
||||
import { and, desc, eq, gt, ilike, isNull, or, sql } from "drizzle-orm";
|
||||
import { schema } from "@app/database";
|
||||
import {
|
||||
createInventoryItemInputSchema,
|
||||
@@ -8,9 +8,20 @@ import {
|
||||
inventoryTransactionInputSchema,
|
||||
updateInventoryItemInputSchema,
|
||||
} from "@app/validation";
|
||||
import { classifyExpiry, findDuplicateCandidates, normalizeDelta, computeTrust } from "@app/inventory-engine";
|
||||
import {
|
||||
classifyExpiry,
|
||||
findDuplicateCandidates,
|
||||
normalizeDelta,
|
||||
computeTrust,
|
||||
householdTrustScore,
|
||||
} from "@app/inventory-engine";
|
||||
import { errors, parse } from "../lib/errors.js";
|
||||
import { emitEvent, getActiveDecayProfile, requireActiveHousehold, requireMembership } from "../lib/helpers.js";
|
||||
import {
|
||||
emitEvent,
|
||||
getActiveDecayProfile,
|
||||
requireActiveHousehold,
|
||||
requireMembership,
|
||||
} from "../lib/helpers.js";
|
||||
|
||||
/**
|
||||
* Food Twin – lagret (spec §8). Transaktionsbaserat: varje förändring skrivs
|
||||
@@ -98,7 +109,34 @@ export async function inventoryRoutes(app: FastifyInstance) {
|
||||
const filtered = query.expiryStatus
|
||||
? items.filter((i) => i.expiry.status === query.expiryStatus)
|
||||
: items;
|
||||
return { items: filtered };
|
||||
|
||||
const thirtyDaysAgo = new Date(Date.now() - 30 * 86_400_000);
|
||||
const txStats = await app.db
|
||||
.select({
|
||||
total: sql<number>`count(*)`,
|
||||
adjustments: sql<number>`count(*) FILTER (WHERE ${schema.inventoryTransactions.type} = 'adjust')`,
|
||||
})
|
||||
.from(schema.inventoryTransactions)
|
||||
.where(
|
||||
and(
|
||||
eq(schema.inventoryTransactions.householdId, householdId),
|
||||
sql`${schema.inventoryTransactions.createdAt} >= ${thirtyDaysAgo}`,
|
||||
),
|
||||
);
|
||||
|
||||
const householdTrust = householdTrustScore(
|
||||
{
|
||||
items: rows.map((r) => r.item),
|
||||
correctionCount30d: Number(txStats[0]?.adjustments ?? 0),
|
||||
transactionCount30d: Number(txStats[0]?.total ?? 0),
|
||||
},
|
||||
new Date(),
|
||||
);
|
||||
|
||||
return {
|
||||
items: filtered,
|
||||
trustStatus: householdTrust.status,
|
||||
};
|
||||
});
|
||||
|
||||
/** Varor som bör användas snart – driver "använd först" (spec §4.4, §40). */
|
||||
|
||||
@@ -0,0 +1,83 @@
|
||||
import "./setup-env.js";
|
||||
import { describe, expect, it, beforeAll, afterAll } from "vitest";
|
||||
import { eq, inArray } from "drizzle-orm";
|
||||
import { buildServer } from "../src/server.js";
|
||||
import { loadConfig } from "../src/config.js";
|
||||
import { createDatabase, closeDatabase, schema } from "@app/database";
|
||||
|
||||
describe("admin household trust score", () => {
|
||||
const testDb = createDatabase(process.env.TEST_DATABASE_URL!);
|
||||
const config = loadConfig();
|
||||
let app: Awaited<ReturnType<typeof buildServer>>;
|
||||
let adminToken: string;
|
||||
let householdId: string;
|
||||
const adminEmail = "admin-trust@example.invalid";
|
||||
|
||||
async function cleanup() {
|
||||
const existing = await testDb.db
|
||||
.select({ id: schema.users.id })
|
||||
.from(schema.users)
|
||||
.where(inArray(schema.users.email, [adminEmail]));
|
||||
for (const u of existing) {
|
||||
await testDb.db.delete(schema.inventoryTransactions).where(eq(schema.inventoryTransactions.actorUserId, u.id));
|
||||
const owned = await testDb.db
|
||||
.select({ id: schema.households.id })
|
||||
.from(schema.households)
|
||||
.innerJoin(schema.householdMembers, eq(schema.householdMembers.householdId, schema.households.id))
|
||||
.where(eq(schema.householdMembers.userId, u.id));
|
||||
for (const h of owned) {
|
||||
await testDb.db.delete(schema.inventoryItems).where(eq(schema.inventoryItems.householdId, h.id));
|
||||
await testDb.db.delete(schema.storageLocations).where(eq(schema.storageLocations.householdId, h.id));
|
||||
await testDb.db.delete(schema.households).where(eq(schema.households.id, h.id));
|
||||
}
|
||||
await testDb.db.delete(schema.householdMembers).where(eq(schema.householdMembers.userId, u.id));
|
||||
await testDb.db.delete(schema.userPreferences).where(eq(schema.userPreferences.userId, u.id));
|
||||
await testDb.db.delete(schema.users).where(eq(schema.users.id, u.id));
|
||||
}
|
||||
}
|
||||
|
||||
beforeAll(async () => {
|
||||
await cleanup();
|
||||
app = await buildServer(config);
|
||||
await app.ready();
|
||||
|
||||
const res = await app.inject({
|
||||
method: "POST",
|
||||
url: "/v1/auth/register",
|
||||
payload: { email: adminEmail, password: "Password123!", displayName: "Admin Trust" },
|
||||
});
|
||||
const body = JSON.parse(res.body) as { accessToken: string };
|
||||
adminToken = body.accessToken;
|
||||
const userId = (JSON.parse(atob(adminToken.split(".")[1]!)) as { sub: string }).sub;
|
||||
|
||||
await testDb.db.update(schema.users).set({ role: "admin" }).where(eq(schema.users.id, userId));
|
||||
|
||||
const quick = await app.inject({
|
||||
method: "POST",
|
||||
url: "/v1/onboarding/quick-start",
|
||||
headers: { authorization: `Bearer ${adminToken}` },
|
||||
payload: { goals: ["cook_more"], precisionMode: "simple" },
|
||||
});
|
||||
householdId = (JSON.parse(quick.body) as { householdId: string }).householdId;
|
||||
});
|
||||
|
||||
afterAll(async () => {
|
||||
await cleanup();
|
||||
await closeDatabase();
|
||||
await app.close();
|
||||
});
|
||||
|
||||
it("returns numeric score and status for admin", async () => {
|
||||
const res = await app.inject({
|
||||
method: "GET",
|
||||
url: `/admin/v1/households/${householdId}/trust`,
|
||||
headers: { authorization: `Bearer ${adminToken}` },
|
||||
});
|
||||
expect(res.statusCode).toBe(200);
|
||||
const body = JSON.parse(res.body) as { householdId: string; score: number; status: string; itemCount: number };
|
||||
expect(body.householdId).toBe(householdId);
|
||||
expect(typeof body.score).toBe("number");
|
||||
expect(["up_to_date", "needs_check", "uncertain"]).toContain(body.status);
|
||||
expect(body.itemCount).toBe(0);
|
||||
});
|
||||
});
|
||||
@@ -40,7 +40,7 @@ interface BudgetSummary {
|
||||
export default function HomeScreen() {
|
||||
const inventory = useQuery({
|
||||
queryKey: ["inventory"],
|
||||
queryFn: () => api<{ items: InventoryItem[] }>("/v1/inventory?limit=100"),
|
||||
queryFn: () => api<{ items: InventoryItem[]; trustStatus?: "up_to_date" | "needs_check" | "uncertain" }>("/v1/inventory?limit=100"),
|
||||
});
|
||||
const expiring = useQuery({
|
||||
queryKey: ["inventory-expiring"],
|
||||
@@ -64,9 +64,16 @@ export default function HomeScreen() {
|
||||
grouped.set(item.locationName, list);
|
||||
}
|
||||
|
||||
const trustStatus = inventory.data?.trustStatus;
|
||||
|
||||
return (
|
||||
<Screen>
|
||||
<Title>{t("home.title")}</Title>
|
||||
{trustStatus && (
|
||||
<Small style={{ marginBottom: spacing.xs, opacity: 0.8 }}>
|
||||
{t(`home.trustStatus.${trustStatus}`)}
|
||||
</Small>
|
||||
)}
|
||||
|
||||
<Row>
|
||||
<QuickLink label={t("home.shopping")} glyph="🛒" onPress={() => router.push("/shopping")} />
|
||||
|
||||
@@ -9,6 +9,7 @@ import {
|
||||
View,
|
||||
type StyleProp,
|
||||
type TextInputProps,
|
||||
type TextStyle,
|
||||
type ViewStyle,
|
||||
} from "react-native";
|
||||
import { SafeAreaView } from "react-native-safe-area-context";
|
||||
@@ -46,8 +47,8 @@ export function Heading({ children }: { children: ReactNode }) {
|
||||
export function Body({ children, muted = false }: { children: ReactNode; muted?: boolean }) {
|
||||
return <Text style={[typography.body, muted && { color: colors.textMuted }]}>{children}</Text>;
|
||||
}
|
||||
export function Small({ children }: { children: ReactNode }) {
|
||||
return <Text style={typography.small}>{children}</Text>;
|
||||
export function Small({ children, style }: { children: ReactNode; style?: StyleProp<TextStyle> }) {
|
||||
return <Text style={[typography.small, style]}>{children}</Text>;
|
||||
}
|
||||
|
||||
export function Card({
|
||||
|
||||
@@ -346,5 +346,8 @@
|
||||
"wte.subtitle": "Ud fra hvad I har derhjemme, hvad der snart skal bruges, og hvad I kan lide.",
|
||||
"wte.title": "Hvad skal vi spise?",
|
||||
"wte.whyTitle": "Hvorfor dette forslag?",
|
||||
"onboarding.primaryGoal": "Primært"
|
||||
"onboarding.primaryGoal": "Primært",
|
||||
"home.trustStatus.up_to_date": "Opdateret",
|
||||
"home.trustStatus.needs_check": "Nogle varer skal tjekkes",
|
||||
"home.trustStatus.uncertain": "Lageret er usikkert – lav en hurtig tjek"
|
||||
}
|
||||
|
||||
@@ -346,5 +346,8 @@
|
||||
"wte.subtitle": "Basierend auf dem, was ihr zuhause habt, was bald verbraucht werden sollte und was ihr mögt.",
|
||||
"wte.title": "Was essen wir?",
|
||||
"wte.whyTitle": "Warum dieser Vorschlag?",
|
||||
"onboarding.primaryGoal": "Primär"
|
||||
"onboarding.primaryGoal": "Primär",
|
||||
"home.trustStatus.up_to_date": "Aktuell",
|
||||
"home.trustStatus.needs_check": "Einige Artikel müssen geprüft werden",
|
||||
"home.trustStatus.uncertain": "Bestand unsicher – schnelle Kontrolle empfohlen"
|
||||
}
|
||||
|
||||
@@ -346,5 +346,8 @@
|
||||
"wte.subtitle": "Based on what you have at home, what should be used up, and what you like.",
|
||||
"wte.title": "What's for dinner?",
|
||||
"wte.whyTitle": "Why this suggestion?",
|
||||
"onboarding.primaryGoal": "Primary"
|
||||
"onboarding.primaryGoal": "Primary",
|
||||
"home.trustStatus.up_to_date": "Up to date",
|
||||
"home.trustStatus.needs_check": "Some items need checking",
|
||||
"home.trustStatus.uncertain": "Inventory uncertain – do a quick check"
|
||||
}
|
||||
|
||||
@@ -346,5 +346,8 @@
|
||||
"wte.subtitle": "Según lo que tenéis en casa, lo que conviene usar pronto y lo que os gusta.",
|
||||
"wte.title": "¿Qué comemos?",
|
||||
"wte.whyTitle": "¿Por qué esta sugerencia?",
|
||||
"onboarding.primaryGoal": "Principal"
|
||||
"onboarding.primaryGoal": "Principal",
|
||||
"home.trustStatus.up_to_date": "Actualizado",
|
||||
"home.trustStatus.needs_check": "Algunos productos necesitan revisión",
|
||||
"home.trustStatus.uncertain": "Inventario incierto – haz una revisión rápida"
|
||||
}
|
||||
|
||||
@@ -346,5 +346,8 @@
|
||||
"wte.subtitle": "Sen mukaan mitä kotona on, mikä pitäisi käyttää pian ja mistä pidätte.",
|
||||
"wte.title": "Mitä syödään?",
|
||||
"wte.whyTitle": "Miksi tämä ehdotus?",
|
||||
"onboarding.primaryGoal": "Ensisijainen"
|
||||
"onboarding.primaryGoal": "Ensisijainen",
|
||||
"home.trustStatus.up_to_date": "Ajan tasalla",
|
||||
"home.trustStatus.needs_check": "Joitakin tuotteita on tarkistettava",
|
||||
"home.trustStatus.uncertain": "Varasto epävarma – tee pikatarkistus"
|
||||
}
|
||||
|
||||
@@ -346,5 +346,8 @@
|
||||
"wte.subtitle": "Selon ce que vous avez chez vous, ce qu'il faut consommer vite et vos goûts.",
|
||||
"wte.title": "On mange quoi ?",
|
||||
"wte.whyTitle": "Pourquoi cette suggestion ?",
|
||||
"onboarding.primaryGoal": "Principal"
|
||||
"onboarding.primaryGoal": "Principal",
|
||||
"home.trustStatus.up_to_date": "À jour",
|
||||
"home.trustStatus.needs_check": "Certains articles doivent être vérifiés",
|
||||
"home.trustStatus.uncertain": "Inventaire incertain – faites un rapide contrôle"
|
||||
}
|
||||
|
||||
@@ -346,5 +346,8 @@
|
||||
"wte.subtitle": "In base a ciò che avete in casa, a cosa va consumato presto e ai vostri gusti.",
|
||||
"wte.title": "Cosa mangiamo?",
|
||||
"wte.whyTitle": "Perché questo suggerimento?",
|
||||
"onboarding.primaryGoal": "Primario"
|
||||
"onboarding.primaryGoal": "Primario",
|
||||
"home.trustStatus.up_to_date": "Aggiornato",
|
||||
"home.trustStatus.needs_check": "Alcuni articoli devono essere controllati",
|
||||
"home.trustStatus.uncertain": "Inventario incerto – fai un controllo rapido"
|
||||
}
|
||||
|
||||
@@ -346,5 +346,8 @@
|
||||
"wte.subtitle": "Basert på hva dere har hjemme, hva som snart bør brukes, og hva dere liker.",
|
||||
"wte.title": "Hva skal vi spise?",
|
||||
"wte.whyTitle": "Hvorfor dette forslaget?",
|
||||
"onboarding.primaryGoal": "Primært"
|
||||
"onboarding.primaryGoal": "Primært",
|
||||
"home.trustStatus.up_to_date": "Oppdatert",
|
||||
"home.trustStatus.needs_check": "Noen varer må sjekkes",
|
||||
"home.trustStatus.uncertain": "Lageret er usikkert – gjør en rask sjekk"
|
||||
}
|
||||
|
||||
@@ -346,5 +346,8 @@
|
||||
"wte.subtitle": "Op basis van wat jullie in huis hebben, wat snel op moet en wat jullie lekker vinden.",
|
||||
"wte.title": "Wat eten we?",
|
||||
"wte.whyTitle": "Waarom deze suggestie?",
|
||||
"onboarding.primaryGoal": "Primair"
|
||||
"onboarding.primaryGoal": "Primair",
|
||||
"home.trustStatus.up_to_date": "Bijgewerkt",
|
||||
"home.trustStatus.needs_check": "Sommige items moeten worden gecontroleerd",
|
||||
"home.trustStatus.uncertain": "Voorraad onzeker – doe een snelle controle"
|
||||
}
|
||||
|
||||
@@ -360,5 +360,8 @@
|
||||
"wte.subtitle": "Na podstawie tego, co macie w domu, co trzeba wkrótce zużyć i co lubicie.",
|
||||
"wte.title": "Co jemy?",
|
||||
"wte.whyTitle": "Dlaczego ta propozycja?",
|
||||
"onboarding.primaryGoal": "Główny"
|
||||
"onboarding.primaryGoal": "Główny",
|
||||
"home.trustStatus.up_to_date": "Aktualne",
|
||||
"home.trustStatus.needs_check": "Niektóre produkty wymagają sprawdzenia",
|
||||
"home.trustStatus.uncertain": "Stan niepewny – zrób szybką kontrolę"
|
||||
}
|
||||
|
||||
@@ -346,5 +346,8 @@
|
||||
"wte.subtitle": "Com base no que têm em casa, no que deve ser usado em breve e no que gostam.",
|
||||
"wte.title": "O que vamos comer?",
|
||||
"wte.whyTitle": "Porquê esta sugestão?",
|
||||
"onboarding.primaryGoal": "Principal"
|
||||
"onboarding.primaryGoal": "Principal",
|
||||
"home.trustStatus.up_to_date": "Atualizado",
|
||||
"home.trustStatus.needs_check": "Alguns itens precisam de verificação",
|
||||
"home.trustStatus.uncertain": "Inventário incerto – faça uma verificação rápida"
|
||||
}
|
||||
|
||||
@@ -346,5 +346,8 @@
|
||||
"wte.subtitle": "Utifrån vad ni har hemma, vad som bör användas och vad ni gillar.",
|
||||
"wte.title": "Vad ska vi äta?",
|
||||
"wte.whyTitle": "Varför detta förslag?",
|
||||
"onboarding.primaryGoal": "Primärt"
|
||||
"onboarding.primaryGoal": "Primärt",
|
||||
"home.trustStatus.up_to_date": "Uppdaterat",
|
||||
"home.trustStatus.needs_check": "Några varor behöver kontrolleras",
|
||||
"home.trustStatus.uncertain": "Lagret är osäkert – gör en snabbkoll"
|
||||
}
|
||||
|
||||
@@ -210,7 +210,7 @@ async function registerRepeatableJobs() {
|
||||
);
|
||||
await queue.upsertJobScheduler(
|
||||
"scheduler-trust",
|
||||
{ every: 300_000 },
|
||||
{ every: 6 * 60 * 60 * 1000 }, // var 6:e timme; decay lever på dygnsskala
|
||||
{ name: "UPDATE_TRUST_STATES", data: { jobType: "UPDATE_TRUST_STATES" }, opts: baseOpts },
|
||||
);
|
||||
await queue.upsertJobScheduler(
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { and, eq, gt, inArray, isNull, lte, sql } from "drizzle-orm";
|
||||
import { and, asc, eq, gt, inArray, isNull, lte, sql } from "drizzle-orm";
|
||||
import { schema } from "@app/database";
|
||||
import { classifyExpiry, computeTrust } from "@app/inventory-engine";
|
||||
import { deriveMemoryUpdates } from "@app/memory-client";
|
||||
@@ -57,6 +57,7 @@ export async function processTrustDecay(ctx: WorkerContext): Promise<number> {
|
||||
.select()
|
||||
.from(schema.inventoryItems)
|
||||
.where(and(isNull(schema.inventoryItems.depletedAt), gt(schema.inventoryItems.quantity, 0)))
|
||||
.orderBy(asc(schema.inventoryItems.updatedAt))
|
||||
.limit(500);
|
||||
|
||||
let updated = 0;
|
||||
|
||||
Reference in New Issue
Block a user