From b8cd1b0f89efa1606d8162b8f07c7a3ca0dc3198 Mon Sep 17 00:00:00 2001
From: siddharthd <siddharthdevilz@gmail.com>
Date: Mon, 11 May 2026 19:15:41 +1000
Subject: [PATCH] fix(reconcile): prevent split/tag double-counting on
 reconciled transactions

Move splits, tags and overrides from manual to statement side on reconcile
(delete from manual after copying) instead of just copying. Add read-time
filter to exclude reconciled manual transactions from balance and shared
transaction queries. Also adds participant filter to shared expenses page.
---
 src/app/api/shared-transactions/route.ts    |  4 +++-
 src/app/api/transactions/reconcile/route.ts |  7 +++++--
 src/app/shared/page.tsx                     | 17 +++++++++++++++--
 src/lib/hooks.ts                            | 11 +++++++----
 src/lib/queries.ts                          | 12 +++++++++++-
 5 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/src/app/api/shared-transactions/route.ts b/src/app/api/shared-transactions/route.ts
index 493ae81..5a951b2 100644
--- a/src/app/api/shared-transactions/route.ts
+++ b/src/app/api/shared-transactions/route.ts
@@ -10,6 +10,8 @@ export async function GET(req: NextRequest) {
   const rawIds = tagParam ? tagParam.split(",").filter(Boolean) : [];
   const noTags = rawIds.includes("untagged");
   const tagIds = rawIds.filter((id) => id !== "untagged").map(Number).filter((n) => !isNaN(n));
-  const transactions = await getSharedTransactions(user.id, tagIds.length ? tagIds : undefined, noTags);
+  const participantParam = req.nextUrl.searchParams.get("participant_id");
+  const participantId = participantParam ? Number(participantParam) : undefined;
+  const transactions = await getSharedTransactions(user.id, tagIds.length ? tagIds : undefined, noTags, participantId);
   return NextResponse.json(transactions);
 }
diff --git a/src/app/api/transactions/reconcile/route.ts b/src/app/api/transactions/reconcile/route.ts
index 529c35c..e920ae1 100644
--- a/src/app/api/transactions/reconcile/route.ts
+++ b/src/app/api/transactions/reconcile/route.ts
@@ -50,18 +50,20 @@ export async function POST(req: NextRequest) {
             my_share_percent: override.my_share_percent,
           },
         });
+        await tx.transaction_overrides.deleteMany({ where: { transaction_id: manual_id } });
       }
 
-      // Copy tags: manual → statement tx
+      // Move tags: manual → statement tx
       const tags = await tx.transaction_tags.findMany({ where: { transaction_id: manual_id } });
       if (tags.length) {
         await tx.transaction_tags.createMany({
           data: tags.map((t) => ({ transaction_id: statement_tx_id, tag_id: t.tag_id })),
           skipDuplicates: true,
         });
+        await tx.transaction_tags.deleteMany({ where: { transaction_id: manual_id } });
       }
 
-      // Copy splits: manual → statement tx
+      // Move splits: manual → statement tx
       const splits = await tx.transaction_splits.findMany({ where: { transaction_id: manual_id } });
       if (splits.length) {
         await tx.transaction_splits.createMany({
@@ -72,6 +74,7 @@ export async function POST(req: NextRequest) {
           })),
           skipDuplicates: true,
         });
+        await tx.transaction_splits.deleteMany({ where: { transaction_id: manual_id } });
       }
 
       // Mark manual tx as reconciled (link to statement tx)
diff --git a/src/app/shared/page.tsx b/src/app/shared/page.tsx
index 2c6eb4b..891894a 100644
--- a/src/app/shared/page.tsx
+++ b/src/app/shared/page.tsx
@@ -4,6 +4,7 @@ import { useState, useRef, useEffect } from "react";
 import {
   useSharedTransactions,
   useParticipantBalances,
+  useParticipants,
   useCreateParticipant,
   useRecordPayment,
   usePaymentHistory,
@@ -274,10 +275,12 @@ type SortCol = "transaction_date" | "created_at" | "amount";
 
 export default function SharedPage() {
   const [tagIds, setTagIds] = useState<string[]>([]);
+  const [participantId, setParticipantId] = useState<number | undefined>(undefined);
   const [sortCol, setSortCol] = useState<SortCol>("transaction_date");
   const [sortDir, setSortDir] = useState<"asc" | "desc">("desc");
   const realTagIds = tagIds.filter((id) => id !== "untagged");
-  const { data: rawTransactions = [], isLoading: txLoading } = useSharedTransactions(tagIds);
+  const { data: participants = [] } = useParticipants();
+  const { data: rawTransactions = [], isLoading: txLoading } = useSharedTransactions(tagIds, participantId);
 
   const transactions = [...rawTransactions].sort((a, b) => {
     const av = sortCol === "amount" ? Number(a.amount) : new Date(a[sortCol]).getTime();
@@ -305,7 +308,17 @@ export default function SharedPage() {
     <div className="space-y-6">
       <div className="flex items-center justify-between gap-3">
         <h2 className="text-xl font-semibold">Shared Expenses</h2>
-        <div className="flex items-center gap-2 ml-auto">
+        <div className="flex items-center gap-2 ml-auto flex-wrap">
+          <select
+            value={participantId ?? ""}
+            onChange={(e) => setParticipantId(e.target.value ? Number(e.target.value) : undefined)}
+            className={`border rounded px-3 py-1.5 text-sm bg-zinc-900 ${participantId ? "border-indigo-500 text-white" : "border-zinc-700 text-zinc-400"}`}
+          >
+            <option value="">All People</option>
+            {participants.map((p: { id: number; name: string }) => (
+              <option key={p.id} value={p.id}>{p.name}</option>
+            ))}
+          </select>
           <TagFilter value={tagIds} onChange={setTagIds} />
           {!addingParticipant && (
             <button onClick={() => setAddingParticipant(true)}
diff --git a/src/lib/hooks.ts b/src/lib/hooks.ts
index b025a1b..2c75183 100644
--- a/src/lib/hooks.ts
+++ b/src/lib/hooks.ts
@@ -210,12 +210,15 @@ export function useParticipantBalances(tagIds?: string[]) {
   });
 }
 
-export function useSharedTransactions(tagIds?: string[]) {
+export function useSharedTransactions(tagIds?: string[], participantId?: number) {
   return useQuery({
-    queryKey: ["shared-transactions", tagIds],
+    queryKey: ["shared-transactions", tagIds, participantId],
     queryFn: async () => {
-      const params = tagIds?.length ? `?tag_ids=${tagIds.join(",")}` : "";
-      const res = await fetch(`/api/shared-transactions${params}`);
+      const sp = new URLSearchParams();
+      if (tagIds?.length) sp.set("tag_ids", tagIds.join(","));
+      if (participantId) sp.set("participant_id", String(participantId));
+      const query = sp.toString() ? `?${sp.toString()}` : "";
+      const res = await fetch(`/api/shared-transactions${query}`);
       return res.json();
     },
   });
diff --git a/src/lib/queries.ts b/src/lib/queries.ts
index b259d4f..b8eef5f 100644
--- a/src/lib/queries.ts
+++ b/src/lib/queries.ts
@@ -329,6 +329,7 @@ export async function getParticipantBalances(ownerId: number, tagIds?: number[])
       JOIN transactions t ON t.id = ts.transaction_id
       LEFT JOIN statements s ON s.id = t.statement_id
       WHERE COALESCE(t.owner_id, s.owner_id) = $1 AND ts.participant_id != $1
+        AND NOT (t.statement_id IS NULL AND t.reconciled_with_id IS NOT NULL)
       ${tagFilter}
 
       UNION ALL
@@ -341,6 +342,7 @@ export async function getParticipantBalances(ownerId: number, tagIds?: number[])
       JOIN transactions t ON t.id = ts.transaction_id
       LEFT JOIN statements s ON s.id = t.statement_id
       WHERE ts.participant_id = $1 AND COALESCE(t.owner_id, s.owner_id) != $1
+        AND NOT (t.statement_id IS NULL AND t.reconciled_with_id IS NOT NULL)
       ${tagFilter}
     ) splits ON splits.pid = p.id
     ${paymentsJoin}
@@ -542,7 +544,7 @@ export async function getTags() {
   `);
 }
 
-export async function getSharedTransactions(ownerId: number, tagIds?: number[], noTags?: boolean) {
+export async function getSharedTransactions(ownerId: number, tagIds?: number[], noTags?: boolean, participantId?: number) {
   const params: unknown[] = [ownerId];
   let tagClause = "";
   if (noTags) {
@@ -552,6 +554,12 @@ export async function getSharedTransactions(ownerId: number, tagIds?: number[],
     tagClause = `AND EXISTS (SELECT 1 FROM transaction_tags tt WHERE tt.transaction_id = t.id AND tt.tag_id = ANY($2::int[]))`;
   }
 
+  let participantClause = "";
+  if (participantId) {
+    params.push(participantId);
+    participantClause = `AND EXISTS (SELECT 1 FROM transaction_splits ts_p WHERE ts_p.transaction_id = t.id AND ts_p.participant_id = $${params.length})`;
+  }
+
   const rows = await queryRaw<TransactionRow & { split_data: string }>(`
     SELECT t.*,
       o.category_override, o.merchant_normalized as merchant_override, o.notes,
@@ -584,7 +592,9 @@ export async function getSharedTransactions(ownerId: number, tagIds?: number[],
           AND EXISTS (SELECT 1 FROM transaction_splits ts_me WHERE ts_me.transaction_id = t.id AND ts_me.participant_id = $1)
         )
       )
+      AND NOT (t.statement_id IS NULL AND t.reconciled_with_id IS NOT NULL)
     ${tagClause}
+    ${participantClause}
     GROUP BY t.id, o.category_override, o.merchant_normalized, o.notes, s.bank_name, s.owner_id, p_owner.name, src.created_at
     ORDER BY t.transaction_date DESC
   `, params);