fix: speeds up imports with batched transactions and daily changes

app/Imports/Sheets/DailyChangesSheet.php

@@ -2,22 +2,23 @@
 
 namespace App\Imports\Sheets;
 
+use App\Imports\ValidatesPortfolioAccess;
 use App\Models\DailyChange;
 use App\Models\BackupImport;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\DB;
-use Maatwebsite\Excel\Concerns\ToModel;
 use Maatwebsite\Excel\Events\BeforeSheet;
 use Maatwebsite\Excel\Concerns\WithEvents;
-use Maatwebsite\Excel\Concerns\WithUpserts;
+use Maatwebsite\Excel\Concerns\ToCollection;
-use App\Rules\PortfolioAccessValidationRule;
 use Maatwebsite\Excel\Concerns\SkipsEmptyRows;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
 use Maatwebsite\Excel\Concerns\WithValidation;
-use Maatwebsite\Excel\Concerns\WithBatchInserts;
 
-class DailyChangesSheet implements ToModel, WithHeadingRow, WithValidation, WithBatchInserts, WithUpserts, SkipsEmptyRows, WithEvents
+class DailyChangesSheet implements ToCollection, WithHeadingRow, WithValidation, SkipsEmptyRows, WithEvents
 {
+    use ValidatesPortfolioAccess;
+
     public function __construct(
         public BackupImport $backupImport
     ) { }
@@ -38,34 +39,53 @@ class DailyChangesSheet implements ToModel, WithHeadingRow, WithValidation, With
         ];
     }
     
-    public function model(array $dailyChange)
+    public function collection(Collection $dailyChanges)
     {
-        return new DailyChange([
+        $dailyChanges->chunk($this->batchSize())->each(function ($chunk) {
-            'total_market_value' => $dailyChange['total_market_value'],
+
-            'total_cost_basis' => $dailyChange['total_cost_basis'],
+            $this->validatePortfolioAccess($chunk);
-            'total_gain' => $dailyChange['total_gain'],
+
-            'total_dividends_earned' => $dailyChange['total_dividends_earned'],
+            // have to cast to native values
-            'realized_gains' => $dailyChange['realized_gains'],
+            $chunk = $chunk->map(function ($dailyChange) {
-            'annotation' => $dailyChange['annotation'],
+
-            'portfolio_id' => $dailyChange['portfolio_id'],
+                return [
-            'date' => Carbon::parse($dailyChange['date'])->format('Y-m-d')
+                    'total_market_value' => $dailyChange['total_market_value'],
-        ]);
+                    'total_cost_basis' => $dailyChange['total_cost_basis'],
+                    'total_gain' => $dailyChange['total_gain'],
+                    'total_dividends_earned' => $dailyChange['total_dividends_earned'],
+                    'realized_gains' => $dailyChange['realized_gains'],
+                    'annotation' => $dailyChange['annotation'],
+                    'portfolio_id' => $dailyChange['portfolio_id'],
+                    'date' => Carbon::parse($dailyChange['date'])->format('Y-m-d')
+                ];
+            });
+
+            DailyChange::upsert(
+                $chunk->toArray(),
+                ['portfolio_id', 'date'],
+                [
+                    'total_market_value',
+                    'total_cost_basis',
+                    'total_gain',
+                    'total_dividends_earned',
+                    'realized_gains',
+                    'annotation',
+                    'portfolio_id',
+                    'date'
+                ]
+            );
+        });
     }
 
     public function batchSize(): int
     {
-        return 150;
+        return 750;
-    }
-
-    public function uniqueBy()
-    {
-        return ['portfolio_id', 'date'];
     }
 
     public function rules(): array
     {
         return [
-            'portfolio_id' => ['required', new PortfolioAccessValidationRule($this->backupImport->user_id)], 
+            'portfolio_id' => ['required'], 
             'date' => ['required', 'date'],
             'total_market_value' => ['sometimes', 'nullable', 'numeric'],
             'total_cost_basis' => ['sometimes', 'nullable', 'min:0', 'numeric'],

app/Imports/Sheets/TransactionsSheet.php

@@ -2,25 +2,27 @@
 
 namespace App\Imports\Sheets;
 
+use App\Imports\ValidatesPortfolioAccess;
 use App\Models\Holding;
+use App\Models\Portfolio;
 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\Concerns\ToModel;
 use Maatwebsite\Excel\Events\BeforeSheet;
-use Maatwebsite\Excel\Concerns\WithUpserts;
+use Maatwebsite\Excel\Concerns\WithEvents;
-use App\Rules\PortfolioAccessValidationRule;
+use Maatwebsite\Excel\Concerns\ToCollection;
 use Maatwebsite\Excel\Concerns\SkipsEmptyRows;
 use Maatwebsite\Excel\Concerns\WithHeadingRow;
 use Maatwebsite\Excel\Concerns\WithValidation;
-use Maatwebsite\Excel\Concerns\WithBatchInserts;
-use Maatwebsite\Excel\Concerns\WithEvents;
 
-class TransactionsSheet implements ToModel, WithHeadingRow, WithValidation, WithBatchInserts, WithUpserts, SkipsEmptyRows, WithEvents
+class TransactionsSheet implements ToCollection, WithHeadingRow, WithValidation, SkipsEmptyRows, WithEvents
 {
 
+    use ValidatesPortfolioAccess;
+
     public function __construct(
         public BackupImport $backupImport
     ) { }
@@ -41,41 +43,64 @@ class TransactionsSheet implements ToModel, WithHeadingRow, WithValidation, With
         ];
     }
 
-    public function model(array $transaction)
+    public function collection(Collection $transactions)
     {
-        $transaction = new Transaction([
-            'id' => $transaction['transaction_id'] ?? Str::uuid()->toString(),
-            'symbol' => strtoupper($transaction['symbol']),
-            'portfolio_id' => $transaction['portfolio_id'],
-            'transaction_type' => $transaction['transaction_type'],
-            'quantity' => $transaction['quantity'],
-            'cost_basis' => $transaction['cost_basis'] ?? 0,
-            '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')
-        ]);
 
-        // stub out related holding
+        $transactions->chunk($this->batchSize())->each(function ($chunk) {
-        Holding::firstOrCreate([
-            'symbol' => $transaction->symbol,
-            'portfolio_id' => $transaction->portfolio_id
-        ], [
-            'quantity' => 0,
-            'average_cost_basis' => 0,
-        ]);
 
-        return $transaction;
+            $this->validatePortfolioAccess($chunk);
+
+            // have to cast to native values
+            $chunk = $chunk->map(function ($transaction) {
+
+                return [
+                    'id' => $transaction['transaction_id'] ?? Str::uuid()->toString(),
+                    'symbol' => strtoupper($transaction['symbol']),
+                    'portfolio_id' => $transaction['portfolio_id'],
+                    'transaction_type' => $transaction['transaction_type'],
+                    'quantity' => $transaction['quantity'],
+                    'cost_basis' => $transaction['cost_basis'] ?? 0,
+                    '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')
+                ];
+            });
+
+            Transaction::upsert(
+                $chunk->toArray(),
+                ['id'],
+                [
+                    'id',
+                    'symbol',
+                    'portfolio_id',
+                    'transaction_type',
+                    'quantity',
+                    'cost_basis',
+                    'sale_price',
+                    'split',
+                    'reinvested_dividend',
+                    'date'
+                ]
+            );
+
+            // stub out related holdings
+            $chunk->unique('symbol')->each(function($holding) {
+                
+                Holding::firstOrCreate([
+                    'symbol' => $holding['symbol'],
+                    'portfolio_id' => $holding['portfolio_id']
+                ], [
+                    'quantity' => 0,
+                    'average_cost_basis' => 0,
+                ]);
+            });
+        });
     }
 
     public function batchSize(): int
     {
-        return 150;
+        return 500;
-    }
-
-    public function uniqueBy()
-    {
-        return 'id';
     }
 
     public function rules(): array
@@ -83,7 +108,7 @@ class TransactionsSheet implements ToModel, WithHeadingRow, WithValidation, With
         return [
             'transaction_id' => ['sometimes', 'nullable'],
             'symbol' => ['required', 'string'],
-            'portfolio_id' => ['required', new PortfolioAccessValidationRule($this->backupImport->user_id)],
+            'portfolio_id' => ['required'],
             'quantity' => ['required', 'min:0', 'numeric'],
             'transaction_type' => ['required', 'in:BUY,SELL'],
             'date' => ['required', 'date'],

app/Imports/ValidatesPortfolioAccess.php

@@ -0,0 +1,24 @@
+<?php
+
+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();
+
+        if (
+            $countPortfoliosWithAccess < $uniquePortfolios->count()
+        ) {
+            throw new \Exception(__("You do not have access to that portfolio."));
+        }
+    }
+}