chore: code style
This commit is contained in:
@@ -4,10 +4,10 @@ namespace App\Actions\Fortify;
|
|||||||
|
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
use App\Traits\WithTrimStrings;
|
use App\Traits\WithTrimStrings;
|
||||||
use Laravel\Jetstream\Jetstream;
|
|
||||||
use Illuminate\Support\Facades\Hash;
|
use Illuminate\Support\Facades\Hash;
|
||||||
use Illuminate\Support\Facades\Validator;
|
use Illuminate\Support\Facades\Validator;
|
||||||
use Laravel\Fortify\Contracts\CreatesNewUsers;
|
use Laravel\Fortify\Contracts\CreatesNewUsers;
|
||||||
|
use Laravel\Jetstream\Jetstream;
|
||||||
|
|
||||||
class CreateNewUser implements CreatesNewUsers
|
class CreateNewUser implements CreatesNewUsers
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -4,15 +4,15 @@ namespace App\Actions\Fortify;
|
|||||||
|
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
use App\Traits\WithTrimStrings;
|
use App\Traits\WithTrimStrings;
|
||||||
use Illuminate\Validation\Rule;
|
|
||||||
use Illuminate\Support\Facades\Validator;
|
|
||||||
use Illuminate\Contracts\Auth\MustVerifyEmail;
|
use Illuminate\Contracts\Auth\MustVerifyEmail;
|
||||||
|
use Illuminate\Support\Facades\Validator;
|
||||||
|
use Illuminate\Validation\Rule;
|
||||||
use Laravel\Fortify\Contracts\UpdatesUserProfileInformation;
|
use Laravel\Fortify\Contracts\UpdatesUserProfileInformation;
|
||||||
|
|
||||||
class UpdateUserProfileInformation implements UpdatesUserProfileInformation
|
class UpdateUserProfileInformation implements UpdatesUserProfileInformation
|
||||||
{
|
{
|
||||||
use WithTrimStrings;
|
use WithTrimStrings;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Validate and update the given user's profile information.
|
* Validate and update the given user's profile information.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -38,9 +38,9 @@ class CaptureDailyChange extends Command
|
|||||||
*/
|
*/
|
||||||
public function handle()
|
public function handle()
|
||||||
{
|
{
|
||||||
Portfolio::with('holdings.market_data')->get()->each(function($portfolio){
|
Portfolio::with('holdings.market_data')->get()->each(function ($portfolio) {
|
||||||
|
|
||||||
$this->line('Capturing daily change for ' . $portfolio->title);
|
$this->line('Capturing daily change for '.$portfolio->title);
|
||||||
|
|
||||||
$total_cost_basis = $portfolio->holdings->sum('total_cost_basis');
|
$total_cost_basis = $portfolio->holdings->sum('total_cost_basis');
|
||||||
|
|
||||||
@@ -48,7 +48,7 @@ class CaptureDailyChange extends Command
|
|||||||
|
|
||||||
$realized_gains = $portfolio->holdings->sum('realized_gain_dollars');
|
$realized_gains = $portfolio->holdings->sum('realized_gain_dollars');
|
||||||
|
|
||||||
$total_market_value = $portfolio->holdings->sum(function($holding) {
|
$total_market_value = $portfolio->holdings->sum(function ($holding) {
|
||||||
return $holding->market_data->market_value * $holding->quantity;
|
return $holding->market_data->market_value * $holding->quantity;
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -58,7 +58,7 @@ class CaptureDailyChange extends Command
|
|||||||
'total_cost_basis' => $total_cost_basis,
|
'total_cost_basis' => $total_cost_basis,
|
||||||
'total_gain' => $total_market_value - $total_cost_basis,
|
'total_gain' => $total_market_value - $total_cost_basis,
|
||||||
'total_dividends_earned' => $total_dividends,
|
'total_dividends_earned' => $total_dividends,
|
||||||
'realized_gains' => $realized_gains
|
'realized_gains' => $realized_gains,
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
namespace App\Console\Commands;
|
namespace App\Console\Commands;
|
||||||
|
|
||||||
use App\Models\Holding;
|
|
||||||
use App\Models\Dividend;
|
use App\Models\Dividend;
|
||||||
|
use App\Models\Holding;
|
||||||
use Illuminate\Console\Command;
|
use Illuminate\Console\Command;
|
||||||
|
|
||||||
class RefreshDividendData extends Command
|
class RefreshDividendData extends Command
|
||||||
@@ -43,17 +43,17 @@ class RefreshDividendData extends Command
|
|||||||
{
|
{
|
||||||
$holdings = Holding::distinct();
|
$holdings = Holding::distinct();
|
||||||
|
|
||||||
if (!($this->option('force') ?? false)) {
|
if (! ($this->option('force') ?? false)) {
|
||||||
$holdings->where('quantity', '>', 0);
|
$holdings->where('quantity', '>', 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->option('user')) {
|
if ($this->option('user')) {
|
||||||
$holdings->myHoldings($this->option('user'));
|
$holdings->myHoldings($this->option('user'));
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach ($holdings->get(['symbol']) as $holding) {
|
foreach ($holdings->get(['symbol']) as $holding) {
|
||||||
$this->line('Refreshing ' . $holding->symbol);
|
$this->line('Refreshing '.$holding->symbol);
|
||||||
|
|
||||||
Dividend::refreshDividendData($holding->symbol);
|
Dividend::refreshDividendData($holding->symbol);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -42,18 +42,18 @@ class RefreshMarketData extends Command
|
|||||||
public function handle()
|
public function handle()
|
||||||
{
|
{
|
||||||
$force = $this->option('force') ?? false;
|
$force = $this->option('force') ?? false;
|
||||||
|
|
||||||
// get all symbols from market data
|
// get all symbols from market data
|
||||||
$holdings = Holding::where('quantity', '>', 0)
|
$holdings = Holding::where('quantity', '>', 0)
|
||||||
->select(['symbol'])
|
->select(['symbol'])
|
||||||
->distinct();
|
->distinct();
|
||||||
|
|
||||||
if ($this->option('user')) {
|
if ($this->option('user')) {
|
||||||
$holdings->myHoldings($this->option('user'));
|
$holdings->myHoldings($this->option('user'));
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach ($holdings->get() as $holding) {
|
foreach ($holdings->get() as $holding) {
|
||||||
$this->line('Refreshing ' . $holding->symbol);
|
$this->line('Refreshing '.$holding->symbol);
|
||||||
|
|
||||||
MarketData::getMarketData($holding->symbol, $force);
|
MarketData::getMarketData($holding->symbol, $force);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
namespace App\Console\Commands;
|
namespace App\Console\Commands;
|
||||||
|
|
||||||
use App\Models\Split;
|
|
||||||
use App\Models\Holding;
|
use App\Models\Holding;
|
||||||
|
use App\Models\Split;
|
||||||
use Illuminate\Console\Command;
|
use Illuminate\Console\Command;
|
||||||
|
|
||||||
class RefreshSplitData extends Command
|
class RefreshSplitData extends Command
|
||||||
@@ -42,14 +42,14 @@ class RefreshSplitData extends Command
|
|||||||
{
|
{
|
||||||
$holdings = Holding::distinct();
|
$holdings = Holding::distinct();
|
||||||
|
|
||||||
if (!($this->option('force') ?? false)) {
|
if (! ($this->option('force') ?? false)) {
|
||||||
$holdings->where('quantity', '>', 0);
|
$holdings->where('quantity', '>', 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach ($holdings->get(['symbol']) as $holding) {
|
foreach ($holdings->get(['symbol']) as $holding) {
|
||||||
$this->line('Refreshing ' . $holding->symbol);
|
$this->line('Refreshing '.$holding->symbol);
|
||||||
|
|
||||||
Split::refreshSplitData($holding->symbol);
|
Split::refreshSplitData($holding->symbol);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ namespace App\Console\Commands;
|
|||||||
use App\Models\Portfolio;
|
use App\Models\Portfolio;
|
||||||
use Illuminate\Console\Command;
|
use Illuminate\Console\Command;
|
||||||
use Illuminate\Contracts\Console\PromptsForMissingInput;
|
use Illuminate\Contracts\Console\PromptsForMissingInput;
|
||||||
|
|
||||||
use function Laravel\Prompts\search;
|
use function Laravel\Prompts\search;
|
||||||
|
|
||||||
class SyncDailyChange extends Command implements PromptsForMissingInput
|
class SyncDailyChange extends Command implements PromptsForMissingInput
|
||||||
@@ -61,14 +62,14 @@ class SyncDailyChange extends Command implements PromptsForMissingInput
|
|||||||
public function handle()
|
public function handle()
|
||||||
{
|
{
|
||||||
try {
|
try {
|
||||||
|
|
||||||
$portfolio = Portfolio::findOrFail($this->argument('portfolio_id'));
|
$portfolio = Portfolio::findOrFail($this->argument('portfolio_id'));
|
||||||
|
|
||||||
$this->line('Syncing daily change history... This may take a moment.');
|
$this->line('Syncing daily change history... This may take a moment.');
|
||||||
|
|
||||||
$portfolio->syncDailyChanges();
|
$portfolio->syncDailyChanges();
|
||||||
|
|
||||||
$this->line('Awesome! Daily change history for '. $portfolio->title .' has been completed.');
|
$this->line('Awesome! Daily change history for '.$portfolio->title.' has been completed.');
|
||||||
|
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
|
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ class SyncHoldingData extends Command
|
|||||||
}
|
}
|
||||||
|
|
||||||
foreach ($holdings->get() as $holding) {
|
foreach ($holdings->get() as $holding) {
|
||||||
$this->line('Refreshing ' . $holding->symbol);
|
$this->line('Refreshing '.$holding->symbol);
|
||||||
|
|
||||||
$holding->syncTransactionsAndDividends();
|
$holding->syncTransactionsAndDividends();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,18 +14,14 @@ class BackupExport implements WithMultipleSheets
|
|||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
public bool $empty = false
|
public bool $empty = false
|
||||||
)
|
) {}
|
||||||
{ }
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return array
|
|
||||||
*/
|
|
||||||
public function sheets(): array
|
public function sheets(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
new PortfoliosSheet($this->empty),
|
new PortfoliosSheet($this->empty),
|
||||||
new TransactionsSheet($this->empty),
|
new TransactionsSheet($this->empty),
|
||||||
new DailyChangesSheet($this->empty)
|
new DailyChangesSheet($this->empty),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ class DailyChangesSheet implements FromCollection, WithHeadings, WithTitle
|
|||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
public bool $empty = false
|
public bool $empty = false
|
||||||
) { }
|
) {}
|
||||||
|
|
||||||
public function headings(): array
|
public function headings(): array
|
||||||
{
|
{
|
||||||
@@ -23,21 +23,18 @@ class DailyChangesSheet implements FromCollection, WithHeadings, WithTitle
|
|||||||
'Total Gain',
|
'Total Gain',
|
||||||
'Total Dividends Earned',
|
'Total Dividends Earned',
|
||||||
'Realized Gains',
|
'Realized Gains',
|
||||||
'Annotation'
|
'Annotation',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return \Illuminate\Support\Collection
|
* @return \Illuminate\Support\Collection
|
||||||
*/
|
*/
|
||||||
public function collection()
|
public function collection()
|
||||||
{
|
{
|
||||||
return $this->empty ? collect() : DailyChange::myDailyChanges()->get();
|
return $this->empty ? collect() : DailyChange::myDailyChanges()->get();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return string
|
|
||||||
*/
|
|
||||||
public function title(): string
|
public function title(): string
|
||||||
{
|
{
|
||||||
return 'Daily Changes';
|
return 'Daily Changes';
|
||||||
|
|||||||
@@ -11,8 +11,8 @@ class PortfoliosSheet implements FromCollection, WithHeadings, WithTitle
|
|||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
public bool $empty = false
|
public bool $empty = false
|
||||||
) { }
|
) {}
|
||||||
|
|
||||||
public function headings(): array
|
public function headings(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
@@ -21,21 +21,18 @@ class PortfoliosSheet implements FromCollection, WithHeadings, WithTitle
|
|||||||
'Notes',
|
'Notes',
|
||||||
'Wishlist',
|
'Wishlist',
|
||||||
'Created',
|
'Created',
|
||||||
'Updated'
|
'Updated',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return \Illuminate\Support\Collection
|
* @return \Illuminate\Support\Collection
|
||||||
*/
|
*/
|
||||||
public function collection()
|
public function collection()
|
||||||
{
|
{
|
||||||
return $this->empty ? collect() : Portfolio::myPortfolios()->get();
|
return $this->empty ? collect() : Portfolio::myPortfolios()->get();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return string
|
|
||||||
*/
|
|
||||||
public function title(): string
|
public function title(): string
|
||||||
{
|
{
|
||||||
return 'Portfolios';
|
return 'Portfolios';
|
||||||
|
|||||||
@@ -3,15 +3,15 @@
|
|||||||
namespace App\Exports\Sheets;
|
namespace App\Exports\Sheets;
|
||||||
|
|
||||||
use App\Models\Transaction;
|
use App\Models\Transaction;
|
||||||
use Maatwebsite\Excel\Concerns\WithTitle;
|
|
||||||
use Maatwebsite\Excel\Concerns\WithHeadings;
|
|
||||||
use Maatwebsite\Excel\Concerns\FromCollection;
|
use Maatwebsite\Excel\Concerns\FromCollection;
|
||||||
|
use Maatwebsite\Excel\Concerns\WithHeadings;
|
||||||
|
use Maatwebsite\Excel\Concerns\WithTitle;
|
||||||
|
|
||||||
class TransactionsSheet implements FromCollection, WithHeadings, WithTitle
|
class TransactionsSheet implements FromCollection, WithHeadings, WithTitle
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
public bool $empty = false
|
public bool $empty = false
|
||||||
) { }
|
) {}
|
||||||
|
|
||||||
public function headings(): array
|
public function headings(): array
|
||||||
{
|
{
|
||||||
@@ -27,21 +27,18 @@ class TransactionsSheet implements FromCollection, WithHeadings, WithTitle
|
|||||||
'Reinvested Dividend',
|
'Reinvested Dividend',
|
||||||
'Date',
|
'Date',
|
||||||
'Created',
|
'Created',
|
||||||
'Updated'
|
'Updated',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return \Illuminate\Support\Collection
|
* @return \Illuminate\Support\Collection
|
||||||
*/
|
*/
|
||||||
public function collection()
|
public function collection()
|
||||||
{
|
{
|
||||||
return $this->empty ? collect() : Transaction::myTransactions()->get();
|
return $this->empty ? collect() : Transaction::myTransactions()->get();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return string
|
|
||||||
*/
|
|
||||||
public function title(): string
|
public function title(): string
|
||||||
{
|
{
|
||||||
return 'Transactions';
|
return 'Transactions';
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace App\Http\ApiControllers;
|
namespace App\Http\ApiControllers;
|
||||||
|
|
||||||
abstract class Controller
|
abstract class Controller
|
||||||
{
|
{
|
||||||
//
|
//
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,14 +2,13 @@
|
|||||||
|
|
||||||
namespace App\Http\ApiControllers;
|
namespace App\Http\ApiControllers;
|
||||||
|
|
||||||
use App\Models\Holding;
|
use App\Http\ApiControllers\Controller as ApiController;
|
||||||
use App\Models\Portfolio;
|
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use Illuminate\Support\Facades\Gate;
|
|
||||||
use App\Http\Requests\HoldingRequest;
|
use App\Http\Requests\HoldingRequest;
|
||||||
use App\Http\Resources\HoldingResource;
|
use App\Http\Resources\HoldingResource;
|
||||||
|
use App\Models\Holding;
|
||||||
|
use App\Models\Portfolio;
|
||||||
use HackerEsq\FilterModels\FilterModels;
|
use HackerEsq\FilterModels\FilterModels;
|
||||||
use App\Http\ApiControllers\Controller as ApiController;
|
use Illuminate\Support\Facades\Gate;
|
||||||
|
|
||||||
class HoldingController extends ApiController
|
class HoldingController extends ApiController
|
||||||
{
|
{
|
||||||
@@ -45,4 +44,4 @@ class HoldingController extends ApiController
|
|||||||
|
|
||||||
return HoldingResource::make($holding);
|
return HoldingResource::make($holding);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,10 +4,10 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace App\Http\ApiControllers;
|
namespace App\Http\ApiControllers;
|
||||||
|
|
||||||
|
use App\Http\ApiControllers\Controller as ApiController;
|
||||||
|
use App\Http\Resources\MarketDataResource;
|
||||||
use App\Models\MarketData;
|
use App\Models\MarketData;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
use App\Http\Resources\MarketDataResource;
|
|
||||||
use App\Http\ApiControllers\Controller as ApiController;
|
|
||||||
|
|
||||||
class MarketDataController extends ApiController
|
class MarketDataController extends ApiController
|
||||||
{
|
{
|
||||||
@@ -18,4 +18,4 @@ class MarketDataController extends ApiController
|
|||||||
MarketData::getMarketData($symbol)
|
MarketData::getMarketData($symbol)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,12 +4,12 @@ declare(strict_types=1);
|
|||||||
|
|
||||||
namespace App\Http\ApiControllers;
|
namespace App\Http\ApiControllers;
|
||||||
|
|
||||||
use App\Models\Portfolio;
|
|
||||||
use Illuminate\Support\Facades\Gate;
|
|
||||||
use HackerEsq\FilterModels\FilterModels;
|
|
||||||
use App\Http\Resources\PortfolioResource;
|
|
||||||
use App\Http\Requests\PortfolioRequest;
|
|
||||||
use App\Http\ApiControllers\Controller as ApiController;
|
use App\Http\ApiControllers\Controller as ApiController;
|
||||||
|
use App\Http\Requests\PortfolioRequest;
|
||||||
|
use App\Http\Resources\PortfolioResource;
|
||||||
|
use App\Models\Portfolio;
|
||||||
|
use HackerEsq\FilterModels\FilterModels;
|
||||||
|
use Illuminate\Support\Facades\Gate;
|
||||||
|
|
||||||
class PortfolioController extends ApiController
|
class PortfolioController extends ApiController
|
||||||
{
|
{
|
||||||
@@ -27,7 +27,7 @@ class PortfolioController extends ApiController
|
|||||||
public function store(PortfolioRequest $request)
|
public function store(PortfolioRequest $request)
|
||||||
{
|
{
|
||||||
$portfolio = Portfolio::create($request->validated());
|
$portfolio = Portfolio::create($request->validated());
|
||||||
|
|
||||||
return PortfolioResource::make($portfolio);
|
return PortfolioResource::make($portfolio);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -55,4 +55,4 @@ class PortfolioController extends ApiController
|
|||||||
|
|
||||||
return response()->noContent();
|
return response()->noContent();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,13 +2,12 @@
|
|||||||
|
|
||||||
namespace App\Http\ApiControllers;
|
namespace App\Http\ApiControllers;
|
||||||
|
|
||||||
use App\Models\Transaction;
|
use App\Http\ApiControllers\Controller as ApiController;
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use Illuminate\Support\Facades\Gate;
|
|
||||||
use HackerEsq\FilterModels\FilterModels;
|
|
||||||
use App\Http\Requests\TransactionRequest;
|
use App\Http\Requests\TransactionRequest;
|
||||||
use App\Http\Resources\TransactionResource;
|
use App\Http\Resources\TransactionResource;
|
||||||
use App\Http\ApiControllers\Controller as ApiController;
|
use App\Models\Transaction;
|
||||||
|
use HackerEsq\FilterModels\FilterModels;
|
||||||
|
use Illuminate\Support\Facades\Gate;
|
||||||
|
|
||||||
class TransactionController extends ApiController
|
class TransactionController extends ApiController
|
||||||
{
|
{
|
||||||
@@ -23,11 +22,11 @@ class TransactionController extends ApiController
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function store(TransactionRequest $request)
|
public function store(TransactionRequest $request)
|
||||||
{
|
{
|
||||||
Gate::authorize('fullAccess', $request->portfolio);
|
Gate::authorize('fullAccess', $request->portfolio);
|
||||||
|
|
||||||
$transaction = Transaction::create($request->validated());
|
$transaction = Transaction::create($request->validated());
|
||||||
|
|
||||||
return TransactionResource::make($transaction);
|
return TransactionResource::make($transaction);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -55,4 +54,4 @@ class TransactionController extends ApiController
|
|||||||
|
|
||||||
return response()->noContent();
|
return response()->noContent();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,9 +2,9 @@
|
|||||||
|
|
||||||
namespace App\Http\ApiControllers;
|
namespace App\Http\ApiControllers;
|
||||||
|
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use App\Http\Resources\UserResource;
|
|
||||||
use App\Http\ApiControllers\Controller as ApiController;
|
use App\Http\ApiControllers\Controller as ApiController;
|
||||||
|
use App\Http\Resources\UserResource;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
class UserController extends ApiController
|
class UserController extends ApiController
|
||||||
{
|
{
|
||||||
@@ -12,4 +12,4 @@ class UserController extends ApiController
|
|||||||
{
|
{
|
||||||
return UserResource::make($request->user());
|
return UserResource::make($request->user());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,21 +2,19 @@
|
|||||||
|
|
||||||
namespace App\Http\Controllers;
|
namespace App\Http\Controllers;
|
||||||
|
|
||||||
use Exception;
|
|
||||||
use App\Models\User;
|
|
||||||
use App\Models\ConnectedAccount;
|
use App\Models\ConnectedAccount;
|
||||||
use Illuminate\Support\MessageBag;
|
use App\Models\User;
|
||||||
|
use App\Notifications\VerifyConnectedAccountNotification;
|
||||||
|
use Exception;
|
||||||
use Illuminate\Support\Facades\Auth;
|
use Illuminate\Support\Facades\Auth;
|
||||||
use Illuminate\Support\Facades\Blade;
|
use Illuminate\Support\Facades\Blade;
|
||||||
|
use Illuminate\Support\MessageBag;
|
||||||
use Laravel\Socialite\Facades\Socialite;
|
use Laravel\Socialite\Facades\Socialite;
|
||||||
use App\Notifications\VerifyConnectedAccountNotification;
|
|
||||||
|
|
||||||
class ConnectedAccountController extends Controller
|
class ConnectedAccountController extends Controller
|
||||||
{
|
{
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Redirect the user to the GitHub authentication page.
|
* Redirect the user to the GitHub authentication page.
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public function redirectToProvider(string $provider)
|
public function redirectToProvider(string $provider)
|
||||||
{
|
{
|
||||||
@@ -27,7 +25,6 @@ class ConnectedAccountController extends Controller
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Obtain the user information from GitHub.
|
* Obtain the user information from GitHub.
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public function handleProviderCallback(string $provider)
|
public function handleProviderCallback(string $provider)
|
||||||
{
|
{
|
||||||
@@ -44,21 +41,21 @@ class ConnectedAccountController extends Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
// check if this account is already linked
|
// check if this account is already linked
|
||||||
$connected_account = ConnectedAccount::firstOrNew([
|
$connected_account = ConnectedAccount::firstOrNew([
|
||||||
'provider' => $provider,
|
'provider' => $provider,
|
||||||
'provider_id' => $providerUser->id
|
'provider_id' => $providerUser->id,
|
||||||
], [
|
], [
|
||||||
'token' => $providerUser->token,
|
'token' => $providerUser->token,
|
||||||
'secret' => $providerUser->tokenSecret,
|
'secret' => $providerUser->tokenSecret,
|
||||||
'refresh_token' => $providerUser->refreshToken,
|
'refresh_token' => $providerUser->refreshToken,
|
||||||
'expires_at' => $providerUser->expiresIn,
|
'expires_at' => $providerUser->expiresIn,
|
||||||
'verified_at' => false
|
'verified_at' => false,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
// already linked and verified, let's go login!
|
// already linked and verified, let's go login!
|
||||||
if (
|
if (
|
||||||
$connected_account->exists
|
$connected_account->exists
|
||||||
&& !is_null($connected_account->verified_at)
|
&& ! is_null($connected_account->verified_at)
|
||||||
) {
|
) {
|
||||||
|
|
||||||
Auth::login($connected_account->user, true);
|
Auth::login($connected_account->user, true);
|
||||||
@@ -67,20 +64,20 @@ class ConnectedAccountController extends Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
// new user, let's create one
|
// new user, let's create one
|
||||||
if (!$user = User::where('email', $providerUser->email)->first()) {
|
if (! $user = User::where('email', $providerUser->email)->first()) {
|
||||||
|
|
||||||
$user = User::create([
|
$user = User::create([
|
||||||
'name' => $providerUser->name,
|
'name' => $providerUser->name,
|
||||||
'email' => $providerUser->email,
|
'email' => $providerUser->email,
|
||||||
'email_verified_at' => now()
|
'email_verified_at' => now(),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$connected_account->user_id = $user->id;
|
$connected_account->user_id = $user->id;
|
||||||
$connected_account->verified_at = now();
|
$connected_account->verified_at = now();
|
||||||
$connected_account->save();
|
$connected_account->save();
|
||||||
|
|
||||||
Auth::login($user, true);
|
Auth::login($user, true);
|
||||||
|
|
||||||
return redirect(route('dashboard'));
|
return redirect(route('dashboard'));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -91,23 +88,23 @@ class ConnectedAccountController extends Controller
|
|||||||
$user->notify(new VerifyConnectedAccountNotification($connected_account->id));
|
$user->notify(new VerifyConnectedAccountNotification($connected_account->id));
|
||||||
|
|
||||||
return redirect(route('login'))
|
return redirect(route('login'))
|
||||||
->with('status', __(
|
->with('status', __(
|
||||||
'Account already exists. Check your email to connect your :provider account.',
|
'Account already exists. Check your email to connect your :provider account.',
|
||||||
['provider' => config("services.$provider.name")]
|
['provider' => config("services.$provider.name")]
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function validateProvider($provider): void
|
protected function validateProvider($provider): void
|
||||||
{
|
{
|
||||||
if (!in_array($provider, explode(',', config('services.enabled_login_providers')))) {
|
if (! in_array($provider, explode(',', config('services.enabled_login_providers')))) {
|
||||||
|
|
||||||
throw new Exception('Please provide a valid social provider.');
|
throw new Exception('Please provide a valid social provider.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public function verify(ConnectedAccount $connected_account)
|
public function verify(ConnectedAccount $connected_account)
|
||||||
{
|
{
|
||||||
if (!$connected_account->verified_at) {
|
if (! $connected_account->verified_at) {
|
||||||
|
|
||||||
// mark request as verified
|
// mark request as verified
|
||||||
$connected_account->verified_at = now();
|
$connected_account->verified_at = now();
|
||||||
@@ -127,8 +124,8 @@ class ConnectedAccountController extends Controller
|
|||||||
'css' => 'alert-success',
|
'css' => 'alert-success',
|
||||||
'icon' => Blade::render("<x-mary-icon class='w-7 h-7' name='o-check-circle' />"),
|
'icon' => Blade::render("<x-mary-icon class='w-7 h-7' name='o-check-circle' />"),
|
||||||
'position' => 'toast-top toast-end',
|
'position' => 'toast-top toast-end',
|
||||||
'timeout' => '5000'
|
'timeout' => '5000',
|
||||||
]
|
],
|
||||||
]));
|
]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace App\Http\Controllers;
|
namespace App\Http\Controllers;
|
||||||
|
|
||||||
abstract class Controller
|
abstract class Controller
|
||||||
{
|
{
|
||||||
//
|
//
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,15 +16,15 @@ class DashboardController extends Controller
|
|||||||
|
|
||||||
// get portfolio metrics
|
// get portfolio metrics
|
||||||
$metrics = cache()->remember(
|
$metrics = cache()->remember(
|
||||||
'dashboard-metrics-' . $user->id,
|
'dashboard-metrics-'.$user->id,
|
||||||
10,
|
10,
|
||||||
function () {
|
function () {
|
||||||
return
|
return
|
||||||
Holding::query()
|
Holding::query()
|
||||||
->myHoldings()
|
->myHoldings()
|
||||||
->withoutWishlists()
|
->withoutWishlists()
|
||||||
->withPortfolioMetrics()
|
->withPortfolioMetrics()
|
||||||
->first();
|
->first();
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -8,21 +8,20 @@ use Illuminate\Http\Request;
|
|||||||
|
|
||||||
class HoldingController extends Controller
|
class HoldingController extends Controller
|
||||||
{
|
{
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Display the specified resource.
|
* Display the specified resource.
|
||||||
*/
|
*/
|
||||||
public function show(Request $request, Portfolio $portfolio, String $symbol)
|
public function show(Request $request, Portfolio $portfolio, string $symbol)
|
||||||
{
|
{
|
||||||
$holding = Holding::with([
|
$holding = Holding::with([
|
||||||
'market_data',
|
'market_data',
|
||||||
'transactions' => function ($query) use ($symbol) {
|
'transactions' => function ($query) use ($symbol) {
|
||||||
$query->where('transactions.symbol', $symbol);
|
$query->where('transactions.symbol', $symbol);
|
||||||
}
|
},
|
||||||
])
|
])
|
||||||
->symbol($symbol)
|
->symbol($symbol)
|
||||||
->portfolio($portfolio->id)
|
->portfolio($portfolio->id)
|
||||||
->firstOrFail();
|
->firstOrFail();
|
||||||
|
|
||||||
$formattedTransactions = $holding->getFormattedTransactions();
|
$formattedTransactions = $holding->getFormattedTransactions();
|
||||||
|
|
||||||
|
|||||||
@@ -2,21 +2,19 @@
|
|||||||
|
|
||||||
namespace App\Http\Controllers;
|
namespace App\Http\Controllers;
|
||||||
|
|
||||||
use App\Models\User;
|
|
||||||
use App\Models\Portfolio;
|
use App\Models\Portfolio;
|
||||||
|
use App\Models\User;
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
class InvitedOnboardingController extends Controller
|
class InvitedOnboardingController extends Controller
|
||||||
{
|
{
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Check if the invited user needs a password?
|
* Check if the invited user needs a password?
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public function __invoke(Request $request, Portfolio $portfolio, User $user)
|
public function __invoke(Request $request, Portfolio $portfolio, User $user)
|
||||||
{
|
{
|
||||||
|
|
||||||
if (!$request->hasValidSignature()) {
|
if (! $request->hasValidSignature()) {
|
||||||
abort(401, 'Invalid signature');
|
abort(401, 'Invalid signature');
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -26,7 +24,7 @@ class InvitedOnboardingController extends Controller
|
|||||||
// route to create password form
|
// route to create password form
|
||||||
return view('auth.invited-onboarding', [
|
return view('auth.invited-onboarding', [
|
||||||
'portfolio' => $portfolio,
|
'portfolio' => $portfolio,
|
||||||
'user' => $user
|
'user' => $user,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ use Illuminate\Support\Facades\Gate;
|
|||||||
|
|
||||||
class PortfolioController extends Controller
|
class PortfolioController extends Controller
|
||||||
{
|
{
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Show the form for creating a new resource.
|
* Show the form for creating a new resource.
|
||||||
*/
|
*/
|
||||||
@@ -26,21 +25,21 @@ class PortfolioController extends Controller
|
|||||||
Gate::authorize('readOnly', $portfolio);
|
Gate::authorize('readOnly', $portfolio);
|
||||||
|
|
||||||
$portfolio->load(['transactions', 'holdings']);
|
$portfolio->load(['transactions', 'holdings']);
|
||||||
|
|
||||||
// get portfolio metrics
|
// get portfolio metrics
|
||||||
$metrics = cache()->remember(
|
$metrics = cache()->remember(
|
||||||
'portfolio-metrics-' . $portfolio->id,
|
'portfolio-metrics-'.$portfolio->id,
|
||||||
60,
|
60,
|
||||||
function () use ($portfolio) {
|
function () use ($portfolio) {
|
||||||
return Holding::query()
|
return Holding::query()
|
||||||
->portfolio($portfolio->id)
|
->portfolio($portfolio->id)
|
||||||
->withPortfolioMetrics()
|
->withPortfolioMetrics()
|
||||||
->first();
|
->first();
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
$formattedHoldings = $portfolio->getFormattedHoldings();
|
$formattedHoldings = $portfolio->getFormattedHoldings();
|
||||||
|
|
||||||
return view('portfolio.show', compact(['portfolio', 'metrics', 'formattedHoldings']));
|
return view('portfolio.show', compact(['portfolio', 'metrics', 'formattedHoldings']));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ namespace App\Http\Controllers;
|
|||||||
|
|
||||||
class TransactionController extends Controller
|
class TransactionController extends Controller
|
||||||
{
|
{
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Display the specified resource.
|
* Display the specified resource.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ class SetLocale
|
|||||||
*/
|
*/
|
||||||
public function handle(Request $request, Closure $next)
|
public function handle(Request $request, Closure $next)
|
||||||
{
|
{
|
||||||
if (!session()->has('locale')) {
|
if (! session()->has('locale')) {
|
||||||
session()->put('locale', $request->getPreferredLanguage(
|
session()->put('locale', $request->getPreferredLanguage(
|
||||||
config('app.available_locales')
|
config('app.available_locales')
|
||||||
));
|
));
|
||||||
@@ -24,4 +24,4 @@ class SetLocale
|
|||||||
|
|
||||||
return $next($request);
|
return $next($request);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,9 +6,8 @@ use Illuminate\Foundation\Http\FormRequest as BaseFormRequest;
|
|||||||
|
|
||||||
class FormRequest extends BaseFormRequest
|
class FormRequest extends BaseFormRequest
|
||||||
{
|
{
|
||||||
|
|
||||||
public function requestOrModelValue($key, $model): mixed
|
public function requestOrModelValue($key, $model): mixed
|
||||||
{
|
{
|
||||||
return $this->request->get($key) ?? $this->{$model}?->{$key};
|
return $this->request->get($key) ?? $this->{$model}?->{$key};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,11 +2,8 @@
|
|||||||
|
|
||||||
namespace App\Http\Requests;
|
namespace App\Http\Requests;
|
||||||
|
|
||||||
use App\Http\Requests\FormRequest;
|
|
||||||
|
|
||||||
class HoldingRequest extends FormRequest
|
class HoldingRequest extends FormRequest
|
||||||
{
|
{
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the validation rules that apply to the request.
|
* Get the validation rules that apply to the request.
|
||||||
*
|
*
|
||||||
@@ -16,7 +13,7 @@ class HoldingRequest extends FormRequest
|
|||||||
{
|
{
|
||||||
|
|
||||||
$rules = [
|
$rules = [
|
||||||
'reinvest_dividends' => ['sometimes', 'boolean']
|
'reinvest_dividends' => ['sometimes', 'boolean'],
|
||||||
];
|
];
|
||||||
|
|
||||||
return $rules;
|
return $rules;
|
||||||
|
|||||||
@@ -2,11 +2,8 @@
|
|||||||
|
|
||||||
namespace App\Http\Requests;
|
namespace App\Http\Requests;
|
||||||
|
|
||||||
use App\Http\Requests\FormRequest;
|
|
||||||
|
|
||||||
class PortfolioRequest extends FormRequest
|
class PortfolioRequest extends FormRequest
|
||||||
{
|
{
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the validation rules that apply to the request.
|
* Get the validation rules that apply to the request.
|
||||||
*
|
*
|
||||||
@@ -21,9 +18,9 @@ class PortfolioRequest extends FormRequest
|
|||||||
'wishlist' => ['sometimes', 'nullable', 'boolean'],
|
'wishlist' => ['sometimes', 'nullable', 'boolean'],
|
||||||
];
|
];
|
||||||
|
|
||||||
if (!is_null($this->portfolio)) {
|
if (! is_null($this->portfolio)) {
|
||||||
$rules['title'][0] = 'sometimes';
|
$rules['title'][0] = 'sometimes';
|
||||||
}
|
}
|
||||||
|
|
||||||
return $rules;
|
return $rules;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,18 +3,16 @@
|
|||||||
namespace App\Http\Requests;
|
namespace App\Http\Requests;
|
||||||
|
|
||||||
use App\Models\Portfolio;
|
use App\Models\Portfolio;
|
||||||
use App\Http\Requests\FormRequest;
|
|
||||||
use App\Rules\SymbolValidationRule;
|
|
||||||
use App\Rules\QuantityValidationRule;
|
use App\Rules\QuantityValidationRule;
|
||||||
|
use App\Rules\SymbolValidationRule;
|
||||||
|
|
||||||
class TransactionRequest extends FormRequest
|
class TransactionRequest extends FormRequest
|
||||||
{
|
{
|
||||||
|
|
||||||
protected function prepareForValidation(): void
|
protected function prepareForValidation(): void
|
||||||
{
|
{
|
||||||
|
|
||||||
$this->merge([
|
$this->merge([
|
||||||
'portfolio' => Portfolio::find($this->requestOrModelValue('portfolio_id', 'transaction'))
|
'portfolio' => Portfolio::find($this->requestOrModelValue('portfolio_id', 'transaction')),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -25,28 +23,28 @@ class TransactionRequest extends FormRequest
|
|||||||
*/
|
*/
|
||||||
public function rules(): array
|
public function rules(): array
|
||||||
{
|
{
|
||||||
|
|
||||||
$rules = [
|
$rules = [
|
||||||
'portfolio_id' => ['required', 'exists:portfolios,id'],
|
'portfolio_id' => ['required', 'exists:portfolios,id'],
|
||||||
'symbol' => ['required', 'string', new SymbolValidationRule],
|
'symbol' => ['required', 'string', new SymbolValidationRule],
|
||||||
'transaction_type' => ['required', 'string', 'in:BUY,SELL'],
|
'transaction_type' => ['required', 'string', 'in:BUY,SELL'],
|
||||||
'date' => ['required', 'date_format:Y-m-d', 'before_or_equal:' . now()->format('Y-m-d')],
|
'date' => ['required', 'date_format:Y-m-d', 'before_or_equal:'.now()->format('Y-m-d')],
|
||||||
'quantity' => [
|
'quantity' => [
|
||||||
'required',
|
'required',
|
||||||
'numeric',
|
'numeric',
|
||||||
'min:0',
|
'min:0',
|
||||||
new QuantityValidationRule(
|
new QuantityValidationRule(
|
||||||
$this->input('portfolio'),
|
$this->input('portfolio'),
|
||||||
$this->requestOrModelValue('symbol', 'transaction'),
|
$this->requestOrModelValue('symbol', 'transaction'),
|
||||||
$this->requestOrModelValue('transaction_type', 'transaction'),
|
$this->requestOrModelValue('transaction_type', 'transaction'),
|
||||||
$this->requestOrModelValue('date', 'transaction')
|
$this->requestOrModelValue('date', 'transaction')
|
||||||
)
|
),
|
||||||
],
|
],
|
||||||
'cost_basis' => ['exclude_if:transaction_type,SELL', 'min:0', 'numeric'],
|
'cost_basis' => ['exclude_if:transaction_type,SELL', 'min:0', 'numeric'],
|
||||||
'sale_price' => ['exclude_if:transaction_type,BUY', 'min:0', 'numeric'],
|
'sale_price' => ['exclude_if:transaction_type,BUY', 'min:0', 'numeric'],
|
||||||
];
|
];
|
||||||
|
|
||||||
if (!is_null($this->transaction)) {
|
if (! is_null($this->transaction)) {
|
||||||
$rules['portfolio_id'][0] = 'sometimes';
|
$rules['portfolio_id'][0] = 'sometimes';
|
||||||
$rules['symbol'][0] = 'sometimes';
|
$rules['symbol'][0] = 'sometimes';
|
||||||
$rules['transaction_type'][0] = 'sometimes';
|
$rules['transaction_type'][0] = 'sometimes';
|
||||||
@@ -64,7 +62,7 @@ class TransactionRequest extends FormRequest
|
|||||||
) {
|
) {
|
||||||
$rules['cost_basis'][0] = 'required';
|
$rules['cost_basis'][0] = 'required';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return $rules;
|
return $rules;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ class HoldingResource extends JsonResource
|
|||||||
'market_gain_dollars' => $this->market_gain_dollars,
|
'market_gain_dollars' => $this->market_gain_dollars,
|
||||||
'market_gain_percent' => $this->market_gain_percent,
|
'market_gain_percent' => $this->market_gain_percent,
|
||||||
'created_at' => $this->created_at,
|
'created_at' => $this->created_at,
|
||||||
'updated_at' => $this->updated_at
|
'updated_at' => $this->updated_at,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ use Illuminate\Http\Request;
|
|||||||
use Illuminate\Http\Resources\Json\JsonResource;
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
|
||||||
class UserResource extends JsonResource
|
class UserResource extends JsonResource
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Transform the resource into an array.
|
* Transform the resource into an array.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -2,39 +2,35 @@
|
|||||||
|
|
||||||
namespace App\Imports;
|
namespace App\Imports;
|
||||||
|
|
||||||
use App\Models\User;
|
use App\Console\Commands\RefreshDividendData;
|
||||||
use App\Imports\Sheets\PortfoliosSheet;
|
use App\Console\Commands\RefreshMarketData;
|
||||||
use Illuminate\Support\Facades\Artisan;
|
|
||||||
use App\Console\Commands\SyncDailyChange;
|
use App\Console\Commands\SyncDailyChange;
|
||||||
use App\Console\Commands\SyncHoldingData;
|
use App\Console\Commands\SyncHoldingData;
|
||||||
use App\Imports\Sheets\DailyChangesSheet;
|
use App\Imports\Sheets\DailyChangesSheet;
|
||||||
|
use App\Imports\Sheets\PortfoliosSheet;
|
||||||
use App\Imports\Sheets\TransactionsSheet;
|
use App\Imports\Sheets\TransactionsSheet;
|
||||||
use Maatwebsite\Excel\Events\AfterImport;
|
use App\Models\BackupImport as BackupImportModel;
|
||||||
|
use App\Models\User;
|
||||||
|
use Illuminate\Support\Facades\Artisan;
|
||||||
use Maatwebsite\Excel\Concerns\Importable;
|
use Maatwebsite\Excel\Concerns\Importable;
|
||||||
use Maatwebsite\Excel\Concerns\WithEvents;
|
use Maatwebsite\Excel\Concerns\WithEvents;
|
||||||
|
use Maatwebsite\Excel\Concerns\WithMultipleSheets;
|
||||||
|
use Maatwebsite\Excel\Events\AfterImport;
|
||||||
use Maatwebsite\Excel\Events\BeforeImport;
|
use Maatwebsite\Excel\Events\BeforeImport;
|
||||||
use Maatwebsite\Excel\Events\ImportFailed;
|
use Maatwebsite\Excel\Events\ImportFailed;
|
||||||
use App\Console\Commands\RefreshMarketData;
|
|
||||||
use App\Console\Commands\RefreshDividendData;
|
|
||||||
use App\Models\BackupImport as BackupImportModel;
|
|
||||||
use Maatwebsite\Excel\Concerns\WithMultipleSheets;
|
|
||||||
|
|
||||||
class BackupImport implements WithMultipleSheets, WithEvents
|
class BackupImport implements WithEvents, WithMultipleSheets
|
||||||
{
|
{
|
||||||
|
|
||||||
use Importable;
|
use Importable;
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
public BackupImportModel $backupImportModel
|
public BackupImportModel $backupImportModel
|
||||||
) { }
|
) {}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return array
|
|
||||||
*/
|
|
||||||
public function registerEvents(): array
|
public function registerEvents(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
BeforeImport::class => fn() => $this->backupImportModel->update([
|
BeforeImport::class => fn () => $this->backupImportModel->update([
|
||||||
'status' => 'in_progress',
|
'status' => 'in_progress',
|
||||||
'message' => __('Import is in progress...'),
|
'message' => __('Import is in progress...'),
|
||||||
]),
|
]),
|
||||||
@@ -43,24 +39,24 @@ class BackupImport implements WithMultipleSheets, WithEvents
|
|||||||
$this->backupImportModel->update([
|
$this->backupImportModel->update([
|
||||||
'status' => 'success',
|
'status' => 'success',
|
||||||
'message' => 'Import completed successfully!',
|
'message' => 'Import completed successfully!',
|
||||||
'completed_at' => now()
|
'completed_at' => now(),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
Artisan::queue(RefreshMarketData::class, ['--user' => $this->backupImportModel->user_id, '--force' => true])
|
Artisan::queue(RefreshMarketData::class, ['--user' => $this->backupImportModel->user_id, '--force' => true])
|
||||||
->chain([
|
->chain([
|
||||||
fn() => Artisan::call(RefreshDividendData::class, ['--user' => $this->backupImportModel->user_id, '--force' => true]),
|
fn () => Artisan::call(RefreshDividendData::class, ['--user' => $this->backupImportModel->user_id, '--force' => true]),
|
||||||
fn() => Artisan::call(SyncHoldingData::class, ['--user' => $this->backupImportModel->user_id]),
|
fn () => Artisan::call(SyncHoldingData::class, ['--user' => $this->backupImportModel->user_id]),
|
||||||
fn() => User::find($this->backupImportModel->user_id)->portfolios->each(function($portfolio) {
|
fn () => User::find($this->backupImportModel->user_id)->portfolios->each(function ($portfolio) {
|
||||||
|
|
||||||
Artisan::queue(SyncDailyChange::class, ['portfolio_id' => $portfolio->id]);
|
Artisan::queue(SyncDailyChange::class, ['portfolio_id' => $portfolio->id]);
|
||||||
})
|
}),
|
||||||
]);
|
]);
|
||||||
},
|
},
|
||||||
ImportFailed::class => fn(ImportFailed $event) => $this->backupImportModel->update([
|
ImportFailed::class => fn (ImportFailed $event) => $this->backupImportModel->update([
|
||||||
'status' => 'failed',
|
'status' => 'failed',
|
||||||
'message' => 'Error: '. substr($event->getException()->getMessage(), 0, 220),
|
'message' => 'Error: '.substr($event->getException()->getMessage(), 0, 220),
|
||||||
'has_errors' => true,
|
'has_errors' => true,
|
||||||
'completed_at' => now()
|
'completed_at' => now(),
|
||||||
]),
|
]),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,42 +3,39 @@
|
|||||||
namespace App\Imports\Sheets;
|
namespace App\Imports\Sheets;
|
||||||
|
|
||||||
use App\Imports\ValidatesPortfolioAccess;
|
use App\Imports\ValidatesPortfolioAccess;
|
||||||
use App\Models\DailyChange;
|
|
||||||
use App\Models\BackupImport;
|
use App\Models\BackupImport;
|
||||||
|
use App\Models\DailyChange;
|
||||||
use Illuminate\Support\Carbon;
|
use Illuminate\Support\Carbon;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
use Maatwebsite\Excel\Events\BeforeSheet;
|
|
||||||
use Maatwebsite\Excel\Concerns\WithEvents;
|
|
||||||
use Maatwebsite\Excel\Concerns\ToCollection;
|
|
||||||
use Maatwebsite\Excel\Concerns\SkipsEmptyRows;
|
use Maatwebsite\Excel\Concerns\SkipsEmptyRows;
|
||||||
|
use Maatwebsite\Excel\Concerns\ToCollection;
|
||||||
|
use Maatwebsite\Excel\Concerns\WithEvents;
|
||||||
use Maatwebsite\Excel\Concerns\WithHeadingRow;
|
use Maatwebsite\Excel\Concerns\WithHeadingRow;
|
||||||
use Maatwebsite\Excel\Concerns\WithValidation;
|
use Maatwebsite\Excel\Concerns\WithValidation;
|
||||||
|
use Maatwebsite\Excel\Events\BeforeSheet;
|
||||||
|
|
||||||
class DailyChangesSheet implements ToCollection, WithHeadingRow, WithValidation, SkipsEmptyRows, WithEvents
|
class DailyChangesSheet implements SkipsEmptyRows, ToCollection, WithEvents, WithHeadingRow, WithValidation
|
||||||
{
|
{
|
||||||
use ValidatesPortfolioAccess;
|
use ValidatesPortfolioAccess;
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
public BackupImport $backupImport
|
public BackupImport $backupImport
|
||||||
) { }
|
) {}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return array
|
|
||||||
*/
|
|
||||||
public function registerEvents(): array
|
public function registerEvents(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
BeforeSheet::class => function(BeforeSheet $event) {
|
BeforeSheet::class => function (BeforeSheet $event) {
|
||||||
DB::commit();
|
DB::commit();
|
||||||
$this->backupImport->update([
|
$this->backupImport->update([
|
||||||
'message' => __('Importing daily changes...'),
|
'message' => __('Importing daily changes...'),
|
||||||
]);
|
]);
|
||||||
DB::beginTransaction();
|
DB::beginTransaction();
|
||||||
}
|
},
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
public function collection(Collection $dailyChanges)
|
public function collection(Collection $dailyChanges)
|
||||||
{
|
{
|
||||||
$dailyChanges->chunk($this->batchSize())->each(function ($chunk) {
|
$dailyChanges->chunk($this->batchSize())->each(function ($chunk) {
|
||||||
@@ -56,7 +53,7 @@ class DailyChangesSheet implements ToCollection, WithHeadingRow, WithValidation,
|
|||||||
'realized_gains' => $dailyChange['realized_gains'],
|
'realized_gains' => $dailyChange['realized_gains'],
|
||||||
'annotation' => $dailyChange['annotation'],
|
'annotation' => $dailyChange['annotation'],
|
||||||
'portfolio_id' => $dailyChange['portfolio_id'],
|
'portfolio_id' => $dailyChange['portfolio_id'],
|
||||||
'date' => Carbon::parse($dailyChange['date'])->format('Y-m-d')
|
'date' => Carbon::parse($dailyChange['date'])->format('Y-m-d'),
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -71,7 +68,7 @@ class DailyChangesSheet implements ToCollection, WithHeadingRow, WithValidation,
|
|||||||
'realized_gains',
|
'realized_gains',
|
||||||
'annotation',
|
'annotation',
|
||||||
'portfolio_id',
|
'portfolio_id',
|
||||||
'date'
|
'date',
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
@@ -85,7 +82,7 @@ class DailyChangesSheet implements ToCollection, WithHeadingRow, WithValidation,
|
|||||||
public function rules(): array
|
public function rules(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'portfolio_id' => ['required', 'uuid'],
|
'portfolio_id' => ['required', 'uuid'],
|
||||||
'date' => ['required', 'date'],
|
'date' => ['required', 'date'],
|
||||||
'total_market_value' => ['sometimes', 'nullable', 'numeric'],
|
'total_market_value' => ['sometimes', 'nullable', 'numeric'],
|
||||||
'total_cost_basis' => ['sometimes', 'nullable', 'min:0', 'numeric'],
|
'total_cost_basis' => ['sometimes', 'nullable', 'min:0', 'numeric'],
|
||||||
|
|||||||
@@ -2,36 +2,33 @@
|
|||||||
|
|
||||||
namespace App\Imports\Sheets;
|
namespace App\Imports\Sheets;
|
||||||
|
|
||||||
use App\Models\Portfolio;
|
|
||||||
use App\Models\BackupImport;
|
use App\Models\BackupImport;
|
||||||
|
use App\Models\Portfolio;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
use Maatwebsite\Excel\Events\BeforeSheet;
|
|
||||||
use Maatwebsite\Excel\Concerns\WithEvents;
|
|
||||||
use Maatwebsite\Excel\Concerns\ToCollection;
|
|
||||||
use Maatwebsite\Excel\Concerns\SkipsEmptyRows;
|
use Maatwebsite\Excel\Concerns\SkipsEmptyRows;
|
||||||
|
use Maatwebsite\Excel\Concerns\ToCollection;
|
||||||
|
use Maatwebsite\Excel\Concerns\WithEvents;
|
||||||
use Maatwebsite\Excel\Concerns\WithHeadingRow;
|
use Maatwebsite\Excel\Concerns\WithHeadingRow;
|
||||||
use Maatwebsite\Excel\Concerns\WithValidation;
|
use Maatwebsite\Excel\Concerns\WithValidation;
|
||||||
|
use Maatwebsite\Excel\Events\BeforeSheet;
|
||||||
|
|
||||||
class PortfoliosSheet implements ToCollection, WithValidation, WithHeadingRow, SkipsEmptyRows, WithEvents
|
class PortfoliosSheet implements SkipsEmptyRows, ToCollection, WithEvents, WithHeadingRow, WithValidation
|
||||||
{
|
{
|
||||||
public function __construct(
|
public function __construct(
|
||||||
public BackupImport $backupImport
|
public BackupImport $backupImport
|
||||||
) { }
|
) {}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return array
|
|
||||||
*/
|
|
||||||
public function registerEvents(): array
|
public function registerEvents(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
BeforeSheet::class => function(BeforeSheet $event) {
|
BeforeSheet::class => function (BeforeSheet $event) {
|
||||||
DB::commit();
|
DB::commit();
|
||||||
$this->backupImport->update([
|
$this->backupImport->update([
|
||||||
'message' => __('Importing portfolios...'),
|
'message' => __('Importing portfolios...'),
|
||||||
]);
|
]);
|
||||||
DB::beginTransaction();
|
DB::beginTransaction();
|
||||||
}
|
},
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -42,7 +39,7 @@ class PortfoliosSheet implements ToCollection, WithValidation, WithHeadingRow, S
|
|||||||
Portfolio::unguard(); // ensures we can set an owner for the portfolio
|
Portfolio::unguard(); // ensures we can set an owner for the portfolio
|
||||||
|
|
||||||
$portfolio = Portfolio::fullAccess($this->backupImport->user_id)->updateOrCreate([
|
$portfolio = Portfolio::fullAccess($this->backupImport->user_id)->updateOrCreate([
|
||||||
'id' => $portfolio['portfolio_id']
|
'id' => $portfolio['portfolio_id'],
|
||||||
], [
|
], [
|
||||||
'id' => $portfolio['portfolio_id'] ?? null,
|
'id' => $portfolio['portfolio_id'] ?? null,
|
||||||
'title' => $portfolio['title'],
|
'title' => $portfolio['title'],
|
||||||
|
|||||||
@@ -3,42 +3,38 @@
|
|||||||
namespace App\Imports\Sheets;
|
namespace App\Imports\Sheets;
|
||||||
|
|
||||||
use App\Imports\ValidatesPortfolioAccess;
|
use App\Imports\ValidatesPortfolioAccess;
|
||||||
|
use App\Models\BackupImport;
|
||||||
use App\Models\Holding;
|
use App\Models\Holding;
|
||||||
use App\Models\Transaction;
|
use App\Models\Transaction;
|
||||||
use Illuminate\Support\Str;
|
|
||||||
use App\Models\BackupImport;
|
|
||||||
use Illuminate\Support\Carbon;
|
use Illuminate\Support\Carbon;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
use Maatwebsite\Excel\Events\BeforeSheet;
|
use Illuminate\Support\Str;
|
||||||
use Maatwebsite\Excel\Concerns\WithEvents;
|
|
||||||
use Maatwebsite\Excel\Concerns\ToCollection;
|
|
||||||
use Maatwebsite\Excel\Concerns\SkipsEmptyRows;
|
use Maatwebsite\Excel\Concerns\SkipsEmptyRows;
|
||||||
|
use Maatwebsite\Excel\Concerns\ToCollection;
|
||||||
|
use Maatwebsite\Excel\Concerns\WithEvents;
|
||||||
use Maatwebsite\Excel\Concerns\WithHeadingRow;
|
use Maatwebsite\Excel\Concerns\WithHeadingRow;
|
||||||
use Maatwebsite\Excel\Concerns\WithValidation;
|
use Maatwebsite\Excel\Concerns\WithValidation;
|
||||||
|
use Maatwebsite\Excel\Events\BeforeSheet;
|
||||||
|
|
||||||
class TransactionsSheet implements ToCollection, WithHeadingRow, WithValidation, SkipsEmptyRows, WithEvents
|
class TransactionsSheet implements SkipsEmptyRows, ToCollection, WithEvents, WithHeadingRow, WithValidation
|
||||||
{
|
{
|
||||||
|
|
||||||
use ValidatesPortfolioAccess;
|
use ValidatesPortfolioAccess;
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
public BackupImport $backupImport
|
public BackupImport $backupImport
|
||||||
) { }
|
) {}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return array
|
|
||||||
*/
|
|
||||||
public function registerEvents(): array
|
public function registerEvents(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
BeforeSheet::class => function(BeforeSheet $event) {
|
BeforeSheet::class => function (BeforeSheet $event) {
|
||||||
DB::commit();
|
DB::commit();
|
||||||
$this->backupImport->update([
|
$this->backupImport->update([
|
||||||
'message' => __('Importing transactions...'),
|
'message' => __('Importing transactions...'),
|
||||||
]);
|
]);
|
||||||
DB::beginTransaction();
|
DB::beginTransaction();
|
||||||
}
|
},
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -62,7 +58,7 @@ class TransactionsSheet implements ToCollection, WithHeadingRow, WithValidation,
|
|||||||
'sale_price' => $transaction['sale_price'],
|
'sale_price' => $transaction['sale_price'],
|
||||||
'split' => boolval($transaction['split']) ? 1 : 0,
|
'split' => boolval($transaction['split']) ? 1 : 0,
|
||||||
'reinvested_dividend' => boolval($transaction['reinvested_dividend']) ? 1 : 0,
|
'reinvested_dividend' => boolval($transaction['reinvested_dividend']) ? 1 : 0,
|
||||||
'date' => Carbon::parse($transaction['date'])->format('Y-m-d')
|
'date' => Carbon::parse($transaction['date'])->format('Y-m-d'),
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -79,23 +75,23 @@ class TransactionsSheet implements ToCollection, WithHeadingRow, WithValidation,
|
|||||||
'sale_price',
|
'sale_price',
|
||||||
'split',
|
'split',
|
||||||
'reinvested_dividend',
|
'reinvested_dividend',
|
||||||
'date'
|
'date',
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
|
||||||
// stub out related holdings
|
// stub out related holdings
|
||||||
$chunk->unique(fn($item) => $item['symbol'] . $item['portfolio_id'])
|
$chunk->unique(fn ($item) => $item['symbol'].$item['portfolio_id'])
|
||||||
->each(function($holding) {
|
->each(function ($holding) {
|
||||||
|
|
||||||
Holding::firstOrCreate([
|
Holding::firstOrCreate([
|
||||||
'symbol' => $holding['symbol'],
|
'symbol' => $holding['symbol'],
|
||||||
'portfolio_id' => $holding['portfolio_id']
|
'portfolio_id' => $holding['portfolio_id'],
|
||||||
], [
|
], [
|
||||||
'quantity' => 0,
|
'quantity' => 0,
|
||||||
'average_cost_basis' => 0,
|
'average_cost_basis' => 0,
|
||||||
'splits_synced_at' => now(),
|
'splits_synced_at' => now(),
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,19 +6,18 @@ use App\Models\Portfolio;
|
|||||||
|
|
||||||
trait ValidatesPortfolioAccess
|
trait ValidatesPortfolioAccess
|
||||||
{
|
{
|
||||||
|
|
||||||
public function validatePortfolioAccess($collection)
|
public function validatePortfolioAccess($collection)
|
||||||
{
|
{
|
||||||
|
|
||||||
$uniquePortfolios = $collection->unique('portfolio_id')->pluck('portfolio_id');
|
$uniquePortfolios = $collection->unique('portfolio_id')->pluck('portfolio_id');
|
||||||
$countPortfoliosWithAccess = Portfolio::fullAccess($this->backupImport->user_id)
|
$countPortfoliosWithAccess = Portfolio::fullAccess($this->backupImport->user_id)
|
||||||
->whereIn('id', $uniquePortfolios)
|
->whereIn('id', $uniquePortfolios)
|
||||||
->count();
|
->count();
|
||||||
|
|
||||||
if (
|
if (
|
||||||
$countPortfoliosWithAccess < $uniquePortfolios->count()
|
$countPortfoliosWithAccess < $uniquePortfolios->count()
|
||||||
) {
|
) {
|
||||||
throw new \Exception(__("You do not have access to that portfolio."));
|
throw new \Exception(__('You do not have access to that portfolio.'));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,33 +2,35 @@
|
|||||||
|
|
||||||
namespace App\Interfaces\MarketData;
|
namespace App\Interfaces\MarketData;
|
||||||
|
|
||||||
|
use App\Interfaces\MarketData\Types\Dividend;
|
||||||
|
use App\Interfaces\MarketData\Types\Ohlc;
|
||||||
|
use App\Interfaces\MarketData\Types\Quote;
|
||||||
|
use App\Interfaces\MarketData\Types\Split;
|
||||||
use Illuminate\Support\Arr;
|
use Illuminate\Support\Arr;
|
||||||
use Illuminate\Support\Carbon;
|
use Illuminate\Support\Carbon;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
use App\Interfaces\MarketData\Types\Quote;
|
|
||||||
use App\Interfaces\MarketData\Types\Split;
|
|
||||||
use App\Interfaces\MarketData\Types\Dividend;
|
|
||||||
use App\Interfaces\MarketData\Types\Ohlc;
|
|
||||||
use Tschucki\Alphavantage\Facades\Alphavantage;
|
use Tschucki\Alphavantage\Facades\Alphavantage;
|
||||||
|
|
||||||
class AlphaVantageMarketData implements MarketDataInterface
|
class AlphaVantageMarketData implements MarketDataInterface
|
||||||
{
|
{
|
||||||
public function exists(String $symbol): Bool
|
public function exists(string $symbol): bool
|
||||||
{
|
{
|
||||||
|
|
||||||
return $this->quote($symbol)->isNotEmpty();
|
return $this->quote($symbol)->isNotEmpty();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function quote(String $symbol): Quote
|
public function quote(string $symbol): Quote
|
||||||
{
|
{
|
||||||
$quote = Alphavantage::core()->quoteEndpoint($symbol);
|
$quote = Alphavantage::core()->quoteEndpoint($symbol);
|
||||||
$quote = Arr::get($quote, 'Global Quote', []);
|
$quote = Arr::get($quote, 'Global Quote', []);
|
||||||
|
|
||||||
if (empty($quote)) return new Quote();
|
if (empty($quote)) {
|
||||||
|
return new Quote;
|
||||||
|
}
|
||||||
|
|
||||||
$fundamental = cache()->remember(
|
$fundamental = cache()->remember(
|
||||||
'av-symbol-'.$symbol,
|
'av-symbol-'.$symbol,
|
||||||
1440,
|
1440,
|
||||||
function () use ($symbol) {
|
function () use ($symbol) {
|
||||||
return Alphavantage::fundamentals()->overview($symbol);
|
return Alphavantage::fundamentals()->overview($symbol);
|
||||||
}
|
}
|
||||||
@@ -49,71 +51,71 @@ class AlphaVantageMarketData implements MarketDataInterface
|
|||||||
: null,
|
: null,
|
||||||
'dividend_yield' => Arr::get($fundamental, 'DividendYield') != 'None'
|
'dividend_yield' => Arr::get($fundamental, 'DividendYield') != 'None'
|
||||||
? Arr::get($fundamental, 'DividendYield')
|
? Arr::get($fundamental, 'DividendYield')
|
||||||
: null
|
: null,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function dividends(String $symbol, $startDate, $endDate): Collection
|
public function dividends(string $symbol, $startDate, $endDate): Collection
|
||||||
{
|
{
|
||||||
$dividends = Alphavantage::fundamentals()->dividends($symbol);
|
$dividends = Alphavantage::fundamentals()->dividends($symbol);
|
||||||
$dividends = Arr::get($dividends, 'data', []);
|
$dividends = Arr::get($dividends, 'data', []);
|
||||||
|
|
||||||
return collect($dividends)
|
return collect($dividends)
|
||||||
->filter(function($dividend) use ($startDate, $endDate) {
|
->filter(function ($dividend) use ($startDate, $endDate) {
|
||||||
|
|
||||||
return Carbon::parse(Arr::get($dividend, 'ex_dividend_date'))->between($startDate, $endDate);
|
return Carbon::parse(Arr::get($dividend, 'ex_dividend_date'))->between($startDate, $endDate);
|
||||||
})
|
})
|
||||||
->map(function($dividend) use ($symbol) {
|
->map(function ($dividend) use ($symbol) {
|
||||||
|
|
||||||
return new Dividend([
|
return new Dividend([
|
||||||
'symbol' => $symbol,
|
'symbol' => $symbol,
|
||||||
'date' => Carbon::parse(Arr::get($dividend, 'ex_dividend_date')),
|
'date' => Carbon::parse(Arr::get($dividend, 'ex_dividend_date')),
|
||||||
'dividend_amount' => Arr::get($dividend, 'amount'),
|
'dividend_amount' => Arr::get($dividend, 'amount'),
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public function splits(String $symbol, $startDate, $endDate): Collection
|
public function splits(string $symbol, $startDate, $endDate): Collection
|
||||||
{
|
{
|
||||||
$splits = Alphavantage::fundamentals()->splits($symbol);
|
$splits = Alphavantage::fundamentals()->splits($symbol);
|
||||||
$splits = Arr::get($splits, 'data', []);
|
$splits = Arr::get($splits, 'data', []);
|
||||||
|
|
||||||
return collect($splits)
|
return collect($splits)
|
||||||
->filter(function($split) use ($startDate, $endDate) {
|
->filter(function ($split) use ($startDate, $endDate) {
|
||||||
|
|
||||||
return Carbon::parse(Arr::get($split, 'effective_date'))->between($startDate, $endDate);
|
return Carbon::parse(Arr::get($split, 'effective_date'))->between($startDate, $endDate);
|
||||||
})
|
})
|
||||||
->map(function($split) use ($symbol) {
|
->map(function ($split) use ($symbol) {
|
||||||
|
|
||||||
return new Split([
|
return new Split([
|
||||||
'symbol' => $symbol,
|
'symbol' => $symbol,
|
||||||
'date' => Carbon::parse(Arr::get($split, 'effective_date')),
|
'date' => Carbon::parse(Arr::get($split, 'effective_date')),
|
||||||
'split_amount' => Arr::get($split, 'split_factor'),
|
'split_amount' => Arr::get($split, 'split_factor'),
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public function history(String $symbol, $startDate, $endDate): Collection
|
public function history(string $symbol, $startDate, $endDate): Collection
|
||||||
{
|
{
|
||||||
|
|
||||||
$history = Alphavantage::timeSeries()->daily($symbol, 'full');
|
$history = Alphavantage::timeSeries()->daily($symbol, 'full');
|
||||||
|
|
||||||
$history = Arr::get($history, 'Time Series (Daily)', []);
|
$history = Arr::get($history, 'Time Series (Daily)', []);
|
||||||
|
|
||||||
return collect($history)
|
return collect($history)
|
||||||
->filter(function ($history, $date) use ($startDate, $endDate) {
|
->filter(function ($history, $date) use ($startDate, $endDate) {
|
||||||
|
|
||||||
return Carbon::parse($date)->between($startDate, $endDate);
|
return Carbon::parse($date)->between($startDate, $endDate);
|
||||||
})
|
})
|
||||||
->mapWithKeys(function($history, $date) use ($symbol) {
|
->mapWithKeys(function ($history, $date) use ($symbol) {
|
||||||
|
|
||||||
$date = Carbon::parse($date)->format('Y-m-d');
|
$date = Carbon::parse($date)->format('Y-m-d');
|
||||||
|
|
||||||
return [ $date => new Ohlc([
|
return [$date => new Ohlc([
|
||||||
'symbol' => $symbol,
|
'symbol' => $symbol,
|
||||||
'date' => $date,
|
'date' => $date,
|
||||||
'close' => Arr::get($history, '4. close')
|
'close' => Arr::get($history, '4. close'),
|
||||||
]) ];
|
])];
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,22 +2,22 @@
|
|||||||
|
|
||||||
namespace App\Interfaces\MarketData;
|
namespace App\Interfaces\MarketData;
|
||||||
|
|
||||||
use Illuminate\Support\Carbon;
|
|
||||||
use Illuminate\Support\Collection;
|
|
||||||
use App\Interfaces\MarketData\Types\Quote;
|
|
||||||
use App\Interfaces\MarketData\Types\Dividend;
|
use App\Interfaces\MarketData\Types\Dividend;
|
||||||
use App\Interfaces\MarketData\Types\Ohlc;
|
use App\Interfaces\MarketData\Types\Ohlc;
|
||||||
|
use App\Interfaces\MarketData\Types\Quote;
|
||||||
use App\Interfaces\MarketData\Types\Split;
|
use App\Interfaces\MarketData\Types\Split;
|
||||||
|
use Illuminate\Support\Carbon;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
|
||||||
class FakeMarketData implements MarketDataInterface
|
class FakeMarketData implements MarketDataInterface
|
||||||
{
|
{
|
||||||
public function exists(String $symbol): Bool
|
public function exists(string $symbol): bool
|
||||||
{
|
{
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function quote(String $symbol): Quote
|
public function quote(string $symbol): Quote
|
||||||
{
|
{
|
||||||
|
|
||||||
return new Quote([
|
return new Quote([
|
||||||
@@ -31,11 +31,11 @@ class FakeMarketData implements MarketDataInterface
|
|||||||
'market_cap' => 9800700600,
|
'market_cap' => 9800700600,
|
||||||
'book_value' => 4.7,
|
'book_value' => 4.7,
|
||||||
'last_dividend_date' => now()->subDays(45),
|
'last_dividend_date' => now()->subDays(45),
|
||||||
'dividend_yield' => 0.033
|
'dividend_yield' => 0.033,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function dividends(String $symbol, $startDate, $endDate): Collection
|
public function dividends(string $symbol, $startDate, $endDate): Collection
|
||||||
{
|
{
|
||||||
|
|
||||||
return collect([
|
return collect([
|
||||||
@@ -57,23 +57,23 @@ class FakeMarketData implements MarketDataInterface
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function splits(String $symbol, $startDate, $endDate): Collection
|
public function splits(string $symbol, $startDate, $endDate): Collection
|
||||||
{
|
{
|
||||||
|
|
||||||
return collect([
|
return collect([
|
||||||
new Split([
|
new Split([
|
||||||
'symbol' => $symbol,
|
'symbol' => $symbol,
|
||||||
'date' => now()->subMonths(36),
|
'date' => now()->subMonths(36),
|
||||||
'split_amount' => 10,
|
'split_amount' => 10,
|
||||||
])
|
]),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function history(String $symbol, $startDate, $endDate): Collection
|
public function history(string $symbol, $startDate, $endDate): Collection
|
||||||
{
|
{
|
||||||
$numDays = Carbon::parse($startDate)->diffInDays($endDate, true);
|
$numDays = Carbon::parse($startDate)->diffInDays($endDate, true);
|
||||||
|
|
||||||
for ($i = 0; $i < $numDays; $i++) {
|
for ($i = 0; $i < $numDays; $i++) {
|
||||||
|
|
||||||
$date = now()->subDays($i)->format('Y-m-d');
|
$date = now()->subDays($i)->format('Y-m-d');
|
||||||
|
|
||||||
@@ -83,7 +83,7 @@ class FakeMarketData implements MarketDataInterface
|
|||||||
'close' => rand(150, 400),
|
'close' => rand(150, 400),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
return collect($series);
|
return collect($series);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,21 +6,20 @@ use Illuminate\Support\Facades\Log;
|
|||||||
|
|
||||||
class FallbackInterface
|
class FallbackInterface
|
||||||
{
|
{
|
||||||
|
|
||||||
protected string $latest_error;
|
protected string $latest_error;
|
||||||
|
|
||||||
public function __call($method, $arguments)
|
public function __call($method, $arguments)
|
||||||
{
|
{
|
||||||
|
|
||||||
$providers = explode(',', config('investbrain.provider', 'yahoo'));
|
$providers = explode(',', config('investbrain.provider', 'yahoo'));
|
||||||
|
|
||||||
foreach ($providers as $provider) {
|
foreach ($providers as $provider) {
|
||||||
|
|
||||||
$provider = trim($provider);
|
$provider = trim($provider);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
||||||
if (!in_array($provider, array_keys(config('investbrain.interfaces', [])))) {
|
if (! in_array($provider, array_keys(config('investbrain.interfaces', [])))) {
|
||||||
|
|
||||||
throw new \Exception("Provider [{$provider}] is not a valid market data interface.");
|
throw new \Exception("Provider [{$provider}] is not a valid market data interface.");
|
||||||
}
|
}
|
||||||
@@ -30,7 +29,7 @@ class FallbackInterface
|
|||||||
return app()->make($provider_class_name)->$method(...$arguments);
|
return app()->make($provider_class_name)->$method(...$arguments);
|
||||||
|
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
|
|
||||||
$this->latest_error = $e->getMessage();
|
$this->latest_error = $e->getMessage();
|
||||||
|
|
||||||
Log::warning("Failed calling method {$method} ({$provider}): {$this->latest_error}");
|
Log::warning("Failed calling method {$method} ({$provider}): {$this->latest_error}");
|
||||||
|
|||||||
@@ -2,13 +2,13 @@
|
|||||||
|
|
||||||
namespace App\Interfaces\MarketData;
|
namespace App\Interfaces\MarketData;
|
||||||
|
|
||||||
use Illuminate\Support\Arr;
|
use App\Interfaces\MarketData\Types\Dividend;
|
||||||
use Illuminate\Support\Carbon;
|
|
||||||
use Illuminate\Support\Collection;
|
|
||||||
use App\Interfaces\MarketData\Types\Ohlc;
|
use App\Interfaces\MarketData\Types\Ohlc;
|
||||||
use App\Interfaces\MarketData\Types\Quote;
|
use App\Interfaces\MarketData\Types\Quote;
|
||||||
use App\Interfaces\MarketData\Types\Split;
|
use App\Interfaces\MarketData\Types\Split;
|
||||||
use App\Interfaces\MarketData\Types\Dividend;
|
use Illuminate\Support\Arr;
|
||||||
|
use Illuminate\Support\Carbon;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
|
||||||
class FinnhubMarketData implements MarketDataInterface
|
class FinnhubMarketData implements MarketDataInterface
|
||||||
{
|
{
|
||||||
@@ -16,13 +16,14 @@ class FinnhubMarketData implements MarketDataInterface
|
|||||||
|
|
||||||
public function __construct()
|
public function __construct()
|
||||||
{
|
{
|
||||||
|
|
||||||
$this->client = new \Finnhub\Api\DefaultApi(
|
$this->client = new \Finnhub\Api\DefaultApi(
|
||||||
new \GuzzleHttp\Client(),
|
new \GuzzleHttp\Client,
|
||||||
\Finnhub\Configuration::getDefaultConfiguration()->setApiKey('token', config('finnhub.key'))
|
\Finnhub\Configuration::getDefaultConfiguration()->setApiKey('token', config('finnhub.key'))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
public function exists(String $symbol): Bool
|
|
||||||
|
public function exists(string $symbol): bool
|
||||||
{
|
{
|
||||||
|
|
||||||
return $this->quote($symbol)->isNotEmpty();
|
return $this->quote($symbol)->isNotEmpty();
|
||||||
@@ -32,20 +33,22 @@ class FinnhubMarketData implements MarketDataInterface
|
|||||||
{
|
{
|
||||||
$quote = $this->client->quote($symbol);
|
$quote = $this->client->quote($symbol);
|
||||||
|
|
||||||
if (empty($quote)) return new Quote();
|
if (empty($quote)) {
|
||||||
|
return new Quote;
|
||||||
|
}
|
||||||
|
|
||||||
$fundamental = cache()->remember(
|
$fundamental = cache()->remember(
|
||||||
'fh-symbol-'.$symbol,
|
'fh-symbol-'.$symbol,
|
||||||
1440,
|
1440,
|
||||||
function () use ($symbol) {
|
function () use ($symbol) {
|
||||||
return $this->client->companyBasicFinancials($symbol, "all");
|
return $this->client->companyBasicFinancials($symbol, 'all');
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
return new Quote([
|
return new Quote([
|
||||||
'name' => Arr::get($fundamental, 'metric.name'),
|
'name' => Arr::get($fundamental, 'metric.name'),
|
||||||
'symbol' => $symbol,
|
'symbol' => $symbol,
|
||||||
'market_value' => Arr::get($quote, 'c'),
|
'market_value' => Arr::get($quote, 'c'),
|
||||||
'fifty_two_week_high' => Arr::get($fundamental, 'metric.52WeekHigh'),
|
'fifty_two_week_high' => Arr::get($fundamental, 'metric.52WeekHigh'),
|
||||||
'fifty_two_week_low' => Arr::get($fundamental, 'metric.52WeekLow'),
|
'fifty_two_week_low' => Arr::get($fundamental, 'metric.52WeekLow'),
|
||||||
'forward_pe' => Arr::get($fundamental, 'metric.forwardPE'), // confirm
|
'forward_pe' => Arr::get($fundamental, 'metric.forwardPE'), // confirm
|
||||||
@@ -54,15 +57,15 @@ class FinnhubMarketData implements MarketDataInterface
|
|||||||
'book_value' => Arr::get($fundamental, 'metric.bookValuePerShare'), // confirm
|
'book_value' => Arr::get($fundamental, 'metric.bookValuePerShare'), // confirm
|
||||||
'last_dividend_date' => Arr::get($fundamental, 'metric.lastDivDate'), // confirm
|
'last_dividend_date' => Arr::get($fundamental, 'metric.lastDivDate'), // confirm
|
||||||
'dividend_yield' => Arr::get($fundamental, 'metric.dividendYield'), // confirm
|
'dividend_yield' => Arr::get($fundamental, 'metric.dividendYield'), // confirm
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function dividends($symbol, $startDate, $endDate): Collection
|
public function dividends($symbol, $startDate, $endDate): Collection
|
||||||
{
|
{
|
||||||
$dividends = $this->client->stockDividends($symbol, $startDate->format('Y-m-d'), $endDate->format('Y-m-d'));
|
$dividends = $this->client->stockDividends($symbol, $startDate->format('Y-m-d'), $endDate->format('Y-m-d'));
|
||||||
|
|
||||||
return collect($dividends)->map(function($dividend) use ($symbol) {
|
return collect($dividends)->map(function ($dividend) use ($symbol) {
|
||||||
|
|
||||||
return new Dividend([
|
return new Dividend([
|
||||||
'symbol' => $symbol,
|
'symbol' => $symbol,
|
||||||
'date' => Carbon::parse(Arr::get($dividend, 'date')),
|
'date' => Carbon::parse(Arr::get($dividend, 'date')),
|
||||||
@@ -72,12 +75,12 @@ class FinnhubMarketData implements MarketDataInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function splits($symbol, $startDate, $endDate): Collection
|
public function splits($symbol, $startDate, $endDate): Collection
|
||||||
{
|
{
|
||||||
|
|
||||||
$splits = $this->client->stockSplits($symbol, $startDate->format('Y-m-d'), $endDate->format('Y-m-d'));
|
$splits = $this->client->stockSplits($symbol, $startDate->format('Y-m-d'), $endDate->format('Y-m-d'));
|
||||||
|
|
||||||
return collect($splits)->map(function($split) use ($symbol) {
|
return collect($splits)->map(function ($split) use ($symbol) {
|
||||||
|
|
||||||
return new Split([
|
return new Split([
|
||||||
'symbol' => $symbol,
|
'symbol' => $symbol,
|
||||||
'date' => Carbon::parse(Arr::get($split, 'date')),
|
'date' => Carbon::parse(Arr::get($split, 'date')),
|
||||||
@@ -89,18 +92,19 @@ class FinnhubMarketData implements MarketDataInterface
|
|||||||
public function history($symbol, $startDate, $endDate): Collection
|
public function history($symbol, $startDate, $endDate): Collection
|
||||||
{
|
{
|
||||||
|
|
||||||
$history = $this->client->stockCandles($symbol, "D", $startDate->timestamp, $endDate->timestamp);
|
$history = $this->client->stockCandles($symbol, 'D', $startDate->timestamp, $endDate->timestamp);
|
||||||
|
|
||||||
$timestamps = Arr::get($history, 't', []);
|
$timestamps = Arr::get($history, 't', []);
|
||||||
$closes = Arr::get($history, 'c', []);
|
$closes = Arr::get($history, 'c', []);
|
||||||
|
|
||||||
return collect($timestamps)->mapWithKeys(function ($timestamp, $index) use ($symbol, $closes) {
|
return collect($timestamps)->mapWithKeys(function ($timestamp, $index) use ($symbol, $closes) {
|
||||||
$date = Carbon::createFromTimestamp($timestamp)->format('Y-m-d');
|
$date = Carbon::createFromTimestamp($timestamp)->format('Y-m-d');
|
||||||
return [ $date => new Ohlc([
|
|
||||||
|
return [$date => new Ohlc([
|
||||||
'symbol' => $symbol,
|
'symbol' => $symbol,
|
||||||
'date' => $date,
|
'date' => $date,
|
||||||
'close' => $closes[$index],
|
'close' => $closes[$index],
|
||||||
]) ];
|
])];
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,59 +2,33 @@
|
|||||||
|
|
||||||
namespace App\Interfaces\MarketData;
|
namespace App\Interfaces\MarketData;
|
||||||
|
|
||||||
use Illuminate\Support\Collection;
|
|
||||||
use App\Interfaces\MarketData\Types\Quote;
|
use App\Interfaces\MarketData\Types\Quote;
|
||||||
|
use Illuminate\Support\Collection;
|
||||||
|
|
||||||
interface MarketDataInterface
|
interface MarketDataInterface
|
||||||
{
|
{
|
||||||
/**
|
/**
|
||||||
* Does this symbol actually exist?
|
* Does this symbol actually exist?
|
||||||
*
|
|
||||||
* @param String $symbol
|
|
||||||
*
|
|
||||||
* @return Bool
|
|
||||||
*/
|
*/
|
||||||
public function exists(String $symbol): Bool;
|
public function exists(string $symbol): bool;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get quote data
|
* Get quote data
|
||||||
*
|
|
||||||
* @param String $symbol
|
|
||||||
*
|
|
||||||
* @return Quote
|
|
||||||
*/
|
*/
|
||||||
public function quote(String $symbol): Quote;
|
public function quote(string $symbol): Quote;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get dividend data
|
* Get dividend data
|
||||||
*
|
|
||||||
* @param String $symbol
|
|
||||||
* @param \DateTimeInterface $startDate
|
|
||||||
* @param \DateTimeInterface $endDate
|
|
||||||
*
|
|
||||||
* @return Collection
|
|
||||||
*/
|
*/
|
||||||
public function dividends(String $symbol, \DateTimeInterface $startDate, \DateTimeInterface $endDate): Collection;
|
public function dividends(string $symbol, \DateTimeInterface $startDate, \DateTimeInterface $endDate): Collection;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get split data
|
* Get split data
|
||||||
*
|
|
||||||
* @param String $symbol
|
|
||||||
* @param \DateTimeInterface $startDate
|
|
||||||
* @param \DateTimeInterface $endDate
|
|
||||||
*
|
|
||||||
* @return Collection
|
|
||||||
*/
|
*/
|
||||||
public function splits(String $symbol, \DateTimeInterface $startDate, \DateTimeInterface $endDate): Collection;
|
public function splits(string $symbol, \DateTimeInterface $startDate, \DateTimeInterface $endDate): Collection;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get historical close data
|
* Get historical close data
|
||||||
*
|
|
||||||
* @param String $symbol
|
|
||||||
* @param \DateTimeInterface $startDate
|
|
||||||
* @param \DateTimeInterface $endDate
|
|
||||||
*
|
|
||||||
* @return Collection
|
|
||||||
*/
|
*/
|
||||||
public function history(String $symbol, \DateTimeInterface $startDate, \DateTimeInterface $endDate): Collection;
|
public function history(string $symbol, \DateTimeInterface $startDate, \DateTimeInterface $endDate): Collection;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,13 +4,13 @@ namespace App\Interfaces\MarketData\Types;
|
|||||||
|
|
||||||
use DateTime;
|
use DateTime;
|
||||||
use Illuminate\Support\Carbon;
|
use Illuminate\Support\Carbon;
|
||||||
use App\Interfaces\MarketData\Types\MarketDataType;
|
|
||||||
|
|
||||||
class Dividend extends MarketDataType
|
class Dividend extends MarketDataType
|
||||||
{
|
{
|
||||||
public function setSymbol(string $symbol): self
|
public function setSymbol(string $symbol): self
|
||||||
{
|
{
|
||||||
$this->items['symbol'] = $symbol;
|
$this->items['symbol'] = $symbol;
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -22,6 +22,7 @@ class Dividend extends MarketDataType
|
|||||||
public function setDividendAmount($dividendAmount): self
|
public function setDividendAmount($dividendAmount): self
|
||||||
{
|
{
|
||||||
$this->items['dividend_amount'] = (float) $dividendAmount;
|
$this->items['dividend_amount'] = (float) $dividendAmount;
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -30,9 +31,10 @@ class Dividend extends MarketDataType
|
|||||||
return $this->items['dividend_amount'] ?? 0.0;
|
return $this->items['dividend_amount'] ?? 0.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function setDate(String|DateTime $date): self
|
public function setDate(string|DateTime $date): self
|
||||||
{
|
{
|
||||||
$this->items['date'] = Carbon::parse($date)->format('Y-m-d H:i:s');
|
$this->items['date'] = Carbon::parse($date)->format('Y-m-d H:i:s');
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -40,4 +42,4 @@ class Dividend extends MarketDataType
|
|||||||
{
|
{
|
||||||
return $this->items['date'] ?? null;
|
return $this->items['date'] ?? null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,18 +2,15 @@
|
|||||||
|
|
||||||
namespace App\Interfaces\MarketData\Types;
|
namespace App\Interfaces\MarketData\Types;
|
||||||
|
|
||||||
use Illuminate\Support\Str;
|
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
|
use Illuminate\Support\Str;
|
||||||
|
|
||||||
class MarketDataType extends Collection
|
class MarketDataType extends Collection
|
||||||
{
|
{
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public function __construct($items = [])
|
public function __construct($items = [])
|
||||||
{
|
{
|
||||||
|
|
||||||
foreach($this->getArrayableItems($items) as $key => $value) {
|
foreach ($this->getArrayableItems($items) as $key => $value) {
|
||||||
|
|
||||||
$this->{$key} = $value;
|
$this->{$key} = $value;
|
||||||
}
|
}
|
||||||
@@ -33,4 +30,4 @@ class MarketDataType extends Collection
|
|||||||
{
|
{
|
||||||
return $this->items[$key] ?? null;
|
return $this->items[$key] ?? null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,13 +4,13 @@ namespace App\Interfaces\MarketData\Types;
|
|||||||
|
|
||||||
use DateTime;
|
use DateTime;
|
||||||
use Illuminate\Support\Carbon;
|
use Illuminate\Support\Carbon;
|
||||||
use App\Interfaces\MarketData\Types\MarketDataType;
|
|
||||||
|
|
||||||
class Ohlc extends MarketDataType
|
class Ohlc extends MarketDataType
|
||||||
{
|
{
|
||||||
public function setSymbol(string $symbol): self
|
public function setSymbol(string $symbol): self
|
||||||
{
|
{
|
||||||
$this->items['symbol'] = $symbol;
|
$this->items['symbol'] = $symbol;
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -22,6 +22,7 @@ class Ohlc extends MarketDataType
|
|||||||
public function setOpen($open): self
|
public function setOpen($open): self
|
||||||
{
|
{
|
||||||
$this->items['open'] = (float) $open;
|
$this->items['open'] = (float) $open;
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -33,6 +34,7 @@ class Ohlc extends MarketDataType
|
|||||||
public function setHigh($high): self
|
public function setHigh($high): self
|
||||||
{
|
{
|
||||||
$this->items['high'] = (float) $high;
|
$this->items['high'] = (float) $high;
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -44,6 +46,7 @@ class Ohlc extends MarketDataType
|
|||||||
public function setLow($low): self
|
public function setLow($low): self
|
||||||
{
|
{
|
||||||
$this->items['low'] = (float) $low;
|
$this->items['low'] = (float) $low;
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -55,6 +58,7 @@ class Ohlc extends MarketDataType
|
|||||||
public function setClose($close): self
|
public function setClose($close): self
|
||||||
{
|
{
|
||||||
$this->items['close'] = (float) $close;
|
$this->items['close'] = (float) $close;
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -63,9 +67,10 @@ class Ohlc extends MarketDataType
|
|||||||
return $this->items['close'] ?? 0.0;
|
return $this->items['close'] ?? 0.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function setDate(String|DateTime $date): self
|
public function setDate(string|DateTime $date): self
|
||||||
{
|
{
|
||||||
$this->items['date'] = Carbon::parse($date)->format('Y-m-d H:i:s');
|
$this->items['date'] = Carbon::parse($date)->format('Y-m-d H:i:s');
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -73,4 +78,4 @@ class Ohlc extends MarketDataType
|
|||||||
{
|
{
|
||||||
return $this->items['date'] ?? null;
|
return $this->items['date'] ?? null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,13 +4,13 @@ namespace App\Interfaces\MarketData\Types;
|
|||||||
|
|
||||||
use DateTime;
|
use DateTime;
|
||||||
use Illuminate\Support\Carbon;
|
use Illuminate\Support\Carbon;
|
||||||
use App\Interfaces\MarketData\Types\MarketDataType;
|
|
||||||
|
|
||||||
class Quote extends MarketDataType
|
class Quote extends MarketDataType
|
||||||
{
|
{
|
||||||
public function setName($name): self
|
public function setName($name): self
|
||||||
{
|
{
|
||||||
$this->items['name'] = (string) $name;
|
$this->items['name'] = (string) $name;
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -22,6 +22,7 @@ class Quote extends MarketDataType
|
|||||||
public function setSymbol($symbol): self
|
public function setSymbol($symbol): self
|
||||||
{
|
{
|
||||||
$this->items['symbol'] = (string) $symbol;
|
$this->items['symbol'] = (string) $symbol;
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -30,9 +31,10 @@ class Quote extends MarketDataType
|
|||||||
return $this->items['symbol'] ?? '';
|
return $this->items['symbol'] ?? '';
|
||||||
}
|
}
|
||||||
|
|
||||||
public function setMarketValue($marketValue): self
|
public function setMarketValue($marketValue): self
|
||||||
{
|
{
|
||||||
$this->items['market_value'] = (float) $marketValue;
|
$this->items['market_value'] = (float) $marketValue;
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -41,9 +43,10 @@ class Quote extends MarketDataType
|
|||||||
return $this->items['market_value'] ?? 0.0;
|
return $this->items['market_value'] ?? 0.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function setFiftyTwoWeekHigh($high): self
|
public function setFiftyTwoWeekHigh($high): self
|
||||||
{
|
{
|
||||||
$this->items['fifty_two_week_high'] = (float) $high;
|
$this->items['fifty_two_week_high'] = (float) $high;
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -52,9 +55,10 @@ class Quote extends MarketDataType
|
|||||||
return $this->items['fifty_two_week_high'] ?? 0.0;
|
return $this->items['fifty_two_week_high'] ?? 0.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function setFiftyTwoWeekLow($low): self
|
public function setFiftyTwoWeekLow($low): self
|
||||||
{
|
{
|
||||||
$this->items['fifty_two_week_low'] = (float) $low;
|
$this->items['fifty_two_week_low'] = (float) $low;
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -63,9 +67,10 @@ class Quote extends MarketDataType
|
|||||||
return $this->items['fifty_two_week_low'] ?? 0.0;
|
return $this->items['fifty_two_week_low'] ?? 0.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function setForwardPE($pe): self
|
public function setForwardPE($pe): self
|
||||||
{
|
{
|
||||||
$this->items['forward_pe'] = (float) $pe;
|
$this->items['forward_pe'] = (float) $pe;
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -74,9 +79,10 @@ class Quote extends MarketDataType
|
|||||||
return $this->items['forward_pe'] ?? 0.0;
|
return $this->items['forward_pe'] ?? 0.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function setTrailingPE($pe): self
|
public function setTrailingPE($pe): self
|
||||||
{
|
{
|
||||||
$this->items['trailing_pe'] = (float) $pe;
|
$this->items['trailing_pe'] = (float) $pe;
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -88,6 +94,7 @@ class Quote extends MarketDataType
|
|||||||
public function setMarketCap($cap): self
|
public function setMarketCap($cap): self
|
||||||
{
|
{
|
||||||
$this->items['market_cap'] = (int) $cap;
|
$this->items['market_cap'] = (int) $cap;
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -96,9 +103,10 @@ class Quote extends MarketDataType
|
|||||||
return $this->items['market_cap'] ?? 0;
|
return $this->items['market_cap'] ?? 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function setBookValue($value): self
|
public function setBookValue($value): self
|
||||||
{
|
{
|
||||||
$this->items['book_value'] = (float) $value;
|
$this->items['book_value'] = (float) $value;
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -110,6 +118,7 @@ class Quote extends MarketDataType
|
|||||||
public function setLastDividendDate(mixed $date): self
|
public function setLastDividendDate(mixed $date): self
|
||||||
{
|
{
|
||||||
$this->items['last_dividend_date'] = is_null($date) ? null : Carbon::parse($date)->format('Y-m-d H:i:s');
|
$this->items['last_dividend_date'] = is_null($date) ? null : Carbon::parse($date)->format('Y-m-d H:i:s');
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -118,9 +127,10 @@ class Quote extends MarketDataType
|
|||||||
return $this->items['last_dividend_date'] ?? null;
|
return $this->items['last_dividend_date'] ?? null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function setDividendYield($yield): self
|
public function setDividendYield($yield): self
|
||||||
{
|
{
|
||||||
$this->items['dividend_yield'] = (float) $yield;
|
$this->items['dividend_yield'] = (float) $yield;
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -128,4 +138,4 @@ class Quote extends MarketDataType
|
|||||||
{
|
{
|
||||||
return $this->items['dividend_yield'] ?? 0.0;
|
return $this->items['dividend_yield'] ?? 0.0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,13 +4,13 @@ namespace App\Interfaces\MarketData\Types;
|
|||||||
|
|
||||||
use DateTime;
|
use DateTime;
|
||||||
use Illuminate\Support\Carbon;
|
use Illuminate\Support\Carbon;
|
||||||
use App\Interfaces\MarketData\Types\MarketDataType;
|
|
||||||
|
|
||||||
class Split extends MarketDataType
|
class Split extends MarketDataType
|
||||||
{
|
{
|
||||||
public function setSymbol(string $symbol): self
|
public function setSymbol(string $symbol): self
|
||||||
{
|
{
|
||||||
$this->items['symbol'] = $symbol;
|
$this->items['symbol'] = $symbol;
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -22,6 +22,7 @@ class Split extends MarketDataType
|
|||||||
public function setSplitAmount($splitAmount): self
|
public function setSplitAmount($splitAmount): self
|
||||||
{
|
{
|
||||||
$this->items['split_amount'] = (float) $splitAmount;
|
$this->items['split_amount'] = (float) $splitAmount;
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -30,9 +31,10 @@ class Split extends MarketDataType
|
|||||||
return $this->items['split_amount'] ?? 0.0;
|
return $this->items['split_amount'] ?? 0.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function setDate(String|DateTime $date): self
|
public function setDate(string|DateTime $date): self
|
||||||
{
|
{
|
||||||
$this->items['date'] = Carbon::parse($date)->format('Y-m-d H:i:s');
|
$this->items['date'] = Carbon::parse($date)->format('Y-m-d H:i:s');
|
||||||
|
|
||||||
return $this;
|
return $this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -40,4 +42,4 @@ class Split extends MarketDataType
|
|||||||
{
|
{
|
||||||
return $this->items['date'] ?? null;
|
return $this->items['date'] ?? null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,36 +2,39 @@
|
|||||||
|
|
||||||
namespace App\Interfaces\MarketData;
|
namespace App\Interfaces\MarketData;
|
||||||
|
|
||||||
use Illuminate\Support\Collection;
|
use App\Interfaces\MarketData\Types\Dividend;
|
||||||
use Scheb\YahooFinanceApi\ApiClient;
|
|
||||||
use App\Interfaces\MarketData\Types\Ohlc;
|
use App\Interfaces\MarketData\Types\Ohlc;
|
||||||
use App\Interfaces\MarketData\Types\Quote;
|
use App\Interfaces\MarketData\Types\Quote;
|
||||||
use App\Interfaces\MarketData\Types\Split;
|
use App\Interfaces\MarketData\Types\Split;
|
||||||
use App\Interfaces\MarketData\Types\Dividend;
|
use Illuminate\Support\Collection;
|
||||||
|
use Scheb\YahooFinanceApi\ApiClient;
|
||||||
use Scheb\YahooFinanceApi\ApiClientFactory as YahooFinance;
|
use Scheb\YahooFinanceApi\ApiClientFactory as YahooFinance;
|
||||||
|
|
||||||
class YahooMarketData implements MarketDataInterface
|
class YahooMarketData implements MarketDataInterface
|
||||||
{
|
{
|
||||||
public ApiClient $client;
|
public ApiClient $client;
|
||||||
|
|
||||||
public function __construct() {
|
public function __construct()
|
||||||
|
{
|
||||||
|
|
||||||
// create yahoo finance client factory
|
// create yahoo finance client factory
|
||||||
$this->client = YahooFinance::createApiClient();
|
$this->client = YahooFinance::createApiClient();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function exists(String $symbol): Bool
|
public function exists(string $symbol): bool
|
||||||
{
|
{
|
||||||
|
|
||||||
return $this->quote($symbol)->isNotEmpty();
|
return $this->quote($symbol)->isNotEmpty();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function quote(String $symbol): Quote
|
public function quote(string $symbol): Quote
|
||||||
{
|
{
|
||||||
|
|
||||||
$quote = $this->client->getQuote($symbol);
|
$quote = $this->client->getQuote($symbol);
|
||||||
|
|
||||||
if (empty($quote)) return collect();
|
if (empty($quote)) {
|
||||||
|
return collect();
|
||||||
|
}
|
||||||
|
|
||||||
return new Quote([
|
return new Quote([
|
||||||
'name' => $quote->getLongName() ?? $quote->getShortName(),
|
'name' => $quote->getLongName() ?? $quote->getShortName(),
|
||||||
@@ -44,52 +47,52 @@ class YahooMarketData implements MarketDataInterface
|
|||||||
'market_cap' => $quote->getMarketCap(),
|
'market_cap' => $quote->getMarketCap(),
|
||||||
'book_value' => $quote->getBookValue(),
|
'book_value' => $quote->getBookValue(),
|
||||||
'last_dividend_date' => $quote->getDividendDate(),
|
'last_dividend_date' => $quote->getDividendDate(),
|
||||||
'dividend_yield' => $quote->getTrailingAnnualDividendYield() * 100
|
'dividend_yield' => $quote->getTrailingAnnualDividendYield() * 100,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function dividends(String $symbol, $startDate, $endDate): Collection
|
public function dividends(string $symbol, $startDate, $endDate): Collection
|
||||||
{
|
{
|
||||||
|
|
||||||
return collect($this->client->getHistoricalDividendData($symbol, $startDate, $endDate))
|
return collect($this->client->getHistoricalDividendData($symbol, $startDate, $endDate))
|
||||||
->map(function($dividend) use ($symbol) {
|
->map(function ($dividend) use ($symbol) {
|
||||||
|
|
||||||
return new Dividend([
|
return new Dividend([
|
||||||
'symbol' => $symbol,
|
'symbol' => $symbol,
|
||||||
'date' => $dividend->getDate(),
|
'date' => $dividend->getDate(),
|
||||||
'dividend_amount' => $dividend->getDividends(),
|
'dividend_amount' => $dividend->getDividends(),
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public function splits(String $symbol, $startDate, $endDate): Collection
|
public function splits(string $symbol, $startDate, $endDate): Collection
|
||||||
{
|
{
|
||||||
|
|
||||||
return collect($this->client->getHistoricalSplitData($symbol, $startDate, $endDate))
|
return collect($this->client->getHistoricalSplitData($symbol, $startDate, $endDate))
|
||||||
->map(function($split) use ($symbol) {
|
->map(function ($split) use ($symbol) {
|
||||||
$split_amount = explode(':', $split->getStockSplits());
|
$split_amount = explode(':', $split->getStockSplits());
|
||||||
|
|
||||||
return new Split([
|
return new Split([
|
||||||
'symbol' => $symbol,
|
'symbol' => $symbol,
|
||||||
'date' => $split->getDate(),
|
'date' => $split->getDate(),
|
||||||
'split_amount' => $split_amount[0] / $split_amount[1],
|
'split_amount' => $split_amount[0] / $split_amount[1],
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public function history(String $symbol, $startDate, $endDate): Collection
|
public function history(string $symbol, $startDate, $endDate): Collection
|
||||||
{
|
{
|
||||||
|
|
||||||
return collect($this->client->getHistoricalQuoteData($symbol, ApiClient::INTERVAL_1_DAY, $startDate, $endDate))
|
return collect($this->client->getHistoricalQuoteData($symbol, ApiClient::INTERVAL_1_DAY, $startDate, $endDate))
|
||||||
->mapWithKeys(function($history) use ($symbol) {
|
->mapWithKeys(function ($history) use ($symbol) {
|
||||||
|
|
||||||
$date = $history->getDate()->format('Y-m-d');
|
$date = $history->getDate()->format('Y-m-d');
|
||||||
|
|
||||||
return [ $date => new Ohlc([
|
return [$date => new Ohlc([
|
||||||
'symbol' => $symbol,
|
'symbol' => $symbol,
|
||||||
'date' => $date,
|
'date' => $date,
|
||||||
'close' => $history->getClose(),
|
'close' => $history->getClose(),
|
||||||
]) ];
|
])];
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,15 +2,15 @@
|
|||||||
|
|
||||||
namespace App\Jobs;
|
namespace App\Jobs;
|
||||||
|
|
||||||
use Throwable;
|
|
||||||
use App\Models\User;
|
|
||||||
use App\Models\BackupImport;
|
|
||||||
use Maatwebsite\Excel\Facades\Excel;
|
|
||||||
use Illuminate\Foundation\Queue\Queueable;
|
|
||||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
|
||||||
use App\Notifications\ImportSucceededNotification;
|
|
||||||
use App\Notifications\ImportFailedNotification;
|
|
||||||
use App\Imports\BackupImport as BackupImportExcel;
|
use App\Imports\BackupImport as BackupImportExcel;
|
||||||
|
use App\Models\BackupImport;
|
||||||
|
use App\Models\User;
|
||||||
|
use App\Notifications\ImportFailedNotification;
|
||||||
|
use App\Notifications\ImportSucceededNotification;
|
||||||
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||||
|
use Illuminate\Foundation\Queue\Queueable;
|
||||||
|
use Maatwebsite\Excel\Facades\Excel;
|
||||||
|
use Throwable;
|
||||||
|
|
||||||
class BackupImportJob implements ShouldQueue
|
class BackupImportJob implements ShouldQueue
|
||||||
{
|
{
|
||||||
@@ -19,7 +19,7 @@ class BackupImportJob implements ShouldQueue
|
|||||||
/**
|
/**
|
||||||
* The number of times the job may be attempted.
|
* The number of times the job may be attempted.
|
||||||
*/
|
*/
|
||||||
public $tries = 1;
|
public $tries = 1;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The number of seconds the job can run before timing out.
|
* The number of seconds the job can run before timing out.
|
||||||
@@ -42,7 +42,7 @@ class BackupImportJob implements ShouldQueue
|
|||||||
*/
|
*/
|
||||||
public function __construct(
|
public function __construct(
|
||||||
public BackupImport $backupImport
|
public BackupImport $backupImport
|
||||||
) {
|
) {
|
||||||
$this->user = User::find($this->backupImport->user_id);
|
$this->user = User::find($this->backupImport->user_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -50,7 +50,7 @@ class BackupImportJob implements ShouldQueue
|
|||||||
* Execute the job.
|
* Execute the job.
|
||||||
*/
|
*/
|
||||||
public function handle(): void
|
public function handle(): void
|
||||||
{
|
{
|
||||||
Excel::import(new BackupImportExcel($this->backupImport), $this->backupImport->path, config('livewire.temporary_file_upload.disk', null));
|
Excel::import(new BackupImportExcel($this->backupImport), $this->backupImport->path, config('livewire.temporary_file_upload.disk', null));
|
||||||
|
|
||||||
$this->user->notify(new ImportSucceededNotification);
|
$this->user->notify(new ImportSucceededNotification);
|
||||||
@@ -63,9 +63,9 @@ class BackupImportJob implements ShouldQueue
|
|||||||
{
|
{
|
||||||
$this->backupImport->update([
|
$this->backupImport->update([
|
||||||
'status' => 'failed',
|
'status' => 'failed',
|
||||||
'message' => 'Error: '. substr($e->getMessage(), 0, 220),
|
'message' => 'Error: '.substr($e->getMessage(), 0, 220),
|
||||||
'has_errors' => true,
|
'has_errors' => true,
|
||||||
'completed_at' => now()
|
'completed_at' => now(),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$this->user->notify(new ImportFailedNotification($e->getMessage()));
|
$this->user->notify(new ImportFailedNotification($e->getMessage()));
|
||||||
|
|||||||
@@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
namespace App\Models;
|
namespace App\Models;
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
|
||||||
use Illuminate\Database\Eloquent\Concerns\HasUuids;
|
use Illuminate\Database\Eloquent\Concerns\HasUuids;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
class AiChat extends Model
|
class AiChat extends Model
|
||||||
{
|
{
|
||||||
@@ -11,7 +11,7 @@ class AiChat extends Model
|
|||||||
|
|
||||||
protected $fillable = [
|
protected $fillable = [
|
||||||
'role',
|
'role',
|
||||||
'content'
|
'content',
|
||||||
];
|
];
|
||||||
|
|
||||||
protected $hidden = [];
|
protected $hidden = [];
|
||||||
@@ -26,7 +26,8 @@ class AiChat extends Model
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public function user() {
|
public function user()
|
||||||
|
{
|
||||||
return $this->belongsTo(User::class);
|
return $this->belongsTo(User::class);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,11 +2,9 @@
|
|||||||
|
|
||||||
namespace App\Models;
|
namespace App\Models;
|
||||||
|
|
||||||
use Maatwebsite\Excel\Facades\Excel;
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
|
||||||
use App\Imports\BackupImport as BackupImportExcel;
|
|
||||||
use App\Jobs\BackupImportJob;
|
use App\Jobs\BackupImportJob;
|
||||||
use Illuminate\Database\Eloquent\Concerns\HasUuids;
|
use Illuminate\Database\Eloquent\Concerns\HasUuids;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
class BackupImport extends Model
|
class BackupImport extends Model
|
||||||
{
|
{
|
||||||
@@ -20,7 +18,7 @@ class BackupImport extends Model
|
|||||||
'status', // pending, in_progress, success, failed
|
'status', // pending, in_progress, success, failed
|
||||||
'message', // Import starting, Import is in progress, Importing portfolios, Importing transactions, Importing daily changes, Import completed successfully
|
'message', // Import starting, Import is in progress, Importing portfolios, Importing transactions, Importing daily changes, Import completed successfully
|
||||||
'has_errors',
|
'has_errors',
|
||||||
'completed_at'
|
'completed_at',
|
||||||
];
|
];
|
||||||
|
|
||||||
protected static function boot()
|
protected static function boot()
|
||||||
@@ -32,9 +30,9 @@ class BackupImport extends Model
|
|||||||
$import->status = 'pending';
|
$import->status = 'pending';
|
||||||
$import->message = __('Import starting...');
|
$import->message = __('Import starting...');
|
||||||
});
|
});
|
||||||
|
|
||||||
static::created(function ($import) {
|
static::created(function ($import) {
|
||||||
|
|
||||||
BackupImportJob::dispatch($import);
|
BackupImportJob::dispatch($import);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -47,7 +45,7 @@ class BackupImport extends Model
|
|||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'has_errors' => 'boolean',
|
'has_errors' => 'boolean',
|
||||||
'completed_at' => 'datetime'
|
'completed_at' => 'datetime',
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ class ConnectedAccount extends Model
|
|||||||
];
|
];
|
||||||
|
|
||||||
protected $with = [
|
protected $with = [
|
||||||
'user'
|
'user',
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -52,4 +52,4 @@ class ConnectedAccount extends Model
|
|||||||
{
|
{
|
||||||
return $this->belongsTo(User::class);
|
return $this->belongsTo(User::class);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,12 +3,12 @@
|
|||||||
namespace App\Models;
|
namespace App\Models;
|
||||||
|
|
||||||
use App\Traits\HasCompositePrimaryKey;
|
use App\Traits\HasCompositePrimaryKey;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
class DailyChange extends Model
|
class DailyChange extends Model
|
||||||
{
|
{
|
||||||
use HasFactory, HasCompositePrimaryKey;
|
use HasCompositePrimaryKey, HasFactory;
|
||||||
|
|
||||||
public $timestamps = false;
|
public $timestamps = false;
|
||||||
|
|
||||||
@@ -32,13 +32,13 @@ class DailyChange extends Model
|
|||||||
protected $casts = [
|
protected $casts = [
|
||||||
'date' => 'datetime',
|
'date' => 'datetime',
|
||||||
];
|
];
|
||||||
|
|
||||||
public function scopePortfolio($query, $portfolio)
|
public function scopePortfolio($query, $portfolio)
|
||||||
{
|
{
|
||||||
return $query->where('portfolio_id', $portfolio);
|
return $query->where('portfolio_id', $portfolio);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function scopeMyDailyChanges()
|
public function scopeMyDailyChanges()
|
||||||
{
|
{
|
||||||
return $this->whereHas('portfolio', function ($query) {
|
return $this->whereHas('portfolio', function ($query) {
|
||||||
$query->whereHas('users', function ($query) {
|
$query->whereHas('users', function ($query) {
|
||||||
@@ -47,12 +47,13 @@ class DailyChange extends Model
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public function scopeWithoutWishlists($query) {
|
public function scopeWithoutWishlists($query)
|
||||||
|
{
|
||||||
return $query->whereHas('portfolio', function ($query) {
|
return $query->whereHas('portfolio', function ($query) {
|
||||||
$query->where('portfolios.wishlist', 0);
|
$query->where('portfolios.wishlist', 0);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public function portfolio()
|
public function portfolio()
|
||||||
{
|
{
|
||||||
return $this->belongsTo(Portfolio::class);
|
return $this->belongsTo(Portfolio::class);
|
||||||
|
|||||||
+42
-43
@@ -2,15 +2,12 @@
|
|||||||
|
|
||||||
namespace App\Models;
|
namespace App\Models;
|
||||||
|
|
||||||
use App\Models\Holding;
|
|
||||||
use App\Models\MarketData;
|
|
||||||
use App\Models\Transaction;
|
|
||||||
use Illuminate\Support\Str;
|
|
||||||
use Illuminate\Support\Carbon;
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
|
||||||
use App\Interfaces\MarketData\MarketDataInterface;
|
use App\Interfaces\MarketData\MarketDataInterface;
|
||||||
use Illuminate\Database\Eloquent\Concerns\HasUuids;
|
use Illuminate\Database\Eloquent\Concerns\HasUuids;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
use Illuminate\Support\Carbon;
|
||||||
|
use Illuminate\Support\Str;
|
||||||
|
|
||||||
class Dividend extends Model
|
class Dividend extends Model
|
||||||
{
|
{
|
||||||
@@ -30,15 +27,18 @@ class Dividend extends Model
|
|||||||
'last_dividend_update' => 'datetime',
|
'last_dividend_update' => 'datetime',
|
||||||
];
|
];
|
||||||
|
|
||||||
public function marketData() {
|
public function marketData()
|
||||||
|
{
|
||||||
return $this->belongsTo(MarketData::class, 'symbol', 'symbol');
|
return $this->belongsTo(MarketData::class, 'symbol', 'symbol');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function holdings() {
|
public function holdings()
|
||||||
|
{
|
||||||
return $this->hasMany(Holding::class, 'symbol', 'symbol');
|
return $this->hasMany(Holding::class, 'symbol', 'symbol');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function transactions() {
|
public function transactions()
|
||||||
|
{
|
||||||
return $this->hasMany(Transaction::class, 'symbol', 'symbol');
|
return $this->hasMany(Transaction::class, 'symbol', 'symbol');
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -49,7 +49,6 @@ class Dividend extends Model
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Grab new dividend data
|
* Grab new dividend data
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public static function refreshDividendData(string $symbol): void
|
public static function refreshDividendData(string $symbol): void
|
||||||
{
|
{
|
||||||
@@ -64,11 +63,11 @@ class Dividend extends Model
|
|||||||
$end_date = now();
|
$end_date = now();
|
||||||
|
|
||||||
// nope, refresh forward looking only
|
// nope, refresh forward looking only
|
||||||
if ( $dividends_meta->total_dividends ) {
|
if ($dividends_meta->total_dividends) {
|
||||||
|
|
||||||
$start_date = $dividends_meta->last_dividend_update->addHours(24);
|
$start_date = $dividends_meta->last_dividend_update->addHours(24);
|
||||||
}
|
}
|
||||||
|
|
||||||
// skip refresh if there's already recent data
|
// skip refresh if there's already recent data
|
||||||
if ($start_date->greaterThan($end_date)) {
|
if ($start_date->greaterThan($end_date)) {
|
||||||
|
|
||||||
@@ -83,7 +82,7 @@ class Dividend extends Model
|
|||||||
// ah, we found some dividends...
|
// ah, we found some dividends...
|
||||||
if ($dividend_data->isNotEmpty()) {
|
if ($dividend_data->isNotEmpty()) {
|
||||||
// create mass insert
|
// create mass insert
|
||||||
foreach ($dividend_data as $index => $dividend){
|
foreach ($dividend_data as $index => $dividend) {
|
||||||
$dividend_data[$index] = [...$dividend, ...['id' => Str::uuid()->toString(), 'updated_at' => now(), 'created_at' => now()]];
|
$dividend_data[$index] = [...$dividend, ...['id' => Str::uuid()->toString(), 'updated_at' => now(), 'created_at' => now()]];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -109,7 +108,7 @@ 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('
|
->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)
|
||||||
THEN transactions.quantity ELSE 0 END, 0)
|
THEN transactions.quantity ELSE 0 END, 0)
|
||||||
@@ -119,22 +118,22 @@ class Dividend extends Model
|
|||||||
* dividends.dividend_amount
|
* dividends.dividend_amount
|
||||||
AS total_received
|
AS total_received
|
||||||
')
|
')
|
||||||
->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', $symbol)
|
->where('dividends.symbol', $symbol)
|
||||||
->groupBy('holdings.portfolio_id', 'dividends.date', 'dividends.symbol', 'dividends.dividend_amount', 'total_received')
|
->groupBy('holdings.portfolio_id', 'dividends.date', 'dividends.symbol', 'dividends.dividend_amount', 'total_received')
|
||||||
->havingRaw('total_received > 0')
|
->havingRaw('total_received > 0')
|
||||||
->get();
|
->get();
|
||||||
|
|
||||||
// iterate through holdings and update
|
// iterate through holdings and update
|
||||||
Holding::where(['symbol' => $symbol])
|
Holding::where(['symbol' => $symbol])
|
||||||
->get()
|
->get()
|
||||||
->each(function ($holding) use ($dividends) {
|
->each(function ($holding) use ($dividends) {
|
||||||
$holding->update([
|
$holding->update([
|
||||||
'dividends_earned' => $dividends->where('portfolio_id', $holding->portfolio_id)
|
'dividends_earned' => $dividends->where('portfolio_id', $holding->portfolio_id)
|
||||||
->sum('total_received')
|
->sum('total_received'),
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function reinvestDividends(iterable $dividend_data, MarketData $market_data): void
|
public static function reinvestDividends(iterable $dividend_data, MarketData $market_data): void
|
||||||
@@ -144,21 +143,21 @@ class Dividend extends Model
|
|||||||
'symbol' => $market_data->symbol,
|
'symbol' => $market_data->symbol,
|
||||||
'reinvest_dividends' => true,
|
'reinvest_dividends' => true,
|
||||||
])
|
])
|
||||||
->get()
|
->get()
|
||||||
->each(function($holding) use ($dividend_data, $market_data) {
|
->each(function ($holding) use ($dividend_data, $market_data) {
|
||||||
|
|
||||||
foreach($dividend_data as $dividend) {
|
foreach ($dividend_data as $dividend) {
|
||||||
|
|
||||||
Transaction::create([
|
Transaction::create([
|
||||||
'date' => $dividend['date'],
|
'date' => $dividend['date'],
|
||||||
'portfolio_id' => $holding->portfolio_id,
|
'portfolio_id' => $holding->portfolio_id,
|
||||||
'symbol' => $holding->symbol,
|
'symbol' => $holding->symbol,
|
||||||
'transaction_type' => "BUY",
|
'transaction_type' => 'BUY',
|
||||||
'reinvested_dividend' => true,
|
'reinvested_dividend' => true,
|
||||||
'cost_basis' => 0,
|
'cost_basis' => 0,
|
||||||
'quantity' => ($dividend['dividend_amount'] * $holding->qtyOwned(Carbon::parse($dividend['date']))) / $market_data->market_value,
|
'quantity' => ($dividend['dividend_amount'] * $holding->qtyOwned(Carbon::parse($dividend['date']))) / $market_data->market_value,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+89
-87
@@ -2,16 +2,10 @@
|
|||||||
|
|
||||||
namespace App\Models;
|
namespace App\Models;
|
||||||
|
|
||||||
use App\Models\Split;
|
|
||||||
use App\Models\AiChat;
|
|
||||||
use App\Models\Dividend;
|
|
||||||
use App\Models\Portfolio;
|
|
||||||
use App\Models\MarketData;
|
|
||||||
use App\Models\Transaction;
|
|
||||||
use Illuminate\Support\Facades\DB;
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
|
||||||
use Illuminate\Database\Eloquent\Concerns\HasUuids;
|
use Illuminate\Database\Eloquent\Concerns\HasUuids;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|
||||||
class Holding extends Model
|
class Holding extends Model
|
||||||
{
|
{
|
||||||
@@ -27,13 +21,13 @@ class Holding extends Model
|
|||||||
'realized_gain_dollars',
|
'realized_gain_dollars',
|
||||||
'dividends_earned',
|
'dividends_earned',
|
||||||
'splits_synced_at',
|
'splits_synced_at',
|
||||||
'reinvest_dividends'
|
'reinvest_dividends',
|
||||||
];
|
];
|
||||||
|
|
||||||
protected $casts = [
|
protected $casts = [
|
||||||
'splits_synced_at' => 'datetime',
|
'splits_synced_at' => 'datetime',
|
||||||
'first_transaction_date' => 'datetime',
|
'first_transaction_date' => 'datetime',
|
||||||
'reinvest_dividends' => 'boolean'
|
'reinvest_dividends' => 'boolean',
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -41,7 +35,7 @@ class Holding extends Model
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function market_data()
|
public function market_data()
|
||||||
{
|
{
|
||||||
return $this->hasOne(MarketData::class, 'symbol', 'symbol');
|
return $this->hasOne(MarketData::class, 'symbol', 'symbol');
|
||||||
}
|
}
|
||||||
@@ -51,7 +45,7 @@ class Holding extends Model
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function transactions()
|
public function transactions()
|
||||||
{
|
{
|
||||||
return $this->hasManyThrough(Transaction::class, Portfolio::class, 'id', 'portfolio_id', 'portfolio_id', 'id')->orderBy('date', 'DESC');
|
return $this->hasManyThrough(Transaction::class, Portfolio::class, 'id', 'portfolio_id', 'portfolio_id', 'id')->orderBy('date', 'DESC');
|
||||||
}
|
}
|
||||||
@@ -61,11 +55,11 @@ class Holding extends Model
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function dividends()
|
public function dividends()
|
||||||
{
|
{
|
||||||
return $this->hasMany(Dividend::class, 'symbol', 'symbol')
|
return $this->hasMany(Dividend::class, 'symbol', 'symbol')
|
||||||
->select(['dividends.symbol','dividends.date','dividends.dividend_amount'])
|
->select(['dividends.symbol', 'dividends.date', 'dividends.dividend_amount'])
|
||||||
->selectRaw("SUM(
|
->selectRaw("SUM(
|
||||||
CASE WHEN transaction_type = 'BUY'
|
CASE WHEN transaction_type = 'BUY'
|
||||||
AND transactions.symbol = dividends.symbol
|
AND transactions.symbol = dividends.symbol
|
||||||
AND transactions.portfolio_id = '$this->portfolio_id'
|
AND transactions.portfolio_id = '$this->portfolio_id'
|
||||||
@@ -73,7 +67,7 @@ class Holding extends Model
|
|||||||
THEN transactions.quantity
|
THEN transactions.quantity
|
||||||
ELSE 0 END
|
ELSE 0 END
|
||||||
) AS purchased")
|
) AS purchased")
|
||||||
->selectRaw("SUM(
|
->selectRaw("SUM(
|
||||||
CASE WHEN transaction_type = 'SELL'
|
CASE WHEN transaction_type = 'SELL'
|
||||||
AND transactions.symbol = dividends.symbol
|
AND transactions.symbol = dividends.symbol
|
||||||
AND transactions.portfolio_id = '$this->portfolio_id'
|
AND transactions.portfolio_id = '$this->portfolio_id'
|
||||||
@@ -81,7 +75,7 @@ class Holding extends Model
|
|||||||
THEN transactions.quantity
|
THEN transactions.quantity
|
||||||
ELSE 0 END
|
ELSE 0 END
|
||||||
) AS sold")
|
) AS sold")
|
||||||
->selectRaw("SUM(
|
->selectRaw("SUM(
|
||||||
(CASE WHEN transaction_type = 'BUY'
|
(CASE WHEN transaction_type = 'BUY'
|
||||||
AND transactions.symbol = dividends.symbol
|
AND transactions.symbol = dividends.symbol
|
||||||
AND transactions.portfolio_id = '$this->portfolio_id'
|
AND transactions.portfolio_id = '$this->portfolio_id'
|
||||||
@@ -94,16 +88,16 @@ class Holding extends Model
|
|||||||
THEN transactions.quantity ELSE 0 END)
|
THEN transactions.quantity ELSE 0 END)
|
||||||
* dividends.dividend_amount
|
* dividends.dividend_amount
|
||||||
) AS total_received")
|
) AS total_received")
|
||||||
->join('transactions', 'transactions.symbol', 'dividends.symbol')
|
->join('transactions', 'transactions.symbol', 'dividends.symbol')
|
||||||
->groupBy(['dividends.symbol','dividends.date','dividends.dividend_amount'])
|
->groupBy(['dividends.symbol', 'dividends.date', 'dividends.dividend_amount'])
|
||||||
->orderBy('dividends.date', 'DESC')
|
->orderBy('dividends.date', 'DESC')
|
||||||
->where('dividends.date', '>=', function ($query) {
|
->where('dividends.date', '>=', function ($query) {
|
||||||
$query->selectRaw('min(transactions.date)')
|
$query->selectRaw('min(transactions.date)')
|
||||||
->from('transactions')
|
->from('transactions')
|
||||||
->whereRaw("transactions.portfolio_id = '$this->portfolio_id'")
|
->whereRaw("transactions.portfolio_id = '$this->portfolio_id'")
|
||||||
->whereRaw("transactions.symbol = '$this->symbol'");
|
->whereRaw("transactions.symbol = '$this->symbol'");
|
||||||
})
|
})
|
||||||
->having('total_received', '>', 0);
|
->having('total_received', '>', 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -111,7 +105,7 @@ class Holding extends Model
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function portfolio()
|
public function portfolio()
|
||||||
{
|
{
|
||||||
return $this->belongsTo(Portfolio::class);
|
return $this->belongsTo(Portfolio::class);
|
||||||
}
|
}
|
||||||
@@ -121,7 +115,7 @@ class Holding extends Model
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function splits()
|
public function splits()
|
||||||
{
|
{
|
||||||
return $this->hasMany(Split::class, 'symbol', 'symbol')
|
return $this->hasMany(Split::class, 'symbol', 'symbol')
|
||||||
->orderBy('date', 'DESC');
|
->orderBy('date', 'DESC');
|
||||||
@@ -140,11 +134,11 @@ class Holding extends Model
|
|||||||
public function scopeWithMarketData($query)
|
public function scopeWithMarketData($query)
|
||||||
{
|
{
|
||||||
return $query->withAggregate('market_data', 'name')
|
return $query->withAggregate('market_data', 'name')
|
||||||
->withAggregate('market_data', 'market_value')
|
->withAggregate('market_data', 'market_value')
|
||||||
->withAggregate('market_data', 'fifty_two_week_low')
|
->withAggregate('market_data', 'fifty_two_week_low')
|
||||||
->withAggregate('market_data', 'fifty_two_week_high')
|
->withAggregate('market_data', 'fifty_two_week_high')
|
||||||
->withAggregate('market_data', 'updated_at')
|
->withAggregate('market_data', 'updated_at')
|
||||||
->join('market_data', 'holdings.symbol', 'market_data.symbol');
|
->join('market_data', 'holdings.symbol', 'market_data.symbol');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function scopeWithPerformance($query)
|
public function scopeWithPerformance($query)
|
||||||
@@ -164,49 +158,50 @@ class Holding extends Model
|
|||||||
return $query->where('holdings.symbol', $symbol);
|
return $query->where('holdings.symbol', $symbol);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function scopeWithoutWishlists($query) {
|
public function scopeWithoutWishlists($query)
|
||||||
|
{
|
||||||
return $query->whereHas('portfolio', function ($query) {
|
return $query->whereHas('portfolio', function ($query) {
|
||||||
$query->where('portfolios.wishlist', 0);
|
$query->where('portfolios.wishlist', 0);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public function scopeMyHoldings($query, $userId = null)
|
public function scopeMyHoldings($query, $userId = null)
|
||||||
{
|
{
|
||||||
return $query->whereHas('portfolio', function($query) use ($userId) {
|
return $query->whereHas('portfolio', function ($query) use ($userId) {
|
||||||
$query->whereRelation('users', 'id', $userId ?? auth()->user()->id);
|
$query->whereRelation('users', 'id', $userId ?? auth()->user()->id);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public function scopeWithPortfolioMetrics($query)
|
public function scopeWithPortfolioMetrics($query)
|
||||||
{
|
{
|
||||||
return $query->selectRaw('COALESCE(SUM(holdings.dividends_earned), 0) AS total_dividends_earned')
|
return $query->selectRaw('COALESCE(SUM(holdings.dividends_earned), 0) AS total_dividends_earned')
|
||||||
->selectRaw('COALESCE(SUM(holdings.realized_gain_dollars), 0) AS realized_gain_dollars')
|
->selectRaw('COALESCE(SUM(holdings.realized_gain_dollars), 0) AS realized_gain_dollars')
|
||||||
->selectRaw('COALESCE(SUM(holdings.quantity * market_data.market_value), 0) AS total_market_value')
|
->selectRaw('COALESCE(SUM(holdings.quantity * market_data.market_value), 0) AS total_market_value')
|
||||||
->selectRaw('COALESCE(SUM(holdings.total_cost_basis), 0) AS total_cost_basis')
|
->selectRaw('COALESCE(SUM(holdings.total_cost_basis), 0) AS total_cost_basis')
|
||||||
->selectRaw('COALESCE(SUM(holdings.quantity * market_data.market_value), 0) - COALESCE(SUM(holdings.total_cost_basis), 0) AS total_gain_dollars')
|
->selectRaw('COALESCE(SUM(holdings.quantity * market_data.market_value), 0) - COALESCE(SUM(holdings.total_cost_basis), 0) AS total_gain_dollars')
|
||||||
// ->selectRaw('COALESCE((@total_gain_dollars / @sum_total_cost_basis) * 100,0) AS total_gain_percent')
|
// ->selectRaw('COALESCE((@total_gain_dollars / @sum_total_cost_basis) * 100,0) AS total_gain_percent')
|
||||||
->join('market_data', 'market_data.symbol', '=', 'holdings.symbol');
|
->join('market_data', 'market_data.symbol', '=', 'holdings.symbol');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function syncTransactionsAndDividends()
|
public function syncTransactionsAndDividends()
|
||||||
{
|
{
|
||||||
// pull existing transaction data
|
// pull existing transaction data
|
||||||
$query = Transaction::where([
|
$query = Transaction::where([
|
||||||
'portfolio_id' => $this->portfolio_id,
|
'portfolio_id' => $this->portfolio_id,
|
||||||
'symbol' => $this->symbol,
|
'symbol' => $this->symbol,
|
||||||
])->selectRaw('SUM(CASE WHEN transaction_type = "BUY" THEN quantity ELSE 0 END) AS `qty_purchases`')
|
])->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 = "SELL" THEN quantity ELSE 0 END) AS `qty_sales`')
|
||||||
->selectRaw('SUM(CASE WHEN transaction_type = "BUY" THEN (quantity * cost_basis) ELSE 0 END) AS `total_cost_basis`')
|
->selectRaw('SUM(CASE WHEN transaction_type = "BUY" THEN (quantity * cost_basis) ELSE 0 END) AS `total_cost_basis`')
|
||||||
->selectRaw('SUM(CASE WHEN transaction_type = "SELL" THEN (quantity * sale_price) ELSE 0 END) AS `total_sale_price`')
|
->selectRaw('SUM(CASE WHEN transaction_type = "SELL" THEN (quantity * sale_price) ELSE 0 END) AS `total_sale_price`')
|
||||||
->first();
|
->first();
|
||||||
|
|
||||||
$total_quantity = round($query->qty_purchases - $query->qty_sales, 3);
|
$total_quantity = round($query->qty_purchases - $query->qty_sales, 3);
|
||||||
|
|
||||||
$average_cost_basis = (
|
$average_cost_basis = (
|
||||||
$query->qty_purchases > 0
|
$query->qty_purchases > 0
|
||||||
&& $total_quantity > 0
|
&& $total_quantity > 0
|
||||||
)
|
)
|
||||||
? $query->total_cost_basis / $query->qty_purchases
|
? $query->total_cost_basis / $query->qty_purchases
|
||||||
: 0;
|
: 0;
|
||||||
|
|
||||||
// update holding
|
// update holding
|
||||||
@@ -214,18 +209,20 @@ class Holding extends Model
|
|||||||
'quantity' => $total_quantity,
|
'quantity' => $total_quantity,
|
||||||
'average_cost_basis' => $average_cost_basis,
|
'average_cost_basis' => $average_cost_basis,
|
||||||
'total_cost_basis' => $total_quantity * $average_cost_basis,
|
'total_cost_basis' => $total_quantity * $average_cost_basis,
|
||||||
'realized_gain_dollars' => $query->qty_purchases > 0 && $query->total_sale_price > 0
|
'realized_gain_dollars' => $query->qty_purchases > 0 && $query->total_sale_price > 0
|
||||||
? $query->total_sale_price - ($query->qty_sales * ($query->total_cost_basis / $query->qty_purchases))
|
? $query->total_sale_price - ($query->qty_sales * ($query->total_cost_basis / $query->qty_purchases))
|
||||||
: 0,
|
: 0,
|
||||||
'dividends_earned' => $this->dividends->sum('total_received')
|
'dividends_earned' => $this->dividends->sum('total_received'),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$this->save();
|
$this->save();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function qtyOwned(\Illuminate\Support\Carbon $date = null)
|
public function qtyOwned(?\Illuminate\Support\Carbon $date = null)
|
||||||
{
|
{
|
||||||
if ($date == null) $date = now();
|
if ($date == null) {
|
||||||
|
$date = now();
|
||||||
|
}
|
||||||
|
|
||||||
$transactions = $this->transactions->where('date', '<=', $date);
|
$transactions = $this->transactions->where('date', '<=', $date);
|
||||||
|
|
||||||
@@ -237,16 +234,20 @@ class Holding extends Model
|
|||||||
}
|
}
|
||||||
|
|
||||||
public function dailyPerformance(
|
public function dailyPerformance(
|
||||||
\Illuminate\Support\Carbon $start_date = null,
|
?\Illuminate\Support\Carbon $start_date = null,
|
||||||
\Illuminate\Support\Carbon $end_date = null,
|
?\Illuminate\Support\Carbon $end_date = null,
|
||||||
) {
|
) {
|
||||||
if ($start_date == null) $start_date = now();
|
if ($start_date == null) {
|
||||||
if ($end_date == null) $end_date = now();
|
$start_date = now();
|
||||||
|
}
|
||||||
|
if ($end_date == null) {
|
||||||
|
$end_date = now();
|
||||||
|
}
|
||||||
|
|
||||||
$date_interval = "DATE_ADD(date, INTERVAL 1 DAY)";
|
$date_interval = 'DATE_ADD(date, INTERVAL 1 DAY)';
|
||||||
|
|
||||||
if (config('database.default') === 'sqlite') {
|
if (config('database.default') === 'sqlite') {
|
||||||
|
|
||||||
$date_interval = "date(date, '+1 day')";
|
$date_interval = "date(date, '+1 day')";
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
@@ -265,14 +266,14 @@ class Holding extends Model
|
|||||||
FROM date_series
|
FROM date_series
|
||||||
) as date_series")
|
) as date_series")
|
||||||
)
|
)
|
||||||
->select([
|
->select([
|
||||||
'date_series.date',
|
'date_series.date',
|
||||||
DB::raw("
|
DB::raw("
|
||||||
ROUND(
|
ROUND(
|
||||||
COALESCE(SUM(CASE WHEN transactions.transaction_type = 'BUY' THEN transactions.quantity ELSE 0 END), 0) -
|
COALESCE(SUM(CASE WHEN transactions.transaction_type = 'BUY' THEN transactions.quantity ELSE 0 END), 0) -
|
||||||
COALESCE(SUM(CASE WHEN transactions.transaction_type = 'SELL' THEN transactions.quantity ELSE 0 END), 0), 3) AS `owned`
|
COALESCE(SUM(CASE WHEN transactions.transaction_type = 'SELL' THEN transactions.quantity ELSE 0 END), 0), 3) AS `owned`
|
||||||
"),
|
"),
|
||||||
DB::raw("
|
DB::raw("
|
||||||
COALESCE(CASE
|
COALESCE(CASE
|
||||||
WHEN (
|
WHEN (
|
||||||
ROUND(
|
ROUND(
|
||||||
@@ -285,29 +286,30 @@ class Holding extends Model
|
|||||||
END)
|
END)
|
||||||
END, 0) AS cost_basis
|
END, 0) AS cost_basis
|
||||||
"),
|
"),
|
||||||
DB::raw("COALESCE(SUM(CASE WHEN transaction_type = 'SELL' THEN ((sale_price - cost_basis) * quantity) ELSE 0 END), 0) AS `realized_gains`")
|
DB::raw("COALESCE(SUM(CASE WHEN transaction_type = 'SELL' THEN ((sale_price - cost_basis) * quantity) ELSE 0 END), 0) AS `realized_gains`"),
|
||||||
])
|
])
|
||||||
->leftJoin('transactions', function ($join) {
|
->leftJoin('transactions', function ($join) {
|
||||||
$join->on(DB::raw('DATE(transactions.date)'), '<=', 'date_series.date')
|
$join->on(DB::raw('DATE(transactions.date)'), '<=', 'date_series.date')
|
||||||
->where('transactions.symbol', '=', $this->symbol)
|
->where('transactions.symbol', '=', $this->symbol)
|
||||||
->where('transactions.portfolio_id', '=', $this->portfolio_id);
|
->where('transactions.portfolio_id', '=', $this->portfolio_id);
|
||||||
})
|
})
|
||||||
->groupBy('date_series.date')
|
->groupBy('date_series.date')
|
||||||
->orderBy('date_series.date')
|
->orderBy('date_series.date')
|
||||||
->get()
|
->get()
|
||||||
->keyBy('date');
|
->keyBy('date');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getFormattedTransactions()
|
public function getFormattedTransactions()
|
||||||
{
|
{
|
||||||
$formattedTransactions = '';
|
$formattedTransactions = '';
|
||||||
foreach($this->transactions->sortByDesc('date') as $transaction) {
|
foreach ($this->transactions->sortByDesc('date') as $transaction) {
|
||||||
$formattedTransactions .= " * ".$transaction->date->format('Y-m-d')
|
$formattedTransactions .= ' * '.$transaction->date->format('Y-m-d')
|
||||||
." ". $transaction->transaction_type
|
.' '.$transaction->transaction_type
|
||||||
." ". $transaction->quantity
|
.' '.$transaction->quantity
|
||||||
." @ ". $transaction->cost_basis
|
.' @ '.$transaction->cost_basis
|
||||||
." each \n\n";
|
." each \n\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
return $formattedTransactions;
|
return $formattedTransactions;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,16 +2,18 @@
|
|||||||
|
|
||||||
namespace App\Models;
|
namespace App\Models;
|
||||||
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
|
||||||
use App\Interfaces\MarketData\MarketDataInterface;
|
use App\Interfaces\MarketData\MarketDataInterface;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
|
||||||
class MarketData extends Model
|
class MarketData extends Model
|
||||||
{
|
{
|
||||||
use HasFactory;
|
use HasFactory;
|
||||||
|
|
||||||
protected $primaryKey = 'symbol';
|
protected $primaryKey = 'symbol';
|
||||||
|
|
||||||
protected $keyType = 'string';
|
protected $keyType = 'string';
|
||||||
|
|
||||||
public $incrementing = false;
|
public $incrementing = false;
|
||||||
|
|
||||||
protected $fillable = [
|
protected $fillable = [
|
||||||
@@ -25,7 +27,7 @@ class MarketData extends Model
|
|||||||
'market_cap',
|
'market_cap',
|
||||||
'book_value',
|
'book_value',
|
||||||
'last_dividend_date',
|
'last_dividend_date',
|
||||||
'dividend_yield'
|
'dividend_yield',
|
||||||
];
|
];
|
||||||
|
|
||||||
protected $casts = [
|
protected $casts = [
|
||||||
@@ -37,10 +39,10 @@ class MarketData extends Model
|
|||||||
'trailing_pe' => 'float',
|
'trailing_pe' => 'float',
|
||||||
'market_cap' => 'float',
|
'market_cap' => 'float',
|
||||||
'book_value' => 'float',
|
'book_value' => 'float',
|
||||||
'dividend_yield' => 'float'
|
'dividend_yield' => 'float',
|
||||||
];
|
];
|
||||||
|
|
||||||
public function holdings()
|
public function holdings()
|
||||||
{
|
{
|
||||||
return $this->hasMany(Holding::class, 'symbol', 'symbol');
|
return $this->hasMany(Holding::class, 'symbol', 'symbol');
|
||||||
}
|
}
|
||||||
@@ -50,20 +52,20 @@ class MarketData extends Model
|
|||||||
return $query->where('symbol', $symbol);
|
return $query->where('symbol', $symbol);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function getMarketData($symbol, $force = false)
|
public static function getMarketData($symbol, $force = false)
|
||||||
{
|
{
|
||||||
$market_data = self::firstOrNew([
|
$market_data = self::firstOrNew([
|
||||||
'symbol' => $symbol
|
'symbol' => $symbol,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
// check if new or stale
|
// check if new or stale
|
||||||
if (
|
if (
|
||||||
$force
|
$force
|
||||||
|| !$market_data->exists
|
|| ! $market_data->exists
|
||||||
|| is_null($market_data->updated_at)
|
|| is_null($market_data->updated_at)
|
||||||
|| $market_data->updated_at->diffInMinutes(now()) >= config('investbrain.refresh')
|
|| $market_data->updated_at->diffInMinutes(now()) >= config('investbrain.refresh')
|
||||||
) {
|
) {
|
||||||
|
|
||||||
// get quote
|
// get quote
|
||||||
$quote = app(MarketDataInterface::class)->quote($symbol);
|
$quote = app(MarketDataInterface::class)->quote($symbol);
|
||||||
|
|
||||||
@@ -76,4 +78,4 @@ class MarketData extends Model
|
|||||||
|
|
||||||
return $market_data;
|
return $market_data;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+59
-66
@@ -2,17 +2,16 @@
|
|||||||
|
|
||||||
namespace App\Models;
|
namespace App\Models;
|
||||||
|
|
||||||
use App\Models\AiChat;
|
use App\Interfaces\MarketData\MarketDataInterface;
|
||||||
|
use App\Notifications\InvitedOnboardingNotification;
|
||||||
use Carbon\CarbonPeriod;
|
use Carbon\CarbonPeriod;
|
||||||
|
use Illuminate\Database\Eloquent\Concerns\HasUuids;
|
||||||
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
use Illuminate\Support\Arr;
|
use Illuminate\Support\Arr;
|
||||||
use Illuminate\Support\Str;
|
|
||||||
use Illuminate\Support\Carbon;
|
use Illuminate\Support\Carbon;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Support\Str;
|
||||||
use App\Interfaces\MarketData\MarketDataInterface;
|
|
||||||
use Illuminate\Database\Eloquent\Concerns\HasUuids;
|
|
||||||
use App\Notifications\InvitedOnboardingNotification;
|
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
|
||||||
|
|
||||||
class Portfolio extends Model
|
class Portfolio extends Model
|
||||||
{
|
{
|
||||||
@@ -30,7 +29,7 @@ class Portfolio extends Model
|
|||||||
protected static function boot()
|
protected static function boot()
|
||||||
{
|
{
|
||||||
parent::boot();
|
parent::boot();
|
||||||
|
|
||||||
static::saved(function ($portfolio) {
|
static::saved(function ($portfolio) {
|
||||||
|
|
||||||
self::ensurePortfolioHasOwner($portfolio);
|
self::ensurePortfolioHasOwner($portfolio);
|
||||||
@@ -40,7 +39,7 @@ class Portfolio extends Model
|
|||||||
protected $hidden = [];
|
protected $hidden = [];
|
||||||
|
|
||||||
protected $casts = [
|
protected $casts = [
|
||||||
'wishlist' => 'boolean'
|
'wishlist' => 'boolean',
|
||||||
];
|
];
|
||||||
|
|
||||||
protected $with = ['users', 'transactions'];
|
protected $with = ['users', 'transactions'];
|
||||||
@@ -53,8 +52,8 @@ class Portfolio extends Model
|
|||||||
public function holdings()
|
public function holdings()
|
||||||
{
|
{
|
||||||
return $this->hasMany(Holding::class, 'portfolio_id')
|
return $this->hasMany(Holding::class, 'portfolio_id')
|
||||||
->withMarketData()
|
->withMarketData()
|
||||||
->withPerformance();
|
->withPerformance();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function transactions()
|
public function transactions()
|
||||||
@@ -77,25 +76,25 @@ class Portfolio extends Model
|
|||||||
return $this->morphMany(AiChat::class, 'chatable')->where('user_id', auth()->user()->id);
|
return $this->morphMany(AiChat::class, 'chatable')->where('user_id', auth()->user()->id);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function scopeMyPortfolios()
|
public function scopeMyPortfolios()
|
||||||
{
|
{
|
||||||
return $this->whereHas('users', function ($query) {
|
return $this->whereHas('users', function ($query) {
|
||||||
$query->where('user_id', auth()->user()->id);
|
$query->where('user_id', auth()->user()->id);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public function scopeFullAccess($query, $user_id = null)
|
public function scopeFullAccess($query, $user_id = null)
|
||||||
{
|
{
|
||||||
return $query->whereHas('users', function ($query) use ($user_id) {
|
return $query->whereHas('users', function ($query) use ($user_id) {
|
||||||
$query->where('user_id', $user_id ?? auth()->user()->id)
|
$query->where('user_id', $user_id ?? auth()->user()->id)
|
||||||
->where(function ($query) {
|
->where(function ($query) {
|
||||||
$query->where('full_access', true)
|
$query->where('full_access', true)
|
||||||
->orWhere('owner', true);
|
->orWhere('owner', true);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public function scopeWithoutWishlists()
|
public function scopeWithoutWishlists()
|
||||||
{
|
{
|
||||||
return $this->where(['wishlist' => false]);
|
return $this->where(['wishlist' => false]);
|
||||||
}
|
}
|
||||||
@@ -103,7 +102,7 @@ class Portfolio extends Model
|
|||||||
public function setOwnerIdAttribute($value)
|
public function setOwnerIdAttribute($value)
|
||||||
{
|
{
|
||||||
// enable queued jobs to create portfolios with owners
|
// enable queued jobs to create portfolios with owners
|
||||||
if (!auth()->user()?->id && !$this->owner_id) {
|
if (! auth()->user()?->id && ! $this->owner_id) {
|
||||||
static::$owner_id = $value;
|
static::$owner_id = $value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -115,18 +114,18 @@ class Portfolio extends Model
|
|||||||
|
|
||||||
public function getOwnerAttribute()
|
public function getOwnerAttribute()
|
||||||
{
|
{
|
||||||
if (!$this->relationLoaded('user')) {
|
if (! $this->relationLoaded('user')) {
|
||||||
|
|
||||||
$this->load('users');
|
$this->load('users');
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->users->where('pivot.owner', true)->first();
|
return $this->users->where('pivot.owner', true)->first();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static function ensurePortfolioHasOwner(self $portfolio)
|
public static function ensurePortfolioHasOwner(self $portfolio)
|
||||||
{
|
{
|
||||||
// make sure we don't remove owner access
|
// make sure we don't remove owner access
|
||||||
if (!$portfolio->owner_id) {
|
if (! $portfolio->owner_id) {
|
||||||
$owner[static::$owner_id ?? auth()->user()->id] = ['owner' => true];
|
$owner[static::$owner_id ?? auth()->user()->id] = ['owner' => true];
|
||||||
|
|
||||||
// save
|
// save
|
||||||
@@ -138,24 +137,24 @@ class Portfolio extends Model
|
|||||||
public function syncDailyChanges(): void
|
public function syncDailyChanges(): void
|
||||||
{
|
{
|
||||||
$holdings = $this->holdings()
|
$holdings = $this->holdings()
|
||||||
->join('transactions', function($join) {
|
->join('transactions', function ($join) {
|
||||||
$join->on('transactions.symbol', '=', 'holdings.symbol')
|
$join->on('transactions.symbol', '=', 'holdings.symbol')
|
||||||
->where('transactions.portfolio_id', '=', $this->id);
|
->where('transactions.portfolio_id', '=', $this->id);
|
||||||
})
|
})
|
||||||
->select('holdings.symbol', 'holdings.portfolio_id', DB::raw('min(transactions.date) as first_transaction_date')) // get first transaction date
|
->select('holdings.symbol', 'holdings.portfolio_id', DB::raw('min(transactions.date) as first_transaction_date')) // get first transaction date
|
||||||
->groupBy(['holdings.symbol', 'holdings.portfolio_id'])
|
->groupBy(['holdings.symbol', 'holdings.portfolio_id'])
|
||||||
->get();
|
->get();
|
||||||
|
|
||||||
$dividends = Dividend::whereIn('symbol', $holdings->pluck('symbol'))->get();
|
$dividends = Dividend::whereIn('symbol', $holdings->pluck('symbol'))->get();
|
||||||
|
|
||||||
$total_performance = [];
|
$total_performance = [];
|
||||||
|
|
||||||
$holdings->each(function($holding) use (&$total_performance, $dividends) {
|
$holdings->each(function ($holding) use (&$total_performance, $dividends) {
|
||||||
|
|
||||||
$period = CarbonPeriod::create(
|
$period = CarbonPeriod::create(
|
||||||
$holding->first_transaction_date,
|
$holding->first_transaction_date,
|
||||||
now()->isBefore(Carbon::parse(config('investbrain.daily_change_time_of_day')))
|
now()->isBefore(Carbon::parse(config('investbrain.daily_change_time_of_day')))
|
||||||
? now()->subDay()
|
? now()->subDay()
|
||||||
: now()
|
: now()
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -170,11 +169,11 @@ class Portfolio extends Model
|
|||||||
$dividends_earned = 0;
|
$dividends_earned = 0;
|
||||||
$holding_performance = [];
|
$holding_performance = [];
|
||||||
|
|
||||||
foreach($period as $date) {
|
foreach ($period as $date) {
|
||||||
$date = $date->format('Y-m-d');
|
$date = $date->format('Y-m-d');
|
||||||
|
|
||||||
$close = $this->getMostRecentCloseData($all_history, $date);
|
$close = $this->getMostRecentCloseData($all_history, $date);
|
||||||
|
|
||||||
$total_market_value = $daily_performance->get($date)->owned * $close;
|
$total_market_value = $daily_performance->get($date)->owned * $close;
|
||||||
$dividends_earned += $daily_performance->get($date)->owned * ($dividends->get($date)?->dividend_amount ?? 0);
|
$dividends_earned += $daily_performance->get($date)->owned * ($dividends->get($date)?->dividend_amount ?? 0);
|
||||||
|
|
||||||
@@ -182,18 +181,18 @@ class Portfolio extends Model
|
|||||||
$holding_performance[$date] = [
|
$holding_performance[$date] = [
|
||||||
'date' => $date,
|
'date' => $date,
|
||||||
'portfolio_id' => $this->id,
|
'portfolio_id' => $this->id,
|
||||||
'total_market_value' => $total_market_value,
|
'total_market_value' => $total_market_value,
|
||||||
'total_cost_basis' => $daily_performance->get($date)->cost_basis,
|
'total_cost_basis' => $daily_performance->get($date)->cost_basis,
|
||||||
'total_gain' => $total_market_value - $daily_performance->get($date)->cost_basis,
|
'total_gain' => $total_market_value - $daily_performance->get($date)->cost_basis,
|
||||||
'realized_gains' => $daily_performance->get($date)->realized_gains,
|
'realized_gains' => $daily_performance->get($date)->realized_gains,
|
||||||
'total_dividends_earned' => $dividends_earned
|
'total_dividends_earned' => $dividends_earned,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach ($holding_performance as $date => $performance) {
|
foreach ($holding_performance as $date => $performance) {
|
||||||
if (Arr::get($total_performance, $date) == null) {
|
if (Arr::get($total_performance, $date) == null) {
|
||||||
|
|
||||||
$total_performance[$date] = $performance;
|
$total_performance[$date] = $performance;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
@@ -207,9 +206,9 @@ class Portfolio extends Model
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!empty($total_performance)) {
|
if (! empty($total_performance)) {
|
||||||
DB::transaction(function () use ($total_performance) {
|
DB::transaction(function () use ($total_performance) {
|
||||||
|
|
||||||
$this->daily_change()->upsert(
|
$this->daily_change()->upsert(
|
||||||
$total_performance,
|
$total_performance,
|
||||||
['date', 'portfolio_id'],
|
['date', 'portfolio_id'],
|
||||||
@@ -218,7 +217,7 @@ class Portfolio extends Model
|
|||||||
'total_cost_basis',
|
'total_cost_basis',
|
||||||
'total_gain',
|
'total_gain',
|
||||||
'realized_gains',
|
'realized_gains',
|
||||||
'total_dividends_earned'
|
'total_dividends_earned',
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
@@ -229,10 +228,10 @@ class Portfolio extends Model
|
|||||||
{
|
{
|
||||||
$close = Arr::get($history, "$date.close", 0);
|
$close = Arr::get($history, "$date.close", 0);
|
||||||
|
|
||||||
if (!$close && $i < $max_attempts) {
|
if (! $close && $i < $max_attempts) {
|
||||||
|
|
||||||
$i++;
|
$i++;
|
||||||
|
|
||||||
$date = Carbon::parse($date)->subDay()->format('Y-m-d');
|
$date = Carbon::parse($date)->subDay()->format('Y-m-d');
|
||||||
|
|
||||||
return $this->getMostRecentCloseData($history, $date, $i);
|
return $this->getMostRecentCloseData($history, $date, $i);
|
||||||
@@ -244,53 +243,47 @@ class Portfolio extends Model
|
|||||||
public function getFormattedHoldings()
|
public function getFormattedHoldings()
|
||||||
{
|
{
|
||||||
$formattedHoldings = '';
|
$formattedHoldings = '';
|
||||||
foreach($this->holdings as $holding) {
|
foreach ($this->holdings as $holding) {
|
||||||
$formattedHoldings .= " * Holding of ".$holding->market_data->name." (".$holding->symbol.")"
|
$formattedHoldings .= ' * Holding of '.$holding->market_data->name.' ('.$holding->symbol.')'
|
||||||
."; with ". ($holding->quantity > 0 ? $holding->quantity : 'ZERO') . " shares"
|
.'; with '.($holding->quantity > 0 ? $holding->quantity : 'ZERO').' shares'
|
||||||
."; avg cost basis ". $holding->average_cost_basis
|
.'; avg cost basis '.$holding->average_cost_basis
|
||||||
."; curr market value ". $holding->market_data->market_value
|
.'; curr market value '.$holding->market_data->market_value
|
||||||
."; unrealized gains ". $holding->market_gain_dollars
|
.'; unrealized gains '.$holding->market_gain_dollars
|
||||||
."; realized gains ". $holding->realized_gain_dollars
|
.'; realized gains '.$holding->realized_gain_dollars
|
||||||
."; dividends earned ". $holding->dividends_earned
|
.'; dividends earned '.$holding->dividends_earned
|
||||||
."\n\n";
|
."\n\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
return $formattedHoldings;
|
return $formattedHoldings;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Share a portfolio with a user
|
* Share a portfolio with a user
|
||||||
*
|
|
||||||
* @param string $email
|
|
||||||
* @param boolean $fullAccess
|
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public function share(string $email, bool $fullAccess = false): void
|
public function share(string $email, bool $fullAccess = false): void
|
||||||
{
|
{
|
||||||
$user = User::firstOrCreate([
|
$user = User::firstOrCreate([
|
||||||
'email' => $email
|
'email' => $email,
|
||||||
], [
|
], [
|
||||||
'name' => Str::title(Str::before($email, '@'))
|
'name' => Str::title(Str::before($email, '@')),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$permissions[$user->id] = [
|
$permissions[$user->id] = [
|
||||||
'full_access' => $fullAccess
|
'full_access' => $fullAccess,
|
||||||
];
|
];
|
||||||
|
|
||||||
$sync = $this->users()->syncWithoutDetaching($permissions);
|
$sync = $this->users()->syncWithoutDetaching($permissions);
|
||||||
|
|
||||||
if (!empty($sync['attached'])) {
|
if (! empty($sync['attached'])) {
|
||||||
|
|
||||||
foreach($sync['attached'] as $newUserId) {
|
foreach ($sync['attached'] as $newUserId) {
|
||||||
User::find($newUserId)->notify(new InvitedOnboardingNotification($this, auth()->user()));
|
User::find($newUserId)->notify(new InvitedOnboardingNotification($this, auth()->user()));
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Un-share a portfolio
|
* Un-share a portfolio
|
||||||
*
|
|
||||||
* @param string $userId
|
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public function unShare(string $userId): void
|
public function unShare(string $userId): void
|
||||||
{
|
{
|
||||||
|
|||||||
+36
-36
@@ -2,13 +2,12 @@
|
|||||||
|
|
||||||
namespace App\Models;
|
namespace App\Models;
|
||||||
|
|
||||||
use App\Models\Transaction;
|
|
||||||
use Illuminate\Support\Str;
|
|
||||||
use Illuminate\Support\Facades\DB;
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
|
||||||
use App\Interfaces\MarketData\MarketDataInterface;
|
use App\Interfaces\MarketData\MarketDataInterface;
|
||||||
use Illuminate\Database\Eloquent\Concerns\HasUuids;
|
use Illuminate\Database\Eloquent\Concerns\HasUuids;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Illuminate\Support\Str;
|
||||||
|
|
||||||
class Split extends Model
|
class Split extends Model
|
||||||
{
|
{
|
||||||
@@ -28,22 +27,23 @@ class Split extends Model
|
|||||||
'last_date' => 'datetime',
|
'last_date' => 'datetime',
|
||||||
];
|
];
|
||||||
|
|
||||||
public function holdings() {
|
public function holdings()
|
||||||
|
{
|
||||||
return $this->hasMany(Holding::class, 'symbol', 'symbol');
|
return $this->hasMany(Holding::class, 'symbol', 'symbol');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function transactions() {
|
public function transactions()
|
||||||
|
{
|
||||||
return $this->hasMany(Transaction::class, 'symbol', 'symbol');
|
return $this->hasMany(Transaction::class, 'symbol', 'symbol');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Grab new split data
|
* Grab new split data
|
||||||
*
|
*
|
||||||
* @param string $symbol
|
* @param \DateTimeInterface|null $start_date
|
||||||
* @param \DateTimeInterface|null $start_date
|
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public static function refreshSplitData(string $symbol)
|
public static function refreshSplitData(string $symbol)
|
||||||
{
|
{
|
||||||
// dates for split data
|
// dates for split data
|
||||||
$splits_meta = self::where(['symbol' => $symbol])
|
$splits_meta = self::where(['symbol' => $symbol])
|
||||||
@@ -58,9 +58,9 @@ class Split extends Model
|
|||||||
|
|
||||||
// nope, need to populate newer split data
|
// nope, need to populate newer split data
|
||||||
if ($splits_meta->total_splits) {
|
if ($splits_meta->total_splits) {
|
||||||
|
|
||||||
$start_date = $splits_meta->last_date->addHours(48);
|
$start_date = $splits_meta->last_date->addHours(48);
|
||||||
$end_date = now();
|
$end_date = now();
|
||||||
}
|
}
|
||||||
|
|
||||||
// get some data
|
// get some data
|
||||||
@@ -71,10 +71,10 @@ class Split extends Model
|
|||||||
if ($split_data->isNotEmpty()) {
|
if ($split_data->isNotEmpty()) {
|
||||||
|
|
||||||
// insert records
|
// insert records
|
||||||
(new self)->insert($split_data->map(function($split) {
|
(new self)->insert($split_data->map(function ($split) {
|
||||||
|
|
||||||
return [...$split, ...['id' => Str::uuid()->toString()]];
|
return [...$split, ...['id' => Str::uuid()->toString()]];
|
||||||
})->toArray());
|
})->toArray());
|
||||||
}
|
}
|
||||||
|
|
||||||
// sync to transactions
|
// sync to transactions
|
||||||
@@ -84,39 +84,39 @@ class Split extends Model
|
|||||||
/**
|
/**
|
||||||
* Syncs all transactions of symbol with split data
|
* Syncs all transactions of symbol with split data
|
||||||
*
|
*
|
||||||
* @param string $symbol
|
* @param string $symbol
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public static function syncToTransactions($symbol)
|
public static function syncToTransactions($symbol)
|
||||||
{
|
{
|
||||||
// get splits joined with matching holdings
|
// get splits joined with matching holdings
|
||||||
$splits = self::select([
|
$splits = self::select([
|
||||||
'splits.date',
|
'splits.date',
|
||||||
'splits.symbol',
|
'splits.symbol',
|
||||||
'splits.split_amount',
|
'splits.split_amount',
|
||||||
'holdings.portfolio_id'
|
'holdings.portfolio_id',
|
||||||
])
|
])
|
||||||
->where([
|
->where([
|
||||||
'splits.symbol' => $symbol,
|
'splits.symbol' => $symbol,
|
||||||
])
|
])
|
||||||
->whereDate('splits.date', '>', DB::raw('IFNULL(holdings.splits_synced_at, "0000-00-00")'))
|
->whereDate('splits.date', '>', DB::raw('IFNULL(holdings.splits_synced_at, "0000-00-00")'))
|
||||||
->where('holdings.quantity', '>', 0)
|
->where('holdings.quantity', '>', 0)
|
||||||
->join('holdings', 'splits.symbol', 'holdings.symbol')
|
->join('holdings', 'splits.symbol', 'holdings.symbol')
|
||||||
->orderBy('splits.date', 'ASC')
|
->orderBy('splits.date', 'ASC')
|
||||||
->get();
|
->get();
|
||||||
|
|
||||||
foreach($splits as $split) {
|
foreach ($splits as $split) {
|
||||||
|
|
||||||
// get qty owned when split was issued
|
// get qty owned when split was issued
|
||||||
$qty_owned = Transaction::where([
|
$qty_owned = Transaction::where([
|
||||||
'symbol' => $split->symbol,
|
'symbol' => $split->symbol,
|
||||||
'portfolio_id' => $split->portfolio_id
|
'portfolio_id' => $split->portfolio_id,
|
||||||
])
|
])
|
||||||
->whereDate('transactions.date', '<', $split->date->format('Y-m-d'))
|
->whereDate('transactions.date', '<', $split->date->format('Y-m-d'))
|
||||||
->selectRaw('SUM(CASE WHEN transaction_type = "BUY" THEN quantity ELSE 0 END) -
|
->selectRaw('SUM(CASE WHEN transaction_type = "BUY" THEN quantity ELSE 0 END) -
|
||||||
SUM(CASE WHEN transaction_type = "SELL" THEN quantity ELSE 0 END) AS qty_owned')
|
SUM(CASE WHEN transaction_type = "SELL" THEN quantity ELSE 0 END) AS qty_owned')
|
||||||
->value('qty_owned');
|
->value('qty_owned');
|
||||||
|
|
||||||
if ($qty_owned > 0) {
|
if ($qty_owned > 0) {
|
||||||
|
|
||||||
Transaction::create([
|
Transaction::create([
|
||||||
@@ -128,14 +128,14 @@ class Split extends Model
|
|||||||
'cost_basis' => 0,
|
'cost_basis' => 0,
|
||||||
'split' => true,
|
'split' => true,
|
||||||
'created_at' => now(),
|
'created_at' => now(),
|
||||||
'updated_at' => now()
|
'updated_at' => now(),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
Holding::where([
|
Holding::where([
|
||||||
'symbol' => $split->symbol,
|
'symbol' => $split->symbol,
|
||||||
'portfolio_id' => $split->portfolio_id
|
'portfolio_id' => $split->portfolio_id,
|
||||||
])->update([
|
])->update([
|
||||||
'splits_synced_at' => now()
|
'splits_synced_at' => now(),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+19
-19
@@ -2,12 +2,11 @@
|
|||||||
|
|
||||||
namespace App\Models;
|
namespace App\Models;
|
||||||
|
|
||||||
use App\Models\MarketData;
|
|
||||||
use Illuminate\Support\Arr;
|
|
||||||
use Illuminate\Database\Eloquent\Model;
|
|
||||||
use Illuminate\Database\Eloquent\Casts\Attribute;
|
use Illuminate\Database\Eloquent\Casts\Attribute;
|
||||||
use Illuminate\Database\Eloquent\Concerns\HasUuids;
|
use Illuminate\Database\Eloquent\Concerns\HasUuids;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
|
use Illuminate\Database\Eloquent\Model;
|
||||||
|
use Illuminate\Support\Arr;
|
||||||
|
|
||||||
class Transaction extends Model
|
class Transaction extends Model
|
||||||
{
|
{
|
||||||
@@ -23,7 +22,7 @@ class Transaction extends Model
|
|||||||
'cost_basis',
|
'cost_basis',
|
||||||
'sale_price',
|
'sale_price',
|
||||||
'split',
|
'split',
|
||||||
'reinvested_dividend'
|
'reinvested_dividend',
|
||||||
];
|
];
|
||||||
|
|
||||||
protected $hidden = [];
|
protected $hidden = [];
|
||||||
@@ -31,7 +30,7 @@ class Transaction extends Model
|
|||||||
protected $casts = [
|
protected $casts = [
|
||||||
'date' => 'datetime',
|
'date' => 'datetime',
|
||||||
'split' => 'boolean',
|
'split' => 'boolean',
|
||||||
'reinvested_dividend' => 'boolean'
|
'reinvested_dividend' => 'boolean',
|
||||||
];
|
];
|
||||||
|
|
||||||
protected static function boot()
|
protected static function boot()
|
||||||
@@ -52,14 +51,14 @@ class Transaction extends Model
|
|||||||
|
|
||||||
$transaction->refreshMarketData();
|
$transaction->refreshMarketData();
|
||||||
|
|
||||||
cache()->forget('portfolio-metrics-' . $transaction->portfolio_id);
|
cache()->forget('portfolio-metrics-'.$transaction->portfolio_id);
|
||||||
});
|
});
|
||||||
|
|
||||||
static::deleted(function ($transaction) {
|
static::deleted(function ($transaction) {
|
||||||
|
|
||||||
$transaction->syncToHolding();
|
$transaction->syncToHolding();
|
||||||
|
|
||||||
cache()->forget('portfolio-metrics-' . $transaction->portfolio_id);
|
cache()->forget('portfolio-metrics-'.$transaction->portfolio_id);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -96,13 +95,13 @@ class Transaction extends Model
|
|||||||
public function scopeWithMarketData($query)
|
public function scopeWithMarketData($query)
|
||||||
{
|
{
|
||||||
return $query->withAggregate('market_data', 'name')
|
return $query->withAggregate('market_data', 'name')
|
||||||
->withAggregate('market_data', 'market_value')
|
->withAggregate('market_data', 'market_value')
|
||||||
->withAggregate('market_data', 'fifty_two_week_low')
|
->withAggregate('market_data', 'fifty_two_week_low')
|
||||||
->withAggregate('market_data', 'fifty_two_week_high')
|
->withAggregate('market_data', 'fifty_two_week_high')
|
||||||
->withAggregate('market_data', 'updated_at')
|
->withAggregate('market_data', 'updated_at')
|
||||||
->join('market_data', 'transactions.symbol', 'market_data.symbol');
|
->join('market_data', 'transactions.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);
|
||||||
@@ -128,7 +127,7 @@ class Transaction extends Model
|
|||||||
return $query->whereDate('date', '<=', $date);
|
return $query->whereDate('date', '<=', $date);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function scopeMyTransactions()
|
public function scopeMyTransactions()
|
||||||
{
|
{
|
||||||
return $this->whereHas('portfolio', function ($query) {
|
return $this->whereHas('portfolio', function ($query) {
|
||||||
$query->whereHas('users', function ($query) {
|
$query->whereHas('users', function ($query) {
|
||||||
@@ -137,7 +136,7 @@ class Transaction extends Model
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public function refreshMarketData()
|
public function refreshMarketData()
|
||||||
{
|
{
|
||||||
return MarketData::getMarketData($this->attributes['symbol']);
|
return MarketData::getMarketData($this->attributes['symbol']);
|
||||||
}
|
}
|
||||||
@@ -154,7 +153,7 @@ class Transaction extends Model
|
|||||||
'symbol' => $this->symbol,
|
'symbol' => $this->symbol,
|
||||||
'transaction_type' => 'BUY',
|
'transaction_type' => 'BUY',
|
||||||
])->whereDate('date', '<=', $this->date)
|
])->whereDate('date', '<=', $this->date)
|
||||||
->average('cost_basis');
|
->average('cost_basis');
|
||||||
|
|
||||||
$this->cost_basis = $average_cost_basis ?? 0;
|
$this->cost_basis = $average_cost_basis ?? 0;
|
||||||
|
|
||||||
@@ -166,7 +165,8 @@ class Transaction extends Model
|
|||||||
*
|
*
|
||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function syncToHolding() {
|
public function syncToHolding()
|
||||||
|
{
|
||||||
|
|
||||||
// if symbol name changed, sync previous symbol too
|
// if symbol name changed, sync previous symbol too
|
||||||
if (Arr::has($this->changes, 'symbol')) {
|
if (Arr::has($this->changes, 'symbol')) {
|
||||||
@@ -181,7 +181,7 @@ class Transaction extends Model
|
|||||||
// get the holding for a symbol and portfolio (or create one)
|
// get the holding for a symbol and portfolio (or create one)
|
||||||
Holding::firstOrNew([
|
Holding::firstOrNew([
|
||||||
'portfolio_id' => $this->portfolio_id,
|
'portfolio_id' => $this->portfolio_id,
|
||||||
'symbol' => $this->symbol
|
'symbol' => $this->symbol,
|
||||||
], [
|
], [
|
||||||
'portfolio_id' => $this->portfolio_id,
|
'portfolio_id' => $this->portfolio_id,
|
||||||
'symbol' => $this->symbol,
|
'symbol' => $this->symbol,
|
||||||
@@ -191,4 +191,4 @@ class Transaction extends Model
|
|||||||
'splits_synced_at' => now(),
|
'splits_synced_at' => now(),
|
||||||
])->syncTransactionsAndDividends();
|
])->syncTransactionsAndDividends();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+12
-12
@@ -3,27 +3,27 @@
|
|||||||
namespace App\Models;
|
namespace App\Models;
|
||||||
|
|
||||||
use App\Traits\HasConnectedAccounts;
|
use App\Traits\HasConnectedAccounts;
|
||||||
use Laravel\Sanctum\HasApiTokens;
|
use Illuminate\Contracts\Auth\MustVerifyEmail;
|
||||||
use Laravel\Jetstream\HasProfilePhoto;
|
|
||||||
use Illuminate\Notifications\Notifiable;
|
|
||||||
use Laravel\Fortify\TwoFactorAuthenticatable;
|
|
||||||
use Staudenmeir\EloquentHasManyDeep\HasManyDeep;
|
|
||||||
use Illuminate\Database\Eloquent\Concerns\HasUuids;
|
use Illuminate\Database\Eloquent\Concerns\HasUuids;
|
||||||
use Staudenmeir\EloquentHasManyDeep\HasRelationships;
|
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
use Illuminate\Foundation\Auth\User as Authenticatable;
|
use Illuminate\Foundation\Auth\User as Authenticatable;
|
||||||
use Illuminate\Contracts\Auth\MustVerifyEmail;
|
use Illuminate\Notifications\Notifiable;
|
||||||
|
use Laravel\Fortify\TwoFactorAuthenticatable;
|
||||||
|
use Laravel\Jetstream\HasProfilePhoto;
|
||||||
|
use Laravel\Sanctum\HasApiTokens;
|
||||||
|
use Staudenmeir\EloquentHasManyDeep\HasManyDeep;
|
||||||
|
use Staudenmeir\EloquentHasManyDeep\HasRelationships;
|
||||||
|
|
||||||
class User extends Authenticatable implements MustVerifyEmail
|
class User extends Authenticatable implements MustVerifyEmail
|
||||||
{
|
{
|
||||||
use HasApiTokens;
|
use HasApiTokens;
|
||||||
|
use HasConnectedAccounts;
|
||||||
use HasFactory;
|
use HasFactory;
|
||||||
use HasProfilePhoto;
|
use HasProfilePhoto;
|
||||||
|
use HasRelationships;
|
||||||
|
use HasUuids;
|
||||||
use Notifiable;
|
use Notifiable;
|
||||||
use TwoFactorAuthenticatable;
|
use TwoFactorAuthenticatable;
|
||||||
use HasUuids;
|
|
||||||
use HasRelationships;
|
|
||||||
use HasConnectedAccounts;
|
|
||||||
|
|
||||||
protected $fillable = [
|
protected $fillable = [
|
||||||
'name',
|
'name',
|
||||||
@@ -65,7 +65,7 @@ class User extends Authenticatable implements MustVerifyEmail
|
|||||||
{
|
{
|
||||||
return $this->hasManyDeep(Holding::class, ['portfolio_user', Portfolio::class])
|
return $this->hasManyDeep(Holding::class, ['portfolio_user', Portfolio::class])
|
||||||
->withMarketData()
|
->withMarketData()
|
||||||
->withPerformance();
|
->withPerformance();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function transactions(): HasManyDeep
|
public function transactions(): HasManyDeep
|
||||||
@@ -78,6 +78,6 @@ class User extends Authenticatable implements MustVerifyEmail
|
|||||||
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');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,9 +3,9 @@
|
|||||||
namespace App\Notifications;
|
namespace App\Notifications;
|
||||||
|
|
||||||
use Illuminate\Bus\Queueable;
|
use Illuminate\Bus\Queueable;
|
||||||
use Illuminate\Notifications\Notification;
|
|
||||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||||
use Illuminate\Notifications\Messages\MailMessage;
|
use Illuminate\Notifications\Messages\MailMessage;
|
||||||
|
use Illuminate\Notifications\Notification;
|
||||||
|
|
||||||
class ImportFailedNotification extends Notification implements ShouldQueue
|
class ImportFailedNotification extends Notification implements ShouldQueue
|
||||||
{
|
{
|
||||||
@@ -16,7 +16,7 @@ class ImportFailedNotification extends Notification implements ShouldQueue
|
|||||||
*/
|
*/
|
||||||
public function __construct(
|
public function __construct(
|
||||||
public string $errorMessage
|
public string $errorMessage
|
||||||
) { }
|
) {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the notification's delivery channels.
|
* Get the notification's delivery channels.
|
||||||
@@ -34,12 +34,12 @@ class ImportFailedNotification extends Notification implements ShouldQueue
|
|||||||
public function toMail(object $notifiable): MailMessage
|
public function toMail(object $notifiable): MailMessage
|
||||||
{
|
{
|
||||||
return (new MailMessage)
|
return (new MailMessage)
|
||||||
->greeting('Oh no!')
|
->greeting('Oh no!')
|
||||||
->subject("Your Investbrain import failed!")
|
->subject('Your Investbrain import failed!')
|
||||||
->line("Heads up, your Investbrain import was unable to successfully complete. There were errors which caused the import to fail.")
|
->line('Heads up, your Investbrain import was unable to successfully complete. There were errors which caused the import to fail.')
|
||||||
->action("Try again?", route('import-export'))
|
->action('Try again?', route('import-export'))
|
||||||
->line("**Technical details:**")
|
->line('**Technical details:**')
|
||||||
->line($this->errorMessage);
|
->line($this->errorMessage);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -2,12 +2,10 @@
|
|||||||
|
|
||||||
namespace App\Notifications;
|
namespace App\Notifications;
|
||||||
|
|
||||||
use App\Models\User;
|
|
||||||
use App\Models\Portfolio;
|
|
||||||
use Illuminate\Bus\Queueable;
|
use Illuminate\Bus\Queueable;
|
||||||
use Illuminate\Notifications\Notification;
|
|
||||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||||
use Illuminate\Notifications\Messages\MailMessage;
|
use Illuminate\Notifications\Messages\MailMessage;
|
||||||
|
use Illuminate\Notifications\Notification;
|
||||||
|
|
||||||
class ImportSucceededNotification extends Notification implements ShouldQueue
|
class ImportSucceededNotification extends Notification implements ShouldQueue
|
||||||
{
|
{
|
||||||
@@ -16,7 +14,7 @@ class ImportSucceededNotification extends Notification implements ShouldQueue
|
|||||||
/**
|
/**
|
||||||
* Create a new notification instance.
|
* Create a new notification instance.
|
||||||
*/
|
*/
|
||||||
public function __construct() { }
|
public function __construct() {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the notification's delivery channels.
|
* Get the notification's delivery channels.
|
||||||
@@ -34,10 +32,10 @@ class ImportSucceededNotification extends Notification implements ShouldQueue
|
|||||||
public function toMail(object $notifiable): MailMessage
|
public function toMail(object $notifiable): MailMessage
|
||||||
{
|
{
|
||||||
return (new MailMessage)
|
return (new MailMessage)
|
||||||
->greeting('Woot! 🎉')
|
->greeting('Woot! 🎉')
|
||||||
->subject("Your Investbrain import was successful!")
|
->subject('Your Investbrain import was successful!')
|
||||||
->line("Just a heads up that your Investbrain import succeeded! Your portfolios, transactions, and daily changes are now available in your account.")
|
->line('Just a heads up that your Investbrain import succeeded! Your portfolios, transactions, and daily changes are now available in your account.')
|
||||||
->action("Get Started", route('dashboard'));
|
->action('Get Started', route('dashboard'));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -2,12 +2,12 @@
|
|||||||
|
|
||||||
namespace App\Notifications;
|
namespace App\Notifications;
|
||||||
|
|
||||||
use App\Models\User;
|
|
||||||
use App\Models\Portfolio;
|
use App\Models\Portfolio;
|
||||||
|
use App\Models\User;
|
||||||
use Illuminate\Bus\Queueable;
|
use Illuminate\Bus\Queueable;
|
||||||
use Illuminate\Notifications\Notification;
|
|
||||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||||
use Illuminate\Notifications\Messages\MailMessage;
|
use Illuminate\Notifications\Messages\MailMessage;
|
||||||
|
use Illuminate\Notifications\Notification;
|
||||||
|
|
||||||
class InvitedOnboardingNotification extends Notification implements ShouldQueue
|
class InvitedOnboardingNotification extends Notification implements ShouldQueue
|
||||||
{
|
{
|
||||||
@@ -19,7 +19,7 @@ class InvitedOnboardingNotification extends Notification implements ShouldQueue
|
|||||||
public function __construct(
|
public function __construct(
|
||||||
public Portfolio $portfolio,
|
public Portfolio $portfolio,
|
||||||
public User $sender,
|
public User $sender,
|
||||||
) { }
|
) {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the notification's delivery channels.
|
* Get the notification's delivery channels.
|
||||||
@@ -40,14 +40,14 @@ class InvitedOnboardingNotification extends Notification implements ShouldQueue
|
|||||||
$url = url()->signedRoute('invited_onboarding', ['portfolio' => $this->portfolio->id, 'user' => $notifiable->id], now()->addDays(90));
|
$url = url()->signedRoute('invited_onboarding', ['portfolio' => $this->portfolio->id, 'user' => $notifiable->id], now()->addDays(90));
|
||||||
|
|
||||||
return (new MailMessage)
|
return (new MailMessage)
|
||||||
->replyTo($this->sender->email, $this->sender->name)
|
->replyTo($this->sender->email, $this->sender->name)
|
||||||
->greeting('Hey there! 👋')
|
->greeting('Hey there! 👋')
|
||||||
->subject("You've been invited to {$this->portfolio->title} on Investbrain!")
|
->subject("You've been invited to {$this->portfolio->title} on Investbrain!")
|
||||||
->line("{$this->sender->name} has invited you to **{$this->portfolio->title}** on Investbrain, a smart open-source investment tracker that consolidates and monitors market performance across your different brokerages.")
|
->line("{$this->sender->name} has invited you to **{$this->portfolio->title}** on Investbrain, a smart open-source investment tracker that consolidates and monitors market performance across your different brokerages.")
|
||||||
->line("Once you're in, you'll be able to see all the holdings, dividends, market performance and more for {$this->portfolio->title}!")
|
->line("Once you're in, you'll be able to see all the holdings, dividends, market performance and more for {$this->portfolio->title}!")
|
||||||
->action("Get Started", $url)
|
->action('Get Started', $url)
|
||||||
->line("If you have any questions, you can reply to this email.")
|
->line('If you have any questions, you can reply to this email.')
|
||||||
->salutation("See you there,\n". e($this->sender->name));
|
->salutation("See you there,\n".e($this->sender->name));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
namespace App\Notifications;
|
namespace App\Notifications;
|
||||||
|
|
||||||
use Illuminate\Bus\Queueable;
|
|
||||||
use App\Models\ConnectedAccount;
|
use App\Models\ConnectedAccount;
|
||||||
use Illuminate\Notifications\Notification;
|
use Illuminate\Bus\Queueable;
|
||||||
use Illuminate\Contracts\Queue\ShouldQueue;
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||||
use Illuminate\Notifications\Messages\MailMessage;
|
use Illuminate\Notifications\Messages\MailMessage;
|
||||||
|
use Illuminate\Notifications\Notification;
|
||||||
|
|
||||||
class VerifyConnectedAccountNotification extends Notification implements ShouldQueue
|
class VerifyConnectedAccountNotification extends Notification implements ShouldQueue
|
||||||
{
|
{
|
||||||
@@ -17,7 +17,7 @@ class VerifyConnectedAccountNotification extends Notification implements ShouldQ
|
|||||||
*/
|
*/
|
||||||
public function __construct(
|
public function __construct(
|
||||||
public string $connected_account_id
|
public string $connected_account_id
|
||||||
) { }
|
) {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the notification's delivery channels.
|
* Get the notification's delivery channels.
|
||||||
@@ -40,11 +40,11 @@ class VerifyConnectedAccountNotification extends Notification implements ShouldQ
|
|||||||
$url = url()->signedRoute('oauth.verify_connected_account', ['connected_account' => $this->connected_account_id], now()->days($days = 7));
|
$url = url()->signedRoute('oauth.verify_connected_account', ['connected_account' => $this->connected_account_id], now()->days($days = 7));
|
||||||
|
|
||||||
return (new MailMessage)
|
return (new MailMessage)
|
||||||
->greeting('Welcome back!')
|
->greeting('Welcome back!')
|
||||||
->subject("Connect your $provider account with Investbrain")
|
->subject("Connect your $provider account with Investbrain")
|
||||||
->line("You recently attempted to log into an existing Investbrain account using $provider. To safeguard your Investbrain account, please confirm this was you by pressing the 'Connect $provider' button below:")
|
->line("You recently attempted to log into an existing Investbrain account using $provider. To safeguard your Investbrain account, please confirm this was you by pressing the 'Connect $provider' button below:")
|
||||||
->action("Connect $provider", $url)
|
->action("Connect $provider", $url)
|
||||||
->line("If you do not recognize this activity, we recommend [changing your password](".route('profile.show').") as soon as possible. Otherwise, you can disregard this message. This link will expire in {$days} days.");
|
->line('If you do not recognize this activity, we recommend [changing your password]('.route('profile.show').") as soon as possible. Otherwise, you can disregard this message. This link will expire in {$days} days.");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -2,25 +2,18 @@
|
|||||||
|
|
||||||
namespace App\Policies;
|
namespace App\Policies;
|
||||||
|
|
||||||
use App\Models\User;
|
|
||||||
use App\Models\Portfolio;
|
use App\Models\Portfolio;
|
||||||
|
use App\Models\User;
|
||||||
|
|
||||||
class PortfolioPolicy
|
class PortfolioPolicy
|
||||||
{
|
{
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public function readOnly(User $user, Portfolio $portfolio)
|
public function readOnly(User $user, Portfolio $portfolio)
|
||||||
{
|
{
|
||||||
$pivot = $portfolio->users()->where('user_id', $user->id)->first();
|
$pivot = $portfolio->users()->where('user_id', $user->id)->first();
|
||||||
|
|
||||||
return !!$pivot;
|
return (bool) $pivot;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public function fullAccess(User $user, Portfolio $portfolio)
|
public function fullAccess(User $user, Portfolio $portfolio)
|
||||||
{
|
{
|
||||||
$pivot = $portfolio->users()->where('user_id', $user->id)->first();
|
$pivot = $portfolio->users()->where('user_id', $user->id)->first();
|
||||||
@@ -28,9 +21,6 @@ class PortfolioPolicy
|
|||||||
return $pivot && ($pivot->pivot->full_access || $pivot->pivot->owner);
|
return $pivot && ($pivot->pivot->full_access || $pivot->pivot->owner);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
public function owner(User $user, Portfolio $portfolio)
|
public function owner(User $user, Portfolio $portfolio)
|
||||||
{
|
{
|
||||||
$pivot = $portfolio->users()->where('user_id', $user->id)->first();
|
$pivot = $portfolio->users()->where('user_id', $user->id)->first();
|
||||||
|
|||||||
@@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
namespace App\Providers;
|
namespace App\Providers;
|
||||||
|
|
||||||
use Illuminate\Support\ServiceProvider;
|
|
||||||
use Illuminate\Http\Resources\Json\JsonResource;
|
use Illuminate\Http\Resources\Json\JsonResource;
|
||||||
|
use Illuminate\Support\ServiceProvider;
|
||||||
|
|
||||||
class AppServiceProvider extends ServiceProvider
|
class AppServiceProvider extends ServiceProvider
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -2,11 +2,11 @@
|
|||||||
|
|
||||||
namespace App\Providers;
|
namespace App\Providers;
|
||||||
|
|
||||||
use Illuminate\Support\Arr;
|
|
||||||
use Laravel\Jetstream\Features;
|
|
||||||
use App\Actions\Jetstream\DeleteUser;
|
use App\Actions\Jetstream\DeleteUser;
|
||||||
|
use Illuminate\Support\Arr;
|
||||||
use Illuminate\Support\Facades\Config;
|
use Illuminate\Support\Facades\Config;
|
||||||
use Illuminate\Support\ServiceProvider;
|
use Illuminate\Support\ServiceProvider;
|
||||||
|
use Laravel\Jetstream\Features;
|
||||||
use Laravel\Jetstream\Jetstream;
|
use Laravel\Jetstream\Jetstream;
|
||||||
|
|
||||||
class JetstreamServiceProvider extends ServiceProvider
|
class JetstreamServiceProvider extends ServiceProvider
|
||||||
@@ -29,7 +29,7 @@ class JetstreamServiceProvider extends ServiceProvider
|
|||||||
|
|
||||||
Jetstream::deleteUsersUsing(DeleteUser::class);
|
Jetstream::deleteUsersUsing(DeleteUser::class);
|
||||||
|
|
||||||
if ( config('investbrain.self_hosted', false) ) {
|
if (config('investbrain.self_hosted', false)) {
|
||||||
|
|
||||||
Config::set(
|
Config::set(
|
||||||
'jetstream.features',
|
'jetstream.features',
|
||||||
|
|||||||
@@ -13,24 +13,19 @@ class QuantityValidationRule implements ValidationRule
|
|||||||
* @return void
|
* @return void
|
||||||
*/
|
*/
|
||||||
public function __construct(
|
public function __construct(
|
||||||
protected ?Portfolio $portfolio,
|
protected ?Portfolio $portfolio,
|
||||||
protected ?string $symbol,
|
protected ?string $symbol,
|
||||||
protected ?string $transactionType,
|
protected ?string $transactionType,
|
||||||
protected ?string $date
|
protected ?string $date
|
||||||
) {
|
) {
|
||||||
$this->portfolio = $portfolio;
|
$this->portfolio = $portfolio;
|
||||||
$this->symbol = $symbol;
|
$this->symbol = $symbol;
|
||||||
$this->transactionType = $transactionType;
|
$this->transactionType = $transactionType;
|
||||||
$this->date = $date;
|
$this->date = $date;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Validate the attribute.
|
* Validate the attribute.
|
||||||
*
|
|
||||||
* @param string $attribute
|
|
||||||
* @param mixed $value
|
|
||||||
* @param \Closure $fail
|
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
||||||
{
|
{
|
||||||
@@ -42,17 +37,17 @@ class QuantityValidationRule implements ValidationRule
|
|||||||
if ($this->transactionType == 'SELL') {
|
if ($this->transactionType == 'SELL') {
|
||||||
|
|
||||||
$purchase_qty = $this->portfolio->transactions()
|
$purchase_qty = $this->portfolio->transactions()
|
||||||
->symbol($this->symbol)
|
->symbol($this->symbol)
|
||||||
->buy()
|
->buy()
|
||||||
->beforeDate($this->date)
|
->beforeDate($this->date)
|
||||||
->sum('quantity');
|
->sum('quantity');
|
||||||
|
|
||||||
$sales_qty = $this->portfolio->transactions()
|
$sales_qty = $this->portfolio->transactions()
|
||||||
->symbol($this->symbol)
|
->symbol($this->symbol)
|
||||||
->sell()
|
->sell()
|
||||||
->beforeDate($this->date)
|
->beforeDate($this->date)
|
||||||
->sum('quantity');
|
->sum('quantity');
|
||||||
|
|
||||||
$maxQuantity = $purchase_qty - $sales_qty;
|
$maxQuantity = $purchase_qty - $sales_qty;
|
||||||
|
|
||||||
if (round($value, 3) > round($maxQuantity, 3)) {
|
if (round($value, 3) > round($maxQuantity, 3)) {
|
||||||
|
|||||||
@@ -22,11 +22,6 @@ class SymbolValidationRule implements ValidationRule
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Validate the attribute.
|
* Validate the attribute.
|
||||||
*
|
|
||||||
* @param string $attribute
|
|
||||||
* @param mixed $value
|
|
||||||
* @param \Closure $fail
|
|
||||||
* @return void
|
|
||||||
*/
|
*/
|
||||||
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
public function validate(string $attribute, mixed $value, \Closure $fail): void
|
||||||
{
|
{
|
||||||
@@ -38,8 +33,8 @@ class SymbolValidationRule implements ValidationRule
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Check if the symbol exists in the Market Data table first (avoid API call)
|
// Check if the symbol exists in the Market Data table first (avoid API call)
|
||||||
if (!app(MarketDataInterface::class)->exists($value)) {
|
if (! app(MarketDataInterface::class)->exists($value)) {
|
||||||
$fail('The symbol provided (' . $this->symbol . ') is not valid');
|
$fail('The symbol provided ('.$this->symbol.') is not valid');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
// if (!function_exists('formatMoney')) {
|
// if (!function_exists('formatMoney')) {
|
||||||
// /**
|
// /**
|
||||||
// * Returns a formatted string for currency
|
// * Returns a formatted string for currency
|
||||||
|
|||||||
+10
-12
@@ -2,18 +2,16 @@
|
|||||||
|
|
||||||
namespace App\Support;
|
namespace App\Support;
|
||||||
|
|
||||||
use App\Models\Holding;
|
|
||||||
use App\Models\Portfolio;
|
|
||||||
use Illuminate\Http\Request;
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
class Spotlight
|
class Spotlight
|
||||||
{
|
{
|
||||||
public function search(Request $request)
|
public function search(Request $request)
|
||||||
{
|
{
|
||||||
|
|
||||||
$results = collect();
|
$results = collect();
|
||||||
|
|
||||||
if (!$request->user()) {
|
if (! $request->user()) {
|
||||||
|
|
||||||
return $results;
|
return $results;
|
||||||
}
|
}
|
||||||
@@ -22,13 +20,13 @@ class Spotlight
|
|||||||
->where('title', 'LIKE', '%'.$request->input('search').'%')
|
->where('title', 'LIKE', '%'.$request->input('search').'%')
|
||||||
->limit(5)
|
->limit(5)
|
||||||
->get();
|
->get();
|
||||||
$portfolios->each(function($portfolio) use ($results) {
|
$portfolios->each(function ($portfolio) use ($results) {
|
||||||
|
|
||||||
$results->push([
|
$results->push([
|
||||||
'name' => 'Portfolio: '. $portfolio->title,
|
'name' => 'Portfolio: '.$portfolio->title,
|
||||||
'description' => null,
|
'description' => null,
|
||||||
'link' => route('portfolio.show', ['portfolio' => $portfolio->id]),
|
'link' => route('portfolio.show', ['portfolio' => $portfolio->id]),
|
||||||
'avatar' => null
|
'avatar' => null,
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -36,20 +34,20 @@ class Spotlight
|
|||||||
->where('holdings.quantity', '>', 0)
|
->where('holdings.quantity', '>', 0)
|
||||||
->where(function ($query) use ($request) {
|
->where(function ($query) use ($request) {
|
||||||
return $query->where('holdings.symbol', 'LIKE', '%'.$request->input('search').'%')
|
return $query->where('holdings.symbol', 'LIKE', '%'.$request->input('search').'%')
|
||||||
->orWhere('market_data.name', 'LIKE', '%'.$request->input('search').'%');
|
->orWhere('market_data.name', 'LIKE', '%'.$request->input('search').'%');
|
||||||
})
|
})
|
||||||
->limit(5)
|
->limit(5)
|
||||||
->get();
|
->get();
|
||||||
$holdings->each(function($holding) use ($results) {
|
$holdings->each(function ($holding) use ($results) {
|
||||||
|
|
||||||
$results->push([
|
$results->push([
|
||||||
'name' => 'Holding: '.$holding->market_data->name.' ('.$holding->symbol.')',
|
'name' => 'Holding: '.$holding->market_data->name.' ('.$holding->symbol.')',
|
||||||
'description' => $holding->portfolio->title,
|
'description' => $holding->portfolio->title,
|
||||||
'link' => route('holding.show', ['portfolio' => $holding->portfolio->id, 'symbol' => $holding->symbol]),
|
'link' => route('holding.show', ['portfolio' => $holding->portfolio->id, 'symbol' => $holding->symbol]),
|
||||||
'avatar' => null
|
'avatar' => null,
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
|
||||||
return $results;
|
return $results;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
namespace App\Traits;
|
namespace App\Traits;
|
||||||
|
|
||||||
trait HasCompositePrimaryKey
|
trait HasCompositePrimaryKey
|
||||||
{
|
{
|
||||||
@@ -17,17 +17,18 @@ trait HasCompositePrimaryKey
|
|||||||
/**
|
/**
|
||||||
* Set the keys for a save update query.
|
* Set the keys for a save update query.
|
||||||
*
|
*
|
||||||
* @param \Illuminate\Database\Eloquent\Builder $query
|
* @param \Illuminate\Database\Eloquent\Builder $query
|
||||||
* @return \Illuminate\Database\Eloquent\Builder
|
* @return \Illuminate\Database\Eloquent\Builder
|
||||||
*/
|
*/
|
||||||
protected function setKeysForSaveQuery($query)
|
protected function setKeysForSaveQuery($query)
|
||||||
{
|
{
|
||||||
foreach ($this->getKeyName() as $key) {
|
foreach ($this->getKeyName() as $key) {
|
||||||
// UPDATE: Added isset() per devflow's comment.
|
// UPDATE: Added isset() per devflow's comment.
|
||||||
if (isset($this->$key))
|
if (isset($this->$key)) {
|
||||||
$query->where($key, '=', $this->$key);
|
$query->where($key, '=', $this->$key);
|
||||||
else
|
} else {
|
||||||
throw new \Exception(__METHOD__ . 'Missing part of the primary key: ' . $key);
|
throw new \Exception(__METHOD__.'Missing part of the primary key: '.$key);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return $query;
|
return $query;
|
||||||
@@ -37,7 +38,7 @@ trait HasCompositePrimaryKey
|
|||||||
/**
|
/**
|
||||||
* Execute a query for a single record by ID.
|
* Execute a query for a single record by ID.
|
||||||
*
|
*
|
||||||
* @param array $ids Array of keys, like [column => value].
|
* @param array $ids Array of keys, like [column => value].
|
||||||
* @param array $columns
|
* @param array $columns
|
||||||
* @return mixed|static
|
* @return mixed|static
|
||||||
*/
|
*/
|
||||||
@@ -48,6 +49,7 @@ trait HasCompositePrimaryKey
|
|||||||
foreach ($me->getKeyName() as $key) {
|
foreach ($me->getKeyName() as $key) {
|
||||||
$query->where($key, '=', $ids[$key]);
|
$query->where($key, '=', $ids[$key]);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $query->first($columns);
|
return $query->first($columns);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,9 +4,9 @@ namespace App\Traits;
|
|||||||
|
|
||||||
use App\Models\ConnectedAccount;
|
use App\Models\ConnectedAccount;
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
use Illuminate\Support\Str;
|
|
||||||
use Illuminate\Database\Eloquent\Collection;
|
use Illuminate\Database\Eloquent\Collection;
|
||||||
use Illuminate\Database\Eloquent\Relations\HasMany;
|
use Illuminate\Database\Eloquent\Relations\HasMany;
|
||||||
|
use Illuminate\Support\Str;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @property Collection $connectedAccounts
|
* @property Collection $connectedAccounts
|
||||||
@@ -63,4 +63,4 @@ trait HasConnectedAccounts
|
|||||||
{
|
{
|
||||||
return $this->hasMany(ConnectedAccount::class);
|
return $this->hasMany(ConnectedAccount::class);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,10 +13,10 @@ trait WithTrimStrings
|
|||||||
|
|
||||||
public function updatedWithTrimStrings(string $property, mixed $value): void
|
public function updatedWithTrimStrings(string $property, mixed $value): void
|
||||||
{
|
{
|
||||||
if (is_string($value) && !in_array($property, $this->trimExceptions())) {
|
if (is_string($value) && ! in_array($property, $this->trimExceptions())) {
|
||||||
$this->fill([
|
$this->fill([
|
||||||
$property => Str::trim($value),
|
$property => Str::trim($value),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ class MainLayout extends Component
|
|||||||
|
|
||||||
// Slots
|
// Slots
|
||||||
public mixed $body = null,
|
public mixed $body = null,
|
||||||
) { }
|
) {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the view / contents that represents the component.
|
* Get the view / contents that represents the component.
|
||||||
|
|||||||
+63
-63
@@ -15,7 +15,7 @@ return [
|
|||||||
| Here you can specify how big the chunk should be.
|
| Here you can specify how big the chunk should be.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
'chunk_size' => 1000,
|
'chunk_size' => 1000,
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
@@ -42,15 +42,15 @@ return [
|
|||||||
| Configure e.g. delimiter, enclosure and line ending for CSV exports.
|
| Configure e.g. delimiter, enclosure and line ending for CSV exports.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
'csv' => [
|
'csv' => [
|
||||||
'delimiter' => ',',
|
'delimiter' => ',',
|
||||||
'enclosure' => '"',
|
'enclosure' => '"',
|
||||||
'line_ending' => PHP_EOL,
|
'line_ending' => PHP_EOL,
|
||||||
'use_bom' => false,
|
'use_bom' => false,
|
||||||
'include_separator_line' => false,
|
'include_separator_line' => false,
|
||||||
'excel_compatibility' => false,
|
'excel_compatibility' => false,
|
||||||
'output_encoding' => '',
|
'output_encoding' => '',
|
||||||
'test_auto_detect' => true,
|
'test_auto_detect' => true,
|
||||||
],
|
],
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -61,20 +61,20 @@ return [
|
|||||||
| Configure e.g. default title, creator, subject,...
|
| Configure e.g. default title, creator, subject,...
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
'properties' => [
|
'properties' => [
|
||||||
'creator' => '',
|
'creator' => '',
|
||||||
'lastModifiedBy' => '',
|
'lastModifiedBy' => '',
|
||||||
'title' => '',
|
'title' => '',
|
||||||
'description' => '',
|
'description' => '',
|
||||||
'subject' => '',
|
'subject' => '',
|
||||||
'keywords' => '',
|
'keywords' => '',
|
||||||
'category' => '',
|
'category' => '',
|
||||||
'manager' => '',
|
'manager' => '',
|
||||||
'company' => '',
|
'company' => '',
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
|
|
||||||
'imports' => [
|
'imports' => [
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
@@ -87,7 +87,7 @@ return [
|
|||||||
| you can enable it by setting read_only to false.
|
| you can enable it by setting read_only to false.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
'read_only' => true,
|
'read_only' => true,
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
@@ -111,7 +111,7 @@ return [
|
|||||||
| Available options: none|slug|custom
|
| Available options: none|slug|custom
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
'heading_row' => [
|
'heading_row' => [
|
||||||
'formatter' => 'slug',
|
'formatter' => 'slug',
|
||||||
],
|
],
|
||||||
|
|
||||||
@@ -123,12 +123,12 @@ return [
|
|||||||
| Configure e.g. delimiter, enclosure and line ending for CSV imports.
|
| Configure e.g. delimiter, enclosure and line ending for CSV imports.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
'csv' => [
|
'csv' => [
|
||||||
'delimiter' => null,
|
'delimiter' => null,
|
||||||
'enclosure' => '"',
|
'enclosure' => '"',
|
||||||
'escape_character' => '\\',
|
'escape_character' => '\\',
|
||||||
'contiguous' => false,
|
'contiguous' => false,
|
||||||
'input_encoding' => Csv::GUESS_ENCODING,
|
'input_encoding' => Csv::GUESS_ENCODING,
|
||||||
],
|
],
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -139,16 +139,16 @@ return [
|
|||||||
| Configure e.g. default title, creator, subject,...
|
| Configure e.g. default title, creator, subject,...
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
'properties' => [
|
'properties' => [
|
||||||
'creator' => '',
|
'creator' => '',
|
||||||
'lastModifiedBy' => '',
|
'lastModifiedBy' => '',
|
||||||
'title' => '',
|
'title' => '',
|
||||||
'description' => '',
|
'description' => '',
|
||||||
'subject' => '',
|
'subject' => '',
|
||||||
'keywords' => '',
|
'keywords' => '',
|
||||||
'category' => '',
|
'category' => '',
|
||||||
'manager' => '',
|
'manager' => '',
|
||||||
'company' => '',
|
'company' => '',
|
||||||
],
|
],
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -159,10 +159,10 @@ return [
|
|||||||
| Configure middleware that is executed on getting a cell value
|
| Configure middleware that is executed on getting a cell value
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
'cells' => [
|
'cells' => [
|
||||||
'middleware' => [
|
'middleware' => [
|
||||||
//\Maatwebsite\Excel\Middleware\TrimCellValue::class,
|
// \Maatwebsite\Excel\Middleware\TrimCellValue::class,
|
||||||
//\Maatwebsite\Excel\Middleware\ConvertEmptyCellValuesToNull::class,
|
// \Maatwebsite\Excel\Middleware\ConvertEmptyCellValuesToNull::class,
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
|
|
||||||
@@ -178,21 +178,21 @@ return [
|
|||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
'extension_detector' => [
|
'extension_detector' => [
|
||||||
'xlsx' => Excel::XLSX,
|
'xlsx' => Excel::XLSX,
|
||||||
'xlsm' => Excel::XLSX,
|
'xlsm' => Excel::XLSX,
|
||||||
'xltx' => Excel::XLSX,
|
'xltx' => Excel::XLSX,
|
||||||
'xltm' => Excel::XLSX,
|
'xltm' => Excel::XLSX,
|
||||||
'xls' => Excel::XLS,
|
'xls' => Excel::XLS,
|
||||||
'xlt' => Excel::XLS,
|
'xlt' => Excel::XLS,
|
||||||
'ods' => Excel::ODS,
|
'ods' => Excel::ODS,
|
||||||
'ots' => Excel::ODS,
|
'ots' => Excel::ODS,
|
||||||
'slk' => Excel::SLK,
|
'slk' => Excel::SLK,
|
||||||
'xml' => Excel::XML,
|
'xml' => Excel::XML,
|
||||||
'gnumeric' => Excel::GNUMERIC,
|
'gnumeric' => Excel::GNUMERIC,
|
||||||
'htm' => Excel::HTML,
|
'htm' => Excel::HTML,
|
||||||
'html' => Excel::HTML,
|
'html' => Excel::HTML,
|
||||||
'csv' => Excel::CSV,
|
'csv' => Excel::CSV,
|
||||||
'tsv' => Excel::TSV,
|
'tsv' => Excel::TSV,
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
@@ -203,7 +203,7 @@ return [
|
|||||||
| Available options: Excel::MPDF | Excel::TCPDF | Excel::DOMPDF
|
| Available options: Excel::MPDF | Excel::TCPDF | Excel::DOMPDF
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
'pdf' => Excel::DOMPDF,
|
'pdf' => Excel::DOMPDF,
|
||||||
],
|
],
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -223,11 +223,11 @@ return [
|
|||||||
| [x] PhpOffice\PhpSpreadsheet\Cell\AdvancedValueBinder::class
|
| [x] PhpOffice\PhpSpreadsheet\Cell\AdvancedValueBinder::class
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
'value_binder' => [
|
'value_binder' => [
|
||||||
'default' => Maatwebsite\Excel\DefaultValueBinder::class,
|
'default' => Maatwebsite\Excel\DefaultValueBinder::class,
|
||||||
],
|
],
|
||||||
|
|
||||||
'cache' => [
|
'cache' => [
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
| Default cell caching driver
|
| Default cell caching driver
|
||||||
@@ -244,7 +244,7 @@ return [
|
|||||||
| Drivers: memory|illuminate|batch
|
| Drivers: memory|illuminate|batch
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
'driver' => 'memory',
|
'driver' => 'memory',
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
@@ -256,7 +256,7 @@ return [
|
|||||||
| Here you can tweak the memory limit to your liking.
|
| Here you can tweak the memory limit to your liking.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
'batch' => [
|
'batch' => [
|
||||||
'memory_limit' => 60000,
|
'memory_limit' => 60000,
|
||||||
],
|
],
|
||||||
|
|
||||||
@@ -272,7 +272,7 @@ return [
|
|||||||
| at "null" it will use the default store.
|
| at "null" it will use the default store.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
'illuminate' => [
|
'illuminate' => [
|
||||||
'store' => null,
|
'store' => null,
|
||||||
],
|
],
|
||||||
|
|
||||||
@@ -308,7 +308,7 @@ return [
|
|||||||
*/
|
*/
|
||||||
'transactions' => [
|
'transactions' => [
|
||||||
'handler' => 'db',
|
'handler' => 'db',
|
||||||
'db' => [
|
'db' => [
|
||||||
'connection' => null,
|
'connection' => null,
|
||||||
],
|
],
|
||||||
],
|
],
|
||||||
@@ -326,7 +326,7 @@ return [
|
|||||||
| and the create file (file).
|
| and the create file (file).
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
'local_path' => storage_path('framework/cache/laravel-excel'),
|
'local_path' => storage_path('framework/cache/laravel-excel'),
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
@@ -338,7 +338,7 @@ return [
|
|||||||
| If omitted the default permissions of the filesystem will be used.
|
| If omitted the default permissions of the filesystem will be used.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
'local_permissions' => [
|
'local_permissions' => [
|
||||||
// 'dir' => 0755,
|
// 'dir' => 0755,
|
||||||
// 'file' => 0644,
|
// 'file' => 0644,
|
||||||
],
|
],
|
||||||
@@ -357,8 +357,8 @@ return [
|
|||||||
| in conjunction with queued imports and exports.
|
| in conjunction with queued imports and exports.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
'remote_disk' => env('TEMP_UPLOAD_DISK', null),
|
'remote_disk' => env('TEMP_UPLOAD_DISK', null),
|
||||||
'remote_prefix' => 'excel-tmp',
|
'remote_prefix' => 'excel-tmp',
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|||||||
@@ -15,5 +15,5 @@ return [
|
|||||||
|
|
||||||
'self_hosted' => env('SELF_HOSTED', true),
|
'self_hosted' => env('SELF_HOSTED', true),
|
||||||
|
|
||||||
'daily_change_time_of_day' => env('DAILY_CHANGE_TIME', '23:00')
|
'daily_change_time_of_day' => env('DAILY_CHANGE_TIME', '23:00'),
|
||||||
];
|
];
|
||||||
|
|||||||
+2
-3
@@ -13,7 +13,6 @@ return [
|
|||||||
* prefix => 'mary-'
|
* prefix => 'mary-'
|
||||||
* <x-mary-button />
|
* <x-mary-button />
|
||||||
* <x-mary-card />
|
* <x-mary-card />
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
'prefix' => '',
|
'prefix' => '',
|
||||||
|
|
||||||
@@ -40,6 +39,6 @@ return [
|
|||||||
'components' => [
|
'components' => [
|
||||||
'spotlight' => [
|
'spotlight' => [
|
||||||
'class' => 'App\Support\Spotlight',
|
'class' => 'App\Support\Spotlight',
|
||||||
]
|
],
|
||||||
]
|
],
|
||||||
];
|
];
|
||||||
|
|||||||
+5
-5
@@ -41,7 +41,7 @@ return [
|
|||||||
'redirect' => '/auth/github/callback',
|
'redirect' => '/auth/github/callback',
|
||||||
'logo' => 'github-icon',
|
'logo' => 'github-icon',
|
||||||
'color' => '#393939',
|
'color' => '#393939',
|
||||||
'name' => 'GitHub'
|
'name' => 'GitHub',
|
||||||
],
|
],
|
||||||
|
|
||||||
'google' => [
|
'google' => [
|
||||||
@@ -49,7 +49,7 @@ return [
|
|||||||
'client_secret' => env('GOOGLE_CLIENT_SECRET'),
|
'client_secret' => env('GOOGLE_CLIENT_SECRET'),
|
||||||
'redirect' => '/auth/google/callback',
|
'redirect' => '/auth/google/callback',
|
||||||
'color' => '#4285F4',
|
'color' => '#4285F4',
|
||||||
'name' => 'Google'
|
'name' => 'Google',
|
||||||
],
|
],
|
||||||
|
|
||||||
'facebook' => [
|
'facebook' => [
|
||||||
@@ -57,7 +57,7 @@ return [
|
|||||||
'client_secret' => env('FACEBOOK_CLIENT_SECRET'),
|
'client_secret' => env('FACEBOOK_CLIENT_SECRET'),
|
||||||
'redirect' => '/auth/facebook/callback',
|
'redirect' => '/auth/facebook/callback',
|
||||||
'color' => '#0165E1',
|
'color' => '#0165E1',
|
||||||
'name' => 'Facebook'
|
'name' => 'Facebook',
|
||||||
],
|
],
|
||||||
|
|
||||||
'linkedin-openid' => [
|
'linkedin-openid' => [
|
||||||
@@ -65,10 +65,10 @@ return [
|
|||||||
'client_secret' => env('LINKEDIN_CLIENT_SECRET'),
|
'client_secret' => env('LINKEDIN_CLIENT_SECRET'),
|
||||||
'redirect' => '/auth/linkedin-openid/callback',
|
'redirect' => '/auth/linkedin-openid/callback',
|
||||||
'color' => '#0a66c2',
|
'color' => '#0a66c2',
|
||||||
'name' => 'Linkedin'
|
'name' => 'Linkedin',
|
||||||
],
|
],
|
||||||
|
|
||||||
//
|
//
|
||||||
'enabled_login_providers' => env('ENABLED_LOGIN_PROVIDERS', ''),
|
'enabled_login_providers' => env('ENABLED_LOGIN_PROVIDERS', ''),
|
||||||
'ai_chat_enabled' => env('AI_CHAT_ENABLED', false)
|
'ai_chat_enabled' => env('AI_CHAT_ENABLED', false),
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ use Illuminate\Database\Eloquent\Factories\Factory;
|
|||||||
*/
|
*/
|
||||||
class TransactionFactory extends Factory
|
class TransactionFactory extends Factory
|
||||||
{
|
{
|
||||||
protected static ?string $transaction_type;
|
protected static ?string $transaction_type;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Define the model's default state.
|
* Define the model's default state.
|
||||||
@@ -24,15 +24,15 @@ class TransactionFactory extends Factory
|
|||||||
return [
|
return [
|
||||||
'symbol' => $this->faker->randomElement(['AAPL', 'GOOG', 'AMZN']),
|
'symbol' => $this->faker->randomElement(['AAPL', 'GOOG', 'AMZN']),
|
||||||
'transaction_type' => $transaction_type,
|
'transaction_type' => $transaction_type,
|
||||||
'portfolio_id' => Portfolio::factory()->create()->id,
|
'portfolio_id' => Portfolio::factory()->create()->id,
|
||||||
'date' => $this->faker->date('Y-m-d'),
|
'date' => $this->faker->date('Y-m-d'),
|
||||||
'quantity' => 1,
|
'quantity' => 1,
|
||||||
'cost_basis' => $transaction_type == 'BUY'
|
'cost_basis' => $transaction_type == 'BUY'
|
||||||
? $this->faker->randomFloat(2, 10, 500)
|
? $this->faker->randomFloat(2, 10, 500)
|
||||||
: null,
|
: null,
|
||||||
'sale_price' => $transaction_type == 'SELL'
|
'sale_price' => $transaction_type == 'SELL'
|
||||||
? $this->faker->randomFloat(2, 10, 500)
|
? $this->faker->randomFloat(2, 10, 500)
|
||||||
: null,
|
: null,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -83,7 +83,7 @@ class TransactionFactory extends Factory
|
|||||||
return $this->state(fn (array $attributes) => [
|
return $this->state(fn (array $attributes) => [
|
||||||
'transaction_type' => 'BUY',
|
'transaction_type' => 'BUY',
|
||||||
'cost_basis' => $this->faker->randomFloat(2, 10, 500),
|
'cost_basis' => $this->faker->randomFloat(2, 10, 500),
|
||||||
'sale_price' => null
|
'sale_price' => null,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ class UserFactory extends Factory
|
|||||||
'two_factor_secret' => null,
|
'two_factor_secret' => null,
|
||||||
'two_factor_recovery_codes' => null,
|
'two_factor_recovery_codes' => null,
|
||||||
'remember_token' => Str::random(10),
|
'remember_token' => Str::random(10),
|
||||||
'profile_photo_path' => null
|
'profile_photo_path' => null,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ return new class extends Migration
|
|||||||
public function up(): void
|
public function up(): void
|
||||||
{
|
{
|
||||||
Schema::create('users', function (Blueprint $table) {
|
Schema::create('users', function (Blueprint $table) {
|
||||||
$table->uuid('id')->primary();
|
$table->uuid('id')->primary();
|
||||||
$table->string('name');
|
$table->string('name');
|
||||||
$table->string('email')->unique();
|
$table->string('email')->unique();
|
||||||
$table->timestamp('email_verified_at')->nullable();
|
$table->timestamp('email_verified_at')->nullable();
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ return new class extends Migration
|
|||||||
public function up()
|
public function up()
|
||||||
{
|
{
|
||||||
Schema::create('portfolios', function (Blueprint $table) {
|
Schema::create('portfolios', function (Blueprint $table) {
|
||||||
$table->uuid('id')->primary();
|
$table->uuid('id')->primary();
|
||||||
$table->string('title');
|
$table->string('title');
|
||||||
$table->text('notes')->nullable();
|
$table->text('notes')->nullable();
|
||||||
$table->boolean('wishlist')->default(false);
|
$table->boolean('wishlist')->default(false);
|
||||||
@@ -31,4 +31,4 @@ return new class extends Migration
|
|||||||
{
|
{
|
||||||
Schema::dropIfExists('portfolios');
|
Schema::dropIfExists('portfolios');
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use App\Models\User;
|
|
||||||
use App\Models\Portfolio;
|
use App\Models\Portfolio;
|
||||||
use Illuminate\Support\Facades\Schema;
|
use App\Models\User;
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
|
||||||
use Illuminate\Database\Migrations\Migration;
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
return new class extends Migration
|
return new class extends Migration
|
||||||
{
|
{
|
||||||
@@ -34,4 +34,4 @@ return new class extends Migration
|
|||||||
{
|
{
|
||||||
Schema::dropIfExists('portfolio_user');
|
Schema::dropIfExists('portfolio_user');
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use Database\Seeders\MarketDataSeeder;
|
use Database\Seeders\MarketDataSeeder;
|
||||||
use Illuminate\Support\Facades\Schema;
|
|
||||||
use Illuminate\Support\Facades\Artisan;
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
|
||||||
use Illuminate\Database\Migrations\Migration;
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Artisan;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
class CreateMarketDataTable extends Migration
|
class CreateMarketDataTable extends Migration
|
||||||
{
|
{
|
||||||
@@ -34,7 +34,7 @@ class CreateMarketDataTable extends Migration
|
|||||||
|
|
||||||
Artisan::call('db:seed', [
|
Artisan::call('db:seed', [
|
||||||
'--class' => MarketDataSeeder::class,
|
'--class' => MarketDataSeeder::class,
|
||||||
'--force' => true
|
'--force' => true,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use App\Models\Portfolio;
|
use App\Models\Portfolio;
|
||||||
use Illuminate\Support\Facades\Schema;
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
|
||||||
use Illuminate\Database\Migrations\Migration;
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
class CreateDailyChangeTable extends Migration
|
class CreateDailyChangeTable extends Migration
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ class CreateDividendsTable extends Migration
|
|||||||
public function up()
|
public function up()
|
||||||
{
|
{
|
||||||
Schema::create('dividends', function (Blueprint $table) {
|
Schema::create('dividends', function (Blueprint $table) {
|
||||||
$table->uuid('id')->primary();
|
$table->uuid('id')->primary();
|
||||||
$table->date('date');
|
$table->date('date');
|
||||||
$table->foreignIdFor(MarketData::class, 'symbol');
|
$table->foreignIdFor(MarketData::class, 'symbol');
|
||||||
$table->float('dividend_amount', 12, 4);
|
$table->float('dividend_amount', 12, 4);
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use App\Models\MarketData;
|
use App\Models\MarketData;
|
||||||
use Illuminate\Support\Facades\Schema;
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
|
||||||
use Illuminate\Database\Migrations\Migration;
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
class CreateSplitsTable extends Migration
|
class CreateSplitsTable extends Migration
|
||||||
{
|
{
|
||||||
@@ -15,7 +15,7 @@ class CreateSplitsTable extends Migration
|
|||||||
public function up()
|
public function up()
|
||||||
{
|
{
|
||||||
Schema::create('splits', function (Blueprint $table) {
|
Schema::create('splits', function (Blueprint $table) {
|
||||||
$table->uuid('id')->primary();
|
$table->uuid('id')->primary();
|
||||||
$table->date('date');
|
$table->date('date');
|
||||||
$table->foreignIdFor(MarketData::class, 'symbol');
|
$table->foreignIdFor(MarketData::class, 'symbol');
|
||||||
$table->float('split_amount', 12, 4);
|
$table->float('split_amount', 12, 4);
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use App\Models\Portfolio;
|
|
||||||
use App\Models\MarketData;
|
use App\Models\MarketData;
|
||||||
use Illuminate\Support\Facades\Schema;
|
use App\Models\Portfolio;
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
|
||||||
use Illuminate\Database\Migrations\Migration;
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
class CreateTransactionsTable extends Migration
|
class CreateTransactionsTable extends Migration
|
||||||
{
|
{
|
||||||
@@ -16,7 +16,7 @@ class CreateTransactionsTable extends Migration
|
|||||||
public function up()
|
public function up()
|
||||||
{
|
{
|
||||||
Schema::create('transactions', function (Blueprint $table) {
|
Schema::create('transactions', function (Blueprint $table) {
|
||||||
$table->uuid('id')->primary();
|
$table->uuid('id')->primary();
|
||||||
$table->foreignIdFor(MarketData::class, 'symbol');
|
$table->foreignIdFor(MarketData::class, 'symbol');
|
||||||
$table->foreignIdFor(Portfolio::class, 'portfolio_id')->constrained()->onDelete('cascade');
|
$table->foreignIdFor(Portfolio::class, 'portfolio_id')->constrained()->onDelete('cascade');
|
||||||
$table->string('transaction_type', 15);
|
$table->string('transaction_type', 15);
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use App\Models\Portfolio;
|
|
||||||
use App\Models\MarketData;
|
use App\Models\MarketData;
|
||||||
use Illuminate\Support\Facades\Schema;
|
use App\Models\Portfolio;
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
|
||||||
use Illuminate\Database\Migrations\Migration;
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
class CreateHoldingsTable extends Migration
|
class CreateHoldingsTable extends Migration
|
||||||
{
|
{
|
||||||
@@ -16,7 +16,7 @@ class CreateHoldingsTable extends Migration
|
|||||||
public function up()
|
public function up()
|
||||||
{
|
{
|
||||||
Schema::create('holdings', function (Blueprint $table) {
|
Schema::create('holdings', function (Blueprint $table) {
|
||||||
$table->uuid('id')->primary();
|
$table->uuid('id')->primary();
|
||||||
$table->foreignIdFor(Portfolio::class, 'portfolio_id')->constrained()->onDelete('cascade');
|
$table->foreignIdFor(Portfolio::class, 'portfolio_id')->constrained()->onDelete('cascade');
|
||||||
$table->foreignIdFor(MarketData::class, 'symbol');
|
$table->foreignIdFor(MarketData::class, 'symbol');
|
||||||
$table->float('quantity', 12, 4);
|
$table->float('quantity', 12, 4);
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
use Illuminate\Support\Facades\Schema;
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
|
||||||
use Illuminate\Database\Migrations\Migration;
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
return new class extends Migration
|
return new class extends Migration
|
||||||
{
|
{
|
||||||
@@ -41,4 +41,4 @@ return new class extends Migration
|
|||||||
|
|
||||||
Schema::dropIfExists('connected_accounts');
|
Schema::dropIfExists('connected_accounts');
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
use Illuminate\Support\Facades\Schema;
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
|
||||||
use Illuminate\Database\Migrations\Migration;
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
return new class extends Migration
|
return new class extends Migration
|
||||||
{
|
{
|
||||||
@@ -31,4 +31,4 @@ return new class extends Migration
|
|||||||
{
|
{
|
||||||
Schema::dropIfExists('backup_import_jobs');
|
Schema::dropIfExists('backup_import_jobs');
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use App\Models\User;
|
use App\Models\User;
|
||||||
use Illuminate\Support\Facades\Schema;
|
|
||||||
use Illuminate\Database\Schema\Builder;
|
|
||||||
use Illuminate\Database\Schema\Blueprint;
|
|
||||||
use Illuminate\Database\Migrations\Migration;
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Database\Schema\Builder;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
class CreateAiChatsTable extends Migration
|
class CreateAiChatsTable extends Migration
|
||||||
{
|
{
|
||||||
@@ -18,7 +18,7 @@ class CreateAiChatsTable extends Migration
|
|||||||
Builder::morphUsingUuids();
|
Builder::morphUsingUuids();
|
||||||
|
|
||||||
Schema::create('ai_chats', function (Blueprint $table) {
|
Schema::create('ai_chats', function (Blueprint $table) {
|
||||||
$table->uuid('id')->primary();
|
$table->uuid('id')->primary();
|
||||||
$table->foreignIdFor(User::class, 'user_id')->constrained()->onDelete('cascade');
|
$table->foreignIdFor(User::class, 'user_id')->constrained()->onDelete('cascade');
|
||||||
$table->morphs('chatable');
|
$table->morphs('chatable');
|
||||||
$table->string('role');
|
$table->string('role');
|
||||||
|
|||||||
@@ -2,9 +2,9 @@
|
|||||||
|
|
||||||
namespace Database\Seeders;
|
namespace Database\Seeders;
|
||||||
|
|
||||||
|
use Illuminate\Database\Console\Seeds\WithoutModelEvents;
|
||||||
use Illuminate\Database\Seeder;
|
use Illuminate\Database\Seeder;
|
||||||
use Illuminate\Support\Facades\DB;
|
use Illuminate\Support\Facades\DB;
|
||||||
use Illuminate\Database\Console\Seeds\WithoutModelEvents;
|
|
||||||
|
|
||||||
class MarketDataSeeder extends Seeder
|
class MarketDataSeeder extends Seeder
|
||||||
{
|
{
|
||||||
@@ -14,7 +14,7 @@ class MarketDataSeeder extends Seeder
|
|||||||
* Run the database seeds.
|
* Run the database seeds.
|
||||||
*/
|
*/
|
||||||
public function run(): void
|
public function run(): void
|
||||||
{
|
{
|
||||||
$chunkSize = 500;
|
$chunkSize = 500;
|
||||||
|
|
||||||
// Path to the CSV file
|
// Path to the CSV file
|
||||||
@@ -29,7 +29,7 @@ class MarketDataSeeder extends Seeder
|
|||||||
|
|
||||||
while (($row = fgetcsv($handle, 0, ',')) !== false) {
|
while (($row = fgetcsv($handle, 0, ',')) !== false) {
|
||||||
|
|
||||||
if (!$header) {
|
if (! $header) {
|
||||||
|
|
||||||
// header must be the first row
|
// header must be the first row
|
||||||
$header = $row;
|
$header = $row;
|
||||||
@@ -40,31 +40,31 @@ class MarketDataSeeder extends Seeder
|
|||||||
$data = array_combine($header, $row);
|
$data = array_combine($header, $row);
|
||||||
|
|
||||||
$rows[] = [
|
$rows[] = [
|
||||||
'symbol' => $data['symbol'],
|
'symbol' => $data['symbol'],
|
||||||
'name' => $data['name'],
|
'name' => $data['name'],
|
||||||
'meta_data' => json_encode([
|
'meta_data' => json_encode([
|
||||||
'country' => $data['country'],
|
'country' => $data['country'],
|
||||||
'first_trade_year' => $data['first_trade_year'],
|
'first_trade_year' => $data['first_trade_year'],
|
||||||
'sector' => $data['sector'],
|
'sector' => $data['sector'],
|
||||||
'industry' => $data['industry'],
|
'industry' => $data['industry'],
|
||||||
]),
|
]),
|
||||||
];
|
];
|
||||||
|
|
||||||
$rowCount++;
|
$rowCount++;
|
||||||
|
|
||||||
if ($rowCount % $chunkSize == 0) {
|
if ($rowCount % $chunkSize == 0) {
|
||||||
DB::table('market_data')->insertOrIgnore($rows);
|
DB::table('market_data')->insertOrIgnore($rows);
|
||||||
$rows = [];
|
$rows = [];
|
||||||
}
|
}
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
|
|
||||||
throw new \Exception('Error: '. $e->getMessage());
|
throw new \Exception('Error: '.$e->getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// final clean up
|
// final clean up
|
||||||
if (!empty($rows)) {
|
if (! empty($rows)) {
|
||||||
DB::table('market_data')->insertOrIgnore($rows);
|
DB::table('market_data')->insertOrIgnore($rows);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+4
-4
@@ -1,11 +1,11 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use Illuminate\Support\Facades\Route;
|
|
||||||
use App\Http\ApiControllers\UserController;
|
|
||||||
use App\Http\ApiControllers\HoldingController;
|
use App\Http\ApiControllers\HoldingController;
|
||||||
use App\Http\ApiControllers\PortfolioController;
|
|
||||||
use App\Http\ApiControllers\MarketDataController;
|
use App\Http\ApiControllers\MarketDataController;
|
||||||
|
use App\Http\ApiControllers\PortfolioController;
|
||||||
use App\Http\ApiControllers\TransactionController;
|
use App\Http\ApiControllers\TransactionController;
|
||||||
|
use App\Http\ApiControllers\UserController;
|
||||||
|
use Illuminate\Support\Facades\Route;
|
||||||
|
|
||||||
Route::middleware(['auth:sanctum'])->name('api.')->group(function () {
|
Route::middleware(['auth:sanctum'])->name('api.')->group(function () {
|
||||||
|
|
||||||
@@ -25,4 +25,4 @@ Route::middleware(['auth:sanctum'])->name('api.')->group(function () {
|
|||||||
|
|
||||||
// market data
|
// market data
|
||||||
Route::get('/market-data/{symbol}', [MarketDataController::class, 'show'])->name('market-data.show');
|
Route::get('/market-data/{symbol}', [MarketDataController::class, 'show'])->name('market-data.show');
|
||||||
});
|
});
|
||||||
|
|||||||
+5
-6
@@ -1,35 +1,34 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
use App\Console\Commands\CaptureDailyChange;
|
||||||
|
use App\Console\Commands\RefreshDividendData;
|
||||||
|
use App\Console\Commands\RefreshMarketData;
|
||||||
|
use App\Console\Commands\RefreshSplitData;
|
||||||
|
use App\Console\Commands\SyncHoldingData;
|
||||||
use Illuminate\Support\Facades\Schedule;
|
use Illuminate\Support\Facades\Schedule;
|
||||||
use App\Console\Commands\{RefreshMarketData, CaptureDailyChange, RefreshDividendData, RefreshSplitData, SyncHoldingData};
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
|
||||||
* This scheduled job refreshes market data from your selected data provider
|
* This scheduled job refreshes market data from your selected data provider
|
||||||
* Update the cadence with the MARKET_DATA_REFRESH key in your env file
|
* Update the cadence with the MARKET_DATA_REFRESH key in your env file
|
||||||
*/
|
*/
|
||||||
Schedule::command(RefreshMarketData::class)->weekdays()->everyMinute();
|
Schedule::command(RefreshMarketData::class)->weekdays()->everyMinute();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
|
||||||
* This scheduled job records daily changes to your portfolios every weekday
|
* This scheduled job records daily changes to your portfolios every weekday
|
||||||
*/
|
*/
|
||||||
Schedule::command(CaptureDailyChange::class)->dailyAt(config('investbrain.daily_change_time_of_day'))->weekdays();
|
Schedule::command(CaptureDailyChange::class)->dailyAt(config('investbrain.daily_change_time_of_day'))->weekdays();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
|
||||||
* Refreshes dividend data for your holdings (and syncs new dividends to holdings)
|
* Refreshes dividend data for your holdings (and syncs new dividends to holdings)
|
||||||
*/
|
*/
|
||||||
Schedule::command(RefreshDividendData::class)->daily()->days([1, 3, 5]);
|
Schedule::command(RefreshDividendData::class)->daily()->days([1, 3, 5]);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
|
||||||
* Refreshes split data for your holdings (and creates new transactions for new splits)
|
* Refreshes split data for your holdings (and creates new transactions for new splits)
|
||||||
*/
|
*/
|
||||||
Schedule::command(RefreshSplitData::class)->weekly();
|
Schedule::command(RefreshSplitData::class)->weekly();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
|
||||||
* Periodically reconciles your holdings with transactions and dividends
|
* Periodically reconciles your holdings with transactions and dividends
|
||||||
*/
|
*/
|
||||||
Schedule::command(SyncHoldingData::class)->yearly();
|
Schedule::command(SyncHoldingData::class)->yearly();
|
||||||
|
|||||||
+7
-7
@@ -1,19 +1,19 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use Illuminate\Support\Facades\View;
|
use App\Http\Controllers\ConnectedAccountController;
|
||||||
use Illuminate\Support\Facades\Route;
|
|
||||||
use App\Http\Controllers\HoldingController;
|
|
||||||
use App\Http\Controllers\DashboardController;
|
use App\Http\Controllers\DashboardController;
|
||||||
|
use App\Http\Controllers\HoldingController;
|
||||||
|
use App\Http\Controllers\InvitedOnboardingController;
|
||||||
use App\Http\Controllers\PortfolioController;
|
use App\Http\Controllers\PortfolioController;
|
||||||
use App\Http\Controllers\TransactionController;
|
use App\Http\Controllers\TransactionController;
|
||||||
use App\Http\Controllers\ConnectedAccountController;
|
use Illuminate\Support\Facades\Route;
|
||||||
use App\Http\Controllers\InvitedOnboardingController;
|
use Illuminate\Support\Facades\View;
|
||||||
use Laravel\Jetstream\Http\Controllers\Livewire\PrivacyPolicyController;
|
use Laravel\Jetstream\Http\Controllers\Livewire\PrivacyPolicyController;
|
||||||
use Laravel\Jetstream\Http\Controllers\Livewire\TermsOfServiceController;
|
use Laravel\Jetstream\Http\Controllers\Livewire\TermsOfServiceController;
|
||||||
|
|
||||||
Route::get('/', function () {
|
Route::get('/', function () {
|
||||||
if (!config('investbrain.self_hosted', true) && View::exists('landing-page::index')) {
|
if (! config('investbrain.self_hosted', true) && View::exists('landing-page::index')) {
|
||||||
|
|
||||||
return view('landing-page::index');
|
return view('landing-page::index');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+10
-10
@@ -2,18 +2,19 @@
|
|||||||
|
|
||||||
namespace Tests\Api;
|
namespace Tests\Api;
|
||||||
|
|
||||||
use Tests\TestCase;
|
|
||||||
use App\Models\User;
|
|
||||||
use App\Models\Holding;
|
use App\Models\Holding;
|
||||||
use App\Models\Portfolio;
|
use App\Models\Portfolio;
|
||||||
use App\Models\Transaction;
|
use App\Models\Transaction;
|
||||||
|
use App\Models\User;
|
||||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||||
|
use Tests\TestCase;
|
||||||
|
|
||||||
class HoldingsTest extends TestCase
|
class HoldingsTest extends TestCase
|
||||||
{
|
{
|
||||||
use RefreshDatabase;
|
use RefreshDatabase;
|
||||||
|
|
||||||
protected User $user;
|
protected User $user;
|
||||||
|
|
||||||
protected Portfolio $portfolio;
|
protected Portfolio $portfolio;
|
||||||
|
|
||||||
protected function setUp(): void
|
protected function setUp(): void
|
||||||
@@ -29,14 +30,14 @@ class HoldingsTest extends TestCase
|
|||||||
$this->actingAs($this->user);
|
$this->actingAs($this->user);
|
||||||
|
|
||||||
Transaction::factory(10)->create();
|
Transaction::factory(10)->create();
|
||||||
|
|
||||||
$this->actingAs($this->user)
|
$this->actingAs($this->user)
|
||||||
->getJson(route('api.holding.index', ['page' => 1, 'itemsPerPage' => 5]))
|
->getJson(route('api.holding.index', ['page' => 1, 'itemsPerPage' => 5]))
|
||||||
->assertOk()
|
->assertOk()
|
||||||
->assertJsonStructure([
|
->assertJsonStructure([
|
||||||
'data' => [['id', 'symbol', 'portfolio_id', 'total_market_value', 'dividends_earned']],
|
'data' => [['id', 'symbol', 'portfolio_id', 'total_market_value', 'dividends_earned']],
|
||||||
'meta' => ['current_page', 'last_page', 'total'],
|
'meta' => ['current_page', 'last_page', 'total'],
|
||||||
'links' => ['first', 'last', 'prev', 'next']
|
'links' => ['first', 'last', 'prev', 'next'],
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -45,7 +46,7 @@ class HoldingsTest extends TestCase
|
|||||||
// create transactions with existing user
|
// create transactions with existing user
|
||||||
$this->actingAs($this->user);
|
$this->actingAs($this->user);
|
||||||
Transaction::factory(10)->create();
|
Transaction::factory(10)->create();
|
||||||
|
|
||||||
// Create a new user
|
// Create a new user
|
||||||
$this->actingAs($user = User::factory()->create());
|
$this->actingAs($user = User::factory()->create());
|
||||||
Transaction::factory(1)->create();
|
Transaction::factory(1)->create();
|
||||||
@@ -88,14 +89,14 @@ class HoldingsTest extends TestCase
|
|||||||
$transaction = Transaction::factory()->create();
|
$transaction = Transaction::factory()->create();
|
||||||
|
|
||||||
$data = [
|
$data = [
|
||||||
'reinvest_dividends' => true
|
'reinvest_dividends' => true,
|
||||||
];
|
];
|
||||||
|
|
||||||
$this->actingAs($this->user)
|
$this->actingAs($this->user)
|
||||||
->putJson(route('api.holding.update', ['portfolio' => $transaction->portfolio_id, 'symbol' => $transaction->symbol]), $data)
|
->putJson(route('api.holding.update', ['portfolio' => $transaction->portfolio_id, 'symbol' => $transaction->symbol]), $data)
|
||||||
->assertOk()
|
->assertOk()
|
||||||
->assertJsonFragment([
|
->assertJsonFragment([
|
||||||
'reinvest_dividends' => true
|
'reinvest_dividends' => true,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -105,7 +106,7 @@ class HoldingsTest extends TestCase
|
|||||||
$transaction = Transaction::factory()->create();
|
$transaction = Transaction::factory()->create();
|
||||||
|
|
||||||
$data = [
|
$data = [
|
||||||
'reinvest_dividends' => true
|
'reinvest_dividends' => true,
|
||||||
];
|
];
|
||||||
|
|
||||||
$otherUser = User::factory()->create();
|
$otherUser = User::factory()->create();
|
||||||
@@ -113,5 +114,4 @@ class HoldingsTest extends TestCase
|
|||||||
->putJson(route('api.holding.update', ['portfolio' => $transaction->portfolio_id, 'symbol' => $transaction->symbol]), $data)
|
->putJson(route('api.holding.update', ['portfolio' => $transaction->portfolio_id, 'symbol' => $transaction->symbol]), $data)
|
||||||
->assertForbidden();
|
->assertForbidden();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
|
||||||
|
|||||||
@@ -2,16 +2,17 @@
|
|||||||
|
|
||||||
namespace Tests\Api;
|
namespace Tests\Api;
|
||||||
|
|
||||||
use Tests\TestCase;
|
|
||||||
use App\Models\User;
|
|
||||||
use App\Models\Portfolio;
|
use App\Models\Portfolio;
|
||||||
|
use App\Models\User;
|
||||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||||
|
use Tests\TestCase;
|
||||||
|
|
||||||
class PortfoliosTest extends TestCase
|
class PortfoliosTest extends TestCase
|
||||||
{
|
{
|
||||||
use RefreshDatabase;
|
use RefreshDatabase;
|
||||||
|
|
||||||
protected User $user;
|
protected User $user;
|
||||||
|
|
||||||
protected Portfolio $portfolio;
|
protected Portfolio $portfolio;
|
||||||
|
|
||||||
protected function setUp(): void
|
protected function setUp(): void
|
||||||
@@ -27,14 +28,14 @@ class PortfoliosTest extends TestCase
|
|||||||
$this->actingAs($this->user);
|
$this->actingAs($this->user);
|
||||||
|
|
||||||
Portfolio::factory(10)->create();
|
Portfolio::factory(10)->create();
|
||||||
|
|
||||||
$this->actingAs($this->user)
|
$this->actingAs($this->user)
|
||||||
->getJson(route('api.portfolio.index', ['page' => 1, 'itemsPerPage' => 5]))
|
->getJson(route('api.portfolio.index', ['page' => 1, 'itemsPerPage' => 5]))
|
||||||
->assertOk()
|
->assertOk()
|
||||||
->assertJsonStructure([
|
->assertJsonStructure([
|
||||||
'data' => [['id', 'title', 'owner', 'holdings', 'transactions']],
|
'data' => [['id', 'title', 'owner', 'holdings', 'transactions']],
|
||||||
'meta' => ['current_page', 'last_page', 'total'],
|
'meta' => ['current_page', 'last_page', 'total'],
|
||||||
'links' => ['first', 'last', 'prev', 'next']
|
'links' => ['first', 'last', 'prev', 'next'],
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -43,7 +44,7 @@ class PortfoliosTest extends TestCase
|
|||||||
// create portfolios with existing user
|
// create portfolios with existing user
|
||||||
$this->actingAs($this->user);
|
$this->actingAs($this->user);
|
||||||
Portfolio::factory(10)->create();
|
Portfolio::factory(10)->create();
|
||||||
|
|
||||||
// Create a new user
|
// Create a new user
|
||||||
$this->actingAs($user = User::factory()->create());
|
$this->actingAs($user = User::factory()->create());
|
||||||
Portfolio::factory(1)->create();
|
Portfolio::factory(1)->create();
|
||||||
@@ -61,12 +62,12 @@ class PortfoliosTest extends TestCase
|
|||||||
public function test_can_create_a_portfolio()
|
public function test_can_create_a_portfolio()
|
||||||
{
|
{
|
||||||
$data = Portfolio::factory()->make()->toArray();
|
$data = Portfolio::factory()->make()->toArray();
|
||||||
|
|
||||||
$this->actingAs($this->user)
|
$this->actingAs($this->user)
|
||||||
->postJson(route('api.portfolio.store'), $data)
|
->postJson(route('api.portfolio.store'), $data)
|
||||||
->assertCreated()
|
->assertCreated()
|
||||||
->assertJsonStructure(['id', 'title', 'owner']);
|
->assertJsonStructure(['id', 'title', 'owner']);
|
||||||
|
|
||||||
$this->assertDatabaseHas('portfolios', ['title' => $data['title']]);
|
$this->assertDatabaseHas('portfolios', ['title' => $data['title']]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -102,12 +103,12 @@ class PortfoliosTest extends TestCase
|
|||||||
|
|
||||||
$this->actingAs($this->user);
|
$this->actingAs($this->user);
|
||||||
$portfolio = Portfolio::factory()->create();
|
$portfolio = Portfolio::factory()->create();
|
||||||
|
|
||||||
$this->actingAs($this->user)
|
$this->actingAs($this->user)
|
||||||
->putJson(route('api.portfolio.update', $portfolio), $updatedData)
|
->putJson(route('api.portfolio.update', $portfolio), $updatedData)
|
||||||
->assertOk()
|
->assertOk()
|
||||||
->assertJson($updatedData);
|
->assertJson($updatedData);
|
||||||
|
|
||||||
$this->assertDatabaseHas('portfolios', $updatedData);
|
$this->assertDatabaseHas('portfolios', $updatedData);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -126,7 +127,7 @@ class PortfoliosTest extends TestCase
|
|||||||
->putJson(route('api.portfolio.update', $portfolio), ['title' => 'A brand new updated title'])
|
->putJson(route('api.portfolio.update', $portfolio), ['title' => 'A brand new updated title'])
|
||||||
->assertOk()
|
->assertOk()
|
||||||
->assertJsonFragment([
|
->assertJsonFragment([
|
||||||
'title' => 'A brand new updated title'
|
'title' => 'A brand new updated title',
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -185,7 +186,7 @@ class PortfoliosTest extends TestCase
|
|||||||
$this->actingAs($this->user)
|
$this->actingAs($this->user)
|
||||||
->deleteJson(route('api.portfolio.destroy', $portfolio))
|
->deleteJson(route('api.portfolio.destroy', $portfolio))
|
||||||
->assertNoContent();
|
->assertNoContent();
|
||||||
|
|
||||||
$this->assertDatabaseMissing('portfolios', ['id' => $portfolio->id]);
|
$this->assertDatabaseMissing('portfolios', ['id' => $portfolio->id]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -199,4 +200,4 @@ class PortfoliosTest extends TestCase
|
|||||||
->deleteJson(route('api.portfolio.destroy', $portfolio))
|
->deleteJson(route('api.portfolio.destroy', $portfolio))
|
||||||
->assertForbidden();
|
->assertForbidden();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,17 +2,18 @@
|
|||||||
|
|
||||||
namespace Tests\Api;
|
namespace Tests\Api;
|
||||||
|
|
||||||
use Tests\TestCase;
|
|
||||||
use App\Models\User;
|
|
||||||
use App\Models\Portfolio;
|
use App\Models\Portfolio;
|
||||||
use App\Models\Transaction;
|
use App\Models\Transaction;
|
||||||
|
use App\Models\User;
|
||||||
use Illuminate\Foundation\Testing\RefreshDatabase;
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||||
|
use Tests\TestCase;
|
||||||
|
|
||||||
class TransactionsTest extends TestCase
|
class TransactionsTest extends TestCase
|
||||||
{
|
{
|
||||||
use RefreshDatabase;
|
use RefreshDatabase;
|
||||||
|
|
||||||
protected User $user;
|
protected User $user;
|
||||||
|
|
||||||
protected Portfolio $portfolio;
|
protected Portfolio $portfolio;
|
||||||
|
|
||||||
protected function setUp(): void
|
protected function setUp(): void
|
||||||
@@ -21,7 +22,7 @@ class TransactionsTest extends TestCase
|
|||||||
|
|
||||||
// make user
|
// make user
|
||||||
$this->user = User::factory()->create();
|
$this->user = User::factory()->create();
|
||||||
|
|
||||||
// make portfolio
|
// make portfolio
|
||||||
$this->portfolio = Portfolio::factory()->makeOne();
|
$this->portfolio = Portfolio::factory()->makeOne();
|
||||||
$this->portfolio->setOwnerIdAttribute($this->user->id);
|
$this->portfolio->setOwnerIdAttribute($this->user->id);
|
||||||
@@ -33,14 +34,14 @@ class TransactionsTest extends TestCase
|
|||||||
$this->actingAs($this->user);
|
$this->actingAs($this->user);
|
||||||
|
|
||||||
Transaction::factory(10)->create();
|
Transaction::factory(10)->create();
|
||||||
|
|
||||||
$this->actingAs($this->user)
|
$this->actingAs($this->user)
|
||||||
->getJson(route('api.transaction.index', ['page' => 1, 'itemsPerPage' => 5]))
|
->getJson(route('api.transaction.index', ['page' => 1, 'itemsPerPage' => 5]))
|
||||||
->assertOk()
|
->assertOk()
|
||||||
->assertJsonStructure([
|
->assertJsonStructure([
|
||||||
'data' => [['id', 'symbol', 'transaction_type', 'portfolio_id', 'date']],
|
'data' => [['id', 'symbol', 'transaction_type', 'portfolio_id', 'date']],
|
||||||
'meta' => ['current_page', 'last_page', 'total'],
|
'meta' => ['current_page', 'last_page', 'total'],
|
||||||
'links' => ['first', 'last', 'prev', 'next']
|
'links' => ['first', 'last', 'prev', 'next'],
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -49,7 +50,7 @@ class TransactionsTest extends TestCase
|
|||||||
// create transactions with existing user
|
// create transactions with existing user
|
||||||
$this->actingAs($this->user);
|
$this->actingAs($this->user);
|
||||||
Transaction::factory(10)->create();
|
Transaction::factory(10)->create();
|
||||||
|
|
||||||
// Create a new user
|
// Create a new user
|
||||||
$this->actingAs($user = User::factory()->create());
|
$this->actingAs($user = User::factory()->create());
|
||||||
Transaction::factory(1)->create();
|
Transaction::factory(1)->create();
|
||||||
@@ -88,7 +89,7 @@ class TransactionsTest extends TestCase
|
|||||||
'quantity',
|
'quantity',
|
||||||
'date',
|
'date',
|
||||||
'cost_basis',
|
'cost_basis',
|
||||||
'sale_price'
|
'sale_price',
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -97,7 +98,7 @@ class TransactionsTest extends TestCase
|
|||||||
$this->actingAs($this->user)
|
$this->actingAs($this->user)
|
||||||
->postJson(route('api.transaction.store'), [
|
->postJson(route('api.transaction.store'), [
|
||||||
'portfolio_id' => $this->portfolio->id,
|
'portfolio_id' => $this->portfolio->id,
|
||||||
'symbol' => null
|
'symbol' => null,
|
||||||
])
|
])
|
||||||
->assertUnprocessable()
|
->assertUnprocessable()
|
||||||
->assertJsonValidationErrors(['symbol']);
|
->assertJsonValidationErrors(['symbol']);
|
||||||
@@ -133,7 +134,7 @@ class TransactionsTest extends TestCase
|
|||||||
'symbol' => 'ZZZ',
|
'symbol' => 'ZZZ',
|
||||||
'transaction_type' => 'BUY',
|
'transaction_type' => 'BUY',
|
||||||
'cost_basis' => 200.19,
|
'cost_basis' => 200.19,
|
||||||
'quantity' => 5
|
'quantity' => 5,
|
||||||
];
|
];
|
||||||
|
|
||||||
$this->actingAs($this->user)
|
$this->actingAs($this->user)
|
||||||
@@ -162,7 +163,7 @@ class TransactionsTest extends TestCase
|
|||||||
->putJson(route('api.transaction.update', $transaction), ['symbol' => 'ZZZ'])
|
->putJson(route('api.transaction.update', $transaction), ['symbol' => 'ZZZ'])
|
||||||
->assertOk()
|
->assertOk()
|
||||||
->assertJsonFragment([
|
->assertJsonFragment([
|
||||||
'symbol' => 'ZZZ'
|
'symbol' => 'ZZZ',
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -198,4 +199,4 @@ class TransactionsTest extends TestCase
|
|||||||
->deleteJson(route('api.transaction.destroy', $transaction))
|
->deleteJson(route('api.transaction.destroy', $transaction))
|
||||||
->assertForbidden();
|
->assertForbidden();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user