feat(api): include blobAttachments to transaction services (#318)

get6pm · Sep 12, 2024 · 954337f · 954337f
1 parent 8c437aa
commit 954337f
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 29 deletions.
diff --git a/apps/api/v1/routes/transactions.ts b/apps/api/v1/routes/transactions.ts
@@ -101,12 +101,12 @@ const router = new Hono()
     const logger = getLogger(`${c.req.method} ${c.req.path}`)
     const user = getAuthUserStrict(c)
     const data = c.req.valid('json')
-    const { budgetId, walletAccountId: walletId, categoryId } = data
+    const { budgetId, walletAccountId: walletId, categoryId, date } = data
 
     logger.debug('Creating transaction %o', data)
 
     const budget = budgetId
-      ? await findBudget({ budgetId, anchorDate: data.date })
+      ? await findBudget({ budgetId, anchorDate: date })
       : null
     if (budgetId && (!budget || !(await canUserReadBudget({ user, budget })))) {
       logger.error(`Budget not found or user doesn't have read access %o`, {
@@ -289,6 +289,7 @@ const router = new Hono()
       const transactionData = await generateTransactionDataFromFile({
         file,
         categories: userCategories,
+        performUser: user,
       })
       return c.json(transactionData)
     } catch {

diff --git a/apps/api/v1/services/ai.service.ts b/apps/api/v1/services/ai.service.ts
@@ -1,4 +1,4 @@
-import type { CategoryType } from '@prisma/client'
+import type { CategoryType, User } from '@prisma/client'
 import { OpenAI } from 'openai'
 import { getLogger } from '../../lib/log'
 import { createAiCache, findAiCacheByQuery } from './ai-cache.service'
@@ -79,6 +79,7 @@ export async function generateTransactionDataFromFile({
   file: inputFile,
   noteLanguage = 'English',
   categories = [],
+  performUser,
 }: {
   file: File
   noteLanguage?: string
@@ -88,6 +89,7 @@ export async function generateTransactionDataFromFile({
     icon?: string | null
     type?: CategoryType
   }[]
+  performUser?: User
 }) {
   const log = getLogger(`ai.service:${generateTransactionDataFromFile.name}`)
   const additionalInstructions = generateAdditionalInstruction({
@@ -117,6 +119,7 @@ export async function generateTransactionDataFromFile({
     putBlobObject({
       file: inputFile,
       pathname: blobObjectPathname,
+      uploadedUser: performUser,
     }),
   ])
 

diff --git a/apps/api/v1/services/transaction.service.ts b/apps/api/v1/services/transaction.service.ts
@@ -109,18 +109,14 @@ export async function findTransaction({
   transactionId: string
 }) {
   return prisma.transaction.findUnique({
-    where: {
-      id: transactionId,
-    },
-    include: {
-      category: true,
-    },
+    where: { id: transactionId },
+    include: { category: true, blobAttachments: true },
   })
 }
 
 export async function createTransaction({
   user,
-  data,
+  data: { blobAttachmentIds, ...data },
 }: {
   user: User
   data: CreateTransaction
@@ -149,18 +145,19 @@ export async function createTransaction({
       ...data,
       amountInVnd,
       createdByUserId: user.id,
+      blobAttachments: {
+        connect: blobAttachmentIds?.map((id) => ({ id })),
+      },
     },
-    include: {
-      category: true,
-    },
+    include: { category: true, blobAttachments: true },
   })
 
   return transaction
 }
 
 export async function updateTransaction({
   transactionId,
-  data,
+  data: { blobAttachmentIds, ...data },
 }: {
   transactionId: string
   data: UpdateTransaction
@@ -203,16 +200,13 @@ export async function updateTransaction({
   }
 
   transaction = await prisma.transaction.update({
-    where: {
-      id: transactionId,
-    },
+    where: { id: transactionId },
     data: {
       ...data,
       amountInVnd,
+      blobAttachments: { set: blobAttachmentIds?.map((id) => ({ id })) },
     },
-    include: {
-      category: true,
-    },
+    include: { category: true, blobAttachments: true },
   })
 
   return transaction
@@ -224,9 +218,7 @@ export async function deleteTransaction({
   transactionId: string
 }) {
   await prisma.transaction.delete({
-    where: {
-      id: transactionId,
-    },
+    where: { id: transactionId },
   })
 }
 
@@ -258,13 +250,9 @@ export async function listTransactions({
         }),
       },
     },
-    orderBy: {
-      date: 'desc',
-    },
+    orderBy: { date: 'desc' },
     take: pagination.first || pagination.last,
-    include: {
-      category: true,
-    },
+    include: { category: true, blobAttachments: true },
   })
 
   const totalCount = await prisma.transaction.count({

diff --git a/packages/validation/src/transaction.zod.ts b/packages/validation/src/transaction.zod.ts
@@ -10,6 +10,7 @@ export const zCreateTransaction = z.object({
   budgetId: z.string().nullable().optional(),
   walletAccountId: z.string(),
   categoryId: z.string().nullable().optional(),
+  blobAttachmentIds: z.array(z.string()).optional(),
 })
 export type CreateTransaction = z.infer<typeof zCreateTransaction>
 
@@ -22,6 +23,7 @@ export const zUpdateTransaction = z.object({
   budgetId: z.string().nullable().optional(),
   walletAccountId: z.string().optional(),
   categoryId: z.string().nullable().optional(),
+  blobAttachmentIds: z.array(z.string()).optional(),
 })
 export type UpdateTransaction = z.infer<typeof zUpdateTransaction>