javier/investbrain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: cost basis calculations on daily change queries

Browse Source
This commit is contained in:
hackerESQ
2025-07-17 22:00:30 -05:00
parent 81845d47f2
commit 81af737204
1 changed files with 39 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Models/DailyChange.php
+39 -25
View File
@@ -96,6 +96,7 @@ class DailyChange extends Model
'tx1.date', 'tx1.date',
'tx1.symbol', 'tx1.symbol',
'tx1.transaction_type', 'tx1.transaction_type',
'tx1.cost_basis_base',
'tx1.quantity', 'tx1.quantity',
]) ])
->selectRaw("(CASE ->selectRaw("(CASE
@@ -119,19 +120,13 @@ class DailyChange extends Model
) END) ) END)
AS rate") AS rate")
->selectRaw( ->selectRaw(
"(CASE "CASE
WHEN tx1.transaction_type = 'BUY' WHEN tx1.transaction_type = 'BUY'
THEN AVG(tx1.cost_basis_base) THEN tx1.quantity
ELSE ( ELSE -tx1.quantity
SELECT END
AVG(-buy.cost_basis_base) AS remaining_quantity"
FROM transactions as buy )
WHERE buy.symbol = tx1.symbol
AND buy.portfolio_id = tx1.portfolio_id
AND buy.transaction_type = 'BUY'
AND buy.date <= tx1.date
) END)
AS cost_basis_base")
->selectRaw( ->selectRaw(
"(CASE "(CASE
WHEN tx1.transaction_type = 'SELL' WHEN tx1.transaction_type = 'SELL'
@@ -161,19 +156,38 @@ class DailyChange extends Model
$join->on('cr.date', '=', 'daily_change.date') $join->on('cr.date', '=', 'daily_change.date')
->where('cr.currency', '=', $currency); ->where('cr.currency', '=', $currency);
}) })
->selectRaw(' ->selectRaw("
SUM( (SUM(
cost_basis_display.cost_basis_base CASE
* cost_basis_display.quantity WHEN cost_basis_display.transaction_type = 'BUY'
* cost_basis_display.rate THEN cost_basis_display.cost_basis_base * cost_basis_display.quantity * cost_basis_display.rate
) as total_cost_basis') END
->selectRaw('( )
/ SUM(
CASE
WHEN cost_basis_display.transaction_type = 'BUY'
THEN cost_basis_display.quantity
END
))
* SUM(cost_basis_display.remaining_quantity)
AS total_cost_basis
")
->selectRaw("(
daily_change.total_market_value * COALESCE(cr.rate, 1) daily_change.total_market_value * COALESCE(cr.rate, 1)
) - SUM( ) - (SUM(
cost_basis_display.cost_basis_base CASE
* cost_basis_display.quantity WHEN cost_basis_display.transaction_type = 'BUY'
* cost_basis_display.rate THEN cost_basis_display.cost_basis_base * cost_basis_display.quantity * cost_basis_display.rate
) as total_gain') END
)
/ SUM(
CASE
WHEN cost_basis_display.transaction_type = 'BUY'
THEN cost_basis_display.quantity
END
))
* SUM(cost_basis_display.remaining_quantity)
as total_gain")
->selectRaw('( ->selectRaw('(
daily_change.total_market_value * COALESCE(cr.rate, 1) daily_change.total_market_value * COALESCE(cr.rate, 1)
) as total_market_value') ) as total_market_value')