This commit is contained in:
hackerESQ
2024-08-17 21:33:09 -05:00
parent 5d3259b653
commit b84bc94da6
8 changed files with 215 additions and 164 deletions
+6 -6
View File
@@ -12,7 +12,7 @@ class Holding extends Model
use HasFactory;
use HasUuids;
protected $with = [];
protected $with = ['market_data'];
/**
* The attributes that are mass assignable.
@@ -42,7 +42,7 @@ class Holding extends Model
];
/**
* get market data for holding
* Market data for holding
*
* @return void
*/
@@ -52,7 +52,7 @@ class Holding extends Model
}
/**
* get related transactions for holding
* Related transactions for holding
*
* @return void
*/
@@ -62,7 +62,7 @@ class Holding extends Model
}
/**
* get related dividends for holding
* Related dividends for holding
*
* @return void
*/
@@ -72,7 +72,7 @@ class Holding extends Model
}
/**
* get related portfolio for holding
* Related portfolio for holding
*
* @return void
*/
@@ -82,7 +82,7 @@ class Holding extends Model
}
/**
* get related splits for holding
* Related splits for holding
*
* @return void
*/
+2 -30
View File
@@ -11,58 +11,30 @@ class Portfolio extends Model
use HasFactory;
use HasUuids;
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = [
'title',
'notes',
'wishlist',
];
/**
*
* @return void
*/
protected static function boot()
{
parent::boot();
static::saved(function ($model) {
self::syncUsers($model);
});
}
/**
* The attributes that should be hidden for arrays.
*
* @var array
*/
protected $hidden = [];
/**
* The attributes that should be cast to native types.
*
* @var array
*/
protected $casts = [
'wishlist' => 'boolean'
];
/**
* The relationships that should always be eagerly loaded.
*
* @var array
*/
protected $with = ['users', 'transactions'];
/**
* The attributes that should be appended.
*
* @var array
*/
protected $appends = ['owner_id'];
public function users()
@@ -77,7 +49,7 @@ class Portfolio extends Model
public function transactions()
{
return $this->hasMany(Transaction::class);
return $this->hasMany(Transaction::class)->orderBy('created_at', 'DESC');
}
public function daily_change()
+83 -77
View File
@@ -4,6 +4,7 @@ namespace App\Models;
use App\Models\MarketData;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Casts\Attribute;
use Illuminate\Database\Eloquent\Concerns\HasUuids;
use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -12,121 +13,57 @@ class Transaction extends Model
use HasFactory;
use HasUuids;
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = [
'symbol',
'date',
'portfolio_id',
'transaction_type',
'quantity',
'cost_basis',
'sale_price',
'split'
'sale_price'
];
/**
* The attributes that should be hidden for arrays.
*
* @var array
*/
protected $hidden = [];
/**
* The attributes that should be cast to native types.
*
* @var array
*/
protected $casts = [
'date' => 'datetime',
'first_date' => 'datetime',
'last_date' => 'datetime',
'split' => 'boolean',
];
/**
*
* @return void
*/
protected static function boot()
{
parent::boot();
static::saving(function ($transaction) {
// if sale, move cost basis to sale price
if ($transaction->transaction_type == 'SELL') {
$transaction->cost_basis = $transaction->holding->average_cost_basis ?? $transaction->cost_basis;
$transaction->ensureCostBasisIsAddedToSale();
}
});
static::saved(function ($transaction) {
// static::syncHolding($transaction);
$transaction->syncHolding();
});
static::deleted(function ($transaction) {
// static::syncHolding($transaction);
$transaction->syncHolding();
});
}
public static function syncHolding($transaction) {
// get the holding for a symbol and portfolio (or create one)
$holding = Holding::firstOrNew([
'portfolio_id' => $transaction->portfolio_id,
'symbol' => $transaction->symbol
], [
'portfolio_id' => $transaction->portfolio_id,
'symbol' => $transaction->symbol,
'quantity' => $transaction->quantity,
'average_cost_basis' => $transaction->cost_basis,
'total_cost_basis' => $transaction->quantity * $transaction->cost_basis,
]);
// pull existing transaction data
$query = self::where([
'portfolio_id' => $transaction->portfolio_id,
'symbol' => $transaction->symbol,
])->selectRaw('SUM(CASE WHEN transaction_type = "BUY" THEN quantity ELSE 0 END) AS `qty_purchases`')
->selectRaw('SUM(CASE WHEN transaction_type = "SELL" THEN quantity ELSE 0 END) AS `qty_sales`')
->selectRaw('SUM(CASE WHEN transaction_type = "BUY" THEN (quantity * cost_basis) ELSE 0 END) AS `cost_basis`')
->selectRaw('SUM(CASE WHEN transaction_type = "SELL" THEN ((sale_price - cost_basis) * quantity) ELSE 0 END) AS `realized_gains`')
->first();
$total_quantity = $query->qty_purchases - $query->qty_sales;
$average_cost_basis = $query->qty_purchases > 0
? $query->cost_basis / $query->qty_purchases
: 0;
// update holding
$holding->fill([
'quantity' => $total_quantity,
'average_cost_basis' => $average_cost_basis,
'total_cost_basis' => $total_quantity * $average_cost_basis,
'realized_gain_loss_dollars' => $query->realized_gains,
]);
$holding->save();
// load market data while we're here
$transaction->refreshMarketData();
// sync dividends to holding
$transaction->syncDividendsToHolding();
}
public function setSymbolAttribute($value)
/**
* Ensure transaction symbol is always upper case
*/
protected function symbol(): Attribute
{
$this->attributes['symbol'] = strtoupper($value);
return Attribute::make(
set: fn (string $value) => strtoupper($value)
);
}
/**
* get market data for transaction
* Related market data for transaction
*
* @return void
*/
@@ -136,7 +73,7 @@ class Transaction extends Model
}
/**
* get portfolio for transaction
* Related portfolio
*
* @return void
*/
@@ -176,4 +113,73 @@ class Transaction extends Model
{
return Dividend::getDividendData($this->attributes['symbol']);
}
/**
* Writes average cost basis to a sale transaction
*
* @return Transaction
*/
public function ensureCostBasisIsAddedToSale()
{
$holding = Holding::firstOrNew([
'portfolio_id' => $this->portfolio_id,
'symbol' => $this->symbol
],[
'average_cost_basis' => null
]);
$this->cost_basis = $holding->average_cost_basis ?? 0;
return $this;
}
/**
* Syncs the holding related to this transaction
*
* @return void
*/
public function syncHolding() {
// get the holding for a symbol and portfolio (or create one)
$holding = Holding::firstOrNew([
'portfolio_id' => $this->portfolio_id,
'symbol' => $this->symbol
], [
'portfolio_id' => $this->portfolio_id,
'symbol' => $this->symbol,
'quantity' => $this->quantity,
'average_cost_basis' => $this->cost_basis,
'total_cost_basis' => $this->quantity * $this->cost_basis,
]);
// pull existing transaction data
$query = self::where([
'portfolio_id' => $this->portfolio_id,
'symbol' => $this->symbol,
])->selectRaw('SUM(CASE WHEN transaction_type = "BUY" THEN quantity ELSE 0 END) AS `qty_purchases`')
->selectRaw('SUM(CASE WHEN transaction_type = "SELL" THEN quantity ELSE 0 END) AS `qty_sales`')
->selectRaw('SUM(CASE WHEN transaction_type = "BUY" THEN (quantity * cost_basis) ELSE 0 END) AS `cost_basis`')
->selectRaw('SUM(CASE WHEN transaction_type = "SELL" THEN ((sale_price - cost_basis) * quantity) ELSE 0 END) AS `realized_gains`')
->first();
$total_quantity = $query->qty_purchases - $query->qty_sales;
$average_cost_basis = $query->qty_purchases > 0
? $query->cost_basis / $query->qty_purchases
: 0;
// update holding
$holding->fill([
'quantity' => $total_quantity,
'average_cost_basis' => $average_cost_basis,
'total_cost_basis' => $total_quantity * $average_cost_basis,
'realized_gain_loss_dollars' => $query->realized_gains,
]);
$holding->save();
// load market data while we're here
// $this->refreshMarketData();
// sync dividends to holding
// $this->syncDividendsToHolding();
}
}
@@ -0,0 +1,9 @@
<div role="status" class="flex w-full animate-pulse" wire:loading.delay>
<div class="h-2.5 bg-gray-200 rounded-full dark:bg-gray-700 w-48 mb-4"></div>
<div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 max-w-[360px] mb-2.5"></div>
<div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 mb-2.5"></div>
<div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 max-w-[330px] mb-2.5"></div>
<div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 max-w-[300px] mb-2.5"></div>
<div class="h-2 bg-gray-200 rounded-full dark:bg-gray-700 max-w-[360px]"></div>
<span class="sr-only">Loading...</span>
</div>
@@ -0,0 +1,68 @@
<?php
use App\Models\Portfolio;
use App\Models\Transaction;
use Illuminate\Support\Collection;
use Livewire\Volt\Component;
new class extends Component {
// props
public Portfolio $portfolio;
public array $sortBy = ['column' => 'symbol', 'direction' => 'asc'];
public array $headers;
public function mount()
{
$this->headers = [
['key' => 'symbol', 'label' => __('Symbol'), 'class' => ''],
['key' => 'market_data_name', 'label' => __('Name'), 'sortable' => true],
['key' => 'quantity', 'label' => __('Quantity')],
['key' => 'average_cost_basis', 'label' => __('Average Cost Basis')],
['key' => 'total_cost_basis', 'label' => __('Total Cost Basis')],
['key' => 'market_data_market_value', 'label' => __('Market Value')],
['key' => 'total_market_value', 'label' => __('Total Market Value')],
['key' => 'market_gain_loss_dollars', 'label' => __('Market Gain/Loss')],
['key' => 'market_gain_loss_percent', 'label' => __('Market Gain/Loss')],
['key' => 'realized_gain_loss_dollars', 'label' => __('Realized Gain/Loss')],
['key' => 'dividends_earned', 'label' => __('Dividends Earned')],
['key' => 'market_data_fifty_two_week_low', 'label' => __('52 week low')],
['key' => 'market_data_fifty_two_week_high', 'label' => __('52 week high')],
['key' => 'num_transactions', 'label' => __('Number of Transactions')],
['key' => 'market_data_updated_at', 'label' => __('Market Data Age')],
];
}
public function holdings(): Collection
{
return $this->portfolio
->holdings()
->with(['transactions' => function ($query) {
$query->portfolio($this->portfolio->id);
}])
->withCount(['transactions as num_transactions' => function ($query) {
$query->portfolio($this->portfolio->id);
}])
->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')
->selectRaw('(market_data.market_value * holdings.quantity) AS total_market_value')
->selectRaw('((market_data.market_value - holdings.average_cost_basis) * holdings.quantity) AS market_gain_loss_dollars')
->selectRaw('(((market_data.market_value - holdings.average_cost_basis) / holdings.average_cost_basis) * 100) AS market_gain_loss_percent')
->join('market_data', 'holdings.symbol', 'market_data.symbol')
->orderBy(...array_values($this->sortBy))
->where('quantity', '>', 0)
->get();
}
}; ?>
<div class="">
<x-table wire:loading.remove :headers="$headers" :rows="$this->holdings()" :sort-by="$sortBy" />
</div>
@@ -21,16 +21,16 @@ new class extends Component {
#[Rule('required|string|in:BUY,SELL')]
public String $transaction_type;
#[Rule('required|date')]
#[Rule('required|date_format:Y-m-d')]
public String $date;
#[Rule('required|numeric')]
#[Rule('required|min:0|numeric')]
public Float $quantity;
#[Rule('exclude_if:transaction_type,SELL|numeric')]
#[Rule('exclude_if:transaction_type,SELL|min:0|numeric')]
public ?Float $cost_basis;
#[Rule('exclude_if:transaction_type,BUY|numeric')]
#[Rule('exclude_if:transaction_type,BUY|min:0|numeric')]
public ?Float $sale_price;
public Bool $confirmingTransactionDeletion = false;
@@ -8,7 +8,6 @@ use Livewire\Volt\Component;
new class extends Component {
// props
public ?Collection $transactions;
public Portfolio $portfolio;
public ?Transaction $editingTransaction;
@@ -23,12 +22,13 @@ new class extends Component {
<div class="">
@foreach($transactions as $transaction)
<div x-data="{ loading: false, timeout: null }">
@foreach($portfolio->transactions->take(10) as $transaction)
<x-list-item
no-separator
:item="$transaction"
class="cursor-pointer"
x-data="{ loading: false, timeout: null }"
@click="
timeout = setTimeout(() => { loading = true }, 200);
$wire.showTransactionDialog('{{ $transaction->id }}').then(() => {
@@ -54,7 +54,7 @@ new class extends Component {
<x-loading x-show="loading" x-cloak class="text-gray-400 ml-2" />
</x-slot:value>
</x-list-item>
</div>
@endforeach
<x-ib-modal
+6 -10
View File
@@ -85,17 +85,14 @@
<x-ib-card title="{{ __('Holdings') }}" class="md:col-span-4">
@php
$users = App\Models\User::take(3)->get();
@endphp
@foreach($users as $user)
<x-list-item no-separator :item="$user" avatar="profile_photo_url" link="/docs/installation" />
@endforeach
@livewire('holdings-table', [
'portfolio' => $portfolio
])
</x-ib-card>
<x-ib-card title="{{ __('Top performers') }}" class="md:col-span-3">
{{-- <x-ib-card title="{{ __('Top performers') }}" class="md:col-span-3">
@php
$users = App\Models\User::take(3)->get();
@@ -105,7 +102,7 @@
<x-list-item no-separator :item="$user" avatar="profile_photo_url" link="/docs/installation" />
@endforeach
</x-ib-card>
</x-ib-card> --}}
{{-- <x-ib-card title="{{ __('Top headlines') }}" class="md:col-span-3">
@@ -119,10 +116,9 @@
</x-ib-card> --}}
<x-ib-card title="{{ __('Recent activity') }}" class="md:col-span-4">
<x-ib-card title="{{ __('Recent activity') }}" class="md:col-span-3">
@livewire('transactions-list', [
'transactions' => $portfolio->transactions,
'portfolio' => $portfolio
])