feat: split into multiple items

This commit is contained in:
vas3k
2025-05-23 14:33:40 +02:00
parent 289b436236
commit 25c61f0519
17 changed files with 332 additions and 57 deletions

View File

@@ -2,16 +2,30 @@ import { Field } from "@/prisma/client"
export const fieldsToJsonSchema = (fields: Field[]) => { export const fieldsToJsonSchema = (fields: Field[]) => {
const fieldsWithPrompt = fields.filter((field) => field.llm_prompt) const fieldsWithPrompt = fields.filter((field) => field.llm_prompt)
const schemaProperties = fieldsWithPrompt.reduce(
(acc, field) => {
acc[field.code] = { type: field.type, description: field.llm_prompt || "" }
return acc
},
{} as Record<string, { type: string; description: string }>
)
const schema = { const schema = {
type: "object", type: "object",
properties: fieldsWithPrompt.reduce( properties: {
(acc, field) => { ...schemaProperties,
acc[field.code] = { type: field.type, description: field.llm_prompt || "" } items: {
return acc type: "array",
description: "Included items or products in the transaction which have own name and price",
items: {
type: "object",
properties: schemaProperties,
required: [...Object.keys(schemaProperties)],
additionalProperties: false,
},
}, },
{} as Record<string, { type: string; description: string }> },
), required: [...Object.keys(schemaProperties), "items"],
required: fieldsWithPrompt.map((field) => field.code),
additionalProperties: false, additionalProperties: false,
} }

View File

@@ -70,7 +70,6 @@ export async function uploadFilesAction(formData: FormData): Promise<ActionState
}) })
) )
// Update user storage used
const storageUsed = await getDirectorySize(getUserUploadsDirectory(user)) const storageUsed = await getDirectorySize(getUserUploadsDirectory(user))
await updateUser(user.id, { storageUsed }) await updateUser(user.id, { storageUsed })

View File

@@ -8,15 +8,18 @@ import { transactionFormSchema } from "@/forms/transactions"
import { ActionState } from "@/lib/actions" import { ActionState } from "@/lib/actions"
import { getCurrentUser, isAiBalanceExhausted, isSubscriptionExpired } from "@/lib/auth" import { getCurrentUser, isAiBalanceExhausted, isSubscriptionExpired } from "@/lib/auth"
import config from "@/lib/config" import config from "@/lib/config"
import { getTransactionFileUploadPath, getUserUploadsDirectory, safePathJoin } from "@/lib/files" import { getTransactionFileUploadPath, getUserUploadsDirectory, safePathJoin, unsortedFilePath } from "@/lib/files"
import { DEFAULT_PROMPT_ANALYSE_NEW_FILE } from "@/models/defaults" import { DEFAULT_PROMPT_ANALYSE_NEW_FILE } from "@/models/defaults"
import { deleteFile, getFileById, updateFile } from "@/models/files" import { createFile, deleteFile, getFileById, updateFile } from "@/models/files"
import { createTransaction, updateTransactionFiles } from "@/models/transactions" import { createTransaction, updateTransactionFiles, TransactionData } from "@/models/transactions"
import { updateUser } from "@/models/users" import { updateUser } from "@/models/users"
import { Category, Field, File, Project, Transaction } from "@/prisma/client" import { Category, Field, File, Project, Transaction } from "@/prisma/client"
import { mkdir, rename } from "fs/promises" import { mkdir, rename } from "fs/promises"
import { revalidatePath } from "next/cache" import { revalidatePath } from "next/cache"
import path from "path" import path from "path"
import { randomUUID } from "crypto"
import { readFile, writeFile } from "fs/promises"
import { getDirectorySize } from "@/lib/files"
export async function analyzeFileAction( export async function analyzeFileAction(
file: File, file: File,
@@ -141,3 +144,79 @@ export async function deleteUnsortedFileAction(
return { success: false, error: "Failed to delete file" } return { success: false, error: "Failed to delete file" }
} }
} }
export async function splitFileIntoItemsAction(
_prevState: ActionState<null> | null,
formData: FormData
): Promise<ActionState<null>> {
try {
const user = await getCurrentUser()
const fileId = formData.get("fileId") as string
const items = JSON.parse(formData.get("items") as string) as TransactionData[]
if (!fileId || !items || items.length === 0) {
return { success: false, error: "File ID and items are required" }
}
// Get the original file
const originalFile = await getFileById(fileId, user.id)
if (!originalFile) {
return { success: false, error: "Original file not found" }
}
// Get the original file's content
const userUploadsDirectory = getUserUploadsDirectory(user)
const originalFilePath = safePathJoin(userUploadsDirectory, originalFile.path)
const fileContent = await readFile(originalFilePath)
// Create a new file for each item
for (const item of items) {
const fileUuid = randomUUID()
const fileName = `${originalFile.filename}-part-${item.name}`
const relativeFilePath = unsortedFilePath(fileUuid, fileName)
const fullFilePath = safePathJoin(userUploadsDirectory, relativeFilePath)
// Create directory if it doesn't exist
await mkdir(path.dirname(fullFilePath), { recursive: true })
// Copy the original file content
await writeFile(fullFilePath, fileContent)
// Create file record in database with the item data cached
await createFile(user.id, {
id: fileUuid,
filename: fileName,
path: relativeFilePath,
mimetype: originalFile.mimetype,
metadata: originalFile.metadata,
isSplitted: true,
cachedParseResult: {
name: item.name,
merchant: item.merchant,
description: item.description,
total: item.total,
currencyCode: item.currencyCode,
categoryCode: item.categoryCode,
projectCode: item.projectCode,
type: item.type,
issuedAt: item.issuedAt,
note: item.note,
text: item.text,
},
})
}
// Delete the original file
await deleteFile(fileId, user.id)
// Update user storage used
const storageUsed = await getDirectorySize(getUserUploadsDirectory(user))
await updateUser(user.id, { storageUsed })
revalidatePath("/unsorted")
return { success: true }
} catch (error) {
console.error("Failed to split file into items:", error)
return { success: false, error: `Failed to split file into items: ${error}` }
}
}

View File

@@ -19,7 +19,7 @@ async function getCurrencyRate(currencyCodeFrom: string, currencyCodeTo: string,
return data.rate return data.rate
} }
export const FormConvertCurrency = ({ export const CurrencyConverterTool = ({
originalTotal, originalTotal,
originalCurrencyCode, originalCurrencyCode,
targetCurrencyCode, targetCurrencyCode,

View File

@@ -0,0 +1,79 @@
import { formatCurrency } from "@/lib/utils"
import { Save, Split } from "lucide-react"
import { Button } from "../ui/button"
import { TransactionData } from "@/models/transactions"
import { splitFileIntoItemsAction } from "@/app/(app)/unsorted/actions"
import { useNotification } from "@/app/(app)/context"
import { useState } from "react"
import { Loader2 } from "lucide-react"
import { File } from "@/prisma/client"
export const ItemsDetectTool = ({ file, data }: { file?: File; data: TransactionData }) => {
const { showNotification } = useNotification()
const [isSplitting, setIsSplitting] = useState(false)
const handleSplit = async () => {
if (!file) {
console.error("No file selected")
return
}
setIsSplitting(true)
try {
const formData = new FormData()
formData.append("fileId", file.id)
formData.append("items", JSON.stringify(data.items))
const result = await splitFileIntoItemsAction(null, formData)
if (result.success) {
showNotification({ code: "global.banner", message: "Split successful!", type: "success" })
showNotification({ code: "sidebar.unsorted", message: "new" })
setTimeout(() => showNotification({ code: "sidebar.unsorted", message: "" }), 3000)
} else {
showNotification({ code: "global.banner", message: result.error || "Failed to split", type: "failed" })
}
} catch (error) {
console.error("Failed to split items:", error)
showNotification({ code: "global.banner", message: "Failed to split items", type: "failed" })
} finally {
setIsSplitting(false)
}
}
return (
<div className="flex flex-col gap-4">
<div className="flex flex-col divide-y divide-border">
{data.items?.map((item, index) => (
<div
key={`${item.name || ""}-${item.merchant || ""}-${item.description || ""}-${index}`}
className="flex flex-row items-start gap-10 py-2 hover:bg-muted/50 transition-colors"
>
<div className="flex flex-col flex-1">
<div className="text-sm">{item.name}</div>
<div className="text-xs text-muted-foreground">{item.description}</div>
</div>
<div className="font-medium">
{formatCurrency((item.total || 0) * 100, item.currencyCode || data.currencyCode || "USD")}
</div>
</div>
))}
</div>
{file && data.items && data.items.length > 1 && (
<Button onClick={handleSplit} className="mt-2 px-4 py-2" disabled={isSplitting}>
{isSplitting ? (
<>
<Loader2 className="w-4 h-4 mr-2 animate-spin" />
Splitting...
</>
) : (
<>
<Split className="w-4 h-4 mr-2" />
Split into {data.items.length} individual transactions
</>
)}
</Button>
)}
</div>
)
}

View File

@@ -2,10 +2,10 @@ import { Bot } from "lucide-react"
export default function ToolWindow({ title, children }: { title: string; children: React.ReactNode }) { export default function ToolWindow({ title, children }: { title: string; children: React.ReactNode }) {
return ( return (
<div className="border-2 border-purple-500 bg-purple-100 rounded-md overflow-hidden"> <div className="border-2 border-purple-500 bg-purple-100 rounded-md overflow-hidden break-all">
<div className="flex flex-row gap-1 items-center font-bold text-xs bg-purple-200 text-purple-800 p-1"> <div className="flex flex-row gap-1 items-center font-bold text-xs bg-purple-200 text-purple-800 p-1">
<Bot className="w-4 h-4" /> <Bot className="w-4 h-4" />
<span>Tool called: {title}</span> <span>{title}</span>
</div> </div>
<div className="p-4">{children}</div> <div className="p-4">{children}</div>
</div> </div>

View File

@@ -7,6 +7,7 @@ import config from "@/lib/config"
import { Loader2 } from "lucide-react" import { Loader2 } from "lucide-react"
import { useRouter } from "next/navigation" import { useRouter } from "next/navigation"
import { ComponentProps, startTransition, useRef, useState } from "react" import { ComponentProps, startTransition, useRef, useState } from "react"
import { FormError } from "../forms/error"
export function UploadButton({ children, ...props }: { children: React.ReactNode } & ComponentProps<typeof Button>) { export function UploadButton({ children, ...props }: { children: React.ReactNode } & ComponentProps<typeof Button>) {
const router = useRouter() const router = useRouter()
@@ -69,7 +70,7 @@ export function UploadButton({ children, ...props }: { children: React.ReactNode
)} )}
</Button> </Button>
{uploadError && <span className="text-red-500"> {uploadError}</span>} {uploadError && <FormError>{uploadError}</FormError>}
</div> </div>
) )
} }

View File

@@ -1,5 +1,16 @@
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
import { AlertCircle } from "lucide-react"
export function FormError({ children, className }: { children: React.ReactNode; className?: string }) { export function FormError({ children, className }: { children: React.ReactNode; className?: string }) {
return <p className={cn("text-red-500 mt-4 overflow-hidden", className)}>{children}</p> return (
<div
className={cn(
"inline-flex items-center gap-2 px-3 py-2 rounded-md bg-red-50 text-red-700 border border-red-200",
className
)}
>
<AlertCircle className="w-4 h-4 flex-shrink-0" />
<p className="text-sm">{children}</p>
</div>
)
} }

View File

@@ -129,9 +129,9 @@ export default function TransactionCreateForm({
"Create and Add Files" "Create and Add Files"
)} )}
</Button> </Button>
{createState?.error && <FormError> {createState.error}</FormError>}
</div> </div>
{createState?.error && <FormError>{createState.error}</FormError>}
</form> </form>
) )
} }

View File

@@ -13,6 +13,9 @@ import { format } from "date-fns"
import { Loader2, Save, Trash2 } from "lucide-react" import { Loader2, Save, Trash2 } from "lucide-react"
import { useRouter } from "next/navigation" import { useRouter } from "next/navigation"
import { startTransition, useActionState, useEffect, useMemo, useState } from "react" import { startTransition, useActionState, useEffect, useMemo, useState } from "react"
import ToolWindow from "@/components/agents/tool-window"
import { ItemsDetectTool } from "@/components/agents/items-detect"
import { TransactionData } from "@/models/transactions"
export default function TransactionEditForm({ export default function TransactionEditForm({
transaction, transaction,
@@ -47,6 +50,7 @@ export default function TransactionEditForm({
projectCode: transaction.projectCode || settings.default_project, projectCode: transaction.projectCode || settings.default_project,
issuedAt: transaction.issuedAt ? format(transaction.issuedAt, "yyyy-MM-dd") : "", issuedAt: transaction.issuedAt ? format(transaction.issuedAt, "yyyy-MM-dd") : "",
note: transaction.note || "", note: transaction.note || "",
items: transaction.items || [],
...extraFields.reduce( ...extraFields.reduce(
(acc, field) => { (acc, field) => {
acc[field.code] = transaction.extra?.[field.code as keyof typeof transaction.extra] || "" acc[field.code] = transaction.extra?.[field.code as keyof typeof transaction.extra] || ""
@@ -205,13 +209,19 @@ export default function TransactionEditForm({
type="text" type="text"
title={field.name} title={field.name}
name={field.code} name={field.code}
defaultValue={formData[field.code as keyof typeof formData] || ""} defaultValue={(formData[field.code as keyof typeof formData] as string) || ""}
isRequired={field.isRequired} isRequired={field.isRequired}
className={field.type === "number" ? "max-w-36" : "max-w-full"} className={field.type === "number" ? "max-w-36" : "max-w-full"}
/> />
))} ))}
</div> </div>
{formData.items && Array.isArray(formData.items) && formData.items.length > 0 && (
<ToolWindow title="Items or products detected">
<ItemsDetectTool data={formData as TransactionData} />
</ToolWindow>
)}
<div className="flex justify-between space-x-4 pt-6"> <div className="flex justify-between space-x-4 pt-6">
<Button type="button" onClick={handleDelete} variant="destructive" disabled={isDeleting}> <Button type="button" onClick={handleDelete} variant="destructive" disabled={isDeleting}>
<> <>
@@ -233,9 +243,11 @@ export default function TransactionEditForm({
</> </>
)} )}
</Button> </Button>
</div>
{deleteState?.error && <FormError> {deleteState.error}</FormError>} <div>
{saveState?.error && <FormError> {saveState.error}</FormError>} {deleteState?.error && <FormError>{deleteState.error}</FormError>}
{saveState?.error && <FormError>{saveState.error}</FormError>}
</div> </div>
</form> </form>
) )

View File

@@ -1,19 +1,35 @@
"use client" "use client"
import { Button } from "@/components/ui/button" import { Button } from "@/components/ui/button"
import { Swords } from "lucide-react" import { Save, Swords } from "lucide-react"
export function AnalyzeAllButton() { export function AnalyzeAllButton() {
const handleAnalyzeAll = () => { const handleAnalyzeAll = () => {
document.querySelectorAll("button[data-analyze-button]").forEach((button) => { if (typeof document !== "undefined") {
;(button as HTMLButtonElement).click() document.querySelectorAll("button[data-analyze-button]").forEach((button) => {
}) ;(button as HTMLButtonElement).click()
})
}
}
const handleSaveAll = () => {
if (typeof document !== "undefined") {
document.querySelectorAll("button[data-save-button]").forEach((button) => {
;(button as HTMLButtonElement).click()
})
}
} }
return ( return (
<Button variant="outline" className="flex items-center gap-2" onClick={handleAnalyzeAll}> <div className="flex flex-row gap-2">
<Swords className="h-4 w-4" /> <Button variant="outline" className="flex items-center gap-2" onClick={handleSaveAll}>
Analyze all <Save className="h-4 w-4" />
</Button> Save all
</Button>
<Button className="flex items-center gap-2" onClick={handleAnalyzeAll}>
<Swords className="h-4 w-4" />
Analyze all
</Button>
</div>
) )
} }

View File

@@ -2,7 +2,7 @@
import { useNotification } from "@/app/(app)/context" import { useNotification } from "@/app/(app)/context"
import { analyzeFileAction, deleteUnsortedFileAction, saveFileAsTransactionAction } from "@/app/(app)/unsorted/actions" import { analyzeFileAction, deleteUnsortedFileAction, saveFileAsTransactionAction } from "@/app/(app)/unsorted/actions"
import { FormConvertCurrency } from "@/components/forms/convert-currency" import { CurrencyConverterTool } from "@/components/agents/currency-converter"
import { FormError } from "@/components/forms/error" import { FormError } from "@/components/forms/error"
import { FormSelectCategory } from "@/components/forms/select-category" import { FormSelectCategory } from "@/components/forms/select-category"
import { FormSelectCurrency } from "@/components/forms/select-currency" import { FormSelectCurrency } from "@/components/forms/select-currency"
@@ -14,7 +14,9 @@ import { Category, Currency, Field, File, Project } from "@/prisma/client"
import { format } from "date-fns" import { format } from "date-fns"
import { Brain, Loader2, Trash2, ArrowDownToLine } from "lucide-react" import { Brain, Loader2, Trash2, ArrowDownToLine } from "lucide-react"
import { startTransition, useActionState, useMemo, useState } from "react" import { startTransition, useActionState, useMemo, useState } from "react"
import ToolWindow from "../agents/tool-window" import ToolWindow from "@/components/agents/tool-window"
import { ItemsDetectTool } from "@/components/agents/items-detect"
import { Badge } from "@/components/ui/badge"
export default function AnalyzeForm({ export default function AnalyzeForm({
file, file,
@@ -65,6 +67,7 @@ export default function AnalyzeForm({
issuedAt: "", issuedAt: "",
note: "", note: "",
text: "", text: "",
items: [],
} }
// Add extra fields // Add extra fields
@@ -141,21 +144,27 @@ export default function AnalyzeForm({
return ( return (
<> <>
<Button className="w-full mb-6 py-6 text-lg" onClick={startAnalyze} disabled={isAnalyzing} data-analyze-button> {file.isSplitted ? (
{isAnalyzing ? ( <div className="flex justify-end">
<> <Badge variant="outline">This file has been split</Badge>
<Loader2 className="mr-1 h-4 w-4 animate-spin" /> </div>
<span>{analyzeStep}</span> ) : (
</> <Button className="w-full mb-6 py-6 text-lg" onClick={startAnalyze} disabled={isAnalyzing} data-analyze-button>
) : ( {isAnalyzing ? (
<> <>
<Brain className="mr-1 h-4 w-4" /> <Loader2 className="mr-1 h-4 w-4 animate-spin" />
<span>Analyze with AI</span> <span>{analyzeStep}</span>
</> </>
)} ) : (
</Button> <>
<Brain className="mr-1 h-4 w-4" />
<span>Analyze with AI</span>
</>
)}
</Button>
)}
{analyzeError && <FormError> {analyzeError}</FormError>} <div>{analyzeError && <FormError>{analyzeError}</FormError>}</div>
<form className="space-y-4" action={saveAsTransaction}> <form className="space-y-4" action={saveAsTransaction}>
<input type="hidden" name="fileId" value={file.id} /> <input type="hidden" name="fileId" value={file.id} />
@@ -222,7 +231,7 @@ export default function AnalyzeForm({
{formData.total != 0 && formData.currencyCode && formData.currencyCode !== settings.default_currency && ( {formData.total != 0 && formData.currencyCode && formData.currencyCode !== settings.default_currency && (
<ToolWindow title={`Exchange rate on ${format(new Date(formData.issuedAt || Date.now()), "LLLL dd, yyyy")}`}> <ToolWindow title={`Exchange rate on ${format(new Date(formData.issuedAt || Date.now()), "LLLL dd, yyyy")}`}>
<FormConvertCurrency <CurrencyConverterTool
originalTotal={formData.total} originalTotal={formData.total}
originalCurrencyCode={formData.currencyCode} originalCurrencyCode={formData.currencyCode}
targetCurrencyCode={settings.default_currency} targetCurrencyCode={settings.default_currency}
@@ -293,7 +302,14 @@ export default function AnalyzeForm({
/> />
))} ))}
{formData.items && formData.items.length > 0 && (
<ToolWindow title="Items or products detected">
<ItemsDetectTool file={file} data={formData} />
</ToolWindow>
)}
<div className="hidden"> <div className="hidden">
<input type="text" name="items" defaultValue={JSON.stringify(formData.items)} />
<FormTextarea <FormTextarea
title={fieldMap.text.name} title={fieldMap.text.name}
name="text" name="text"
@@ -314,7 +330,7 @@ export default function AnalyzeForm({
{isDeleting ? "⏳ Deleting..." : "Delete"} {isDeleting ? "⏳ Deleting..." : "Delete"}
</Button> </Button>
<Button type="submit" disabled={isSaving}> <Button type="submit" disabled={isSaving} data-save-button>
{isSaving ? ( {isSaving ? (
<> <>
<Loader2 className="mr-2 h-4 w-4 animate-spin" /> <Loader2 className="mr-2 h-4 w-4 animate-spin" />
@@ -327,9 +343,11 @@ export default function AnalyzeForm({
</> </>
)} )}
</Button> </Button>
</div>
{deleteState?.error && <FormError> {deleteState.error}</FormError>} <div>
{saveError && <FormError> {saveError}</FormError>} {deleteState?.error && <FormError>{deleteState.error}</FormError>}
{saveError && <FormError>{saveError}</FormError>}
</div> </div>
</form> </form>
</> </>

View File

@@ -47,5 +47,16 @@ export const transactionFormSchema = z
.optional(), .optional(),
text: z.string().optional(), text: z.string().optional(),
note: z.string().optional(), note: z.string().optional(),
items: z
.string()
.optional()
.transform((val) => {
if (!val || val.trim() === '') return []
try {
return JSON.parse(val)
} catch (e) {
throw new z.ZodError([{ message: "Invalid items JSON", path: ["items"], code: z.ZodIssueCode.custom }])
}
}),
}) })
.catchall(z.string()) .catchall(z.string())

View File

@@ -8,7 +8,7 @@ export function cn(...inputs: ClassValue[]) {
return twMerge(clsx(inputs)) return twMerge(clsx(inputs))
} }
export function formatCurrency(total: number, currency: string, separator: string = "") { export function formatCurrency(total: number, currency: string) {
try { try {
return new Intl.NumberFormat(LOCALE, { return new Intl.NumberFormat(LOCALE, {
style: "currency", style: "currency",

View File

@@ -5,6 +5,22 @@ import { getFields } from "./fields"
import { deleteFile } from "./files" import { deleteFile } from "./files"
export type TransactionData = { export type TransactionData = {
name?: string | null
description?: string | null
merchant?: string | null
total?: number | null
currencyCode?: string | null
convertedTotal?: number | null
convertedCurrencyCode?: string | null
type?: string | null
items?: TransactionData[] | null
note?: string | null
files?: string[] | null
extra?: Record<string, unknown>
categoryCode?: string | null
projectCode?: string | null
issuedAt?: Date | string | null
text?: string | null
[key: string]: unknown [key: string]: unknown
} }
@@ -105,6 +121,12 @@ export const getTransactionById = cache(async (id: string, userId: string): Prom
}) })
}) })
export const getTransactionsByFileId = cache(async (fileId: string, userId: string): Promise<Transaction[]> => {
return await prisma.transaction.findMany({
where: { files: { array_contains: [fileId] }, userId },
})
})
export const createTransaction = async (userId: string, data: TransactionData): Promise<Transaction> => { export const createTransaction = async (userId: string, data: TransactionData): Promise<Transaction> => {
const { standard, extra } = await splitTransactionDataExtraFields(data, userId) const { standard, extra } = await splitTransactionDataExtraFields(data, userId)
@@ -112,8 +134,11 @@ export const createTransaction = async (userId: string, data: TransactionData):
data: { data: {
...standard, ...standard,
extra: extra, extra: extra,
userId, items: data.items as Prisma.InputJsonValue,
}, user: {
connect: { id: userId }
}
} as Prisma.TransactionCreateInput,
}) })
} }
@@ -125,7 +150,8 @@ export const updateTransaction = async (id: string, userId: string, data: Transa
data: { data: {
...standard, ...standard,
extra: extra, extra: extra,
}, items: data.items ? data.items as Prisma.InputJsonValue : [],
} as Prisma.TransactionUpdateInput,
}) })
} }
@@ -143,7 +169,9 @@ export const deleteTransaction = async (id: string, userId: string): Promise<Tra
const files = Array.isArray(transaction.files) ? transaction.files : [] const files = Array.isArray(transaction.files) ? transaction.files : []
for (const fileId of files as string[]) { for (const fileId of files as string[]) {
await deleteFile(fileId, userId) if ((await getTransactionsByFileId(fileId, userId)).length <= 1) {
await deleteFile(fileId, userId)
}
} }
return await prisma.transaction.delete({ return await prisma.transaction.delete({
@@ -171,7 +199,7 @@ const splitTransactionDataExtraFields = async (
{} as Record<string, Field> {} as Record<string, Field>
) )
const standard: Omit<Partial<Transaction>, "extra"> = {} const standard: TransactionData = {}
const extra: Record<string, unknown> = {} const extra: Record<string, unknown> = {}
Object.entries(data).forEach(([key, value]) => { Object.entries(data).forEach(([key, value]) => {
@@ -180,7 +208,7 @@ const splitTransactionDataExtraFields = async (
if (fieldDef.isExtra) { if (fieldDef.isExtra) {
extra[key] = value extra[key] = value
} else { } else {
standard[key as keyof Omit<Transaction, "extra">] = value as any standard[key] = value
} }
} }
}) })

View File

@@ -0,0 +1,5 @@
-- AlterTable
ALTER TABLE "files" ADD COLUMN "is_splitted" BOOLEAN NOT NULL DEFAULT false;
-- AlterTable
ALTER TABLE "transactions" ADD COLUMN "items" JSONB NOT NULL DEFAULT '[]';

View File

@@ -160,6 +160,7 @@ model File {
mimetype String mimetype String
metadata Json? metadata Json?
isReviewed Boolean @default(false) @map("is_reviewed") isReviewed Boolean @default(false) @map("is_reviewed")
isSplitted Boolean @default(false) @map("is_splitted")
cachedParseResult Json? @map("cached_parse_result") cachedParseResult Json? @map("cached_parse_result")
createdAt DateTime @default(now()) @map("created_at") createdAt DateTime @default(now()) @map("created_at")
@@ -178,6 +179,7 @@ model Transaction {
convertedTotal Int? @map("converted_total") convertedTotal Int? @map("converted_total")
convertedCurrencyCode String? @map("converted_currency_code") convertedCurrencyCode String? @map("converted_currency_code")
type String? @default("expense") type String? @default("expense")
items Json @default("[]")
note String? note String?
files Json @default("[]") files Json @default("[]")
extra Json? extra Json?