julienfroidefond/fintrack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add initial balance support to accounts, enhancing account management and balance calculations across components

Browse Source
This commit is contained in:
Julien Froidefond
2025-11-30 12:13:02 +01:00
parent c26ba9ddc6
commit 184a073bb1
13 changed files with 117 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/accounts/page.tsx
View File

@@ -13,6 +13,7 @@ import { Card, CardContent } from "@/components/ui/card";
import { Building2, Folder } from "lucide-react";
import type { Account } from "@/lib/types";
import { cn } from "@/lib/utils";
import { getAccountBalance } from "@/lib/account-utils";
export default function AccountsPage() {
const { data, isLoading, refresh } = useBankingData();
@@ -26,6 +27,7 @@ export default function AccountsPage() {
type: "CHECKING" as Account["type"],
folderId: "folder-root",
externalUrl: "",
initialBalance: 0,
});
if (isLoading || !data) {
@@ -46,6 +48,7 @@ export default function AccountsPage() {
type: account.type,
folderId: account.folderId || "folder-root",
externalUrl: account.externalUrl || "",
initialBalance: account.initialBalance || 0,
});
setIsDialogOpen(true);
};
@@ -60,6 +63,7 @@ export default function AccountsPage() {
type: formData.type,
folderId: formData.folderId,
externalUrl: formData.externalUrl || null,
initialBalance: formData.initialBalance,
};
await updateAccount(updatedAccount);
refresh();
@@ -126,7 +130,10 @@ export default function AccountsPage() {
return data.transactions.filter((t) => t.accountId === accountId).length;
};
const totalBalance = data.accounts.reduce((sum, a) => sum + a.balance, 0);
const totalBalance = data.accounts.reduce(
(sum, a) => sum + getAccountBalance(a),
0,
);
// Grouper les comptes par folder
const accountsByFolder = data.accounts.reduce(
@@ -194,6 +201,24 @@ export default function AccountsPage() {
<span className="text-sm text-muted-foreground">
({accountsByFolder["no-folder"].length})
</span>
<span
className={cn(
"text-sm font-semibold tabular-nums ml-auto",
accountsByFolder["no-folder"].reduce(
(sum, a) => sum + getAccountBalance(a),
0,
) >= 0
? "text-emerald-600"
: "text-red-600",
)}
>
{formatCurrency(
accountsByFolder["no-folder"].reduce(
(sum, a) => sum + getAccountBalance(a),
0,
),
)}
</span>
</div>
<div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
{accountsByFolder["no-folder"].map((account) => {
@@ -225,7 +250,7 @@ export default function AccountsPage() {
if (folderAccounts.length === 0) return null;
const folderBalance = folderAccounts.reduce(
(sum, a) => sum + a.balance,
(sum, a) => sum + getAccountBalance(a),
0,
);

19
app/statistics/page.tsx
View File

@@ -10,6 +10,7 @@ import {
TopExpensesList,
} from "@/components/statistics";
import { useBankingData } from "@/lib/hooks";
import { getAccountBalance } from "@/lib/account-utils";
import {
Select,
SelectContent,
@@ -231,7 +232,19 @@ export default function StatisticsPage() {
(a, b) => new Date(a.date).getTime() - new Date(b.date).getTime()
);
// Start with sum of initial balances for filtered accounts
let runningBalance = 0;
if (selectedAccounts.includes("all")) {
runningBalance = data.accounts.reduce(
(sum, acc) => sum + (acc.initialBalance || 0),
0,
);
} else {
runningBalance = data.accounts
.filter((acc) => selectedAccounts.includes(acc.id))
.reduce((sum, acc) => sum + (acc.initialBalance || 0), 0);
}
const aggregatedBalanceByDate = new Map<string, number>();
sortedFilteredTransactions.forEach((t) => {
runningBalance += t.amount;
@@ -254,10 +267,10 @@ export default function StatisticsPage() {
accountBalances.set(account.id, new Map());
});
// Calculate running balance per account
// Calculate running balance per account (start with initialBalance)
const accountRunningBalances = new Map<string, number>();
data.accounts.forEach((account) => {
accountRunningBalances.set(account.id, 0);
accountRunningBalances.set(account.id, account.initialBalance || 0);
});
sortedFilteredTransactions.forEach((t) => {
@@ -280,7 +293,7 @@ export default function StatisticsPage() {
const sortedDates = Array.from(allDates).sort();
const lastBalances = new Map<string, number>();
data.accounts.forEach((account) => {
lastBalances.set(account.id, 0);
lastBalances.set(account.id, account.initialBalance || 0);
});
const perAccountBalanceData = sortedDates.map((date) => {

10
components/accounts/account-card.tsx
View File

@@ -14,6 +14,7 @@ import Link from "next/link";
import type { Account, Folder } from "@/lib/types";
import { accountTypeIcons, accountTypeLabels } from "./constants";
import { Checkbox } from "@/components/ui/checkbox";
import { getAccountBalance } from "@/lib/account-utils";
interface AccountCardProps {
account: Account;
@@ -37,10 +38,11 @@ export function AccountCard({
onSelect,
}: AccountCardProps) {
const Icon = accountTypeIcons[account.type];
const realBalance = getAccountBalance(account);
return (
<Card className={cn("relative", isSelected && "ring-2 ring-primary")}>
<CardHeader className="pb-1.5">
<CardHeader className="pb-0">
<div className="flex items-start justify-between">
<div className="flex items-center gap-2 flex-1">
{onSelect && (
@@ -89,14 +91,14 @@ export function AccountCard({
</DropdownMenu>
</div>
</CardHeader>
<CardContent className="pt-1.5">
<CardContent className="pt-1">
<div
className={cn(
"text-xl font-bold mb-1.5",
account.balance >= 0 ? "text-emerald-600" : "text-red-600"
realBalance >= 0 ? "text-emerald-600" : "text-red-600"
)}
>
{formatCurrency(account.balance)}
{formatCurrency(realBalance)}
</div>
<div className="flex items-center justify-between text-xs text-muted-foreground">
<Link

19
components/accounts/account-edit-dialog.tsx
View File

@@ -24,6 +24,7 @@ interface AccountFormData {
type: Account["type"];
folderId: string;
externalUrl: string;
initialBalance: number;
}
interface AccountEditDialogProps {
@@ -99,6 +100,24 @@ export function AccountEditDialog({
</SelectContent>
</Select>
</div>
<div className="space-y-2">
<Label>Solde initial</Label>
<Input
type="number"
step="0.01"
value={formData.initialBalance}
onChange={(e) =>
onFormDataChange({
...formData,
initialBalance: parseFloat(e.target.value) || 0,
})
}
placeholder="0.00"
/>
<p className="text-xs text-muted-foreground">
Solde de départ pour équilibrer le compte
</p>
</div>
<div className="space-y-2">
<Label>Lien externe (portail banque)</Label>
<Input

14
components/dashboard/accounts-summary.tsx
View File

@@ -5,6 +5,7 @@ import { Progress } from "@/components/ui/progress";
import type { BankingData } from "@/lib/types";
import { cn } from "@/lib/utils";
import { Building2 } from "lucide-react";
import { getAccountBalance } from "@/lib/account-utils";
interface AccountsSummaryProps {
data: BankingData;
@@ -19,8 +20,8 @@ export function AccountsSummary({ data }: AccountsSummaryProps) {
};
const totalPositive = data.accounts
.filter((a) => a.balance > 0)
.reduce((sum, a) => sum + a.balance, 0);
.filter((a) => getAccountBalance(a) > 0)
.reduce((sum, a) => sum + getAccountBalance(a), 0);
if (data.accounts.length === 0) {
return (
@@ -49,9 +50,10 @@ export function AccountsSummary({ data }: AccountsSummaryProps) {
<CardContent>
<div className="space-y-4">
{data.accounts.map((account) => {
const realBalance = getAccountBalance(account);
const percentage =
totalPositive > 0
? Math.max(0, (account.balance / totalPositive) * 100)
? Math.max(0, (realBalance / totalPositive) * 100)
: 0;
return (
@@ -71,15 +73,15 @@ export function AccountsSummary({ data }: AccountsSummaryProps) {
<span
className={cn(
"font-semibold tabular-nums",
account.balance >= 0
realBalance >= 0
? "text-emerald-600"
: "text-red-600",
)}
>
{formatCurrency(account.balance)}
{formatCurrency(realBalance)}
</span>
</div>
{account.balance > 0 && (
{realBalance > 0 && (
<Progress value={percentage} className="h-1.5" />
)}
</div>

6
components/dashboard/overview-cards.tsx
View File

@@ -3,13 +3,17 @@
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { TrendingUp, TrendingDown, Wallet, CreditCard } from "lucide-react";
import type { BankingData } from "@/lib/types";
import { getAccountBalance } from "@/lib/account-utils";
interface OverviewCardsProps {
data: BankingData;
}
export function OverviewCards({ data }: OverviewCardsProps) {
const totalBalance = data.accounts.reduce((sum, acc) => sum + acc.balance, 0);
const totalBalance = data.accounts.reduce(
(sum, acc) => sum + getAccountBalance(acc),
0,
);
const thisMonth = new Date();
thisMonth.setDate(1);

6
components/folders/draggable-account-item.tsx
View File

@@ -7,6 +7,7 @@ import { Building2, GripVertical, Pencil } from "lucide-react";
import { cn } from "@/lib/utils";
import Link from "next/link";
import type { Account } from "@/lib/types";
import { getAccountBalance } from "@/lib/account-utils";
interface DraggableAccountItemProps {
account: Account;
@@ -19,6 +20,7 @@ export function DraggableAccountItem({
onEditAccount,
formatCurrency,
}: DraggableAccountItemProps) {
const realBalance = getAccountBalance(account);
const {
attributes,
listeners,
@@ -71,10 +73,10 @@ export function DraggableAccountItem({
<span
className={cn(
"text-sm tabular-nums",
account.balance >= 0 ? "text-emerald-600" : "text-red-600"
realBalance >= 0 ? "text-emerald-600" : "text-red-600"
)}
>
{formatCurrency(account.balance)}
{formatCurrency(realBalance)}
</span>
<Button
variant="ghost"

6
components/folders/folder-tree-item.tsx
View File

@@ -4,6 +4,7 @@ import { useState } from "react";
import { DraggableFolderItem } from "./draggable-folder-item";
import { DraggableAccountItem } from "./draggable-account-item";
import type { Folder as FolderType, Account } from "@/lib/types";
import { getAccountBalance } from "@/lib/account-utils";
interface FolderTreeItemProps {
folder: FolderType;
@@ -35,7 +36,10 @@ export function FolderTreeItem({
(folder.id === "folder-root" && a.folderId === null)
);
const childFolders = allFolders.filter((f) => f.parentId === folder.id);
const folderTotal = folderAccounts.reduce((sum, a) => sum + a.balance, 0);
const folderTotal = folderAccounts.reduce(
(sum, a) => sum + getAccountBalance(a),
0,
);
return (
<div>

9
lib/account-utils.ts Normal file
View File

@@ -0,0 +1,9 @@
import type { Account } from "./types";
/**
* Calcule le solde réel d'un compte en incluant le solde initial
*/
export function getAccountBalance(account: Account): number {
return (account.initialBalance || 0) + account.balance;
}

1
lib/types.ts
View File

@@ -22,6 +22,7 @@ export interface Account {
type: "CHECKING" | "SAVINGS" | "CREDIT_CARD" | "OTHER";
folderId: string | null;
balance: number;
initialBalance: number;
currency: string;
lastImport: string | null;
externalUrl: string | null;

1
prisma/schema.prisma
View File

@@ -18,6 +18,7 @@ model Account {
type String // CHECKING | SAVINGS | CREDIT_CARD | OTHER
folderId String?
balance Float @default(0)
initialBalance Float @default(0) // Solde de départ pour équilibrer
currency String @default("EUR")
lastImport String?
externalUrl String? // Custom URL for external bank portal

4
services/account.service.ts
View File

@@ -11,6 +11,7 @@ export const accountService = {
type: data.type,
folderId: data.folderId,
balance: data.balance,
initialBalance: data.initialBalance ?? 0,
currency: data.currency,
lastImport: data.lastImport,
externalUrl: data.externalUrl,
@@ -25,6 +26,7 @@ export const accountService = {
type: created.type as Account["type"],
folderId: created.folderId,
balance: created.balance,
initialBalance: created.initialBalance,
currency: created.currency,
lastImport: created.lastImport,
externalUrl: created.externalUrl,
@@ -44,6 +46,7 @@ export const accountService = {
type: data.type,
folderId: data.folderId,
balance: data.balance,
initialBalance: data.initialBalance,
currency: data.currency,
lastImport: data.lastImport,
externalUrl: data.externalUrl,
@@ -58,6 +61,7 @@ export const accountService = {
type: updated.type as Account["type"],
folderId: updated.folderId,
balance: updated.balance,
initialBalance: updated.initialBalance,
currency: updated.currency,
lastImport: updated.lastImport,
externalUrl: updated.externalUrl,

1
services/banking.service.ts
View File

@@ -36,6 +36,7 @@ export const bankingService = {
type: a.type as Account["type"],
folderId: a.folderId,
balance: a.balance,
initialBalance: a.initialBalance,
currency: a.currency,
lastImport: a.lastImport,
externalUrl: a.externalUrl,