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

fix:properly scoped dividend counts

Browse Source
This commit is contained in:
hackerESQ
2024-10-28 21:17:53 -05:00
parent 25176c5a5f
commit 1235abadd0
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Models/Holding.php
+8 -4
View File
@@ -85,15 +85,19 @@ class Holding extends Model
THEN transactions.quantity THEN transactions.quantity
ELSE 0 END ELSE 0 END
) AS sold") ) AS sold")
->selectRaw('SUM( ->selectRaw("SUM(
(CASE WHEN transaction_type = "BUY" (CASE WHEN transaction_type = 'BUY'
AND transactions.symbol = dividends.symbol
AND transactions.portfolio_id = '$this->portfolio_id'
AND date(transactions.date) <= date(dividends.date) AND date(transactions.date) <= date(dividends.date)
THEN transactions.quantity ELSE 0 END THEN transactions.quantity ELSE 0 END
- CASE WHEN transaction_type = "SELL" - CASE WHEN transaction_type = 'SELL'
AND transactions.symbol = dividends.symbol
AND transactions.portfolio_id = '$this->portfolio_id'
AND date(transactions.date) <= date(dividends.date) AND date(transactions.date) <= date(dividends.date)
THEN transactions.quantity ELSE 0 END) THEN transactions.quantity ELSE 0 END)
* dividends.dividend_amount * dividends.dividend_amount
) AS total_received') ) AS total_received")
->join('transactions', 'transactions.symbol', 'dividends.symbol') ->join('transactions', 'transactions.symbol', 'dividends.symbol')
->groupBy(['dividends.symbol','dividends.date','dividends.dividend_amount']) ->groupBy(['dividends.symbol','dividends.date','dividends.dividend_amount'])
->orderBy('dividends.date', 'DESC') ->orderBy('dividends.date', 'DESC')