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

no need for 'owned'

Browse Source
This commit is contained in:
hackerESQ
2024-09-16 00:20:43 -05:00
parent 87681af1f0
commit cdf7fe9afc
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Models/Dividend.php
+1 -10
View File
@@ -103,15 +103,6 @@ class Dividend extends Model
// group by holdings // group by holdings
$dividends = self::select(['holdings.portfolio_id', 'dividends.date', 'dividends.symbol', 'dividends.dividend_amount']) $dividends = self::select(['holdings.portfolio_id', 'dividends.date', 'dividends.symbol', 'dividends.dividend_amount'])
->selectRaw('
COALESCE(CASE WHEN transactions.transaction_type = "BUY"
AND date(transactions.date) <= date(dividends.date)
THEN transactions.quantity ELSE 0 END, 0)
- COALESCE(CASE WHEN transactions.transaction_type = "SELL"
AND date(transactions.date) <= date(dividends.date)
THEN transactions.quantity ELSE 0 END, 0)
AS owned
')
->selectRaw(' ->selectRaw('
(COALESCE(CASE WHEN transactions.transaction_type = "BUY" (COALESCE(CASE WHEN transactions.transaction_type = "BUY"
AND date(transactions.date) <= date(dividends.date) AND date(transactions.date) <= date(dividends.date)
@@ -125,7 +116,7 @@ class Dividend extends Model
->join('transactions', 'transactions.symbol', '=', 'dividends.symbol') ->join('transactions', 'transactions.symbol', '=', 'dividends.symbol')
->join('holdings', 'transactions.portfolio_id', '=', 'holdings.portfolio_id') ->join('holdings', 'transactions.portfolio_id', '=', 'holdings.portfolio_id')
->where('dividends.symbol', $dividend_data->last()['symbol']) ->where('dividends.symbol', $dividend_data->last()['symbol'])
->groupBy('holdings.portfolio_id', 'dividends.date', 'dividends.symbol', 'dividends.dividend_amount', 'owned', 'dividends_received') ->groupBy('holdings.portfolio_id', 'dividends.date', 'dividends.symbol', 'dividends.dividend_amount', 'dividends_received')
->havingRaw('dividends_received > 0') ->havingRaw('dividends_received > 0')
->get(); ->get();