This commit is contained in:
hackerESQ
2024-08-29 23:36:44 -05:00
parent 2febed20ae
commit df1071d628
13 changed files with 204 additions and 64 deletions
@@ -0,0 +1,91 @@
<?php
namespace App\Console\Commands;
use App\Models\Dividend;
use App\Models\Holding;
use App\Models\MarketData;
use App\Models\Transaction;
use Illuminate\Console\Command;
use Illuminate\Database\Query\Builder;
class RefreshHoldingData extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'holding-data:refresh';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Refresh holdings';
/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
parent::__construct();
}
/**
* Execute the console command.
*
* @return int
*/
public function handle()
{
// get all holdings
$holdings = Holding::get();
foreach ($holdings as $holding) {
$this->line('Refreshing ' . $holding->symbol);
$query = Transaction::where([
'portfolio_id' => $holding->portfolio_id,
'symbol' => $holding->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;
// pull dividend data joined with holdings/transactions
$dividends = Dividend::where([
'dividends.symbol' => $holding->symbol,
])
->select(['holdings.portfolio_id', 'dividends.date', 'dividends.symbol', 'dividends.dividend_amount'])
->selectRaw('@purchased:=(SELECT coalesce(SUM(quantity),0) FROM transactions WHERE transactions.transaction_type = "BUY" AND transactions.symbol = dividends.symbol AND date(transactions.date) <= date(dividends.date) AND holdings.portfolio_id = transactions.portfolio_id ) AS `purchased`')
->selectRaw('@sold:=(SELECT coalesce(SUM(quantity),0) FROM transactions WHERE transactions.transaction_type = "SELL" AND transactions.symbol = dividends.symbol AND date(transactions.date) <= date(dividends.date) AND holdings.portfolio_id = transactions.portfolio_id ) AS `sold`')
->selectRaw('@owned:=(@purchased - @sold) AS `owned`')
->selectRaw('@dividends_received:=(@owned * dividends.dividend_amount) AS `dividends_received`')
->join('transactions', 'transactions.symbol', 'dividends.symbol')
->join('holdings', 'transactions.portfolio_id', 'holdings.portfolio_id')
->groupBy(['holdings.portfolio_id', 'dividends.date', 'dividends.symbol', 'dividends.dividend_amount'])
->get();
// update holding
$holding->fill([
'quantity' => $total_quantity,
'average_cost_basis' => $average_cost_basis,
'total_cost_basis' => $total_quantity * $average_cost_basis,
'realized_gain_dollars' => $query->realized_gains,
'dividends_earned' => $dividends->where('portfolio_id', $holding->portfolio_id)->sum('dividends_received')
]);
$holding->save();
}
}
}
+8 -3
View File
@@ -12,15 +12,20 @@ class BackupExport implements WithMultipleSheets
{ {
use Exportable; use Exportable;
public function __construct(
public bool $empty = false
)
{ }
/** /**
* @return array * @return array
*/ */
public function sheets(): array public function sheets(): array
{ {
return [ return [
new PortfoliosSheet, new PortfoliosSheet($this->empty),
new TransactionsSheet, new TransactionsSheet($this->empty),
new DailyChangesSheet new DailyChangesSheet($this->empty)
]; ];
} }
} }
+5 -1
View File
@@ -9,6 +9,10 @@ use Maatwebsite\Excel\Concerns\WithTitle;
class DailyChangesSheet implements FromCollection, WithHeadings, WithTitle class DailyChangesSheet implements FromCollection, WithHeadings, WithTitle
{ {
public function __construct(
public bool $empty = false
) { }
public function headings(): array public function headings(): array
{ {
return [ return [
@@ -28,7 +32,7 @@ class DailyChangesSheet implements FromCollection, WithHeadings, WithTitle
*/ */
public function collection() public function collection()
{ {
return DailyChange::myDailyChanges()->get(); return $this->empty ? collect() : DailyChange::myDailyChanges()->get();
} }
/** /**
+5 -1
View File
@@ -9,6 +9,10 @@ use Maatwebsite\Excel\Concerns\WithTitle;
class PortfoliosSheet implements FromCollection, WithHeadings, WithTitle class PortfoliosSheet implements FromCollection, WithHeadings, WithTitle
{ {
public function __construct(
public bool $empty = false
) { }
public function headings(): array public function headings(): array
{ {
return [ return [
@@ -26,7 +30,7 @@ class PortfoliosSheet implements FromCollection, WithHeadings, WithTitle
*/ */
public function collection() public function collection()
{ {
return Portfolio::myPortfolios()->get(); return $this->empty ? collect() : Portfolio::myPortfolios()->get();
} }
/** /**
+5 -1
View File
@@ -10,6 +10,10 @@ use Maatwebsite\Excel\Concerns\FromCollection;
class TransactionsSheet implements FromCollection, WithHeadings, WithTitle class TransactionsSheet implements FromCollection, WithHeadings, WithTitle
{ {
public function __construct(
public bool $empty = false
) { }
public function headings(): array public function headings(): array
{ {
return [ return [
@@ -32,7 +36,7 @@ class TransactionsSheet implements FromCollection, WithHeadings, WithTitle
*/ */
public function collection() public function collection()
{ {
return Transaction::myTransactions()->get(); return $this->empty ? collect() : Transaction::myTransactions()->get();
} }
/** /**
+4 -1
View File
@@ -6,11 +6,13 @@ use App\Imports\Sheets\SplitsSheet;
use App\Imports\Sheets\DividendsSheet; use App\Imports\Sheets\DividendsSheet;
use App\Imports\Sheets\MarketDataSheet; use App\Imports\Sheets\MarketDataSheet;
use App\Imports\Sheets\PortfoliosSheet; use App\Imports\Sheets\PortfoliosSheet;
use Illuminate\Support\Facades\Artisan;
use Maatwebsite\Excel\Events\AfterSheet; use Maatwebsite\Excel\Events\AfterSheet;
use App\Imports\Sheets\DailyChangesSheet; use App\Imports\Sheets\DailyChangesSheet;
use App\Imports\Sheets\TransactionsSheet; use App\Imports\Sheets\TransactionsSheet;
use Maatwebsite\Excel\Concerns\Importable; use Maatwebsite\Excel\Concerns\Importable;
use Maatwebsite\Excel\Concerns\WithEvents; use Maatwebsite\Excel\Concerns\WithEvents;
use App\Console\Commands\RefreshHoldingData;
use Maatwebsite\Excel\Concerns\WithMultipleSheets; use Maatwebsite\Excel\Concerns\WithMultipleSheets;
class BackupImport implements WithMultipleSheets, WithEvents class BackupImport implements WithMultipleSheets, WithEvents
@@ -25,7 +27,8 @@ class BackupImport implements WithMultipleSheets, WithEvents
{ {
return [ return [
// AfterSheet::class => dd('test') // AfterSheet::class => Artisan::queue(RefreshHoldingData::class),
AfterSheet::class => Artisan::call(RefreshHoldingData::class)
]; ];
} }
+26 -19
View File
@@ -2,18 +2,17 @@
namespace App\Imports\Sheets; namespace App\Imports\Sheets;
use App\Models\DailyChange;
use Exception; use Exception;
use App\Models\DailyChange;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Maatwebsite\Excel\Concerns\ToCollection; use Maatwebsite\Excel\Concerns\ToCollection;
use Maatwebsite\Excel\Concerns\SkipsEmptyRows; use Maatwebsite\Excel\Concerns\SkipsEmptyRows;
use Maatwebsite\Excel\Concerns\WithHeadingRow; use Maatwebsite\Excel\Concerns\WithHeadingRow;
use Maatwebsite\Excel\Concerns\WithValidation; use Maatwebsite\Excel\Concerns\WithValidation;
use Maatwebsite\Excel\Concerns\WithChunkReading;
class DailyChangesSheet implements ToCollection, WithHeadingRow, WithValidation, SkipsEmptyRows class DailyChangesSheet implements ToCollection, WithHeadingRow, WithValidation, SkipsEmptyRows, WithChunkReading
{ {
// use Importable;
public function collection(Collection $dailyChanges) public function collection(Collection $dailyChanges)
{ {
@@ -27,22 +26,25 @@ class DailyChangesSheet implements ToCollection, WithHeadingRow, WithValidation,
} }
}); });
foreach ($dailyChanges as $dailyChange) { DailyChange::withoutEvents(function () use ($dailyChanges) {
DailyChange::updateOrCreate([ foreach ($dailyChanges as $dailyChange) {
'date' => $dailyChange['date'],
'portfolio_id' => $dailyChange['portfolio_id'], DailyChange::updateOrCreate([
],[ 'date' => $dailyChange['date'],
'portfolio_id' => $dailyChange['portfolio_id'], 'portfolio_id' => $dailyChange['portfolio_id'],
'date' => $dailyChange['date'], ],[
'total_market_value' => $dailyChange['total_market_value'], 'portfolio_id' => $dailyChange['portfolio_id'],
'total_cost_basis' => $dailyChange['total_cost_basis'], 'date' => $dailyChange['date'],
'total_gain' => $dailyChange['total_gain'], 'total_market_value' => $dailyChange['total_market_value'],
'total_dividends' => $dailyChange['total_dividends'], 'total_cost_basis' => $dailyChange['total_cost_basis'],
'realized_gains' => $dailyChange['realized_gains'], 'total_gain' => $dailyChange['total_gain'],
'annotation' => $dailyChange['annotation'], 'total_dividends' => $dailyChange['total_dividends'],
]); 'realized_gains' => $dailyChange['realized_gains'],
} 'annotation' => $dailyChange['annotation'],
]);
}
});
} }
public function rules(): array public function rules(): array
@@ -58,4 +60,9 @@ class DailyChangesSheet implements ToCollection, WithHeadingRow, WithValidation,
'annotation' => ['sometimes', 'nullable', 'string'], 'annotation' => ['sometimes', 'nullable', 'string'],
]; ];
} }
public function chunkSize(): int
{
return 500;
}
} }
+16 -15
View File
@@ -12,25 +12,26 @@ use Maatwebsite\Excel\Concerns\WithValidation;
class PortfoliosSheet implements ToCollection, WithValidation, WithHeadingRow, SkipsEmptyRows class PortfoliosSheet implements ToCollection, WithValidation, WithHeadingRow, SkipsEmptyRows
{ {
// use Importable;
public function collection(Collection $portfolios) public function collection(Collection $portfolios)
{ {
foreach ($portfolios as $portfolio) { Portfolio::withoutEvents(function () use ($portfolios) {
auth()->user()->portfolios() foreach ($portfolios as $portfolio) {
->where(['id' => $portfolio['portfolio_id']])
->orWhere(['title' => $portfolio['title']])
->firstOr(function () use ($portfolio) {
return Portfolio::make()->forceFill([ auth()->user()->portfolios()
'id' => $portfolio['portfolio_id'] ?? null, ->where(['id' => $portfolio['portfolio_id']])
'title' => $portfolio['title'], ->orWhere(['title' => $portfolio['title']])
'wishlist' => $portfolio['wishlist'] ?? false, ->firstOr(function () use ($portfolio) {
'notes' => $portfolio['notes'],
])->save(); return Portfolio::make()->forceFill([
}); 'id' => $portfolio['portfolio_id'] ?? null,
} 'title' => $portfolio['title'],
'wishlist' => $portfolio['wishlist'] ?? false,
'notes' => $portfolio['notes'],
])->save();
});
}
});
} }
public function rules(): array public function rules(): array
+31 -18
View File
@@ -2,6 +2,7 @@
namespace App\Imports\Sheets; namespace App\Imports\Sheets;
use App\Models\Holding;
use App\Models\Transaction; use App\Models\Transaction;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Maatwebsite\Excel\Concerns\ToCollection; use Maatwebsite\Excel\Concerns\ToCollection;
@@ -12,28 +13,40 @@ use Maatwebsite\Excel\Concerns\WithChunkReading;
class TransactionsSheet implements ToCollection, WithHeadingRow, WithValidation, SkipsEmptyRows, WithChunkReading class TransactionsSheet implements ToCollection, WithHeadingRow, WithValidation, SkipsEmptyRows, WithChunkReading
{ {
// use Importable;
public function collection(Collection $transactions) public function collection(Collection $transactions)
{ {
foreach ($transactions->sortBy('date') as $transaction) { Transaction::withoutEvents(function () use ($transactions) {
Transaction::where('id', $transaction['transaction_id']) foreach ($transactions->sortBy('date') as $transaction) {
->firstOr(function () use ($transaction) {
return Transaction::make()->forceFill([ $transaction = Transaction::where('id', $transaction['transaction_id'])
'id' => $transaction['transaction_id'], ->firstOr(function () use ($transaction) {
'symbol' => $transaction['symbol'],
'portfolio_id' => $transaction['portfolio_id'], return Transaction::make()->forceFill([
'transaction_type' => $transaction['transaction_type'], 'id' => $transaction['transaction_id'],
'quantity' => $transaction['quantity'], 'symbol' => $transaction['symbol'],
'cost_basis' => $transaction['cost_basis'] ?? 0, 'portfolio_id' => $transaction['portfolio_id'],
'sale_price' => $transaction['sale_price'], 'transaction_type' => $transaction['transaction_type'],
'split' => $transaction['split'] ?? null, 'quantity' => $transaction['quantity'],
'date' => $transaction['date'], 'cost_basis' => $transaction['cost_basis'] ?? 0,
])->save(); 'sale_price' => $transaction['sale_price'],
}); 'split' => $transaction['split'] ?? null,
} 'date' => $transaction['date'],
])->save();
});
Holding::firstOrCreate([
'symbol' => $transaction['symbol'],
'portfolio_id' => $transaction['portfolio_id'],
], [
'quantity' => 0,
'average_cost_basis' => 0,
'total_cost_basis' => 0,
'realized_gain_dollars' => 0,
'dividends_earned' => 0
]);
}
});
} }
public function rules(): array public function rules(): array
+2
View File
@@ -94,6 +94,8 @@
"Successfully imported!": "Successfully imported!", "Successfully imported!": "Successfully imported!",
"Select a file": "Select a file", "Select a file": "Select a file",
"Download Export": "Download Export", "Download Export": "Download Export",
"Click to download import template.": "Click to download import template.",
"Download import template.": "Download import template.",
"Your email address is unverified.": "Your email address is unverified.", "Your email address is unverified.": "Your email address is unverified.",
"Click here to re-send the verification email.": "Click here to re-send the verification email.", "Click here to re-send the verification email.": "Click here to re-send the verification email.",
"A new verification link has been sent to your email address.": "A new verification link has been sent to your email address.", "A new verification link has been sent to your email address.": "A new verification link has been sent to your email address.",
+2
View File
@@ -94,6 +94,8 @@
"Successfully imported!": "¡Importado con éxito!", "Successfully imported!": "¡Importado con éxito!",
"Select a file": "Seleccionar un archivo", "Select a file": "Seleccionar un archivo",
"Download Export": "Descargar Exportación", "Download Export": "Descargar Exportación",
"Click to download import template.": "Haz clic para descargar la plantilla de importación.",
"Download import template.": "Descargar la plantilla de importación.",
"Your email address is unverified.": "Tu dirección de correo electrónico no está verificada.", "Your email address is unverified.": "Tu dirección de correo electrónico no está verificada.",
"Click here to re-send the verification email.": "Haz clic aquí para reenviar el correo de verificación.", "Click here to re-send the verification email.": "Haz clic aquí para reenviar el correo de verificación.",
"A new verification link has been sent to your email address.": "Se ha enviado un nuevo enlace de verificación a tu dirección de correo electrónico.", "A new verification link has been sent to your email address.": "Se ha enviado un nuevo enlace de verificación a tu dirección de correo electrónico.",
+1 -1
View File
@@ -2,7 +2,7 @@
<div class="max-w-7xl mx-auto sm:px-6 lg:px-8"> <div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
@livewire('import-portfolios-field') @livewire('import-portfolios-field')
<x-section-border /> <x-section-border />
</div> </div>
@@ -4,6 +4,7 @@ use Livewire\WithFileUploads;
use Livewire\Volt\Component; use Livewire\Volt\Component;
use Mary\Traits\Toast; use Mary\Traits\Toast;
use App\Imports\BackupImport; use App\Imports\BackupImport;
use App\Exports\BackupExport;
use Livewire\Attributes\Rule; use Livewire\Attributes\Rule;
new class extends Component { new class extends Component {
@@ -17,7 +18,6 @@ new class extends Component {
// methods // methods
public function import() public function import()
{ {
$this->validate(); $this->validate();
try { try {
@@ -25,13 +25,16 @@ new class extends Component {
$import = (new BackupImport)->import($this->file); $import = (new BackupImport)->import($this->file);
} catch (\Throwable $e) { } catch (\Throwable $e) {
dd($e);
return $this->error($e->getMessage()); return $this->error($e->getMessage());
} }
$this->success(__('Successfully imported!')); $this->success(__('Successfully imported!'));
}
// Artisan::queue(RefreshHoldingData::class); public function downloadTemplate()
{
return Excel::download(new BackupExport(empty: true), now()->format('Y_m_d') . '_investbrain_template.xlsx');
} }
}; ?> }; ?>
@@ -43,6 +46,7 @@ new class extends Component {
<x-slot name="description"> <x-slot name="description">
{{ __('Upload or recover your Investbrain portfolio and holdings.') }} {{ __('Upload or recover your Investbrain portfolio and holdings.') }}
<a href="#" title="{{ __('Click to download import template.') }}" @click="$wire.downloadTemplate()"> {{ __('Download import template.') }}</a>
</x-slot> </x-slot>
<x-slot name="form"> <x-slot name="form">