✨ server: support multiple cards in statement

Author: nfmelendez

.changeset/soft-trains-dig.md

@@ -0,0 +1,5 @@
+---
+"@exactly/server": patch
+---
+
+✨ support multiple cards in statement

server/api/activity.ts

@@ -1,7 +1,7 @@
 import { renderToBuffer } from "@react-pdf/renderer";
 
 import { captureException, setUser } from "@sentry/node";
-import { and, arrayOverlaps, eq, inArray } from "drizzle-orm";
+import { arrayOverlaps, eq } from "drizzle-orm";
 import { Hono } from "hono";
 import { accepts } from "hono/accepts";
 import { validator as vValidator } from "hono-openapi/valibot";
@@ -90,7 +90,7 @@ export default new Hono().get(
       columns: { account: true },
       with: {
         cards: {
-          columns: {},
+          columns: { id: true, lastFour: true },
           with: { transactions: { columns: { hashes: true, payload: true } } },
           limit: ignore("card") || maturity !== undefined ? 0 : undefined,
         },
@@ -262,29 +262,26 @@ export default new Hono().get(
       ].map((blockNumber) => publicClient.getBlock({ blockNumber })),
     );
     const timestamps = new Map(blocks.map(({ number: block, timestamp }) => [block, timestamp]));
-    let statementCards: string[] = [];
-    let cardPurchases: typeof credential.cards;
-    if (!ignore("card") && maturity !== undefined && borrows) {
-      const hashes = borrows
-        .entries()
-        .filter(([_, { events }]) => events.some(({ maturity: m }) => Number(m) === maturity))
-        .map(([hash]) => hash)
-        .toArray();
-      const userCards = await database.query.cards
-        .findMany({ columns: { id: true }, where: eq(cards.credentialId, credentialId) })
-        .then((rows) => rows.map(({ id }) => id));
-      const statementTransactions =
-        hashes.length === 0 || userCards.length === 0
-          ? []
-          : await database.query.transactions.findMany({
-              where: and(arrayOverlaps(transactions.hashes, hashes), inArray(transactions.cardId, userCards)),
-              columns: { cardId: true, hashes: true, payload: true },
+    const purchases =
+      !ignore("card") && borrows && maturity !== undefined
+        ? await (() => {
+            const hashes = borrows
+              .entries()
+              .filter(([_, { events }]) => events.some(({ maturity: m }) => Number(m) === maturity))
+              .map(([hash]) => hash)
+              .toArray();
+            return database.query.cards.findMany({
+              where: eq(cards.credentialId, credentialId),
+              columns: { id: true, lastFour: true },
+              with: {
+                transactions: {
+                  columns: { hashes: true, payload: true },
+                  where: arrayOverlaps(transactions.hashes, hashes),
+                },
+              },
             });
-      statementCards = [...new Set(statementTransactions.map(({ cardId }) => cardId))];
-      cardPurchases = [{ transactions: statementTransactions }];
-    } else {
-      cardPurchases = credential.cards;
-    }
+          })()
+        : credential.cards;
 
     const accept = accepts(c, {
       header: "Accept",
@@ -294,7 +291,7 @@ export default new Hono().get(
     const pdf = accept === "application/pdf";
 
     const response = [
-      ...cardPurchases.flatMap(({ transactions: txs }) =>
+      ...purchases.flatMap(({ transactions: txs }) =>
         txs.map(({ hashes, payload }) => {
           const panda = safeParse(PandaActivity, {
             ...(payload as object),
@@ -423,20 +420,16 @@ export default new Hono().get(
       .toSorted((a, b) => b.timestamp.localeCompare(a.timestamp) || b.id.localeCompare(a.id));
 
     if (maturity !== undefined && pdf) {
-      if (statementCards.length > 1) return c.json({ code: "multiple cards" }, 400);
-      const statementCurrency = market(marketUSDCAddress).symbol;
-      const card =
-        statementCards.length === 0
-          ? undefined
-          : await database.query.cards.findFirst({
-              columns: { lastFour: true },
-              where: and(eq(cards.credentialId, credentialId), inArray(cards.id, statementCards)),
-            });
-      const statement = {
-        maturity,
-        lastFour: card?.lastFour ?? "",
-        data: response.flatMap((item): Parameters<typeof Statement>[0]["data"] => {
+      const cardLookup = new Map(
+        purchases.flatMap(({ id, transactions: txs }) =>
+          txs.flatMap(({ hashes }) => hashes.map((hash) => [hash, id] as const)),
+        ),
+      );
+      const purchasesByCard = Map.groupBy(
+        response.flatMap((item) => {
           if (item.type === "panda") {
+            const cardId = item.operations[0] && cardLookup.get(item.operations[0].transactionHash);
+            if (!cardId) return [];
             const installments = item.operations
               .reduce((accumulator, operation) => {
                 if ("borrow" in operation) {
@@ -470,6 +463,7 @@ export default new Hono().get(
             if (installments.length === 0) return [];
             return [
               {
+                cardId,
                 id: item.id,
                 timestamp: item.timestamp,
                 description: `${item.merchant.name}${item.merchant.city ? `, ${item.merchant.city}` : ""}`,
@@ -478,6 +472,8 @@ export default new Hono().get(
             ];
           }
           if (item.type === "card" && "borrow" in item) {
+            const cardId = cardLookup.get(item.transactionHash);
+            if (!cardId) return [];
             if ("installments" in item.borrow) {
               const events = borrows?.get(item.transactionHash)?.events;
               if (!events) return [];
@@ -490,6 +486,7 @@ export default new Hono().get(
               if (installments.length === 0) return [];
               return [
                 {
+                  cardId,
                   id: item.id,
                   timestamp: item.timestamp,
                   description: `${item.merchant.name}${item.merchant.city ? `, ${item.merchant.city}` : ""}`,
@@ -501,27 +498,28 @@ export default new Hono().get(
             if (!borrow || Number(borrow.maturity) !== maturity) return [];
             return [
               {
+                cardId,
                 id: item.id,
                 timestamp: item.timestamp,
                 description: `${item.merchant.name}${item.merchant.city ? `, ${item.merchant.city}` : ""}`,
                 installments: [{ amount: Number(borrow.assets + borrow.fee) / 1e6, current: 1, total: 1 }],
               },
             ];
           }
-          if (item.type === "repay") {
-            if (item.currency !== statementCurrency) return [];
-            return [
-              {
-                id: item.id,
-                timestamp: item.timestamp,
-                currency: item.currency,
-                positionAmount: item.positionAmount,
-                amount: item.amount,
-              },
-            ];
-          }
           return [];
         }),
+        ({ cardId }) => cardId,
+      );
+      const statement = {
+        account: `${account.slice(0, 6)}...${account.slice(-6)}`,
+        maturity,
+        cards: purchases.map(({ id, lastFour }) => ({
+          lastFour,
+          purchases: (purchasesByCard.get(id) ?? []).map(({ cardId: _, ...rest }) => rest),
+        })),
+        payments: response
+          .filter(({ type, currency }) => type === "repay" && currency === market(marketUSDCAddress).symbol)
+          .map(({ id, timestamp, amount }) => ({ id, timestamp, amount })),
       };
       return c.body(new Uint8Array(await renderToBuffer(Statement(statement))), 200, {
         "content-type": "application/pdf",

server/test/api/activity.test.ts

@@ -69,7 +69,10 @@ describe.concurrent("authenticated", () => {
     let maturity: string;
 
     beforeAll(async () => {
-      await database.insert(cards).values([{ id: "activity", credentialId: "bob", lastFour: "1234" }]);
+      await database.insert(cards).values([
+        { id: "first-activity-card", credentialId: "bob", lastFour: "1234" },
+        { id: "second-activity-card", credentialId: "bob", lastFour: "6789" },
+      ]);
       const borrows = await anvilClient.getContractEvents({
         abi: marketAbi,
         eventName: "BorrowAtMaturity",
@@ -148,7 +151,7 @@ describe.concurrent("authenticated", () => {
               };
         return {
           id: String(index),
-          cardId: "activity",
+          cardId: index === 0 ? "first-activity-card" : "second-activity-card",
           hashes,
           payload,
           hash,
@@ -218,7 +221,7 @@ describe.concurrent("authenticated", () => {
     it("reports bad transaction", async () => {
       await database
         .insert(transactions)
-        .values([{ id: "bad-transaction", cardId: "activity", hashes: ["0x1"], payload: {} }]);
+        .values([{ id: "bad-transaction", cardId: "first-activity-card", hashes: ["0x1"], payload: {} }]);
       const response = await appClient.index.$get(
         { query: { include: "card" } },
         { headers: { "test-credential-id": "bob" } },