From 81845d47f299c3c4efb4b0bccb6d5103ae0a846e Mon Sep 17 00:00:00 2001
From: hackerESQ <corey@coreyvarma.com>
Date: Thu, 17 Jul 2025 20:38:29 -0500
Subject: [PATCH] fix: cost basis for holding calculations

---
 app/Models/Holding.php | 21 +++++++------------
 tests/HoldingsTest.php | 46 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 14 deletions(-)
 create mode 100644 tests/HoldingsTest.php

diff --git a/app/Models/Holding.php b/app/Models/Holding.php
index 6ffa077..b217aa8 100644
--- a/app/Models/Holding.php
+++ b/app/Models/Holding.php
@@ -323,19 +323,12 @@ class Holding extends Model
                                         AS rate"
                             )
                             ->selectRaw(
-                                "(CASE
-                                        WHEN transactions.transaction_type = 'BUY'
-                                            THEN AVG(transactions.cost_basis_base)
-                                        ELSE (
-                                            SELECT
-                                                AVG(-buy.cost_basis_base)
-                                            FROM transactions as buy
-                                            WHERE buy.symbol = transactions.symbol
-                                                AND buy.portfolio_id = transactions.portfolio_id
-                                                AND buy.transaction_type = 'BUY'
-                                                AND buy.date <= transactions.date
-                                        ) END)
-                                        AS cost_basis_base"
+                                "CASE
+                                    WHEN transactions.transaction_type = 'BUY'
+                                    THEN transactions.quantity
+                                    ELSE -transactions.quantity
+                                END
+                                AS remaining_quantity"
                             )
                             ->groupBy([
                                 'transactions.symbol',
@@ -353,7 +346,7 @@ class Holding extends Model
                         "SUM(CASE WHEN transactions.transaction_type = 'SELL' THEN (transactions.sale_price_base - transactions.cost_basis_base) * transactions.quantity * COALESCE(cr.rate, 1) ELSE 0 END) AS realized_gain_dollars"
                     )
                     ->selectRaw(
-                        'SUM(cost_basis_display.cost_basis_base * cost_basis_display.quantity * cost_basis_display.rate) AS total_cost_basis'
+                        "SUM(CASE WHEN transactions.transaction_type = 'BUY' THEN transactions.cost_basis_base * transactions.quantity * cost_basis_display.rate END) / SUM(CASE WHEN transactions.transaction_type = 'BUY' THEN transactions.quantity END) * SUM(cost_basis_display.remaining_quantity) AS total_cost_basis"
                     )
                     ->groupBy(['transactions.symbol', 'transactions.portfolio_id']),
                 'transactions_display',
diff --git a/tests/HoldingsTest.php b/tests/HoldingsTest.php
new file mode 100644
index 0000000..834e702
--- /dev/null
+++ b/tests/HoldingsTest.php
@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests;
+
+use App\Models\Holding;
+use App\Models\Portfolio;
+use App\Models\Transaction;
+use App\Models\User;
+use Illuminate\Foundation\Testing\RefreshDatabase;
+
+class HoldingsTest extends TestCase
+{
+    use RefreshDatabase;
+
+    public function test_calculates_cost_basis(): void
+    {
+        $this->actingAs($user = User::factory()->create());
+
+        $portfolio = Portfolio::factory()->create();
+
+        Transaction::factory()->buy()->lastYear()->costBasis(200)->portfolio($portfolio->id)->symbol('AAPL')->create();
+        Transaction::factory()->buy()->lastMonth()->costBasis(300)->portfolio($portfolio->id)->symbol('AAPL')->create();
+        $holding = Holding::query()->getPortfolioMetrics();
+        $this->assertEquals(500, $holding->get('total_cost_basis'));
+    }
+
+    public function test_calculates_cost_basis_after_multiple_sales(): void
+    {
+        $this->actingAs($user = User::factory()->create());
+
+        $portfolio = Portfolio::factory()->create();
+
+        Transaction::factory()->buy()->lastYear()->costBasis(200)->portfolio($portfolio->id)->symbol('AAPL')->create();
+        Transaction::factory()->buy()->lastMonth()->costBasis(300)->portfolio($portfolio->id)->symbol('AAPL')->create();
+
+        Transaction::factory()->sell()->recent()->costBasis(250)->portfolio($portfolio->id)->symbol('AAPL')->create();
+        $holding = Holding::query()->getPortfolioMetrics();
+        $this->assertEquals(250, $holding->get('total_cost_basis'));
+
+        Transaction::factory()->sell()->recent()->costBasis(250)->portfolio($portfolio->id)->symbol('AAPL')->create();
+        $holding = Holding::query()->getPortfolioMetrics();
+        $this->assertEquals(0, $holding->get('total_cost_basis'));
+    }
+}