diff --git a/app/Models/Dividend.php b/app/Models/Dividend.php index 785fca2..b3d5469 100644 --- a/app/Models/Dividend.php +++ b/app/Models/Dividend.php @@ -103,15 +103,6 @@ class Dividend extends Model // group by holdings $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(' (COALESCE(CASE WHEN transactions.transaction_type = "BUY" AND date(transactions.date) <= date(dividends.date) @@ -125,7 +116,7 @@ class Dividend extends Model ->join('transactions', 'transactions.symbol', '=', 'dividends.symbol') ->join('holdings', 'transactions.portfolio_id', '=', 'holdings.portfolio_id') ->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') ->get();