fix: task-4 review round 1 (soon-constant, computed status, id guard)
This commit is contained in:
1 parent
660d6cff51
commit
c86ec8bd36
5 files changed
+21
-18
No files matched your search
@@ -3,18 +3,22 @@ import { getDb } from "@/lib/db";
|
||||
|
||||
export async function GET(_req: NextRequest, { params }: { params: Promise<{ id: string }> }) {
|
||||
const { id } = await params;
|
||||
const numId = Number(id);
|
||||
if (!Number.isInteger(numId)) return NextResponse.json({ error: "not found" }, { status: 404 });
|
||||
const db = getDb();
|
||||
const v = await db.voucher.findUnique({ where: { id: Number(id) } });
|
||||
const v = await db.voucher.findUnique({ where: { id: numId } });
|
||||
if (!v) return NextResponse.json({ error: "not found" }, { status: 404 });
|
||||
return NextResponse.json(v);
|
||||
}
|
||||
|
||||
export async function POST(req: NextRequest, { params }: { params: Promise<{ id: string }> }) {
|
||||
const { id } = await params;
|
||||
const numId = Number(id);
|
||||
if (!Number.isInteger(numId)) return NextResponse.json({ error: "not found" }, { status: 404 });
|
||||
const body = await req.json().catch(() => ({}));
|
||||
if (body.action !== "redeem") return NextResponse.json({ error: "unknown action" }, { status: 400 });
|
||||
const db = getDb();
|
||||
const v = await db.voucher.findUnique({ where: { id: Number(id) } });
|
||||
const v = await db.voucher.findUnique({ where: { id: numId } });
|
||||
if (!v) return NextResponse.json({ error: "not found" }, { status: 404 });
|
||||
const updated = await db.voucher.update({ where: { id: v.id }, data: { status: "eingeloest", restCents: 0 } });
|
||||
return NextResponse.json(updated);
|
||||
|
||||
@@ -1,25 +1,17 @@
|
||||
import { NextRequest, NextResponse } from "next/server";
|
||||
import { getDb } from "@/lib/db";
|
||||
import { getVoucherStatus } from "@/lib/voucher-status";
|
||||
import { validateVoucher } from "@/lib/vouchers";
|
||||
import { validateVoucher, isExpiringSoon } from "@/lib/vouchers";
|
||||
|
||||
export async function GET(req: NextRequest) {
|
||||
const filter = req.nextUrl.searchParams.get("filter");
|
||||
const db = getDb();
|
||||
const all = await db.voucher.findMany({ orderBy: { createdAt: "desc" } });
|
||||
const now = Date.now();
|
||||
const in14d = now + 14 * 24 * 3600 * 1000;
|
||||
const filtered = all.filter((v) => {
|
||||
const s = getVoucherStatus(v);
|
||||
if (filter === "eingeloest") return s === "eingeloest";
|
||||
if (filter === "abgelaufen") return s === "abgelaufen";
|
||||
if (filter === "bald")
|
||||
return (
|
||||
s === "aktiv" &&
|
||||
v.ablaufdatum &&
|
||||
new Date(v.ablaufdatum).getTime() >= now &&
|
||||
new Date(v.ablaufdatum).getTime() <= in14d
|
||||
);
|
||||
if (filter === "bald") return s === "aktiv" && isExpiringSoon(v.ablaufdatum);
|
||||
if (filter === "aktiv") return s === "aktiv";
|
||||
return true;
|
||||
});
|
||||
|
||||
+2
-5
@@ -2,7 +2,7 @@ import Link from "next/link";
|
||||
import { Suspense } from "react";
|
||||
import { getDb } from "@/lib/db";
|
||||
import { getVoucherStatus } from "@/lib/voucher-status";
|
||||
import { formatEuro } from "@/lib/vouchers";
|
||||
import { formatEuro, isExpiringSoon } from "@/lib/vouchers";
|
||||
|
||||
const FILTERS = [
|
||||
{ key: "", label: "Alle" },
|
||||
@@ -28,14 +28,11 @@ function Skeleton() {
|
||||
async function VoucherList({ filter }: { filter: string }) {
|
||||
const db = getDb();
|
||||
const all = await db.voucher.findMany({ orderBy: { createdAt: "desc" } });
|
||||
const now = Date.now();
|
||||
const in14d = now + 14 * 24 * 3600 * 1000;
|
||||
const filtered = all.filter((v) => {
|
||||
const s = getVoucherStatus(v);
|
||||
if (filter === "eingeloest") return s === "eingeloest";
|
||||
if (filter === "abgelaufen") return s === "abgelaufen";
|
||||
if (filter === "bald")
|
||||
return s === "aktiv" && v.ablaufdatum && +new Date(v.ablaufdatum) >= now && +new Date(v.ablaufdatum) <= in14d;
|
||||
if (filter === "bald") return s === "aktiv" && isExpiringSoon(v.ablaufdatum);
|
||||
if (filter === "aktiv") return s === "aktiv";
|
||||
return true;
|
||||
});
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
import { use, useEffect, useState } from "react";
|
||||
import Link from "next/link";
|
||||
import { formatEuro } from "@/lib/vouchers";
|
||||
import { getVoucherStatus } from "@/lib/voucher-status";
|
||||
|
||||
type Voucher = {
|
||||
id: number;
|
||||
@@ -56,7 +57,7 @@ export default function VoucherDetailPage({ params }: { params: Promise<{ id: st
|
||||
<div><dt className="font-medium">Anbieter</dt><dd>{v.anbieter}</dd></div>
|
||||
<div><dt className="font-medium">Wert</dt><dd>{formatEuro(v.wertCents)}</dd></div>
|
||||
<div><dt className="font-medium">Rest</dt><dd>{formatEuro(v.restCents)}</dd></div>
|
||||
<div><dt className="font-medium">Status</dt><dd>{v.status}</dd></div>
|
||||
<div><dt className="font-medium">Status</dt><dd>{getVoucherStatus({ status: v.status, ablaufdatum: v.ablaufdatum ? new Date(v.ablaufdatum) : null })}</dd></div>
|
||||
{v.ablaufdatum && <div><dt className="font-medium">Ablaufdatum</dt><dd>{new Date(v.ablaufdatum).toLocaleDateString("de-DE")}</dd></div>}
|
||||
{v.codeText && <div><dt className="font-medium">Code</dt><dd>{v.codeText}</dd></div>}
|
||||
{v.kategorie && <div><dt className="font-medium">Kategorie</dt><dd>{v.kategorie}</dd></div>}
|
||||
|
||||
@@ -10,3 +10,12 @@ export function validateVoucher(v: VoucherInput): string[] {
|
||||
export function formatEuro(cents: number): string {
|
||||
return (cents / 100).toLocaleString("de-DE", { style: "currency", currency: "EUR" });
|
||||
}
|
||||
|
||||
// TODO(Task 6): vorläufiges "bald ablaufend"-Fenster. Task 6 ersetzt dies durch
|
||||
// individuelle Reminder-Regeln (Defaults 30/6/1 Tage vorher).
|
||||
export const VOUCHER_SOON_DAYS = 14;
|
||||
export function isExpiringSoon(ablaufdatum: Date | string | null, now: number = Date.now()): boolean {
|
||||
if (!ablaufdatum) return false;
|
||||
const t = new Date(ablaufdatum).getTime();
|
||||
return t >= now && t <= now + VOUCHER_SOON_DAYS * 24 * 3600 * 1000;
|
||||
}
|
||||
Reference in new issue
Block a user