From 7009b444d9a4791f578bd905c72ded57a6a719b5 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 26 May 2024 15:36:30 +0200 Subject: [PATCH] Skip creation using if statement. --- .../Commands/Upgrade/CorrectAccountBalance.php | 2 +- database/seeders/AccountTypeSeeder.php | 10 ++++++---- database/seeders/ConfigSeeder.php | 9 ++++----- database/seeders/LinkTypeSeeder.php | 10 ++++++---- database/seeders/PermissionSeeder.php | 11 +++++++---- database/seeders/TransactionCurrencySeeder.php | 10 ++++++---- database/seeders/TransactionTypeSeeder.php | 10 ++++++---- database/seeders/UserRoleSeeder.php | 10 ++++++---- 8 files changed, 42 insertions(+), 30 deletions(-) diff --git a/app/Console/Commands/Upgrade/CorrectAccountBalance.php b/app/Console/Commands/Upgrade/CorrectAccountBalance.php index 2fc946fa49..8d313d2793 100644 --- a/app/Console/Commands/Upgrade/CorrectAccountBalance.php +++ b/app/Console/Commands/Upgrade/CorrectAccountBalance.php @@ -33,7 +33,7 @@ use Illuminate\Console\Command; class CorrectAccountBalance extends Command { use ShowsFriendlyMessages; - public const string CONFIG_NAME = '620_correct_balances'; + public const string CONFIG_NAME = '610_correct_balances'; protected $description = 'Recalculate all account balance amounts'; protected $signature = 'firefly-iii:correct-account-balance {--F|force : Force the execution of this command.}'; diff --git a/database/seeders/AccountTypeSeeder.php b/database/seeders/AccountTypeSeeder.php index 7f968ba642..8dd3ce2289 100644 --- a/database/seeders/AccountTypeSeeder.php +++ b/database/seeders/AccountTypeSeeder.php @@ -49,10 +49,12 @@ class AccountTypeSeeder extends Seeder AccountType::LIABILITY_CREDIT, ]; foreach ($types as $type) { - try { - AccountType::create(['type' => $type]); - } catch (\PDOException $e) { - // @ignoreException + if(null === AccountType::where('type', $type)->first()) { + try { + AccountType::create(['type' => $type]); + } catch (\PDOException $e) { + // @ignoreException + } } } } diff --git a/database/seeders/ConfigSeeder.php b/database/seeders/ConfigSeeder.php index 3f7fece659..842b8cc069 100644 --- a/database/seeders/ConfigSeeder.php +++ b/database/seeders/ConfigSeeder.php @@ -44,11 +44,10 @@ class ConfigSeeder extends Seeder 'data' => 1, ] ); + return; } - if (null !== $entry) { - $version = (int)config('firefly.db_version'); - $entry->data = $version; - $entry->save(); - } + $version = (int) config('firefly.db_version'); + $entry->data = $version; + $entry->save(); } } diff --git a/database/seeders/LinkTypeSeeder.php b/database/seeders/LinkTypeSeeder.php index 1dca2fd2a0..48fc038cf6 100644 --- a/database/seeders/LinkTypeSeeder.php +++ b/database/seeders/LinkTypeSeeder.php @@ -60,10 +60,12 @@ class LinkTypeSeeder extends Seeder ], ]; foreach ($types as $type) { - try { - LinkType::create($type); - } catch (\PDOException $e) { - // @ignoreException + if (null === LinkType::where('name', $type['name'])->first()) { + try { + LinkType::create($type); + } catch (\PDOException $e) { + // @ignoreException + } } } } diff --git a/database/seeders/PermissionSeeder.php b/database/seeders/PermissionSeeder.php index 76e5106459..d94e35e1b3 100644 --- a/database/seeders/PermissionSeeder.php +++ b/database/seeders/PermissionSeeder.php @@ -46,11 +46,14 @@ class PermissionSeeder extends Seeder ], ]; foreach ($roles as $role) { - try { - Role::create($role); - } catch (\PDOException $e) { - // @ignoreException + if (null === Role::where('name', $role['name'])->first()) { + try { + Role::create($role); + } catch (\PDOException $e) { + // @ignoreException + } } + } } } diff --git a/database/seeders/TransactionCurrencySeeder.php b/database/seeders/TransactionCurrencySeeder.php index 530881b36f..22f0f82dcd 100644 --- a/database/seeders/TransactionCurrencySeeder.php +++ b/database/seeders/TransactionCurrencySeeder.php @@ -71,10 +71,12 @@ class TransactionCurrencySeeder extends Seeder $currencies[] = ['code' => 'HRK', 'name' => 'Croatian kuna', 'symbol' => 'kn', 'decimal_places' => 2]; foreach ($currencies as $currency) { - try { - TransactionCurrency::create($currency); - } catch (\PDOException $e) { - // @ignoreException + if(null === TransactionCurrency::where('code', $currency['code'])->first()) { + try { + TransactionCurrency::create($currency); + } catch (\PDOException $e) { + // @ignoreException + } } } } diff --git a/database/seeders/TransactionTypeSeeder.php b/database/seeders/TransactionTypeSeeder.php index 1793b3e991..5241ee49dc 100644 --- a/database/seeders/TransactionTypeSeeder.php +++ b/database/seeders/TransactionTypeSeeder.php @@ -44,10 +44,12 @@ class TransactionTypeSeeder extends Seeder ]; foreach ($types as $type) { - try { - TransactionType::create(['type' => $type]); - } catch (\PDOException $e) { - // @ignoreException + if(null === TransactionType::where('type', $type)->first()) { + try { + TransactionType::create(['type' => $type]); + } catch (\PDOException $e) { + // @ignoreException + } } } } diff --git a/database/seeders/UserRoleSeeder.php b/database/seeders/UserRoleSeeder.php index 76d1c2084f..9b94e9f6fb 100644 --- a/database/seeders/UserRoleSeeder.php +++ b/database/seeders/UserRoleSeeder.php @@ -45,10 +45,12 @@ class UserRoleSeeder extends Seeder /** @var string $role */ foreach ($roles as $role) { - try { - UserRole::create(['title' => $role]); - } catch (\PDOException $e) { - // @ignoreException + if(null === UserRole::where('title', $role)->first()) { + try { + UserRole::create(['title' => $role]); + } catch (\PDOException $e) { + // @ignoreException + } } } }