Phase2: Invoicecomputation/AdminpricingUI/Ainvoicemgnt

src/lib/billing.ts

@@ -341,15 +341,21 @@ async function collectThreemaUsage(
 ): Promise<{ inCount: number; outCount: number } | null> {
   const packages = tenant.spec.packages ?? [];
   if (!packages.includes("threema")) return null;
-  const usage = await getThreemaUsage(
+  // threema-relay.getUsage takes Date params, not strings, and
-    tenant.metadata.name,
+  // returns a discriminated RelayResult<UsageBreakdown> — the
-    periodStart,
+  // `ok` discriminant must be checked before reading the totals.
-    periodEnd
+  // Period end is exclusive in the relay's API; pass the next-day
-  ).catch(() => null);
+  // midnight UTC to capture the full last day of the period.
-  if (!usage) return null;
+  const from = new Date(`${periodStart}T00:00:00Z`);
+  const to = new Date(`${periodEnd}T00:00:00Z`);
+  to.setUTCDate(to.getUTCDate() + 1);
+  const result = await getThreemaUsage(tenant.metadata.name, from, to).catch(
+    () => null
+  );
+  if (!result || !result.ok) return null;
   return {
-    inCount: Number(usage.totals?.in ?? 0),
+    inCount: Number(result.totals?.in ?? 0),
-    outCount: Number(usage.totals?.out ?? 0),
+    outCount: Number(result.totals?.out ?? 0),
   };
 }