feat: add loan payment functionality to transactions workflow and update related components

Author: dmsLakmal

actions/transactions.ts

@@ -14,7 +14,12 @@ import {
 import { AccountModel } from "@/models/Account";
 import { TransactionModel } from "@/models/Transaction";
 
-type TransactionType = "earning" | "expense";
+type EditableTransactionType = "earning" | "expense";
+type TransactionType =
+  | EditableTransactionType
+  | "transfer"
+  | "transfer_fee"
+  | "loan_repayment";
 
 export type TransactionListItem = {
   id: string;
@@ -27,7 +32,7 @@ export type TransactionListItem = {
   createdAt: string;
 };
 
-function effectFor(type: TransactionType, amount: number) {
+function effectFor(type: EditableTransactionType, amount: number) {
   return type === "earning" ? amount : -amount;
 }
 
@@ -207,11 +212,11 @@ export async function updateTransactionForTenant(
     await applyBalanceEffectOrThrow(
       existing.accountId.toString(),
       tenantId,
-      -effectFor(existing.type as TransactionType, existing.amount),
+      -effectFor(existing.type as EditableTransactionType, existing.amount),
     );
 
     const nextAccountId = payload.accountId ?? existing.accountId.toString();
-    const nextType = (payload.type ?? existing.type) as TransactionType;
+    const nextType = (payload.type ?? existing.type) as EditableTransactionType;
     const nextAmount = payload.amount ?? existing.amount;
 
     await applyBalanceEffectOrThrow(
@@ -276,7 +281,7 @@ export async function deleteTransactionForTenant(
     await applyBalanceEffectOrThrow(
       existing.accountId.toString(),
       tenantId,
-      -effectFor(existing.type as TransactionType, existing.amount),
+      -effectFor(existing.type as EditableTransactionType, existing.amount),
     );
 
     await existing.deleteOne();

app/(dashboard)/reports/page.tsx

@@ -308,7 +308,7 @@ export default async function ReportsPage({
                 <div className='flex justify-between gap-3 text-sm'>
                   <span className='font-medium text-slate-700 flex items-center gap-2'>
                     <span
-                      className={`w-2 h-2 rounded-full ${category.type === 'INCOME' ? 'bg-emerald-500' : 'bg-rose-500'}`}
+                      className={`w-2 h-2 rounded-full ${category.type === 'earning' ? 'bg-emerald-500' : 'bg-rose-500'}`}
                     ></span>
                     {category.category}
                   </span>
@@ -322,7 +322,7 @@ export default async function ReportsPage({
                 </div>
                 <div className='h-2 rounded-full bg-slate-100 overflow-hidden'>
                   <div
-                    className={`h-full rounded-full ${category.type === 'INCOME' ? 'bg-emerald-400' : 'bg-sky-400'}`}
+                    className={`h-full rounded-full ${category.type === 'earning' ? 'bg-emerald-400' : 'bg-sky-400'}`}
                     style={{
                       width: barWidth(category.total, maxCategoryTotal),
                     }}

app/(dashboard)/transactions/new/page.tsx

@@ -1,24 +1,56 @@
+import Link from 'next/link';
+
 import { listAccountsByTenant } from '@/actions/accounts';
+import { listLoansByTenant } from '@/actions/loans';
 import NewTransactionForm from '@/components/transactions/new-transaction-form';
 import { getTenantIdOrThrow } from '@/lib/tenant/getTenant';
 
-export default async function NewTransactionPage() {
+type SearchParams = {
+  mode?: string;
+};
+
+export default async function NewTransactionPage({
+  searchParams,
+}: {
+  searchParams: Promise<SearchParams>;
+}) {
   const tenantId = await getTenantIdOrThrow();
-  const accounts = await listAccountsByTenant(tenantId);
+  const params = await searchParams;
+  const [accounts, loans] = await Promise.all([
+    listAccountsByTenant(tenantId),
+    listLoansByTenant(tenantId),
+  ]);
+  const openLoans = loans.filter((loan) => !loan.isClosed);
+  const initialMode =
+    params.mode === 'loan_repayment' ? 'loan_repayment' : undefined;
 
   return (
     <div className='max-w-2xl mx-auto space-y-6'>
-      <header className='pb-4 border-b border-slate-200'>
-        <h1 className='text-2xl font-bold tracking-tight text-slate-900'>
-          Add Transaction
-        </h1>
-        <p className='text-sm text-slate-500 mt-1'>
-          Record a new earning or expense.
-        </p>
+      <header className='flex flex-col sm:flex-row sm:items-center justify-between gap-4 pb-4 border-b border-slate-200'>
+        <div>
+          <h1 className='text-2xl font-bold tracking-tight text-slate-900'>
+            Add Transaction
+          </h1>
+          <p className='text-sm text-slate-500 mt-1'>
+            Record earning, expense, or loan payment activity.
+          </p>
+        </div>
+        {openLoans.length === 0 ? (
+          <Link
+            className='btn-secondary text-sm text-center'
+            href='/loans/new'
+          >
+            New Loan
+          </Link>
+        ) : null}
       </header>
 
       <div className='card p-6'>
-        <NewTransactionForm accounts={accounts} />
+        <NewTransactionForm
+          accounts={accounts}
+          loans={openLoans}
+          initialMode={initialMode}
+        />
       </div>
     </div>
   );

app/(dashboard)/transactions/page.tsx

@@ -69,6 +69,26 @@ export default async function TransactionsPage({
             </svg>
             Add Transaction
           </Link>
+          <Link
+            className='btn-secondary flex items-center gap-2 text-sm'
+            href='/transactions/new?mode=loan_repayment'
+          >
+            <svg
+              className='w-4 h-4'
+              fill='none'
+              stroke='currentColor'
+              viewBox='0 0 24 24'
+              xmlns='http://www.w3.org/2000/svg'
+            >
+              <path
+                strokeLinecap='round'
+                strokeLinejoin='round'
+                strokeWidth={2}
+                d='M12 8c-1.657 0-3 .895-3 2s1.343 2 3 2 3 .895 3 2-1.343 2-3 2m0-8V7m0 10v-1m9-4a9 9 0 11-18 0 9 9 0 0118 0z'
+              />
+            </svg>
+            Loan Payment
+          </Link>
           <Link
             className='btn-secondary flex items-center gap-2 text-sm'
             href='/transactions/transfer'

app/api/admin/audits/export/route.ts

@@ -33,7 +33,7 @@ export async function GET(request: Request) {
           audits.items.map((item) => ({
             id: item.id,
             action: item.action,
-            status: item.status,
+            status: item.status ?? "",
             tenantId: item.tenantId ?? undefined,
             actorId: item.actorId ?? undefined,
             ipAddress: item.ipAddress ?? undefined,

app/api/loans/[loanId]/route.ts

@@ -1,9 +1,6 @@
 import { NextResponse } from "next/server";
 
-import {
-  getLoanByIdForTenant,
-  listLoanRepaymentsByTenant,
-} from "@/actions/loans";
+import { getLoanDetailForTenant } from "@/actions/loans";
 import { getTenantIdOrThrow } from "@/lib/tenant/getTenant";
 
 export async function GET(
@@ -14,16 +11,16 @@ export async function GET(
     const tenantId = await getTenantIdOrThrow();
     const { loanId } = await context.params;
 
-    const [loan, repayments] = await Promise.all([
-      getLoanByIdForTenant(tenantId, loanId),
-      listLoanRepaymentsByTenant(tenantId, loanId),
-    ]);
+    const loan = await getLoanDetailForTenant(tenantId, loanId);
 
     if (!loan) {
       return NextResponse.json({ error: "Loan not found" }, { status: 404 });
     }
 
-    return NextResponse.json({ loan, repayments }, { status: 200 });
+    return NextResponse.json(
+      { loan, repayments: loan.repayments },
+      { status: 200 },
+    );
   } catch (error) {
     const message =
       error instanceof Error ? error.message : "Failed to fetch loan details";

app/api/reports/export/route.ts

@@ -1,11 +1,8 @@
 import { NextResponse } from "next/server";
 
-import { getFinancialInsights, toCsvReport } from "@/actions/reports";
+import { getFinancialReportForTenant, reportToCsv } from "@/actions/reports";
 import { getTenantIdOrThrow } from "@/lib/tenant/getTenant";
-import {
-  exportFormatSchema,
-  reportFilterSchema,
-} from "@/lib/validators/report";
+import { reportFilterSchema } from "@/lib/validators/report";
 
 export async function GET(request: Request) {
   try {
@@ -16,16 +13,14 @@ export async function GET(request: Request) {
       accountId: searchParams.get("accountId") ?? undefined,
       fromDate: searchParams.get("fromDate") ?? undefined,
       toDate: searchParams.get("toDate") ?? undefined,
+      format: searchParams.get("format") ?? undefined,
     });
 
-    const format = exportFormatSchema.parse(
-      searchParams.get("format") ?? "json",
-    );
-
-    const insights = await getFinancialInsights(tenantId, filters);
+    const format = filters.format ?? "json";
+    const report = await getFinancialReportForTenant(tenantId, filters);
 
     if (format === "csv") {
-      const csv = toCsvReport(insights);
+      const csv = reportToCsv(report);
 
       return new NextResponse(csv, {
         status: 200,
@@ -36,7 +31,7 @@ export async function GET(request: Request) {
       });
     }
 
-    return NextResponse.json({ insights }, { status: 200 });
+    return NextResponse.json({ report }, { status: 200 });
   } catch (error) {
     const message =
       error instanceof Error ? error.message : "Failed to export report";

app/api/reports/summary/route.ts

@@ -1,6 +1,6 @@
 import { NextResponse } from "next/server";
 
-import { getFinancialInsights } from "@/actions/reports";
+import { getFinancialReportForTenant } from "@/actions/reports";
 import { getTenantIdOrThrow } from "@/lib/tenant/getTenant";
 import { reportFilterSchema } from "@/lib/validators/report";
 
@@ -15,9 +15,9 @@ export async function GET(request: Request) {
       toDate: searchParams.get("toDate") ?? undefined,
     });
 
-    const insights = await getFinancialInsights(tenantId, filters);
+    const report = await getFinancialReportForTenant(tenantId, filters);
 
-    return NextResponse.json({ insights }, { status: 200 });
+    return NextResponse.json({ report }, { status: 200 });
   } catch (error) {
     const message =
       error instanceof Error ? error.message : "Failed to generate report";