diff --git a/.deploy/docker/entrypoint.sh b/.deploy/docker/entrypoint.sh index 0af6acec79..cd8228a8be 100755 --- a/.deploy/docker/entrypoint.sh +++ b/.deploy/docker/entrypoint.sh @@ -56,7 +56,7 @@ php artisan cache:clear php artisan migrate --seed php artisan firefly-iii:decrypt-all -# there are 12 upgrade commands +# there are 13 upgrade commands php artisan firefly-iii:transaction-identifiers php artisan firefly-iii:migrate-to-groups php artisan firefly-iii:account-currencies @@ -69,6 +69,7 @@ php artisan firefly-iii:bl-currency php artisan firefly-iii:cc-liabilities php artisan firefly-iii:back-to-journals php artisan firefly-iii:rename-account-meta +php artisan firefly-iii:migrate-recurrence-meta # there are 14 verify commands php artisan firefly-iii:fix-piggies diff --git a/app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php b/app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php index 99c4c70fb6..1e812f77f6 100644 --- a/app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php +++ b/app/Console/Commands/Upgrade/MigrateRecurrenceMeta.php @@ -110,12 +110,18 @@ class MigrateRecurrenceMeta extends Command if (null === $firstTransaction) { return 0; } + $value = $meta->value; + + if ('tags' === $meta->name) { + $array = explode(',', $meta->value); + $value = json_encode($array); + } RecurrenceTransactionMeta::create( [ 'rt_id' => $firstTransaction->id, 'name' => $meta->name, - 'value' => $meta->value, + 'value' => $value, ] ); $meta->forceDelete(); diff --git a/app/Console/Commands/Upgrade/UpgradeDatabase.php b/app/Console/Commands/Upgrade/UpgradeDatabase.php index 8fc138c20e..60e6ba5dac 100644 --- a/app/Console/Commands/Upgrade/UpgradeDatabase.php +++ b/app/Console/Commands/Upgrade/UpgradeDatabase.php @@ -58,7 +58,7 @@ class UpgradeDatabase extends Command $commands = [ - // there are 12 upgrade commands. + // there are 13 upgrade commands. 'firefly-iii:transaction-identifiers', 'firefly-iii:migrate-to-groups', 'firefly-iii:account-currencies', @@ -71,6 +71,7 @@ class UpgradeDatabase extends Command 'firefly-iii:cc-liabilities', 'firefly-iii:back-to-journals', 'firefly-iii:rename-account-meta', + 'firefly-iii:migrate-recurrence-meta', // there are 14 verify commands. 'firefly-iii:fix-piggies', diff --git a/app/Http/Controllers/System/InstallController.php b/app/Http/Controllers/System/InstallController.php index e8da516561..f1f59582b6 100644 --- a/app/Http/Controllers/System/InstallController.php +++ b/app/Http/Controllers/System/InstallController.php @@ -70,7 +70,7 @@ class InstallController extends Controller 'firefly-iii:decrypt-all' => [], 'generate-keys' => [], // an exception :( - // there are 12 upgrade commands. + // there are 13 upgrade commands. 'firefly-iii:transaction-identifiers' => [], 'firefly-iii:migrate-to-groups' => [], 'firefly-iii:account-currencies' => [], @@ -83,6 +83,7 @@ class InstallController extends Controller 'firefly-iii:cc-liabilities' => [], 'firefly-iii:back-to-journals' => [], 'firefly-iii:rename-account-meta' => [], + 'firefly-iii:migrate-recurrence-meta' => [], // there are 14 verify commands. 'firefly-iii:fix-piggies' => [], diff --git a/composer.json b/composer.json index 4acc13261c..663fcc7014 100644 --- a/composer.json +++ b/composer.json @@ -147,6 +147,7 @@ "@php artisan firefly-iii:cc-liabilities", "@php artisan firefly-iii:back-to-journals", "@php artisan firefly-iii:rename-account-meta", + "@php artisan firefly-iii:migrate-recurrence-meta", "@php artisan firefly-iii:fix-piggies", "@php artisan firefly-iii:create-link-types",