chore: code style

This commit is contained in:
hackerESQ
2025-01-28 17:14:49 -06:00
parent c4736fae70
commit e8ef0921ad
123 changed files with 1051 additions and 1197 deletions
+1 -1
View File
@@ -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,9 +4,9 @@ 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
+1 -1
View File
@@ -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,
]); ]);
}); });
} }
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1
View File
@@ -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
+2 -6
View File
@@ -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),
]; ];
} }
} }
+1 -4
View File
@@ -23,7 +23,7 @@ class DailyChangesSheet implements FromCollection, WithHeadings, WithTitle
'Total Gain', 'Total Gain',
'Total Dividends Earned', 'Total Dividends Earned',
'Realized Gains', 'Realized Gains',
'Annotation' 'Annotation',
]; ];
} }
@@ -35,9 +35,6 @@ class DailyChangesSheet implements FromCollection, WithHeadings, WithTitle
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';
+1 -4
View File
@@ -21,7 +21,7 @@ class PortfoliosSheet implements FromCollection, WithHeadings, WithTitle
'Notes', 'Notes',
'Wishlist', 'Wishlist',
'Created', 'Created',
'Updated' 'Updated',
]; ];
} }
@@ -33,9 +33,6 @@ class PortfoliosSheet implements FromCollection, WithHeadings, WithTitle
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 -6
View File
@@ -3,9 +3,9 @@
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
{ {
@@ -27,7 +27,7 @@ class TransactionsSheet implements FromCollection, WithHeadings, WithTitle
'Reinvested Dividend', 'Reinvested Dividend',
'Date', 'Date',
'Created', 'Created',
'Updated' 'Updated',
]; ];
} }
@@ -39,9 +39,6 @@ class TransactionsSheet implements FromCollection, WithHeadings, WithTitle
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';
@@ -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
{ {
@@ -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
{ {
@@ -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
{ {
@@ -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
{ {
+2 -2
View File
@@ -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
{ {
@@ -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)
{ {
@@ -46,13 +43,13 @@ 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!
@@ -72,7 +69,7 @@ class ConnectedAccountController extends Controller
$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;
@@ -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',
] ],
])); ]));
} }
} }
+2 -3
View File
@@ -8,17 +8,16 @@ 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)
@@ -2,16 +2,14 @@
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)
{ {
@@ -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.
*/ */
@@ -4,7 +4,6 @@ namespace App\Http\Controllers;
class TransactionController extends Controller class TransactionController extends Controller
{ {
/** /**
* Display the specified resource. * Display the specified resource.
*/ */
-1
View File
@@ -6,7 +6,6 @@ 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};
+1 -4
View File
@@ -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;
-3
View File
@@ -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.
* *
+3 -5
View File
@@ -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')),
]); ]);
} }
@@ -40,7 +38,7 @@ class TransactionRequest extends FormRequest
$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'],
+1 -1
View File
@@ -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,
]; ];
} }
} }
+12 -16
View File
@@ -2,35 +2,31 @@
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 [
@@ -43,7 +39,7 @@ 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])
@@ -53,14 +49,14 @@ class BackupImport implements WithMultipleSheets, WithEvents
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(),
]), ]),
]; ];
} }
+8 -11
View File
@@ -3,19 +3,19 @@
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;
@@ -23,9 +23,6 @@ class DailyChangesSheet implements ToCollection, WithHeadingRow, WithValidation,
public BackupImport $backupImport public BackupImport $backupImport
) {} ) {}
/**
* @return array
*/
public function registerEvents(): array public function registerEvents(): array
{ {
return [ return [
@@ -35,7 +32,7 @@ class DailyChangesSheet implements ToCollection, WithHeadingRow, WithValidation,
'message' => __('Importing daily changes...'), 'message' => __('Importing daily changes...'),
]); ]);
DB::beginTransaction(); DB::beginTransaction();
} },
]; ];
} }
@@ -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',
] ]
); );
}); });
+7 -10
View File
@@ -2,26 +2,23 @@
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 [
@@ -31,7 +28,7 @@ class PortfoliosSheet implements ToCollection, WithValidation, WithHeadingRow, S
'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'],
+10 -14
View File
@@ -3,32 +3,28 @@
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 [
@@ -38,7 +34,7 @@ class TransactionsSheet implements ToCollection, WithHeadingRow, WithValidation,
'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,7 +75,7 @@ class TransactionsSheet implements ToCollection, WithHeadingRow, WithValidation,
'sale_price', 'sale_price',
'split', 'split',
'reinvested_dividend', 'reinvested_dividend',
'date' 'date',
] ]
); );
@@ -89,7 +85,7 @@ class TransactionsSheet implements ToCollection, WithHeadingRow, WithValidation,
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,
+1 -2
View File
@@ -6,7 +6,6 @@ use App\Models\Portfolio;
trait ValidatesPortfolioAccess trait ValidatesPortfolioAccess
{ {
public function validatePortfolioAccess($collection) public function validatePortfolioAccess($collection)
{ {
@@ -18,7 +17,7 @@ trait ValidatesPortfolioAccess
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,29 +2,31 @@
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,
@@ -49,11 +51,11 @@ 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', []);
@@ -73,7 +75,7 @@ class AlphaVantageMarketData implements MarketDataInterface
}); });
} }
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', []);
@@ -93,7 +95,7 @@ class AlphaVantageMarketData implements MarketDataInterface
}); });
} }
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');
@@ -112,7 +114,7 @@ class AlphaVantageMarketData implements MarketDataInterface
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'),
])]; ])];
}); });
} }
+10 -10
View File
@@ -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,7 +57,7 @@ class FakeMarketData implements MarketDataInterface
]); ]);
} }
public function splits(String $symbol, $startDate, $endDate): Collection public function splits(string $symbol, $startDate, $endDate): Collection
{ {
return collect([ return collect([
@@ -65,11 +65,11 @@ class FakeMarketData implements MarketDataInterface
'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);
@@ -6,7 +6,6 @@ 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)
@@ -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
{ {
@@ -18,11 +18,12 @@ class FinnhubMarketData implements MarketDataInterface
{ {
$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,13 +33,15 @@ 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');
} }
); );
@@ -89,13 +92,14 @@ 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,
@@ -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 -2
View File
@@ -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;
} }
@@ -2,14 +2,11 @@
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 = [])
{ {
+7 -2
View File
@@ -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;
} }
+11 -1
View File
@@ -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;
} }
@@ -33,6 +34,7 @@ class Quote extends MarketDataType
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;
} }
@@ -44,6 +46,7 @@ class Quote extends MarketDataType
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;
} }
@@ -55,6 +58,7 @@ class Quote extends MarketDataType
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;
} }
@@ -66,6 +70,7 @@ class Quote extends MarketDataType
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;
} }
@@ -77,6 +82,7 @@ class Quote extends MarketDataType
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;
} }
@@ -99,6 +106,7 @@ class Quote extends MarketDataType
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;
} }
@@ -121,6 +130,7 @@ class Quote extends MarketDataType
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;
} }
+4 -2
View File
@@ -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;
} }
+14 -11
View File
@@ -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,11 +47,11 @@ 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))
@@ -62,7 +65,7 @@ class YahooMarketData implements MarketDataInterface
}); });
} }
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))
@@ -77,7 +80,7 @@ class YahooMarketData implements MarketDataInterface
}); });
} }
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))
+9 -9
View File
@@ -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
{ {
@@ -65,7 +65,7 @@ class BackupImportJob implements ShouldQueue
'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()));
+4 -3
View File
@@ -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);
} }
+3 -5
View File
@@ -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()
@@ -47,7 +45,7 @@ class BackupImport extends Model
{ {
return [ return [
'has_errors' => 'boolean', 'has_errors' => 'boolean',
'completed_at' => 'datetime' 'completed_at' => 'datetime',
]; ];
} }
} }
+1 -1
View File
@@ -29,7 +29,7 @@ class ConnectedAccount extends Model
]; ];
protected $with = [ protected $with = [
'user' 'user',
]; ];
/** /**
+4 -3
View File
@@ -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;
@@ -47,7 +47,8 @@ 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);
}); });
+11 -12
View File
@@ -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
{ {
@@ -132,7 +131,7 @@ class Dividend extends Model
->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'),
]); ]);
}); });
} }
@@ -153,7 +152,7 @@ class Dividend extends Model
'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,
+26 -24
View File
@@ -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',
]; ];
/** /**
@@ -164,7 +158,8 @@ 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);
}); });
@@ -217,15 +212,17 @@ class Holding extends Model
'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,13 +234,17 @@ 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') {
@@ -285,7 +286,7 @@ 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')
@@ -302,12 +303,13 @@ class Holding extends Model
{ {
$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;
} }
} }
+6 -4
View File
@@ -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,7 +39,7 @@ 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()
@@ -53,7 +55,7 @@ class MarketData extends Model
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
+21 -28
View File
@@ -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
{ {
@@ -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'];
@@ -186,7 +185,7 @@ class Portfolio extends Model
'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,
]; ];
} }
} }
@@ -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',
] ]
); );
}); });
@@ -245,35 +244,32 @@ class Portfolio extends Model
{ {
$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);
@@ -282,15 +278,12 @@ class Portfolio extends Model
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
{ {
+12 -12
View File
@@ -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,18 +27,19 @@ 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
*/ */
@@ -94,7 +94,7 @@ class Split extends Model
'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,
@@ -110,7 +110,7 @@ class Split extends Model
// 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) -
@@ -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(),
]); ]);
} }
} }
+7 -7
View File
@@ -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()
@@ -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,
+10 -10
View File
@@ -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',
@@ -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
{ {
@@ -35,10 +35,10 @@ class ImportFailedNotification extends Notification implements ShouldQueue
{ {
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
{ {
@@ -35,9 +33,9 @@ class ImportSucceededNotification extends Notification implements ShouldQueue
{ {
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
{ {
@@ -45,8 +45,8 @@ class InvitedOnboardingNotification extends Notification implements ShouldQueue
->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
{ {
@@ -44,7 +44,7 @@ class VerifyConnectedAccountNotification extends Notification implements ShouldQ
->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 -12
View File
@@ -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();
+1 -1
View File
@@ -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 -2
View File
@@ -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
-5
View File
@@ -26,11 +26,6 @@ class QuantityValidationRule 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
{ {
-5
View File
@@ -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
{ {
+2 -4
View File
@@ -2,8 +2,6 @@
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
@@ -28,7 +26,7 @@ class Spotlight
'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,
]); ]);
}); });
@@ -46,7 +44,7 @@ class Spotlight
'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,
]); ]);
}); });
+4 -2
View File
@@ -24,11 +24,12 @@ trait HasCompositePrimaryKey
{ {
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;
} }
@@ -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);
} }
} }
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
View File
@@ -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
View File
@@ -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),
]; ];
+1 -1
View File
@@ -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,
]); ]);
} }
+1 -1
View File
@@ -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,
]; ];
} }
@@ -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
{ {
@@ -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
{ {
@@ -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
{ {
@@ -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
{ {
@@ -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
{ {
@@ -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
{ {
@@ -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
{ {
@@ -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
{ {
+1 -1
View File
@@ -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
{ {
+3 -3
View File
@@ -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 () {
+5 -6
View File
@@ -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();
+5 -5
View File
@@ -1,13 +1,13 @@
<?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;
+7 -7
View File
@@ -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
@@ -36,7 +37,7 @@ class HoldingsTest extends TestCase
->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'],
]); ]);
} }
@@ -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();
} }
} }
+5 -4
View File
@@ -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
@@ -34,7 +35,7 @@ class PortfoliosTest extends TestCase
->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'],
]); ]);
} }
@@ -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',
]); ]);
} }
+8 -7
View File
@@ -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
@@ -40,7 +41,7 @@ class TransactionsTest extends TestCase
->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'],
]); ]);
} }
@@ -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',
]); ]);
} }
-1
View File
@@ -8,7 +8,6 @@ use Illuminate\Support\Str;
use Laravel\Jetstream\Features; use Laravel\Jetstream\Features;
use Laravel\Jetstream\Http\Livewire\ApiTokenManager; use Laravel\Jetstream\Http\Livewire\ApiTokenManager;
use Livewire\Livewire; use Livewire\Livewire;
use Tests\TestCase;
class ApiTokenPermissionsTest extends TestCase class ApiTokenPermissionsTest extends TestCase
{ {
-1
View File
@@ -4,7 +4,6 @@ namespace Tests;
use App\Models\User; use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase; use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;
class AuthenticationTest extends TestCase class AuthenticationTest extends TestCase
{ {
-1
View File
@@ -6,7 +6,6 @@ use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase; use Illuminate\Foundation\Testing\RefreshDatabase;
use Laravel\Jetstream\Http\Livewire\LogoutOtherBrowserSessionsForm; use Laravel\Jetstream\Http\Livewire\LogoutOtherBrowserSessionsForm;
use Livewire\Livewire; use Livewire\Livewire;
use Tests\TestCase;
class BrowserSessionsTest extends TestCase class BrowserSessionsTest extends TestCase
{ {
+4 -7
View File
@@ -2,19 +2,18 @@
namespace Tests; namespace Tests;
use Tests\TestCase;
use App\Models\User;
use App\Models\Portfolio;
use App\Models\DailyChange; use App\Models\DailyChange;
use App\Models\Portfolio;
use App\Models\Transaction; use App\Models\Transaction;
use Illuminate\Support\Facades\Artisan; use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase; use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\Artisan;
class CaptureDailyChangeTest extends TestCase class CaptureDailyChangeTest extends TestCase
{ {
use RefreshDatabase; use RefreshDatabase;
public function setUp(): void protected function setUp(): void
{ {
parent::setUp(); parent::setUp();
@@ -25,8 +24,6 @@ class CaptureDailyChangeTest extends TestCase
$this->transaction = Transaction::factory()->sell()->lastMonth()->portfolio($this->portfolio->id)->symbol('AAPL')->create(); $this->transaction = Transaction::factory()->sell()->lastMonth()->portfolio($this->portfolio->id)->symbol('AAPL')->create();
} }
/**
*/
public function test_daily_change_for_portfolios() public function test_daily_change_for_portfolios()
{ {
// Run the command // Run the command
+5 -7
View File
@@ -2,13 +2,12 @@
namespace Tests; namespace Tests;
use Tests\TestCase; use App\Http\Controllers\ConnectedAccountController;
use App\Models\User;
use App\Models\ConnectedAccount; use App\Models\ConnectedAccount;
use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Laravel\Socialite\Facades\Socialite; use Laravel\Socialite\Facades\Socialite;
use Illuminate\Foundation\Testing\RefreshDatabase;
use App\Http\Controllers\ConnectedAccountController;
class ConnectedAccountTest extends TestCase class ConnectedAccountTest extends TestCase
{ {
@@ -19,7 +18,7 @@ class ConnectedAccountTest extends TestCase
protected function setUp(): void protected function setUp(): void
{ {
parent::setUp(); parent::setUp();
$this->controller = new ConnectedAccountController(); $this->controller = new ConnectedAccountController;
} }
public function test_handle_provider_callback_with_already_connected_account() public function test_handle_provider_callback_with_already_connected_account()
@@ -47,7 +46,7 @@ class ConnectedAccountTest extends TestCase
'provider_id' => $providerUser->id, 'provider_id' => $providerUser->id,
'user_id' => $user->id, 'user_id' => $user->id,
'token' => $providerUser->token, 'token' => $providerUser->token,
'verified_at' => now() 'verified_at' => now(),
]); ]);
Socialite::shouldReceive('driver') Socialite::shouldReceive('driver')
@@ -164,5 +163,4 @@ class ConnectedAccountTest extends TestCase
$response->assertRedirect(route('dashboard')); $response->assertRedirect(route('dashboard'));
$response->assertSessionHas('toast'); $response->assertSessionHas('toast');
} }
} }
+1 -10
View File
@@ -2,19 +2,16 @@
namespace Tests; namespace Tests;
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;
class DashboardTest extends TestCase class DashboardTest extends TestCase
{ {
use RefreshDatabase; use RefreshDatabase;
/**
*/
public function test_user_has_portfolios(): void public function test_user_has_portfolios(): void
{ {
$this->actingAs($user = User::factory()->create()); $this->actingAs($user = User::factory()->create());
@@ -24,8 +21,6 @@ class DashboardTest extends TestCase
$this->assertCount(5, $user->portfolios); $this->assertCount(5, $user->portfolios);
} }
/**
*/
public function test_user_has_transactions(): void public function test_user_has_transactions(): void
{ {
$this->actingAs($user = User::factory()->create()); $this->actingAs($user = User::factory()->create());
@@ -35,8 +30,6 @@ class DashboardTest extends TestCase
$this->assertCount(10, $user->transactions); $this->assertCount(10, $user->transactions);
} }
/**
*/
public function test_user_has_holdings(): void public function test_user_has_holdings(): void
{ {
$this->actingAs($user = User::factory()->create()); $this->actingAs($user = User::factory()->create());
@@ -48,8 +41,6 @@ class DashboardTest extends TestCase
$this->assertCount(1, $user->holdings); $this->assertCount(1, $user->holdings);
} }
/**
*/
public function test_user_has_dashboard_metrics(): void public function test_user_has_dashboard_metrics(): void
{ {
$this->actingAs($user = User::factory()->create()); $this->actingAs($user = User::factory()->create());
-1
View File
@@ -7,7 +7,6 @@ use Illuminate\Foundation\Testing\RefreshDatabase;
use Laravel\Jetstream\Features; use Laravel\Jetstream\Features;
use Laravel\Jetstream\Http\Livewire\DeleteUserForm; use Laravel\Jetstream\Http\Livewire\DeleteUserForm;
use Livewire\Livewire; use Livewire\Livewire;
use Tests\TestCase;
class DeleteAccountTest extends TestCase class DeleteAccountTest extends TestCase
{ {
+4 -12
View File
@@ -2,22 +2,18 @@
namespace Tests; namespace Tests;
use Tests\TestCase;
use App\Models\User;
use App\Models\Split;
use App\Models\Holding;
use App\Models\Dividend; use App\Models\Dividend;
use App\Models\Portfolio; use App\Models\Holding;
use App\Models\MarketData; use App\Models\MarketData;
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;
class DividendsTest extends TestCase class DividendsTest extends TestCase
{ {
use RefreshDatabase; use RefreshDatabase;
/**
*/
public function test_new_dividends_update_holding(): void public function test_new_dividends_update_holding(): void
{ {
$this->actingAs($user = User::factory()->create()); $this->actingAs($user = User::factory()->create());
@@ -36,8 +32,6 @@ class DividendsTest extends TestCase
$this->assertEquals(4.95, $holding->dividends_earned); $this->assertEquals(4.95, $holding->dividends_earned);
} }
/**
*/
public function test_new_dividends_are_reinvested(): void public function test_new_dividends_are_reinvested(): void
{ {
$this->actingAs($user = User::factory()->create()); $this->actingAs($user = User::factory()->create());
@@ -62,8 +56,6 @@ class DividendsTest extends TestCase
$this->assertEqualsWithDelta(4.95, $dividendsReinvested * $market_data->market_value, 0.01); $this->assertEqualsWithDelta(4.95, $dividendsReinvested * $market_data->market_value, 0.01);
} }
/**
*/
public function test_do_not_duplicate_recent_dividends(): void public function test_do_not_duplicate_recent_dividends(): void
{ {
$this->actingAs($user = User::factory()->create()); $this->actingAs($user = User::factory()->create());
@@ -76,7 +68,7 @@ class DividendsTest extends TestCase
Dividend::create([ Dividend::create([
'symbol' => 'ACME', 'symbol' => 'ACME',
'date' => now()->subDay(2), 'date' => now()->subDay(2),
'dividend_amount' => .01 'dividend_amount' => .01,
]); ]);
Dividend::refreshDividendData('ACME'); Dividend::refreshDividendData('ACME');
-1
View File
@@ -8,7 +8,6 @@ use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\Event; use Illuminate\Support\Facades\Event;
use Illuminate\Support\Facades\URL; use Illuminate\Support\Facades\URL;
use Laravel\Fortify\Features; use Laravel\Fortify\Features;
use Tests\TestCase;
class EmailVerificationTest extends TestCase class EmailVerificationTest extends TestCase
{ {
+12 -13
View File
@@ -2,24 +2,23 @@
namespace Tests; namespace Tests;
use Mockery;
use Tests\TestCase;
use Illuminate\Support\Facades\Log;
use App\Interfaces\MarketData\YahooMarketData;
use App\Interfaces\MarketData\FallbackInterface;
use App\Interfaces\MarketData\AlphaVantageMarketData; use App\Interfaces\MarketData\AlphaVantageMarketData;
use App\Interfaces\MarketData\FallbackInterface;
use App\Interfaces\MarketData\Types\Quote; use App\Interfaces\MarketData\Types\Quote;
use App\Interfaces\MarketData\YahooMarketData;
use Illuminate\Support\Facades\Log;
use Mockery;
class FallbackInterfaceTest extends TestCase class FallbackInterfaceTest extends TestCase
{ {
public function setUp(): void protected function setUp(): void
{ {
parent::setUp(); parent::setUp();
Log::spy(); Log::spy();
} }
public function testFallbackToNextProviderOnFailure() public function test_fallback_to_next_provider_on_failure()
{ {
config()->set('investbrain.provider', 'yahoo,alphavantage'); config()->set('investbrain.provider', 'yahoo,alphavantage');
config()->set('investbrain.interfaces', [ config()->set('investbrain.interfaces', [
@@ -29,7 +28,7 @@ class FallbackInterfaceTest extends TestCase
$yahooMock = Mockery::mock(YahooMarketData::class); $yahooMock = Mockery::mock(YahooMarketData::class);
$yahooMock->shouldReceive('quote') $yahooMock->shouldReceive('quote')
->andThrow(new \Exception("Yahoo failed")); ->andThrow(new \Exception('Yahoo failed'));
$alphaMock = Mockery::mock(AlphaVantageMarketData::class); $alphaMock = Mockery::mock(AlphaVantageMarketData::class);
$alphaMock->shouldReceive('quote') $alphaMock->shouldReceive('quote')
@@ -38,7 +37,7 @@ class FallbackInterfaceTest extends TestCase
$this->app->instance(YahooMarketData::class, $yahooMock); $this->app->instance(YahooMarketData::class, $yahooMock);
$this->app->instance(AlphaVantageMarketData::class, $alphaMock); $this->app->instance(AlphaVantageMarketData::class, $alphaMock);
$fallbackInterface = new FallbackInterface(); $fallbackInterface = new FallbackInterface;
$result = $fallbackInterface->quote('ACME'); $result = $fallbackInterface->quote('ACME');
@@ -47,7 +46,7 @@ class FallbackInterfaceTest extends TestCase
Log::shouldHaveReceived('warning')->with('Failed calling method quote (yahoo): Yahoo failed'); Log::shouldHaveReceived('warning')->with('Failed calling method quote (yahoo): Yahoo failed');
} }
public function testAllProvidersFail() public function test_all_providers_fail()
{ {
config()->set('investbrain.provider', 'yahoo,alpha'); config()->set('investbrain.provider', 'yahoo,alpha');
config()->set('investbrain.interfaces', [ config()->set('investbrain.interfaces', [
@@ -57,16 +56,16 @@ class FallbackInterfaceTest extends TestCase
$yahooMock = Mockery::mock(YahooMarketData::class); $yahooMock = Mockery::mock(YahooMarketData::class);
$yahooMock->shouldReceive('quote') $yahooMock->shouldReceive('quote')
->andThrow(new \Exception("Yahoo failed")); ->andThrow(new \Exception('Yahoo failed'));
$alphaMock = Mockery::mock(AlphaVantageMarketData::class); $alphaMock = Mockery::mock(AlphaVantageMarketData::class);
$alphaMock->shouldReceive('quote') $alphaMock->shouldReceive('quote')
->andThrow(new \Exception("Alpha failed")); ->andThrow(new \Exception('Alpha failed'));
$this->app->instance(YahooMarketData::class, $yahooMock); $this->app->instance(YahooMarketData::class, $yahooMock);
$this->app->instance(AlphaVantageMarketData::class, $alphaMock); $this->app->instance(AlphaVantageMarketData::class, $alphaMock);
$fallbackInterface = new FallbackInterface(); $fallbackInterface = new FallbackInterface;
$this->expectException(\Exception::class); $this->expectException(\Exception::class);
$this->expectExceptionMessage('Could not get market data: Provider [alpha] is not a valid market data interface.'); $this->expectExceptionMessage('Could not get market data: Provider [alpha] is not a valid market data interface.');
+6 -15
View File
@@ -2,20 +2,17 @@
namespace Tests; namespace Tests;
use Tests\TestCase;
use App\Models\User;
use App\Models\Transaction;
use Maatwebsite\Excel\Facades\Excel;
use App\Exports\BackupExport; use App\Exports\BackupExport;
use App\Models\BackupImport as BackupImportModel; use App\Models\BackupImport as BackupImportModel;
use App\Models\Transaction;
use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase; use Illuminate\Foundation\Testing\RefreshDatabase;
use Maatwebsite\Excel\Facades\Excel;
class ImportExportTest extends TestCase class ImportExportTest extends TestCase
{ {
use RefreshDatabase; use RefreshDatabase;
/**
*/
public function test_can_create_exports(): void public function test_can_create_exports(): void
{ {
Excel::fake(); Excel::fake();
@@ -31,15 +28,13 @@ class ImportExportTest extends TestCase
}); });
} }
/**
*/
public function test_backup_job_completes(): void public function test_backup_job_completes(): void
{ {
$this->actingAs($user = User::factory()->create()); $this->actingAs($user = User::factory()->create());
$backup_job = BackupImportModel::create([ $backup_job = BackupImportModel::create([
'user_id' => auth()->user()->id, 'user_id' => auth()->user()->id,
'path' => __DIR__.'/0000_00_00_import_test.xlsx' 'path' => __DIR__.'/0000_00_00_import_test.xlsx',
]); ]);
$backup_job->refresh(); $backup_job->refresh();
@@ -47,29 +42,25 @@ class ImportExportTest extends TestCase
$this->assertEquals('success', $backup_job->status); $this->assertEquals('success', $backup_job->status);
} }
/**
*/
public function test_backup_job_inserts_rows(): void public function test_backup_job_inserts_rows(): void
{ {
$this->actingAs($user = User::factory()->create()); $this->actingAs($user = User::factory()->create());
BackupImportModel::create([ BackupImportModel::create([
'user_id' => auth()->user()->id, 'user_id' => auth()->user()->id,
'path' => __DIR__.'/0000_00_00_import_test.xlsx' 'path' => __DIR__.'/0000_00_00_import_test.xlsx',
]); ]);
$this->assertEquals(3, $user->transactions->count()); $this->assertEquals(3, $user->transactions->count());
} }
/**
*/
public function test_backup_job_calculates_correct_holding_data(): void public function test_backup_job_calculates_correct_holding_data(): void
{ {
$this->actingAs($user = User::factory()->create()); $this->actingAs($user = User::factory()->create());
BackupImportModel::create([ BackupImportModel::create([
'user_id' => auth()->user()->id, 'user_id' => auth()->user()->id,
'path' => __DIR__.'/0000_00_00_import_test.xlsx' 'path' => __DIR__.'/0000_00_00_import_test.xlsx',
]); ]);
$holding = $user->holdings->first(); $holding = $user->holdings->first();
-1
View File
@@ -4,7 +4,6 @@ namespace Tests;
use App\Models\User; use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase; use Illuminate\Foundation\Testing\RefreshDatabase;
use Tests\TestCase;
class PasswordConfirmationTest extends TestCase class PasswordConfirmationTest extends TestCase
{ {
-1
View File
@@ -7,7 +7,6 @@ use Illuminate\Auth\Notifications\ResetPassword;
use Illuminate\Foundation\Testing\RefreshDatabase; use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\Notification; use Illuminate\Support\Facades\Notification;
use Laravel\Fortify\Features; use Laravel\Fortify\Features;
use Tests\TestCase;
class PasswordResetTest extends TestCase class PasswordResetTest extends TestCase
{ {
+7 -6
View File
@@ -2,27 +2,29 @@
namespace Tests; namespace Tests;
use Tests\TestCase;
use App\Models\User;
use App\Models\Portfolio; use App\Models\Portfolio;
use App\Models\User;
use App\Policies\PortfolioPolicy; use App\Policies\PortfolioPolicy;
use Illuminate\Support\Facades\Auth;
use Illuminate\Foundation\Testing\RefreshDatabase; use Illuminate\Foundation\Testing\RefreshDatabase;
use Illuminate\Support\Facades\Auth;
class PortfolioPolicyTest extends TestCase class PortfolioPolicyTest extends TestCase
{ {
use RefreshDatabase; use RefreshDatabase;
protected $policy; protected $policy;
protected $owner; protected $owner;
protected $user; protected $user;
protected $portfolio; protected $portfolio;
protected function setUp(): void protected function setUp(): void
{ {
parent::setUp(); parent::setUp();
$this->policy = new PortfolioPolicy(); $this->policy = new PortfolioPolicy;
$this->owner = User::factory()->create(); $this->owner = User::factory()->create();
Auth::login($this->owner); Auth::login($this->owner);
@@ -34,7 +36,7 @@ class PortfolioPolicyTest extends TestCase
$this->user->id => [ $this->user->id => [
'full_access' => false, 'full_access' => false,
'owner' => false, 'owner' => false,
] ],
]); ]);
} }
@@ -109,5 +111,4 @@ class PortfolioPolicyTest extends TestCase
$result = $this->policy->owner($this->user, $this->portfolio); $result = $this->policy->owner($this->user, $this->portfolio);
$this->assertFalse($result, 'User should not be the owner'); $this->assertFalse($result, 'User should not be the owner');
} }
} }

Some files were not shown because too many files have changed in this diff Show More