diff --git a/prisma/migrations/20231207005126_reimbursement/migration.sql b/prisma/migrations/20231207005126_reimbursement/migration.sql new file mode 100644 index 0000000..2c6b1c6 --- /dev/null +++ b/prisma/migrations/20231207005126_reimbursement/migration.sql @@ -0,0 +1,2 @@ +-- AlterTable +ALTER TABLE "Expense" ADD COLUMN "isReimbursement" BOOLEAN NOT NULL DEFAULT false; diff --git a/prisma/schema.prisma b/prisma/schema.prisma index 5ee1575..cc88c4e 100644 --- a/prisma/schema.prisma +++ b/prisma/schema.prisma @@ -29,14 +29,15 @@ model Participant { } model Expense { - id String @id - group Group @relation(fields: [groupId], references: [id]) - title String - amount Int - paidBy Participant @relation(fields: [paidById], references: [id]) - paidById String - paidFor ExpensePaidFor[] - groupId String + id String @id + group Group @relation(fields: [groupId], references: [id]) + title String + amount Int + paidBy Participant @relation(fields: [paidById], references: [id]) + paidById String + paidFor ExpensePaidFor[] + groupId String + isReimbursement Boolean @default(false) } model ExpensePaidFor { diff --git a/src/app/groups/[groupId]/balances/page.tsx b/src/app/groups/[groupId]/balances/page.tsx index 33ba653..ab2c582 100644 --- a/src/app/groups/[groupId]/balances/page.tsx +++ b/src/app/groups/[groupId]/balances/page.tsx @@ -22,7 +22,6 @@ export default async function GroupPage({ const expenses = await getGroupExpenses(groupId) const balances = getBalances(expenses) const reimbursements = getSuggestedReimbursements(balances) - console.log(reimbursements) return ( <> @@ -54,6 +53,7 @@ export default async function GroupPage({ reimbursements={reimbursements} participants={group.participants} currency={group.currency} + groupId={groupId} /> diff --git a/src/app/groups/[groupId]/expenses/page.tsx b/src/app/groups/[groupId]/expenses/page.tsx index 2eb98ab..c99d081 100644 --- a/src/app/groups/[groupId]/expenses/page.tsx +++ b/src/app/groups/[groupId]/expenses/page.tsx @@ -16,6 +16,7 @@ import { TableRow, } from '@/components/ui/table' import { getGroup, getGroupExpenses } from '@/lib/api' +import { cn } from '@/lib/utils' import { ChevronRight, Plus } from 'lucide-react' import Link from 'next/link' import { notFound } from 'next/navigation' @@ -62,7 +63,10 @@ export default async function GroupExpensesPage({ {expenses.map((expense) => ( - + {expense.title} diff --git a/src/app/groups/[groupId]/reimbursement-list.tsx b/src/app/groups/[groupId]/reimbursement-list.tsx index 9d3ec49..3fc94bc 100644 --- a/src/app/groups/[groupId]/reimbursement-list.tsx +++ b/src/app/groups/[groupId]/reimbursement-list.tsx @@ -1,16 +1,20 @@ +import { Button } from '@/components/ui/button' import { Reimbursement } from '@/lib/balances' import { Participant } from '@prisma/client' +import Link from 'next/link' type Props = { reimbursements: Reimbursement[] participants: Participant[] currency: string + groupId: string } export function ReimbursementList({ reimbursements, participants, currency, + groupId, }: Props) { const getParticipant = (id: string) => participants.find((p) => p.id === id) return ( @@ -20,6 +24,13 @@ export function ReimbursementList({
{getParticipant(reimbursement.from)?.name} owes{' '} {getParticipant(reimbursement.to)?.name} +
{currency} {reimbursement.amount.toFixed(2)} diff --git a/src/components/expense-form.tsx b/src/components/expense-form.tsx index 6420bc6..3f6490f 100644 --- a/src/components/expense-form.tsx +++ b/src/components/expense-form.tsx @@ -29,6 +29,7 @@ import { import { getExpense, getGroup } from '@/lib/api' import { ExpenseFormValues, expenseFormSchema } from '@/lib/schemas' import { zodResolver } from '@hookform/resolvers/zod' +import { useSearchParams } from 'next/navigation' import { useForm } from 'react-hook-form' export type Props = { @@ -40,6 +41,7 @@ export type Props = { export function ExpenseForm({ group, expense, onSubmit, onDelete }: Props) { const isCreate = expense === undefined + const searchParams = useSearchParams() const form = useForm({ resolver: zodResolver(expenseFormSchema), defaultValues: expense @@ -48,8 +50,17 @@ export function ExpenseForm({ group, expense, onSubmit, onDelete }: Props) { amount: expense.amount, paidBy: expense.paidById, paidFor: expense.paidFor.map(({ participantId }) => participantId), + isReimbursement: expense.isReimbursement, } - : { title: '', amount: 0, paidFor: [] }, + : searchParams.get('reimbursement') + ? { + title: 'Reimbursement', + amount: Number(searchParams.get('amount')) || 0, + paidBy: searchParams.get('from') ?? undefined, + paidFor: [searchParams.get('to') ?? undefined], + isReimbursement: true, + } + : { title: '', amount: 0, paidFor: [], isReimbursement: false }, }) return ( @@ -131,8 +142,25 @@ export function ExpenseForm({ group, expense, onSubmit, onDelete }: Props) { />
- Enter the expense amount. + + ( + + + + +
+ This is a reimbursement +
+
+ )} + /> )} /> @@ -141,7 +169,7 @@ export function ExpenseForm({ group, expense, onSubmit, onDelete }: Props) { control={form.control} name="paidFor" render={() => ( - +
Paid for diff --git a/src/lib/api.ts b/src/lib/api.ts index 4fd4c39..4ae88ef 100644 --- a/src/lib/api.ts +++ b/src/lib/api.ts @@ -53,6 +53,7 @@ export async function createExpense( })), }, }, + isReimbursement: expenseFormValues.isReimbursement, }, }) } @@ -105,6 +106,7 @@ export async function updateExpense( ), ), }, + isReimbursement: expenseFormValues.isReimbursement, }, }) } diff --git a/src/lib/balances.ts b/src/lib/balances.ts index 54dea00..a53bd01 100644 --- a/src/lib/balances.ts +++ b/src/lib/balances.ts @@ -54,7 +54,6 @@ export function getSuggestedReimbursements( ([participantId, { total }]) => ({ participantId, total }), ) balancesArray.sort((b1, b2) => b2.total - b1.total) - console.log(balancesArray) const reimbursements: Reimbursement[] = [] while (balancesArray.length > 1) { const first = balancesArray[0] diff --git a/src/lib/schemas.ts b/src/lib/schemas.ts index 6f0c15c..5c3489b 100644 --- a/src/lib/schemas.ts +++ b/src/lib/schemas.ts @@ -49,6 +49,7 @@ export const expenseFormSchema = z.object({ paidFor: z .array(z.string()) .min(1, 'The expense must be paid for at least 1 participant.'), + isReimbursement: z.boolean(), }) export type ExpenseFormValues = z.infer