feat(api): [Transaction] Paginate transactions by date instead of cre…

…atedAt (#103) Also populate category field on transaction record.
get6pm · Jul 12, 2024 · 082cf37 · 082cf37
1 parent bc11f7f
commit 082cf37
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/apps/api/v1/routes/transactions.ts b/apps/api/v1/routes/transactions.ts
@@ -26,10 +26,10 @@ const router = new Hono()
       z.object({
         wallet_id: z.string().optional(),
         budget_id: z.string().optional(),
-        before: z.date().optional(),
-        after: z.date().optional(),
-        first: z.number().optional(),
-        last: z.number().optional(),
+        before: z.date({ coerce: true }).optional(),
+        after: z.date({ coerce: true }).optional(),
+        first: z.number({ coerce: true }).optional(),
+        last: z.number({ coerce: true }).optional(),
       }),
     ),
     async (c) => {

diff --git a/apps/api/v1/services/transaction.service.ts b/apps/api/v1/services/transaction.service.ts
@@ -170,7 +170,7 @@ export async function listTransactions({
   const transactions = await prisma.transaction.findMany({
     where: {
       ...query,
-      createdAt: {
+      date: {
         ...(pagination.before && {
           lt: pagination.before,
         }),
@@ -180,9 +180,12 @@ export async function listTransactions({
       },
     },
     orderBy: {
-      createdAt: 'desc',
+      date: 'desc',
     },
     take: pagination.first || pagination.last,
+    include: {
+      category: true,
+    },
   })
 
   const totalCount = await prisma.transaction.count({
@@ -193,10 +196,10 @@ export async function listTransactions({
     hasMore: transactions.length > (pagination.first || pagination.last || 0),
     totalCount,
     ...(pagination.first && {
-      before: transactions[0]?.createdAt,
+      before: transactions[0]?.date,
     }),
     ...(pagination.last && {
-      after: transactions[transactions.length - 1]?.createdAt,
+      after: transactions[transactions.length - 1]?.date,
     }),
   }