Update SECURITY.md

feat: simplify self host install by removing asset_url env

.dockerignore

@@ -13,4 +13,4 @@ storage/framework/cache/*
 storage/framework/sessions/*
 storage/framework/testing/*
 storage/framework/views/*
-storage/framework/logs/*
+storage/logs/*

.env.example

@@ -40,13 +40,10 @@ LINKEDIN_CLIENT_SECRET=
 FACEBOOK_CLIENT_ID=
 FACEBOOK_CLIENT_SECRET=
 
-APP_NAME=Investbrain
-APP_TIMEZONE=UTC
-APP_ENV=production
-APP_DEBUG=true
-APP_LOCALE=en
-APP_FALLBACK_LOCALE=en
-SELF_HOSTED=true
+FILESYSTEM_DISK=local
+SESSION_DRIVER=redis
+QUEUE_CONNECTION=redis
+CACHE_STORE=redis
 
 DB_CONNECTION=mysql
 DB_HOST=investbrain-mysql
@@ -55,20 +52,7 @@ DB_DATABASE=investbrain
 DB_USERNAME=investbrain
 DB_PASSWORD=investbrain
 
-SESSION_DRIVER=redis
-SESSION_LIFETIME=120
-SESSION_ENCRYPT=false
-SESSION_PATH=/
-SESSION_DOMAIN=null
-
-FILESYSTEM_DISK=local
-QUEUE_CONNECTION=redis
-
-CACHE_STORE=redis
-
-REDIS_CLIENT=predis
 REDIS_HOST=investbrain-redis
-REDIS_PATH=/tmp/database_server.sock
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 
@@ -86,5 +70,3 @@ AWS_SECRET_ACCESS_KEY=
 AWS_DEFAULT_REGION=us-east-1
 AWS_BUCKET=
 AWS_USE_PATH_STYLE_ENDPOINT=false
-
-VITE_APP_NAME="${APP_NAME}"

README.md

@@ -38,21 +38,23 @@ Before getting started, you should already have [Docker Engine](https://docs.doc
 
 Ready? Let's get started! 
 
-**1. Copy Docker Compose file**
+**1. Download copy of Docker Compose file**
 
-Grab a copy of the [docker-compose.yml](https://github.com/investbrainapp/investbrain/blob/main/docker-compose.yml)** file and paste the contents into the directory where you plan to install Investbrain.
+Grab a copy of the [docker-compose.yml](https://github.com/investbrainapp/investbrain/blob/main/docker-compose.yml) using `wget`, `curl` or similar:
+
+```bash
+curl -O https://raw.githubusercontent.com/investbrainapp/investbrain/main/docker-compose.yml
+```
 
 **2. Set your environment**
 
-Adjust the `environment` properties in the Docker Compose file to your preferences. Alternatively, create a .env file in the same directory as your compose file, then reference the .env file using the `env_file` property. 
+Adjust the `environment` properties in the compose file to your preferences. 
 
-_Importantly_, you need to set the `APP_KEY` value to a complex random value.  If you're unsure, Investbrain will generate an `APP_KEY` for you on first run - but you must **manually** update your environment configuration with this generated value!
-
-> Tip: Want to know what other configuration options are available? You can reference the [.env.example](https://github.com/investbrainapp/investbrain/blob/main/.env.example) file in this respository for available environment  configurations. 
+**Importantly**, you need to set the `APP_KEY` value.  If you're unsure, Investbrain will generate an `APP_KEY` for you on first run, but it will not persist. You must _manually_ update your environment configuration with this generated value!
 
 **3. Run `docker compose up`**
 
-This might take a few minutes to pull the Docker images. But assuming everything worked as expected, you should now be able to access Investbrain in the browser by visiting:
+It might take a few minutes to pull the Docker images. But assuming everything worked as expected, you should now be able to access Investbrain in the browser by visiting:
 
 ```bash
 http://localhost:8000/register
@@ -212,6 +214,14 @@ docker exec -it investbrain-app tail -f storage/logs/laravel.log
 
 <details>
 
+**<summary>Application styling is broken and images are too big</summary>**
+
+If you're serving Investbrain from a DNS name (e.g. example.com), it's likely that you haven't updated the `ASSET_URL` environment yet. The URL provided there will be used to generate absolute URLs for images, JS, and CSS assets on the front end of the application.
+
+</details>
+
+<details>
+
 **<summary>Market data not refreshing on fresh install</summary>**
 
 If you're unable to refresh market data out of the box (i.e. your market data provider is set to Yahoo), there is a chance Yahoo is being blocked by a firewall or adblocker.  Pihole is known to block `fc.yahoo.com` which is the domain used to query Yahoo. 

SECURITY.md

@@ -4,7 +4,8 @@
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 1.0.x   | :white_check_mark: |
+| 1.1.x   | :white_check_mark: |
+| 1.0.x   | :x: |
 | < 1.0.0   | :x:                |
 
 ## Reporting a Vulnerability

app/Actions/Fortify/CreateNewUser.php

@@ -1,13 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Actions\Fortify;
 
 use App\Models\User;
 use App\Traits\WithTrimStrings;
-use Laravel\Jetstream\Jetstream;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
 use Laravel\Fortify\Contracts\CreatesNewUsers;
+use Laravel\Jetstream\Jetstream;
 
 class CreateNewUser implements CreatesNewUsers
 {

app/Actions/Fortify/PasswordValidationRules.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Actions\Fortify;
 
 use Illuminate\Validation\Rules\Password;

app/Actions/Fortify/ResetUserPassword.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Actions\Fortify;
 
 use App\Models\User;

app/Actions/Fortify/UpdateUserPassword.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Actions\Fortify;
 
 use App\Models\User;

app/Actions/Fortify/UpdateUserProfileInformation.php

@@ -1,18 +1,20 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Actions\Fortify;
 
 use App\Models\User;
 use App\Traits\WithTrimStrings;
-use Illuminate\Validation\Rule;
-use Illuminate\Support\Facades\Validator;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rule;
 use Laravel\Fortify\Contracts\UpdatesUserProfileInformation;
 
 class UpdateUserProfileInformation implements UpdatesUserProfileInformation
 {
     use WithTrimStrings;
-    
+
     /**
      * Validate and update the given user's profile information.
      *

app/Actions/Jetstream/DeleteUser.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Actions\Jetstream;
 
 use App\Models\User;

app/Console/Commands/CaptureDailyChange.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Console\Commands;
 
 use App\Models\Portfolio;
@@ -38,9 +40,9 @@ class CaptureDailyChange extends Command
      */
     public function handle()
     {
-        Portfolio::with('holdings.market_data')->get()->each(function($portfolio){
+        Portfolio::with('holdings.market_data')->get()->each(function ($portfolio) {
 
-            $this->line('Capturing daily change for ' . $portfolio->title);
+            $this->line('Capturing daily change for '.$portfolio->title);
 
             $total_cost_basis = $portfolio->holdings->sum('total_cost_basis');
 
@@ -48,7 +50,7 @@ class CaptureDailyChange extends Command
 
             $realized_gains = $portfolio->holdings->sum('realized_gain_dollars');
 
-            $total_market_value = $portfolio->holdings->sum(function($holding) {
+            $total_market_value = $portfolio->holdings->sum(function ($holding) {
                 return $holding->market_data->market_value * $holding->quantity;
             });
 
@@ -58,7 +60,7 @@ class CaptureDailyChange extends Command
                 'total_cost_basis' => $total_cost_basis,
                 'total_gain' => $total_market_value - $total_cost_basis,
                 'total_dividends_earned' => $total_dividends,
-                'realized_gains' => $realized_gains
+                'realized_gains' => $realized_gains,
             ]);
         });
     }

app/Console/Commands/RefreshDividendData.php

@@ -1,9 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Console\Commands;
 
-use App\Models\Holding;
 use App\Models\Dividend;
+use App\Models\Holding;
 use Illuminate\Console\Command;
 
 class RefreshDividendData extends Command
@@ -43,17 +45,17 @@ class RefreshDividendData extends Command
     {
         $holdings = Holding::distinct();
 
-        if (!($this->option('force') ?? false)) {
+        if (! ($this->option('force') ?? false)) {
             $holdings->where('quantity', '>', 0);
-        } 
+        }
 
         if ($this->option('user')) {
             $holdings->myHoldings($this->option('user'));
         }
 
         foreach ($holdings->get(['symbol']) as $holding) {
-            $this->line('Refreshing ' . $holding->symbol);
-            
+            $this->line('Refreshing '.$holding->symbol);
+
             Dividend::refreshDividendData($holding->symbol);
         }
     }

app/Console/Commands/RefreshMarketData.php

@@ -1,10 +1,13 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Console\Commands;
 
 use App\Models\Holding;
 use App\Models\MarketData;
 use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Log;
 
 class RefreshMarketData extends Command
 {
@@ -42,20 +45,24 @@ class RefreshMarketData extends Command
     public function handle()
     {
         $force = $this->option('force') ?? false;
-    
+
         // get all symbols from market data
         $holdings = Holding::where('quantity', '>', 0)
-                    ->select(['symbol'])
-                    ->distinct();
-                
+            ->select(['symbol'])
+            ->distinct();
+
         if ($this->option('user')) {
             $holdings->myHoldings($this->option('user'));
         }
 
         foreach ($holdings->get() as $holding) {
-            $this->line('Refreshing ' . $holding->symbol);
+            $this->line('Refreshing '.$holding->symbol);
 
-            MarketData::getMarketData($holding->symbol, $force);
+            try {
+                MarketData::getMarketData($holding->symbol, $force);
+            } catch (\Throwable $e) {
+                Log::error('Could not refresh '.$holding->symbol.' ('.$e->getMessage().')');
+            }
         }
     }
 }

app/Console/Commands/RefreshSplitData.php

@@ -1,9 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Console\Commands;
 
-use App\Models\Split;
 use App\Models\Holding;
+use App\Models\Split;
 use Illuminate\Console\Command;
 
 class RefreshSplitData extends Command
@@ -42,14 +44,14 @@ class RefreshSplitData extends Command
     {
         $holdings = Holding::distinct();
 
-        if (!($this->option('force') ?? false)) {
+        if (! ($this->option('force') ?? false)) {
             $holdings->where('quantity', '>', 0);
-        } 
+        }
 
         foreach ($holdings->get(['symbol']) as $holding) {
-            $this->line('Refreshing ' . $holding->symbol);
-            
+            $this->line('Refreshing '.$holding->symbol);
+
             Split::refreshSplitData($holding->symbol);
-        }   
+        }
     }
 }

app/Console/Commands/SyncDailyChange.php

@@ -1,10 +1,13 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Console\Commands;
 
 use App\Models\Portfolio;
 use Illuminate\Console\Command;
 use Illuminate\Contracts\Console\PromptsForMissingInput;
+
 use function Laravel\Prompts\search;
 
 class SyncDailyChange extends Command implements PromptsForMissingInput
@@ -61,14 +64,14 @@ class SyncDailyChange extends Command implements PromptsForMissingInput
     public function handle()
     {
         try {
-            
+
             $portfolio = Portfolio::findOrFail($this->argument('portfolio_id'));
 
             $this->line('Syncing daily change history... This may take a moment.');
 
             $portfolio->syncDailyChanges();
 
-            $this->line('Awesome! Daily change history for '. $portfolio->title .' has been completed.');
+            $this->line('Awesome! Daily change history for '.$portfolio->title.' has been completed.');
 
         } catch (\Throwable $e) {
 

app/Console/Commands/SyncHoldingData.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Console\Commands;
 
 use App\Models\Holding;
@@ -47,7 +49,7 @@ class SyncHoldingData extends Command
         }
 
         foreach ($holdings->get() as $holding) {
-            $this->line('Refreshing ' . $holding->symbol);
+            $this->line('Refreshing '.$holding->symbol);
 
             $holding->syncTransactionsAndDividends();
         }

app/Exports/BackupExport.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Exports;
 
 use App\Exports\Sheets\DailyChangesSheet;
@@ -14,18 +16,14 @@ class BackupExport implements WithMultipleSheets
 
     public function __construct(
         public bool $empty = false
-    )
-    { }
+    ) {}
 
-    /**
-     * @return array
-     */
     public function sheets(): array
     {
-            return [
-                new PortfoliosSheet($this->empty),
-                new TransactionsSheet($this->empty),
-                new DailyChangesSheet($this->empty)
-            ];
+        return [
+            new PortfoliosSheet($this->empty),
+            new TransactionsSheet($this->empty),
+            new DailyChangesSheet($this->empty),
+        ];
     }
 }

app/Exports/Sheets/DailyChangesSheet.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Exports\Sheets;
 
 use App\Models\DailyChange;
@@ -11,7 +13,7 @@ class DailyChangesSheet implements FromCollection, WithHeadings, WithTitle
 {
     public function __construct(
         public bool $empty = false
-    ) { }
+    ) {}
 
     public function headings(): array
     {
@@ -23,21 +25,18 @@ class DailyChangesSheet implements FromCollection, WithHeadings, WithTitle
             'Total Gain',
             'Total Dividends Earned',
             'Realized Gains',
-            'Annotation'
+            'Annotation',
         ];
     }
 
     /**
-    * @return \Illuminate\Support\Collection
-    */
+     * @return \Illuminate\Support\Collection
+     */
     public function collection()
     {
         return $this->empty ? collect() : DailyChange::myDailyChanges()->get();
     }
 
-     /**
-     * @return string
-     */
     public function title(): string
     {
         return 'Daily Changes';

app/Exports/Sheets/PortfoliosSheet.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Exports\Sheets;
 
 use App\Models\Portfolio;
@@ -11,8 +13,8 @@ class PortfoliosSheet implements FromCollection, WithHeadings, WithTitle
 {
     public function __construct(
         public bool $empty = false
-    ) { }
-    
+    ) {}
+
     public function headings(): array
     {
         return [
@@ -21,21 +23,18 @@ class PortfoliosSheet implements FromCollection, WithHeadings, WithTitle
             'Notes',
             'Wishlist',
             'Created',
-            'Updated'
+            'Updated',
         ];
     }
 
     /**
-    * @return \Illuminate\Support\Collection
-    */
+     * @return \Illuminate\Support\Collection
+     */
     public function collection()
     {
         return $this->empty ? collect() : Portfolio::myPortfolios()->get();
     }
 
-     /**
-     * @return string
-     */
     public function title(): string
     {
         return 'Portfolios';

app/Exports/Sheets/TransactionsSheet.php

@@ -1,17 +1,19 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Exports\Sheets;
 
 use App\Models\Transaction;
-use Maatwebsite\Excel\Concerns\WithTitle;
-use Maatwebsite\Excel\Concerns\WithHeadings;
 use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithTitle;
 
 class TransactionsSheet implements FromCollection, WithHeadings, WithTitle
 {
     public function __construct(
         public bool $empty = false
-    ) { }
+    ) {}
 
     public function headings(): array
     {
@@ -27,21 +29,18 @@ class TransactionsSheet implements FromCollection, WithHeadings, WithTitle
             'Reinvested Dividend',
             'Date',
             'Created',
-            'Updated'
+            'Updated',
         ];
     }
 
     /**
-    * @return \Illuminate\Support\Collection
-    */
+     * @return \Illuminate\Support\Collection
+     */
     public function collection()
     {
         return $this->empty ? collect() : Transaction::myTransactions()->get();
     }
 
-     /**
-     * @return string
-     */
     public function title(): string
     {
         return 'Transactions';

app/Http/ApiControllers/Controller.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\ApiControllers;
+
+abstract class Controller
+{
+    //
+}

app/Http/ApiControllers/HoldingController.php

@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\ApiControllers;
+
+use App\Http\ApiControllers\Controller as ApiController;
+use App\Http\Requests\HoldingRequest;
+use App\Http\Resources\HoldingResource;
+use App\Models\Holding;
+use App\Models\Portfolio;
+use HackerEsq\FilterModels\FilterModels;
+use Illuminate\Support\Facades\Gate;
+
+class HoldingController extends ApiController
+{
+    public function index(FilterModels $filters)
+    {
+
+        $filters->setQuery(Holding::query());
+        $filters->setScopes(['myHoldings']);
+        $filters->setEagerRelations(['market_data', 'transactions']);
+        $filters->setSearchableColumns(['symbol']);
+
+        return HoldingResource::collection($filters->paginated());
+    }
+
+    public function show(Portfolio $portfolio, string $symbol)
+    {
+
+        Gate::authorize('readOnly', $portfolio);
+
+        $holding = $portfolio->holdings()->symbol($symbol)->firstOrFail();
+
+        return HoldingResource::make($holding);
+    }
+
+    public function update(HoldingRequest $request, Portfolio $portfolio, string $symbol)
+    {
+
+        Gate::authorize('fullAccess', $portfolio);
+
+        $holding = $portfolio->holdings()->symbol($symbol)->firstOrFail();
+
+        $holding->update($request->validated());
+
+        return HoldingResource::make($holding);
+    }
+}

app/Http/ApiControllers/MarketDataController.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\ApiControllers;
+
+use App\Http\ApiControllers\Controller as ApiController;
+use App\Http\Resources\MarketDataResource;
+use App\Models\MarketData;
+use Illuminate\Http\Request;
+
+class MarketDataController extends ApiController
+{
+    public function show(Request $request, string $symbol)
+    {
+
+        try {
+
+            return MarketDataResource::make(
+                MarketData::getMarketData($symbol)
+            );
+        } catch (\Throwable $e) {
+
+            return response([
+                'message' => 'Symbol '.$symbol.' not found.',
+            ], 404);
+        }
+
+    }
+}

app/Http/ApiControllers/PortfolioController.php

@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\ApiControllers;
+
+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
+{
+    public function index(FilterModels $filters)
+    {
+        $filters->setQuery(Portfolio::query());
+        $filters->setScopes(['myPortfolios']);
+        $filters->setEagerRelations(['users', 'transactions', 'holdings']);
+        $filters->setFilterableRelations(['holdings.symbol']);
+        $filters->setSearchableColumns(['title', 'notes']);
+
+        return PortfolioResource::collection($filters->paginated());
+    }
+
+    public function store(PortfolioRequest $request)
+    {
+        $portfolio = Portfolio::create($request->validated());
+
+        return PortfolioResource::make($portfolio);
+    }
+
+    public function show(Portfolio $portfolio)
+    {
+        Gate::authorize('readOnly', $portfolio);
+
+        return PortfolioResource::make($portfolio);
+    }
+
+    public function update(PortfolioRequest $request, Portfolio $portfolio)
+    {
+        Gate::authorize('fullAccess', $portfolio);
+
+        $portfolio->update($request->validated());
+
+        return PortfolioResource::make($portfolio);
+    }
+
+    public function destroy(Portfolio $portfolio)
+    {
+        Gate::authorize('fullAccess', $portfolio);
+
+        $portfolio->delete();
+
+        return response()->noContent();
+    }
+}

app/Http/ApiControllers/TransactionController.php

@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\ApiControllers;
+
+use App\Http\ApiControllers\Controller as ApiController;
+use App\Http\Requests\TransactionRequest;
+use App\Http\Resources\TransactionResource;
+use App\Models\Transaction;
+use HackerEsq\FilterModels\FilterModels;
+use Illuminate\Support\Facades\Gate;
+
+class TransactionController extends ApiController
+{
+    public function index(FilterModels $filters)
+    {
+
+        $filters->setQuery(Transaction::query());
+        $filters->setScopes(['myTransactions']);
+        $filters->setSearchableColumns(['symbol']);
+
+        return TransactionResource::collection($filters->paginated());
+    }
+
+    public function store(TransactionRequest $request)
+    {
+        Gate::authorize('fullAccess', $request->portfolio);
+
+        $transaction = Transaction::create($request->validated());
+
+        return TransactionResource::make($transaction);
+    }
+
+    public function show(Transaction $transaction)
+    {
+        Gate::authorize('readOnly', $transaction->portfolio);
+
+        return TransactionResource::make($transaction);
+    }
+
+    public function update(TransactionRequest $request, Transaction $transaction)
+    {
+        Gate::authorize('fullAccess', $transaction->portfolio);
+
+        $transaction->update($request->validated());
+
+        return TransactionResource::make($transaction);
+    }
+
+    public function destroy(Transaction $transaction)
+    {
+        Gate::authorize('fullAccess', $transaction->portfolio);
+
+        $transaction->delete();
+
+        return response()->noContent();
+    }
+}

app/Http/ApiControllers/UserController.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\ApiControllers;
+
+use App\Http\ApiControllers\Controller as ApiController;
+use App\Http\Resources\UserResource;
+use Illuminate\Http\Request;
+
+class UserController extends ApiController
+{
+    public function me(Request $request)
+    {
+        return UserResource::make($request->user());
+    }
+}

app/Http/Controllers/ConnectedAccountController.php

@@ -1,23 +1,22 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Http\Controllers;
 
-use Exception;
-use App\Models\User;
 use App\Models\ConnectedAccount;
-use Illuminate\Support\MessageBag;
-use App\Http\Controllers\Controller;
+use App\Models\User;
+use App\Notifications\VerifyConnectedAccountNotification;
+use Exception;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Blade;
+use Illuminate\Support\MessageBag;
 use Laravel\Socialite\Facades\Socialite;
-use App\Notifications\VerifyConnectedAccountNotification;
 
 class ConnectedAccountController extends Controller
 {
-
     /**
      * Redirect the user to the GitHub authentication page.
-     *
      */
     public function redirectToProvider(string $provider)
     {
@@ -28,7 +27,6 @@ class ConnectedAccountController extends Controller
 
     /**
      * Obtain the user information from GitHub.
-     *
      */
     public function handleProviderCallback(string $provider)
     {
@@ -45,21 +43,21 @@ class ConnectedAccountController extends Controller
         }
 
         // check if this account is already linked
-        $connected_account = ConnectedAccount::firstOrNew([ 
+        $connected_account = ConnectedAccount::firstOrNew([
             'provider' => $provider,
-            'provider_id' => $providerUser->id
+            'provider_id' => $providerUser->id,
         ], [
             'token' => $providerUser->token,
             'secret' => $providerUser->tokenSecret,
             'refresh_token' => $providerUser->refreshToken,
             'expires_at' => $providerUser->expiresIn,
-            'verified_at' => false
+            'verified_at' => false,
         ]);
 
         // already linked and verified, let's go login!
         if (
-            $connected_account->exists 
-            && !is_null($connected_account->verified_at)
+            $connected_account->exists
+            && ! is_null($connected_account->verified_at)
         ) {
 
             Auth::login($connected_account->user, true);
@@ -68,20 +66,20 @@ class ConnectedAccountController extends Controller
         }
 
         // new user, let's create one
-        if (!$user = User::where('email', $providerUser->email)->first()) {
+        if (! $user = User::where('email', $providerUser->email)->first()) {
 
             $user = User::create([
                 'name' => $providerUser->name,
                 'email' => $providerUser->email,
-                'email_verified_at' => now()
+                'email_verified_at' => now(),
             ]);
-    
+
             $connected_account->user_id = $user->id;
             $connected_account->verified_at = now();
             $connected_account->save();
-    
+
             Auth::login($user, true);
-    
+
             return redirect(route('dashboard'));
         }
 
@@ -92,23 +90,23 @@ class ConnectedAccountController extends Controller
         $user->notify(new VerifyConnectedAccountNotification($connected_account->id));
 
         return redirect(route('login'))
-                ->with('status', __(
-                    'Account already exists. Check your email to connect your :provider account.', 
-                    ['provider' => config("services.$provider.name")]
-                ));
+            ->with('status', __(
+                'Account already exists. Check your email to connect your :provider account.',
+                ['provider' => config("services.$provider.name")]
+            ));
     }
 
     protected function validateProvider($provider): void
     {
-        if (!in_array($provider, explode(',', config('services.enabled_login_providers')))) {
-            
+        if (! in_array($provider, explode(',', config('services.enabled_login_providers')))) {
+
             throw new Exception('Please provide a valid social provider.');
         }
     }
 
     public function verify(ConnectedAccount $connected_account)
     {
-        if (!$connected_account->verified_at) {
+        if (! $connected_account->verified_at) {
 
             // mark request as verified
             $connected_account->verified_at = now();
@@ -128,8 +126,8 @@ class ConnectedAccountController extends Controller
                 'css' => 'alert-success',
                 'icon' => Blade::render("<x-mary-icon class='w-7 h-7' name='o-check-circle' />"),
                 'position' => 'toast-top toast-end',
-                'timeout' => '5000'
-            ]
+                'timeout' => '5000',
+            ],
         ]));
     }
 }

app/Http/Controllers/Controller.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Http\Controllers;
 
 abstract class Controller

app/Http/Controllers/DashboardController.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Http\Controllers;
 
 use App\Models\Holding;
@@ -16,15 +18,15 @@ class DashboardController extends Controller
 
         // get portfolio metrics
         $metrics = cache()->remember(
-            'dashboard-metrics-' . $user->id, 
-            10, 
+            'dashboard-metrics-'.$user->id,
+            10,
             function () {
                 return
                  Holding::query()
-                    ->myHoldings()
-                    ->withoutWishlists()
-                    ->withPortfolioMetrics()
-                    ->first();
+                     ->myHoldings()
+                     ->withoutWishlists()
+                     ->withPortfolioMetrics()
+                     ->first();
             }
         );
 

app/Http/Controllers/HoldingController.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Http\Controllers;
 
 use App\Models\Holding;
@@ -8,21 +10,20 @@ use Illuminate\Http\Request;
 
 class HoldingController extends Controller
 {
-
     /**
      * 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([
-                            'market_data',
-                            'transactions' => function ($query) use ($symbol) {
-                                $query->where('transactions.symbol', $symbol);
-                            }
-                        ])
-                        ->symbol($symbol)
-                        ->portfolio($portfolio->id)
-                        ->firstOrFail();
+            'market_data',
+            'transactions' => function ($query) use ($symbol) {
+                $query->where('transactions.symbol', $symbol);
+            },
+        ])
+            ->symbol($symbol)
+            ->portfolio($portfolio->id)
+            ->firstOrFail();
 
         $formattedTransactions = $holding->getFormattedTransactions();
 

app/Http/Controllers/InvitedOnboardingController.php

@@ -1,23 +1,22 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Http\Controllers;
 
-use App\Models\User;
 use App\Models\Portfolio;
+use App\Models\User;
 use Illuminate\Http\Request;
-use App\Http\Controllers\Controller;
 
 class InvitedOnboardingController extends Controller
 {
-
     /**
      * Check if the invited user needs a password?
-     *
      */
     public function __invoke(Request $request, Portfolio $portfolio, User $user)
     {
 
-        if (!$request->hasValidSignature()) {
+        if (! $request->hasValidSignature()) {
             abort(401, 'Invalid signature');
         }
 
@@ -27,7 +26,7 @@ class InvitedOnboardingController extends Controller
             // route to create password form
             return view('auth.invited-onboarding', [
                 'portfolio' => $portfolio,
-                'user' => $user
+                'user' => $user,
             ]);
         }
 

app/Http/Controllers/PortfolioController.php

@@ -1,14 +1,16 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Http\Controllers;
 
 use App\Models\Holding;
 use App\Models\Portfolio;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Gate;
 
 class PortfolioController extends Controller
 {
-
     /**
      * Show the form for creating a new resource.
      */
@@ -22,26 +24,24 @@ class PortfolioController extends Controller
      */
     public function show(Request $request, Portfolio $portfolio)
     {
-        if ($request->user()->cannot('readOnly', $portfolio)) {
-            abort(403);
-        }
+        Gate::authorize('readOnly', $portfolio);
 
         $portfolio->load(['transactions', 'holdings']);
-        
+
         // get portfolio metrics
         $metrics = cache()->remember(
-            'portfolio-metrics-' . $portfolio->id, 
-            60, 
+            'portfolio-metrics-'.$portfolio->id,
+            60,
             function () use ($portfolio) {
                 return Holding::query()
-                        ->portfolio($portfolio->id)
-                        ->withPortfolioMetrics()
-                        ->first();
+                    ->portfolio($portfolio->id)
+                    ->withPortfolioMetrics()
+                    ->first();
             }
         );
 
         $formattedHoldings = $portfolio->getFormattedHoldings();
-        
+
         return view('portfolio.show', compact(['portfolio', 'metrics', 'formattedHoldings']));
     }
 }

app/Http/Controllers/TransactionController.php

@@ -1,10 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Http\Controllers;
 
 class TransactionController extends Controller
 {
-
     /**
      * Display the specified resource.
      */

app/Http/Middleware/SetLocale.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Http\Middleware;
 
 use Closure;
@@ -14,7 +16,7 @@ class SetLocale
      */
     public function handle(Request $request, Closure $next)
     {
-        if (!session()->has('locale')) {
+        if (! session()->has('locale')) {
             session()->put('locale', $request->getPreferredLanguage(
                 config('app.available_locales')
             ));
@@ -24,4 +26,4 @@ class SetLocale
 
         return $next($request);
     }
-}
+}

app/Http/Requests/FormRequest.php

@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest as BaseFormRequest;
+
+class FormRequest extends BaseFormRequest
+{
+    public function requestOrModelValue($key, $model): mixed
+    {
+        return $this->request->get($key) ?? $this->{$model}?->{$key};
+    }
+}

app/Http/Requests/HoldingRequest.php

@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests;
+
+class HoldingRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+
+        $rules = [
+            'reinvest_dividends' => ['sometimes', 'boolean'],
+        ];
+
+        return $rules;
+    }
+}

app/Http/Requests/PortfolioRequest.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests;
+
+class PortfolioRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+
+        $rules = [
+            'title' => ['required', 'string', 'min:5', 'max:255'],
+            'notes' => ['sometimes', 'nullable', 'string'],
+            'wishlist' => ['sometimes', 'nullable', 'boolean'],
+        ];
+
+        if (! is_null($this->portfolio)) {
+            $rules['title'][0] = 'sometimes';
+        }
+
+        return $rules;
+    }
+}

app/Http/Requests/TransactionRequest.php

@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Requests;
+
+use App\Models\Portfolio;
+use App\Rules\QuantityValidationRule;
+use App\Rules\SymbolValidationRule;
+
+class TransactionRequest extends FormRequest
+{
+    protected function prepareForValidation(): void
+    {
+
+        $this->merge([
+            'portfolio' => Portfolio::find($this->requestOrModelValue('portfolio_id', 'transaction')),
+        ]);
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
+     */
+    public function rules(): array
+    {
+
+        $rules = [
+            'portfolio_id' => ['required', 'exists:portfolios,id'],
+            'symbol' => ['required', 'string', new SymbolValidationRule],
+            'transaction_type' => ['required', 'string', 'in:BUY,SELL'],
+            'date' => ['required', 'date_format:Y-m-d', 'before_or_equal:'.now()->format('Y-m-d')],
+            'quantity' => [
+                'required',
+                'numeric',
+                'min:0',
+                new QuantityValidationRule(
+                    $this->input('portfolio'),
+                    $this->requestOrModelValue('symbol', 'transaction'),
+                    $this->requestOrModelValue('transaction_type', 'transaction'),
+                    $this->requestOrModelValue('date', 'transaction')
+                ),
+            ],
+            'cost_basis' => ['exclude_if:transaction_type,SELL', 'min:0', 'numeric'],
+            'sale_price' => ['exclude_if:transaction_type,BUY', 'min:0', 'numeric'],
+        ];
+
+        if (! is_null($this->transaction)) {
+            $rules['portfolio_id'][0] = 'sometimes';
+            $rules['symbol'][0] = 'sometimes';
+            $rules['transaction_type'][0] = 'sometimes';
+            $rules['date'][0] = 'sometimes';
+            $rules['quantity'][0] = 'sometimes';
+
+            if (
+                $this->requestOrModelValue('transaction_type', 'transaction') == 'SELL'
+                && $this->requestOrModelValue('sale_price', 'transaction') == null
+            ) {
+                $rules['sale_price'][0] = 'required';
+            } elseif (
+                $this->requestOrModelValue('transaction_type', 'transaction') == 'BUY'
+                && $this->requestOrModelValue('cost_basis', 'transaction') == null
+            ) {
+                $rules['cost_basis'][0] = 'required';
+            }
+        }
+
+        return $rules;
+    }
+}

app/Http/Resources/HoldingResource.php

@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class HoldingResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->id,
+            'portfolio_id' => $this->portfolio_id,
+            'symbol' => $this->symbol,
+            'quantity' => $this->quantity,
+            'reinvest_dividends' => $this->reinvest_dividends,
+            'average_cost_basis' => $this->average_cost_basis,
+            'total_cost_basis' => $this->total_cost_basis,
+            'realized_gain_dollars' => $this->realized_gain_dollars,
+            'dividends_earned' => $this->dividends_earned,
+            'splits_synced_at' => $this->splits_synced_at,
+            'total_market_value' => $this->total_market_value,
+            'market_gain_dollars' => $this->market_gain_dollars,
+            'market_gain_percent' => $this->market_gain_percent,
+            'created_at' => $this->created_at,
+            'updated_at' => $this->updated_at,
+        ];
+    }
+}

app/Http/Resources/MarketDataResource.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class MarketDataResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        return [
+            'symbol' => $this->symbol,
+            'name' => $this->name,
+            'market_value' => $this->market_value,
+            'fifty_two_week_low' => $this->fifty_two_week_low,
+            'fifty_two_week_high' => $this->fifty_two_week_high,
+            'last_dividend_date' => $this->last_dividend_date,
+            'last_dividend_amount' => $this->last_dividend_amount,
+            'dividend_yield' => $this->dividend_yield,
+            'market_cap' => $this->market_cap,
+            'trailing_pe' => $this->trailing_pe,
+            'forward_pe' => $this->forward_pe,
+            'book_value' => $this->book_value,
+            'created_at' => $this->created_at,
+            'updated_at' => $this->updated_at,
+        ];
+    }
+}

app/Http/Resources/PortfolioResource.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class PortfolioResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->id,
+            'title' => $this->title,
+            'notes' => $this->notes,
+            'wishlist' => $this->wishlist,
+            'owner' => UserResource::make($this->owner),
+            'transactions' => TransactionResource::collection($this->whenLoaded('transactions')),
+            'holdings' => HoldingResource::collection($this->whenLoaded('holdings')),
+            'created_at' => $this->created_at,
+            'updated_at' => $this->updated_at,
+        ];
+    }
+}

app/Http/Resources/TransactionResource.php

@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class TransactionResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->id,
+            'symbol' => $this->symbol,
+            'portfolio_id' => $this->portfolio_id,
+            'transaction_type' => $this->transaction_type,
+            'quantity' => $this->quantity,
+            'cost_basis' => $this->cost_basis,
+            'sale_price' => $this->sale_price,
+            'split' => $this->split,
+            'reinvested_dividend' => $this->reinvested_dividend,
+            'date' => $this->date,
+            'created_at' => $this->created_at,
+            'updated_at' => $this->updated_at,
+        ];
+    }
+}

app/Http/Resources/UserResource.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class UserResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+
+        return [
+            'id' => $this->id,
+            'name' => $this->name,
+            'email' => $this->email,
+            'profile_photo_url' => $this->profile_photo_url,
+            'created_at' => $this->created_at,
+            'updated_at' => $this->updated_at,
+        ];
+    }
+}

app/Imports/BackupImport.php

@@ -1,40 +1,38 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Imports;
 
-use App\Models\User;
-use App\Imports\Sheets\PortfoliosSheet;
-use Illuminate\Support\Facades\Artisan;
+use App\Console\Commands\RefreshDividendData;
+use App\Console\Commands\RefreshMarketData;
 use App\Console\Commands\SyncDailyChange;
 use App\Console\Commands\SyncHoldingData;
 use App\Imports\Sheets\DailyChangesSheet;
+use App\Imports\Sheets\PortfoliosSheet;
 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\WithEvents;
+use Maatwebsite\Excel\Concerns\WithMultipleSheets;
+use Maatwebsite\Excel\Events\AfterImport;
 use Maatwebsite\Excel\Events\BeforeImport;
 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;
 
     public function __construct(
         public BackupImportModel $backupImportModel
-    ) { }
+    ) {}
 
-    /**
-     * @return array
-     */
     public function registerEvents(): array
     {
         return [
-            BeforeImport::class => fn() => $this->backupImportModel->update([
+            BeforeImport::class => fn () => $this->backupImportModel->update([
                 'status' => 'in_progress',
                 'message' => __('Import is in progress...'),
             ]),
@@ -43,24 +41,24 @@ class BackupImport implements WithMultipleSheets, WithEvents
                 $this->backupImportModel->update([
                     'status' => 'success',
                     'message' => 'Import completed successfully!',
-                    'completed_at' => now()
+                    'completed_at' => now(),
                 ]);
-                
+
                 Artisan::queue(RefreshMarketData::class, ['--user' => $this->backupImportModel->user_id, '--force' => true])
                     ->chain([
-                        fn() => Artisan::call(RefreshDividendData::class, ['--user' => $this->backupImportModel->user_id, '--force' => true]),
-                        fn() => Artisan::call(SyncHoldingData::class, ['--user' => $this->backupImportModel->user_id]),
-                        fn() => User::find($this->backupImportModel->user_id)->portfolios->each(function($portfolio) {
+                        fn () => Artisan::call(RefreshDividendData::class, ['--user' => $this->backupImportModel->user_id, '--force' => true]),
+                        fn () => Artisan::call(SyncHoldingData::class, ['--user' => $this->backupImportModel->user_id]),
+                        fn () => User::find($this->backupImportModel->user_id)->portfolios->each(function ($portfolio) {
 
                             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',
-                'message' => 'Error: '. substr($event->getException()->getMessage(), 0, 220),
+                'message' => 'Error: '.substr($event->getException()->getMessage(), 0, 220),
                 'has_errors' => true,
-                'completed_at' => now()
+                'completed_at' => now(),
             ]),
         ];
     }

app/Imports/Sheets/DailyChangesSheet.php

@@ -1,44 +1,43 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Imports\Sheets;
 
 use App\Imports\ValidatesPortfolioAccess;
-use App\Models\DailyChange;
 use App\Models\BackupImport;
+use App\Models\DailyChange;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
 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\ToCollection;
+use Maatwebsite\Excel\Concerns\WithEvents;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
 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;
 
     public function __construct(
         public BackupImport $backupImport
-    ) { }
+    ) {}
 
-    /**
-     * @return array
-     */
     public function registerEvents(): array
     {
         return [
-            BeforeSheet::class => function(BeforeSheet $event) {
+            BeforeSheet::class => function (BeforeSheet $event) {
                 DB::commit();
                 $this->backupImport->update([
                     'message' => __('Importing daily changes...'),
                 ]);
                 DB::beginTransaction();
-            }
+            },
         ];
     }
-    
+
     public function collection(Collection $dailyChanges)
     {
         $dailyChanges->chunk($this->batchSize())->each(function ($chunk) {
@@ -56,7 +55,7 @@ class DailyChangesSheet implements ToCollection, WithHeadingRow, WithValidation,
                     'realized_gains' => $dailyChange['realized_gains'],
                     'annotation' => $dailyChange['annotation'],
                     '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 +70,7 @@ class DailyChangesSheet implements ToCollection, WithHeadingRow, WithValidation,
                     'realized_gains',
                     'annotation',
                     'portfolio_id',
-                    'date'
+                    'date',
                 ]
             );
         });
@@ -85,7 +84,7 @@ class DailyChangesSheet implements ToCollection, WithHeadingRow, WithValidation,
     public function rules(): array
     {
         return [
-            'portfolio_id' => ['required', 'uuid'], 
+            'portfolio_id' => ['required', 'uuid'],
             'date' => ['required', 'date'],
             'total_market_value' => ['sometimes', 'nullable', 'numeric'],
             'total_cost_basis' => ['sometimes', 'nullable', 'min:0', 'numeric'],

app/Imports/Sheets/PortfoliosSheet.php

@@ -1,37 +1,36 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Imports\Sheets;
 
-use App\Models\Portfolio;
 use App\Models\BackupImport;
+use App\Models\Portfolio;
 use Illuminate\Support\Collection;
 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\ToCollection;
+use Maatwebsite\Excel\Concerns\WithEvents;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
 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 BackupImport $backupImport
-    ) { }
-    
-    /**
-     * @return array
-     */
+    ) {}
+
     public function registerEvents(): array
     {
         return [
-            BeforeSheet::class => function(BeforeSheet $event) {
+            BeforeSheet::class => function (BeforeSheet $event) {
                 DB::commit();
                 $this->backupImport->update([
                     'message' => __('Importing portfolios...'),
                 ]);
                 DB::beginTransaction();
-            }
+            },
         ];
     }
 
@@ -42,7 +41,7 @@ class PortfoliosSheet implements ToCollection, WithValidation, WithHeadingRow, S
             Portfolio::unguard(); // ensures we can set an owner for the portfolio
 
             $portfolio = Portfolio::fullAccess($this->backupImport->user_id)->updateOrCreate([
-                'id' => $portfolio['portfolio_id']
+                'id' => $portfolio['portfolio_id'],
             ], [
                 'id' => $portfolio['portfolio_id'] ?? null,
                 'title' => $portfolio['title'],

app/Imports/Sheets/TransactionsSheet.php

@@ -1,44 +1,42 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Imports\Sheets;
 
 use App\Imports\ValidatesPortfolioAccess;
+use App\Models\BackupImport;
 use App\Models\Holding;
 use App\Models\Transaction;
-use Illuminate\Support\Str;
-use App\Models\BackupImport;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
-use Maatwebsite\Excel\Events\BeforeSheet;
-use Maatwebsite\Excel\Concerns\WithEvents;
-use Maatwebsite\Excel\Concerns\ToCollection;
+use Illuminate\Support\Str;
 use Maatwebsite\Excel\Concerns\SkipsEmptyRows;
+use Maatwebsite\Excel\Concerns\ToCollection;
+use Maatwebsite\Excel\Concerns\WithEvents;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
 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;
 
     public function __construct(
         public BackupImport $backupImport
-    ) { }
+    ) {}
 
-    /**
-     * @return array
-     */
     public function registerEvents(): array
     {
         return [
-            BeforeSheet::class => function(BeforeSheet $event) {
+            BeforeSheet::class => function (BeforeSheet $event) {
                 DB::commit();
                 $this->backupImport->update([
                     'message' => __('Importing transactions...'),
                 ]);
                 DB::beginTransaction();
-            }
+            },
         ];
     }
 
@@ -62,7 +60,7 @@ class TransactionsSheet implements ToCollection, WithHeadingRow, WithValidation,
                     'sale_price' => $transaction['sale_price'],
                     'split' => boolval($transaction['split']) ? 1 : 0,
                     'reinvested_dividend' => boolval($transaction['reinvested_dividend']) ? 1 : 0,
-                    'date' => Carbon::parse($transaction['date'])->format('Y-m-d')
+                    'date' => Carbon::parse($transaction['date'])->format('Y-m-d'),
                 ];
             });
 
@@ -79,23 +77,23 @@ class TransactionsSheet implements ToCollection, WithHeadingRow, WithValidation,
                     'sale_price',
                     'split',
                     'reinvested_dividend',
-                    'date'
+                    'date',
                 ]
             );
 
             // stub out related holdings
-            $chunk->unique(fn($item) => $item['symbol'] . $item['portfolio_id'])
-                    ->each(function($holding) {
-                        
-                        Holding::firstOrCreate([
-                            'symbol' => $holding['symbol'],
-                            'portfolio_id' => $holding['portfolio_id']
-                        ], [
-                            'quantity' => 0,
-                            'average_cost_basis' => 0,
-                            'splits_synced_at' => now(),
-                        ]);
-                    });
+            $chunk->unique(fn ($item) => $item['symbol'].$item['portfolio_id'])
+                ->each(function ($holding) {
+
+                    Holding::firstOrCreate([
+                        'symbol' => $holding['symbol'],
+                        'portfolio_id' => $holding['portfolio_id'],
+                    ], [
+                        'quantity' => 0,
+                        'average_cost_basis' => 0,
+                        'splits_synced_at' => now(),
+                    ]);
+                });
         });
     }
 

app/Imports/ValidatesPortfolioAccess.php

@@ -1,24 +1,25 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Imports;
 
 use App\Models\Portfolio;
 
 trait ValidatesPortfolioAccess
 {
-
     public function validatePortfolioAccess($collection)
     {
 
         $uniquePortfolios = $collection->unique('portfolio_id')->pluck('portfolio_id');
         $countPortfoliosWithAccess = Portfolio::fullAccess($this->backupImport->user_id)
-                                        ->whereIn('id', $uniquePortfolios)
-                                        ->count();
+            ->whereIn('id', $uniquePortfolios)
+            ->count();
 
         if (
             $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.'));
         }
     }
 }

app/Interfaces/MarketData/AlphaVantageMarketData.php

@@ -1,34 +1,34 @@
 <?php
 
+declare(strict_types=1);
+
 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\Carbon;
 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;
 
 class AlphaVantageMarketData implements MarketDataInterface
 {
-    public function exists(String $symbol): Bool
+    public function exists(string $symbol): bool
     {
 
-        return $this->quote($symbol)->isNotEmpty();
+        return (bool) $this->quote($symbol);
     }
 
-    public function quote(String $symbol): Quote
+    public function quote(string $symbol): Quote
     {
         $quote = Alphavantage::core()->quoteEndpoint($symbol);
         $quote = Arr::get($quote, 'Global Quote', []);
 
-        if (empty($quote)) return new Quote();
-
         $fundamental = cache()->remember(
-            'av-symbol-'.$symbol, 
-            1440, 
+            'av-symbol-'.$symbol,
+            1440,
             function () use ($symbol) {
                 return Alphavantage::fundamentals()->overview($symbol);
             }
@@ -36,7 +36,7 @@ class AlphaVantageMarketData implements MarketDataInterface
 
         return new Quote([
             'name' => Arr::get($fundamental, 'Name'),
-            'symbol' => Arr::get($fundamental, 'Symbol'),
+            'symbol' => $symbol,
             'market_value' => Arr::get($quote, '05. price'),
             'fifty_two_week_high' => Arr::get($fundamental, '52WeekHigh'),
             'fifty_two_week_low' => Arr::get($fundamental, '52WeekLow'),
@@ -49,71 +49,71 @@ class AlphaVantageMarketData implements MarketDataInterface
                         : null,
             'dividend_yield' => Arr::get($fundamental, 'DividendYield') != 'None'
                         ? 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 = Arr::get($dividends, 'data', []);
 
         return collect($dividends)
-                        ->filter(function($dividend) use ($startDate, $endDate) {
-                            
-                            return Carbon::parse(Arr::get($dividend, 'ex_dividend_date'))->between($startDate, $endDate);
-                        })
-                        ->map(function($dividend) use ($symbol) {
-                            
-                            return new Dividend([
-                                'symbol' => $symbol,
-                                'date' => Carbon::parse(Arr::get($dividend, 'ex_dividend_date')),
-                                'dividend_amount' => Arr::get($dividend, 'amount'),
-                            ]);
-                        });
+            ->filter(function ($dividend) use ($startDate, $endDate) {
+
+                return Carbon::parse(Arr::get($dividend, 'ex_dividend_date'))->between($startDate, $endDate);
+            })
+            ->map(function ($dividend) use ($symbol) {
+
+                return new Dividend([
+                    'symbol' => $symbol,
+                    'date' => Carbon::parse(Arr::get($dividend, 'ex_dividend_date')),
+                    'dividend_amount' => Arr::get($dividend, 'amount'),
+                ]);
+            });
     }
 
-    public function splits(String $symbol, $startDate, $endDate): Collection
-    {   
+    public function splits(string $symbol, $startDate, $endDate): Collection
+    {
         $splits = Alphavantage::fundamentals()->splits($symbol);
         $splits = Arr::get($splits, 'data', []);
 
         return collect($splits)
-                        ->filter(function($split) use ($startDate, $endDate) {
-                                            
-                            return Carbon::parse(Arr::get($split, 'effective_date'))->between($startDate, $endDate);
-                        })
-                        ->map(function($split) use ($symbol) {
-                            
-                            return new Split([
-                                'symbol' => $symbol,
-                                'date' => Carbon::parse(Arr::get($split, 'effective_date')),
-                                'split_amount' => Arr::get($split, 'split_factor'),
-                            ]);
-                        });
+            ->filter(function ($split) use ($startDate, $endDate) {
+
+                return Carbon::parse(Arr::get($split, 'effective_date'))->between($startDate, $endDate);
+            })
+            ->map(function ($split) use ($symbol) {
+
+                return new Split([
+                    'symbol' => $symbol,
+                    'date' => Carbon::parse(Arr::get($split, 'effective_date')),
+                    'split_amount' => Arr::get($split, 'split_factor'),
+                ]);
+            });
     }
 
-    public function history(String $symbol, $startDate, $endDate): Collection
+    public function history(string $symbol, $startDate, $endDate): Collection
     {
 
         $history = Alphavantage::timeSeries()->daily($symbol, 'full');
 
         $history = Arr::get($history, 'Time Series (Daily)', []);
-        
+
         return collect($history)
-                    ->filter(function ($history, $date) use ($startDate, $endDate) {
+            ->filter(function ($history, $date) use ($startDate, $endDate) {
 
-                        return Carbon::parse($date)->between($startDate, $endDate);
-                    })
-                    ->mapWithKeys(function($history, $date) use ($symbol) {
+                return Carbon::parse($date)->between($startDate, $endDate);
+            })
+            ->mapWithKeys(function ($history, $date) use ($symbol) {
 
-                        $date = Carbon::parse($date)->format('Y-m-d');
-                        
-                        return [ $date => new Ohlc([
-                                'symbol' => $symbol,
-                                'date' => $date,
-                                'close' => Arr::get($history, '4. close')
-                            ]) ];
-                    });
+                $date = Carbon::parse($date)->format('Y-m-d');
+
+                return [$date => new Ohlc([
+                    'symbol' => $symbol,
+                    'date' => $date,
+                    'close' => Arr::get($history, '4. close'),
+                ])];
+            });
     }
-}
+}

app/Interfaces/MarketData/FakeMarketData.php

@@ -1,23 +1,25 @@
 <?php
 
+declare(strict_types=1);
+
 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\Ohlc;
+use App\Interfaces\MarketData\Types\Quote;
 use App\Interfaces\MarketData\Types\Split;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Collection;
 
 class FakeMarketData implements MarketDataInterface
 {
-    public function exists(String $symbol): Bool
+    public function exists(string $symbol): bool
     {
 
         return true;
     }
 
-    public function quote(String $symbol): Quote
+    public function quote(string $symbol): Quote
     {
 
         return new Quote([
@@ -31,11 +33,11 @@ class FakeMarketData implements MarketDataInterface
             'market_cap' => 9800700600,
             'book_value' => 4.7,
             '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([
@@ -57,23 +59,23 @@ class FakeMarketData implements MarketDataInterface
         ]);
     }
 
-    public function splits(String $symbol, $startDate, $endDate): Collection
-    {   
+    public function splits(string $symbol, $startDate, $endDate): Collection
+    {
 
         return collect([
             new Split([
                 'symbol' => $symbol,
                 'date' => now()->subMonths(36),
                 '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);
 
-        for ($i = 0; $i < $numDays; $i++) { 
+        for ($i = 0; $i < $numDays; $i++) {
 
             $date = now()->subDays($i)->format('Y-m-d');
 
@@ -83,7 +85,7 @@ class FakeMarketData implements MarketDataInterface
                 'close' => rand(150, 400),
             ]);
         }
-        
+
         return collect($series);
     }
-}
+}

app/Interfaces/MarketData/FallbackInterface.php

@@ -1,26 +1,28 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Interfaces\MarketData;
 
 use Illuminate\Support\Facades\Log;
 
 class FallbackInterface
 {
-
     protected string $latest_error;
 
     public function __call($method, $arguments)
     {
 
         $providers = explode(',', config('investbrain.provider', 'yahoo'));
-        
+
         foreach ($providers as $provider) {
 
             $provider = trim($provider);
 
             try {
+                Log::warning("Calling method {$method} ({$provider})");
 
-                if (!in_array($provider, array_keys(config('investbrain.interfaces', [])))) {
+                if (! in_array($provider, array_keys(config('investbrain.interfaces', [])))) {
 
                     throw new \Exception("Provider [{$provider}] is not a valid market data interface.");
                 }
@@ -30,13 +32,20 @@ class FallbackInterface
                 return app()->make($provider_class_name)->$method(...$arguments);
 
             } catch (\Throwable $e) {
-                
+
                 $this->latest_error = $e->getMessage();
 
                 Log::warning("Failed calling method {$method} ({$provider}): {$this->latest_error}");
             }
         }
 
+        // don't need to throw error if calling exists
+        if ($method == 'exists') {
+
+            // symbol prob just doesn't exist
+            return false;
+        }
+
         throw new \Exception("Could not get market data: {$this->latest_error}");
     }
 }

app/Interfaces/MarketData/FinnhubMarketData.php

@@ -1,14 +1,16 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Interfaces\MarketData;
 
-use Illuminate\Support\Arr;
-use Illuminate\Support\Carbon;
-use Illuminate\Support\Collection;
+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 App\Interfaces\MarketData\Types\Dividend;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Collection;
 
 class FinnhubMarketData implements MarketDataInterface
 {
@@ -16,36 +18,35 @@ class FinnhubMarketData implements MarketDataInterface
 
     public function __construct()
     {
-        
+
         $this->client = new \Finnhub\Api\DefaultApi(
-            new \GuzzleHttp\Client(),
+            new \GuzzleHttp\Client,
             \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 (bool) $this->quote($symbol);
     }
 
     public function quote(string $symbol): Quote
     {
         $quote = $this->client->quote($symbol);
 
-        if (empty($quote)) return new Quote();
-    
         $fundamental = cache()->remember(
-            'fh-symbol-'.$symbol, 
-            1440, 
+            'fh-symbol-'.$symbol,
+            1440,
             function () use ($symbol) {
-                return $this->client->companyBasicFinancials($symbol, "all");
+                return $this->client->companyBasicFinancials($symbol, 'all');
             }
         );
-    
+
         return new Quote([
             'name' => Arr::get($fundamental, 'metric.name'),
             'symbol' => $symbol,
-            'market_value' => Arr::get($quote, 'c'), 
+            'market_value' => Arr::get($quote, 'c'),
             'fifty_two_week_high' => Arr::get($fundamental, 'metric.52WeekHigh'),
             'fifty_two_week_low' => Arr::get($fundamental, 'metric.52WeekLow'),
             'forward_pe' => Arr::get($fundamental, 'metric.forwardPE'), // confirm
@@ -54,15 +55,15 @@ class FinnhubMarketData implements MarketDataInterface
             'book_value' => Arr::get($fundamental, 'metric.bookValuePerShare'), // confirm
             'last_dividend_date' => Arr::get($fundamental, 'metric.lastDivDate'), // confirm
             'dividend_yield' => Arr::get($fundamental, 'metric.dividendYield'), // confirm
-        ]);      
+        ]);
     }
 
     public function dividends($symbol, $startDate, $endDate): Collection
     {
         $dividends = $this->client->stockDividends($symbol, $startDate->format('Y-m-d'), $endDate->format('Y-m-d'));
-        
-        return collect($dividends)->map(function($dividend) use ($symbol) {
-                            
+
+        return collect($dividends)->map(function ($dividend) use ($symbol) {
+
             return new Dividend([
                 'symbol' => $symbol,
                 'date' => Carbon::parse(Arr::get($dividend, 'date')),
@@ -72,12 +73,12 @@ class FinnhubMarketData implements MarketDataInterface
     }
 
     public function splits($symbol, $startDate, $endDate): Collection
-    {   
+    {
 
         $splits = $this->client->stockSplits($symbol, $startDate->format('Y-m-d'), $endDate->format('Y-m-d'));
 
-        return collect($splits)->map(function($split) use ($symbol) {
-            
+        return collect($splits)->map(function ($split) use ($symbol) {
+
             return new Split([
                 'symbol' => $symbol,
                 'date' => Carbon::parse(Arr::get($split, 'date')),
@@ -89,18 +90,19 @@ class FinnhubMarketData implements MarketDataInterface
     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', []);
         $closes = Arr::get($history, 'c', []);
 
         return collect($timestamps)->mapWithKeys(function ($timestamp, $index) use ($symbol, $closes) {
             $date = Carbon::createFromTimestamp($timestamp)->format('Y-m-d');
-            return [ $date => new Ohlc([
+
+            return [$date => new Ohlc([
                 'symbol' => $symbol,
                 'date' => $date,
                 'close' => $closes[$index],
-            ]) ];
+            ])];
         });
     }
-}
+}

app/Interfaces/MarketData/MarketDataInterface.php

@@ -1,60 +1,36 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Interfaces\MarketData;
 
-use Illuminate\Support\Collection;
 use App\Interfaces\MarketData\Types\Quote;
+use Illuminate\Support\Collection;
 
 interface MarketDataInterface
 {
     /**
      * 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
-     * 
-     * @param String $symbol
-     * 
-     * @return Quote
      */
-    public function quote(String $symbol): Quote;
+    public function quote(string $symbol): Quote;
 
     /**
      * 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
-     * 
-     * @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
-     * 
-     * @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;
 }

app/Interfaces/MarketData/Types/Dividend.php

@@ -1,16 +1,18 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Interfaces\MarketData\Types;
 
 use DateTime;
 use Illuminate\Support\Carbon;
-use App\Interfaces\MarketData\Types\MarketDataType;
 
 class Dividend extends MarketDataType
 {
     public function setSymbol(string $symbol): self
     {
         $this->items['symbol'] = $symbol;
+
         return $this;
     }
 
@@ -22,6 +24,7 @@ class Dividend extends MarketDataType
     public function setDividendAmount($dividendAmount): self
     {
         $this->items['dividend_amount'] = (float) $dividendAmount;
+
         return $this;
     }
 
@@ -30,9 +33,10 @@ class Dividend extends MarketDataType
         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');
+
         return $this;
     }
 
@@ -40,4 +44,4 @@ class Dividend extends MarketDataType
     {
         return $this->items['date'] ?? null;
     }
-}
+}

app/Interfaces/MarketData/Types/MarketDataType.php

@@ -1,19 +1,18 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Interfaces\MarketData\Types;
 
-use Illuminate\Support\Str;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Str;
 
 class MarketDataType extends Collection
 {
-    /**
-     * 
-     */
     public function __construct($items = [])
     {
 
-        foreach($this->getArrayableItems($items) as $key => $value) {
+        foreach ($this->getArrayableItems($items) as $key => $value) {
 
             $this->{$key} = $value;
         }
@@ -33,4 +32,4 @@ class MarketDataType extends Collection
     {
         return $this->items[$key] ?? null;
     }
-}
+}

app/Interfaces/MarketData/Types/Ohlc.php

@@ -1,16 +1,18 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Interfaces\MarketData\Types;
 
 use DateTime;
 use Illuminate\Support\Carbon;
-use App\Interfaces\MarketData\Types\MarketDataType;
 
 class Ohlc extends MarketDataType
 {
     public function setSymbol(string $symbol): self
     {
         $this->items['symbol'] = $symbol;
+
         return $this;
     }
 
@@ -22,6 +24,7 @@ class Ohlc extends MarketDataType
     public function setOpen($open): self
     {
         $this->items['open'] = (float) $open;
+
         return $this;
     }
 
@@ -33,6 +36,7 @@ class Ohlc extends MarketDataType
     public function setHigh($high): self
     {
         $this->items['high'] = (float) $high;
+
         return $this;
     }
 
@@ -44,6 +48,7 @@ class Ohlc extends MarketDataType
     public function setLow($low): self
     {
         $this->items['low'] = (float) $low;
+
         return $this;
     }
 
@@ -55,6 +60,7 @@ class Ohlc extends MarketDataType
     public function setClose($close): self
     {
         $this->items['close'] = (float) $close;
+
         return $this;
     }
 
@@ -63,9 +69,10 @@ class Ohlc extends MarketDataType
         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');
+
         return $this;
     }
 
@@ -73,4 +80,4 @@ class Ohlc extends MarketDataType
     {
         return $this->items['date'] ?? null;
     }
-}
+}

app/Interfaces/MarketData/Types/Quote.php

@@ -1,16 +1,20 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Interfaces\MarketData\Types;
 
 use DateTime;
 use Illuminate\Support\Carbon;
-use App\Interfaces\MarketData\Types\MarketDataType;
 
 class Quote extends MarketDataType
-{   
+{
     public function setName($name): self
     {
-        $this->items['name'] = (string) $name;
+        if (! empty($name)) {
+            $this->items['name'] = (string) $name;
+        }
+
         return $this;
     }
 
@@ -19,9 +23,10 @@ class Quote extends MarketDataType
         return $this->items['name'] ?? '';
     }
 
-    public function setSymbol($symbol): self
+    public function setSymbol(string $symbol): self
     {
         $this->items['symbol'] = (string) $symbol;
+
         return $this;
     }
 
@@ -30,9 +35,10 @@ class Quote extends MarketDataType
         return $this->items['symbol'] ?? '';
     }
 
-    public function setMarketValue($marketValue): self 
+    public function setMarketValue($marketValue): self
     {
         $this->items['market_value'] = (float) $marketValue;
+
         return $this;
     }
 
@@ -41,9 +47,10 @@ class Quote extends MarketDataType
         return $this->items['market_value'] ?? 0.0;
     }
 
-    public function setFiftyTwoWeekHigh($high): self 
+    public function setFiftyTwoWeekHigh($high): self
     {
         $this->items['fifty_two_week_high'] = (float) $high;
+
         return $this;
     }
 
@@ -52,9 +59,10 @@ class Quote extends MarketDataType
         return $this->items['fifty_two_week_high'] ?? 0.0;
     }
 
-    public function setFiftyTwoWeekLow($low): self 
+    public function setFiftyTwoWeekLow($low): self
     {
         $this->items['fifty_two_week_low'] = (float) $low;
+
         return $this;
     }
 
@@ -63,9 +71,10 @@ class Quote extends MarketDataType
         return $this->items['fifty_two_week_low'] ?? 0.0;
     }
 
-    public function setForwardPE($pe): self 
+    public function setForwardPE($pe): self
     {
         $this->items['forward_pe'] = (float) $pe;
+
         return $this;
     }
 
@@ -74,9 +83,10 @@ class Quote extends MarketDataType
         return $this->items['forward_pe'] ?? 0.0;
     }
 
-    public function setTrailingPE($pe): self 
+    public function setTrailingPE($pe): self
     {
         $this->items['trailing_pe'] = (float) $pe;
+
         return $this;
     }
 
@@ -88,6 +98,7 @@ class Quote extends MarketDataType
     public function setMarketCap($cap): self
     {
         $this->items['market_cap'] = (int) $cap;
+
         return $this;
     }
 
@@ -96,9 +107,10 @@ class Quote extends MarketDataType
         return $this->items['market_cap'] ?? 0;
     }
 
-    public function setBookValue($value): self 
+    public function setBookValue($value): self
     {
         $this->items['book_value'] = (float) $value;
+
         return $this;
     }
 
@@ -110,6 +122,7 @@ class Quote extends MarketDataType
     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');
+
         return $this;
     }
 
@@ -118,9 +131,10 @@ class Quote extends MarketDataType
         return $this->items['last_dividend_date'] ?? null;
     }
 
-    public function setDividendYield($yield): self 
+    public function setDividendYield($yield): self
     {
         $this->items['dividend_yield'] = (float) $yield;
+
         return $this;
     }
 
@@ -128,4 +142,4 @@ class Quote extends MarketDataType
     {
         return $this->items['dividend_yield'] ?? 0.0;
     }
-}
+}

app/Interfaces/MarketData/Types/Split.php

@@ -1,16 +1,18 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Interfaces\MarketData\Types;
 
 use DateTime;
 use Illuminate\Support\Carbon;
-use App\Interfaces\MarketData\Types\MarketDataType;
 
 class Split extends MarketDataType
 {
     public function setSymbol(string $symbol): self
     {
         $this->items['symbol'] = $symbol;
+
         return $this;
     }
 
@@ -22,6 +24,7 @@ class Split extends MarketDataType
     public function setSplitAmount($splitAmount): self
     {
         $this->items['split_amount'] = (float) $splitAmount;
+
         return $this;
     }
 
@@ -30,9 +33,10 @@ class Split extends MarketDataType
         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');
+
         return $this;
     }
 
@@ -40,4 +44,4 @@ class Split extends MarketDataType
     {
         return $this->items['date'] ?? null;
     }
-}
+}

app/Interfaces/MarketData/YahooMarketData.php

@@ -1,95 +1,96 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Interfaces\MarketData;
 
-use Illuminate\Support\Collection;
-use Scheb\YahooFinanceApi\ApiClient;
+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 App\Interfaces\MarketData\Types\Dividend;
+use Illuminate\Support\Collection;
+use Scheb\YahooFinanceApi\ApiClient;
 use Scheb\YahooFinanceApi\ApiClientFactory as YahooFinance;
 
 class YahooMarketData implements MarketDataInterface
 {
     public ApiClient $client;
 
-    public function __construct() {
+    public function __construct()
+    {
 
         // create yahoo finance client factory
         $this->client = YahooFinance::createApiClient();
     }
 
-    public function exists(String $symbol): Bool
+    public function exists(string $symbol): bool
     {
 
-        return $this->quote($symbol)->isNotEmpty();
+        return (bool) $this->quote($symbol);
     }
 
-    public function quote(String $symbol): Quote
+    public function quote(string $symbol): Quote
     {
 
         $quote = $this->client->getQuote($symbol);
 
-        if (empty($quote)) return collect();
-
         return new Quote([
-            'name' => $quote->getLongName() ?? $quote->getShortName(),
-            'symbol' => $quote->getSymbol(),
-            'market_value' => $quote->getRegularMarketPrice(),
-            'fifty_two_week_high' => $quote->getFiftyTwoWeekHigh(),
-            'fifty_two_week_low' => $quote->getFiftyTwoWeekLow(),
-            'forward_pe' => $quote->getForwardPE(),
-            'trailing_pe' => $quote->getTrailingPE(),
-            'market_cap' => $quote->getMarketCap(),
-            'book_value' => $quote->getBookValue(),
-            'last_dividend_date' => $quote->getDividendDate(),
-            'dividend_yield' => $quote->getTrailingAnnualDividendYield() * 100
+            'name' => $quote?->getLongName() ?? $quote?->getShortName(),
+            'symbol' => $symbol,
+            'market_value' => $quote?->getRegularMarketPrice(),
+            'fifty_two_week_high' => $quote?->getFiftyTwoWeekHigh(),
+            'fifty_two_week_low' => $quote?->getFiftyTwoWeekLow(),
+            'forward_pe' => $quote?->getForwardPE(),
+            'trailing_pe' => $quote?->getTrailingPE(),
+            'market_cap' => $quote?->getMarketCap(),
+            'book_value' => $quote?->getBookValue(),
+            'last_dividend_date' => $quote?->getDividendDate(),
+            '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))
-                        ->map(function($dividend) use ($symbol) {
-                            
-                            return new Dividend([
-                                'symbol' => $symbol,
-                                'date' => $dividend->getDate(),
-                                'dividend_amount' => $dividend->getDividends(),
-                            ]);
-                        });
+            ->map(function ($dividend) use ($symbol) {
+
+                return new Dividend([
+                    'symbol' => $symbol,
+                    'date' => $dividend->getDate(),
+                    'dividend_amount' => $dividend->getDividends(),
+                ]);
+            });
     }
 
-    public function splits(String $symbol, $startDate, $endDate): Collection
-    {   
+    public function splits(string $symbol, $startDate, $endDate): Collection
+    {
 
         return collect($this->client->getHistoricalSplitData($symbol, $startDate, $endDate))
-                        ->map(function($split) use ($symbol) {
-                            $split_amount = explode(':', $split->getStockSplits());
+            ->map(function ($split) use ($symbol) {
+                $split_amount = explode(':', $split->getStockSplits());
 
-                            return new Split([
-                                'symbol' => $symbol,
-                                'date' => $split->getDate(),
-                                'split_amount' => $split_amount[0] / $split_amount[1],
-                            ]);
-                        });
+                return new Split([
+                    'symbol' => $symbol,
+                    'date' => $split->getDate(),
+                    'split_amount' => $split_amount[0] / $split_amount[1],
+                ]);
+            });
     }
 
-    public function history(String $symbol, $startDate, $endDate): Collection
+    public function history(string $symbol, $startDate, $endDate): Collection
     {
 
         return collect($this->client->getHistoricalQuoteData($symbol, ApiClient::INTERVAL_1_DAY, $startDate, $endDate))
-            ->mapWithKeys(function($history) use ($symbol) {
+            ->mapWithKeys(function ($history) use ($symbol) {
 
                 $date = $history->getDate()->format('Y-m-d');
 
-                return [ $date => new Ohlc([
-                        'symbol' => $symbol,
-                        'date' => $date,
-                        'close' => $history->getClose(),
-                    ]) ];
+                return [$date => new Ohlc([
+                    'symbol' => $symbol,
+                    'date' => $date,
+                    'close' => $history->getClose(),
+                ])];
             });
     }
-}
+}

app/Jobs/BackupImportJob.php

@@ -1,16 +1,18 @@
 <?php
 
+declare(strict_types=1);
+
 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\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
 {
@@ -19,7 +21,7 @@ class BackupImportJob implements ShouldQueue
     /**
      * The number of times the job may be attempted.
      */
-    public $tries = 1; 
+    public $tries = 1;
 
     /**
      * The number of seconds the job can run before timing out.
@@ -42,7 +44,7 @@ class BackupImportJob implements ShouldQueue
      */
     public function __construct(
         public BackupImport $backupImport
-    ) { 
+    ) {
         $this->user = User::find($this->backupImport->user_id);
     }
 
@@ -50,7 +52,7 @@ class BackupImportJob implements ShouldQueue
      * Execute the job.
      */
     public function handle(): void
-    {                
+    {
         Excel::import(new BackupImportExcel($this->backupImport), $this->backupImport->path, config('livewire.temporary_file_upload.disk', null));
 
         $this->user->notify(new ImportSucceededNotification);
@@ -63,9 +65,9 @@ class BackupImportJob implements ShouldQueue
     {
         $this->backupImport->update([
             'status' => 'failed',
-            'message' => 'Error: '. substr($e->getMessage(), 0, 220),
+            'message' => 'Error: '.substr($e->getMessage(), 0, 220),
             'has_errors' => true,
-            'completed_at' => now()
+            'completed_at' => now(),
         ]);
 
         $this->user->notify(new ImportFailedNotification($e->getMessage()));

app/Models/AiChat.php

@@ -1,9 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Concerns\HasUuids;
+use Illuminate\Database\Eloquent\Model;
 
 class AiChat extends Model
 {
@@ -11,7 +13,7 @@ class AiChat extends Model
 
     protected $fillable = [
         'role',
-        'content'
+        'content',
     ];
 
     protected $hidden = [];
@@ -26,7 +28,8 @@ class AiChat extends Model
         });
     }
 
-    public function user() {
+    public function user()
+    {
         return $this->belongsTo(User::class);
     }
 

app/Models/BackupImport.php

@@ -1,12 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Models;
 
-use Maatwebsite\Excel\Facades\Excel;
-use Illuminate\Database\Eloquent\Model;
-use App\Imports\BackupImport as BackupImportExcel;
 use App\Jobs\BackupImportJob;
 use Illuminate\Database\Eloquent\Concerns\HasUuids;
+use Illuminate\Database\Eloquent\Model;
 
 class BackupImport extends Model
 {
@@ -20,7 +20,7 @@ class BackupImport extends Model
         'status', // pending, in_progress, success, failed
         'message', // Import starting, Import is in progress, Importing portfolios, Importing transactions, Importing daily changes, Import completed successfully
         'has_errors',
-        'completed_at'
+        'completed_at',
     ];
 
     protected static function boot()
@@ -32,9 +32,9 @@ class BackupImport extends Model
             $import->status = 'pending';
             $import->message = __('Import starting...');
         });
-        
+
         static::created(function ($import) {
-            
+
             BackupImportJob::dispatch($import);
         });
     }
@@ -47,7 +47,7 @@ class BackupImport extends Model
     {
         return [
             'has_errors' => 'boolean',
-            'completed_at' => 'datetime'
+            'completed_at' => 'datetime',
         ];
     }
 }

app/Models/ConnectedAccount.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Concerns\HasTimestamps;
@@ -29,7 +31,7 @@ class ConnectedAccount extends Model
     ];
 
     protected $with = [
-        'user'
+        'user',
     ];
 
     /**
@@ -52,4 +54,4 @@ class ConnectedAccount extends Model
     {
         return $this->belongsTo(User::class);
     }
-}
+}

app/Models/DailyChange.php

@@ -1,14 +1,16 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Models;
 
 use App\Traits\HasCompositePrimaryKey;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
 
 class DailyChange extends Model
 {
-    use HasFactory, HasCompositePrimaryKey;
+    use HasCompositePrimaryKey, HasFactory;
 
     public $timestamps = false;
 
@@ -32,13 +34,13 @@ class DailyChange extends Model
     protected $casts = [
         'date' => 'datetime',
     ];
-    
+
     public function scopePortfolio($query, $portfolio)
     {
         return $query->where('portfolio_id', $portfolio);
     }
 
-    public function scopeMyDailyChanges() 
+    public function scopeMyDailyChanges()
     {
         return $this->whereHas('portfolio', function ($query) {
             $query->whereHas('users', function ($query) {
@@ -47,12 +49,13 @@ class DailyChange extends Model
         });
     }
 
-    public function scopeWithoutWishlists($query) {
+    public function scopeWithoutWishlists($query)
+    {
         return $query->whereHas('portfolio', function ($query) {
             $query->where('portfolios.wishlist', 0);
         });
     }
-    
+
     public function portfolio()
     {
         return $this->belongsTo(Portfolio::class);

app/Models/Dividend.php

@@ -1,16 +1,16 @@
 <?php
 
+declare(strict_types=1);
+
 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 Illuminate\Database\Eloquent\Concerns\HasUuids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
 
 class Dividend extends Model
 {
@@ -30,15 +30,18 @@ class Dividend extends Model
         'last_dividend_update' => 'datetime',
     ];
 
-    public function marketData() {
+    public function marketData()
+    {
         return $this->belongsTo(MarketData::class, 'symbol', 'symbol');
     }
 
-    public function holdings() {
+    public function holdings()
+    {
         return $this->hasMany(Holding::class, 'symbol', 'symbol');
     }
 
-    public function transactions() {
+    public function transactions()
+    {
         return $this->hasMany(Transaction::class, 'symbol', 'symbol');
     }
 
@@ -49,7 +52,6 @@ class Dividend extends Model
 
     /**
      * Grab new dividend data
-     *
      */
     public static function refreshDividendData(string $symbol): void
     {
@@ -64,11 +66,11 @@ class Dividend extends Model
         $end_date = now();
 
         // nope, refresh forward looking only
-        if ( $dividends_meta->total_dividends ) {
-            
+        if ($dividends_meta->total_dividends) {
+
             $start_date = $dividends_meta->last_dividend_update->addHours(24);
         }
-        
+
         // skip refresh if there's already recent data
         if ($start_date->greaterThan($end_date)) {
 
@@ -83,7 +85,7 @@ class Dividend extends Model
         // ah, we found some dividends...
         if ($dividend_data->isNotEmpty()) {
             // create mass insert
-            foreach ($dividend_data as $index => $dividend){
+            foreach ($dividend_data as $index => $dividend) {
                 $dividend_data[$index] = [...$dividend, ...['id' => Str::uuid()->toString(), 'updated_at' => now(), 'created_at' => now()]];
             }
 
@@ -108,33 +110,39 @@ class Dividend extends Model
     public static function syncHoldings(string $symbol): void
     {
         // group by holdings
-        $dividends = self::select(['holdings.portfolio_id', 'dividends.date', 'dividends.symbol', 'dividends.dividend_amount'])
-                        ->selectRaw('
-                            (COALESCE(CASE WHEN transactions.transaction_type = "BUY" 
-                                AND date(transactions.date) <= date(dividends.date) 
-                                THEN transactions.quantity ELSE 0 END, 0)
-                            - COALESCE(CASE WHEN transactions.transaction_type = "SELL" 
-                                AND date(transactions.date) <= date(dividends.date) 
-                                THEN transactions.quantity ELSE 0 END, 0))
-                            * dividends.dividend_amount
-                                AS total_received
-                        ')
-                        ->join('transactions', 'transactions.symbol', '=', 'dividends.symbol')
-                        ->join('holdings', 'transactions.portfolio_id', '=', 'holdings.portfolio_id')
-                        ->where('dividends.symbol', $symbol)
-                        ->groupBy('holdings.portfolio_id', 'dividends.date', 'dividends.symbol', 'dividends.dividend_amount', 'total_received')
-                        ->havingRaw('total_received > 0')
-                        ->get();
+        $subQuery = self::select([
+            'holdings.portfolio_id',
+            'dividends.date',
+            'dividends.symbol',
+            'dividends.dividend_amount',
+        ])->selectRaw("
+            (COALESCE(SUM(CASE WHEN transactions.transaction_type = 'BUY' 
+                AND date(transactions.date) <= date(dividends.date) 
+                THEN transactions.quantity ELSE 0 END), 0)
+            - COALESCE(SUM(CASE WHEN transactions.transaction_type = 'SELL' 
+                AND date(transactions.date) <= date(dividends.date) 
+                THEN transactions.quantity ELSE 0 END), 0))
+            * dividends.dividend_amount
+            AS total_received
+        ")->join('transactions', 'transactions.symbol', '=', 'dividends.symbol')
+            ->join('holdings', 'transactions.portfolio_id', '=', 'holdings.portfolio_id')
+            ->where('dividends.symbol', $symbol)
+            ->groupBy('holdings.portfolio_id', 'dividends.date', 'dividends.symbol', 'dividends.dividend_amount');
 
-        // iterate through holdings and update 
+        $dividends = DB::table(DB::raw("({$subQuery->toSql()}) as sub"))
+            ->mergeBindings($subQuery->getQuery())
+            ->where('total_received', '>', 0)
+            ->get();
+
+        // iterate through holdings and update
         Holding::where(['symbol' => $symbol])
-                ->get()
-                ->each(function ($holding) use ($dividends) {
-                    $holding->update([
-                        'dividends_earned' => $dividends->where('portfolio_id', $holding->portfolio_id)
-                                                        ->sum('total_received')
-                    ]);
-                });
+            ->get()
+            ->each(function ($holding) use ($dividends) {
+                $holding->update([
+                    'dividends_earned' => $dividends->where('portfolio_id', $holding->portfolio_id)
+                        ->sum('total_received'),
+                ]);
+            });
     }
 
     public static function reinvestDividends(iterable $dividend_data, MarketData $market_data): void
@@ -144,21 +152,21 @@ class Dividend extends Model
             'symbol' => $market_data->symbol,
             'reinvest_dividends' => true,
         ])
-        ->get()
-        ->each(function($holding) use ($dividend_data, $market_data) {
+            ->get()
+            ->each(function ($holding) use ($dividend_data, $market_data) {
 
-            foreach($dividend_data as $dividend) {
+                foreach ($dividend_data as $dividend) {
 
-                Transaction::create([
-                    'date' => $dividend['date'],
-                    'portfolio_id' => $holding->portfolio_id,
-                    'symbol' => $holding->symbol,
-                    'transaction_type' => "BUY",
-                    'reinvested_dividend' => true,
-                    'cost_basis' => 0,
-                    'quantity' => ($dividend['dividend_amount'] * $holding->qtyOwned(Carbon::parse($dividend['date']))) / $market_data->market_value,
-                ]);
-            }
-        });
+                    Transaction::create([
+                        'date' => $dividend['date'],
+                        'portfolio_id' => $holding->portfolio_id,
+                        'symbol' => $holding->symbol,
+                        'transaction_type' => 'BUY',
+                        'reinvested_dividend' => true,
+                        'cost_basis' => 0,
+                        'quantity' => ($dividend['dividend_amount'] * $holding->qtyOwned(Carbon::parse($dividend['date']))) / $market_data->market_value,
+                    ]);
+                }
+            });
     }
 }

app/Models/Holding.php

@@ -1,17 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 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\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\DB;
 
 class Holding extends Model
 {
@@ -27,18 +24,13 @@ class Holding extends Model
         'realized_gain_dollars',
         'dividends_earned',
         'splits_synced_at',
-        'reinvest_dividends'
+        'reinvest_dividends',
     ];
 
     protected $casts = [
         'splits_synced_at' => 'datetime',
         'first_transaction_date' => 'datetime',
-        'reinvest_dividends' => 'boolean'
-    ];
-
-    protected $attributes = [
-        'realized_gain_dollars' => 0,
-        'dividends_earned' => 0,
+        'reinvest_dividends' => 'boolean',
     ];
 
     /**
@@ -46,7 +38,7 @@ class Holding extends Model
      *
      * @return void
      */
-    public function market_data() 
+    public function market_data()
     {
         return $this->hasOne(MarketData::class, 'symbol', 'symbol');
     }
@@ -56,7 +48,7 @@ class Holding extends Model
      *
      * @return void
      */
-    public function transactions() 
+    public function transactions()
     {
         return $this->hasManyThrough(Transaction::class, Portfolio::class, 'id', 'portfolio_id', 'portfolio_id', 'id')->orderBy('date', 'DESC');
     }
@@ -66,49 +58,67 @@ class Holding extends Model
      *
      * @return void
      */
-    public function dividends() 
+    public function dividends()
     {
         return $this->hasMany(Dividend::class, 'symbol', 'symbol')
-                ->select(['dividends.symbol','dividends.date','dividends.dividend_amount'])
-                ->selectRaw("SUM(
-                    CASE WHEN transaction_type = 'BUY' 
-                        AND transactions.symbol = dividends.symbol 
+            ->select(['dividends.symbol', 'dividends.date', 'dividends.dividend_amount'])
+            ->selectRaw("SUM(
+                    CASE WHEN transaction_type = 'BUY'
+                        AND transactions.symbol = dividends.symbol
                         AND transactions.portfolio_id = '$this->portfolio_id'
                         AND date(dividends.date) >= date(transactions.date)
                     THEN transactions.quantity
                     ELSE 0 END
                 ) AS purchased")
-                ->selectRaw("SUM(
+            ->selectRaw("SUM(
                     CASE WHEN transaction_type = 'SELL'
-                        AND transactions.symbol = dividends.symbol 
-                        AND transactions.portfolio_id = '$this->portfolio_id' 
+                        AND transactions.symbol = dividends.symbol
+                        AND transactions.portfolio_id = '$this->portfolio_id'
                         AND date(dividends.date) >= date(transactions.date)
                     THEN transactions.quantity
                     ELSE 0 END
                 ) AS sold")
-                ->selectRaw("SUM(
-                    (CASE WHEN transaction_type = 'BUY' 
-                        AND transactions.symbol = dividends.symbol 
+            ->selectRaw("SUM(
+                    (CASE WHEN transaction_type = 'BUY'
+                        AND transactions.symbol = dividends.symbol
                         AND transactions.portfolio_id = '$this->portfolio_id'
-                        AND date(transactions.date) <= date(dividends.date) 
+                        AND date(transactions.date) <= date(dividends.date)
                         THEN transactions.quantity ELSE 0 END
-                    - CASE WHEN transaction_type = 'SELL' 
-                        AND transactions.symbol = dividends.symbol 
+                    - CASE WHEN transaction_type = 'SELL'
+                        AND transactions.symbol = dividends.symbol
                         AND transactions.portfolio_id = '$this->portfolio_id'
-                        AND date(transactions.date) <= date(dividends.date) 
+                        AND date(transactions.date) <= date(dividends.date)
                         THEN transactions.quantity ELSE 0 END)
                     * dividends.dividend_amount
                 ) AS total_received")
-                ->join('transactions', 'transactions.symbol', 'dividends.symbol')
-                ->groupBy(['dividends.symbol','dividends.date','dividends.dividend_amount'])
-                ->orderBy('dividends.date', 'DESC')
-                ->where('dividends.date', '>=', function ($query) {
-                    $query->selectRaw('min(transactions.date)')
-                        ->from('transactions')
-                        ->whereRaw("transactions.portfolio_id = '$this->portfolio_id'")
-                        ->whereRaw("transactions.symbol = '$this->symbol'");
-                })
-                ->having('total_received', '>', 0);
+            ->join('transactions', 'transactions.symbol', 'dividends.symbol')
+            ->groupBy(['dividends.symbol', 'dividends.date', 'dividends.dividend_amount'])
+            ->orderBy('dividends.date', 'DESC')
+            ->where('dividends.date', '>=', function ($query) {
+                $query->selectRaw('min(transactions.date)')
+                    ->from('transactions')
+                    ->whereRaw("transactions.portfolio_id = '$this->portfolio_id'")
+                    ->whereRaw("transactions.symbol = '$this->symbol'");
+            })
+            ->havingRaw("SUM(
+                (CASE 
+                    WHEN transaction_type = 'BUY'
+                    AND transactions.symbol = dividends.symbol
+                    AND transactions.portfolio_id = '$this->portfolio_id'
+                    AND transactions.date <= dividends.date
+                THEN transactions.quantity 
+                ELSE 0 
+                END)
+                - 
+                (CASE 
+                    WHEN transaction_type = 'SELL'
+                    AND transactions.symbol = dividends.symbol
+                    AND transactions.portfolio_id = '$this->portfolio_id'
+                    AND transactions.date <= dividends.date
+                THEN transactions.quantity 
+                ELSE 0 
+                END)
+            ) * dividends.dividend_amount > 0");
     }
 
     /**
@@ -116,7 +126,7 @@ class Holding extends Model
      *
      * @return void
      */
-    public function portfolio() 
+    public function portfolio()
     {
         return $this->belongsTo(Portfolio::class);
     }
@@ -126,7 +136,7 @@ class Holding extends Model
      *
      * @return void
      */
-    public function splits() 
+    public function splits()
     {
         return $this->hasMany(Split::class, 'symbol', 'symbol')
             ->orderBy('date', 'DESC');
@@ -145,18 +155,18 @@ class Holding extends Model
     public function scopeWithMarketData($query)
     {
         return $query->withAggregate('market_data', 'name')
-                    ->withAggregate('market_data', 'market_value')
-                    ->withAggregate('market_data', 'fifty_two_week_low')
-                    ->withAggregate('market_data', 'fifty_two_week_high')
-                    ->withAggregate('market_data', 'updated_at')
-                    ->join('market_data', 'holdings.symbol', 'market_data.symbol');
+            ->withAggregate('market_data', 'market_value')
+            ->withAggregate('market_data', 'fifty_two_week_low')
+            ->withAggregate('market_data', 'fifty_two_week_high')
+            ->withAggregate('market_data', 'updated_at')
+            ->join('market_data', 'holdings.symbol', 'market_data.symbol');
     }
 
     public function scopeWithPerformance($query)
     {
         return $query->selectRaw('COALESCE(market_data.market_value * holdings.quantity, 0) AS total_market_value')
             ->selectRaw('COALESCE((market_data.market_value - holdings.average_cost_basis) * holdings.quantity, 0) AS market_gain_dollars')
-            ->selectRaw('COALESCE(((market_data.market_value - holdings.average_cost_basis) / holdings.average_cost_basis) * 100, 0) AS market_gain_percent');
+            ->selectRaw('COALESCE(((market_data.market_value - holdings.average_cost_basis) / NULLIF(holdings.average_cost_basis, 0)) * 100, 0) AS market_gain_percent');
     }
 
     public function scopePortfolio($query, $portfolio)
@@ -169,68 +179,70 @@ class Holding extends Model
         return $query->where('holdings.symbol', $symbol);
     }
 
-    public function scopeWithoutWishlists($query) {
+    public function scopeWithoutWishlists($query)
+    {
         return $query->whereHas('portfolio', function ($query) {
-                $query->where('portfolios.wishlist', 0);
-            });
+            $query->where('portfolios.wishlist', 0);
+        });
     }
 
     public function scopeMyHoldings($query, $userId = null)
     {
-        return $query->whereHas('portfolio', function($query) use ($userId) {
+        return $query->whereHas('portfolio', function ($query) use ($userId) {
             $query->whereRelation('users', 'id', $userId ?? auth()->user()->id);
         });
     }
 
-    public function scopeWithPortfolioMetrics($query) 
+    public function scopeWithPortfolioMetrics($query)
     {
         return $query->selectRaw('COALESCE(SUM(holdings.dividends_earned), 0) AS total_dividends_earned')
-                    ->selectRaw('COALESCE(SUM(holdings.realized_gain_dollars), 0) AS realized_gain_dollars')
-                    ->selectRaw('COALESCE(SUM(holdings.quantity * market_data.market_value), 0) AS total_market_value')
-                    ->selectRaw('COALESCE(SUM(holdings.total_cost_basis), 0) AS total_cost_basis')
-                    ->selectRaw('COALESCE(SUM(holdings.quantity * market_data.market_value), 0) - COALESCE(SUM(holdings.total_cost_basis), 0) AS total_gain_dollars')
+            ->selectRaw('COALESCE(SUM(holdings.realized_gain_dollars), 0) AS realized_gain_dollars')
+            ->selectRaw('COALESCE(SUM(holdings.quantity * market_data.market_value), 0) AS total_market_value')
+            ->selectRaw('COALESCE(SUM(holdings.total_cost_basis), 0) AS total_cost_basis')
+            ->selectRaw('COALESCE(SUM(holdings.quantity * market_data.market_value), 0) - COALESCE(SUM(holdings.total_cost_basis), 0) AS total_gain_dollars')
                     // ->selectRaw('COALESCE((@total_gain_dollars / @sum_total_cost_basis) * 100,0) AS total_gain_percent')
-                    ->join('market_data', 'market_data.symbol', '=', 'holdings.symbol');            
+            ->join('market_data', 'market_data.symbol', '=', 'holdings.symbol');
     }
 
     public function syncTransactionsAndDividends()
     {
         // pull existing transaction data
         $query = Transaction::where([
-                            'portfolio_id' => $this->portfolio_id,
-                            'symbol' => $this->symbol,
-                        ])->selectRaw('SUM(CASE WHEN transaction_type = "BUY" THEN quantity ELSE 0 END) AS `qty_purchases`')
-                        ->selectRaw('SUM(CASE WHEN transaction_type = "SELL" THEN quantity ELSE 0 END) AS `qty_sales`')
-                        ->selectRaw('SUM(CASE WHEN transaction_type = "BUY" THEN (quantity * cost_basis) ELSE 0 END) AS `total_cost_basis`')
-                        ->selectRaw('SUM(CASE WHEN transaction_type = "SELL" THEN (quantity * sale_price) ELSE 0 END) AS `total_sale_price`')
-                        ->first();
+            'portfolio_id' => $this->portfolio_id,
+            'symbol' => $this->symbol,
+        ])->selectRaw("SUM(CASE WHEN transaction_type = 'BUY' THEN quantity ELSE 0 END) AS qty_purchases")
+            ->selectRaw("SUM(CASE WHEN transaction_type = 'SELL' THEN quantity ELSE 0 END) AS qty_sales")
+            ->selectRaw("SUM(CASE WHEN transaction_type = 'BUY' THEN (quantity * cost_basis) ELSE 0 END) AS total_cost_basis")
+            ->selectRaw("SUM(CASE WHEN transaction_type = 'SELL' THEN (quantity * sale_price) ELSE 0 END) AS total_sale_price")
+            ->first();
 
         $total_quantity = round($query->qty_purchases - $query->qty_sales, 3);
 
         $average_cost_basis = (
-                                $query->qty_purchases > 0 
-                                && $total_quantity > 0
-                              )
-                                    ? $query->total_cost_basis / $query->qty_purchases 
-                                    : 0;
+            $query->qty_purchases > 0
+            && $total_quantity > 0
+        ) ? $query->total_cost_basis / $query->qty_purchases
+        : 0;
 
         // update holding
         $this->fill([
             'quantity' => $total_quantity,
             'average_cost_basis' => $average_cost_basis,
             'total_cost_basis' => $total_quantity * $average_cost_basis,
-            '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)) 
+            '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))
                     : 0,
-            'dividends_earned' => $this->dividends->sum('total_received')
+            'dividends_earned' => $this->dividends->sum('total_received'),
         ]);
 
         $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);
 
@@ -242,77 +254,116 @@ class Holding extends Model
     }
 
     public function dailyPerformance(
-        \Illuminate\Support\Carbon $start_date = null, 
-        \Illuminate\Support\Carbon $end_date = null, 
+        ?\Illuminate\Support\Carbon $start_date = null,
+        ?\Illuminate\Support\Carbon $end_date = null,
     ) {
-        if ($start_date == null) $start_date = now();
-        if ($end_date == null) $end_date = now();
-
-        $date_interval = "DATE_ADD(date, INTERVAL 1 DAY)";
-
-        if (config('database.default') === 'sqlite') {
-            
-            $date_interval = "date(date, '+1 day')";
-        } else {
-
-            DB::statement('SET cte_max_recursion_depth=1000000;');
+        if ($start_date == null) {
+            $start_date = now();
+        }
+        if ($end_date == null) {
+            $end_date = now();
         }
 
-        return DB::table(DB::raw("(
-                WITH RECURSIVE date_series AS (
-                    SELECT '{$start_date->format('Y-m-d')}' AS date
-                    UNION ALL
-                    SELECT $date_interval
-                    FROM date_series
-                    WHERE date < '{$end_date->format('Y-m-d')}'
-                )
-                SELECT date_series.date
+        // MySQL default interval
+        $date_interval = 'DATE_ADD(date, INTERVAL 1 DAY)';
+        $castNumberType = 'decimal';
+
+        // Use SQLite interval grammar
+        if (config('database.default') === 'sqlite') {
+
+            $date_interval = "date(date, '+1 day')";
+        }
+
+        // Default CTE time series query (for MySQL and SQLite)
+        $timeSeriesQuery = DB::table(DB::raw("(
+            WITH RECURSIVE date_series AS (
+                SELECT '{$start_date->format('Y-m-d')}' AS date
+                UNION ALL
+                SELECT $date_interval
                 FROM date_series
-            ) as date_series")
-        )
-        ->select([
-            'date_series.date',
-            DB::raw("
-                ROUND(
-                COALESCE(SUM(CASE WHEN transactions.transaction_type = 'BUY' THEN transactions.quantity ELSE 0 END), 0) -
-                COALESCE(SUM(CASE WHEN transactions.transaction_type = 'SELL' THEN transactions.quantity ELSE 0 END), 0), 3) AS `owned`
-            "),
-            DB::raw("
-               COALESCE(CASE 
-                    WHEN (
-                        ROUND(
-                        COALESCE(SUM(CASE WHEN transactions.transaction_type = 'BUY' THEN transactions.quantity ELSE 0 END), 0) - 
-                        COALESCE(SUM(CASE WHEN transactions.transaction_type = 'SELL' THEN transactions.quantity ELSE 0 END), 0), 3)
-                    ) = 0 THEN 0
-                    ELSE SUM(CASE 
-                        WHEN transactions.transaction_type = 'BUY' THEN transactions.quantity * transactions.cost_basis 
-                        ELSE 0 
-                    END)
-                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`")
-        ])
-        ->leftJoin('transactions', function ($join) {
-            $join->on(DB::raw('DATE(transactions.date)'), '<=', 'date_series.date')
-                ->where('transactions.symbol', '=', $this->symbol)
-                ->where('transactions.portfolio_id', '=', $this->portfolio_id);
-        })
-        ->groupBy('date_series.date')
-        ->orderBy('date_series.date')
-        ->get()
-        ->keyBy('date');
+                WHERE date < '{$end_date->format('Y-m-d')}'
+            )
+            SELECT date_series.date
+            FROM date_series
+        ) as date_series"));
+
+        // PGSql time series query
+        if (config('database.default') === 'pgsql') {
+
+            $timeSeriesQuery = DB::table(DB::raw("
+                generate_series(
+                    date '{$start_date->format('Y-m-d')}', 
+                    date '{$end_date->format('Y-m-d')}', 
+                    interval '1 day'
+                ) as date_series"));
+
+            $castNumberType = 'numeric';
+        }
+
+        // Set MySQL-like query CTE max iterations
+        if (config('database.default') === 'mysql') {
+
+            // MySQL default
+            $max_recursion_var_name = 'cte_max_recursion_depth';
+
+            // Determine if running MySQL or MariaDB
+            $versionString = Arr::get(
+                DB::select('SELECT VERSION() as version;'),
+                '0', new \stdClass
+            )->version;
+            if (stripos($versionString, 'MariaDB') !== false) {
+                $max_recursion_var_name = 'max_recursive_iterations'; // Must be MariaDB
+            }
+
+            DB::statement("SET $max_recursion_var_name=1000000;");
+        }
+
+        // Extracted query for counting QTY owned
+        $quantityQuery = "ROUND(CAST(COALESCE(
+            SUM(CASE WHEN transactions.transaction_type = 'BUY' THEN transactions.quantity ELSE 0 END) 
+            - SUM(CASE WHEN transactions.transaction_type = 'SELL' THEN transactions.quantity ELSE 0 END),
+            0
+        ) AS {$castNumberType}), 3)";
+
+        return $timeSeriesQuery
+            ->select([
+                'date_series.date',
+                DB::raw("
+                    {$quantityQuery} AS owned
+                "),
+                DB::raw("
+                    CASE
+                        WHEN ({$quantityQuery}) = 0 THEN 0
+                        ELSE SUM(CASE
+                            WHEN transactions.transaction_type = 'BUY' THEN transactions.quantity * transactions.cost_basis
+                            ELSE 0
+                        END)
+                    END 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"),
+            ])
+            ->leftJoin('transactions', function ($join) {
+                $join->on(DB::raw('DATE(transactions.date)'), '<=', 'date_series.date')
+                    ->where('transactions.symbol', '=', $this->symbol)
+                    ->where('transactions.portfolio_id', '=', $this->portfolio_id);
+            })
+            ->groupBy('date_series.date')
+            ->orderBy('date_series.date')
+            ->get()
+            ->keyBy('date');
     }
 
     public function getFormattedTransactions()
     {
         $formattedTransactions = '';
-        foreach($this->transactions->sortByDesc('date') as $transaction) {
-            $formattedTransactions .= " * ".$transaction->date->format('Y-m-d') 
-                                    ." ". $transaction->transaction_type 
-                                    ." ". $transaction->quantity
-                                    ." @ ". $transaction->cost_basis 
+        foreach ($this->transactions->sortByDesc('date') as $transaction) {
+            $formattedTransactions .= ' * '.$transaction->date->format('Y-m-d')
+                                    .' '.$transaction->transaction_type
+                                    .' '.$transaction->quantity
+                                    .' @ '.$transaction->cost_basis
                                     ." each \n\n";
         }
+
         return $formattedTransactions;
     }
-}
+}

app/Models/MarketData.php

@@ -1,17 +1,21 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Models;
 
-use Illuminate\Database\Eloquent\Model;
 use App\Interfaces\MarketData\MarketDataInterface;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
 
 class MarketData extends Model
 {
     use HasFactory;
 
     protected $primaryKey = 'symbol';
+
     protected $keyType = 'string';
+
     public $incrementing = false;
 
     protected $fillable = [
@@ -25,7 +29,7 @@ class MarketData extends Model
         'market_cap',
         'book_value',
         'last_dividend_date',
-        'dividend_yield'
+        'dividend_yield',
     ];
 
     protected $casts = [
@@ -37,10 +41,10 @@ class MarketData extends Model
         'trailing_pe' => 'float',
         'market_cap' => 'float',
         'book_value' => 'float',
-        'dividend_yield' => 'float'
+        'dividend_yield' => 'float',
     ];
 
-    public function holdings() 
+    public function holdings()
     {
         return $this->hasMany(Holding::class, 'symbol', 'symbol');
     }
@@ -50,20 +54,20 @@ class MarketData extends Model
         return $query->where('symbol', $symbol);
     }
 
-    public static function getMarketData($symbol, $force = false) 
+    public static function getMarketData($symbol, $force = false)
     {
         $market_data = self::firstOrNew([
-            'symbol' => $symbol
+            'symbol' => $symbol,
         ]);
 
         // check if new or stale
         if (
             $force
-            || !$market_data->exists
+            || ! $market_data->exists
             || is_null($market_data->updated_at)
             || $market_data->updated_at->diffInMinutes(now()) >= config('investbrain.refresh')
         ) {
-            
+
             // get quote
             $quote = app(MarketDataInterface::class)->quote($symbol);
 
@@ -76,4 +80,4 @@ class MarketData extends Model
 
         return $market_data;
     }
-}
+}

app/Models/Portfolio.php

@@ -1,16 +1,19 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Models;
 
-use App\Models\AiChat;
+use App\Interfaces\MarketData\MarketDataInterface;
+use App\Notifications\InvitedOnboardingNotification;
 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\Carbon;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Database\Eloquent\Model;
-use App\Interfaces\MarketData\MarketDataInterface;
-use Illuminate\Database\Eloquent\Concerns\HasUuids;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Support\Str;
 
 class Portfolio extends Model
 {
@@ -28,7 +31,7 @@ class Portfolio extends Model
     protected static function boot()
     {
         parent::boot();
-        
+
         static::saved(function ($portfolio) {
 
             self::ensurePortfolioHasOwner($portfolio);
@@ -38,7 +41,7 @@ class Portfolio extends Model
     protected $hidden = [];
 
     protected $casts = [
-        'wishlist' => 'boolean'
+        'wishlist' => 'boolean',
     ];
 
     protected $with = ['users', 'transactions'];
@@ -51,8 +54,8 @@ class Portfolio extends Model
     public function holdings()
     {
         return $this->hasMany(Holding::class, 'portfolio_id')
-                    ->withMarketData()
-                    ->withPerformance();
+            ->withMarketData()
+            ->withPerformance();
     }
 
     public function transactions()
@@ -75,25 +78,25 @@ class Portfolio extends Model
         return $this->morphMany(AiChat::class, 'chatable')->where('user_id', auth()->user()->id);
     }
 
-    public function scopeMyPortfolios() 
+    public function scopeMyPortfolios()
     {
         return $this->whereHas('users', function ($query) {
             $query->where('user_id', auth()->user()->id);
         });
     }
 
-    public function scopeFullAccess($query, $user_id = null) 
+    public function scopeFullAccess($query, $user_id = null)
     {
         return $query->whereHas('users', function ($query) use ($user_id) {
             $query->where('user_id', $user_id ?? auth()->user()->id)
-                  ->where(function ($query) {
-                      $query->where('full_access', true)
-                            ->orWhere('owner', true);
-                  });
+                ->where(function ($query) {
+                    $query->where('full_access', true)
+                        ->orWhere('owner', true);
+                });
         });
     }
 
-    public function scopeWithoutWishlists() 
+    public function scopeWithoutWishlists()
     {
         return $this->where(['wishlist' => false]);
     }
@@ -101,7 +104,7 @@ class Portfolio extends Model
     public function setOwnerIdAttribute($value)
     {
         // enable queued jobs to create portfolios with owners
-        if (!auth()->user()?->id && !$this->owner_id) {
+        if (! auth()->user()?->id && ! $this->owner_id) {
             static::$owner_id = $value;
         }
     }
@@ -113,46 +116,47 @@ class Portfolio extends Model
 
     public function getOwnerAttribute()
     {
-        if (!$this->relationLoaded('user')) {
-            
+        if (! $this->relationLoaded('user')) {
+
             $this->load('users');
         }
 
         return $this->users->where('pivot.owner', true)->first();
     }
 
-    public static function ensurePortfolioHasOwner(self $portfolio) 
+    public static function ensurePortfolioHasOwner(self $portfolio)
     {
         // make sure we don't remove owner access
-        if (!$portfolio->owner_id) {
+        if (! $portfolio->owner_id) {
             $owner[static::$owner_id ?? auth()->user()->id] = ['owner' => true];
 
             // save
             $portfolio->users()->sync($owner);
+            static::$owner_id = null;
         }
     }
 
     public function syncDailyChanges(): void
     {
         $holdings = $this->holdings()
-                ->join('transactions', function($join) {
-                    $join->on('transactions.symbol', '=', 'holdings.symbol')
-                         ->where('transactions.portfolio_id', '=', $this->id); 
-                })
-                ->select('holdings.symbol', 'holdings.portfolio_id', DB::raw('min(transactions.date) as first_transaction_date')) // get first transaction date
-                ->groupBy(['holdings.symbol', 'holdings.portfolio_id']) 
-                ->get();
+            ->join('transactions', function ($join) {
+                $join->on('transactions.symbol', '=', 'holdings.symbol')
+                    ->where('transactions.portfolio_id', '=', $this->id);
+            })
+            ->select('holdings.symbol', 'holdings.portfolio_id', DB::raw('min(transactions.date) as first_transaction_date')) // get first transaction date
+            ->groupBy(['holdings.symbol', 'holdings.portfolio_id'])
+            ->get();
 
         $dividends = Dividend::whereIn('symbol', $holdings->pluck('symbol'))->get();
-        
+
         $total_performance = [];
 
-        $holdings->each(function($holding) use (&$total_performance, $dividends) {
+        $holdings->each(function ($holding) use (&$total_performance, $dividends) {
 
             $period = CarbonPeriod::create(
-                $holding->first_transaction_date, 
-                now()->isBefore(Carbon::parse(config('investbrain.daily_change_time_of_day'))) 
-                    ? now()->subDay() 
+                $holding->first_transaction_date,
+                now()->isBefore(Carbon::parse(config('investbrain.daily_change_time_of_day')))
+                    ? now()->subDay()
                     : now()
             );
 
@@ -167,11 +171,11 @@ class Portfolio extends Model
             $dividends_earned = 0;
             $holding_performance = [];
 
-            foreach($period as $date) {
+            foreach ($period as $date) {
                 $date = $date->format('Y-m-d');
 
                 $close = $this->getMostRecentCloseData($all_history, $date);
-                
+
                 $total_market_value = $daily_performance->get($date)->owned * $close;
                 $dividends_earned += $daily_performance->get($date)->owned * ($dividends->get($date)?->dividend_amount ?? 0);
 
@@ -179,18 +183,18 @@ class Portfolio extends Model
                     $holding_performance[$date] = [
                         'date' => $date,
                         'portfolio_id' => $this->id,
-                        'total_market_value' => $total_market_value, 
+                        'total_market_value' => $total_market_value,
                         'total_cost_basis' => $daily_performance->get($date)->cost_basis,
                         'total_gain' => $total_market_value - $daily_performance->get($date)->cost_basis,
                         'realized_gains' => $daily_performance->get($date)->realized_gains,
-                        'total_dividends_earned' => $dividends_earned
+                        'total_dividends_earned' => $dividends_earned,
                     ];
                 }
             }
 
             foreach ($holding_performance as $date => $performance) {
                 if (Arr::get($total_performance, $date) == null) {
-                    
+
                     $total_performance[$date] = $performance;
 
                 } else {
@@ -204,9 +208,14 @@ class Portfolio extends Model
             }
         });
 
-        if (!empty($total_performance)) {
+        if (! empty($total_performance)) {
             DB::transaction(function () use ($total_performance) {
-                
+
+                // delete old history
+                $firstDate = array_keys($total_performance)[0];
+                $this->daily_change()->where('date', '<', $firstDate)->delete();
+
+                // upsert new history
                 $this->daily_change()->upsert(
                     $total_performance,
                     ['date', 'portfolio_id'],
@@ -215,7 +224,7 @@ class Portfolio extends Model
                         'total_cost_basis',
                         'total_gain',
                         'realized_gains',
-                        'total_dividends_earned'
+                        'total_dividends_earned',
                     ]
                 );
             });
@@ -226,10 +235,10 @@ class Portfolio extends Model
     {
         $close = Arr::get($history, "$date.close", 0);
 
-        if (!$close && $i < $max_attempts) {
+        if (! $close && $i < $max_attempts) {
 
             $i++;
-    
+
             $date = Carbon::parse($date)->subDay()->format('Y-m-d');
 
             return $this->getMostRecentCloseData($history, $date, $i);
@@ -241,16 +250,50 @@ class Portfolio extends Model
     public function getFormattedHoldings()
     {
         $formattedHoldings = '';
-        foreach($this->holdings as $holding) {
-            $formattedHoldings .= " * Holding of ".$holding->market_data->name." (".$holding->symbol.")" 
-                                    ."; with ". ($holding->quantity > 0 ? $holding->quantity : 'ZERO') . " shares"
-                                    ."; avg cost basis ". $holding->average_cost_basis
-                                    ."; curr market value ". $holding->market_data->market_value 
-                                    ."; unrealized gains ". $holding->market_gain_dollars 
-                                    ."; realized gains ". $holding->realized_gain_dollars
-                                    ."; dividends earned ". $holding->dividends_earned
+        foreach ($this->holdings as $holding) {
+            $formattedHoldings .= ' * Holding of '.$holding->market_data->name.' ('.$holding->symbol.')'
+                                    .'; with '.($holding->quantity > 0 ? $holding->quantity : 'ZERO').' shares'
+                                    .'; avg cost basis '.$holding->average_cost_basis
+                                    .'; curr market value '.$holding->market_data->market_value
+                                    .'; unrealized gains '.$holding->market_gain_dollars
+                                    .'; realized gains '.$holding->realized_gain_dollars
+                                    .'; dividends earned '.$holding->dividends_earned
                                     ."\n\n";
         }
+
         return $formattedHoldings;
     }
+
+    /**
+     * Share a portfolio with a user
+     */
+    public function share(string $email, bool $fullAccess = false): void
+    {
+        $user = User::firstOrCreate([
+            'email' => $email,
+        ], [
+            'name' => Str::title(Str::before($email, '@')),
+        ]);
+
+        $permissions[$user->id] = [
+            'full_access' => $fullAccess,
+        ];
+
+        $sync = $this->users()->syncWithoutDetaching($permissions);
+
+        if (! empty($sync['attached'])) {
+
+            foreach ($sync['attached'] as $newUserId) {
+                User::find($newUserId)->notify(new InvitedOnboardingNotification($this, auth()->user()));
+            }
+        }
+    }
+
+    /**
+     * Un-share a portfolio
+     */
+    public function unShare(string $userId): void
+    {
+        $this->users()->detach($userId);
+    }
 }

app/Models/Split.php

@@ -1,14 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 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 Illuminate\Database\Eloquent\Concerns\HasUuids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Str;
 
 class Split extends Model
 {
@@ -28,22 +29,23 @@ class Split extends Model
         'last_date' => 'datetime',
     ];
 
-    public function holdings() {
+    public function holdings()
+    {
         return $this->hasMany(Holding::class, 'symbol', 'symbol');
     }
 
-    public function transactions() {
+    public function transactions()
+    {
         return $this->hasMany(Transaction::class, 'symbol', 'symbol');
     }
 
     /**
      * Grab new split data
      *
-     * @param string $symbol
-     * @param \DateTimeInterface|null $start_date
+     * @param  \DateTimeInterface|null  $start_date
      * @return void
      */
-    public static function refreshSplitData(string $symbol) 
+    public static function refreshSplitData(string $symbol)
     {
         // dates for split data
         $splits_meta = self::where(['symbol' => $symbol])
@@ -58,9 +60,9 @@ class Split extends Model
 
         // nope, need to populate newer split data
         if ($splits_meta->total_splits) {
-            
+
             $start_date = $splits_meta->last_date->addHours(48);
-            $end_date =  now();
+            $end_date = now();
         }
 
         // get some data
@@ -71,10 +73,10 @@ class Split extends Model
         if ($split_data->isNotEmpty()) {
 
             // insert records
-            (new self)->insert($split_data->map(function($split) {
+            (new self)->insert($split_data->map(function ($split) {
 
                 return [...$split, ...['id' => Str::uuid()->toString()]];
-            })->toArray());   
+            })->toArray());
         }
 
         // sync to transactions
@@ -84,39 +86,39 @@ class Split extends Model
     /**
      * Syncs all transactions of symbol with split data
      *
-     * @param string $symbol
+     * @param  string  $symbol
      * @return void
      */
-    public static function syncToTransactions($symbol) 
+    public static function syncToTransactions($symbol)
     {
         // get splits joined with matching holdings
         $splits = self::select([
-                        'splits.date', 
-                        'splits.symbol', 
-                        'splits.split_amount', 
-                        'holdings.portfolio_id'
-                    ])
-                    ->where([
-                        'splits.symbol' => $symbol,
-                    ])
-                    ->whereDate('splits.date', '>', DB::raw('IFNULL(holdings.splits_synced_at, "0000-00-00")'))
-                    ->where('holdings.quantity', '>', 0)
-                    ->join('holdings', 'splits.symbol', 'holdings.symbol')
-                    ->orderBy('splits.date', 'ASC')
-                    ->get();
+            'splits.date',
+            'splits.symbol',
+            'splits.split_amount',
+            'holdings.portfolio_id',
+        ])
+            ->where([
+                'splits.symbol' => $symbol,
+            ])
+            ->whereDate('splits.date', '>', DB::raw("COALESCE(holdings.splits_synced_at, '1901-01-01')"))
+            ->where('holdings.quantity', '>', 0)
+            ->join('holdings', 'splits.symbol', 'holdings.symbol')
+            ->orderBy('splits.date', 'ASC')
+            ->get();
 
-        foreach($splits as $split) {
+        foreach ($splits as $split) {
 
             // get qty owned when split was issued
             $qty_owned = Transaction::where([
-                    'symbol' => $split->symbol, 
-                    'portfolio_id' => $split->portfolio_id
-                ])
+                'symbol' => $split->symbol,
+                'portfolio_id' => $split->portfolio_id,
+            ])
                 ->whereDate('transactions.date', '<', $split->date->format('Y-m-d'))
-                ->selectRaw('SUM(CASE WHEN transaction_type = "BUY" THEN quantity ELSE 0 END) -
-                            SUM(CASE WHEN transaction_type = "SELL" THEN quantity ELSE 0 END) AS qty_owned')
+                ->selectRaw("SUM(CASE WHEN transaction_type = 'BUY' THEN quantity ELSE 0 END) -
+                            SUM(CASE WHEN transaction_type = 'SELL' THEN quantity ELSE 0 END) AS qty_owned")
                 ->value('qty_owned');
-                
+
             if ($qty_owned > 0) {
 
                 Transaction::create([
@@ -128,14 +130,14 @@ class Split extends Model
                     'cost_basis' => 0,
                     'split' => true,
                     'created_at' => now(),
-                    'updated_at' => now()
+                    'updated_at' => now(),
                 ]);
 
                 Holding::where([
                     'symbol' => $split->symbol,
-                    'portfolio_id' => $split->portfolio_id
+                    'portfolio_id' => $split->portfolio_id,
                 ])->update([
-                    'splits_synced_at' => now()
+                    'splits_synced_at' => now(),
                 ]);
             }
         }

app/Models/Transaction.php

@@ -1,13 +1,17 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Models;
 
-use App\Models\MarketData;
-use Illuminate\Support\Arr;
-use Illuminate\Database\Eloquent\Model;
+use Illuminate\Contracts\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Concerns\HasUuids;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasOne;
+use Illuminate\Support\Arr;
 
 class Transaction extends Model
 {
@@ -23,7 +27,7 @@ class Transaction extends Model
         'cost_basis',
         'sale_price',
         'split',
-        'reinvested_dividend'
+        'reinvested_dividend',
     ];
 
     protected $hidden = [];
@@ -31,7 +35,7 @@ class Transaction extends Model
     protected $casts = [
         'date' => 'datetime',
         'split' => 'boolean',
-        'reinvested_dividend' => 'boolean'
+        'reinvested_dividend' => 'boolean',
     ];
 
     protected static function boot()
@@ -52,14 +56,14 @@ class Transaction extends Model
 
             $transaction->refreshMarketData();
 
-            cache()->forget('portfolio-metrics-' . $transaction->portfolio_id);
+            cache()->forget('portfolio-metrics-'.$transaction->portfolio_id);
         });
 
         static::deleted(function ($transaction) {
 
             $transaction->syncToHolding();
 
-            cache()->forget('portfolio-metrics-' . $transaction->portfolio_id);
+            cache()->forget('portfolio-metrics-'.$transaction->portfolio_id);
         });
     }
 
@@ -78,7 +82,7 @@ class Transaction extends Model
      *
      * @return void
      */
-    public function market_data()
+    public function market_data(): HasOne
     {
         return $this->hasOne(MarketData::class, 'symbol', 'symbol');
     }
@@ -88,47 +92,47 @@ class Transaction extends Model
      *
      * @return void
      */
-    public function portfolio()
+    public function portfolio(): BelongsTo
     {
         return $this->belongsTo(Portfolio::class);
     }
 
-    public function scopeWithMarketData($query)
+    public function scopeWithMarketData($query): Builder
     {
         return $query->withAggregate('market_data', 'name')
-                    ->withAggregate('market_data', 'market_value')
-                    ->withAggregate('market_data', 'fifty_two_week_low')
-                    ->withAggregate('market_data', 'fifty_two_week_high')
-                    ->withAggregate('market_data', 'updated_at')
-                    ->join('market_data', 'transactions.symbol', 'market_data.symbol');
+            ->withAggregate('market_data', 'market_value')
+            ->withAggregate('market_data', 'fifty_two_week_low')
+            ->withAggregate('market_data', 'fifty_two_week_high')
+            ->withAggregate('market_data', 'updated_at')
+            ->join('market_data', 'transactions.symbol', 'market_data.symbol');
     }
-    
-    public function scopePortfolio($query, $portfolio)
+
+    public function scopePortfolio($query, $portfolio): Builder
     {
         return $query->where('portfolio_id', $portfolio);
     }
 
-    public function scopeSymbol($query, $symbol)
+    public function scopeSymbol($query, $symbol): Builder
     {
         return $query->where('symbol', $symbol);
     }
 
-    public function scopeBuy($query)
+    public function scopeBuy($query): Builder
     {
         return $query->where('transaction_type', 'BUY');
     }
 
-    public function scopeSell($query)
+    public function scopeSell($query): Builder
     {
         return $query->where('transaction_type', 'SELL');
     }
 
-    public function scopeBeforeDate($query, $date)
+    public function scopeBeforeDate($query, $date): Builder
     {
         return $query->whereDate('date', '<=', $date);
     }
 
-    public function scopeMyTransactions() 
+    public function scopeMyTransactions(): Builder
     {
         return $this->whereHas('portfolio', function ($query) {
             $query->whereHas('users', function ($query) {
@@ -137,24 +141,22 @@ class Transaction extends Model
         });
     }
 
-    public function refreshMarketData() 
+    public function refreshMarketData(): void
     {
-        return MarketData::getMarketData($this->attributes['symbol']);
+        MarketData::getMarketData($this->attributes['symbol']);
     }
 
     /**
      * Writes average cost basis to a sale transaction
-     *
-     * @return Transaction
      */
-    public function ensureCostBasisIsAddedToSale()
+    public function ensureCostBasisIsAddedToSale(): Transaction
     {
         $average_cost_basis = Transaction::where([
             'portfolio_id' => $this->portfolio_id,
             'symbol' => $this->symbol,
             'transaction_type' => 'BUY',
         ])->whereDate('date', '<=', $this->date)
-        ->average('cost_basis');
+            ->average('cost_basis');
 
         $this->cost_basis = $average_cost_basis ?? 0;
 
@@ -163,10 +165,9 @@ class Transaction extends Model
 
     /**
      * Syncs the holding related to this transaction
-     *
-     * @return void
      */
-    public function syncToHolding() {
+    public function syncToHolding(): void
+    {
 
         // if symbol name changed, sync previous symbol too
         if (Arr::has($this->changes, 'symbol')) {
@@ -181,7 +182,7 @@ class Transaction extends Model
         // get the holding for a symbol and portfolio (or create one)
         Holding::firstOrNew([
             'portfolio_id' => $this->portfolio_id,
-            'symbol' => $this->symbol
+            'symbol' => $this->symbol,
         ], [
             'portfolio_id' => $this->portfolio_id,
             'symbol' => $this->symbol,
@@ -191,4 +192,4 @@ class Transaction extends Model
             'splits_synced_at' => now(),
         ])->syncTransactionsAndDividends();
     }
-}
+}

app/Models/User.php

@@ -1,29 +1,31 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Models;
 
 use App\Traits\HasConnectedAccounts;
-use Laravel\Sanctum\HasApiTokens;
-use Laravel\Jetstream\HasProfilePhoto;
-use Illuminate\Notifications\Notifiable;
-use Laravel\Fortify\TwoFactorAuthenticatable;
-use Staudenmeir\EloquentHasManyDeep\HasManyDeep;
+use Illuminate\Contracts\Auth\MustVerifyEmail;
 use Illuminate\Database\Eloquent\Concerns\HasUuids;
-use Staudenmeir\EloquentHasManyDeep\HasRelationships;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 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
 {
     use HasApiTokens;
+    use HasConnectedAccounts;
     use HasFactory;
     use HasProfilePhoto;
+    use HasRelationships;
+    use HasUuids;
     use Notifiable;
     use TwoFactorAuthenticatable;
-    use HasUuids;
-    use HasRelationships;
-    use HasConnectedAccounts;
 
     protected $fillable = [
         'name',
@@ -65,7 +67,7 @@ class User extends Authenticatable implements MustVerifyEmail
     {
         return $this->hasManyDeep(Holding::class, ['portfolio_user', Portfolio::class])
             ->withMarketData()
-            ->withPerformance();    
+            ->withPerformance();
     }
 
     public function transactions(): HasManyDeep
@@ -78,6 +80,6 @@ class User extends Authenticatable implements MustVerifyEmail
                     WHEN transaction_type = \'SELL\' 
                     THEN COALESCE(transactions.sale_price - transactions.cost_basis, 0)
                     ELSE COALESCE(market_data.market_value - transactions.cost_basis, 0)
-                END AS gain_dollars');   
+                END AS gain_dollars');
     }
 }

app/Notifications/ImportFailedNotification.php

@@ -1,11 +1,13 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Notifications;
 
 use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Notification;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
 
 class ImportFailedNotification extends Notification implements ShouldQueue
 {
@@ -16,7 +18,7 @@ class ImportFailedNotification extends Notification implements ShouldQueue
      */
     public function __construct(
         public string $errorMessage
-    ) { }
+    ) {}
 
     /**
      * Get the notification's delivery channels.
@@ -34,12 +36,12 @@ class ImportFailedNotification extends Notification implements ShouldQueue
     public function toMail(object $notifiable): MailMessage
     {
         return (new MailMessage)
-                    ->greeting('Oh no!')
-                    ->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.")
-                    ->action("Try again?", route('import-export'))
-                    ->line("**Technical details:**")
-                    ->line($this->errorMessage);
+            ->greeting('Oh no!')
+            ->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.')
+            ->action('Try again?', route('import-export'))
+            ->line('**Technical details:**')
+            ->line($this->errorMessage);
     }
 
     /**

app/Notifications/ImportSucceededNotification.php

@@ -1,13 +1,13 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Notifications;
 
-use App\Models\User;
-use App\Models\Portfolio;
 use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Notification;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
 
 class ImportSucceededNotification extends Notification implements ShouldQueue
 {
@@ -16,7 +16,7 @@ class ImportSucceededNotification extends Notification implements ShouldQueue
     /**
      * Create a new notification instance.
      */
-    public function __construct() { }
+    public function __construct() {}
 
     /**
      * Get the notification's delivery channels.
@@ -34,10 +34,10 @@ class ImportSucceededNotification extends Notification implements ShouldQueue
     public function toMail(object $notifiable): MailMessage
     {
         return (new MailMessage)
-                    ->greeting('Woot! 🎉')
-                    ->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.")
-                    ->action("Get Started", route('dashboard'));
+            ->greeting('Woot! 🎉')
+            ->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.')
+            ->action('Get Started', route('dashboard'));
     }
 
     /**

app/Notifications/InvitedOnboardingNotification.php

@@ -1,13 +1,15 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Notifications;
 
-use App\Models\User;
 use App\Models\Portfolio;
+use App\Models\User;
 use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Notification;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
 
 class InvitedOnboardingNotification extends Notification implements ShouldQueue
 {
@@ -19,7 +21,7 @@ class InvitedOnboardingNotification extends Notification implements ShouldQueue
     public function __construct(
         public Portfolio $portfolio,
         public User $sender,
-    ) { }
+    ) {}
 
     /**
      * Get the notification's delivery channels.
@@ -40,14 +42,14 @@ class InvitedOnboardingNotification extends Notification implements ShouldQueue
         $url = url()->signedRoute('invited_onboarding', ['portfolio' => $this->portfolio->id, 'user' => $notifiable->id], now()->addDays(90));
 
         return (new MailMessage)
-                    ->replyTo($this->sender->email, $this->sender->name)
-                    ->greeting('Hey there! 👋')
-                    ->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("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)
-                    ->line("If you have any questions, you can reply to this email.")
-                    ->salutation("See you there,\n". e($this->sender->name));
+            ->replyTo($this->sender->email, $this->sender->name)
+            ->greeting('Hey there! 👋')
+            ->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("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)
+            ->line('If you have any questions, you can reply to this email.')
+            ->salutation("See you there,\n".e($this->sender->name));
     }
 
     /**

app/Notifications/VerifyConnectedAccountNotification.php

@@ -1,12 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Notifications;
 
-use Illuminate\Bus\Queueable;
 use App\Models\ConnectedAccount;
-use Illuminate\Notifications\Notification;
+use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
 
 class VerifyConnectedAccountNotification extends Notification implements ShouldQueue
 {
@@ -17,7 +19,7 @@ class VerifyConnectedAccountNotification extends Notification implements ShouldQ
      */
     public function __construct(
         public string $connected_account_id
-    ) { }
+    ) {}
 
     /**
      * Get the notification's delivery channels.
@@ -40,11 +42,11 @@ class VerifyConnectedAccountNotification extends Notification implements ShouldQ
         $url = url()->signedRoute('oauth.verify_connected_account', ['connected_account' => $this->connected_account_id], now()->days($days = 7));
 
         return (new MailMessage)
-                    ->greeting('Welcome back!')
-                    ->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:")
-                    ->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.");
+            ->greeting('Welcome back!')
+            ->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:")
+            ->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.");
     }
 
     /**

app/Policies/PortfolioPolicy.php

@@ -1,26 +1,21 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Policies;
 
-use App\Models\User;
 use App\Models\Portfolio;
+use App\Models\User;
 
 class PortfolioPolicy
 {
-
-    /**
-     * 
-     */
     public function readOnly(User $user, Portfolio $portfolio)
     {
         $pivot = $portfolio->users()->where('user_id', $user->id)->first();
 
-        return !!$pivot;
+        return (bool) $pivot;
     }
 
-    /**
-     * 
-     */
     public function fullAccess(User $user, Portfolio $portfolio)
     {
         $pivot = $portfolio->users()->where('user_id', $user->id)->first();
@@ -28,9 +23,6 @@ class PortfolioPolicy
         return $pivot && ($pivot->pivot->full_access || $pivot->pivot->owner);
     }
 
-    /**
-     * 
-     */
     public function owner(User $user, Portfolio $portfolio)
     {
         $pivot = $portfolio->users()->where('user_id', $user->id)->first();

app/Providers/AppServiceProvider.php

@@ -1,7 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Providers;
 
+use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\ServiceProvider;
 
 class AppServiceProvider extends ServiceProvider
@@ -22,6 +25,6 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot(): void
     {
-        //
+        JsonResource::withoutWrapping();
     }
 }

app/Providers/FortifyServiceProvider.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Providers;
 
 use App\Actions\Fortify\CreateNewUser;

app/Providers/JetstreamServiceProvider.php

@@ -1,11 +1,10 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Providers;
 
-use Illuminate\Support\Arr;
-use Laravel\Jetstream\Features;
 use App\Actions\Jetstream\DeleteUser;
-use Illuminate\Support\Facades\Config;
 use Illuminate\Support\ServiceProvider;
 use Laravel\Jetstream\Jetstream;
 
@@ -28,14 +27,6 @@ class JetstreamServiceProvider extends ServiceProvider
         $this->configurePermissions();
 
         Jetstream::deleteUsersUsing(DeleteUser::class);
-
-        if ( config('investbrain.self_hosted', false) ) {
-
-            Config::set(
-                'jetstream.features',
-                array_keys(Arr::except(array_values(config('jetstream.features')), Features::termsAndPrivacyPolicy()))
-            );
-        }
     }
 
     /**
@@ -43,13 +34,22 @@ class JetstreamServiceProvider extends ServiceProvider
      */
     protected function configurePermissions(): void
     {
-        Jetstream::defaultApiTokenPermissions(['read']);
+        Jetstream::defaultApiTokenPermissions([
+            // 'portfolio:read',
+            // 'portfolio:write',
+            // 'holding:read',
+            // 'holding:write',
+            // 'transaction:read',
+            // 'transaction:write',
+        ]);
 
         Jetstream::permissions([
-            'create',
-            'read',
-            'update',
-            'delete',
+            // 'Read Portfolios' => 'portfolio:read',
+            // 'Create Portfolios' => 'portfolio:write',
+            // 'Read Holdings' => 'holding:read',
+            // 'Update Holdings' => 'holding:write',
+            // 'Read Transactions' => 'transaction:read',
+            // 'Create Transactions' => 'transaction:write',
         ]);
     }
 }

app/Providers/VoltServiceProvider.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;

app/Rules/QuantityValidationRule.php

@@ -1,9 +1,12 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Rules;
 
 use App\Models\Portfolio;
 use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Support\Carbon;
 
 class QuantityValidationRule implements ValidationRule
 {
@@ -13,41 +16,41 @@ class QuantityValidationRule implements ValidationRule
      * @return void
      */
     public function __construct(
-        protected Portfolio $portfolio, 
-        protected string $symbol, 
-        protected string $transactionType,
-        protected string $date
+        protected ?Portfolio $portfolio,
+        protected ?string $symbol,
+        protected ?string $transactionType,
+        protected string|Carbon|null $date
     ) {
         $this->portfolio = $portfolio;
-        $this->symbol = $symbol; 
+        $this->symbol = $symbol;
         $this->transactionType = $transactionType;
         $this->date = $date;
     }
 
     /**
      * Validate the attribute.
-     *
-     * @param  string  $attribute
-     * @param  mixed  $value
-     * @param  \Closure  $fail
-     * @return void
      */
     public function validate(string $attribute, mixed $value, \Closure $fail): void
     {
+        if (is_null($this->portfolio) || is_null($this->symbol) || is_null($this->transactionType) || is_null($this->date)) {
+            //
+            $fail(__('The quantity must not be greater than the available quantity.'));
+        }
+
         if ($this->transactionType == 'SELL') {
 
             $purchase_qty = $this->portfolio->transactions()
-                                        ->symbol($this->symbol)
-                                        ->buy()
-                                        ->beforeDate($this->date)
-                                        ->sum('quantity');
+                ->symbol($this->symbol)
+                ->buy()
+                ->beforeDate($this->date)
+                ->sum('quantity');
 
             $sales_qty = $this->portfolio->transactions()
-                                        ->symbol($this->symbol)
-                                        ->sell()
-                                        ->beforeDate($this->date)
-                                        ->sum('quantity');
-   
+                ->symbol($this->symbol)
+                ->sell()
+                ->beforeDate($this->date)
+                ->sum('quantity');
+
             $maxQuantity = $purchase_qty - $sales_qty;
 
             if (round($value, 3) > round($maxQuantity, 3)) {

app/Rules/SymbolValidationRule.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Rules;
 
 use App\Interfaces\MarketData\MarketDataInterface;
@@ -22,24 +24,20 @@ class SymbolValidationRule implements ValidationRule
 
     /**
      * Validate the attribute.
-     *
-     * @param  string  $attribute
-     * @param  mixed  $value
-     * @param  \Closure  $fail
-     * @return void
      */
     public function validate(string $attribute, mixed $value, \Closure $fail): void
     {
         $this->symbol = $value;
 
+        // Check if the symbol exists in the Market Data table first (avoid API call)
         if (MarketData::find($this->symbol)) {
 
             return;
         }
 
-        // Check if the symbol exists in the Market Data table first (avoid API call)
-        if (!app(MarketDataInterface::class)->exists($value)) {
-            $fail('The symbol provided (' . $this->symbol . ') is not valid');
+        // Then check against market data provider
+        if (! app(MarketDataInterface::class)->exists($value)) {
+            $fail('The symbol provided ('.$this->symbol.') is not valid');
         }
     }
-}
+}

app/Support/Helpers.php

@@ -1,5 +1,7 @@
 <?php
- 
+
+declare(strict_types=1);
+
 // if (!function_exists('formatMoney')) {
 //     /**
 //      * Returns a formatted string for currency

app/Support/Spotlight.php

@@ -1,55 +1,55 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Support;
 
-use App\Models\Holding;
-use App\Models\Portfolio;
 use Illuminate\Http\Request;
- 
+
 class Spotlight
 {
     public function search(Request $request)
     {
-        
+
         $results = collect();
 
-        if (!$request->user()) {
+        if (! $request->user()) {
 
             return $results;
         }
 
         $portfolios = $request->user()->portfolios()
-            ->where('title', 'LIKE', '%'.$request->input('search').'%')
+            ->whereFullText('title', $request->input('search'))
             ->limit(5)
             ->get();
-        $portfolios->each(function($portfolio) use ($results) {
+        $portfolios->each(function ($portfolio) use ($results) {
 
             $results->push([
-                'name' => 'Portfolio: '. $portfolio->title,
+                'name' => 'Portfolio: '.$portfolio->title,
                 'description' => null,
                 'link' => route('portfolio.show', ['portfolio' => $portfolio->id]),
-                'avatar' => null
+                'avatar' => null,
             ]);
         });
 
         $holdings = $request->user()->holdings()
             ->where('holdings.quantity', '>', 0)
             ->where(function ($query) use ($request) {
-                return $query->where('holdings.symbol', 'LIKE', '%'.$request->input('search').'%')
-                        ->orWhere('market_data.name', 'LIKE', '%'.$request->input('search').'%');
+                return $query->whereFullText('holdings.symbol', $request->input('search'))
+                    ->orWhereFullText('market_data.name', $request->input('search'));
             })
             ->limit(5)
             ->get();
-        $holdings->each(function($holding) use ($results) {
+        $holdings->each(function ($holding) use ($results) {
 
             $results->push([
                 'name' => 'Holding: '.$holding->market_data->name.' ('.$holding->symbol.')',
                 'description' => $holding->portfolio->title,
                 'link' => route('holding.show', ['portfolio' => $holding->portfolio->id, 'symbol' => $holding->symbol]),
-                'avatar' => null
+                'avatar' => null,
             ]);
         });
 
         return $results;
     }
-}
+}

app/Traits/HasCompositePrimaryKey.php

@@ -1,6 +1,8 @@
 <?php
 
-namespace App\Traits; 
+declare(strict_types=1);
+
+namespace App\Traits;
 
 trait HasCompositePrimaryKey
 {
@@ -17,17 +19,18 @@ trait HasCompositePrimaryKey
     /**
      * Set the keys for a save update query.
      *
-     * @param  \Illuminate\Database\Eloquent\Builder $query
+     * @param  \Illuminate\Database\Eloquent\Builder  $query
      * @return \Illuminate\Database\Eloquent\Builder
      */
     protected function setKeysForSaveQuery($query)
     {
         foreach ($this->getKeyName() as $key) {
             // UPDATE: Added isset() per devflow's comment.
-            if (isset($this->$key))
+            if (isset($this->$key)) {
                 $query->where($key, '=', $this->$key);
-            else
-                throw new \Exception(__METHOD__ . 'Missing part of the primary key: ' . $key);
+            } else {
+                throw new \Exception(__METHOD__.'Missing part of the primary key: '.$key);
+            }
         }
 
         return $query;
@@ -37,7 +40,7 @@ trait HasCompositePrimaryKey
     /**
      * Execute a query for a single record by ID.
      *
-     * @param  array  $ids Array of keys, like [column => value].
+     * @param  array  $ids  Array of keys, like [column => value].
      * @param  array  $columns
      * @return mixed|static
      */
@@ -48,6 +51,7 @@ trait HasCompositePrimaryKey
         foreach ($me->getKeyName() as $key) {
             $query->where($key, '=', $ids[$key]);
         }
+
         return $query->first($columns);
     }
-}
+}

app/Traits/HasConnectedAccounts.php

@@ -1,12 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Traits;
 
 use App\Models\ConnectedAccount;
 use App\Models\User;
-use Illuminate\Support\Str;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Support\Str;
 
 /**
  * @property Collection $connectedAccounts
@@ -63,4 +65,4 @@ trait HasConnectedAccounts
     {
         return $this->hasMany(ConnectedAccount::class);
     }
-}
+}

app/Traits/WithTrimStrings.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Traits;
 
 use Illuminate\Support\Str;
@@ -13,10 +15,10 @@ trait WithTrimStrings
 
     public function updatedWithTrimStrings(string $property, mixed $value): void
     {
-        if (is_string($value) && !in_array($property, $this->trimExceptions())) {
+        if (is_string($value) && ! in_array($property, $this->trimExceptions())) {
             $this->fill([
                 $property => Str::trim($value),
             ]);
         }
     }
-}
+}

app/View/Components/AppLayout.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\View\Components;
 
 use Illuminate\View\Component;

app/View/Components/GuestLayout.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\View\Components;
 
 use Illuminate\View\Component;

app/View/Components/MainLayout.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\View\Components;
 
 use Illuminate\View\Component;
@@ -11,7 +13,7 @@ class MainLayout extends Component
 
         // Slots
         public mixed $body = null,
-    ) { }
+    ) {}
 
     /**
      * Get the view / contents that represents the component.

bootstrap/app.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use App\Http\Middleware\SetLocale;
 use Illuminate\Foundation\Application;
 use Illuminate\Foundation\Configuration\Exceptions;

bootstrap/providers.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 return [
     App\Providers\AppServiceProvider::class,
     App\Providers\FortifyServiceProvider::class,

composer.json

@@ -10,6 +10,7 @@
         "ext-mbstring": "*",
         "ext-zip": "*",
         "finnhub/client": "master@dev",
+        "hackeresq/filter-models": "dev-main",
         "laravel/framework": "^11.35",
         "laravel/jetstream": "^5.1",
         "laravel/sanctum": "^4.0",
@@ -37,6 +38,12 @@
     "repositories": [
         {
             "type": "vcs",
+            "no-api": true,
+            "url": "https://github.com/hackeresq/filter-models"
+        },
+        {
+            "type": "vcs",
+            "no-api": true,
             "url": "https://github.com/investbrainapp/finnhub-php"
         }
     ],

config/alphavantage.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 return [
     'key' => env('ALPHAVANTAGE_API_KEY'),
 ];

config/app.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 return [
 
     /*
@@ -98,7 +100,8 @@ return [
 
     'cipher' => 'AES-256-CBC',
 
-    'key' => env('APP_KEY'),
+    'key' => env('APP_KEY')
+        ?: when(file_exists(storage_path('app/.key')), fn () => trim(file_get_contents(storage_path('app/.key')))),
 
     'previous_keys' => [
         ...array_filter(

config/auth.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 return [
 
     /*

config/cache.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Illuminate\Support\Str;
 
 return [
@@ -15,7 +17,7 @@ return [
     |
     */
 
-    'default' => env('CACHE_STORE', 'database'),
+    'default' => env('CACHE_STORE', 'redis'),
 
     /*
     |--------------------------------------------------------------------------

config/database.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Illuminate\Support\Str;
 
 return [

config/excel.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 use Maatwebsite\Excel\Excel;
 use PhpOffice\PhpSpreadsheet\Reader\Csv;
 
@@ -15,7 +17,7 @@ return [
         | Here you can specify how big the chunk should be.
         |
         */
-        'chunk_size'             => 1000,
+        'chunk_size' => 1000,
 
         /*
         |--------------------------------------------------------------------------
@@ -42,15 +44,15 @@ return [
         | Configure e.g. delimiter, enclosure and line ending for CSV exports.
         |
         */
-        'csv'                    => [
-            'delimiter'              => ',',
-            'enclosure'              => '"',
-            'line_ending'            => PHP_EOL,
-            'use_bom'                => false,
+        'csv' => [
+            'delimiter' => ',',
+            'enclosure' => '"',
+            'line_ending' => PHP_EOL,
+            'use_bom' => false,
             'include_separator_line' => false,
-            'excel_compatibility'    => false,
-            'output_encoding'        => '',
-            'test_auto_detect'       => true,
+            'excel_compatibility' => false,
+            'output_encoding' => '',
+            'test_auto_detect' => true,
         ],
 
         /*
@@ -61,20 +63,20 @@ return [
         | Configure e.g. default title, creator, subject,...
         |
         */
-        'properties'             => [
-            'creator'        => '',
+        'properties' => [
+            'creator' => '',
             'lastModifiedBy' => '',
-            'title'          => '',
-            'description'    => '',
-            'subject'        => '',
-            'keywords'       => '',
-            'category'       => '',
-            'manager'        => '',
-            'company'        => '',
+            'title' => '',
+            'description' => '',
+            'subject' => '',
+            'keywords' => '',
+            'category' => '',
+            'manager' => '',
+            'company' => '',
         ],
     ],
 
-    'imports'            => [
+    'imports' => [
 
         /*
         |--------------------------------------------------------------------------
@@ -87,7 +89,7 @@ return [
         | you can enable it by setting read_only to false.
         |
         */
-        'read_only'    => true,
+        'read_only' => true,
 
         /*
         |--------------------------------------------------------------------------
@@ -111,7 +113,7 @@ return [
         | Available options: none|slug|custom
         |
         */
-        'heading_row'  => [
+        'heading_row' => [
             'formatter' => 'slug',
         ],
 
@@ -123,12 +125,12 @@ return [
         | Configure e.g. delimiter, enclosure and line ending for CSV imports.
         |
         */
-        'csv'          => [
-            'delimiter'        => null,
-            'enclosure'        => '"',
+        'csv' => [
+            'delimiter' => null,
+            'enclosure' => '"',
             'escape_character' => '\\',
-            'contiguous'       => false,
-            'input_encoding'   => Csv::GUESS_ENCODING,
+            'contiguous' => false,
+            'input_encoding' => Csv::GUESS_ENCODING,
         ],
 
         /*
@@ -139,16 +141,16 @@ return [
         | Configure e.g. default title, creator, subject,...
         |
         */
-        'properties'   => [
-            'creator'        => '',
+        'properties' => [
+            'creator' => '',
             'lastModifiedBy' => '',
-            'title'          => '',
-            'description'    => '',
-            'subject'        => '',
-            'keywords'       => '',
-            'category'       => '',
-            'manager'        => '',
-            'company'        => '',
+            'title' => '',
+            'description' => '',
+            'subject' => '',
+            'keywords' => '',
+            'category' => '',
+            'manager' => '',
+            'company' => '',
         ],
 
         /*
@@ -159,10 +161,10 @@ return [
        | Configure middleware that is executed on getting a cell value
        |
        */
-        'cells'        => [
+        'cells' => [
             'middleware' => [
-                //\Maatwebsite\Excel\Middleware\TrimCellValue::class,
-                //\Maatwebsite\Excel\Middleware\ConvertEmptyCellValuesToNull::class,
+                // \Maatwebsite\Excel\Middleware\TrimCellValue::class,
+                // \Maatwebsite\Excel\Middleware\ConvertEmptyCellValuesToNull::class,
             ],
         ],
 
@@ -178,21 +180,21 @@ return [
     |
     */
     'extension_detector' => [
-        'xlsx'     => Excel::XLSX,
-        'xlsm'     => Excel::XLSX,
-        'xltx'     => Excel::XLSX,
-        'xltm'     => Excel::XLSX,
-        'xls'      => Excel::XLS,
-        'xlt'      => Excel::XLS,
-        'ods'      => Excel::ODS,
-        'ots'      => Excel::ODS,
-        'slk'      => Excel::SLK,
-        'xml'      => Excel::XML,
+        'xlsx' => Excel::XLSX,
+        'xlsm' => Excel::XLSX,
+        'xltx' => Excel::XLSX,
+        'xltm' => Excel::XLSX,
+        'xls' => Excel::XLS,
+        'xlt' => Excel::XLS,
+        'ods' => Excel::ODS,
+        'ots' => Excel::ODS,
+        'slk' => Excel::SLK,
+        'xml' => Excel::XML,
         'gnumeric' => Excel::GNUMERIC,
-        'htm'      => Excel::HTML,
-        'html'     => Excel::HTML,
-        'csv'      => Excel::CSV,
-        'tsv'      => Excel::TSV,
+        'htm' => Excel::HTML,
+        'html' => Excel::HTML,
+        'csv' => Excel::CSV,
+        'tsv' => Excel::TSV,
 
         /*
         |--------------------------------------------------------------------------
@@ -203,7 +205,7 @@ return [
         | Available options: Excel::MPDF | Excel::TCPDF | Excel::DOMPDF
         |
         */
-        'pdf'      => Excel::DOMPDF,
+        'pdf' => Excel::DOMPDF,
     ],
 
     /*
@@ -223,11 +225,11 @@ return [
     | [x] PhpOffice\PhpSpreadsheet\Cell\AdvancedValueBinder::class
     |
     */
-    'value_binder'       => [
+    'value_binder' => [
         'default' => Maatwebsite\Excel\DefaultValueBinder::class,
     ],
 
-    'cache'        => [
+    'cache' => [
         /*
         |--------------------------------------------------------------------------
         | Default cell caching driver
@@ -244,7 +246,7 @@ return [
         | Drivers: memory|illuminate|batch
         |
         */
-        'driver'      => 'memory',
+        'driver' => 'memory',
 
         /*
         |--------------------------------------------------------------------------
@@ -256,7 +258,7 @@ return [
         | Here you can tweak the memory limit to your liking.
         |
         */
-        'batch'       => [
+        'batch' => [
             'memory_limit' => 60000,
         ],
 
@@ -272,7 +274,7 @@ return [
         | at "null" it will use the default store.
         |
         */
-        'illuminate'  => [
+        'illuminate' => [
             'store' => null,
         ],
 
@@ -308,7 +310,7 @@ return [
     */
     'transactions' => [
         'handler' => 'db',
-        'db'      => [
+        'db' => [
             'connection' => null,
         ],
     ],
@@ -326,7 +328,7 @@ return [
         | and the create file (file).
         |
         */
-        'local_path'          => storage_path('framework/cache/laravel-excel'),
+        'local_path' => storage_path('framework/cache/laravel-excel'),
 
         /*
         |--------------------------------------------------------------------------
@@ -338,7 +340,7 @@ return [
         | If omitted the default permissions of the filesystem will be used.
         |
         */
-        'local_permissions'   => [
+        'local_permissions' => [
             // 'dir'  => 0755,
             // 'file' => 0644,
         ],
@@ -357,8 +359,8 @@ return [
         | in conjunction with queued imports and exports.
         |
         */
-        'remote_disk'         => env('TEMP_UPLOAD_DISK', null),
-        'remote_prefix'       => 'excel-tmp',
+        'remote_disk' => env('TEMP_UPLOAD_DISK', null),
+        'remote_prefix' => 'excel-tmp',
 
         /*
         |--------------------------------------------------------------------------