Add market data scope
This commit is contained in:
+10
-5
@@ -16,8 +16,6 @@ class Holding extends Model
|
|||||||
use HasFactory;
|
use HasFactory;
|
||||||
use HasUuids;
|
use HasUuids;
|
||||||
|
|
||||||
protected $with = ['market_data'];
|
|
||||||
|
|
||||||
protected $fillable = [
|
protected $fillable = [
|
||||||
'portfolio_id',
|
'portfolio_id',
|
||||||
'symbol',
|
'symbol',
|
||||||
@@ -68,9 +66,6 @@ class Holding extends Model
|
|||||||
*/
|
*/
|
||||||
public function dividends()
|
public function dividends()
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return $this->hasMany(Dividend::class, 'symbol', 'symbol')
|
return $this->hasMany(Dividend::class, 'symbol', 'symbol')
|
||||||
->select([
|
->select([
|
||||||
'dividends.symbol',
|
'dividends.symbol',
|
||||||
@@ -129,6 +124,16 @@ class Holding extends Model
|
|||||||
->orderBy('date', 'DESC');
|
->orderBy('date', 'DESC');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function scopeWithMarketData($query)
|
||||||
|
{
|
||||||
|
$query->withAggregate('market_data', 'name')
|
||||||
|
->withAggregate('market_data', 'market_value')
|
||||||
|
->withAggregate('market_data', 'fifty_two_week_low')
|
||||||
|
->withAggregate('market_data', 'fifty_two_week_high')
|
||||||
|
->withAggregate('market_data', 'updated_at')
|
||||||
|
->join('market_data', 'holdings.symbol', 'market_data.symbol');
|
||||||
|
}
|
||||||
|
|
||||||
public function scopePortfolio($query, $portfolio)
|
public function scopePortfolio($query, $portfolio)
|
||||||
{
|
{
|
||||||
return $query->where('portfolio_id', $portfolio);
|
return $query->where('portfolio_id', $portfolio);
|
||||||
|
|||||||
@@ -46,15 +46,10 @@ class Portfolio extends Model
|
|||||||
->withCount(['transactions as num_transactions' => function ($query) {
|
->withCount(['transactions as num_transactions' => function ($query) {
|
||||||
$query->portfolio($this->id);
|
$query->portfolio($this->id);
|
||||||
}])
|
}])
|
||||||
->withAggregate('market_data', 'name')
|
->withMarketData()
|
||||||
->withAggregate('market_data', 'market_value')
|
|
||||||
->withAggregate('market_data', 'fifty_two_week_low')
|
|
||||||
->withAggregate('market_data', 'fifty_two_week_high')
|
|
||||||
->withAggregate('market_data', 'updated_at')
|
|
||||||
->selectRaw('COALESCE(market_data.market_value * holdings.quantity, 0) AS total_market_value')
|
->selectRaw('COALESCE(market_data.market_value * holdings.quantity, 0) AS total_market_value')
|
||||||
->selectRaw('COALESCE((market_data.market_value - holdings.average_cost_basis) * holdings.quantity, 0) AS market_gain_dollars')
|
->selectRaw('COALESCE((market_data.market_value - holdings.average_cost_basis) * holdings.quantity, 0) AS market_gain_dollars')
|
||||||
->selectRaw('COALESCE(((market_data.market_value - holdings.average_cost_basis) / holdings.average_cost_basis), 0) AS market_gain_percent')
|
->selectRaw('COALESCE(((market_data.market_value - holdings.average_cost_basis) / holdings.average_cost_basis), 0) AS market_gain_percent');
|
||||||
->join('market_data', 'holdings.symbol', 'market_data.symbol');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function transactions()
|
public function transactions()
|
||||||
|
|||||||
@@ -86,6 +86,17 @@ class Transaction extends Model
|
|||||||
{
|
{
|
||||||
return $this->belongsTo(Portfolio::class);
|
return $this->belongsTo(Portfolio::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function scopeWithMarketData($query)
|
||||||
|
{
|
||||||
|
$query->withAggregate('market_data', 'name')
|
||||||
|
->withAggregate('portfolio', 'title')
|
||||||
|
->withAggregate('market_data', 'market_value')
|
||||||
|
->withAggregate('market_data', 'fifty_two_week_low')
|
||||||
|
->withAggregate('market_data', 'fifty_two_week_high')
|
||||||
|
->withAggregate('market_data', 'updated_at')
|
||||||
|
->join('market_data', 'transactions.symbol', 'market_data.symbol');
|
||||||
|
}
|
||||||
|
|
||||||
public function scopePortfolio($query, $portfolio)
|
public function scopePortfolio($query, $portfolio)
|
||||||
{
|
{
|
||||||
|
|||||||
+4
-15
@@ -62,32 +62,21 @@ class User extends Authenticatable
|
|||||||
public function holdings(): HasManyDeep
|
public function holdings(): HasManyDeep
|
||||||
{
|
{
|
||||||
return $this->hasManyDeep(Holding::class, ['portfolio_user', Portfolio::class])
|
return $this->hasManyDeep(Holding::class, ['portfolio_user', Portfolio::class])
|
||||||
->withAggregate('market_data', 'name')
|
->withMarketData()
|
||||||
->withAggregate('market_data', 'market_value')
|
|
||||||
->withAggregate('market_data', 'fifty_two_week_low')
|
|
||||||
->withAggregate('market_data', 'fifty_two_week_high')
|
|
||||||
->withAggregate('market_data', 'updated_at')
|
|
||||||
->selectRaw('COALESCE(market_data.market_value * holdings.quantity, 0) AS total_market_value')
|
->selectRaw('COALESCE(market_data.market_value * holdings.quantity, 0) AS total_market_value')
|
||||||
->selectRaw('COALESCE((market_data.market_value - holdings.average_cost_basis) * holdings.quantity, 0) AS market_gain_dollars')
|
->selectRaw('COALESCE((market_data.market_value - holdings.average_cost_basis) * holdings.quantity, 0) AS market_gain_dollars')
|
||||||
->selectRaw('COALESCE(((market_data.market_value - holdings.average_cost_basis) / holdings.average_cost_basis), 0) AS market_gain_percent')
|
->selectRaw('COALESCE(((market_data.market_value - holdings.average_cost_basis) / holdings.average_cost_basis), 0) AS market_gain_percent');
|
||||||
->join('market_data', 'holdings.symbol', 'market_data.symbol');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function transactions(): HasManyDeep
|
public function transactions(): HasManyDeep
|
||||||
{
|
{
|
||||||
return $this->hasManyDeep(Transaction::class, ['portfolio_user', Portfolio::class])
|
return $this->hasManyDeep(Transaction::class, ['portfolio_user', Portfolio::class])
|
||||||
->withAggregate('market_data', 'name')
|
->withMarketData()
|
||||||
->withAggregate('portfolio', 'title')
|
|
||||||
->withAggregate('market_data', 'market_value')
|
|
||||||
->withAggregate('market_data', 'fifty_two_week_low')
|
|
||||||
->withAggregate('market_data', 'fifty_two_week_high')
|
|
||||||
->withAggregate('market_data', 'updated_at')
|
|
||||||
->selectRaw('
|
->selectRaw('
|
||||||
CASE
|
CASE
|
||||||
WHEN transaction_type = \'SELL\'
|
WHEN transaction_type = \'SELL\'
|
||||||
THEN COALESCE(transactions.sale_price - transactions.cost_basis, 0)
|
THEN COALESCE(transactions.sale_price - transactions.cost_basis, 0)
|
||||||
ELSE COALESCE(market_data.market_value - transactions.cost_basis, 0)
|
ELSE COALESCE(market_data.market_value - transactions.cost_basis, 0)
|
||||||
END AS gain_dollars')
|
END AS gain_dollars');
|
||||||
->join('market_data', 'transactions.symbol', 'market_data.symbol');;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user