Auto commit for release 'develop' on 2024-05-27

# Conflicts:
#	app/Console/Commands/Upgrade/CorrectAccountBalance.php

app/Console/Commands/Upgrade/CorrectAccountBalance.php

@@ -33,9 +33,8 @@ 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.}';
 
     public function handle(): int

config/firefly.php

@@ -117,7 +117,7 @@ return [
         'expression_engine' => false,
         // see cer.php for exchange rates feature flag.
     ],
-    'version'                      => 'develop/2024-05-25',
+    'version'                      => 'develop/2024-05-27',
     'api_version'                  => '2.1.0',
     'db_version'                   => 24,
 

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
+                }
             }
         }
     }

database/seeders/ConfigSeeder.php

@@ -36,7 +36,7 @@ class ConfigSeeder extends Seeder
      */
     public function run(): void
     {
-        $entry = Configuration::where('name', 'db_version')->first();
+        $entry       = Configuration::where('name', 'db_version')->first();
         if (null === $entry) {
             Configuration::create(
                 [
@@ -44,11 +44,11 @@ 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();
     }
 }

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
+                }
             }
         }
     }

database/seeders/PermissionSeeder.php

@@ -46,10 +46,12 @@ 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
+                }
             }
         }
     }

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
+                }
             }
         }
     }

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
+                }
             }
         }
     }

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
+                }
             }
         }
     }

package-lock.json

@@ -3341,9 +3341,9 @@
             }
         },
         "node_modules/ajv-formats/node_modules/ajv": {
-            "version": "8.13.0",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.13.0.tgz",
-            "integrity": "sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==",
+            "version": "8.14.0",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.14.0.tgz",
+            "integrity": "sha512-oYs1UUtO97ZO2lJ4bwnWeQW8/zvOIQLGKcvPTsWmvc2SYgBb+upuNS5NxoLaMU4h8Ju3Nbj6Cq8mD2LQoqVKFA==",
             "dev": true,
             "dependencies": {
                 "fast-deep-equal": "^3.1.3",
@@ -5840,6 +5840,7 @@
             "version": "7.2.3",
             "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
             "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+            "deprecated": "Glob versions prior to v9 are no longer supported",
             "dev": true,
             "dependencies": {
                 "fs.realpath": "^1.0.0",
@@ -8972,6 +8973,7 @@
             "version": "2.7.1",
             "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
             "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+            "deprecated": "Rimraf versions prior to v4 are no longer supported",
             "dev": true,
             "dependencies": {
                 "glob": "^7.1.3"
@@ -10447,9 +10449,9 @@
             }
         },
         "node_modules/webpack-dev-middleware/node_modules/ajv": {
-            "version": "8.13.0",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.13.0.tgz",
-            "integrity": "sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==",
+            "version": "8.14.0",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.14.0.tgz",
+            "integrity": "sha512-oYs1UUtO97ZO2lJ4bwnWeQW8/zvOIQLGKcvPTsWmvc2SYgBb+upuNS5NxoLaMU4h8Ju3Nbj6Cq8mD2LQoqVKFA==",
             "dev": true,
             "dependencies": {
                 "fast-deep-equal": "^3.1.3",
@@ -10559,9 +10561,9 @@
             }
         },
         "node_modules/webpack-dev-server/node_modules/ajv": {
-            "version": "8.13.0",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.13.0.tgz",
-            "integrity": "sha512-PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==",
+            "version": "8.14.0",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.14.0.tgz",
+            "integrity": "sha512-oYs1UUtO97ZO2lJ4bwnWeQW8/zvOIQLGKcvPTsWmvc2SYgBb+upuNS5NxoLaMU4h8Ju3Nbj6Cq8mD2LQoqVKFA==",
             "dev": true,
             "dependencies": {
                 "fast-deep-equal": "^3.1.3",
@@ -10613,6 +10615,7 @@
             "version": "3.0.2",
             "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
             "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+            "deprecated": "Rimraf versions prior to v4 are no longer supported",
             "dev": true,
             "dependencies": {
                 "glob": "^7.1.3"