From 77929a6bc3582af6575f557cac404815d211cfa1 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 16 Nov 2020 15:40:52 +1100
Subject: [PATCH] Minor fixes for bulk import

---
 app/Console/Commands/ImportMigrations.php | 5 +++--
 app/Jobs/Util/StartMigration.php          | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Console/Commands/ImportMigrations.php b/app/Console/Commands/ImportMigrations.php
index af490e426bb8..0a04e1817b2f 100644
--- a/app/Console/Commands/ImportMigrations.php
+++ b/app/Console/Commands/ImportMigrations.php
@@ -88,14 +88,15 @@ class ImportMigrations extends Command
             'confirmation_code' => $this->createDbHash(config('database.default')),
         ]);
 
+CompanyToken::unguard();
         $company_token = CompanyToken::create([
             'user_id' => $user->id,
             'company_id' => $company->id,
             'account_id' => $account->id,
-            'name' => 'test token',
+            'name' => 'First token',
             'token' => Str::random(64),
         ]);
-
+        
         $user->companies()->attach($company->id, [
             'account_id' => $account->id,
             'is_owner' => 1,
diff --git a/app/Jobs/Util/StartMigration.php b/app/Jobs/Util/StartMigration.php
index 9a911ab024ef..22e215c763d0 100644
--- a/app/Jobs/Util/StartMigration.php
+++ b/app/Jobs/Util/StartMigration.php
@@ -107,7 +107,7 @@ class StartMigration implements ShouldQueue
 
             $data = json_decode(file_get_contents($file), 1);
 
-            Import::dispatchNow($data['data'], $this->company, $this->user);
+            Import::dispatchNow($data, $this->company, $this->user);
         } catch (NonExistingMigrationFile | ProcessingMigrationArchiveFailed | ResourceNotAvailableForMigration | MigrationValidatorFailed | ResourceDependencyMissing $e) {
 
             Mail::to($this->user)->send(new MigrationFailed($e, $e->getMessage()));