diff --git a/.env.docker b/.env.docker index 28b1973148..20f4436f77 100644 --- a/.env.docker +++ b/.env.docker @@ -95,4 +95,5 @@ DEMO_PASSWORD= IS_DOCKER=true IS_SANDSTORM=false IS_HEROKU=false +BUNQ_USE_SANDBOX=false TZ=${TZ} diff --git a/.env.example b/.env.example index 2f2f38771a..e45753a2ca 100644 --- a/.env.example +++ b/.env.example @@ -98,4 +98,5 @@ DEMO_USERNAME= DEMO_PASSWORD= IS_DOCKER=false IS_SANDSTORM=false +BUNQ_USE_SANDBOX=false IS_HEROKU=false diff --git a/.env.heroku b/.env.heroku index e25675664d..91e273659a 100644 --- a/.env.heroku +++ b/.env.heroku @@ -98,4 +98,5 @@ DEMO_USERNAME= DEMO_PASSWORD= IS_DOCKER=false IS_SANDSTORM=false +BUNQ_USE_SANDBOX=false IS_HEROKU=true diff --git a/.env.sandstorm b/.env.sandstorm index 8aa9358af8..c72676704c 100755 --- a/.env.sandstorm +++ b/.env.sandstorm @@ -98,4 +98,5 @@ DEMO_USERNAME= DEMO_PASSWORD= IS_DOCKER=false IS_SANDSTORM=true +BUNQ_USE_SANDBOX=false IS_HEROKU=false diff --git a/.env.testing b/.env.testing index 04b6a2b328..943ab13502 100644 --- a/.env.testing +++ b/.env.testing @@ -94,4 +94,5 @@ DEMO_USERNAME= DEMO_PASSWORD= IS_DOCKER=false IS_SANDSTORM=false +BUNQ_USE_SANDBOX=true IS_HEROKU=false diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md new file mode 100644 index 0000000000..1312de943a --- /dev/null +++ b/.github/ISSUE_TEMPLATE/Bug_report.md @@ -0,0 +1,22 @@ +--- +name: Bug report +about: Create a report to help Firefly III improve + +--- + +**Bug description** +I am running Firefly III version x.x.x + +(please give a clear and concise description of what the bug is) + +**Steps to reproduce** +What do you need to do to trigger this bug? + +**Extra info** +Please add extra info here, such as OS, browser, and the output from the `/debug`-page of your Firefly III installation (click the version at the bottom). + +**Bonus points** +Earn bonus points by: + +- Post a stacktrace from your log files +- Add a screenshot \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/Custom.md b/.github/ISSUE_TEMPLATE/Custom.md new file mode 100644 index 0000000000..f943c935cb --- /dev/null +++ b/.github/ISSUE_TEMPLATE/Custom.md @@ -0,0 +1,25 @@ +--- +name: I have a question or a problem +about: Ask away + +--- + +I am running Firefly III version x.x.x + +**Description of my issue:** + + +**Steps to reproduce** + +(please include if this problem also exists on the demo site: https://demo.firefly-iii.org/ ) + +**Extra info** + +Please add extra info here, such as OS, browser, and the output from the `/debug`-page of your Firefly III installation (click the version at the bottom). + +**Bonus points** +Earn bonus points by: + +- Post a stacktrace from your log files +- Add a screenshot +- Post nginx or Apache configuration \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/Feature_request.md b/.github/ISSUE_TEMPLATE/Feature_request.md new file mode 100644 index 0000000000..7dfae270ae --- /dev/null +++ b/.github/ISSUE_TEMPLATE/Feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea or feature for Firefly III + +--- + +**Description** +Please describe your feature request: + +- I would like Firefly III to do X. +- What if you would add Y? + +**Solution** +Describe what your feature would add to Firefly III. + +**What are alternatives?** +Please describe what alternatives currently exist. + +**Additional context** +Add any other context or screenshots about the feature request here. \ No newline at end of file diff --git a/.github/issue_template.md b/.github/issue_template.md deleted file mode 100644 index d1640a0f27..0000000000 --- a/.github/issue_template.md +++ /dev/null @@ -1,11 +0,0 @@ -I am running Firefly III version x.x.x - -#### Description of my issue: - -#### Steps to reproduce - -(please include if this problem also exists on the demo site) - -#### Other important details (log files, system info): - -Please click the version number in the right corner of any Firefly III page to get debug information. \ No newline at end of file diff --git a/.sandstorm/changelog.md b/.sandstorm/changelog.md index 9f8550f563..c46086da90 100644 --- a/.sandstorm/changelog.md +++ b/.sandstorm/changelog.md @@ -1,7 +1,31 @@ +# 4.7.4 +- [Issue 1409](https://github.com/firefly-iii/firefly-iii/issues/1409), add Indian Rupee and explain that users can do this themselves [issue 1413](https://github.com/firefly-iii/firefly-iii/issues/1413) +- [Issue 1445](https://github.com/firefly-iii/firefly-iii/issues/1445), upgrade Curl in Docker image. +- [Issue 1386](https://github.com/firefly-iii/firefly-iii/issues/1386), quick links to often used pages. +- [Issue 1405](https://github.com/firefly-iii/firefly-iii/issues/1405), show proposed amount to piggy banks. +- [Issue 1416](https://github.com/firefly-iii/firefly-iii/issues/1416), ability to delete lost attachments. +- A completely rewritten import routine that can handle bunq (thanks everybody for testing!), CSV files and Spectre. Please make sure you read about this at http://bit.ly/FF3-new-import +- [Issue 1392](https://github.com/firefly-iii/firefly-iii/issues/1392), explicitly mention rules are inactive (when they are). +- [Issue 1406](https://github.com/firefly-iii/firefly-iii/issues/1406), bill conversion to rules will be smarter about the rules they create. +- [Issue 1369](https://github.com/firefly-iii/firefly-iii/issues/1369), you can now properly order piggy banks again. +- [Issue 1389](https://github.com/firefly-iii/firefly-iii/issues/1389), null-pointer in the import routine. +- [Issue 1400](https://github.com/firefly-iii/firefly-iii/issues/1400), missing translation. +- [Issue 1403](https://github.com/firefly-iii/firefly-iii/issues/1403), bill would always be marked as inactive in edit screen. +- [Issue 1418](https://github.com/firefly-iii/firefly-iii/issues/1418), missing note text on bill page. +- Export routine would break when encountering un-decryptable files. +- [Issue 1425](https://github.com/firefly-iii/firefly-iii/issues/1425), empty fields when edit multiple transactions at once. +- [Issue 1449](https://github.com/firefly-iii/firefly-iii/issues/1449), bad calculations in "budget left to spend" view. +- [Issue 1451](https://github.com/firefly-iii/firefly-iii/issues/1451), same but in another view. +- [Issue 1453](https://github.com/firefly-iii/firefly-iii/issues/1453), same as [issue 1403](https://github.com/firefly-iii/firefly-iii/issues/1403). +- [Issue 1455](https://github.com/firefly-iii/firefly-iii/issues/1455), could add income to a budget. +- [Issue 1442](https://github.com/firefly-iii/firefly-iii/issues/1442), issues with editing a split deposit. +- [Issue 1452](https://github.com/firefly-iii/firefly-iii/issues/1452), date range problems with tags. +- [Issue 1458](https://github.com/firefly-iii/firefly-iii/issues/1458), same for transactions. +- [Issue 1415](https://github.com/firefly-iii/firefly-iii/issues/1415), will email you when OAuth2 keys are generated. + # 4.7.3.2 - Forgot to increase the version number :(. - # 4.7.3.1 - Fixed a critical bug where the rules-engine would fire inadvertently. diff --git a/.sandstorm/sandstorm-pkgdef.capnp b/.sandstorm/sandstorm-pkgdef.capnp index 239821c66b..6f5c532bd3 100644 --- a/.sandstorm/sandstorm-pkgdef.capnp +++ b/.sandstorm/sandstorm-pkgdef.capnp @@ -15,8 +15,8 @@ const pkgdef :Spk.PackageDefinition = ( manifest = ( appTitle = (defaultText = "Firefly III"), - appVersion = 12, - appMarketingVersion = (defaultText = "4.7.3.2"), + appVersion = 13, + appMarketingVersion = (defaultText = "4.7.4"), actions = [ # Define your "new document" handlers here. diff --git a/Dockerfile b/Dockerfile index 05884d9350..e9619b7ee4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,8 @@ FROM php:7.1-apache # set working dir ENV FIREFLY_PATH /var/www/firefly-iii +ENV CURL_VERSION 7.60.0 +ENV OPENSSL_VERSION 1.1.1-pre6 WORKDIR $FIREFLY_PATH ADD . $FIREFLY_PATH @@ -11,7 +13,8 @@ RUN apt-get update -y && \ apt-get install -y --no-install-recommends libcurl4-openssl-dev \ zlib1g-dev \ libjpeg62-turbo-dev \ - libpng12-dev \ + wget \ + libpng-dev \ libicu-dev \ libedit-dev \ libtidy-dev \ @@ -24,6 +27,26 @@ RUN apt-get update -y && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* +# Setup the Composer installer +RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer + +# Install latest curl +RUN cd /tmp && \ + wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz && \ + tar -xvf openssl-${OPENSSL_VERSION}.tar.gz && \ + cd openssl-${OPENSSL_VERSION} && \ + ./config && \ + make && \ + make install + +RUN cd /tmp && \ + wget https://curl.haxx.se/download/curl-${CURL_VERSION}.tar.gz && \ + tar -xvf curl-${CURL_VERSION}.tar.gz && \ + cd curl-${CURL_VERSION} && \ + ./configure --with-ssl && \ + make && \ + make install + # Install PHP exentions. RUN docker-php-ext-install -j$(nproc) curl gd intl json readline tidy zip bcmath xml mbstring pdo_sqlite pdo_mysql bz2 pdo_pgsql @@ -42,9 +65,6 @@ RUN a2enmod ssl # Create volumes for several directories: VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload -# Setup the Composer installer -RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer - # Enable default site (Firefly III) COPY ./.deploy/docker/apache-firefly.conf /etc/apache2/sites-available/000-default.conf @@ -58,4 +78,5 @@ RUN composer install --prefer-dist --no-dev --no-scripts --no-suggest EXPOSE 80 # Run entrypoint thing -ENTRYPOINT [".deploy/docker/entrypoint.sh"] \ No newline at end of file +ENTRYPOINT [".deploy/docker/entrypoint.sh"] + diff --git a/app/Api/V1/Controllers/AboutController.php b/app/Api/V1/Controllers/AboutController.php index e7fcc291c3..77e63b7c64 100644 --- a/app/Api/V1/Controllers/AboutController.php +++ b/app/Api/V1/Controllers/AboutController.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers; diff --git a/app/Api/V1/Controllers/AccountController.php b/app/Api/V1/Controllers/AccountController.php index cff7969f6f..2f951fed3b 100644 --- a/app/Api/V1/Controllers/AccountController.php +++ b/app/Api/V1/Controllers/AccountController.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers; diff --git a/app/Api/V1/Controllers/BillController.php b/app/Api/V1/Controllers/BillController.php index bbf38c444d..420b01dc16 100644 --- a/app/Api/V1/Controllers/BillController.php +++ b/app/Api/V1/Controllers/BillController.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Api\V1\Controllers; use FireflyIII\Api\V1\Requests\BillRequest; diff --git a/app/Api/V1/Controllers/Controller.php b/app/Api/V1/Controllers/Controller.php index ba49f812aa..a212ad3029 100644 --- a/app/Api/V1/Controllers/Controller.php +++ b/app/Api/V1/Controllers/Controller.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Api\V1\Controllers; use Carbon\Carbon; diff --git a/app/Api/V1/Controllers/TransactionController.php b/app/Api/V1/Controllers/TransactionController.php index 99ea62de2a..f0dbc2b246 100644 --- a/app/Api/V1/Controllers/TransactionController.php +++ b/app/Api/V1/Controllers/TransactionController.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers; diff --git a/app/Api/V1/Controllers/UserController.php b/app/Api/V1/Controllers/UserController.php index 1cf1bece04..f2759f9e71 100644 --- a/app/Api/V1/Controllers/UserController.php +++ b/app/Api/V1/Controllers/UserController.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); namespace FireflyIII\Api\V1\Controllers; diff --git a/app/Api/V1/Requests/AccountRequest.php b/app/Api/V1/Requests/AccountRequest.php index 44977d41e2..5a287b85ed 100644 --- a/app/Api/V1/Requests/AccountRequest.php +++ b/app/Api/V1/Requests/AccountRequest.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); namespace FireflyIII\Api\V1\Requests; diff --git a/app/Api/V1/Requests/BillRequest.php b/app/Api/V1/Requests/BillRequest.php index f2e13aaf9f..9f68a656cd 100644 --- a/app/Api/V1/Requests/BillRequest.php +++ b/app/Api/V1/Requests/BillRequest.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); namespace FireflyIII\Api\V1\Requests; diff --git a/app/Api/V1/Requests/CurrencyRequest.php b/app/Api/V1/Requests/CurrencyRequest.php index 72666a3a77..8e2edfeda9 100644 --- a/app/Api/V1/Requests/CurrencyRequest.php +++ b/app/Api/V1/Requests/CurrencyRequest.php @@ -80,4 +80,4 @@ class CurrencyRequest extends Request return $rules; } -} \ No newline at end of file +} diff --git a/app/Api/V1/Requests/Request.php b/app/Api/V1/Requests/Request.php index 509c092956..e2016dba34 100644 --- a/app/Api/V1/Requests/Request.php +++ b/app/Api/V1/Requests/Request.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Api\V1\Requests; use FireflyIII\Http\Requests\Request as FireflyIIIRequest; diff --git a/app/Api/V1/Requests/TransactionRequest.php b/app/Api/V1/Requests/TransactionRequest.php index 2b7ce5c0f9..ab03ec561a 100644 --- a/app/Api/V1/Requests/TransactionRequest.php +++ b/app/Api/V1/Requests/TransactionRequest.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); namespace FireflyIII\Api\V1\Requests; diff --git a/app/Api/V1/Requests/UserRequest.php b/app/Api/V1/Requests/UserRequest.php index 2a1d76fe86..ba9bf54904 100644 --- a/app/Api/V1/Requests/UserRequest.php +++ b/app/Api/V1/Requests/UserRequest.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); namespace FireflyIII\Api\V1\Requests; diff --git a/app/Console/Commands/CreateExport.php b/app/Console/Commands/CreateExport.php index 658dce8505..336c5718ff 100644 --- a/app/Console/Commands/CreateExport.php +++ b/app/Console/Commands/CreateExport.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Console\Commands; use Carbon\Carbon; diff --git a/app/Console/Commands/CreateImport.php b/app/Console/Commands/CreateImport.php index 209ed068cf..8c23105c0a 100644 --- a/app/Console/Commands/CreateImport.php +++ b/app/Console/Commands/CreateImport.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Console\Commands; +use Exception; use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Import\Prerequisites\PrerequisitesInterface; use FireflyIII\Import\Routine\RoutineInterface; +use FireflyIII\Import\Storage\ImportArrayStorage; use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; use FireflyIII\Repositories\User\UserRepositoryInterface; -use FireflyIII\Services\Internal\File\EncryptService; use Illuminate\Console\Command; -use Illuminate\Support\MessageBag; use Log; use Preferences; @@ -52,18 +55,17 @@ class CreateImport extends Command */ protected $signature = 'firefly:create-import - {file : The file to import.} - {configuration : The configuration file to use for the import.} + {file? : The file to import.} + {configuration? : The configuration file to use for the import.} {--type=csv : The file type of the import.} - {--user= : The user ID that the import should import for.} + {--provider=file : The file type of the import.} + {--user=1 : The user ID that the import should import for.} {--token= : The user\'s access token.} {--start : Starts the job immediately.}'; /** * Run the command. * - * @noinspection MultipleReturnStatementsInspection - * * @throws FireflyException */ public function handle(): int @@ -74,77 +76,155 @@ class CreateImport extends Command return 1; } /** @var UserRepositoryInterface $userRepository */ - $userRepository = app(UserRepositoryInterface::class); - $file = $this->argument('file'); - $configuration = $this->argument('configuration'); - $user = $userRepository->findNull((int)$this->option('user')); - $cwd = getcwd(); - $type = strtolower($this->option('type')); + $userRepository = app(UserRepositoryInterface::class); + $file = (string)$this->argument('file'); + $configuration = (string)$this->argument('configuration'); + $user = $userRepository->findNull((int)$this->option('user')); + $cwd = getcwd(); + $type = strtolower((string)$this->option('type')); + $provider = strtolower((string)$this->option('provider')); + $configurationData = []; if (!$this->validArguments()) { $this->errorLine('Invalid arguments.'); return 1; } + if (\strlen($configuration) > 0) { + $configurationData = json_decode(file_get_contents($configuration), true); + if (null === $configurationData) { + $this->errorLine(sprintf('Firefly III cannot read the contents of configuration file "%s" (working directory: "%s").', $configuration, $cwd)); - $configurationData = json_decode(file_get_contents($configuration), true); - if (null === $configurationData) { - $this->errorLine(sprintf('Firefly III cannot read the contents of configuration file "%s" (working directory: "%s").', $configuration, $cwd)); - - return 1; + return 1; + } } + $this->infoLine(sprintf('Going to create a job to import file: %s', $file)); $this->infoLine(sprintf('Using configuration file: %s', $configuration)); $this->infoLine(sprintf('Import into user: #%d (%s)', $user->id, $user->email)); - $this->infoLine(sprintf('Type of import: %s', $type)); + $this->infoLine(sprintf('Type of import: %s', $provider)); /** @var ImportJobRepositoryInterface $jobRepository */ $jobRepository = app(ImportJobRepositoryInterface::class); $jobRepository->setUser($user); - $job = $jobRepository->create($type); - $this->infoLine(sprintf('Created job "%s"', $job->key)); + $importJob = $jobRepository->create($provider); + $this->infoLine(sprintf('Created job "%s"', $importJob->key)); - /** @var EncryptService $service */ - $service = app(EncryptService::class); - $service->encrypt($file, $job->key); - - $this->infoLine('Stored import data...'); - - $jobRepository->setConfiguration($job, $configurationData); - $jobRepository->updateStatus($job, 'configured'); - $this->infoLine('Stored configuration...'); - - if (true === $this->option('start')) { - $this->infoLine('The import will start in a moment. This process is not visible...'); - Log::debug('Go for import!'); - - // normally would refer to other firefly:start-import but that doesn't seem to work all to well... - - // start the actual routine: - $type = 'csv' === $job->file_type ? 'file' : $job->file_type; - $key = sprintf('import.routine.%s', $type); - $className = config($key); - if (null === $className || !class_exists($className)) { - throw new FireflyException(sprintf('Cannot find import routine class for job of type "%s".', $type)); // @codeCoverageIgnore + // make sure that job has no prerequisites. + if ((bool)config(sprintf('import.has_prereq.%s', $provider))) { + // make prerequisites thing. + $class = (string)config(sprintf('import.prerequisites.%s', $provider)); + if (!class_exists($class)) { + throw new FireflyException(sprintf('No class to handle prerequisites for "%s".', $provider)); // @codeCoverageIgnore } - /** @var RoutineInterface $routine */ - $routine = app($className); - $routine->setJob($job); - $routine->run(); + /** @var PrerequisitesInterface $object */ + $object = app($class); + $object->setUser($user); + if (!$object->isComplete()) { + $this->errorLine(sprintf('Import provider "%s" has prerequisites that can only be filled in using the browser.', $provider)); - // give feedback. - /** @var MessageBag $error */ - foreach ($routine->getErrors() as $index => $error) { - $this->errorLine(sprintf('Error importing line #%d: %s', $index, $error)); + return 1; } - $this->infoLine( - sprintf( - 'The import has finished. %d transactions have been imported out of %d records.', $routine->getJournals()->count(), $routine->getLines() - ) - ); } + // store file as attachment. + if (\strlen($file) > 0) { + $messages = $jobRepository->storeCLIUpload($importJob, 'import_file', $file); + if ($messages->count() > 0) { + $this->errorLine($messages->first()); + + return 1; + } + $this->infoLine('File content saved.'); + } + + $this->infoLine('Job configuration saved.'); + $jobRepository->setConfiguration($importJob, $configurationData); + $jobRepository->setStatus($importJob, 'ready_to_run'); + + + if (true === $this->option('start')) { + $this->infoLine('The has started. The process is not visible. Please wait.'); + Log::debug('Go for import!'); + + // run it! + $key = sprintf('import.routine.%s', $provider); + $className = config($key); + if (null === $className || !class_exists($className)) { + // @codeCoverageIgnoreStart + $this->errorLine(sprintf('No routine for provider "%s"', $provider)); + + return 1; + // @codeCoverageIgnoreEnd + } + + // keep repeating this call until job lands on "provider_finished" + $valid = ['provider_finished']; + $count = 0; + while (!\in_array($importJob->status, $valid, true) && $count < 6) { + Log::debug(sprintf('Now in loop #%d.', $count + 1)); + /** @var RoutineInterface $routine */ + $routine = app($className); + $routine->setImportJob($importJob); + try { + $routine->run(); + } catch (FireflyException|Exception $e) { + $message = 'The import routine crashed: ' . $e->getMessage(); + Log::error($message); + Log::error($e->getTraceAsString()); + + // set job errored out: + $jobRepository->setStatus($importJob, 'error'); + $this->errorLine($message); + + return 1; + } + $count++; + } + if ($importJob->status === 'provider_finished') { + $this->infoLine('Import has finished. Please wait for storage of data.'); + // set job to be storing data: + $jobRepository->setStatus($importJob, 'storing_data'); + + /** @var ImportArrayStorage $storage */ + $storage = app(ImportArrayStorage::class); + $storage->setImportJob($importJob); + + try { + $storage->store(); + } catch (FireflyException|Exception $e) { + $message = 'The import routine crashed: ' . $e->getMessage(); + Log::error($message); + Log::error($e->getTraceAsString()); + + // set job errored out: + $jobRepository->setStatus($importJob, 'error'); + $this->errorLine($message); + + return 1; + } + // set storage to be finished: + $jobRepository->setStatus($importJob, 'storage_finished'); + } + + // give feedback: + $this->infoLine('Job has finished.'); + if (null !== $importJob->tag) { + $this->infoLine(sprintf('%d transaction(s) have been imported.', $importJob->tag->transactionJournals->count())); + $this->infoLine(sprintf('You can find your transactions under tag "%s"', $importJob->tag->tag)); + } + + if (null === $importJob->tag) { + $this->errorLine('No transactions have been imported :(.'); + } + if (\count($importJob->errors) > 0) { + $this->infoLine(sprintf('%d error(s) occurred:', \count($importJob->errors))); + foreach ($importJob->errors as $err) { + $this->errorLine('- ' . $err); + } + } + } // clear cache for user: Preferences::setForUser($user, 'lastActivity', microtime()); @@ -185,20 +265,28 @@ class CreateImport extends Command $cwd = getcwd(); $validTypes = config('import.options.file.import_formats'); $type = strtolower($this->option('type')); + $provider = strtolower($this->option('provider')); + $enabled = (bool)config(sprintf('import.enabled.%s', $provider)); - if (!\in_array($type, $validTypes, true)) { + if (false === $enabled) { + $this->errorLine(sprintf('Provider "%s" is not enabled.', $provider)); + + return false; + } + + if ($provider === 'file' && !\in_array($type, $validTypes, true)) { $this->errorLine(sprintf('Cannot import file of type "%s"', $type)); return false; } - if (!file_exists($file)) { + if ($provider === 'file' && !file_exists($file)) { $this->errorLine(sprintf('Firefly III cannot find file "%s" (working directory: "%s").', $file, $cwd)); return false; } - if (!file_exists($configuration)) { + if ($provider === 'file' && !file_exists($configuration)) { $this->errorLine(sprintf('Firefly III cannot find configuration file "%s" (working directory: "%s").', $configuration, $cwd)); return false; diff --git a/app/Console/Commands/DecryptAttachment.php b/app/Console/Commands/DecryptAttachment.php index baf2414ba5..dca003e8b9 100644 --- a/app/Console/Commands/DecryptAttachment.php +++ b/app/Console/Commands/DecryptAttachment.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Console\Commands; use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface; diff --git a/app/Console/Commands/EncryptFile.php b/app/Console/Commands/EncryptFile.php index 0e787860e7..d074897c23 100644 --- a/app/Console/Commands/EncryptFile.php +++ b/app/Console/Commands/EncryptFile.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Console\Commands; use FireflyIII\Exceptions\FireflyException; diff --git a/app/Console/Commands/Import.php b/app/Console/Commands/Import.php index 9a12e5988f..25ec3be10a 100644 --- a/app/Console/Commands/Import.php +++ b/app/Console/Commands/Import.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Console\Commands; use FireflyIII\Exceptions\FireflyException; diff --git a/app/Console/Commands/ScanAttachments.php b/app/Console/Commands/ScanAttachments.php index e30727488e..b23f82b1ce 100644 --- a/app/Console/Commands/ScanAttachments.php +++ b/app/Console/Commands/ScanAttachments.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Console\Commands; use Crypt; diff --git a/app/Console/Commands/UpgradeDatabase.php b/app/Console/Commands/UpgradeDatabase.php index 9c3adc2536..c4f31d21d2 100644 --- a/app/Console/Commands/UpgradeDatabase.php +++ b/app/Console/Commands/UpgradeDatabase.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Console\Commands; use DB; @@ -159,28 +161,41 @@ class UpgradeDatabase extends Command 'order' => 2, ] ); - - // add triggers for amounts: - RuleTrigger::create( - [ - 'rule_id' => $rule->id, - 'trigger_type' => 'amount_less', - 'trigger_value' => round($bill->amount_max, $currency->decimal_places), - 'active' => 1, - 'stop_processing' => 0, - 'order' => 3, - ] - ); - RuleTrigger::create( - [ - 'rule_id' => $rule->id, - 'trigger_type' => 'amount_more', - 'trigger_value' => round($bill->amount_min, $currency->decimal_places), - 'active' => 1, - 'stop_processing' => 0, - 'order' => 4, - ] - ); + if ($bill->amount_max !== $bill->amount_min) { + // add triggers for amounts: + RuleTrigger::create( + [ + 'rule_id' => $rule->id, + 'trigger_type' => 'amount_less', + 'trigger_value' => round($bill->amount_max, $currency->decimal_places), + 'active' => 1, + 'stop_processing' => 0, + 'order' => 3, + ] + ); + RuleTrigger::create( + [ + 'rule_id' => $rule->id, + 'trigger_type' => 'amount_more', + 'trigger_value' => round($bill->amount_min, $currency->decimal_places), + 'active' => 1, + 'stop_processing' => 0, + 'order' => 4, + ] + ); + } + if($bill->amount_max === $bill->amount_min) { + RuleTrigger::create( + [ + 'rule_id' => $rule->id, + 'trigger_type' => 'amount_exactly', + 'trigger_value' => round($bill->amount_min, $currency->decimal_places), + 'active' => 1, + 'stop_processing' => 0, + 'order' => 3, + ] + ); + } // create action RuleAction::create( @@ -600,12 +615,16 @@ class UpgradeDatabase extends Command $opposing->transaction_currency_id = $currency->id; $transaction->save(); $opposing->save(); - Log::debug(sprintf('Currency for account "%s" is %s, and currency for account "%s" is also + Log::debug( + sprintf( + 'Currency for account "%s" is %s, and currency for account "%s" is also %s, so %s #%d (#%d and #%d) has been verified to be to %s exclusively.', - $opposing->account->name, $opposingCurrency->code, - $transaction->account->name, $transaction->transactionCurrency->code, - $journal->transactionType->type, $journal->id, - $transaction->id, $opposing->id, $currency->code)); + $opposing->account->name, $opposingCurrency->code, + $transaction->account->name, $transaction->transactionCurrency->code, + $journal->transactionType->type, $journal->id, + $transaction->id, $opposing->id, $currency->code + ) + ); return; } diff --git a/app/Console/Commands/UpgradeFireflyInstructions.php b/app/Console/Commands/UpgradeFireflyInstructions.php index a79e62f05f..7924e609a0 100644 --- a/app/Console/Commands/UpgradeFireflyInstructions.php +++ b/app/Console/Commands/UpgradeFireflyInstructions.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Console\Commands; use Illuminate\Console\Command; diff --git a/app/Console/Commands/UseEncryption.php b/app/Console/Commands/UseEncryption.php index e9cbde4aed..e89aff9281 100644 --- a/app/Console/Commands/UseEncryption.php +++ b/app/Console/Commands/UseEncryption.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Console\Commands; use Illuminate\Console\Command; diff --git a/app/Console/Commands/VerifiesAccessToken.php b/app/Console/Commands/VerifiesAccessToken.php index da3225a045..c03d456b53 100644 --- a/app/Console/Commands/VerifiesAccessToken.php +++ b/app/Console/Commands/VerifiesAccessToken.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Console\Commands; use FireflyIII\Repositories\User\UserRepositoryInterface; diff --git a/app/Console/Commands/VerifyDatabase.php b/app/Console/Commands/VerifyDatabase.php index 8db87ad4dc..08ec12f3df 100644 --- a/app/Console/Commands/VerifyDatabase.php +++ b/app/Console/Commands/VerifyDatabase.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Console\Commands; use Crypt; diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 5a16876766..3f24caad90 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Console; use Illuminate\Console\Scheduling\Schedule; diff --git a/app/Events/AdminRequestedTestMessage.php b/app/Events/AdminRequestedTestMessage.php index 54858f2000..7198811a0c 100644 --- a/app/Events/AdminRequestedTestMessage.php +++ b/app/Events/AdminRequestedTestMessage.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Events; use FireflyIII\User; diff --git a/app/Events/Event.php b/app/Events/Event.php index 490238246a..41b3b0437c 100644 --- a/app/Events/Event.php +++ b/app/Events/Event.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Events; /** diff --git a/app/Events/RegisteredUser.php b/app/Events/RegisteredUser.php index 8296bcdec5..053d0b24c5 100644 --- a/app/Events/RegisteredUser.php +++ b/app/Events/RegisteredUser.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Events; use FireflyIII\User; diff --git a/app/Events/RequestedNewPassword.php b/app/Events/RequestedNewPassword.php index 566aadeed5..422cc19872 100644 --- a/app/Events/RequestedNewPassword.php +++ b/app/Events/RequestedNewPassword.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Events; use FireflyIII\User; diff --git a/app/Events/RequestedVersionCheckStatus.php b/app/Events/RequestedVersionCheckStatus.php index 1147c7cea4..6173b031af 100644 --- a/app/Events/RequestedVersionCheckStatus.php +++ b/app/Events/RequestedVersionCheckStatus.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); namespace FireflyIII\Events; diff --git a/app/Events/StoredTransactionJournal.php b/app/Events/StoredTransactionJournal.php index 2d57502558..4db12b1b35 100644 --- a/app/Events/StoredTransactionJournal.php +++ b/app/Events/StoredTransactionJournal.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Events; use FireflyIII\Models\TransactionJournal; diff --git a/app/Events/UpdatedTransactionJournal.php b/app/Events/UpdatedTransactionJournal.php index c8b08ddaa8..5c9c7f7a9b 100644 --- a/app/Events/UpdatedTransactionJournal.php +++ b/app/Events/UpdatedTransactionJournal.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Events; use FireflyIII\Models\TransactionJournal; diff --git a/app/Events/UserChangedEmail.php b/app/Events/UserChangedEmail.php index 577fcd5c86..2c2d9d8580 100644 --- a/app/Events/UserChangedEmail.php +++ b/app/Events/UserChangedEmail.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Events; use FireflyIII\User; diff --git a/app/Exceptions/FireflyException.php b/app/Exceptions/FireflyException.php index 2dddf3e3c7..16c24f25aa 100644 --- a/app/Exceptions/FireflyException.php +++ b/app/Exceptions/FireflyException.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Exceptions; use Exception; diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 9bcf356980..d66d42a274 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Exceptions; use ErrorException; @@ -28,6 +30,7 @@ use FireflyIII\Jobs\MailError; use Illuminate\Auth\AuthenticationException; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; use Illuminate\Validation\ValidationException; +use League\OAuth2\Server\Exception\OAuthServerException; use Request; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; @@ -79,6 +82,11 @@ class Handler extends ExceptionHandler return response()->json(['message' => 'Unauthenticated', 'exception' => 'AuthenticationException'], 401); } + if ($exception instanceof OAuthServerException && $request->expectsJson()) { + // somehow Laravel handler does not catch this: + return response()->json(['message' => $exception->getMessage(), 'exception' => 'OAuthServerException'], 401); + } + if ($request->expectsJson()) { $isDebug = config('app.debug', false); if ($isDebug) { @@ -96,7 +104,7 @@ class Handler extends ExceptionHandler return response()->json(['message' => 'Internal Firefly III Exception. See log files.', 'exception' => \get_class($exception)], 500); } - if ($exception instanceof FireflyException || $exception instanceof ErrorException) { + if ($exception instanceof FireflyException || $exception instanceof ErrorException || $exception instanceof OAuthServerException) { $isDebug = env('APP_DEBUG', false); return response()->view('errors.FireflyException', ['exception' => $exception, 'debug' => $isDebug], 500); @@ -120,8 +128,25 @@ class Handler extends ExceptionHandler */ public function report(Exception $exception) { + $doMailError = env('SEND_ERROR_MESSAGE', true); - if (($exception instanceof FireflyException || $exception instanceof ErrorException) && $doMailError) { + if ( + // if the user wants us to mail: + $doMailError === true && + (( + // and if is one of these error instances + $exception instanceof FireflyException + || $exception instanceof ErrorException + || $exception instanceof OAuthServerException + + ) + || ( + // or this one, but it's a JSON exception. + $exception instanceof AuthenticationException + && Request::expectsJson() === true + )) + ) { + // then, send email $userData = [ 'id' => 0, 'email' => 'unknown@example.com', @@ -139,6 +164,9 @@ class Handler extends ExceptionHandler 'line' => $exception->getLine(), 'code' => $exception->getCode(), 'version' => config('firefly.version'), + 'url' => Request::fullUrl(), + 'userAgent' => Request::userAgent(), + 'json' => Request::acceptsJson(), ]; // create job that will mail. diff --git a/app/Exceptions/NotImplementedException.php b/app/Exceptions/NotImplementedException.php index e05cccd6fe..7254d56d34 100644 --- a/app/Exceptions/NotImplementedException.php +++ b/app/Exceptions/NotImplementedException.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Exceptions; /** diff --git a/app/Exceptions/ValidationException.php b/app/Exceptions/ValidationException.php index e0443c126e..602b4df9b0 100644 --- a/app/Exceptions/ValidationException.php +++ b/app/Exceptions/ValidationException.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Exceptions; /** diff --git a/app/Export/Collector/AttachmentCollector.php b/app/Export/Collector/AttachmentCollector.php index 5405855e3b..0db72ed3a2 100644 --- a/app/Export/Collector/AttachmentCollector.php +++ b/app/Export/Collector/AttachmentCollector.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Export\Collector; use Carbon\Carbon; @@ -94,7 +96,8 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface */ private function exportAttachment(Attachment $attachment): bool { - $file = $attachment->fileName(); + $file = $attachment->fileName(); + $decrypted = false; if ($this->uploadDisk->exists($file)) { try { $decrypted = Crypt::decrypt($this->uploadDisk->get($file)); @@ -104,6 +107,9 @@ class AttachmentCollector extends BasicCollector implements CollectorInterface return false; } } + if ($decrypted === false) { + return false; + } $exportFile = $this->exportFileName($attachment); $this->exportDisk->put($exportFile, $decrypted); $this->getEntries()->push($exportFile); diff --git a/app/Export/Collector/BasicCollector.php b/app/Export/Collector/BasicCollector.php index 38b357ea0d..bc19f1f541 100644 --- a/app/Export/Collector/BasicCollector.php +++ b/app/Export/Collector/BasicCollector.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Export\Collector; use FireflyIII\Models\ExportJob; diff --git a/app/Export/Collector/CollectorInterface.php b/app/Export/Collector/CollectorInterface.php index 11c0f53271..bd40c82f29 100644 --- a/app/Export/Collector/CollectorInterface.php +++ b/app/Export/Collector/CollectorInterface.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Export\Collector; use FireflyIII\Models\ExportJob; diff --git a/app/Export/Collector/UploadCollector.php b/app/Export/Collector/UploadCollector.php index fccc32814a..dd8c71e769 100644 --- a/app/Export/Collector/UploadCollector.php +++ b/app/Export/Collector/UploadCollector.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Export\Collector; use Crypt; diff --git a/app/Export/Entry/Entry.php b/app/Export/Entry/Entry.php index a91b50e45f..55886a2697 100644 --- a/app/Export/Entry/Entry.php +++ b/app/Export/Entry/Entry.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Export\Entry; use FireflyIII\Models\Transaction; diff --git a/app/Export/ExpandedProcessor.php b/app/Export/ExpandedProcessor.php index 33db5e518b..d8ad004f9f 100644 --- a/app/Export/ExpandedProcessor.php +++ b/app/Export/ExpandedProcessor.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Export; use Crypt; diff --git a/app/Export/Exporter/BasicExporter.php b/app/Export/Exporter/BasicExporter.php index ee618c2bb2..02826171c2 100644 --- a/app/Export/Exporter/BasicExporter.php +++ b/app/Export/Exporter/BasicExporter.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Export\Exporter; use FireflyIII\Models\ExportJob; diff --git a/app/Export/Exporter/CsvExporter.php b/app/Export/Exporter/CsvExporter.php index 8eec22225c..e323b94bf9 100644 --- a/app/Export/Exporter/CsvExporter.php +++ b/app/Export/Exporter/CsvExporter.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Export\Exporter; use FireflyIII\Export\Entry\Entry; diff --git a/app/Export/Exporter/ExporterInterface.php b/app/Export/Exporter/ExporterInterface.php index f9c35b8d04..f10e763dab 100644 --- a/app/Export/Exporter/ExporterInterface.php +++ b/app/Export/Exporter/ExporterInterface.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Export\Exporter; use FireflyIII\Models\ExportJob; diff --git a/app/Export/ProcessorInterface.php b/app/Export/ProcessorInterface.php index c255eb7713..ad8745cc7c 100644 --- a/app/Export/ProcessorInterface.php +++ b/app/Export/ProcessorInterface.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Export; use Illuminate\Support\Collection; diff --git a/app/Factory/AccountFactory.php b/app/Factory/AccountFactory.php index 8c035c8548..81383d4143 100644 --- a/app/Factory/AccountFactory.php +++ b/app/Factory/AccountFactory.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); namespace FireflyIII\Factory; diff --git a/app/Factory/AccountMetaFactory.php b/app/Factory/AccountMetaFactory.php index c514e182f8..ba2172a30d 100644 --- a/app/Factory/AccountMetaFactory.php +++ b/app/Factory/AccountMetaFactory.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); namespace FireflyIII\Factory; diff --git a/app/Factory/BillFactory.php b/app/Factory/BillFactory.php index 28b4a3544d..94327af9ee 100644 --- a/app/Factory/BillFactory.php +++ b/app/Factory/BillFactory.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); namespace FireflyIII\Factory; diff --git a/app/Factory/BudgetFactory.php b/app/Factory/BudgetFactory.php index bd96712658..ba9315f4ec 100644 --- a/app/Factory/BudgetFactory.php +++ b/app/Factory/BudgetFactory.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Factory; diff --git a/app/Factory/CategoryFactory.php b/app/Factory/CategoryFactory.php index 5bc20ec485..ff80a61a7b 100644 --- a/app/Factory/CategoryFactory.php +++ b/app/Factory/CategoryFactory.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); namespace FireflyIII\Factory; diff --git a/app/Factory/PiggyBankEventFactory.php b/app/Factory/PiggyBankEventFactory.php index d55ba7dc8f..d4a586ba03 100644 --- a/app/Factory/PiggyBankEventFactory.php +++ b/app/Factory/PiggyBankEventFactory.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); namespace FireflyIII\Factory; diff --git a/app/Factory/PiggyBankFactory.php b/app/Factory/PiggyBankFactory.php index 1f8ecf617d..ce398c3697 100644 --- a/app/Factory/PiggyBankFactory.php +++ b/app/Factory/PiggyBankFactory.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); namespace FireflyIII\Factory; diff --git a/app/Factory/TagFactory.php b/app/Factory/TagFactory.php index 09e9212a27..1fdd0e74a8 100644 --- a/app/Factory/TagFactory.php +++ b/app/Factory/TagFactory.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); namespace FireflyIII\Factory; diff --git a/app/Factory/TransactionCurrencyFactory.php b/app/Factory/TransactionCurrencyFactory.php index 1c95a60e7f..3cee423c42 100644 --- a/app/Factory/TransactionCurrencyFactory.php +++ b/app/Factory/TransactionCurrencyFactory.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); namespace FireflyIII\Factory; @@ -68,7 +69,8 @@ class TransactionCurrencyFactory $currencyCode = (string)$currencyCode; $currencyId = (int)$currencyId; - if (\strlen($currencyCode) === 0 && (int)$currencyId === 0) { + if ('' === $currencyCode && $currencyId === 0) { + Log::warning('Cannot find anything on empty currency code and empty currency ID!'); return null; } @@ -78,6 +80,7 @@ class TransactionCurrencyFactory if (null !== $currency) { return $currency; } + Log::warning(sprintf('Currency ID is %d but found nothing!', $currencyId)); } // then by code: if (\strlen($currencyCode) > 0) { @@ -85,7 +88,9 @@ class TransactionCurrencyFactory if (null !== $currency) { return $currency; } + Log::warning(sprintf('Currency code is %d but found nothing!', $currencyCode)); } + Log::warning('Found nothing for currency.'); return null; } diff --git a/app/Factory/TransactionFactory.php b/app/Factory/TransactionFactory.php index 468ff3f17e..c9c787d092 100644 --- a/app/Factory/TransactionFactory.php +++ b/app/Factory/TransactionFactory.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); namespace FireflyIII\Factory; +use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionType; use FireflyIII\Services\Internal\Support\TransactionServiceTrait; use FireflyIII\User; use Illuminate\Support\Collection; +use Log; /** * Class TransactionFactory @@ -45,10 +48,21 @@ class TransactionFactory * @param array $data * * @return Transaction + * @throws FireflyException */ - public function create(array $data): Transaction + public function create(array $data): ?Transaction { - $currencyId = isset($data['currency']) ? $data['currency']->id : $data['currency_id']; + Log::debug('Start of TransactionFactory::create()'); + $currencyId = $data['currency_id'] ?? null; + $currencyId = isset($data['currency']) ? $data['currency']->id : $currencyId; + if ('' === $data['amount']) { + throw new FireflyException('Amount is an empty string, which Firefly III cannot handle. Apologies.'); // @codeCoverageIgnore + } + if (null === $currencyId) { + throw new FireflyException('Cannot store transaction without currency information.'); // @codeCoverageIgnore + } + $data['foreign_amount'] = '' === (string)$data['foreign_amount'] ? null : $data['foreign_amount']; + Log::debug(sprintf('Create transaction for account #%d ("%s") with amount %s', $data['account']->id, $data['account']->name, $data['amount'])); return Transaction::create( [ @@ -72,19 +86,23 @@ class TransactionFactory * @param array $data * * @return Collection + * @throws FireflyException */ public function createPair(TransactionJournal $journal, array $data): Collection { + Log::debug('Start of TransactionFactory::createPair()'); // all this data is the same for both transactions: $currency = $this->findCurrency($data['currency_id'], $data['currency_code']); $description = $journal->description === $data['description'] ? null : $data['description']; // type of source account depends on journal type: $sourceType = $this->accountType($journal, 'source'); + Log::debug(sprintf('Expect source account to be of type %s', $sourceType)); $sourceAccount = $this->findAccount($sourceType, $data['source_id'], $data['source_name']); // same for destination account: $destinationType = $this->accountType($journal, 'destination'); + Log::debug(sprintf('Expect source destination to be of type %s', $destinationType)); $destinationAccount = $this->findAccount($destinationType, $data['destination_id'], $data['destination_name']); // first make a "negative" (source) transaction based on the data in the array. $source = $this->create( @@ -125,7 +143,7 @@ class TransactionFactory } // set budget: - if ($journal->transactionType->type === TransactionType::TRANSFER) { + if ($journal->transactionType->type !== TransactionType::WITHDRAWAL) { $data['budget_id'] = null; $data['budget_name'] = null; } diff --git a/app/Factory/TransactionJournalFactory.php b/app/Factory/TransactionJournalFactory.php index a4422b7b71..fbee73ea96 100644 --- a/app/Factory/TransactionJournalFactory.php +++ b/app/Factory/TransactionJournalFactory.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); namespace FireflyIII\Factory; @@ -51,6 +52,7 @@ class TransactionJournalFactory // store basic journal first. $type = $this->findTransactionType($data['type']); $defaultCurrency = app('amount')->getDefaultCurrencyByUser($this->user); + Log::debug(sprintf('Going to store a %s', $type->type)); $journal = TransactionJournal::create( [ 'user_id' => $data['user'], @@ -70,8 +72,10 @@ class TransactionJournalFactory $factory = app(TransactionFactory::class); $factory->setUser($this->user); + Log::debug(sprintf('Found %d transactions in array.', \count($data['transactions']))); /** @var array $trData */ - foreach ($data['transactions'] as $trData) { + foreach ($data['transactions'] as $index => $trData) { + Log::debug(sprintf('Now storing transaction %d of %d', $index + 1, \count($data['transactions']))); $factory->createPair($journal, $trData); } $journal->completed = true; @@ -91,7 +95,7 @@ class TransactionJournalFactory // store date meta fields (if present): $fields = ['sepa-cc', 'sepa-ct-op', 'sepa-ct-id', 'sepa-db', 'sepa-country', 'sepa-ep', 'sepa-ci', 'interest_date', 'book_date', 'process_date', - 'due_date', 'payment_date', 'invoice_date', 'internal_reference', 'bunq_payment_id','importHash']; + 'due_date', 'payment_date', 'invoice_date', 'internal_reference', 'bunq_payment_id', 'importHash','importHashV2', 'external_id']; foreach ($fields as $field) { $this->storeMeta($journal, $data, $field); diff --git a/app/Factory/TransactionJournalMetaFactory.php b/app/Factory/TransactionJournalMetaFactory.php index 4be44a8bbe..2af8397c0a 100644 --- a/app/Factory/TransactionJournalMetaFactory.php +++ b/app/Factory/TransactionJournalMetaFactory.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); namespace FireflyIII\Factory; @@ -70,6 +71,7 @@ class TransactionJournalMetaFactory } if (null === $entry) { + Log::debug(sprintf('Going to create new meta-data entry to store "%s".', $data['name'])); $entry = new TransactionJournalMeta(); $entry->transactionJournal()->associate($data['journal']); $entry->name = $data['name']; diff --git a/app/Factory/TransactionTypeFactory.php b/app/Factory/TransactionTypeFactory.php index 8a36869407..03db2cbd13 100644 --- a/app/Factory/TransactionTypeFactory.php +++ b/app/Factory/TransactionTypeFactory.php @@ -1,5 +1,5 @@ . */ +declare(strict_types=1); namespace FireflyIII\Factory; diff --git a/app/Handlers/Events/APIEventHandler.php b/app/Handlers/Events/APIEventHandler.php new file mode 100644 index 0000000000..64aa286420 --- /dev/null +++ b/app/Handlers/Events/APIEventHandler.php @@ -0,0 +1,80 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Handlers\Events; + + +use Exception; +use FireflyIII\Mail\AccessTokenCreatedMail; +use FireflyIII\Repositories\User\UserRepositoryInterface; +use Laravel\Passport\Events\AccessTokenCreated; +use Laravel\Passport\Token; +use Log; +use Mail; +use Request; +use Session; + +/** + * Class APIEventHandler + */ +class APIEventHandler +{ + /** + * @param AccessTokenCreated $event + * + * @return bool + */ + public function accessTokenCreated(AccessTokenCreated $event): bool + { + /** @var UserRepositoryInterface $repository */ + $repository = app(UserRepositoryInterface::class); + $user = $repository->findNull((int)$event->userId); + if (null === $user) { + Log::error('Access Token generated but no user associated.'); + + return true; + } + + $email = $user->email; + $ipAddress = Request::ip(); + + Log::debug(sprintf('Now in APIEventHandler::accessTokenCreated. Email is %s, IP is %s', $email, $ipAddress)); + try { + Log::debug('Trying to send message...'); + Mail::to($email)->send(new AccessTokenCreatedMail($email, $ipAddress)); + // @codeCoverageIgnoreStart + } catch (Exception $e) { + Log::debug('Send message failed! :('); + Log::error($e->getMessage()); + Log::error($e->getTraceAsString()); + Session::flash('error', 'Possible email error: ' . $e->getMessage()); + } + Log::debug('If no error above this line, message was sent.'); + + // @codeCoverageIgnoreEnd + return true; + + + } + +} \ No newline at end of file diff --git a/app/Helpers/Attachments/AttachmentHelper.php b/app/Helpers/Attachments/AttachmentHelper.php index b4da01386b..72a00bab0c 100644 --- a/app/Helpers/Attachments/AttachmentHelper.php +++ b/app/Helpers/Attachments/AttachmentHelper.php @@ -24,6 +24,8 @@ namespace FireflyIII\Helpers\Attachments; use Crypt; use FireflyIII\Models\Attachment; +use Illuminate\Contracts\Encryption\DecryptException; +use Illuminate\Contracts\Filesystem\FileNotFoundException; use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Collection; use Illuminate\Support\MessageBag; @@ -64,6 +66,26 @@ class AttachmentHelper implements AttachmentHelperInterface $this->uploadDisk = Storage::disk('upload'); } + /** + * @codeCoverageIgnore + * + * @param Attachment $attachment + * + * @return string + */ + public function getAttachmentContent(Attachment $attachment): string + { + try { + $content = Crypt::decrypt($this->uploadDisk->get(sprintf('at-%d.data', $attachment->id))); + } catch (DecryptException|FileNotFoundException $e) { + Log::error(sprintf('Could not decrypt data of attachment #%d', $attachment->id)); + + return ''; + } + + return $content; + } + /** * @param Attachment $attachment * diff --git a/app/Helpers/Attachments/AttachmentHelperInterface.php b/app/Helpers/Attachments/AttachmentHelperInterface.php index fc66698573..276d312a27 100644 --- a/app/Helpers/Attachments/AttachmentHelperInterface.php +++ b/app/Helpers/Attachments/AttachmentHelperInterface.php @@ -39,6 +39,13 @@ interface AttachmentHelperInterface */ public function getAttachmentLocation(Attachment $attachment): string; + /** + * @param Attachment $attachment + * + * @return string + */ + public function getAttachmentContent(Attachment $attachment): string; + /** * @return Collection */ diff --git a/app/Helpers/Collector/JournalCollector.php b/app/Helpers/Collector/JournalCollector.php index 79e69f923c..b2eb90dc1a 100644 --- a/app/Helpers/Collector/JournalCollector.php +++ b/app/Helpers/Collector/JournalCollector.php @@ -32,6 +32,7 @@ use FireflyIII\Helpers\Filter\NegativeAmountFilter; use FireflyIII\Helpers\Filter\OpposingAccountFilter; use FireflyIII\Helpers\Filter\PositiveAmountFilter; use FireflyIII\Helpers\Filter\SplitIndicatorFilter; +use FireflyIII\Helpers\Filter\TransactionViewFilter; use FireflyIII\Helpers\Filter\TransferFilter; use FireflyIII\Models\AccountType; use FireflyIII\Models\Budget; @@ -60,6 +61,7 @@ use Steam; */ class JournalCollector implements JournalCollectorInterface { + /** @var array */ private $accountIds = []; /** @var int */ @@ -106,7 +108,8 @@ class JournalCollector implements JournalCollectorInterface ]; /** @var array */ private $filters = [InternalTransferFilter::class]; - + /** @var bool */ + private $ignoreCache = false; /** @var bool */ private $joinedBudget = false; /** @var bool */ @@ -257,12 +260,15 @@ class JournalCollector implements JournalCollectorInterface foreach ($this->filters as $filter) { $cache->addProperty((string)$filter); } - if ($cache->has()) { + if (false === $this->ignoreCache && $cache->has()) { Log::debug(sprintf('Return cache of query with ID "%s".', $key)); return $cache->get(); // @codeCoverageIgnore - } + } + if (true === $this->ignoreCache) { + Log::debug('Ignore cache in journal collector.'); + } /** @var Collection $set */ $set = $this->query->get(array_values($this->fields)); @@ -315,6 +321,16 @@ class JournalCollector implements JournalCollectorInterface return $journals; } + /** + * @return JournalCollectorInterface + */ + public function ignoreCache(): JournalCollectorInterface + { + $this->ignoreCache = true; + + return $this; + } + /** * @param string $filter * @@ -768,6 +784,7 @@ class JournalCollector implements JournalCollectorInterface NegativeAmountFilter::class => new NegativeAmountFilter, SplitIndicatorFilter::class => new SplitIndicatorFilter, CountAttachmentsFilter::class => new CountAttachmentsFilter, + TransactionViewFilter::class => new TransactionViewFilter, ]; Log::debug(sprintf('Will run %d filters on the set.', \count($this->filters))); foreach ($this->filters as $enabled) { @@ -784,7 +801,7 @@ class JournalCollector implements JournalCollectorInterface /** * */ - private function joinBudgetTables() + private function joinBudgetTables(): void { if (!$this->joinedBudget) { // join some extra tables: @@ -809,7 +826,7 @@ class JournalCollector implements JournalCollectorInterface /** * */ - private function joinCategoryTables() + private function joinCategoryTables(): void { if (!$this->joinedCategory) { // join some extra tables: @@ -839,7 +856,7 @@ class JournalCollector implements JournalCollectorInterface /** * */ - private function joinOpposingTables() + private function joinOpposingTables(): void { if (!$this->joinedOpposing) { Log::debug('joinedOpposing is false'); @@ -871,7 +888,7 @@ class JournalCollector implements JournalCollectorInterface /** * */ - private function joinTagTables() + private function joinTagTables(): void { if (!$this->joinedTag) { // join some extra tables: diff --git a/app/Helpers/Collector/JournalCollectorInterface.php b/app/Helpers/Collector/JournalCollectorInterface.php index 1b439a748b..b710326175 100644 --- a/app/Helpers/Collector/JournalCollectorInterface.php +++ b/app/Helpers/Collector/JournalCollectorInterface.php @@ -78,6 +78,11 @@ interface JournalCollectorInterface */ public function getPaginatedJournals(): LengthAwarePaginator; + /** + * @return JournalCollectorInterface + */ + public function ignoreCache(): JournalCollectorInterface; + /** * @param string $filter * diff --git a/app/Helpers/Filter/TransactionViewFilter.php b/app/Helpers/Filter/TransactionViewFilter.php new file mode 100644 index 0000000000..ea83a62e75 --- /dev/null +++ b/app/Helpers/Filter/TransactionViewFilter.php @@ -0,0 +1,80 @@ +. + */ +declare(strict_types=1); + +namespace FireflyIII\Helpers\Filter; + +use FireflyIII\Models\Transaction; +use FireflyIII\Models\TransactionType; +use Illuminate\Support\Collection; +use Log; + +/** + * Class TransactionViewFilter. + * + * This filter removes the entry with a negative amount when it's a withdrawal + * And the positive amount when it's a deposit or transfer + * + * This is used in the mass-edit routine. + * + */ +class TransactionViewFilter implements FilterInterface +{ + /** + * @param Collection $set + * + * @return Collection + */ + public function filter(Collection $set): Collection + { + return $set->filter( + function (Transaction $transaction) { + // remove if amount is less than zero and type is withdrawal. + if ($transaction->transaction_type_type === TransactionType::WITHDRAWAL && 1 === bccomp($transaction->transaction_amount, '0')) { + Log::debug( + sprintf( + 'Filtered #%d because amount is %f and type is %s.', $transaction->id, $transaction->transaction_amount, + $transaction->transaction_type_type + ) + ); + + return null; + } + + if ($transaction->transaction_type_type === TransactionType::DEPOSIT && -1 === bccomp($transaction->transaction_amount, '0')) { + Log::debug( + sprintf( + 'Filtered #%d because amount is %f and type is %s.', $transaction->id, $transaction->transaction_amount, + $transaction->transaction_type_type + ) + ); + + return null; + } + Log::debug( + sprintf('#%d: amount is %f and type is %s.', $transaction->id, $transaction->transaction_amount, $transaction->transaction_type_type) + ); + + return $transaction; + } + ); + } +} diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 4c15c0406b..db68a5c841 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -210,18 +210,7 @@ class AccountController extends Controller $request->session()->flash('preFilled', $preFilled); - return view( - 'accounts.edit', - compact( - 'account', - 'currency', - 'subTitle', - 'subTitleIcon', - 'what', - 'roles', - 'preFilled' - ) - ); + return view('accounts.edit', compact('account', 'currency', 'subTitle', 'subTitleIcon', 'what', 'roles', 'preFilled')); } /** @@ -297,8 +286,10 @@ class AccountController extends Controller throw new FireflyException('End is after start!'); // @codeCoverageIgnore } + + $what = config(sprintf('firefly.shortNamesByFullName.%s', $account->accountType->type)); // used for menu $today = new Carbon; - $subTitleIcon = config('firefly.subIconsByIdentifier.' . $account->accountType->type); + $subTitleIcon = config(sprintf('firefly.subIconsByIdentifier.%s', $account->accountType->type)); $page = (int)$request->get('page'); $pageSize = (int)Preferences::get('listPageSize', 50)->data; $currencyId = (int)$this->repository->getMetaValue($account, 'currency_id'); @@ -320,7 +311,7 @@ class AccountController extends Controller return view( 'accounts.show', - compact('account', 'showAll', 'currency', 'today', 'periods', 'subTitleIcon', 'transactions', 'subTitle', 'start', 'end', 'chartUri') + compact('account', 'showAll', 'what', 'currency', 'today', 'periods', 'subTitleIcon', 'transactions', 'subTitle', 'start', 'end', 'chartUri') ); } @@ -338,7 +329,7 @@ class AccountController extends Controller public function showAll(Request $request, Account $account) { if (AccountType::INITIAL_BALANCE === $account->accountType->type) { - return $this->redirectToOriginalAccount($account); + return $this->redirectToOriginalAccount($account); // @codeCoverageIgnore } $end = new Carbon; $today = new Carbon; diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php index 2e0d35969b..bbb5a96234 100644 --- a/app/Http/Controllers/BillController.php +++ b/app/Http/Controllers/BillController.php @@ -22,14 +22,11 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers; -use ExpandedForm; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Http\Requests\BillFormRequest; use FireflyIII\Models\Bill; -use FireflyIII\Models\Note; use FireflyIII\Repositories\Bill\BillRepositoryInterface; -use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; use FireflyIII\TransactionRules\TransactionMatcher; use FireflyIII\Transformers\BillTransformer; @@ -50,6 +47,10 @@ class BillController extends Controller { /** @var AttachmentHelperInterface Helper for attachments. */ private $attachments; + /** @var BillRepositoryInterface */ + private $billRepository; + /** @var RuleGroupRepositoryInterface */ + private $ruleGroupRepos; /** * @@ -67,7 +68,9 @@ class BillController extends Controller function ($request, $next) { app('view')->share('title', trans('firefly.bills')); app('view')->share('mainTitleIcon', 'fa-calendar-o'); - $this->attachments = app(AttachmentHelperInterface::class); + $this->attachments = app(AttachmentHelperInterface::class); + $this->billRepository = app(BillRepositoryInterface::class); + $this->ruleGroupRepos = app(RuleGroupRepositoryInterface::class); return $next($request); } @@ -75,21 +78,20 @@ class BillController extends Controller } /** - * @param Request $request - * - * @param CurrencyRepositoryInterface $repository + * @param Request $request * * @return View */ - public function create(Request $request, CurrencyRepositoryInterface $repository) + public function create(Request $request) { $periods = []; - foreach (config('firefly.bill_periods') as $current) { + /** @var array $billPeriods */ + $billPeriods = config('firefly.bill_periods'); + foreach ($billPeriods as $current) { $periods[$current] = strtolower((string)trans('firefly.repeat_freq_' . $current)); } $subTitle = trans('firefly.create_new_bill'); $defaultCurrency = app('amount')->getDefaultCurrency(); - $currencies = ExpandedForm::makeSelectList($repository->get()); // put previous url in session if not redirect from store (not "create another"). if (true !== session('bills.create.fromStore')) { @@ -97,7 +99,7 @@ class BillController extends Controller } $request->session()->forget('bills.create.fromStore'); - return view('bills.create', compact('periods', 'subTitle', 'currencies', 'defaultCurrency')); + return view('bills.create', compact('periods', 'subTitle', 'defaultCurrency')); } /** @@ -115,16 +117,15 @@ class BillController extends Controller } /** - * @param Request $request - * @param BillRepositoryInterface $repository - * @param Bill $bill + * @param Request $request + * @param Bill $bill * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector */ - public function destroy(Request $request, BillRepositoryInterface $repository, Bill $bill) + public function destroy(Request $request, Bill $bill) { $name = $bill->name; - $repository->destroy($bill); + $this->billRepository->destroy($bill); $request->session()->flash('success', (string)trans('firefly.deleted_bill', ['name' => $name])); Preferences::mark(); @@ -133,18 +134,21 @@ class BillController extends Controller } /** - * @param Request $request - * @param CurrencyRepositoryInterface $repository - * @param Bill $bill + * @param Request $request + * @param Bill $bill * * @return View */ - public function edit(Request $request, CurrencyRepositoryInterface $repository, Bill $bill) + public function edit(Request $request, Bill $bill) { $periods = []; - foreach (config('firefly.bill_periods') as $current) { + /** @var array $billPeriods */ + $billPeriods = config('firefly.bill_periods'); + + foreach ($billPeriods as $current) { $periods[$current] = trans('firefly.' . $current); } + $subTitle = trans('firefly.edit_bill', ['name' => $bill->name]); // put previous url in session if not redirect from store (not "return_to_edit"). @@ -156,36 +160,28 @@ class BillController extends Controller $bill->amount_min = round($bill->amount_min, $currency->decimal_places); $bill->amount_max = round($bill->amount_max, $currency->decimal_places); $defaultCurrency = app('amount')->getDefaultCurrency(); - $currencies = ExpandedForm::makeSelectList($repository->get()); $preFilled = [ - 'notes' => '', + 'notes' => $this->billRepository->getNoteText($bill), + 'transaction_currency_id' => $bill->transaction_currency_id, + 'active' => $bill->active, ]; - /** @var Note $note */ - $note = $bill->notes()->first(); - if (null !== $note) { - $preFilled['notes'] = $note->text; - } - $request->session()->flash('preFilled', $preFilled); - $request->session()->forget('bills.edit.fromUpdate'); - return view('bills.edit', compact('subTitle', 'periods', 'bill', 'defaultCurrency', 'currencies')); + return view('bills.edit', compact('subTitle', 'periods', 'bill', 'defaultCurrency', 'preFilled')); } /** - * @param BillRepositoryInterface $repository - * * @return View */ - public function index(BillRepositoryInterface $repository) + public function index() { $start = session('start'); $end = session('end'); $pageSize = (int)Preferences::get('listPageSize', 50)->data; - $paginator = $repository->getPaginator($pageSize); + $paginator = $this->billRepository->getPaginator($pageSize); $parameters = new ParameterBag(); $parameters->set('start', $start); $parameters->set('end', $end); @@ -203,7 +199,7 @@ class BillController extends Controller ); // add info about rules: - $rules = $repository->getRulesForBills($paginator->getCollection()); + $rules = $this->billRepository->getRulesForBills($paginator->getCollection()); $bills = $bills->map( function (array $bill) use ($rules) { $bill['rules'] = $rules[$bill['id']] ?? []; @@ -218,21 +214,20 @@ class BillController extends Controller } /** - * @param Request $request - * @param BillRepositoryInterface $repository - * @param Bill $bill + * @param Request $request + * @param Bill $bill * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * @throws \FireflyIII\Exceptions\FireflyException */ - public function rescan(Request $request, BillRepositoryInterface $repository, Bill $bill) + public function rescan(Request $request, Bill $bill) { if (0 === (int)$bill->active) { $request->session()->flash('warning', (string)trans('firefly.cannot_scan_inactive_bill')); return redirect(URL::previous()); } - $set = $repository->getRulesForBill($bill); + $set = $this->billRepository->getRulesForBill($bill); $total = 0; foreach ($set as $rule) { // simply fire off all rules? @@ -243,7 +238,7 @@ class BillController extends Controller $matcher->setRule($rule); $matchingTransactions = $matcher->findTransactionsByRule(); $total += $matchingTransactions->count(); - $repository->linkCollectionToBill($bill, $matchingTransactions); + $this->billRepository->linkCollectionToBill($bill, $matchingTransactions); } @@ -254,24 +249,23 @@ class BillController extends Controller } /** - * @param Request $request - * @param BillRepositoryInterface $repository - * @param Bill $bill + * @param Request $request + * @param Bill $bill * * @return View */ - public function show(Request $request, BillRepositoryInterface $repository, Bill $bill) + public function show(Request $request, Bill $bill) { // add info about rules: - $rules = $repository->getRulesForBill($bill); + $rules = $this->billRepository->getRulesForBill($bill); $subTitle = $bill->name; $start = session('start'); $end = session('end'); $year = $start->year; $page = (int)$request->get('page'); $pageSize = (int)Preferences::get('listPageSize', 50)->data; - $yearAverage = $repository->getYearAverage($bill, $start); - $overallAverage = $repository->getOverallAverage($bill); + $yearAverage = $this->billRepository->getYearAverage($bill, $start); + $overallAverage = $this->billRepository->getOverallAverage($bill); $manager = new Manager(); $manager->setSerializer(new DataArraySerializer()); $manager->parseIncludes(['attachments', 'notes']); @@ -296,16 +290,14 @@ class BillController extends Controller } /** - * @param BillFormRequest $request - * @param BillRepositoryInterface $repository + * @param BillFormRequest $request * - * @param RuleGroupRepositoryInterface $ruleGroupRepository * @return \Illuminate\Http\RedirectResponse */ - public function store(BillFormRequest $request, BillRepositoryInterface $repository, RuleGroupRepositoryInterface $ruleGroupRepository) + public function store(BillFormRequest $request) { $billData = $request->getBillData(); - $bill = $repository->store($billData); + $bill = $this->billRepository->store($billData); if (null === $bill) { $request->session()->flash('error', (string)trans('firefly.bill_store_error')); @@ -330,16 +322,16 @@ class BillController extends Controller } // find first rule group, or create one: - $count = $ruleGroupRepository->count(); + $count = $this->ruleGroupRepos->count(); if ($count === 0) { $data = [ 'title' => (string)trans('firefly.rulegroup_for_bills_title'), 'description' => (string)trans('firefly.rulegroup_for_bills_description'), ]; - $group = $ruleGroupRepository->store($data); + $group = $this->ruleGroupRepos->store($data); } if ($count > 0) { - $group = $ruleGroupRepository->getActiveGroups(auth()->user())->first(); + $group = $this->ruleGroupRepos->getActiveGroups(auth()->user())->first(); } // redirect to page that will create a new rule. @@ -349,16 +341,15 @@ class BillController extends Controller } /** - * @param BillFormRequest $request - * @param BillRepositoryInterface $repository - * @param Bill $bill + * @param BillFormRequest $request + * @param Bill $bill * * @return \Illuminate\Http\RedirectResponse */ - public function update(BillFormRequest $request, BillRepositoryInterface $repository, Bill $bill) + public function update(BillFormRequest $request, Bill $bill) { $billData = $request->getBillData(); - $bill = $repository->update($bill, $billData); + $bill = $this->billRepository->update($bill, $billData); $request->session()->flash('success', (string)trans('firefly.updated_bill', ['name' => $bill->name])); Preferences::mark(); diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index 3ab8154910..ed199483d5 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -87,6 +87,8 @@ class BudgetController extends Controller $budgetLimit = $this->repository->updateLimitAmount($budget, $start, $end, $amount); $largeDiff = false; $warnText = ''; + $days = 0; + $daysInMonth = 0; if (0 === bccomp($amount, '0')) { $budgetLimit = null; } @@ -94,13 +96,17 @@ class BudgetController extends Controller // if today is between start and end, use the diff in days between end and today (days left) // otherwise, use diff between start and end. $today = new Carbon; + Log::debug(sprintf('Start is %s, end is %s, today is %s', $start->format('Y-m-d'), $end->format('Y-m-d'),$today->format('Y-m-d'))); if ($today->gte($start) && $today->lte($end)) { - $days = $end->diffInDays($today); + $days = $end->diffInDays($today); + $daysInMonth = $start->diffInDays($today); } if ($today->lte($start) || $today->gte($end)) { - $days = $start->diffInDays($end); + $days = $start->diffInDays($end); + $daysInMonth = $start->diffInDays($end); } - $days = $days === 0 ? 1 : $days; + $days = $days === 0 ? 1 : $days; + $daysInMonth = $daysInMonth === 0 ? 1 : $daysInMonth; // calculate left in budget: $spent = $repository->spentInPeriod(new Collection([$budget]), new Collection, $start, $end); @@ -146,6 +152,7 @@ class BudgetController extends Controller 'large_diff' => $largeDiff, 'left_per_day' => $leftPerDay, 'warn_text' => $warnText, + 'daysInMonth' => $daysInMonth, ] ); @@ -229,22 +236,13 @@ class BudgetController extends Controller */ public function index(Request $request, string $moment = null) { - $range = Preferences::get('viewRange', '1M')->data; - $start = session('start', new Carbon); - $end = session('end', new Carbon); - $page = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page'); - $pageSize = (int)Preferences::get('listPageSize', 50)->data; - - // if today is between start and end, use the diff in days between end and today (days left) - // otherwise, use diff between start and end. - $today = new Carbon; - if ($today->gte($start) && $today->lte($end)) { - $days = $end->diffInDays($today); - } - if ($today->lte($start) || $today->gte($end)) { - $days = $start->diffInDays($end); - } - $days = $days === 0 ? 1 : $days; + $range = Preferences::get('viewRange', '1M')->data; + $start = session('start', new Carbon); + $end = session('end', new Carbon); + $page = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page'); + $pageSize = (int)Preferences::get('listPageSize', 50)->data; + $days = 0; + $daysInMonth = 0; // make date if present: if (null !== $moment || '' !== (string)$moment) { @@ -256,6 +254,22 @@ class BudgetController extends Controller Log::debug('start and end are already defined.'); } } + + // if today is between start and end, use the diff in days between end and today (days left) + // otherwise, use diff between start and end. + $today = new Carbon; + if ($today->gte($start) && $today->lte($end)) { + $days = $end->diffInDays($today); + $daysInMonth = $start->diffInDays($today); + } + if ($today->lte($start) || $today->gte($end)) { + $days = $start->diffInDays($end); + $daysInMonth = $start->diffInDays($end); + } + $days = $days === 0 ? 1 : $days; + $daysInMonth = $daysInMonth === 0 ? 1 : $daysInMonth; + + $next = clone $end; $next->addDay(); $prev = clone $start; @@ -312,7 +326,7 @@ class BudgetController extends Controller return view( 'budgets.index', compact( 'available', 'currentMonth', 'next', 'nextText', 'prev', 'allBudgets', 'prevText', 'periodStart', 'periodEnd', 'days', 'page', - 'budgetInformation', + 'budgetInformation', 'daysInMonth', 'inactive', 'budgets', 'spent', 'budgeted', 'previousLoop', 'nextLoop', 'start', 'end' ) ); diff --git a/app/Http/Controllers/DebugController.php b/app/Http/Controllers/DebugController.php index 4a56acf427..11f52acf5c 100644 --- a/app/Http/Controllers/DebugController.php +++ b/app/Http/Controllers/DebugController.php @@ -66,6 +66,7 @@ class DebugController extends Controller $userAgent = $request->header('user-agent'); $isSandstorm = var_export(env('IS_SANDSTORM', 'unknown'), true); $isDocker = var_export(env('IS_DOCKER', 'unknown'), true); + $toSandbox = var_export(env('BUNQ_USE_SANDBOX', 'unknown'), true); $trustedProxies = env('TRUSTED_PROXIES', '(none)'); $displayErrors = ini_get('display_errors'); $errorReporting = $this->errorReporting((int)ini_get('error_reporting')); @@ -96,40 +97,24 @@ class DebugController extends Controller if (null !== $logFile) { try { $logContent = file_get_contents($logFile); + // @codeCoverageIgnoreStart } catch (Exception $e) { // don't care Log::debug(sprintf('Could not read log file. %s', $e->getMessage())); } + // @codeCoverageIgnoreEnd } } } // last few lines - $logContent = 'Truncated from this point <----|' . substr($logContent, -4096); + $logContent = 'Truncated from this point <----|' . substr($logContent, -8192); return view( - 'debug', - compact( - 'phpVersion', - 'extensions', 'localeAttempts', - 'appEnv', - 'appDebug', - 'appLog', - 'appLogLevel', - 'now', - 'packages', - 'drivers', - 'currentDriver', - 'userAgent', - 'displayErrors', - 'errorReporting', - 'phpOs', - 'interface', - 'logContent', - 'cacheDriver', - 'isDocker', - 'isSandstorm', - 'trustedProxies' - ) + 'debug', compact( + 'phpVersion', 'extensions', 'localeAttempts', 'appEnv', 'appDebug', 'appLog', 'appLogLevel', 'now', 'packages', 'drivers', 'currentDriver', + 'userAgent', 'displayErrors', 'errorReporting', 'phpOs', 'interface', 'logContent', 'cacheDriver', 'isDocker', 'isSandstorm', 'trustedProxies', + 'toSandbox' + ) ); } diff --git a/app/Http/Controllers/ExportController.php b/app/Http/Controllers/ExportController.php index 2c19715d42..a6836ba004 100644 --- a/app/Http/Controllers/ExportController.php +++ b/app/Http/Controllers/ExportController.php @@ -23,12 +23,10 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers; use Carbon\Carbon; -use ExpandedForm; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Export\ProcessorInterface; use FireflyIII\Http\Middleware\IsDemoUser; use FireflyIII\Http\Requests\ExportFormRequest; -use FireflyIII\Models\AccountType; use FireflyIII\Models\ExportJob; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\ExportJob\ExportJobRepositoryInterface; @@ -107,12 +105,11 @@ class ExportController extends Controller } /** - * @param AccountRepositoryInterface $repository * @param ExportJobRepositoryInterface $jobs * * @return View */ - public function index(AccountRepositoryInterface $repository, ExportJobRepositoryInterface $jobs) + public function index(ExportJobRepositoryInterface $jobs) { // create new export job. $job = $jobs->create(); @@ -120,15 +117,12 @@ class ExportController extends Controller $jobs->cleanup(); // does the user have shared accounts? - $accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]); - $accountList = ExpandedForm::makeSelectList($accounts); - $checked = array_keys($accountList); $formats = array_keys(config('firefly.export_formats')); $defaultFormat = Preferences::get('export_format', config('firefly.default_export_format'))->data; $first = session('first')->format('Y-m-d'); $today = Carbon::create()->format('Y-m-d'); - return view('export.index', compact('job', 'checked', 'accountList', 'formats', 'defaultFormat', 'first', 'today')); + return view('export.index', compact('job', 'formats', 'defaultFormat', 'first', 'today')); } /** diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index ba32b7e7ba..993d3273e5 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -133,10 +133,12 @@ class HomeController extends Controller Log::debug('Call twig:clean...'); try { Artisan::call('twig:clean'); + // @codeCoverageIgnoreStart } catch (Exception $e) { - // dont care + // don't care Log::debug('Called twig:clean.'); } + // @codeCoverageIgnoreEnd Log::debug('Call view:clear...'); Artisan::call('view:clear'); Log::debug('Done! Redirecting...'); diff --git a/app/Http/Controllers/Import/ConfigurationController.php b/app/Http/Controllers/Import/ConfigurationController.php deleted file mode 100644 index 7f6ee65b1c..0000000000 --- a/app/Http/Controllers/Import/ConfigurationController.php +++ /dev/null @@ -1,147 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Http\Controllers\Import; - -use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Http\Controllers\Controller; -use FireflyIII\Http\Middleware\IsDemoUser; -use FireflyIII\Import\Configuration\ConfiguratorInterface; -use FireflyIII\Models\ImportJob; -use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; -use Illuminate\Http\Request; -use Log; - -/** - * Class ConfigurationController - */ -class ConfigurationController extends Controller -{ - /** @var ImportJobRepositoryInterface */ - public $repository; - - /** - * - */ - public function __construct() - { - parent::__construct(); - - $this->middleware( - function ($request, $next) { - app('view')->share('mainTitleIcon', 'fa-archive'); - app('view')->share('title', trans('firefly.import_index_title')); - $this->repository = app(ImportJobRepositoryInterface::class); - - return $next($request); - } - ); - $this->middleware(IsDemoUser::class); - } - - /** - * Configure the job. This method is returned to until job is deemed "configured". - * - * @param ImportJob $job - * - * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View - * - * @throws FireflyException - */ - public function index(ImportJob $job) - { - // create configuration class: - $configurator = $this->makeConfigurator($job); - - // is the job already configured? - if ($configurator->isJobConfigured()) { - $this->repository->updateStatus($job, 'configured'); - - return redirect(route('import.status', [$job->key])); - } - - $this->repository->updateStatus($job, 'configuring'); - - $view = $configurator->getNextView(); - $data = $configurator->getNextData(); - $subTitle = trans('firefly.import_config_bread_crumb'); - $subTitleIcon = 'fa-wrench'; - - return view($view, compact('data', 'job', 'subTitle', 'subTitleIcon')); - } - - /** - * Store the configuration. Returns to "configure" method until job is configured. - * - * @param Request $request - * @param ImportJob $job - * - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector - * - * @throws FireflyException - */ - public function post(Request $request, ImportJob $job) - { - Log::debug('Now in postConfigure()', ['job' => $job->key]); - $configurator = $this->makeConfigurator($job); - - // is the job already configured? - if ($configurator->isJobConfigured()) { - return redirect(route('import.status', [$job->key])); - } - $data = $request->all(); - $configurator->configureJob($data); - - // get possible warning from configurator: - $warning = $configurator->getWarningMessage(); - - if (\strlen($warning) > 0) { - $request->session()->flash('warning', $warning); - } - - // return to configure - return redirect(route('import.configure', [$job->key])); - } - - /** - * @param ImportJob $job - * - * @return ConfiguratorInterface - * - * @throws FireflyException - */ - private function makeConfigurator(ImportJob $job): ConfiguratorInterface - { - $type = $job->file_type; - $key = sprintf('import.configuration.%s', $type); - $className = config($key); - if (null === $className || !class_exists($className)) { - throw new FireflyException(sprintf('Cannot find configurator class for job of type "%s".', $type)); // @codeCoverageIgnore - } - Log::debug(sprintf('Going to create class "%s"', $className)); - /** @var ConfiguratorInterface $configurator */ - $configurator = app($className); - $configurator->setJob($job); - - return $configurator; - } -} diff --git a/app/Http/Controllers/Import/IndexController.php b/app/Http/Controllers/Import/IndexController.php index c340ef8f1e..a6fe9d3167 100644 --- a/app/Http/Controllers/Import/IndexController.php +++ b/app/Http/Controllers/Import/IndexController.php @@ -24,17 +24,14 @@ namespace FireflyIII\Http\Controllers\Import; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Http\Controllers\Controller; -use FireflyIII\Http\Middleware\IsDemoUser; -use FireflyIII\Import\Routine\RoutineInterface; +use FireflyIII\Import\Prerequisites\PrerequisitesInterface; use FireflyIII\Models\ImportJob; use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; -use Illuminate\Http\Request; +use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Http\Response as LaravelResponse; use Log; -use Preferences; use View; - /** * Class FileController. */ @@ -43,6 +40,9 @@ class IndexController extends Controller /** @var ImportJobRepositoryInterface */ public $repository; + /** @var UserRepositoryInterface */ + public $userRepository; + /** * */ @@ -54,33 +54,96 @@ class IndexController extends Controller function ($request, $next) { app('view')->share('mainTitleIcon', 'fa-archive'); app('view')->share('title', trans('firefly.import_index_title')); - $this->repository = app(ImportJobRepositoryInterface::class); + $this->repository = app(ImportJobRepositoryInterface::class); + $this->userRepository = app(UserRepositoryInterface::class); return $next($request); } ); - $this->middleware(IsDemoUser::class)->except(['index']); } /** - * Creates a new import job for $bank with the default (global) job configuration. + * Creates a new import job for $importProvider. * - * @param string $bank + * @param string $importProvider * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * * @throws FireflyException */ - public function create(string $bank) + public function create(string $importProvider) { - if (true === !config(sprintf('import.enabled.%s', $bank))) { - throw new FireflyException(sprintf('Cannot import from "%s" at this time.', $bank)); // @codeCoverageIgnore + Log::debug(sprintf('Will create job for provider "%s"', $importProvider)); + // can only create "fake" for demo user. + $providers = array_keys($this->getProviders()); + if (!\in_array($importProvider, $providers, true)) { + Log::error(sprintf('%s-provider is disabled. Cannot create job.', $importProvider)); + session()->flash('warning', trans('import.cannot_create_for_provider', ['provider' => $importProvider])); + + return redirect(route('import.index')); } - $importJob = $this->repository->create($bank); + $importJob = $this->repository->create($importProvider); + Log::debug(sprintf('Created job #%d for provider %s', $importJob->id, $importProvider)); + + $hasPreReq = (bool)config(sprintf('import.has_prereq.%s', $importProvider)); + $hasConfig = (bool)config(sprintf('import.has_job_config.%s', $importProvider)); + // if job provider has no prerequisites: + if ($hasPreReq === false) { + Log::debug('Provider has no prerequisites. Continue.'); + // if job provider also has no configuration: + if ($hasConfig === false) { + // @codeCoverageIgnoreStart + Log::debug('Provider needs no configuration for job. Job is ready to start.'); + $this->repository->updateStatus($importJob, 'ready_to_run'); + Log::debug('Redirect to status-page.'); + + return redirect(route('import.job.status.index', [$importJob->key])); + // @codeCoverageIgnoreEnd + } + + // update job to say "has_prereq". + $this->repository->setStatus($importJob, 'has_prereq'); + + // redirect to job configuration. + Log::debug('Redirect to configuration.'); + + return redirect(route('import.job.configuration.index', [$importJob->key])); + } + Log::debug('Job provider has prerequisites.'); + // if need to set prerequisites, do that first. + $class = (string)config(sprintf('import.prerequisites.%s', $importProvider)); + if (!class_exists($class)) { + throw new FireflyException(sprintf('No class to handle prerequisites for "%s".', $importProvider)); // @codeCoverageIgnore + } + /** @var PrerequisitesInterface $providerPre */ + $providerPre = app($class); + $providerPre->setUser(auth()->user()); + + if (!$providerPre->isComplete()) { + Log::debug('Job provider prerequisites are not yet filled in. Redirect to prerequisites-page.'); + + // redirect to global prerequisites + return redirect(route('import.prerequisites.index', [$importProvider, $importJob->key])); + } + Log::debug('Prerequisites are complete.'); + + // update job to say "has_prereq". + $this->repository->setStatus($importJob, 'has_prereq'); + if ($hasConfig === false) { + // @codeCoverageIgnoreStart + Log::debug('Provider has no configuration. Job is ready to start.'); + $this->repository->updateStatus($importJob, 'ready_to_run'); + Log::debug('Redirect to status-page.'); + + return redirect(route('import.job.status.index', [$importJob->key])); + // @codeCoverageIgnoreEnd + } + Log::debug('Job has configuration. Redirect to job-config.'); + + // Otherwise just redirect to job configuration. + return redirect(route('import.job.configuration.index', [$importJob->key])); - // from here, always go to configure step. - return redirect(route('import.configure', [$importJob->key])); } /** @@ -90,22 +153,18 @@ class IndexController extends Controller * * @return LaravelResponse */ - public function download(ImportJob $job) + public function download(ImportJob $job): LaravelResponse { Log::debug('Now in download()', ['job' => $job->key]); - $config = $job->configuration; - + $config = $this->repository->getConfiguration($job); // This is CSV import specific: - $config['column-roles-complete'] = false; - $config['column-mapping-complete'] = false; - $config['initial-config-complete'] = false; - $config['has-file-upload'] = false; - $config['delimiter'] = "\t" === $config['delimiter'] ? 'tab' : $config['delimiter']; - unset($config['stage']); - - $result = json_encode($config, JSON_PRETTY_PRINT); - $name = sprintf('"%s"', addcslashes('import-configuration-' . date('Y-m-d') . '.json', '"\\')); + $config['delimiter'] = $config['delimiter'] ?? ','; + $config['delimiter'] = "\t" === $config['delimiter'] ? 'tab' : $config['delimiter']; + // this prevents private information from escaping + $config['column-mapping-config'] = []; + $result = json_encode($config, JSON_PRETTY_PRINT); + $name = sprintf('"%s"', addcslashes('import-configuration-' . date('Y-m-d') . '.json', '"\\')); /** @var LaravelResponse $response */ $response = response($result, 200); $response->header('Content-disposition', 'attachment; filename=' . $name) @@ -127,78 +186,60 @@ class IndexController extends Controller */ public function index() { - $subTitle = trans('firefly.import_index_sub_title'); + $providers = $this->getProviders(); + $subTitle = trans('import.index_breadcrumb'); $subTitleIcon = 'fa-home'; - $routines = config('import.enabled'); - return view('import.index', compact('subTitle', 'subTitleIcon', 'routines')); + return view('import.index', compact('subTitle', 'subTitleIcon', 'providers')); } /** - * @param Request $request - * @param string $bank - * - * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * @return array */ - public function reset(Request $request, string $bank) + private function getProviders(): array { - if ($bank === 'bunq') { - // remove bunq related preferences. - Preferences::delete('bunq_api_key'); - Preferences::delete('bunq_server_public_key'); - Preferences::delete('bunq_private_key'); - Preferences::delete('bunq_public_key'); - Preferences::delete('bunq_installation_token'); - Preferences::delete('bunq_installation_id'); - Preferences::delete('bunq_device_server_id'); - Preferences::delete('external_ip'); + // get and filter all import routines: + /** @var array $config */ + $providerNames = array_keys(config('import.enabled')); + $providers = []; + $isDemoUser = $this->userRepository->hasRole(auth()->user(), 'demo'); + $isDebug = (bool)config('app.debug'); + foreach ($providerNames as $providerName) { + //Log::debug(sprintf('Now with provider %s', $providerName)); + // only consider enabled providers + $enabled = (bool)config(sprintf('import.enabled.%s', $providerName)); + $allowedForDemo = (bool)config(sprintf('import.allowed_for_demo.%s', $providerName)); + $allowedForUser = (bool)config(sprintf('import.allowed_for_user.%s', $providerName)); + if ($enabled === false) { + //Log::debug('Provider is not enabled. NEXT!'); + continue; + } + if ($isDemoUser === true && $allowedForDemo === false) { + //Log::debug('User is demo and this provider is not allowed for demo user. NEXT!'); + continue; + } + if ($isDemoUser === false && $allowedForUser === false && $isDebug === false) { + //Log::debug('User is not demo and this provider is not allowed for such users. NEXT!'); + continue; // @codeCoverageIgnore + } + + $providers[$providerName] = [ + 'has_prereq' => (bool)config('import.has_prereq.' . $providerName), + ]; + $class = (string)config(sprintf('import.prerequisites.%s', $providerName)); + $result = false; + if ($class !== '' && class_exists($class)) { + //Log::debug('Will not check prerequisites.'); + /** @var PrerequisitesInterface $object */ + $object = app($class); + $object->setUser(auth()->user()); + $result = $object->isComplete(); + } + $providers[$providerName]['prereq_complete'] = $result; } + Log::debug(sprintf('Enabled providers: %s', json_encode(array_keys($providers)))); - if ($bank === 'spectre') { - // remove spectre related preferences: - Preferences::delete('spectre_client_id'); - Preferences::delete('spectre_app_secret'); - Preferences::delete('spectre_service_secret'); - Preferences::delete('spectre_app_id'); - Preferences::delete('spectre_secret'); - Preferences::delete('spectre_private_key'); - Preferences::delete('spectre_public_key'); - Preferences::delete('spectre_customer'); - } - - Preferences::mark(); - $request->session()->flash('info', (string)trans('firefly.settings_reset_for_' . $bank)); - - return redirect(route('import.index')); - - } - - /** - * @param ImportJob $job - * - * @return \Illuminate\Http\JsonResponse - * - * @throws FireflyException - */ - public function start(ImportJob $job) - { - $type = $job->file_type; - $key = sprintf('import.routine.%s', $type); - $className = config($key); - if (null === $className || !class_exists($className)) { - throw new FireflyException(sprintf('Cannot find import routine class for job of type "%s".', $type)); // @codeCoverageIgnore - } - - /** @var RoutineInterface $routine */ - $routine = app($className); - $routine->setJob($job); - $result = $routine->run(); - - if ($result) { - return response()->json(['run' => 'ok']); - } - - throw new FireflyException('Job did not complete successfully. Please review the log files.'); + return $providers; } } diff --git a/app/Http/Controllers/Import/JobConfigurationController.php b/app/Http/Controllers/Import/JobConfigurationController.php new file mode 100644 index 0000000000..fc11df8284 --- /dev/null +++ b/app/Http/Controllers/Import/JobConfigurationController.php @@ -0,0 +1,184 @@ +. + */ +declare(strict_types=1); + +namespace FireflyIII\Http\Controllers\Import; + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Http\Controllers\Controller; +use FireflyIII\Import\JobConfiguration\JobConfigurationInterface; +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use Illuminate\Http\Request; +use Illuminate\Http\UploadedFile; +use Illuminate\Support\MessageBag; +use Log; + +/** + * Class JobConfigurationController + */ +class JobConfigurationController extends Controller +{ + /** @var ImportJobRepositoryInterface */ + public $repository; + + /** + * + */ + public function __construct() + { + parent::__construct(); + + $this->middleware( + function ($request, $next) { + app('view')->share('mainTitleIcon', 'fa-archive'); + app('view')->share('title', trans('firefly.import_index_title')); + $this->repository = app(ImportJobRepositoryInterface::class); + + return $next($request); + } + ); + } + + /** + * Configure the job. This method is returned to until job is deemed "configured". + * + * @param ImportJob $importJob + * + * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View + * + * @throws FireflyException + */ + public function index(ImportJob $importJob) + { + Log::debug('Now in JobConfigurationController::index()'); + // catch impossible status: + $allowed = ['has_prereq', 'need_job_config']; + if (null !== $importJob && !\in_array($importJob->status, $allowed, true)) { + Log::debug(sprintf('Job has state "%s", but we only accept %s', $importJob->status, json_encode($allowed))); + session()->flash('error', trans('import.bad_job_status', ['status' => $importJob->status])); + + return redirect(route('import.index')); + } + Log::debug(sprintf('Now in JobConfigurationController::index() with job "%s" and status "%s"', $importJob->key, $importJob->status)); + + // if provider has no config, just push it through: + $importProvider = $importJob->provider; + if (!(bool)config(sprintf('import.has_job_config.%s', $importProvider))) { + // @codeCoverageIgnoreStart + Log::debug('Job needs no config, is ready to run!'); + $this->repository->updateStatus($importJob, 'ready_to_run'); + + return redirect(route('import.job.status.index', [$importJob->key])); + // @codeCoverageIgnoreEnd + } + + // create configuration class: + $configurator = $this->makeConfigurator($importJob); + + // is the job already configured? + if ($configurator->configurationComplete()) { + Log::debug('Config is complete, set status to ready_to_run.'); + $this->repository->updateStatus($importJob, 'ready_to_run'); + + return redirect(route('import.job.status.index', [$importJob->key])); + } + + $view = $configurator->getNextView(); + $data = $configurator->getNextData(); + $subTitle = trans('import.job_configuration_breadcrumb', ['key' => $importJob->key]); + $subTitleIcon = 'fa-wrench'; + + return view($view, compact('data', 'importJob', 'subTitle', 'subTitleIcon')); + } + + /** + * Store the configuration. Returns to "configure" method until job is configured. + * + * @param Request $request + * @param ImportJob $importJob + * + * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector + * + * @throws FireflyException + */ + public function post(Request $request, ImportJob $importJob) + { + // catch impossible status: + $allowed = ['has_prereq', 'need_job_config']; + if (null !== $importJob && !\in_array($importJob->status, $allowed, true)) { + session()->flash('error', trans('import.bad_job_status', ['status' => $importJob->status])); + + return redirect(route('import.index')); + } + + Log::debug('Now in postConfigure()', ['job' => $importJob->key]); + $configurator = $this->makeConfigurator($importJob); + + // is the job already configured? + if ($configurator->configurationComplete()) { + $this->repository->updateStatus($importJob, 'ready_to_run'); + + return redirect(route('import.job.status.index', [$importJob->key])); + } + + // uploaded files are attached to the job. + // the configurator can then handle them. + $result = new MessageBag; + + /** @var UploadedFile $upload */ + foreach ($request->allFiles() as $name => $upload) { + $result = $this->repository->storeFileUpload($importJob, $name, $upload); + } + $data = $request->all(); + $messages = $configurator->configureJob($data); + $result->merge($messages); + + if ($messages->count() > 0) { + $request->session()->flash('warning', $messages->first()); + } + + // return to configure + return redirect(route('import.job.configuration.index', [$importJob->key])); + } + + /** + * @param ImportJob $importJob + * + * @return JobConfigurationInterface + * + * @throws FireflyException + */ + private function makeConfigurator(ImportJob $importJob): JobConfigurationInterface + { + $key = sprintf('import.configuration.%s', $importJob->provider); + $className = (string)config($key); + if (null === $className || !class_exists($className)) { + throw new FireflyException(sprintf('Cannot find configurator class for job with provider "%s".', $importJob->provider)); // @codeCoverageIgnore + } + Log::debug(sprintf('Going to create class "%s"', $className)); + /** @var JobConfigurationInterface $configurator */ + $configurator = app($className); + $configurator->setImportJob($importJob); + + return $configurator; + } +} diff --git a/app/Http/Controllers/Import/JobStatusController.php b/app/Http/Controllers/Import/JobStatusController.php new file mode 100644 index 0000000000..d512e82196 --- /dev/null +++ b/app/Http/Controllers/Import/JobStatusController.php @@ -0,0 +1,232 @@ +. + */ +declare(strict_types=1); + +namespace FireflyIII\Http\Controllers\Import; + +use Exception; +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Http\Controllers\Controller; +use FireflyIII\Import\Routine\RoutineInterface; +use FireflyIII\Import\Storage\ImportArrayStorage; +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use Illuminate\Http\JsonResponse; +use Log; + +/** + * Class JobStatusController + */ +class JobStatusController extends Controller +{ + /** @var ImportJobRepositoryInterface */ + private $repository; + + /** + * + */ + public function __construct() + { + parent::__construct(); + + $this->middleware( + function ($request, $next) { + app('view')->share('mainTitleIcon', 'fa-archive'); + app('view')->share('title', trans('firefly.import_index_title')); + $this->repository = app(ImportJobRepositoryInterface::class); + + return $next($request); + } + ); + } + + /** + * @param ImportJob $importJob + * + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View + */ + public function index(ImportJob $importJob) + { + $subTitleIcon = 'fa-gear'; + $subTitle = trans('import.job_status_breadcrumb', ['key' => $importJob->key]); + + return view('import.status', compact('importJob', 'subTitle', 'subTitleIcon')); + } + + /** + * @param ImportJob $importJob + * + * @return JsonResponse + */ + public function json(ImportJob $importJob): JsonResponse + { + $count = \count($importJob->transactions); + $json = [ + 'status' => $importJob->status, + 'errors' => $importJob->errors, + 'count' => $count, + 'tag_id' => $importJob->tag_id, + 'tag_name' => null === $importJob->tag_id ? null : $importJob->tag->tag, + 'report_txt' => trans('import.unknown_import_result'), + 'download_config' => false, + 'download_config_text' => '', + ]; + + if ($importJob->provider === 'file') { + $json['download_config'] = true; + $json['download_config_text'] + = trans('import.should_download_config', ['route' => route('import.job.download', [$importJob->key])]) . ' ' + . trans('import.share_config_file'); + } + + // if count is zero: + if (null !== $importJob->tag_id) { + $count = $importJob->tag->transactionJournals->count(); + } + if ($count === 0) { + $json['report_txt'] = trans('import.result_no_transactions'); + } + if ($count === 1 && null !== $importJob->tag_id) { + $json['report_txt'] = trans( + 'import.result_one_transaction', ['route' => route('tags.show', [$importJob->tag_id, 'all']), 'tag' => $importJob->tag->tag] + ); + } + if ($count > 1 && null !== $importJob->tag_id) { + $json['report_txt'] = trans( + 'import.result_many_transactions', + ['count' => $count, 'route' => route('tags.show', [$importJob->tag_id, 'all']), 'tag' => $importJob->tag->tag] + ); + } + + return response()->json($json); + } + + /** + * @param ImportJob $importJob + * + * @return JsonResponse + */ + public function start(ImportJob $importJob): JsonResponse + { + // catch impossible status: + $allowed = ['ready_to_run', 'need_job_config', 'error']; // todo remove error + + if (null !== $importJob && !\in_array($importJob->status, $allowed, true)) { + Log::error('Job is not ready.'); + $this->repository->setStatus($importJob, 'error'); + + return response()->json( + ['status' => 'NOK', 'message' => sprintf('JobStatusController::start expects status "ready_to_run" instead of "%s".', $importJob->status)] + ); + } + $importProvider = $importJob->provider; + $key = sprintf('import.routine.%s', $importProvider); + $className = config($key); + if (null === $className || !class_exists($className)) { + // @codeCoverageIgnoreStart + return response()->json( + ['status' => 'NOK', 'message' => sprintf('Cannot find import routine class for job of type "%s".', $importProvider)] + ); + // @codeCoverageIgnoreEnd + } + + /** @var RoutineInterface $routine */ + $routine = app($className); + $routine->setImportJob($importJob); + try { + $routine->run(); + } catch (FireflyException|Exception $e) { + $message = 'The import routine crashed: ' . $e->getMessage(); + Log::error($message); + Log::error($e->getTraceAsString()); + + // set job errored out: + $this->repository->setStatus($importJob, 'error'); + + return response()->json(['status' => 'NOK', 'message' => $message]); + } + + // expect nothing from routine, just return OK to user. + return response()->json(['status' => 'OK', 'message' => 'stage_finished']); + } + + /** + * Store does three things: + * + * - Store the transactions. + * - Add them to a tag. + * + * @param ImportJob $importJob + * + * @return JsonResponse + */ + public function store(ImportJob $importJob): JsonResponse + { + // catch impossible status: + $allowed = ['provider_finished', 'storing_data']; + if (null !== $importJob && !\in_array($importJob->status, $allowed, true)) { + Log::error('Job is not ready.'); + + return response()->json( + ['status' => 'NOK', 'message' => sprintf('JobStatusController::start expects status "provider_finished" instead of "%s".', $importJob->status)] + ); + } + + // set job to be storing data: + $this->repository->setStatus($importJob, 'storing_data'); + + try { + $this->storeTransactions($importJob); + } catch (FireflyException $e) { + $message = 'The import storage routine crashed: ' . $e->getMessage(); + Log::error($message); + Log::error($e->getTraceAsString()); + + // set job errored out: + $this->repository->setStatus($importJob, 'error'); + + return response()->json(['status' => 'NOK', 'message' => $message]); + } + // set storage to be finished: + $this->repository->setStatus($importJob, 'storage_finished'); + + + // expect nothing from routine, just return OK to user. + return response()->json(['status' => 'OK', 'message' => 'storage_finished']); + } + + /** + * @param ImportJob $importJob + * + * @throws FireflyException + */ + private function storeTransactions(ImportJob $importJob): void + { + /** @var ImportArrayStorage $storage */ + $storage = app(ImportArrayStorage::class); + $storage->setImportJob($importJob); + try { + $storage->store(); + } catch (FireflyException|Exception $e) { + throw new FireflyException($e->getMessage()); + } + } +} diff --git a/app/Http/Controllers/Import/PrerequisitesController.php b/app/Http/Controllers/Import/PrerequisitesController.php index 76b4973321..d0e4d5bbd6 100644 --- a/app/Http/Controllers/Import/PrerequisitesController.php +++ b/app/Http/Controllers/Import/PrerequisitesController.php @@ -24,8 +24,9 @@ namespace FireflyIII\Http\Controllers\Import; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Http\Controllers\Controller; -use FireflyIII\Http\Middleware\IsDemoUser; use FireflyIII\Import\Prerequisites\PrerequisitesInterface; +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; use Illuminate\Http\Request; use Log; @@ -35,6 +36,9 @@ use Log; class PrerequisitesController extends Controller { + /** @var ImportJobRepositoryInterface */ + private $repository; + /** * */ @@ -46,48 +50,59 @@ class PrerequisitesController extends Controller function ($request, $next) { app('view')->share('mainTitleIcon', 'fa-archive'); app('view')->share('title', trans('firefly.import_index_title')); + app('view')->share('subTitleIcon', 'fa-check'); + + $this->repository = app(ImportJobRepositoryInterface::class); return $next($request); } ); - $this->middleware(IsDemoUser::class); } /** - * Once there are no prerequisites, this method will create an importjob object and - * redirect the user to a view where this object can be used by a bank specific - * class to process. + * This method will process and store import provider global prerequisites + * such as API keys. * - * @param string $bank - * - * @return \Illuminate\View\View|\Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse + * @param string $importProvider + * @param ImportJob $importJob * + * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View * @throws FireflyException */ - public function index(string $bank) + public function index(string $importProvider, ImportJob $importJob = null) { - if (true === !config(sprintf('import.enabled.%s', $bank))) { - throw new FireflyException(sprintf('Cannot import from "%s" at this time.', $bank)); // @codeCoverageIgnore - } - $class = (string)config(sprintf('import.prerequisites.%s', $bank)); - if (!class_exists($class)) { - throw new FireflyException(sprintf('No class to handle "%s".', $bank)); // @codeCoverageIgnore + // catch impossible status: + $allowed = ['new']; + if (null !== $importJob && !in_array($importJob->status, $allowed)) { + Log::error(sprintf('Job has state "%s" but this Prerequisites::index() only accepts %s', $importJob->status, json_encode($allowed))); + session()->flash('error', trans('import.bad_job_status', ['status' => $importJob->status])); + + return redirect(route('import.index')); } + app('view')->share('subTitle', trans('import.prerequisites_breadcrumb_' . $importProvider)); + $class = (string)config(sprintf('import.prerequisites.%s', $importProvider)); + if (!class_exists($class)) { + throw new FireflyException(sprintf('No class to handle prerequisites for "%s".', $importProvider)); // @codeCoverageIgnore + } /** @var PrerequisitesInterface $object */ $object = app($class); $object->setUser(auth()->user()); - if ($object->hasPrerequisites()) { - $view = $object->getView(); - $parameters = ['title' => (string)trans('firefly.import_index_title'), 'mainTitleIcon' => 'fa-archive']; - $parameters = array_merge($object->getViewParameters(), $parameters); + if (null !== $importJob && $object->isComplete()) { + // update job: + $this->repository->setStatus($importJob, 'has_prereq'); - return view($view, $parameters); + // redirect to job config: + return redirect(route('import.job.configuration.index', [$importJob->key])); } - // if no (more) prerequisites, return to create a job: - return redirect(route('import.create-job', [$bank])); + + $view = $object->getView(); + $parameters = ['title' => (string)trans('firefly.import_index_title'), 'mainTitleIcon' => 'fa-archive', 'importJob' => $importJob]; + $parameters = array_merge($object->getViewParameters(), $parameters); + + return view($view, $parameters); } /** @@ -98,42 +113,63 @@ class PrerequisitesController extends Controller * * @see PrerequisitesInterface::storePrerequisites * - * @param Request $request - * @param string $bank + * @param Request $request + * @param string $importProvider + * @param ImportJob $importJob * * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector * * @throws FireflyException */ - public function post(Request $request, string $bank) + public function post(Request $request, string $importProvider, ImportJob $importJob = null) { - Log::debug(sprintf('Now in postPrerequisites for %s', $bank)); + Log::debug(sprintf('Now in postPrerequisites for %s', $importProvider)); - if (true === !config(sprintf('import.enabled.%s', $bank))) { - throw new FireflyException(sprintf('Cannot import from "%s" at this time.', $bank)); // @codeCoverageIgnore + // catch impossible status: + $allowed = ['new']; + if (null !== $importJob && !\in_array($importJob->status, $allowed, true)) { + Log::error(sprintf('Job has state "%s" but this Prerequisites::post() only accepts %s', $importJob->status, json_encode($allowed))); + session()->flash('error', trans('import.bad_job_status', ['status' => $importJob->status])); + + return redirect(route('import.index')); } - $class = (string)config(sprintf('import.prerequisites.%s', $bank)); + + $class = (string)config(sprintf('import.prerequisites.%s', $importProvider)); if (!class_exists($class)) { throw new FireflyException(sprintf('Cannot find class %s', $class)); // @codeCoverageIgnore } /** @var PrerequisitesInterface $object */ $object = app($class); $object->setUser(auth()->user()); - if (!$object->hasPrerequisites()) { - Log::debug(sprintf('No more prerequisites for %s, move to form.', $bank)); - - return redirect(route('import.create-job', [$bank])); - } Log::debug('Going to store entered prerequisites.'); // store post data - $result = $object->storePrerequisites($request); + $data = $request->all(); + $result = $object->storePrerequisites($data); Log::debug(sprintf('Result of storePrerequisites has message count: %d', $result->count())); if ($result->count() > 0) { $request->session()->flash('error', $result->first()); + + // redirect back to job, if has job: + return redirect(route('import.prerequisites.index', [$importProvider, $importJob->key ?? '']))->withInput(); } - return redirect(route('import.prerequisites', [$bank])); + // session flash! + $request->session()->flash('success', (string)trans('import.prerequisites_saved_for_' . $importProvider)); + + // if has job, redirect to global config for provider + // if no job, back to index! + if (null === $importJob) { + return redirect(route('import.index')); + } + + // update job: + $this->repository->setStatus($importJob, 'has_prereq'); + + // redirect to job config: + return redirect(route('import.job.configuration.index', [$importJob->key])); + + } } diff --git a/app/Http/Controllers/Import/StatusController.php b/app/Http/Controllers/Import/StatusController.php deleted file mode 100644 index 4c95ec77a3..0000000000 --- a/app/Http/Controllers/Import/StatusController.php +++ /dev/null @@ -1,125 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Http\Controllers\Import; - -use FireflyIII\Http\Controllers\Controller; -use FireflyIII\Http\Middleware\IsDemoUser; -use FireflyIII\Models\ImportJob; -use FireflyIII\Repositories\Tag\TagRepositoryInterface; -use Log; - -/** - * Class StatusController - */ -class StatusController extends Controller -{ - /** - * - */ - public function __construct() - { - parent::__construct(); - - $this->middleware( - function ($request, $next) { - app('view')->share('mainTitleIcon', 'fa-archive'); - app('view')->share('title', trans('firefly.import_index_title')); - - return $next($request); - } - ); - $this->middleware(IsDemoUser::class); - } - - /** - * @param ImportJob $job - * - * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View - */ - public function index(ImportJob $job) - { - $statuses = ['configured', 'running', 'finished', 'error']; - if (!\in_array($job->status, $statuses)) { - return redirect(route('import.configure', [$job->key])); - } - $subTitle = trans('import.status_sub_title'); - $subTitleIcon = 'fa-star'; - - return view('import.status', compact('job', 'subTitle', 'subTitleIcon')); - } - - /** - * Show status of import job in JSON. - * - * @param ImportJob $job - * - * @return \Illuminate\Http\JsonResponse - */ - public function json(ImportJob $job) - { - $result = [ - 'started' => false, - 'finished' => false, - 'running' => false, - 'errors' => array_values($job->extended_status['errors']), - 'percentage' => 0, - 'show_percentage' => false, - 'steps' => $job->extended_status['steps'], - 'done' => $job->extended_status['done'], - 'statusText' => trans('import.status_job_' . $job->status), - 'status' => $job->status, - 'finishedText' => '', - ]; - - if (0 !== $job->extended_status['steps']) { - $result['percentage'] = round(($job->extended_status['done'] / $job->extended_status['steps']) * 100, 0); - $result['show_percentage'] = true; - } - if ('finished' === $job->status) { - $result['finished'] = true; - $tagId = (int)$job->extended_status['tag']; - if ($tagId !== 0) { - /** @var TagRepositoryInterface $repository */ - $repository = app(TagRepositoryInterface::class); - $tag = $repository->find($tagId); - $count = $tag->transactionJournals()->count(); - $result['finishedText'] = trans( - 'import.status_finished_job', ['count' => $count, 'link' => route('tags.show', [$tag->id, 'all']), 'tag' => $tag->tag] - ); - } - - if ($tagId === 0) { - $result['finishedText'] = trans('import.status_finished_no_tag'); // @codeCoverageIgnore - } - } - - if ('running' === $job->status) { - $result['started'] = true; - $result['running'] = true; - } - $result['percentage'] = $result['percentage'] > 100 ? 100 : $result['percentage']; - Log::debug(sprintf('JOB STATUS: %d/%d', $result['done'], $result['steps'])); - - return response()->json($result); - } -} diff --git a/app/Http/Controllers/JavascriptController.php b/app/Http/Controllers/JavascriptController.php index d47992d9ed..0ebb2d5192 100644 --- a/app/Http/Controllers/JavascriptController.php +++ b/app/Http/Controllers/JavascriptController.php @@ -29,6 +29,7 @@ use FireflyIII\Models\TransactionCurrency; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use Illuminate\Http\Request; +use Illuminate\Http\Response; use Log; use Preferences; @@ -68,9 +69,9 @@ class JavascriptController extends Controller /** * @param CurrencyRepositoryInterface $repository * - * @return \Illuminate\Http\Response + * @return Response */ - public function currencies(CurrencyRepositoryInterface $repository) + public function currencies(CurrencyRepositoryInterface $repository): Response { $currencies = $repository->get(); $data = ['currencies' => []]; @@ -102,7 +103,8 @@ class JavascriptController extends Controller } /** @var TransactionCurrency $currency */ $currency = $currencyRepository->findNull($currencyId); - if (0 === $currencyId) { + if (null === $currency) { + /** @var TransactionCurrency $currency */ $currency = app('amount')->getDefaultCurrency(); } diff --git a/app/Http/Controllers/Json/AutoCompleteController.php b/app/Http/Controllers/Json/AutoCompleteController.php index b01069520e..6ff6c92e1d 100644 --- a/app/Http/Controllers/Json/AutoCompleteController.php +++ b/app/Http/Controllers/Json/AutoCompleteController.php @@ -35,6 +35,7 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\Tag\TagRepositoryInterface; use FireflyIII\Support\CacheProperties; +use Illuminate\Http\JsonResponse; /** * Class AutoCompleteController. @@ -47,7 +48,7 @@ class AutoCompleteController extends Controller * * @param AccountRepositoryInterface $repository * - * @return \Illuminate\Http\JsonResponse + * @return JsonResponse */ public function allAccounts(AccountRepositoryInterface $repository) { @@ -64,9 +65,9 @@ class AutoCompleteController extends Controller /** * @param JournalCollectorInterface $collector * - * @return \Illuminate\Http\JsonResponse + * @return JsonResponse */ - public function allTransactionJournals(JournalCollectorInterface $collector) + public function allTransactionJournals(JournalCollectorInterface $collector): JsonResponse { $collector->setLimit(250)->setPage(1); $return = array_unique($collector->getJournals()->pluck('description')->toArray()); @@ -80,9 +81,9 @@ class AutoCompleteController extends Controller * * @param BillRepositoryInterface $repository * - * @return \Illuminate\Http\JsonResponse + * @return JsonResponse */ - public function bills(BillRepositoryInterface $repository) + public function bills(BillRepositoryInterface $repository): JsonResponse { $return = array_unique( $repository->getActiveBills()->pluck('name')->toArray() @@ -95,7 +96,7 @@ class AutoCompleteController extends Controller /** * @param BudgetRepositoryInterface $repository * - * @return \Illuminate\Http\JsonResponse + * @return JsonResponse */ public function budgets(BudgetRepositoryInterface $repository) { @@ -110,7 +111,7 @@ class AutoCompleteController extends Controller * * @param CategoryRepositoryInterface $repository * - * @return \Illuminate\Http\JsonResponse + * @return JsonResponse */ public function categories(CategoryRepositoryInterface $repository) { @@ -123,7 +124,7 @@ class AutoCompleteController extends Controller /** * @param CurrencyRepositoryInterface $repository * - * @return \Illuminate\Http\JsonResponse + * @return JsonResponse */ public function currencyNames(CurrencyRepositoryInterface $repository) { @@ -138,7 +139,7 @@ class AutoCompleteController extends Controller * * @param AccountRepositoryInterface $repository * - * @return \Illuminate\Http\JsonResponse + * @return JsonResponse */ public function expenseAccounts(AccountRepositoryInterface $repository) { @@ -163,7 +164,7 @@ class AutoCompleteController extends Controller * @param JournalCollectorInterface $collector * @param TransactionJournal $except * - * @return \Illuminate\Http\JsonResponse|mixed + * @return JsonResponse|mixed */ public function journalsWithId(JournalCollectorInterface $collector, TransactionJournal $except) { @@ -195,7 +196,7 @@ class AutoCompleteController extends Controller /** * @param AccountRepositoryInterface $repository * - * @return \Illuminate\Http\JsonResponse + * @return JsonResponse */ public function revenueAccounts(AccountRepositoryInterface $repository) { @@ -220,7 +221,7 @@ class AutoCompleteController extends Controller * * @param TagRepositoryInterface $tagRepository * - * @return \Illuminate\Http\JsonResponse + * @return JsonResponse */ public function tags(TagRepositoryInterface $tagRepository) { @@ -234,7 +235,7 @@ class AutoCompleteController extends Controller * @param JournalCollectorInterface $collector * @param string $what * - * @return \Illuminate\Http\JsonResponse + * @return JsonResponse */ public function transactionJournals(JournalCollectorInterface $collector, string $what) { @@ -251,7 +252,7 @@ class AutoCompleteController extends Controller /** * @param JournalRepositoryInterface $repository * - * @return \Illuminate\Http\JsonResponse + * @return JsonResponse */ public function transactionTypes(JournalRepositoryInterface $repository) { diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php index 12a56e79c6..fbfbf94505 100644 --- a/app/Http/Controllers/PiggyBankController.php +++ b/app/Http/Controllers/PiggyBankController.php @@ -30,6 +30,7 @@ use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use FireflyIII\Transformers\AccountTransformer; use FireflyIII\Transformers\PiggyBankTransformer; +use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; @@ -215,6 +216,7 @@ class PiggyBankController extends Controller */ public function index(Request $request) { + $this->piggyRepos->correctOrder(); $collection = $this->piggyRepos->getPiggyBanks(); $total = $collection->count(); $page = 0 === (int)$request->get('page') ? 1 : (int)$request->get('page'); @@ -261,27 +263,6 @@ class PiggyBankController extends Controller return view('piggy-banks.index', compact('piggyBanks', 'accounts')); } - /** - * @param Request $request - * - * @return \Illuminate\Http\JsonResponse - */ - public function order(Request $request) - { - $data = $request->get('order'); - - // set all users piggy banks to zero: - $this->piggyRepos->reset(); - - if (\is_array($data)) { - foreach ($data as $order => $id) { - $this->piggyRepos->setOrder((int)$id, $order + 1); - } - } - - return response()->json(['result' => 'ok']); - } - /** * @param Request $request * @param PiggyBank $piggyBank @@ -402,6 +383,20 @@ class PiggyBankController extends Controller return view('piggy-banks.remove-mobile', compact('piggyBank', 'repetition', 'currency')); } + /** + * @param Request $request + * @param PiggyBank $piggyBank + * + * @return JsonResponse + */ + public function setOrder(Request $request, PiggyBank $piggyBank): JsonResponse + { + $newOrder = (int)$request->get('order'); + $this->piggyRepos->setOrder($piggyBank, $newOrder); + + return response()->json(['data' => 'OK']); + } + /** * @param PiggyBank $piggyBank * @@ -409,11 +404,17 @@ class PiggyBankController extends Controller */ public function show(PiggyBank $piggyBank) { - $note = $piggyBank->notes()->first(); - $events = $this->piggyRepos->getEvents($piggyBank); - $subTitle = $piggyBank->name; + /** @var Carbon $end */ + $end = session('end', Carbon::now()->endOfMonth()); + // transform piggies using the transformer: + $parameters = new ParameterBag; + $parameters->set('end', $end); + $transformer = new PiggyBankTransformer(new ParameterBag); + $piggy = $transformer->transform($piggyBank); + $events = $this->piggyRepos->getEvents($piggyBank); + $subTitle = $piggyBank->name; - return view('piggy-banks.show', compact('piggyBank', 'events', 'subTitle', 'note')); + return view('piggy-banks.show', compact('piggyBank', 'events', 'subTitle', 'piggy')); } /** diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 12c9923f6c..581f88b35d 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -424,7 +424,7 @@ class ProfileController extends Controller /** * */ - private function createOAuthKeys() + private function createOAuthKeys(): void { $rsa = new RSA(); $keys = $rsa->createKey(4096); @@ -437,11 +437,13 @@ class ProfileController extends Controller if (file_exists($publicKey) || file_exists($privateKey)) { return; } + // @codeCoverageIgnoreStart Log::alert('NO OAuth keys were found. They have been created.'); file_put_contents($publicKey, array_get($keys, 'publickey')); file_put_contents($privateKey, array_get($keys, 'privatekey')); } + // @codeCoverageIgnoreEnd /** * @return string diff --git a/app/Http/Controllers/RuleController.php b/app/Http/Controllers/RuleController.php index 3e5b4e5fba..98a781017c 100644 --- a/app/Http/Controllers/RuleController.php +++ b/app/Http/Controllers/RuleController.php @@ -102,7 +102,6 @@ class RuleController extends Controller $preFilled = [ 'strict' => true, ]; - $groups = ExpandedForm::makeSelectList($this->ruleGroupRepos->get()); $oldTriggers = []; $oldActions = []; $returnToBill = false; @@ -150,7 +149,7 @@ class RuleController extends Controller return view( 'rules.rule.create', compact( - 'subTitleIcon', 'oldTriggers', 'returnToBill', 'groups', 'preFilled', 'bill', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroup', + 'subTitleIcon', 'oldTriggers', 'returnToBill', 'preFilled', 'bill', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroup', 'subTitle' ) ); @@ -212,7 +211,6 @@ class RuleController extends Controller */ public function edit(Request $request, Rule $rule) { - $ruleGroups = ExpandedForm::makeSelectList($this->ruleGroupRepos->get()); $triggerCount = 0; $actionCount = 0; $oldActions = []; @@ -243,7 +241,7 @@ class RuleController extends Controller } session()->forget('rules.edit.fromUpdate'); - return view('rules.rule.edit', compact('rule', 'subTitle', 'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount', 'ruleGroups')); + return view('rules.rule.edit', compact('rule', 'subTitle', 'primaryTrigger', 'oldTriggers', 'oldActions', 'triggerCount', 'actionCount')); } /** @@ -333,14 +331,11 @@ class RuleController extends Controller public function selectTransactions(Rule $rule) { // does the user have shared accounts? - $accounts = $this->accountRepos->getAccountsByType([AccountType::ASSET]); - $accountList = ExpandedForm::makeSelectList($accounts); - $checkedAccounts = array_keys($accountList); $first = session('first')->format('Y-m-d'); $today = Carbon::create()->format('Y-m-d'); $subTitle = (string)trans('firefly.apply_rule_selection', ['title' => $rule->title]); - return view('rules.rule.select-transactions', compact('checkedAccounts', 'accountList', 'first', 'today', 'rule', 'subTitle')); + return view('rules.rule.select-transactions', compact( 'first', 'today', 'rule', 'subTitle')); } /** @@ -357,12 +352,12 @@ class RuleController extends Controller // redirect to show bill. if ($request->get('return_to_bill') === 'true' && (int)$request->get('bill_id') > 0) { - return redirect(route('bills.show', [(int)$request->get('bill_id')])); + return redirect(route('bills.show', [(int)$request->get('bill_id')])); // @codeCoverageIgnore } // redirect to new bill creation. if ((int)$request->get('bill_id') > 0) { - return redirect($this->getPreviousUri('bills.create.uri')); + return redirect($this->getPreviousUri('bills.create.uri')); // @codeCoverageIgnore } @@ -408,10 +403,12 @@ class RuleController extends Controller $matcher->setTriggers($triggers); try { $matchingTransactions = $matcher->findTransactionsByTriggers(); + // @codeCoverageIgnoreStart } catch (FireflyException $exception) { Log::error(sprintf('Could not grab transactions in testTriggers(): %s', $exception->getMessage())); Log::error($exception->getTraceAsString()); } + // @codeCoverageIgnoreStart // Warn the user if only a subset of transactions is returned @@ -427,10 +424,12 @@ class RuleController extends Controller $view = 'ERROR, see logs.'; try { $view = view('list.journals-tiny', ['transactions' => $matchingTransactions])->render(); + // @codeCoverageIgnoreStart } catch (Throwable $exception) { Log::error(sprintf('Could not render view in testTriggers(): %s', $exception->getMessage())); Log::error($exception->getTraceAsString()); } + // @codeCoverageIgnoreEnd return response()->json(['html' => $view, 'warning' => $warning]); } @@ -466,10 +465,12 @@ class RuleController extends Controller $matcher->setRule($rule); try { $matchingTransactions = $matcher->findTransactionsByRule(); + // @codeCoverageIgnoreStart } catch (FireflyException $exception) { Log::error(sprintf('Could not grab transactions in testTriggersByRule(): %s', $exception->getMessage())); Log::error($exception->getTraceAsString()); } + // @codeCoverageIgnoreEnd // Warn the user if only a subset of transactions is returned $warning = ''; @@ -484,10 +485,12 @@ class RuleController extends Controller $view = 'ERROR, see logs.'; try { $view = view('list.journals-tiny', ['transactions' => $matchingTransactions])->render(); + // @codeCoverageIgnoreStart } catch (Throwable $exception) { Log::error(sprintf('Could not render view in testTriggersByRule(): %s', $exception->getMessage())); Log::error($exception->getTraceAsString()); } + // @codeCoverageIgnoreEnd return response()->json(['html' => $view, 'warning' => $warning]); } @@ -592,10 +595,12 @@ class RuleController extends Controller 'count' => 1, ] )->render(); + // @codeCoverageIgnoreStart } catch (Throwable $e) { Log::error(sprintf('Throwable was thrown in getActionsForBill(): %s', $e->getMessage())); Log::error($e->getTraceAsString()); } + // @codeCoverageIgnoreEnd return $actions; } @@ -625,10 +630,12 @@ class RuleController extends Controller 'count' => $count, ] )->render(); + // @codeCoverageIgnoreStart } catch (Throwable $e) { Log::debug(sprintf('Throwable was thrown in getCurrentActions(): %s', $e->getMessage())); Log::error($e->getTraceAsString()); } + // @codeCoverageIgnoreEnd ++$index; } @@ -660,10 +667,12 @@ class RuleController extends Controller 'count' => $count, ] )->render(); + // @codeCoverageIgnoreStart } catch (Throwable $e) { Log::debug(sprintf('Throwable was thrown in getCurrentTriggers(): %s', $e->getMessage())); Log::error($e->getTraceAsString()); } + // @codeCoverageIgnoreEnd ++$index; } } @@ -696,10 +705,12 @@ class RuleController extends Controller 'count' => $count, ] )->render(); + // @codeCoverageIgnoreStart } catch (Throwable $e) { Log::debug(sprintf('Throwable was thrown in getPreviousActions(): %s', $e->getMessage())); Log::error($e->getTraceAsString()); } + // @codeCoverageIgnoreEnd ++$newIndex; } @@ -732,10 +743,12 @@ class RuleController extends Controller 'count' => $count, ] )->render(); + // @codeCoverageIgnoreStart } catch (Throwable $e) { Log::debug(sprintf('Throwable was thrown in getPreviousTriggers(): %s', $e->getMessage())); Log::error($e->getTraceAsString()); } + // @codeCoverageIgnoreEnd ++$newIndex; } @@ -791,10 +804,12 @@ class RuleController extends Controller 'count' => 4, ] )->render(); + // @codeCoverageIgnoreStart } catch (Throwable $e) { Log::debug(sprintf('Throwable was thrown in getTriggersForBill(): %s', $e->getMessage())); Log::debug($e->getTraceAsString()); } + // @codeCoverageIgnoreEnd return $triggers; } diff --git a/app/Http/Controllers/RuleGroupController.php b/app/Http/Controllers/RuleGroupController.php index 16c44dea94..360f73eb82 100644 --- a/app/Http/Controllers/RuleGroupController.php +++ b/app/Http/Controllers/RuleGroupController.php @@ -23,11 +23,9 @@ declare(strict_types=1); namespace FireflyIII\Http\Controllers; use Carbon\Carbon; -use ExpandedForm; use FireflyIII\Http\Requests\RuleGroupFormRequest; use FireflyIII\Http\Requests\SelectTransactionsRequest; use FireflyIII\Jobs\ExecuteRuleGroupOnExistingTransactions; -use FireflyIII\Models\AccountType; use FireflyIII\Models\RuleGroup; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; @@ -75,22 +73,18 @@ class RuleGroupController extends Controller } /** - * @param RuleGroupRepositoryInterface $repository - * @param RuleGroup $ruleGroup + * @param RuleGroup $ruleGroup * * @return View */ - public function delete(RuleGroupRepositoryInterface $repository, RuleGroup $ruleGroup) + public function delete(RuleGroup $ruleGroup) { $subTitle = trans('firefly.delete_rule_group', ['title' => $ruleGroup->title]); - $ruleGroupList = ExpandedForm::makeSelectListWithEmpty($repository->get()); - unset($ruleGroupList[$ruleGroup->id]); - // put previous url in session $this->rememberPreviousUri('rule-groups.delete.uri'); - return view('rules.rule-group.delete', compact('ruleGroup', 'subTitle', 'ruleGroupList')); + return view('rules.rule-group.delete', compact('ruleGroup', 'subTitle')); } /** @@ -135,11 +129,17 @@ class RuleGroupController extends Controller { $subTitle = trans('firefly.edit_rule_group', ['title' => $ruleGroup->title]); + $preFilled = [ + 'active' => $ruleGroup->active, + ]; + + // put previous url in session if not redirect from store (not "return_to_edit"). if (true !== session('rule-groups.edit.fromUpdate')) { $this->rememberPreviousUri('rule-groups.edit.uri'); } session()->forget('rule-groups.edit.fromUpdate'); + session()->flash('preFilled', $preFilled); return view('rules.rule-group.edit', compact('ruleGroup', 'subTitle')); } @@ -179,22 +179,17 @@ class RuleGroupController extends Controller } /** - * @param AccountRepositoryInterface $repository - * @param RuleGroup $ruleGroup + * @param RuleGroup $ruleGroup * * @return View */ - public function selectTransactions(AccountRepositoryInterface $repository, RuleGroup $ruleGroup) + public function selectTransactions(RuleGroup $ruleGroup) { - // does the user have shared accounts? - $accounts = $repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]); - $accountList = ExpandedForm::makeSelectList($accounts); - $checkedAccounts = array_keys($accountList); - $first = session('first')->format('Y-m-d'); - $today = Carbon::create()->format('Y-m-d'); - $subTitle = (string)trans('firefly.apply_rule_group_selection', ['title' => $ruleGroup->title]); + $first = session('first')->format('Y-m-d'); + $today = Carbon::create()->format('Y-m-d'); + $subTitle = (string)trans('firefly.apply_rule_group_selection', ['title' => $ruleGroup->title]); - return view('rules.rule-group.select-transactions', compact('checkedAccounts', 'accountList', 'first', 'today', 'ruleGroup', 'subTitle')); + return view('rules.rule-group.select-transactions', compact('first', 'today', 'ruleGroup', 'subTitle')); } /** diff --git a/app/Http/Controllers/System/InstallController.php b/app/Http/Controllers/System/InstallController.php index a84a03b1e0..9945f9d4d9 100644 --- a/app/Http/Controllers/System/InstallController.php +++ b/app/Http/Controllers/System/InstallController.php @@ -33,6 +33,7 @@ use Log; use phpseclib\Crypt\RSA; /** + * @codeCoverageIgnore * Class InstallController */ class InstallController extends Controller diff --git a/app/Http/Controllers/TagController.php b/app/Http/Controllers/TagController.php index 294d364014..26074416c4 100644 --- a/app/Http/Controllers/TagController.php +++ b/app/Http/Controllers/TagController.php @@ -31,19 +31,10 @@ use FireflyIII\Repositories\Tag\TagRepositoryInterface; use FireflyIII\Support\CacheProperties; use Illuminate\Http\Request; use Illuminate\Support\Collection; -use Preferences; use View; /** * Class TagController. - * - * Remember: a balancingAct takes at most one expense and one transfer. - * an advancePayment takes at most one expense, infinite deposits and NO transfers. - * - * transaction can only have one advancePayment OR balancingAct. - * Other attempts to put in such a tag are blocked. - * also show an error when editing a tag and it becomes either - * of these two types. Or rather, block editing of the tag. */ class TagController extends Controller { @@ -79,7 +70,6 @@ class TagController extends Controller { $subTitle = trans('firefly.new_tag'); $subTitleIcon = 'fa-tag'; - $apiKey = env('GOOGLE_MAPS_API_KEY', ''); // put previous url in session if not redirect from store (not "create another"). if (true !== session('tags.create.fromStore')) { @@ -87,7 +77,7 @@ class TagController extends Controller } session()->forget('tags.create.fromStore'); - return view('tags.create', compact('subTitle', 'subTitleIcon', 'apiKey')); + return view('tags.create', compact('subTitle', 'subTitleIcon')); } /** @@ -118,7 +108,7 @@ class TagController extends Controller $this->repository->destroy($tag); session()->flash('success', (string)trans('firefly.deleted_tag', ['tag' => $tagName])); - Preferences::mark(); + app('preferences')->mark(); return redirect($this->getPreviousUri('tags.delete.uri')); } @@ -134,7 +124,6 @@ class TagController extends Controller { $subTitle = trans('firefly.edit_tag', ['tag' => $tag->tag]); $subTitleIcon = 'fa-tag'; - $apiKey = env('GOOGLE_MAPS_API_KEY', ''); // put previous url in session if not redirect from store (not "return_to_edit"). if (true !== session('tags.edit.fromUpdate')) { @@ -142,7 +131,7 @@ class TagController extends Controller } session()->forget('tags.edit.fromUpdate'); - return view('tags.edit', compact('tag', 'subTitle', 'subTitleIcon', 'apiKey')); + return view('tags.edit', compact('tag', 'subTitle', 'subTitleIcon')); } /** @@ -155,27 +144,18 @@ class TagController extends Controller public function index(TagRepositoryInterface $repository) { // start with oldest tag - $oldestTag = $repository->oldestTag(); - /** @var Carbon $start */ - $start = new Carbon; - if (null !== $oldestTag) { - /** @var Carbon $start */ - $start = $oldestTag->date; // @codeCoverageIgnore - } - if (null === $oldestTag) { - /** @var Carbon $start */ - $start = clone session('first'); - } - - $now = new Carbon; + $oldestTagDate = null === $repository->oldestTag() ? clone session('first') : $repository->oldestTag()->date; + $newestTagDate = null === $repository->newestTag() ? new Carbon : $repository->newestTag()->date; + $oldestTagDate->startOfYear(); + $newestTagDate->endOfYear(); $clouds = []; $clouds['no-date'] = $repository->tagCloud(null); - while ($now > $start) { - $year = $now->year; + while ($newestTagDate > $oldestTagDate) { + $year = $newestTagDate->year; $clouds[$year] = $repository->tagCloud($year); - $now->subYear(); + $newestTagDate->subYear(); } $count = $repository->count(); @@ -196,12 +176,11 @@ class TagController extends Controller $subTitle = $tag->tag; $subTitleIcon = 'fa-tag'; $page = (int)$request->get('page'); - $pageSize = (int)Preferences::get('listPageSize', 50)->data; - $range = Preferences::get('viewRange', '1M')->data; + $pageSize = (int)app('preferences')->get('listPageSize', 50)->data; + $range = app('preferences')->get('viewRange', '1M')->data; $start = null; $end = null; $periods = new Collection; - $apiKey = env('GOOGLE_MAPS_API_KEY', ''); $path = route('tags.show', [$tag->id]); // prep for "all" view. @@ -213,7 +192,7 @@ class TagController extends Controller } // prep for "specific date" view. - if (\strlen($moment) > 0 && 'all' !== $moment) { + if ('all' !== $moment && \strlen($moment) > 0) { $start = new Carbon($moment); $end = app('navigation')->endOfPeriod($start, $range); $subTitle = trans( @@ -226,7 +205,7 @@ class TagController extends Controller } // prep for current period - if (0 === \strlen($moment)) { + if ('' === $moment) { /** @var Carbon $start */ $start = clone session('start', app('navigation')->startOfPeriod(new Carbon, $range)); /** @var Carbon $end */ @@ -261,7 +240,7 @@ class TagController extends Controller $this->repository->store($data); session()->flash('success', (string)trans('firefly.created_tag', ['tag' => $data['tag']])); - Preferences::mark(); + app('preferences')->mark(); if (1 === (int)$request->get('create_another')) { // @codeCoverageIgnoreStart @@ -286,7 +265,7 @@ class TagController extends Controller $this->repository->update($tag, $data); session()->flash('success', (string)trans('firefly.updated_tag', ['tag' => $data['tag']])); - Preferences::mark(); + app('preferences')->mark(); if (1 === (int)$request->get('return_to_edit')) { // @codeCoverageIgnoreStart @@ -308,9 +287,11 @@ class TagController extends Controller private function getPeriodOverview(Tag $tag): Collection { // get first and last tag date from tag: - $range = Preferences::get('viewRange', '1M')->data; - $start = app('navigation')->startOfPeriod($this->repository->firstUseDate($tag), $range); - $end = app('navigation')->startOfPeriod($this->repository->lastUseDate($tag), $range); + $range = app('preferences')->get('viewRange', '1M')->data; + $end = app('navigation')->endOfX($this->repository->lastUseDate($tag), $range, null); + $start = $this->repository->firstUseDate($tag); + + // properties for entries with their amounts. $cache = new CacheProperties; $cache->addProperty($start); @@ -323,22 +304,23 @@ class TagController extends Controller } $collection = new Collection; - + $currentEnd = clone $end; // while end larger or equal to start - while ($end >= $start) { - $currentEnd = app('navigation')->endOfPeriod($end, $range); + while ($currentEnd >= $start) { + $currentStart = app('navigation')->startOfPeriod($currentEnd, $range); // get expenses and what-not in this period and this tag. $arr = [ 'string' => $end->format('Y-m-d'), - 'name' => app('navigation')->periodShow($end, $range), + 'name' => app('navigation')->periodShow($currentEnd, $range), 'date' => clone $end, - 'spent' => $this->repository->spentInPeriod($tag, $end, $currentEnd), - 'earned' => $this->repository->earnedInPeriod($tag, $end, $currentEnd), + 'spent' => $this->repository->spentInPeriod($tag, $currentStart, $currentEnd), + 'earned' => $this->repository->earnedInPeriod($tag, $currentStart, $currentEnd), ]; $collection->push($arr); - $end = app('navigation')->subtractPeriod($end, $range, 1); + $currentEnd = clone $currentStart; + $currentEnd->subDay(); } $cache->store($collection); diff --git a/app/Http/Controllers/Transaction/LinkController.php b/app/Http/Controllers/Transaction/LinkController.php index c238f36f01..686b73c082 100644 --- a/app/Http/Controllers/Transaction/LinkController.php +++ b/app/Http/Controllers/Transaction/LinkController.php @@ -107,7 +107,7 @@ class LinkController extends Controller return redirect(route('transactions.show', [$journal->id])); } - $other = $this->journalRepository->find($linkInfo['transaction_journal_id']); + $other = $this->journalRepository->findNull($linkInfo['transaction_journal_id']); $alreadyLinked = $this->repository->findLink($journal, $other); if ($other->id === $journal->id) { diff --git a/app/Http/Controllers/Transaction/MassController.php b/app/Http/Controllers/Transaction/MassController.php index e404300f61..8b78a9ccb9 100644 --- a/app/Http/Controllers/Transaction/MassController.php +++ b/app/Http/Controllers/Transaction/MassController.php @@ -25,6 +25,7 @@ namespace FireflyIII\Http\Controllers\Transaction; use Carbon\Carbon; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Helpers\Filter\NegativeAmountFilter; +use FireflyIII\Helpers\Filter\TransactionViewFilter; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\MassDeleteJournalRequest; use FireflyIII\Http\Requests\MassEditJournalRequest; @@ -145,22 +146,24 @@ class MassController extends Controller $collector->setUser(auth()->user()); $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation(); $collector->setJournals($journals); - $collector->addFilter(NegativeAmountFilter::class); - $transactions = $collector->getJournals(); + $collector->addFilter(TransactionViewFilter::class); + $collection = $collector->getJournals(); // add some filters: // transform to array - $journals = $transactions->map( + $transactions = $collection->map( function (Transaction $transaction) use ($transformer) { - $result = $transformer->transform($transaction); - - return $result; + $transaction= $transformer->transform($transaction); + // make sure amount is positive: + $transaction['amount'] = app('steam')->positive((string)$transaction['amount']); + $transaction['foreign_amount'] = app('steam')->positive((string)$transaction['foreign_amount']); + return $transaction; } ); - return view('transactions.mass.edit', compact('journals', 'subTitle', 'accounts', 'budgets')); + return view('transactions.mass.edit', compact('transactions', 'subTitle', 'accounts', 'budgets')); } /** diff --git a/app/Http/Controllers/Transaction/SplitController.php b/app/Http/Controllers/Transaction/SplitController.php index 2dfc57325c..aa25f47fdc 100644 --- a/app/Http/Controllers/Transaction/SplitController.php +++ b/app/Http/Controllers/Transaction/SplitController.php @@ -29,8 +29,6 @@ use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Http\Controllers\Controller; use FireflyIII\Http\Requests\SplitJournalFormRequest; -use FireflyIII\Models\Account; -use FireflyIII\Models\AccountType; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; use FireflyIII\Models\TransactionType; @@ -100,22 +98,18 @@ class SplitController extends Controller if ($this->isOpeningBalance($journal)) { return $this->redirectToAccount($journal); // @codeCoverageIgnore } + // basic fields: + $uploadSize = min(Steam::phpBytes(ini_get('upload_max_filesize')), Steam::phpBytes(ini_get('post_max_size'))); + $subTitle = trans('breadcrumbs.edit_journal', ['description' => $journal->description]); + $subTitleIcon = 'fa-pencil'; - $uploadSize = min(Steam::phpBytes(ini_get('upload_max_filesize')), Steam::phpBytes(ini_get('post_max_size'))); - $currencies = $this->currencies->get(); + // lists and collections + $currencies = $this->currencies->get(); + $budgets = ExpandedForm::makeSelectListWithEmpty($this->budgets->getActiveBudgets()); + + // other fields $optionalFields = Preferences::get('transaction_journal_optional_fields', [])->data; - $budgets = ExpandedForm::makeSelectListWithEmpty($this->budgets->getActiveBudgets()); $preFilled = $this->arrayFromJournal($request, $journal); - $subTitle = trans('breadcrumbs.edit_journal', ['description' => $journal->description]); - $subTitleIcon = 'fa-pencil'; - $accountList = $this->accounts->getAccountsByType([AccountType::ASSET, AccountType::DEFAULT]); - $accountArray = []; - // account array to display currency info: - /** @var Account $account */ - foreach ($accountList as $account) { - $accountArray[$account->id] = $account; - $accountArray[$account->id]['currency_id'] = (int)$this->accounts->getMetaValue($account, 'currency_id'); - } // put previous url in session if not redirect from store (not "return_to_edit"). if (true !== session('transactions.edit-split.fromUpdate')) { @@ -126,7 +120,7 @@ class SplitController extends Controller return view( 'transactions.split.edit', compact( 'subTitleIcon', 'currencies', 'optionalFields', 'preFilled', 'subTitle', 'uploadSize', 'budgets', - 'journal', 'accountArray' + 'journal' ) ); } @@ -146,8 +140,7 @@ class SplitController extends Controller // keep current bill: $data['bill_id'] = $journal->bill_id; - - $journal = $this->repository->update($journal, $data); + $journal = $this->repository->update($journal, $data); /** @var array $files */ $files = $request->hasFile('attachments') ? $request->file('attachments') : null; @@ -283,9 +276,9 @@ class SplitController extends Controller } // take some info from first transaction, that should at least exist. $array[$index] = $row; - $array[$index]['currency_id'] = $array[0]['transaction_currency_id']; - $array[$index]['currency_code'] = $array[0]['transaction_currency_code'] ?? ''; - $array[$index]['currency_symbol'] = $array[0]['transaction_currency_symbol'] ?? ''; + $array[$index]['currency_id'] = $array[0]['currency_id']; + $array[$index]['currency_code'] = $array[0]['currency_code'] ?? ''; + $array[$index]['currency_symbol'] = $array[0]['currency_symbol'] ?? ''; $array[$index]['foreign_amount'] = round($array[0]['foreign_destination_amount'] ?? '0', 12); $array[$index]['foreign_currency_id'] = $array[0]['foreign_currency_id']; $array[$index]['foreign_currency_code'] = $array[0]['foreign_currency_code']; diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index 394f04d01a..9c2b7f0131 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -1,5 +1,4 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Http\Middleware; use Closure; @@ -103,7 +104,9 @@ class Authenticate } } } catch (QueryException $e) { + // @codeCoverageIgnoreStart throw new FireflyException('It seems the database has not yet been initialized. Did you run the correct upgrade or installation commands?'); + // @codeCoverageIgnoreEnd } return $this->auth->authenticate(); diff --git a/app/Http/Middleware/Installer.php b/app/Http/Middleware/Installer.php index 1afa004cdf..2f8f73a654 100644 --- a/app/Http/Middleware/Installer.php +++ b/app/Http/Middleware/Installer.php @@ -1,4 +1,25 @@ . + */ + declare(strict_types=1); namespace FireflyIII\Http\Middleware; diff --git a/app/Http/Requests/SplitJournalFormRequest.php b/app/Http/Requests/SplitJournalFormRequest.php index 207754df5b..ce99023a1f 100644 --- a/app/Http/Requests/SplitJournalFormRequest.php +++ b/app/Http/Requests/SplitJournalFormRequest.php @@ -109,23 +109,23 @@ class SplitJournalFormRequest extends Request public function rules(): array { return [ - 'what' => 'required|in:withdrawal,deposit,transfer', - 'journal_description' => 'required|between:1,255', - 'id' => 'numeric|belongsToUser:transaction_journals,id', - 'journal_source_account_id' => 'numeric|belongsToUser:accounts,id', - 'journal_source_account_name.*' => 'between:1,255', - 'journal_currency_id' => 'required|exists:transaction_currencies,id', - 'date' => 'required|date', - 'interest_date' => 'date|nullable', - 'book_date' => 'date|nullable', - 'process_date' => 'date|nullable', - 'transactions.*.transaction_description' => 'required|between:1,255', - 'transactions.*.destination_account_id' => 'numeric|belongsToUser:accounts,id', - 'transactions.*.destination_name' => 'between:1,255|nullable', - 'transactions.*.amount' => 'required|numeric', - 'transactions.*.budget_id' => 'belongsToUser:budgets,id', - 'transactions.*.category_name' => 'between:1,255|nullable', - 'transactions.*.piggy_bank_id' => 'between:1,255|nullable', + 'what' => 'required|in:withdrawal,deposit,transfer', + 'journal_description' => 'required|between:1,255', + 'id' => 'numeric|belongsToUser:transaction_journals,id', + 'journal_source_account_id' => 'numeric|belongsToUser:accounts,id', + 'journal_source_account_name.*' => 'between:1,255', + 'journal_currency_id' => 'required|exists:transaction_currencies,id', + 'date' => 'required|date', + 'interest_date' => 'date|nullable', + 'book_date' => 'date|nullable', + 'process_date' => 'date|nullable', + 'transactions.*.transaction_description' => 'required|between:1,255', + 'transactions.*.destination_account_id' => 'numeric|belongsToUser:accounts,id', + 'transactions.*.destination_name' => 'between:1,255|nullable', + 'transactions.*.amount' => 'required|numeric', + 'transactions.*.budget_id' => 'belongsToUser:budgets,id', + 'transactions.*.category_name' => 'between:1,255|nullable', + 'transactions.*.piggy_bank_id' => 'between:1,255|nullable', ]; } diff --git a/app/Import/Configuration/BunqConfigurator.php b/app/Import/Configuration/BunqConfigurator.php index 910c494d71..a115f8e933 100644 --- a/app/Import/Configuration/BunqConfigurator.php +++ b/app/Import/Configuration/BunqConfigurator.php @@ -29,6 +29,8 @@ use FireflyIII\Support\Import\Configuration\Bunq\HaveAccounts; use Log; /** + * @deprecated + * @codeCoverageIgnore * Class BunqConfigurator. */ class BunqConfigurator implements ConfiguratorInterface diff --git a/app/Import/Configuration/ConfiguratorInterface.php b/app/Import/Configuration/ConfiguratorInterface.php index f171044f7c..a1e961b0ec 100644 --- a/app/Import/Configuration/ConfiguratorInterface.php +++ b/app/Import/Configuration/ConfiguratorInterface.php @@ -25,6 +25,8 @@ namespace FireflyIII\Import\Configuration; use FireflyIII\Models\ImportJob; /** + * @deprecated + * @codeCoverageIgnore * Interface ConfiguratorInterface. */ interface ConfiguratorInterface diff --git a/app/Import/Configuration/FileConfigurator.php b/app/Import/Configuration/FileConfigurator.php deleted file mode 100644 index 4d98232d2a..0000000000 --- a/app/Import/Configuration/FileConfigurator.php +++ /dev/null @@ -1,275 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Import\Configuration; - -use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Models\ImportJob; -use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; -use FireflyIII\Support\Import\Configuration\ConfigurationInterface; -use FireflyIII\Support\Import\Configuration\File\Initial; -use FireflyIII\Support\Import\Configuration\File\Map; -use FireflyIII\Support\Import\Configuration\File\Roles; -use FireflyIII\Support\Import\Configuration\File\UploadConfig; -use Log; - -/** - * Class FileConfigurator. - */ -class FileConfigurator implements ConfiguratorInterface -{ - /** @var array */ - private $defaultConfig - = [ - 'stage' => 'initial', - 'has-headers' => false, // assume - 'date-format' => 'Ymd', // assume - 'delimiter' => ',', // assume - 'import-account' => 0, // none, - 'specifics' => [], // none - 'column-count' => 0, // unknown - 'column-roles' => [], // unknown - 'column-do-mapping' => [], // not yet set which columns must be mapped - 'column-mapping-config' => [], // no mapping made yet. - 'file-type' => 'csv', // assume - 'has-config-file' => true, - 'apply-rules' => true, - 'auto-start' => false, - ]; - /** @var ImportJob */ - private $job; - /** @var ImportJobRepositoryInterface */ - private $repository; - - // give job default config: - /** @var string */ - private $warning = ''; - - /** - * FileConfigurator constructor. - */ - public function __construct() - { - Log::debug('Created FileConfigurator'); - } - - /** - * Store any data from the $data array into the job. - * - * @param array $data - * - * @return bool - * - * @throws FireflyException - */ - public function configureJob(array $data): bool - { - if (null === $this->job) { - throw new FireflyException('Cannot call configureJob() without a job.'); - } - /** @var ConfigurationInterface $object */ - $object = app($this->getConfigurationClass()); - $object->setJob($this->job); - $result = $object->storeConfiguration($data); - $this->warning = $object->getWarningMessage(); - - return $result; - } - - /** - * Return the data required for the next step in the job configuration. - * - * @return array - * - * @throws FireflyException - */ - public function getNextData(): array - { - if (null === $this->job) { - throw new FireflyException('Cannot call getNextData() without a job.'); - } - /** @var ConfigurationInterface $object */ - $object = app($this->getConfigurationClass()); - $object->setJob($this->job); - - return $object->getData(); - } - - /** - * @return string - * - * @throws FireflyException - */ - public function getNextView(): string - { - if (null === $this->job) { - throw new FireflyException('Cannot call getNextView() without a job.'); - } - $config = $this->getConfig(); - $stage = $config['stage'] ?? 'initial'; - switch ($stage) { - case 'initial': // has nothing, no file upload or anything. - return 'import.file.initial'; - case 'upload-config': // has file, needs file config. - return 'import.file.upload-config'; - case 'roles': // has configured file, needs roles. - return 'import.file.roles'; - case 'map': // has roles, needs mapping. - return 'import.file.map'; - } - throw new FireflyException(sprintf('No view for stage "%s"', $stage)); - } - - /** - * Return possible warning to user. - * - * @return string - * - * @throws FireflyException - */ - public function getWarningMessage(): string - { - if (null === $this->job) { - throw new FireflyException('Cannot call getWarningMessage() without a job.'); - } - - return $this->warning; - } - - /** - * @return bool - * - * @throws FireflyException - */ - public function isJobConfigured(): bool - { - if (null === $this->job) { - throw new FireflyException('Cannot call isJobConfigured() without a job.'); - } - $config = $this->getConfig(); - $stage = $config['stage'] ?? 'initial'; - if ('ready' === $stage) { - Log::debug('isJobConfigured returns true'); - - return true; - } - Log::debug('isJobConfigured returns false'); - - return false; - } - - /** - * @param ImportJob $job - */ - public function setJob(ImportJob $job) - { - Log::debug(sprintf('FileConfigurator::setJob(#%d: %s)', $job->id, $job->key)); - $this->job = $job; - $this->repository = app(ImportJobRepositoryInterface::class); - $this->repository->setUser($job->user); - - // set number of steps to 100: - $extendedStatus = $this->getExtendedStatus(); - $extendedStatus['steps'] = 6; - $extendedStatus['done'] = 0; - $this->setExtendedStatus($extendedStatus); - - $config = $this->getConfig(); - $newConfig = array_merge($this->defaultConfig, $config); - $this->repository->setConfiguration($job, $newConfig); - } - - /** - * Short hand method. - * - * @return array - */ - private function getConfig(): array - { - return $this->repository->getConfiguration($this->job); - } - - /** - * @return string - * - * @throws FireflyException - */ - private function getConfigurationClass(): string - { - $config = $this->getConfig(); - $stage = $config['stage'] ?? 'initial'; - $class = false; - Log::debug(sprintf('Now in getConfigurationClass() for stage "%s"', $stage)); - - switch ($stage) { - case 'initial': // has nothing, no file upload or anything. - $class = Initial::class; - break; - case 'upload-config': // has file, needs file config. - $class = UploadConfig::class; - break; - case 'roles': // has configured file, needs roles. - $class = Roles::class; - break; - case 'map': // has roles, needs mapping. - $class = Map::class; - break; - default: - break; - } - - if (false === $class || 0 === \strlen($class)) { - throw new FireflyException(sprintf('Cannot handle job stage "%s" in getConfigurationClass().', $stage)); - } - if (!class_exists($class)) { - throw new FireflyException(sprintf('Class %s does not exist in getConfigurationClass().', $class)); // @codeCoverageIgnore - } - Log::debug(sprintf('Configuration class is "%s"', $class)); - - return $class; - } - - /** - * Shorthand method to return the extended status. - * - * @codeCoverageIgnore - * - * @return array - */ - private function getExtendedStatus(): array - { - return $this->repository->getExtendedStatus($this->job); - } - - /** - * Shorthand method to set the extended status. - * - * @codeCoverageIgnore - * - * @param array $extended - */ - private function setExtendedStatus(array $extended): void - { - $this->repository->setExtendedStatus($this->job, $extended); - - } -} diff --git a/app/Import/Configuration/SpectreConfigurator.php b/app/Import/Configuration/SpectreConfigurator.php deleted file mode 100644 index 3f65633d3a..0000000000 --- a/app/Import/Configuration/SpectreConfigurator.php +++ /dev/null @@ -1,233 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Import\Configuration; - -use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Models\ImportJob; -use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; -use FireflyIII\Support\Import\Configuration\Spectre\HaveAccounts; -use Log; - -/** - * Class SpectreConfigurator. - */ -class SpectreConfigurator implements ConfiguratorInterface -{ - /** @var ImportJob */ - private $job; - - /** @var ImportJobRepositoryInterface */ - private $repository; - - /** @var string */ - private $warning = ''; - - /** - * ConfiguratorInterface constructor. - */ - public function __construct() - { - } - - /** - * Store any data from the $data array into the job. - * - * @param array $data - * - * @return bool - * - * @throws FireflyException - */ - public function configureJob(array $data): bool - { - if (null === $this->job) { - throw new FireflyException('Cannot call configureJob() without a job.'); - } - $stage = $this->getConfig()['stage'] ?? 'initial'; - Log::debug(sprintf('in getNextData(), for stage "%s".', $stage)); - switch ($stage) { - case 'have-accounts': - /** @var HaveAccounts $class */ - $class = app(HaveAccounts::class); - $class->setJob($this->job); - $class->storeConfiguration($data); - - // update job for next step and set to "configured". - $config = $this->getConfig(); - $config['stage'] = 'have-account-mapping'; - $this->repository->setConfiguration($this->job, $config); - - return true; - default: - throw new FireflyException(sprintf('Cannot store configuration when job is in state "%s"', $stage)); - break; - } - } - - /** - * Return the data required for the next step in the job configuration. - * - * @return array - * - * @throws FireflyException - */ - public function getNextData(): array - { - if (null === $this->job) { - throw new FireflyException('Cannot call configureJob() without a job.'); - } - $config = $this->getConfig(); - $stage = $config['stage'] ?? 'initial'; - - Log::debug(sprintf('in getNextData(), for stage "%s".', $stage)); - switch ($stage) { - case 'has-token': - // simply redirect to Spectre. - $config['is-redirected'] = true; - $config['stage'] = 'user-logged-in'; - $status = 'configured'; - - // update config and status: - $this->repository->setConfiguration($this->job, $config); - $this->repository->setStatus($this->job, $status); - - return $this->repository->getConfiguration($this->job); - case 'have-accounts': - /** @var HaveAccounts $class */ - $class = app(HaveAccounts::class); - $class->setJob($this->job); - - return $class->getData(); - default: - return []; - } - } - - /** - * @return string - * - * @throws FireflyException - */ - public function getNextView(): string - { - if (null === $this->job) { - throw new FireflyException('Cannot call configureJob() without a job.'); - } - $stage = $this->getConfig()['stage'] ?? 'initial'; - Log::debug(sprintf('in getNextView(), for stage "%s".', $stage)); - switch ($stage) { - case 'has-token': - // redirect to Spectre. - Log::info('User is being redirected to Spectre.'); - - return 'import.spectre.redirect'; - case 'have-accounts': - return 'import.spectre.accounts'; - default: - return ''; - } - } - - /** - * Return possible warning to user. - * - * @return string - */ - public function getWarningMessage(): string - { - return $this->warning; - } - - /** - * @return bool - * - * @throws FireflyException - */ - public function isJobConfigured(): bool - { - if (null === $this->job) { - throw new FireflyException('Cannot call configureJob() without a job.'); - } - $stage = $this->getConfig()['stage'] ?? 'initial'; - Log::debug(sprintf('in isJobConfigured(), for stage "%s".', $stage)); - switch ($stage) { - case 'has-token': - case 'have-accounts': - Log::debug('isJobConfigured returns false'); - - return false; - default: - Log::debug('isJobConfigured returns true'); - - return true; - } - } - - /** - * @param ImportJob $job - */ - public function setJob(ImportJob $job): void - { - // make repository - $this->repository = app(ImportJobRepositoryInterface::class); - $this->repository->setUser($job->user); - - // set default config: - $defaultConfig = [ - 'has-token' => false, - 'token' => '', - 'token-expires' => 0, - 'token-url' => '', - 'is-redirected' => false, - 'customer' => null, - 'login' => null, - 'stage' => 'initial', - 'accounts' => '', - 'accounts-mapped' => '', - 'auto-start' => true, - 'apply-rules' => true, - ]; - $currentConfig = $this->repository->getConfiguration($job); - $finalConfig = array_merge($defaultConfig, $currentConfig); - - // set default extended status: - $extendedStatus = $this->repository->getExtendedStatus($job); - $extendedStatus['steps'] = 6; - - // save to job: - $job = $this->repository->setConfiguration($job, $finalConfig); - $job = $this->repository->setExtendedStatus($job, $extendedStatus); - $this->job = $job; - - } - - /** - * Shorthand method. - * - * @return array - */ - private function getConfig(): array - { - return $this->repository->getConfiguration($this->job); - } -} diff --git a/app/Import/Converter/RabobankDebitCredit.php b/app/Import/Converter/RabobankDebitCredit.php index 242f4ca38f..d426e52b5b 100644 --- a/app/Import/Converter/RabobankDebitCredit.php +++ b/app/Import/Converter/RabobankDebitCredit.php @@ -43,6 +43,12 @@ class RabobankDebitCredit implements ConverterInterface return -1; } + // old format: + if('A' === $value) { + Log::debug('Return -1'); + + return -1; + } Log::debug('Return 1'); diff --git a/app/Import/FileProcessor/CsvProcessor.php b/app/Import/FileProcessor/CsvProcessor.php deleted file mode 100644 index affd463daa..0000000000 --- a/app/Import/FileProcessor/CsvProcessor.php +++ /dev/null @@ -1,374 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Import\FileProcessor; - -use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Import\Object\ImportJournal; -use FireflyIII\Import\Specifics\SpecificInterface; -use FireflyIII\Models\ImportJob; -use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; -use Illuminate\Support\Collection; -use League\Csv\Reader; -use League\Csv\Statement; -use Log; - -/** - * Class CsvProcessor, as the name suggests, goes over CSV file line by line and creates - * "ImportJournal" objects, which are used in another step to create new journals and transactions - * and what-not. - */ -class CsvProcessor implements FileProcessorInterface -{ - /** @var ImportJob */ - private $job; - /** @var Collection */ - private $objects; - /** @var ImportJobRepositoryInterface */ - private $repository; - /** @var array */ - private $validConverters; - /** @var array */ - private $validSpecifics; - - /** - * FileProcessorInterface constructor. - */ - public function __construct() - { - $this->objects = new Collection; - $this->validSpecifics = array_keys(config('csv.import_specifics')); - $this->validConverters = array_keys(config('csv.import_roles')); - } - - /** - * @return Collection - * - * @throws FireflyException - */ - public function getObjects(): Collection - { - if (null === $this->job) { - throw new FireflyException('Cannot call getObjects() without a job.'); - } - - return $this->objects; - } - - /** - * Does the actual job. - * - * @return bool - * - * @throws FireflyException - * @throws \League\Csv\Exception - */ - public function run(): bool - { - if (null === $this->job) { - throw new FireflyException('Cannot call run() without a job.'); - } - Log::debug('Now in CsvProcessor run(). Job is now running...'); - - $entries = new Collection($this->getImportArray()); - $this->addStep(); - Log::notice('Building importable objects from CSV file.'); - Log::debug(sprintf('Number of entries: %d', $entries->count())); - $notImported = $entries->filter( - function (array $row, int $index) { - $row = array_values($row); - if ($this->rowAlreadyImported($row)) { - $message = sprintf('Row #%d has already been imported.', $index); - $this->repository->addError($this->job, $index, $message); - Log::info($message); - - return null; - } - - return $row; - } - ); - $this->addStep(); - Log::debug(sprintf('Number of entries left: %d', $notImported->count())); - - $notImported->each( - function (array $row, int $index) { - $journal = $this->importRow($index, $row); - $this->objects->push($journal); - } - ); - $this->addStep(); - - return true; - } - - /** - * Shorthand method to set the extended status. - * - * @codeCoverageIgnore - * - * @param array $array - */ - public function setExtendedStatus(array $array): void - { - $this->repository->setExtendedStatus($this->job, $array); - } - - /** - * Set import job for this processor. - * - * @param ImportJob $job - * - * @return FileProcessorInterface - */ - public function setJob(ImportJob $job): FileProcessorInterface - { - $this->job = $job; - $this->repository = app(ImportJobRepositoryInterface::class); - $this->repository->setUser($job->user); - - return $this; - } - - /** - * Shorthand method to add a step. - * - * @codeCoverageIgnore - */ - private function addStep() - { - $this->repository->addStepsDone($this->job, 1); - } - - /** - * Add meta data to the individual value and verify that it can be handled in a later stage. - * - * @param int $index - * @param string $value - * - * @return array - * - * @throws FireflyException - */ - private function annotateValue(int $index, string $value) - { - $config = $this->getConfig(); - $role = $config['column-roles'][$index] ?? '_ignore'; - $mapped = $config['column-mapping-config'][$index][$value] ?? null; - - // throw error when not a valid converter. - if (!\in_array($role, $this->validConverters)) { - throw new FireflyException(sprintf('"%s" is not a valid role.', $role)); - } - - $entry = [ - 'role' => $role, - 'value' => $value, - 'mapped' => $mapped, - ]; - - return $entry; - } - - /** - * Shorthand method to return configuration. - * - * @codeCoverageIgnore - * - * @return array - */ - private function getConfig(): array - { - return $this->repository->getConfiguration($this->job); - } - - /** - * @return array - * - * @throws \League\Csv\Exception - * @throws \League\Csv\Exception - */ - private function getImportArray(): array - { - $content = $this->repository->uploadFileContents($this->job); - $config = $this->getConfig(); - $reader = Reader::createFromString($content); - $delimiter = $config['delimiter'] ?? ','; - $hasHeaders = $config['has-headers'] ?? false; - $offset = 0; - if ('tab' === $delimiter) { - $delimiter = "\t"; // @codeCoverageIgnore - } - $reader->setDelimiter($delimiter); - if ($hasHeaders) { - $offset = 1; - } - $stmt = (new Statement)->offset($offset); - $records = $stmt->process($reader); - $return = []; - foreach ($records as $record) { - $return[] = $record; - } - Log::debug('Created a CSV reader.'); - - return $return; - } - - /** - * Will return string representation of JSON error code. - * - * @param int $jsonError - * - * @codeCoverageIgnore - * - * @return string - */ - private function getJsonError(int $jsonError): string - { - $messages = [ - JSON_ERROR_NONE => 'No JSON error', - JSON_ERROR_DEPTH => 'The maximum stack depth has been exceeded.', - JSON_ERROR_STATE_MISMATCH => 'Invalid or malformed JSON.', - JSON_ERROR_CTRL_CHAR => 'Control character error, possibly incorrectly encoded.', - JSON_ERROR_SYNTAX => 'Syntax error.', - JSON_ERROR_UTF8 => 'Malformed UTF-8 characters, possibly incorrectly encoded.', - JSON_ERROR_RECURSION => 'One or more recursive references in the value to be encoded.', - JSON_ERROR_INF_OR_NAN => 'One or more NAN or INF values in the value to be encoded.', - JSON_ERROR_UNSUPPORTED_TYPE => 'A value of a type that cannot be encoded was given.', - JSON_ERROR_INVALID_PROPERTY_NAME => 'A property name that cannot be encoded was given.', - JSON_ERROR_UTF16 => 'Malformed UTF-16 characters, possibly incorrectly encoded.', - ]; - if (isset($messages[$jsonError])) { - return $messages[$jsonError]; - } - - return 'Unknown JSON error'; - } - - /** - * Hash an array and return the result. - * - * @param array $array - * - * @return string - * - * @throws FireflyException - */ - private function getRowHash(array $array): string - { - $json = json_encode($array); - $jsonError = json_last_error(); - - if (false === $json) { - throw new FireflyException(sprintf('Error while encoding JSON for CSV row: %s', $this->getJsonError($jsonError))); // @codeCoverageIgnore - } - - return hash('sha256', $json); - } - - /** - * Take a row, build import journal by annotating each value and storing it in the import journal. - * - * @param int $index - * @param array $row - * - * @return ImportJournal - * - * @throws FireflyException - */ - private function importRow(int $index, array $row): ImportJournal - { - $row = array_values($row); - Log::debug(sprintf('Now at row %d', $index)); - $row = $this->specifics($row); - $hash = $this->getRowHash($row); - $config = $this->getConfig(); - - $journal = new ImportJournal; - $journal->setUser($this->job->user); - $journal->setHash($hash); - - /** - * @var int - * @var string $value - */ - foreach ($row as $rowIndex => $value) { - $value = trim((string)$value); - if (\strlen($value) > 0) { - $annotated = $this->annotateValue($rowIndex, $value); - Log::debug('Annotated value', $annotated); - $journal->setValue($annotated); - } - } - // set some extra info: - $importAccount = (int)($config['import-account'] ?? 0.0); - $journal->asset->setDefaultAccountId($importAccount); - - return $journal; - } - - /** - * Checks if the row has not been imported before. - * - * @param array $array - * - * @return bool - * - * @throws FireflyException - */ - private function rowAlreadyImported(array $array): bool - { - $hash = $this->getRowHash($array); - $count = $this->repository->countByHash($hash); - Log::debug(sprintf('Hash is %s and count is %d', $hash, $count)); - - return $count > 0; - } - - /** - * And this is the point where the specifix go to work. - * - * @param array $row - * - * @return array - * - * @throws FireflyException - */ - private function specifics(array $row): array - { - $config = $this->getConfig(); - $names = array_keys($config['specifics'] ?? []); - foreach ($names as $name) { - if (!\in_array($name, $this->validSpecifics)) { - throw new FireflyException(sprintf('"%s" is not a valid class name', $name)); - } - - /** @var SpecificInterface $specific */ - $specific = app('FireflyIII\Import\Specifics\\' . $name); - - // it returns the row, possibly modified: - $row = $specific->run($row); - } - - return $row; - } -} diff --git a/app/Import/JobConfiguration/BunqJobConfiguration.php b/app/Import/JobConfiguration/BunqJobConfiguration.php new file mode 100644 index 0000000000..9ea6382b4d --- /dev/null +++ b/app/Import/JobConfiguration/BunqJobConfiguration.php @@ -0,0 +1,129 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Import\JobConfiguration; + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Support\Import\JobConfiguration\Bunq\BunqJobConfigurationInterface; +use FireflyIII\Support\Import\JobConfiguration\Bunq\ChooseAccountsHandler; +use FireflyIII\Support\Import\JobConfiguration\Bunq\NewBunqJobHandler; +use Illuminate\Support\MessageBag; +use Log; + +/** + * Class BunqJobConfiguration + */ +class BunqJobConfiguration implements JobConfigurationInterface +{ + /** @var BunqJobConfigurationInterface */ + private $handler; + /** @var ImportJob */ + private $importJob; + /** @var ImportJobRepositoryInterface */ + private $repository; + + /** + * Returns true when the initial configuration for this job is complete. + * + * @return bool + */ + public function configurationComplete(): bool + { + return $this->handler->configurationComplete(); + } + + /** + * Store any data from the $data array into the job. Anything in the message bag will be flashed + * as an error to the user, regardless of its content. + * + * @param array $data + * + * @return MessageBag + */ + public function configureJob(array $data): MessageBag + { + return $this->handler->configureJob($data); + } + + /** + * Return the data required for the next step in the job configuration. + * + * @return array + */ + public function getNextData(): array + { + return $this->handler->getNextData(); + } + + /** + * Returns the view of the next step in the job configuration. + * + * @return string + */ + public function getNextView(): string + { + return $this->handler->getNextView(); + } + + /** + * @param ImportJob $importJob + * + * @throws FireflyException + */ + public function setImportJob(ImportJob $importJob): void + { + $this->importJob = $importJob; + $this->repository = app(ImportJobRepositoryInterface::class); + $this->repository->setUser($importJob->user); + $this->handler = $this->getHandler(); + } + + /** + * @return BunqJobConfigurationInterface + * @throws FireflyException + */ + private function getHandler(): BunqJobConfigurationInterface + { + Log::debug(sprintf('Now in BunqJobConfiguration::getHandler() with stage "%s"', $this->importJob->stage)); + $handler = null; + switch ($this->importJob->stage) { + case 'new'; + $handler = app(NewBunqJobHandler::class); + $handler->setImportJob($this->importJob); + break; + case 'choose-accounts': + /** @var ChooseAccountsHandler $handler */ + $handler = app(ChooseAccountsHandler::class); + $handler->setImportJob($this->importJob); + break; + default: + // @codeCoverageIgnoreStart + throw new FireflyException(sprintf('Firefly III cannot create a configuration handler for stage "%s"', $this->importJob->stage)); + // @codeCoverageIgnoreEnd + } + + return $handler; + } +} \ No newline at end of file diff --git a/app/Import/JobConfiguration/FakeJobConfiguration.php b/app/Import/JobConfiguration/FakeJobConfiguration.php new file mode 100644 index 0000000000..81a96adfd7 --- /dev/null +++ b/app/Import/JobConfiguration/FakeJobConfiguration.php @@ -0,0 +1,159 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Import\JobConfiguration; + +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use Illuminate\Support\MessageBag; + +/** + * Class FakeJobConfiguration + */ +class FakeJobConfiguration implements JobConfigurationInterface +{ + /** @var ImportJob */ + private $importJob; + + /** @var ImportJobRepositoryInterface */ + private $repository; + + /** + * Returns true when the initial configuration for this job is complete. + * + * @return bool + */ + public function configurationComplete(): bool + { + // configuration array of job must have two values: + // 'artist' must be 'david bowie', case insensitive + // 'song' must be 'golden years', case insensitive. + // if stage is not "new", then album must be 'station to station' + $config = $this->importJob->configuration; + if ($this->importJob->stage === 'new') { + return (isset($config['artist']) && 'david bowie' === strtolower($config['artist'])) + && (isset($config['song']) && 'golden years' === strtolower($config['song'])) + && isset($config['apply-rules']); + } + + return isset($config['album']) && 'station to station' === strtolower($config['album']); + + + } + + /** + * Store any data from the $data array into the job. + * + * @param array $data + * + * @return MessageBag + */ + public function configureJob(array $data): MessageBag + { + $artist = strtolower($data['artist'] ?? ''); + $song = strtolower($data['song'] ?? ''); + $album = strtolower($data['album'] ?? ''); + $applyRules = isset($data['apply_rules']) ? (int)$data['apply_rules'] === 1 : null; + $configuration = $this->importJob->configuration; + if ($artist === 'david bowie') { + // store artist + $configuration['artist'] = $artist; + } + + if ($song === 'golden years') { + // store song + $configuration['song'] = $song; + } + + if ($album === 'station to station') { + // store album + $configuration['album'] = $album; + } + if (null !== $applyRules) { + $configuration['apply-rules'] = $applyRules; + } + + $this->repository->setConfiguration($this->importJob, $configuration); + $messages = new MessageBag(); + + if (\count($configuration) !== 3) { + + $messages->add('some_key', 'Ignore this error: ' . \count($configuration)); + } + + return $messages; + } + + /** + * Return the data required for the next step in the job configuration. + * @codeCoverageIgnore + * @return array + */ + public function getNextData(): array + { + return [ + 'rulesOptions' => [ + 1 => trans('firefly.yes'), + 0 => trans('firefly.no'), + ], + ]; + } + + /** + * Returns the view of the next step in the job configuration. + * + * @return string + */ + public function getNextView(): string + { + // first configure artist: + $config = $this->importJob->configuration; + $artist = $config['artist'] ?? ''; + $song = $config['song'] ?? ''; + $album = $config['album'] ?? ''; + $applyRules = $config['apply-rules'] ?? null; + if (null === $applyRules) { + return 'import.fake.apply-rules'; + } + if (strtolower($artist) !== 'david bowie') { + return 'import.fake.enter-artist'; + } + if (strtolower($song) !== 'golden years') { + return 'import.fake.enter-song'; + } + if (strtolower($album) !== 'station to station' && $this->importJob->stage !== 'new') { + return 'import.fake.enter-album'; + } + return 'impossible-view'; // @codeCoverageIgnore + } + + /** + * @param ImportJob $importJob + */ + public function setImportJob(ImportJob $importJob): void + { + $this->importJob = $importJob; + $this->repository = app(ImportJobRepositoryInterface::class); + $this->repository->setUser($importJob->user); + } +} diff --git a/app/Import/JobConfiguration/FileJobConfiguration.php b/app/Import/JobConfiguration/FileJobConfiguration.php new file mode 100644 index 0000000000..cfc1d18966 --- /dev/null +++ b/app/Import/JobConfiguration/FileJobConfiguration.php @@ -0,0 +1,157 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Import\JobConfiguration; + + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Support\Import\JobConfiguration\File\FileConfigurationInterface; +use FireflyIII\Support\Import\JobConfiguration\File\ConfigureMappingHandler; +use FireflyIII\Support\Import\JobConfiguration\File\ConfigureRolesHandler; +use FireflyIII\Support\Import\JobConfiguration\File\ConfigureUploadHandler; +use FireflyIII\Support\Import\JobConfiguration\File\NewFileJobHandler; +use Illuminate\Support\MessageBag; + +/** + * Class FileJobConfiguration + */ +class FileJobConfiguration implements JobConfigurationInterface +{ + /** @var ImportJob */ + private $importJob; + /** @var ImportJobRepositoryInterface */ + private $repository; + + /** + * Returns true when the initial configuration for this job is complete. + * + * @return bool + */ + public function configurationComplete(): bool + { + return $this->importJob->stage === 'ready_to_run'; + } + + /** + * Store any data from the $data array into the job. Anything in the message bag will be flashed + * as an error to the user, regardless of its content. + * + * @param array $data + * + * @return MessageBag + * @throws FireflyException + */ + public function configureJob(array $data): MessageBag + { + $configurator = $this->getConfigurationObject(); + $configurator->setImportJob($this->importJob); + + return $configurator->configureJob($data); + } + + /** + * Return the data required for the next step in the job configuration. + * + * @throws FireflyException + * @return array + */ + public function getNextData(): array + { + $configurator = $this->getConfigurationObject(); + $configurator->setImportJob($this->importJob); + + return $configurator->getNextData(); + } + + /** + * Returns the view of the next step in the job configuration. + * + * @throws FireflyException + * @return string + */ + public function getNextView(): string + { + switch ($this->importJob->stage) { + case 'new': + return 'import.file.new'; + case 'configure-upload': + return 'import.file.configure-upload'; + break; + case 'roles': + return 'import.file.roles'; + break; + case 'map': + return 'import.file.map'; + break; + default: + // @codeCoverageIgnoreStart + throw new FireflyException( + sprintf('FileJobConfiguration::getNextView() cannot handle stage "%s"', $this->importJob->stage) + ); + // @codeCoverageIgnoreEnd + } + } + + /** + * @param ImportJob $importJob + */ + public function setImportJob(ImportJob $importJob): void + { + $this->importJob = $importJob; + $this->repository = app(ImportJobRepositoryInterface::class); + $this->repository->setUser($importJob->user); + } + + /** + * Get the configuration handler for this specific stage. + * + * @return FileConfigurationInterface + * @throws FireflyException + */ + private function getConfigurationObject(): FileConfigurationInterface + { + $class = 'DoNotExist'; + switch ($this->importJob->stage) { + case 'new': // has nothing, no file upload or anything. + $class = NewFileJobHandler::class; + break; + case 'configure-upload': + $class = ConfigureUploadHandler::class; + break; + case 'roles': + $class = ConfigureRolesHandler::class; + break; + case 'map': + $class = ConfigureMappingHandler::class; + break; + } + if (!class_exists($class)) { + throw new FireflyException(sprintf('Class %s does not exist in getConfigurationClass().', $class)); // @codeCoverageIgnore + } + + return app($class); + } +} diff --git a/app/Import/JobConfiguration/JobConfigurationInterface.php b/app/Import/JobConfiguration/JobConfigurationInterface.php new file mode 100644 index 0000000000..0560240b17 --- /dev/null +++ b/app/Import/JobConfiguration/JobConfigurationInterface.php @@ -0,0 +1,68 @@ +. + */ +declare(strict_types=1); + +namespace FireflyIII\Import\JobConfiguration; + +use FireflyIII\Models\ImportJob; +use Illuminate\Support\MessageBag; + +/** + * Interface JobConfigurationInterface. + */ +interface JobConfigurationInterface +{ + /** + * Returns true when the initial configuration for this job is complete. + * + * @return bool + */ + public function configurationComplete(): bool; + + /** + * Store any data from the $data array into the job. Anything in the message bag will be flashed + * as an error to the user, regardless of its content. + * + * @param array $data + * + * @return MessageBag + */ + public function configureJob(array $data): MessageBag; + + /** + * Return the data required for the next step in the job configuration. + * + * @return array + */ + public function getNextData(): array; + + /** + * Returns the view of the next step in the job configuration. + * + * @return string + */ + public function getNextView(): string; + + /** + * @param ImportJob $importJob + */ + public function setImportJob(ImportJob $importJob): void; +} diff --git a/app/Import/JobConfiguration/SpectreJobConfiguration.php b/app/Import/JobConfiguration/SpectreJobConfiguration.php new file mode 100644 index 0000000000..1251ebf6f4 --- /dev/null +++ b/app/Import/JobConfiguration/SpectreJobConfiguration.php @@ -0,0 +1,152 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Import\JobConfiguration; + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Support\Import\JobConfiguration\Spectre\AuthenticatedConfigHandler; +use FireflyIII\Support\Import\JobConfiguration\Spectre\AuthenticatedHandler; +use FireflyIII\Support\Import\JobConfiguration\Spectre\AuthenticateHandler; +use FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseAccount; +use FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseAccountsHandler; +use FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseLoginHandler; +use FireflyIII\Support\Import\JobConfiguration\Spectre\DoAuthenticateHandler; +use FireflyIII\Support\Import\JobConfiguration\Spectre\NewConfig; +use FireflyIII\Support\Import\JobConfiguration\Spectre\NewSpectreJobHandler; +use FireflyIII\Support\Import\JobConfiguration\Spectre\SpectreJobConfigurationInterface; +use Illuminate\Support\MessageBag; +use Log; + +/** + * Class SpectreJobConfiguration + */ +class SpectreJobConfiguration implements JobConfigurationInterface +{ + /** @var SpectreJobConfigurationInterface */ + private $handler; + /** @var ImportJob */ + private $importJob; + /** @var ImportJobRepositoryInterface */ + private $repository; + + /** + * Returns true when the initial configuration for this job is complete. + * + * @return bool + */ + public function configurationComplete(): bool + { + return $this->handler->configurationComplete(); + } + + /** + * Store any data from the $data array into the job. Anything in the message bag will be flashed + * as an error to the user, regardless of its content. + * + * @param array $data + * + * @return MessageBag + */ + public function configureJob(array $data): MessageBag + { + return $this->handler->configureJob($data); + } + + /** + * Return the data required for the next step in the job configuration. + * + * @return array + */ + public function getNextData(): array + { + return $this->handler->getNextData(); + } + + /** + * Returns the view of the next step in the job configuration. + * + * @return string + */ + public function getNextView(): string + { + return $this->handler->getNextView(); + } + + /** + * @param ImportJob $importJob + * + * @throws FireflyException + */ + public function setImportJob(ImportJob $importJob): void + { + $this->importJob = $importJob; + $this->repository = app(ImportJobRepositoryInterface::class); + $this->repository->setUser($importJob->user); + $this->handler = $this->getHandler(); + } + + /** + * @return SpectreJobConfigurationInterface + * @throws FireflyException + */ + private function getHandler(): SpectreJobConfigurationInterface + { + Log::debug(sprintf('Now in SpectreJobConfiguration::getHandler() with stage "%s"', $this->importJob->stage)); + $handler = null; + switch ($this->importJob->stage) { + case 'new': + /** @var NewSpectreJobHandler $handler */ + $handler = app(NewSpectreJobHandler::class); + $handler->setImportJob($this->importJob); + break; + case 'do-authenticate': + /** @var DoAuthenticateHandler $handler */ + $handler = app(DoAuthenticateHandler::class); + $handler->setImportJob($this->importJob); + break; + case 'choose-login': + /** @var ChooseLoginHandler $handler */ + $handler = app(ChooseLoginHandler::class); + $handler->setImportJob($this->importJob); + break; + case 'authenticated': + /** @var AuthenticatedHandler $handler */ + $handler = app(AuthenticatedHandler::class); + $handler->setImportJob($this->importJob); + break; + case 'choose-accounts': + /** @var ChooseAccountsHandler $handler */ + $handler = app(ChooseAccountsHandler::class); + $handler->setImportJob($this->importJob); + break; + default: + // @codeCoverageIgnoreStart + throw new FireflyException(sprintf('Firefly III cannot create a configuration handler for stage "%s"', $this->importJob->stage)); + // @codeCoverageIgnoreEnd + } + + return $handler; + } +} \ No newline at end of file diff --git a/app/Import/Logging/CommandHandler.php b/app/Import/Logging/CommandHandler.php deleted file mode 100644 index c1dfc85773..0000000000 --- a/app/Import/Logging/CommandHandler.php +++ /dev/null @@ -1,71 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Import\Logging; - -use Illuminate\Console\Command; -use Monolog\Handler\AbstractProcessingHandler; - -/** - * @codeCoverageIgnore - * Class CommandHandler. - */ -class CommandHandler extends AbstractProcessingHandler -{ - /** @var Command */ - private $command; - - /** - * Handler constructor. - * - * @param Command $command - */ - public function __construct(Command $command) - { - parent::__construct(); - $this->command = $command; - - $this->changeLevel(env('APP_LOG_LEVEL', 'info')); - } - - /** - * Writes the record down to the log of the implementing handler. - * - * @param array $record - */ - protected function write(array $record) - { - $this->command->line(trim($record['formatted'])); - } - - /** - * @param string $level - */ - private function changeLevel(string $level) - { - $level = strtoupper($level); - $reference = sprintf('\Monolog\Logger::%s', $level); - if (\defined($reference)) { - $this->setLevel(\constant($reference)); - } - } -} diff --git a/app/Import/Mapper/Bills.php b/app/Import/Mapper/Bills.php index 6457affe4f..8caa0f76a3 100644 --- a/app/Import/Mapper/Bills.php +++ b/app/Import/Mapper/Bills.php @@ -43,7 +43,7 @@ class Bills implements MapperInterface /** @var Bill $bill */ foreach ($result as $bill) { $billId = (int)$bill->id; - $list[$billId] = $bill->name . ' [' . $bill->match . ']'; + $list[$billId] = $bill->name; } asort($list); $list = [0 => trans('import.map_do_not_map')] + $list; diff --git a/app/Import/Object/ImportAccount.php b/app/Import/Object/ImportAccount.php index fe2ffc8767..fdfef58293 100644 --- a/app/Import/Object/ImportAccount.php +++ b/app/Import/Object/ImportAccount.php @@ -30,6 +30,8 @@ use FireflyIII\User; use Log; /** + * @deprecated + * @codeCoverageIgnore * Class ImportAccount. */ class ImportAccount diff --git a/app/Import/Object/ImportBill.php b/app/Import/Object/ImportBill.php index 19364f9df6..5222334aa6 100644 --- a/app/Import/Object/ImportBill.php +++ b/app/Import/Object/ImportBill.php @@ -29,6 +29,8 @@ use Log; use Steam; /** + * @deprecated + * @codeCoverageIgnore * Class ImportBill. */ class ImportBill diff --git a/app/Import/Object/ImportBudget.php b/app/Import/Object/ImportBudget.php index 53e92a8f80..55f4e6e559 100644 --- a/app/Import/Object/ImportBudget.php +++ b/app/Import/Object/ImportBudget.php @@ -28,6 +28,8 @@ use FireflyIII\User; use Log; /** + * @deprecated + * @codeCoverageIgnore * Class ImportBudget. */ class ImportBudget diff --git a/app/Import/Object/ImportCategory.php b/app/Import/Object/ImportCategory.php index 9427d74871..bcdf0a9477 100644 --- a/app/Import/Object/ImportCategory.php +++ b/app/Import/Object/ImportCategory.php @@ -28,6 +28,8 @@ use FireflyIII\User; use Log; /** + * @deprecated + * @codeCoverageIgnore * Class ImportCategory */ class ImportCategory diff --git a/app/Import/Object/ImportCurrency.php b/app/Import/Object/ImportCurrency.php index 2d63bf9955..b570632064 100644 --- a/app/Import/Object/ImportCurrency.php +++ b/app/Import/Object/ImportCurrency.php @@ -28,6 +28,8 @@ use FireflyIII\User; use Log; /** + * @deprecated + * @codeCoverageIgnore * Class ImportCurrency */ class ImportCurrency diff --git a/app/Import/Object/ImportJournal.php b/app/Import/Object/ImportJournal.php index 9fe1d82349..c4e96db676 100644 --- a/app/Import/Object/ImportJournal.php +++ b/app/Import/Object/ImportJournal.php @@ -33,6 +33,8 @@ use Log; use Steam; /** + * @deprecated + * @codeCoverageIgnore * Class ImportJournal. */ class ImportJournal @@ -158,6 +160,14 @@ class ImportJournal return $this->description; } + /** + * @return string + */ + public function getExternalId(): string + { + return $this->externalId; + } + /** * @return string|null */ @@ -231,7 +241,6 @@ class ImportJournal return null; } - /** * @param string $hash */ diff --git a/app/Import/Prerequisites/BunqPrerequisites.php b/app/Import/Prerequisites/BunqPrerequisites.php index 286268b919..ea39453f3a 100644 --- a/app/Import/Prerequisites/BunqPrerequisites.php +++ b/app/Import/Prerequisites/BunqPrerequisites.php @@ -22,12 +22,14 @@ declare(strict_types=1); namespace FireflyIII\Import\Prerequisites; +use bunq\Exception\BunqException; +use bunq\Util\BunqEnumApiEnvironmentType; +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Services\Bunq\ApiContext; use FireflyIII\Services\IP\IPRetrievalInterface; use FireflyIII\User; -use Illuminate\Http\Request; use Illuminate\Support\MessageBag; use Log; -use Preferences; /** * This class contains all the routines necessary to connect to Bunq. @@ -38,14 +40,13 @@ class BunqPrerequisites implements PrerequisitesInterface private $user; /** - * Returns view name that allows user to fill in prerequisites. Currently asks for the API key. + * @codeCoverageIgnore + * Returns view name that allows user to fill in prerequisites. * * @return string */ public function getView(): string { - Log::debug('Now in BunqPrerequisites::getView()'); - return 'import.bunq.prerequisites'; } @@ -57,105 +58,155 @@ class BunqPrerequisites implements PrerequisitesInterface public function getViewParameters(): array { Log::debug('Now in BunqPrerequisites::getViewParameters()'); - $key = ''; - $serverIP = ''; + $key = ''; + $externalIP = ''; if ($this->hasApiKey()) { - $key = Preferences::getForUser($this->user, 'bunq_api_key', null)->data; + $key = app('preferences')->getForUser($this->user, 'bunq_api_key', null)->data; } - if ($this->hasServerIP()) { - $serverIP = Preferences::getForUser($this->user, 'external_ip', null)->data; + if ($this->hasExternalIP()) { + $externalIP = app('preferences')->getForUser($this->user, 'bunq_external_ip', null)->data; } - if (!$this->hasServerIP()) { + if (!$this->hasExternalIP()) { /** @var IPRetrievalInterface $service */ - $service = app(IPRetrievalInterface::class); - $serverIP = (string)$service->getIP(); + $service = app(IPRetrievalInterface::class); + $externalIP = (string)$service->getIP(); } - - // get IP address - return ['key' => $key, 'ip' => $serverIP]; + return ['api_key' => $key, 'external_ip' => $externalIP]; } /** - * Returns if this import method has any special prerequisites such as config - * variables or other things. The only thing we verify is the presence of the API key. Everything else - * tumbles into place: no installation token? Will be requested. No device server? Will be created. Etc. + * Indicate if all prerequisites have been met. * * @return bool */ - public function hasPrerequisites(): bool + public function isComplete(): bool { - $hasApiKey = $this->hasApiKey(); - $hasServerIP = $this->hasServerIP(); - - return !$hasApiKey || !$hasServerIP; + return $this->hasApiKey() && $this->hasExternalIP() && $this->hasApiContext(); } /** + * @codeCoverageIgnore * Set the user for this Prerequisites-routine. Class is expected to implement and save this. * * @param User $user */ public function setUser(User $user): void { - Log::debug(sprintf('Now in setUser(#%d)', $user->id)); $this->user = $user; } /** - * This method responds to the user's submission of an API key. It tries to register this instance as a new Firefly III device. - * If this fails, the error is returned in a message bag and the user is notified (this is fairly friendly). + * This method responds to the user's submission of an API key. Should do nothing but store the value. * - * @param Request $request + * Errors must be returned in the message bag under the field name they are requested by. + * + * @param array $data * * @return MessageBag */ - public function storePrerequisites(Request $request): MessageBag + public function storePrerequisites(array $data): MessageBag { - $apiKey = $request->get('api_key'); - $serverIP = $request->get('external_ip'); + $apiKey = $data['api_key'] ?? ''; + $externalIP = $data['external_ip'] ?? ''; Log::debug('Storing bunq API key'); - Preferences::setForUser($this->user, 'bunq_api_key', $apiKey); - Preferences::setForUser($this->user, 'external_ip', $serverIP); + app('preferences')->setForUser($this->user, 'bunq_api_key', $apiKey); + app('preferences')->setForUser($this->user, 'bunq_external_ip', $externalIP); + + $environment = $this->getBunqEnvironment(); + $deviceDescription = 'Firefly III v' . config('firefly.version'); + $permittedIps = [$externalIP]; + + try { + /** @var ApiContext $object */ + $object = app(ApiContext::class); + $apiContext = $object->create($environment, $apiKey, $deviceDescription, $permittedIps); + } catch (FireflyException $e) { + $messages = new MessageBag(); + $messages->add('bunq_error', $e->getMessage()); + + return $messages; + } + // store context in JSON: + try { + $json = $apiContext->toJson(); + // @codeCoverageIgnoreStart + } catch (BunqException $e) { + $messages = new MessageBag(); + $messages->add('bunq_error', $e->getMessage()); + + return $messages; + } + // @codeCoverageIgnoreEnd + + // and store for user: + app('preferences')->setForUser($this->user, 'bunq_api_context', $json); return new MessageBag; } + /** + * @codeCoverageIgnore + * @return BunqEnumApiEnvironmentType + */ + private function getBunqEnvironment(): BunqEnumApiEnvironmentType + { + $env = env('BUNQ_USE_SANDBOX'); + if (null === $env) { + return BunqEnumApiEnvironmentType::PRODUCTION(); + } + if (false === $env) { + return BunqEnumApiEnvironmentType::PRODUCTION(); + } + + return BunqEnumApiEnvironmentType::SANDBOX(); + } + + /** + * @return bool + */ + private function hasApiContext(): bool + { + $apiContext = app('preferences')->getForUser($this->user, 'bunq_api_context', null); + if (null === $apiContext) { + return false; + } + if ('' === (string)$apiContext->data) { + return false; + } + + return true; + } + /** * @return bool */ private function hasApiKey(): bool { - $apiKey = Preferences::getForUser($this->user, 'bunq_api_key', false); + $apiKey = app('preferences')->getForUser($this->user, 'bunq_api_key', null); if (null === $apiKey) { return false; } - if (null === $apiKey->data) { + if ('' === (string)$apiKey->data) { return false; } - if (\strlen((string)$apiKey->data) === 64) { - return true; - } - return false; + return true; } /** * @return bool */ - private function hasServerIP(): bool + private function hasExternalIP(): bool { - $serverIP = Preferences::getForUser($this->user, 'external_ip', false); - if (null === $serverIP) { + $externalIP = app('preferences')->getForUser($this->user, 'bunq_external_ip', null); + if (null === $externalIP) { return false; } - if (null === $serverIP->data) { + if ('' === (string)$externalIP->data) { return false; } - if (\strlen((string)$serverIP->data) > 6) { - return true; - } - return false; + return true; } } diff --git a/app/Import/Prerequisites/FakePrerequisites.php b/app/Import/Prerequisites/FakePrerequisites.php new file mode 100644 index 0000000000..ac8c07affb --- /dev/null +++ b/app/Import/Prerequisites/FakePrerequisites.php @@ -0,0 +1,128 @@ +. + */ +declare(strict_types=1); + +namespace FireflyIII\Import\Prerequisites; + +use FireflyIII\User; +use Illuminate\Http\Request; +use Illuminate\Support\MessageBag; + +/** + * This class contains all the routines necessary for the fake import provider. + * + * Class FakePrerequisites + */ +class FakePrerequisites implements PrerequisitesInterface +{ + /** @var User */ + private $user; + + /** + * Returns view name that allows user to fill in prerequisites. Currently asks for the API key. + * + * @codeCoverageIgnore + * @return string + */ + public function getView(): string + { + return 'import.fake.prerequisites'; + } + + /** + * Returns any values required for the prerequisites-view. + * + * @return array + */ + public function getViewParameters(): array + { + $apiKey = ''; + if ($this->hasApiKey()) { + $apiKey = app('preferences')->getForUser($this->user, 'fake_api_key', null)->data; + } + $oldKey = (string)\request()->old('api_key'); + if ($oldKey !== '') { + $apiKey = \request()->old('api_key'); // @codeCoverageIgnore + } + + return ['api_key' => $apiKey]; + } + + /** + * Indicate if all prerequisites have been met. + * + * @return bool + */ + public function isComplete(): bool + { + return $this->hasApiKey(); + } + + /** + * Set the user for this Prerequisites-routine. Class is expected to implement and save this. + * + * @param User $user + */ + public function setUser(User $user): void + { + $this->user = $user; + + } + + /** + * @param array $data + * + * @return MessageBag + */ + public function storePrerequisites(array $data): MessageBag + { + $apiKey = $data['api_key'] ?? ''; + $messageBag = new MessageBag(); + if (32 !== \strlen($apiKey)) { + $messageBag->add('api_key', 'API key must be 32 chars.'); + + return $messageBag; + } + + app('preferences')->setForUser($this->user, 'fake_api_key', $apiKey); + + return $messageBag; + } + + /** + * @return bool + */ + private function hasApiKey(): bool + { + $apiKey = app('preferences')->getForUser($this->user, 'fake_api_key', false); + if (null === $apiKey) { + return false; + } + if (null === $apiKey->data) { + return false; + } + if (\strlen((string)$apiKey->data) === 32) { + return true; + } + + return false; + } +} diff --git a/app/Import/Prerequisites/FilePrerequisites.php b/app/Import/Prerequisites/FilePrerequisites.php index e2177af913..c9200489e3 100644 --- a/app/Import/Prerequisites/FilePrerequisites.php +++ b/app/Import/Prerequisites/FilePrerequisites.php @@ -22,21 +22,18 @@ declare(strict_types=1); namespace FireflyIII\Import\Prerequisites; -use FireflyIII\Exceptions\FireflyException; use FireflyIII\User; -use Illuminate\Http\Request; use Illuminate\Support\MessageBag; /** + * @codeCoverageIgnore + * * This class contains all the routines necessary to import from a file. Hint: there are none. */ class FilePrerequisites implements PrerequisitesInterface { - /** @var User */ - private $user; - /** - * Returns view name that allows user to fill in prerequisites. Currently asks for the API key. + * Returns view name that allows user to fill in prerequisites. * * @return string */ @@ -56,23 +53,13 @@ class FilePrerequisites implements PrerequisitesInterface } /** - * Returns if this import method has any special prerequisites such as config - * variables or other things. The only thing we verify is the presence of the API key. Everything else - * tumbles into place: no installation token? Will be requested. No device server? Will be created. Etc. - * - * True if prerequisites. False if not. + * Indicate if all prerequisites have been met. * * @return bool - * - * @throws FireflyException */ - public function hasPrerequisites(): bool + public function isComplete(): bool { - if ($this->user->hasRole('demo')) { - throw new FireflyException('Apologies, the demo user cannot import files.'); - } - - return false; + return true; } /** @@ -82,19 +69,19 @@ class FilePrerequisites implements PrerequisitesInterface */ public function setUser(User $user): void { - $this->user = $user; } /** - * This method responds to the user's submission of an API key. It tries to register this instance as a new Firefly III device. - * If this fails, the error is returned in a message bag and the user is notified (this is fairly friendly). + * This method responds to the user's submission of an API key. Should do nothing but store the value. * - * @param Request $request + * Errors must be returned in the message bag under the field name they are requested by. + * + * @param array $data * * @return MessageBag */ - public function storePrerequisites(Request $request): MessageBag + public function storePrerequisites(array $data): MessageBag { return new MessageBag; } diff --git a/app/Import/Prerequisites/PrerequisitesInterface.php b/app/Import/Prerequisites/PrerequisitesInterface.php index 699ea43b31..588821eeca 100644 --- a/app/Import/Prerequisites/PrerequisitesInterface.php +++ b/app/Import/Prerequisites/PrerequisitesInterface.php @@ -46,12 +46,11 @@ interface PrerequisitesInterface public function getViewParameters(): array; /** - * Returns if this import method has any special prerequisites such as config - * variables or other things. + * Indicate if all prerequisites have been met. * * @return bool */ - public function hasPrerequisites(): bool; + public function isComplete(): bool; /** * Set the user for this Prerequisites-routine. Class is expected to implement and save this. @@ -61,9 +60,13 @@ interface PrerequisitesInterface public function setUser(User $user): void; /** - * @param Request $request + * This method responds to the user's submission of an API key. Should do nothing but store the value. + * + * Errors must be returned in the message bag under the field name they are requested by. + * + * @param array $data * * @return MessageBag */ - public function storePrerequisites(Request $request): MessageBag; + public function storePrerequisites(array $data): MessageBag; } diff --git a/app/Import/Prerequisites/SpectrePrerequisites.php b/app/Import/Prerequisites/SpectrePrerequisites.php index a780c3ddd1..239e3f274b 100644 --- a/app/Import/Prerequisites/SpectrePrerequisites.php +++ b/app/Import/Prerequisites/SpectrePrerequisites.php @@ -24,10 +24,8 @@ namespace FireflyIII\Import\Prerequisites; use FireflyIII\Models\Preference; use FireflyIII\User; -use Illuminate\Http\Request; use Illuminate\Support\MessageBag; use Log; -use Preferences; /** * This class contains all the routines necessary to connect to Spectre. @@ -38,7 +36,7 @@ class SpectrePrerequisites implements PrerequisitesInterface private $user; /** - * Returns view name that allows user to fill in prerequisites. Currently asks for the API key. + * Returns view name that allows user to fill in prerequisites. * * @return string */ @@ -54,37 +52,29 @@ class SpectrePrerequisites implements PrerequisitesInterface */ public function getViewParameters(): array { - $publicKey = $this->getPublicKey(); - $subTitle = (string)trans('import.spectre_title'); - $subTitleIcon = 'fa-archive'; + /** @var Preference $appIdPreference */ + $appIdPreference = app('preferences')->getForUser($this->user, 'spectre_app_id', null); + $appId = null === $appIdPreference ? '' : $appIdPreference->data; + /** @var Preference $secretPreference */ + $secretPreference = app('preferences')->getForUser($this->user, 'spectre_secret', null); + $secret = null === $secretPreference ? '' : $secretPreference->data; + $publicKey = $this->getPublicKey(); - return compact('publicKey', 'subTitle', 'subTitleIcon'); + return [ + 'app_id' => $appId, + 'secret' => $secret, + 'public_key' => $publicKey, + ]; } /** - * Returns if this import method has any special prerequisites such as config - * variables or other things. The only thing we verify is the presence of the API key. Everything else - * tumbles into place: no installation token? Will be requested. No device server? Will be created. Etc. + * Indicate if all prerequisites have been met. * * @return bool */ - public function hasPrerequisites(): bool + public function isComplete(): bool { - $values = [ - Preferences::getForUser($this->user, 'spectre_app_id', false), - Preferences::getForUser($this->user, 'spectre_secret', false), - ]; - /** @var Preference $value */ - foreach ($values as $value) { - if (false === $value->data || null === $value->data) { - Log::info(sprintf('Config var "%s" is missing.', $value->name)); - - return true; - } - } - Log::debug('All prerequisites are here!'); - - return false; + return $this->hasAppId() && $this->hasSecret(); } /** @@ -95,22 +85,22 @@ class SpectrePrerequisites implements PrerequisitesInterface public function setUser(User $user): void { $this->user = $user; - } /** - * This method responds to the user's submission of an API key. It tries to register this instance as a new Firefly III device. - * If this fails, the error is returned in a message bag and the user is notified (this is fairly friendly). + * This method responds to the user's submission of an API key. Should do nothing but store the value. * - * @param Request $request + * Errors must be returned in the message bag under the field name they are requested by. + * + * @param array $data * * @return MessageBag */ - public function storePrerequisites(Request $request): MessageBag + public function storePrerequisites(array $data): MessageBag { Log::debug('Storing Spectre API keys..'); - Preferences::setForUser($this->user, 'spectre_app_id', $request->get('app_id')); - Preferences::setForUser($this->user, 'spectre_secret', $request->get('secret')); + app('preferences')->setForUser($this->user, 'spectre_app_id', $data['app_id'] ?? null); + app('preferences')->setForUser($this->user, 'spectre_secret', $data['secret'] ?? null); Log::debug('Done!'); return new MessageBag; @@ -139,8 +129,8 @@ class SpectrePrerequisites implements PrerequisitesInterface // Extract the public key from $res to $pubKey $pubKey = openssl_pkey_get_details($res); - Preferences::setForUser($this->user, 'spectre_private_key', $privKey); - Preferences::setForUser($this->user, 'spectre_public_key', $pubKey['key']); + app('preferences')->setForUser($this->user, 'spectre_private_key', $privKey); + app('preferences')->setForUser($this->user, 'spectre_public_key', $pubKey['key']); Log::debug('Created key pair'); } @@ -153,15 +143,47 @@ class SpectrePrerequisites implements PrerequisitesInterface private function getPublicKey(): string { Log::debug('get public key'); - $preference = Preferences::getForUser($this->user, 'spectre_public_key', null); + $preference = app('preferences')->getForUser($this->user, 'spectre_public_key', null); if (null === $preference) { Log::debug('public key is null'); // create key pair $this->createKeyPair(); } - $preference = Preferences::getForUser($this->user, 'spectre_public_key', null); + $preference = app('preferences')->getForUser($this->user, 'spectre_public_key', null); Log::debug('Return public key for user'); return $preference->data; } + + /** + * @return bool + */ + private function hasAppId(): bool + { + $appId = app('preferences')->getForUser($this->user, 'spectre_app_id', null); + if (null === $appId) { + return false; + } + if ('' === (string)$appId->data) { + return false; + } + + return true; + } + + /** + * @return bool + */ + private function hasSecret(): bool + { + $secret = app('preferences')->getForUser($this->user, 'spectre_secret', null); + if (null === $secret) { + return false; + } + if ('' === (string)$secret->data) { + return false; + } + + return true; + } } diff --git a/app/Import/Routine/BunqRoutine.php b/app/Import/Routine/BunqRoutine.php index 98156f9d7e..0f29d089f8 100644 --- a/app/Import/Routine/BunqRoutine.php +++ b/app/Import/Routine/BunqRoutine.php @@ -23,892 +23,83 @@ declare(strict_types=1); namespace FireflyIII\Import\Routine; -use Carbon\Carbon; -use DB; use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Factory\AccountFactory; -use FireflyIII\Factory\TransactionJournalFactory; -use FireflyIII\Models\Account; -use FireflyIII\Models\AccountType; use FireflyIII\Models\ImportJob; -use FireflyIII\Models\TransactionJournalMeta; -use FireflyIII\Models\TransactionType; -use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; -use FireflyIII\Repositories\Tag\TagRepositoryInterface; -use FireflyIII\Services\Bunq\Id\DeviceServerId; -use FireflyIII\Services\Bunq\Object\DeviceServer; -use FireflyIII\Services\Bunq\Object\LabelMonetaryAccount; -use FireflyIII\Services\Bunq\Object\MonetaryAccountBank; -use FireflyIII\Services\Bunq\Object\Payment; -use FireflyIII\Services\Bunq\Object\ServerPublicKey; -use FireflyIII\Services\Bunq\Object\UserCompany; -use FireflyIII\Services\Bunq\Object\UserPerson; -use FireflyIII\Services\Bunq\Request\DeviceServerRequest; -use FireflyIII\Services\Bunq\Request\DeviceSessionRequest; -use FireflyIII\Services\Bunq\Request\InstallationTokenRequest; -use FireflyIII\Services\Bunq\Request\ListDeviceServerRequest; -use FireflyIII\Services\Bunq\Request\ListMonetaryAccountRequest; -use FireflyIII\Services\Bunq\Request\ListPaymentRequest; -use FireflyIII\Services\Bunq\Token\InstallationToken; -use FireflyIII\Services\Bunq\Token\SessionToken; -use FireflyIII\Services\IP\IPRetrievalInterface; -use Illuminate\Support\Collection; +use FireflyIII\Support\Import\Routine\Bunq\StageImportDataHandler; +use FireflyIII\Support\Import\Routine\Bunq\StageNewHandler; use Log; -use Preferences; /** * Class BunqRoutine - * - * Steps before import: - * 1) register device complete. - * - * Stage: 'initial'. - * - * 1) Get an installation token (if not present) - * 2) Register device (if not found) - * - * Stage 'registered' - * - * 1) Get a session token. (new session) - * 2) store user person / user company - * - * Stage 'logged-in' - * - * Get list of bank accounts - * - * Stage 'have-accounts' - * - * Map accounts to existing accounts - * - * Stage 'do-import'? */ class BunqRoutine implements RoutineInterface { - /** @var Collection */ - public $errors; - /** @var Collection */ - public $journals; - /** @var int */ - public $lines = 0; - /** @var AccountFactory */ - private $accountFactory; - /** @var AccountRepositoryInterface */ - private $accountRepository; /** @var ImportJob */ - private $job; - /** @var TransactionJournalFactory */ - private $journalFactory; + private $importJob; + /** @var ImportJobRepositoryInterface */ private $repository; /** - * ImportRoutine constructor. - */ - public function __construct() - { - $this->journals = new Collection; - $this->errors = new Collection; - } - - /** - * @return Collection - */ - public function getErrors(): Collection - { - return $this->errors; - } - - /** - * @return Collection - */ - public function getJournals(): Collection - { - return $this->journals; - } - - /** - * @return int - */ - public function getLines(): int - { - return $this->lines; - } - - /** - * @return bool + * At the end of each run(), the import routine must set the job to the expected status. + * + * The final status of the routine must be "provider_finished". * * @throws FireflyException */ - public function run(): bool + public function run(): void { - Log::info(sprintf('Start with import job %s using Bunq.', $this->job->key)); - set_time_limit(0); - // this method continues with the job and is called by whenever a stage is - // finished - $this->continueJob(); + Log::debug(sprintf('Now in SpectreRoutine::run() with status "%s" and stage "%s".', $this->importJob->status, $this->importJob->stage)); + $valid = ['ready_to_run']; // should be only ready_to_run + if (\in_array($this->importJob->status, $valid, true)) { + switch ($this->importJob->stage) { + default: + throw new FireflyException(sprintf('SpectreRoutine cannot handle stage "%s".', $this->importJob->stage)); // @codeCoverageIgnore + case 'new': + // list all of the users accounts. + $this->repository->setStatus($this->importJob, 'running'); + /** @var StageNewHandler $handler */ + $handler = app(StageNewHandler::class); + $handler->setImportJob($this->importJob); + $handler->run(); - return true; - } + // make user choose accounts to import from. + $this->repository->setStage($this->importJob, 'choose-accounts'); + $this->repository->setStatus($this->importJob, 'need_job_config'); - /** - * @param ImportJob $job - */ - public function setJob(ImportJob $job) - { - $this->job = $job; - $this->repository = app(ImportJobRepositoryInterface::class); - $this->accountRepository = app(AccountRepositoryInterface::class); - $this->accountFactory = app(AccountFactory::class); - $this->journalFactory = app(TransactionJournalFactory::class); - $this->repository->setUser($job->user); - $this->accountRepository->setUser($job->user); - $this->accountFactory->setUser($job->user); - $this->journalFactory->setUser($job->user); - } + return; + case 'go-for-import': + // list all of the users accounts. + $this->repository->setStatus($this->importJob, 'running'); - /** - * @throws FireflyException - */ - protected function continueJob() - { - // if in "configuring" - if ('configuring' === $this->getStatus()) { - Log::debug('Job is in configuring stage, will do nothing.'); + /** @var StageImportDataHandler $handler */ + $handler = app(StageImportDataHandler::class); + $handler->setImportJob($this->importJob); + $handler->run(); + $transactions = $handler->getTransactions(); - return; - } - $stage = $this->getConfig()['stage'] ?? 'unknown'; - Log::debug(sprintf('Now in continueJob() for stage %s', $stage)); - switch ($stage) { - case 'initial': - // register device and get tokens. - $this->runStageInitial(); - $this->continueJob(); - break; - case 'registered': - // get all bank accounts of user. - $this->runStageRegistered(); - $this->continueJob(); - break; - case 'logged-in': - $this->runStageLoggedIn(); - break; - case 'have-accounts': - // do nothing in this stage. Job should revert to config routine. - break; - case 'have-account-mapping': - $this->setStatus('running'); - $this->runStageHaveAccountMapping(); + $this->repository->setTransactions($this->importJob, $transactions); + $this->repository->setStatus($this->importJob, 'provider_finished'); + $this->repository->setStage($this->importJob, 'final'); - break; - default: - throw new FireflyException(sprintf('No action for stage %s!', $stage)); - break; - } - } - - /** - * @throws FireflyException - */ - protected function runStageInitial(): void - { - $this->addStep(); - Log::debug('In runStageInitial()'); - $this->setStatus('running'); - - // register the device at Bunq: - $serverId = $this->registerDevice(); - Log::debug(sprintf('Found device server with id %d', $serverId->getId())); - - $config = $this->getConfig(); - $config['stage'] = 'registered'; - $this->setConfig($config); - $this->addStep(); - } - - /** - * Get a session token + userperson + usercompany. Store it in the job. - * - * @throws FireflyException - */ - protected function runStageRegistered(): void - { - $this->addStep(); - Log::debug('Now in runStageRegistered()'); - $apiKey = (string)Preferences::getForUser($this->job->user, 'bunq_api_key')->data; - $serverPublicKey = new ServerPublicKey(Preferences::getForUser($this->job->user, 'bunq_server_public_key', [])->data); - $installationToken = $this->getInstallationToken(); - $request = new DeviceSessionRequest; - $request->setInstallationToken($installationToken); - $request->setPrivateKey($this->getPrivateKey()); - $request->setServerPublicKey($serverPublicKey); - $request->setSecret($apiKey); - $request->call(); - $this->addStep(); - - Log::debug('Requested new session.'); - - $deviceSession = $request->getDeviceSessionId(); - $userPerson = $request->getUserPerson(); - $userCompany = $request->getUserCompany(); - $sessionToken = $request->getSessionToken(); - - $config = $this->getConfig(); - $config['device_session_id'] = $deviceSession->toArray(); - $config['user_person'] = $userPerson->toArray(); - $config['user_company'] = $userCompany->toArray(); - $config['session_token'] = $sessionToken->toArray(); - $config['stage'] = 'logged-in'; - $this->setConfig($config); - $this->addStep(); - - Log::debug('Session stored in job.'); - } - - /** - * Shorthand method. - */ - private function addStep(): void - { - $this->addSteps(1); - } - - /** - * Shorthand method. - * - * @param int $count - */ - private function addSteps(int $count): void - { - $this->repository->addStepsDone($this->job, $count); - } - - /** - * Shorthand method - * - * @param int $steps - */ - private function addTotalSteps(int $steps): void - { - $this->repository->addTotalSteps($this->job, $steps); - } - - /** - * @param int $paymentId - * - * @return bool - */ - private function alreadyImported(int $paymentId): bool - { - $count = TransactionJournalMeta::where('name', 'bunq_payment_id') - ->where('data', json_encode($paymentId))->count(); - - Log::debug(sprintf('Transaction #%d is %d time(s) in the database.', $paymentId, $count)); - - return $count > 0; - } - - /** - * @param LabelMonetaryAccount $party - * @param string $expectedType - * - * @return Account - */ - private function convertToAccount(LabelMonetaryAccount $party, string $expectedType): Account - { - Log::debug('in convertToAccount()'); - - if ($party->getIban() !== null) { - // find opposing party by IBAN first. - $result = $this->accountRepository->findByIbanNull($party->getIban(), [$expectedType]); - if (null !== $result) { - Log::debug(sprintf('Search for %s resulted in account %s (#%d)', $party->getIban(), $result->name, $result->id)); - - return $result; - } - - // try to find asset account just in case: - if ($expectedType !== AccountType::ASSET) { - $result = $this->accountRepository->findByIbanNull($party->getIban(), [AccountType::ASSET]); - if (null !== $result) { - Log::debug(sprintf('Search for Asset "%s" resulted in account %s (#%d)', $party->getIban(), $result->name, $result->id)); - - return $result; - } + return; } } - - // create new account: - $data = [ - 'user_id' => $this->job->user_id, - 'iban' => $party->getIban(), - 'name' => $party->getLabelUser()->getDisplayName(), - 'account_type_id' => null, - 'accountType' => $expectedType, - 'virtualBalance' => null, - 'active' => true, - - ]; - $account = $this->accountFactory->create($data); - Log::debug( - sprintf( - 'Converted label monetary account %s to %s account %s (#%d)', - $party->getLabelUser()->getDisplayName(), - $expectedType, - $account->name, $account->id - ) - ); - - return $account; + throw new FireflyException(sprintf('bunq import routine cannot handle status "%s"', $this->importJob->status)); // @codeCoverageIgnore } + /** - * This method creates a new public/private keypair for the user. This isn't really secure, since the key is generated on the fly with - * no regards for HSM's, smart cards or other things. It would require some low level programming to get this right. But the private key - * is stored encrypted in the database so it's something. + * @param ImportJob $importJob + * + * @return void */ - private function createKeyPair(): void + public function setImportJob(ImportJob $importJob): void { - Log::debug('Now in createKeyPair()'); - $private = Preferences::getForUser($this->job->user, 'bunq_private_key', null); - $public = Preferences::getForUser($this->job->user, 'bunq_public_key', null); - - if (!(null === $private && null === $public)) { - Log::info('Already have public and private key, return NULL.'); - - return; - } - - Log::debug('Generate new key pair for user.'); - $keyConfig = [ - 'digest_alg' => 'sha512', - 'private_key_bits' => 2048, - 'private_key_type' => OPENSSL_KEYTYPE_RSA, - ]; - // Create the private and public key - $res = openssl_pkey_new($keyConfig); - - // Extract the private key from $res to $privKey - $privKey = ''; - openssl_pkey_export($res, $privKey); - - // Extract the public key from $res to $pubKey - $pubKey = openssl_pkey_get_details($res); - - Preferences::setForUser($this->job->user, 'bunq_private_key', $privKey); - Preferences::setForUser($this->job->user, 'bunq_public_key', $pubKey['key']); - Log::debug('Created and stored key pair'); + $this->importJob = $importJob; + $this->repository = app(ImportJobRepositoryInterface::class); + $this->repository->setUser($importJob->user); } - /** - * Shorthand method. - * - * @return array - */ - private function getConfig(): array - { - return $this->repository->getConfiguration($this->job); - } - - /** - * Try to detect the current device ID (in case this instance has been registered already. - * - * @return DeviceServerId - * - * @throws FireflyException - */ - private function getExistingDevice(): ?DeviceServerId - { - Log::debug('Now in getExistingDevice()'); - $installationToken = $this->getInstallationToken(); - $serverPublicKey = $this->getServerPublicKey(); - $request = new ListDeviceServerRequest; - $remoteIp = $this->getRemoteIp(); - $request->setInstallationToken($installationToken); - $request->setServerPublicKey($serverPublicKey); - $request->setPrivateKey($this->getPrivateKey()); - $request->call(); - $devices = $request->getDevices(); - /** @var DeviceServer $device */ - foreach ($devices as $device) { - if ($device->getIp() === $remoteIp) { - Log::debug(sprintf('This instance is registered as device #%s', $device->getId()->getId())); - - return $device->getId(); - } - } - Log::info('This instance is not yet registered.'); - - return null; - } - - /** - * Shorthand method. - * - * @return array - */ - private function getExtendedStatus(): array - { - return $this->repository->getExtendedStatus($this->job); - } - - /** - * Get the installation token, either from the users preferences or from Bunq. - * - * @return InstallationToken - * - * @throws FireflyException - */ - private function getInstallationToken(): InstallationToken - { - Log::debug('Now in getInstallationToken().'); - $token = Preferences::getForUser($this->job->user, 'bunq_installation_token', null); - if (null !== $token) { - Log::debug('Have installation token, return it.'); - - return new InstallationToken($token->data); - } - Log::debug('Have no installation token, request one.'); - - // verify bunq api code: - $publicKey = $this->getPublicKey(); - $request = new InstallationTokenRequest; - $request->setPublicKey($publicKey); - $request->call(); - Log::debug('Sent request for installation token.'); - - $installationToken = $request->getInstallationToken(); - $installationId = $request->getInstallationId(); - $serverPublicKey = $request->getServerPublicKey(); - - Log::debug('Have all values from InstallationTokenRequest'); - - - Preferences::setForUser($this->job->user, 'bunq_installation_token', $installationToken->toArray()); - Preferences::setForUser($this->job->user, 'bunq_installation_id', $installationId->toArray()); - Preferences::setForUser($this->job->user, 'bunq_server_public_key', $serverPublicKey->toArray()); - - Log::debug('Stored token, ID and pub key.'); - - return $installationToken; - } - - /** - * Get the private key from the users preferences. - * - * @return string - */ - private function getPrivateKey(): string - { - Log::debug('In getPrivateKey()'); - $preference = Preferences::getForUser($this->job->user, 'bunq_private_key', null); - if (null === $preference) { - Log::debug('private key is null'); - // create key pair - $this->createKeyPair(); - } - $preference = Preferences::getForUser($this->job->user, 'bunq_private_key', null); - Log::debug('Return private key for user'); - - return (string)$preference->data; - } - - /** - * Get a public key from the users preferences. - * - * @return string - */ - private function getPublicKey(): string - { - Log::debug('Now in getPublicKey()'); - $preference = Preferences::getForUser($this->job->user, 'bunq_public_key', null); - if (null === $preference) { - Log::debug('public key is NULL.'); - // create key pair - $this->createKeyPair(); - } - $preference = Preferences::getForUser($this->job->user, 'bunq_public_key', null); - Log::debug('Return public key for user'); - - return (string)$preference->data; - } - - /** - * Request users server remote IP. Let's assume this value will not change any time soon. - * - * @return string - * - */ - private function getRemoteIp(): ?string - { - - $preference = Preferences::getForUser($this->job->user, 'external_ip', null); - if (null === $preference) { - - /** @var IPRetrievalInterface $service */ - $service = app(IPRetrievalInterface::class); - $serverIp = $service->getIP(); - if (null !== $serverIp) { - Preferences::setForUser($this->job->user, 'external_ip', $serverIp); - } - - return $serverIp; - } - - return $preference->data; - } - - /** - * Get the public key of the server, necessary to verify server signature. - * - * @return ServerPublicKey - * - * @throws FireflyException - */ - private function getServerPublicKey(): ServerPublicKey - { - $pref = Preferences::getForUser($this->job->user, 'bunq_server_public_key', null)->data; - if (null === $pref) { - throw new FireflyException('Cannot determine bunq server public key, but should have it at this point.'); - } - - return new ServerPublicKey($pref); - } - - /** - * Shorthand method. - * - * @return string - */ - private function getStatus(): string - { - return $this->repository->getStatus($this->job); - } - - /** - * Import the transactions that were found. - * - * @param array $payments - * - * @throws FireflyException - */ - private function importPayments(array $payments): void - { - Log::debug('Going to run importPayments()'); - $journals = new Collection; - $config = $this->getConfig(); - foreach ($payments as $accountId => $data) { - Log::debug(sprintf('Now running for bunq account #%d with %d payment(s).', $accountId, \count($data['payments']))); - /** @var Payment $payment */ - foreach ($data['payments'] as $index => $payment) { - Log::debug(sprintf('Now at payment #%d with ID #%d', $index, $payment->getId())); - // store or find counter party: - $counterParty = $payment->getCounterParty(); - $amount = $payment->getAmount(); - $paymentId = $payment->getId(); - if ($this->alreadyImported($paymentId)) { - Log::error(sprintf('Already imported bunq payment with id #%d', $paymentId)); - - // add three steps to keep up - $this->addSteps(3); - continue; - } - Log::debug(sprintf('Amount is %s %s', $amount->getCurrency(), $amount->getValue())); - $expected = AccountType::EXPENSE; - if (bccomp($amount->getValue(), '0') === 1) { - // amount + means that its a deposit. - $expected = AccountType::REVENUE; - Log::debug('Will make opposing account revenue.'); - } - $opposing = $this->convertToAccount($counterParty, $expected); - $account = $this->accountRepository->findNull($config['accounts-mapped'][$accountId]); - $type = TransactionType::WITHDRAWAL; - - $this->addStep(); - - Log::debug(sprintf('Will store withdrawal between "%s" (%d) and "%s" (%d)', $account->name, $account->id, $opposing->name, $opposing->id)); - - // start storing stuff: - $source = $account; - $destination = $opposing; - if (bccomp($amount->getValue(), '0') === 1) { - // its a deposit: - $source = $opposing; - $destination = $account; - $type = TransactionType::DEPOSIT; - Log::debug('Will make it a deposit.'); - } - if ($account->accountType->type === AccountType::ASSET && $opposing->accountType->type === AccountType::ASSET) { - $type = TransactionType::TRANSFER; - Log::debug('Both are assets, will make transfer.'); - } - - $storeData = [ - 'user' => $this->job->user_id, - 'type' => $type, - 'date' => $payment->getCreated(), - 'description' => $payment->getDescription(), - 'piggy_bank_id' => null, - 'piggy_bank_name' => null, - 'bill_id' => null, - 'bill_name' => null, - 'tags' => [$payment->getType(), $payment->getSubType()], - 'internal_reference' => $payment->getId(), - 'notes' => null, - 'bunq_payment_id' => $payment->getId(), - 'transactions' => [ - // single transaction: - [ - 'description' => null, - 'amount' => $amount->getValue(), - 'currency_id' => null, - 'currency_code' => $amount->getCurrency(), - 'foreign_amount' => null, - 'foreign_currency_id' => null, - 'foreign_currency_code' => null, - 'budget_id' => null, - 'budget_name' => null, - 'category_id' => null, - 'category_name' => null, - 'source_id' => $source->id, - 'source_name' => null, - 'destination_id' => $destination->id, - 'destination_name' => null, - 'reconciled' => false, - 'identifier' => 0, - ], - ], - ]; - $journal = $this->journalFactory->create($storeData); - Log::debug(sprintf('Stored journal with ID #%d', $journal->id)); - $this->addStep(); - $journals->push($journal); - - } - } - if ($journals->count() > 0) { - // link to tag - /** @var TagRepositoryInterface $repository */ - $repository = app(TagRepositoryInterface::class); - $repository->setUser($this->job->user); - $data = [ - 'tag' => trans('import.import_with_key', ['key' => $this->job->key]), - 'date' => new Carbon, - 'description' => null, - 'latitude' => null, - 'longitude' => null, - 'zoomLevel' => null, - 'tagMode' => 'nothing', - ]; - $tag = $repository->store($data); - $extended = $this->getExtendedStatus(); - $extended['tag'] = $tag->id; - $this->setExtendedStatus($extended); - - Log::debug(sprintf('Created tag #%d ("%s")', $tag->id, $tag->tag)); - Log::debug('Looping journals...'); - $tagId = $tag->id; - - foreach ($journals as $journal) { - Log::debug(sprintf('Linking journal #%d to tag #%d...', $journal->id, $tagId)); - DB::table('tag_transaction_journal')->insert(['transaction_journal_id' => $journal->id, 'tag_id' => $tagId]); - $this->addStep(); - } - Log::info(sprintf('Linked %d journals to tag #%d ("%s")', $journals->count(), $tag->id, $tag->tag)); - } - - // set status to "finished"? - // update job: - $this->setStatus('finished'); - } - - /** - * To install Firefly III as a new device: - * - Send an installation token request. - * - Use this token to send a device server request - * - Store the installation token - * - Use the installation token each time we need a session. - * - * @throws FireflyException - */ - private function registerDevice(): DeviceServerId - { - Log::debug('Now in registerDevice()'); - $deviceServerId = Preferences::getForUser($this->job->user, 'bunq_device_server_id', null); - $serverIp = $this->getRemoteIp(); - if (null !== $deviceServerId) { - Log::debug('Already have device server ID.'); - - return new DeviceServerId($deviceServerId->data); - } - - Log::debug('Device server ID is null, we have to find an existing one or register a new one.'); - $installationToken = $this->getInstallationToken(); - $serverPublicKey = $this->getServerPublicKey(); - $apiKey = Preferences::getForUser($this->job->user, 'bunq_api_key', ''); - $this->addStep(); - - // try get the current from a list: - $deviceServerId = $this->getExistingDevice(); - $this->addStep(); - if (null !== $deviceServerId) { - Log::debug('Found device server ID in existing devices list.'); - - return $deviceServerId; - } - - Log::debug('Going to create new DeviceServerRequest() because nothing found in existing list.'); - $request = new DeviceServerRequest; - $request->setPrivateKey($this->getPrivateKey()); - $request->setDescription('Firefly III v' . config('firefly.version') . ' for ' . $this->job->user->email); - $request->setSecret($apiKey->data); - $request->setPermittedIps([$serverIp]); - $request->setInstallationToken($installationToken); - $request->setServerPublicKey($serverPublicKey); - $deviceServerId = null; - // try to register device: - try { - $request->call(); - $deviceServerId = $request->getDeviceServerId(); - } catch (FireflyException $e) { - Log::error($e->getMessage()); - // we really have to quit at this point :( - throw new FireflyException($e->getMessage()); - } - if (null === $deviceServerId) { - throw new FireflyException('Was not able to register server with bunq. Please see the log files.'); - } - - Preferences::setForUser($this->job->user, 'bunq_device_server_id', $deviceServerId->toArray()); - Log::debug(sprintf('Server ID: %s', json_encode($deviceServerId))); - - return $deviceServerId; - } - - /** - * Will download the transactions for each account that is selected to be imported from. - * Will of course also update the number of steps and what-not. - * - * @throws FireflyException - */ - private function runStageHaveAccountMapping(): void - { - $config = $this->getConfig(); - $user = new UserPerson($config['user_person']); - $mapping = $config['accounts-mapped']; - $token = new SessionToken($config['session_token']); - $count = 0; - $all = []; - if (0 === $user->getId()) { - $user = new UserCompany($config['user_company']); - Log::debug(sprintf('Will try to get transactions for company #%d', $user->getId())); - } - - $this->addTotalSteps(\count($config['accounts']) * 2); - - foreach ($config['accounts'] as $accountData) { - $this->addStep(); - $account = new MonetaryAccountBank($accountData); - $importId = $account->getId(); - if (isset($mapping[$importId])) { - Log::debug(sprintf('Will grab payments for account %s', $account->getDescription())); - $request = new ListPaymentRequest(); - $request->setPrivateKey($this->getPrivateKey()); - $request->setServerPublicKey($this->getServerPublicKey()); - $request->setSessionToken($token); - $request->setUserId($user->getId()); - $request->setAccount($account); - $request->call(); - $payments = $request->getPayments(); - - // store in array - $all[$account->getId()] = [ - 'account' => $account, - 'import_id' => $importId, - 'payments' => $payments, - ]; - $count += \count($payments); - } - Log::debug(sprintf('Total number of payments: %d', $count)); - $this->addStep(); - // add steps for import: - $this->addTotalSteps($count * 3); - $this->importPayments($all); - } - - // update job to be complete, I think? - } - - /** - * @throws FireflyException - */ - private function runStageLoggedIn(): void - { - $this->addStep(); - // grab new session token: - $config = $this->getConfig(); - $token = new SessionToken($config['session_token']); - $user = new UserPerson($config['user_person']); - if (0 === $user->getId()) { - $user = new UserCompany($config['user_company']); - } - - // list accounts request - $request = new ListMonetaryAccountRequest(); - $request->setServerPublicKey($this->getServerPublicKey()); - $request->setPrivateKey($this->getPrivateKey()); - $request->setUserId($user->getId()); - $request->setSessionToken($token); - $request->call(); - $accounts = $request->getMonetaryAccounts(); - $arr = []; - Log::debug(sprintf('Get monetary accounts, found %d accounts.', $accounts->count())); - $this->addStep(); - - /** @var MonetaryAccountBank $account */ - foreach ($accounts as $account) { - $arr[] = $account->toArray(); - } - - $config = $this->getConfig(); - $config['accounts'] = $arr; - $config['stage'] = 'have-accounts'; - $this->setConfig($config); - - // once the accounts are stored, go to configuring stage: - // update job, set status to "configuring". - $this->setStatus('configuring'); - $this->addStep(); - } - - /** - * Shorthand. - * - * @param array $config - */ - private function setConfig(array $config): void - { - $this->repository->setConfiguration($this->job, $config); - } - - /** - * Shorthand method. - * - * @param array $extended - */ - private function setExtendedStatus(array $extended): void - { - $this->repository->setExtendedStatus($this->job, $extended); - } - - /** - * Shorthand. - * - * @param string $status - */ - private function setStatus(string $status): void - { - $this->repository->setStatus($this->job, $status); - } } diff --git a/app/Import/Routine/FakeRoutine.php b/app/Import/Routine/FakeRoutine.php new file mode 100644 index 0000000000..bd609706c5 --- /dev/null +++ b/app/Import/Routine/FakeRoutine.php @@ -0,0 +1,106 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Import\Routine; + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Support\Import\Routine\Fake\StageAhoyHandler; +use FireflyIII\Support\Import\Routine\Fake\StageFinalHandler; +use FireflyIII\Support\Import\Routine\Fake\StageNewHandler; +use Log; + +/** + * Class FakeRoutine + */ +class FakeRoutine implements RoutineInterface +{ + /** @var ImportJob */ + private $importJob; + /** @var ImportJobRepositoryInterface */ + private $repository; + + /** + * Fake import routine has three stages: + * + * "new": will quietly log gibberish for 15 seconds, then switch to stage "ahoy". + * will also set status to "ready_to_run" so it will arrive here again. + * "ahoy": will log some nonsense and then drop job into status:"need_job_config" to force it back to the job config routine. + * "final": will do some logging, sleep for 10 seconds and then finish. Generates 5 random transactions. + * + * @return void + * @throws FireflyException + */ + public function run(): void + { + Log::debug(sprintf('Now in run() for fake routine with status: %s', $this->importJob->status)); + if ($this->importJob->status !== 'ready_to_run') { + throw new FireflyException(sprintf('Fake job should have status "ready_to_run", not "%s"', $this->importJob->status)); // @codeCoverageIgnore + } + + switch ($this->importJob->stage) { + default: + throw new FireflyException(sprintf('Fake routine cannot handle stage "%s".', $this->importJob->stage)); // @codeCoverageIgnore + case 'new': + $this->repository->setStatus($this->importJob, 'running'); + /** @var StageNewHandler $handler */ + $handler = app(StageNewHandler::class); + $handler->run(); + $this->repository->setStage($this->importJob, 'ahoy'); + // set job finished this step: + $this->repository->setStatus($this->importJob, 'ready_to_run'); + + return; + case 'ahoy': + $this->repository->setStatus($this->importJob, 'running'); + /** @var StageAhoyHandler $handler */ + $handler = app(StageAhoyHandler::class); + $handler->run(); + $this->repository->setStatus($this->importJob, 'need_job_config'); + $this->repository->setStage($this->importJob, 'final'); + break; + case 'final': + $this->repository->setStatus($this->importJob, 'running'); + /** @var StageFinalHandler $handler */ + $handler = app(StageFinalHandler::class); + $handler->setImportJob($this->importJob); + $transactions = $handler->getTransactions(); + $this->repository->setStatus($this->importJob, 'provider_finished'); + $this->repository->setStage($this->importJob, 'final'); + $this->repository->setTransactions($this->importJob, $transactions); + } + } + + /** + * @param ImportJob $importJob + * + * @return + */ + public function setImportJob(ImportJob $importJob): void + { + $this->importJob = $importJob; + $this->repository = app(ImportJobRepositoryInterface::class); + $this->repository->setUser($importJob->user); + } +} diff --git a/app/Import/Routine/FileRoutine.php b/app/Import/Routine/FileRoutine.php index b4c58bc856..db228ac494 100644 --- a/app/Import/Routine/FileRoutine.php +++ b/app/Import/Routine/FileRoutine.php @@ -22,15 +22,10 @@ declare(strict_types=1); namespace FireflyIII\Import\Routine; -use Carbon\Carbon; -use DB; -use FireflyIII\Import\FileProcessor\FileProcessorInterface; -use FireflyIII\Import\Storage\ImportStorage; +use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\ImportJob; -use FireflyIII\Models\Tag; use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; -use FireflyIII\Repositories\Tag\TagRepositoryInterface; -use Illuminate\Support\Collection; +use FireflyIII\Support\Import\Routine\File\FileProcessorInterface; use Log; /** @@ -38,271 +33,62 @@ use Log; */ class FileRoutine implements RoutineInterface { - /** @var Collection */ - public $errors; - /** @var Collection */ - public $journals; - /** @var int */ - public $lines = 0; /** @var ImportJob */ - private $job; - + private $importJob; /** @var ImportJobRepositoryInterface */ private $repository; /** - * ImportRoutine constructor. - */ - public function __construct() - { - $this->journals = new Collection; - $this->errors = new Collection; - } - - /** - * @return Collection - */ - public function getErrors(): Collection - { - return $this->errors; - } - - /** - * @return Collection - */ - public function getJournals(): Collection - { - return $this->journals; - } - - /** - * @return int - */ - public function getLines(): int - { - return $this->lines; - } - - /** + * At the end of each run(), the import routine must set the job to the expected status. * + * The final status of the routine must be "provider_finished". + * + * @throws FireflyException */ - public function run(): bool + public function run(): void { - if ('configured' !== $this->getStatus()) { - Log::error(sprintf('Job %s is in state "%s" so it cannot be started.', $this->job->key, $this->getStatus())); + Log::debug(sprintf('Now in run() for file routine with status: %s', $this->importJob->status)); + if ($this->importJob->status === 'ready_to_run') { + $this->repository->setStatus($this->importJob, 'running'); + // get processor, depending on file type + // is just CSV for now. + $processor = $this->getProcessor(); + $processor->setImportJob($this->importJob); + $transactions = $processor->run(); - return false; + $this->repository->setStatus($this->importJob, 'provider_finished'); + $this->repository->setStage($this->importJob, 'final'); + $this->repository->setTransactions($this->importJob, $transactions); + + return; } - set_time_limit(0); - Log::info(sprintf('Start with import job %s', $this->job->key)); - - // total steps: 6 - $this->setTotalSteps(6); - - $importObjects = $this->getImportObjects(); - $this->lines = $importObjects->count(); - $this->addStep(); - - // total steps can now be extended. File has been scanned. 7 steps per line: - $this->addTotalSteps(7 * $this->lines); - - // once done, use storage thing to actually store them: - Log::info(sprintf('Returned %d valid objects from file processor', $this->lines)); - - $storage = $this->storeObjects($importObjects); - $this->addStep(); - Log::debug('Back in run()'); - - Log::debug('Updated job...'); - Log::debug(sprintf('%d journals in $storage->journals', $storage->journals->count())); - $this->journals = $storage->journals; - $this->errors = $storage->errors; - - Log::debug('Going to call createImportTag()'); - - // create tag, link tag to all journals: - $this->createImportTag(); - $this->addStep(); - - // update job: - $this->setStatus('finished'); - - Log::info(sprintf('Done with import job %s', $this->job->key)); - - return true; + throw new FireflyException(sprintf('Import routine cannot handle status "%s"', $this->importJob->status)); // @codeCoverageIgnore } /** - * @param ImportJob $job + * @param ImportJob $importJob + * + * @return void */ - public function setJob(ImportJob $job) + public function setImportJob(ImportJob $importJob): void { - $this->job = $job; + $this->importJob = $importJob; $this->repository = app(ImportJobRepositoryInterface::class); - $this->repository->setUser($job->user); + $this->repository->setUser($importJob->user); } /** - * @return Collection - */ - protected function getImportObjects(): Collection - { - $objects = new Collection; - $fileType = $this->getConfig()['file-type'] ?? 'csv'; - // will only respond to "file" - $class = config(sprintf('import.options.file.processors.%s', $fileType)); - /** @var FileProcessorInterface $processor */ - $processor = app($class); - $processor->setJob($this->job); - - if ('configured' === $this->getStatus()) { - // set job as "running"... - $this->setStatus('running'); - - Log::debug('Job is configured, start with run()'); - $processor->run(); - $objects = $processor->getObjects(); - } - - return $objects; - } - - /** - * Shorthand method. - */ - private function addStep() - { - $this->repository->addStepsDone($this->job, 1); - } - - /** - * Shorthand + * Return the appropriate file routine handler for + * the file type of the job. * - * @param int $steps + * @return FileProcessorInterface */ - private function addTotalSteps(int $steps) + private function getProcessor(): FileProcessorInterface { - $this->repository->addTotalSteps($this->job, $steps); - } + $config = $this->repository->getConfiguration($this->importJob); + $type = $config['file-type'] ?? 'csv'; + $class = config(sprintf('import.options.file.processors.%s', $type)); - /** - * - */ - private function createImportTag(): Tag - { - Log::debug('Now in createImportTag()'); - - if ($this->journals->count() < 1) { - Log::info(sprintf('Will not create tag, %d journals imported.', $this->journals->count())); - - return new Tag; - } - $this->addTotalSteps($this->journals->count() + 2); - - /** @var TagRepositoryInterface $repository */ - $repository = app(TagRepositoryInterface::class); - $repository->setUser($this->job->user); - $data = [ - 'tag' => trans('import.import_with_key', ['key' => $this->job->key]), - 'date' => new Carbon, - 'description' => null, - 'latitude' => null, - 'longitude' => null, - 'zoomLevel' => null, - 'tagMode' => 'nothing', - ]; - $tag = $repository->store($data); - $this->addStep(); - $extended = $this->getExtendedStatus(); - $extended['tag'] = $tag->id; - $this->setExtendedStatus($extended); - - Log::debug(sprintf('Created tag #%d ("%s")', $tag->id, $tag->tag)); - Log::debug('Looping journals...'); - $journalIds = $this->journals->pluck('id')->toArray(); - $tagId = $tag->id; - foreach ($journalIds as $journalId) { - Log::debug(sprintf('Linking journal #%d to tag #%d...', $journalId, $tagId)); - DB::table('tag_transaction_journal')->insert(['transaction_journal_id' => $journalId, 'tag_id' => $tagId]); - $this->addStep(); - } - Log::info(sprintf('Linked %d journals to tag #%d ("%s")', $this->journals->count(), $tag->id, $tag->tag)); - $this->addStep(); - - return $tag; - } - - /** - * Shorthand method - * - * @return array - */ - private function getConfig(): array - { - return $this->repository->getConfiguration($this->job); - } - - /** - * @return array - */ - private function getExtendedStatus(): array - { - return $this->repository->getExtendedStatus($this->job); - } - - /** - * Shorthand method. - * - * @return string - */ - private function getStatus(): string - { - return $this->repository->getStatus($this->job); - } - - /** - * @param array $extended - */ - private function setExtendedStatus(array $extended): void - { - $this->repository->setExtendedStatus($this->job, $extended); - } - - /** - * Shorthand - * - * @param string $status - */ - private function setStatus(string $status): void - { - $this->repository->setStatus($this->job, $status); - } - - /** - * Shorthand - * - * @param int $steps - */ - private function setTotalSteps(int $steps) - { - $this->repository->setTotalSteps($this->job, $steps); - } - - /** - * @param Collection $objects - * - * @return ImportStorage - */ - private function storeObjects(Collection $objects): ImportStorage - { - $config = $this->getConfig(); - $storage = new ImportStorage; - $storage->setJob($this->job); - $storage->setDateFormat($config['date-format']); - $storage->setObjects($objects); - $storage->store(); - Log::info('Back in storeObjects()'); - - return $storage; + return app($class); } } diff --git a/app/Import/Routine/RoutineInterface.php b/app/Import/Routine/RoutineInterface.php index ef2d25515b..aad9c4854a 100644 --- a/app/Import/Routine/RoutineInterface.php +++ b/app/Import/Routine/RoutineInterface.php @@ -22,8 +22,8 @@ declare(strict_types=1); namespace FireflyIII\Import\Routine; +use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\ImportJob; -use Illuminate\Support\Collection; /** * Interface RoutineInterface @@ -31,29 +31,18 @@ use Illuminate\Support\Collection; interface RoutineInterface { /** - * @return Collection - */ - public function getErrors(): Collection; - - /** - * @return Collection - */ - public function getJournals(): Collection; - - /** - * @return int - */ - public function getLines(): int; - - /** - * @return bool - */ - public function run(): bool; - - /** - * @param ImportJob $job + * At the end of each run(), the import routine must set the job to the expected status. * - * @return mixed + * The final status of the routine must be "provider_finished". + * + * @throws FireflyException */ - public function setJob(ImportJob $job); + public function run(): void; + + /** + * @param ImportJob $importJob + * + * @return void + */ + public function setImportJob(ImportJob $importJob): void; } diff --git a/app/Import/Routine/SpectreRoutine.php b/app/Import/Routine/SpectreRoutine.php index 3147f7788f..1c51d8d697 100644 --- a/app/Import/Routine/SpectreRoutine.php +++ b/app/Import/Routine/SpectreRoutine.php @@ -22,572 +22,101 @@ declare(strict_types=1); namespace FireflyIII\Import\Routine; -use Carbon\Carbon; -use DB; -use Exception; use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Import\Object\ImportJournal; -use FireflyIII\Import\Storage\ImportStorage; use FireflyIII\Models\ImportJob; use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; -use FireflyIII\Repositories\Tag\TagRepositoryInterface; -use FireflyIII\Services\Spectre\Exception\SpectreException; -use FireflyIII\Services\Spectre\Object\Account; -use FireflyIII\Services\Spectre\Object\Customer; -use FireflyIII\Services\Spectre\Object\Login; -use FireflyIII\Services\Spectre\Object\Token; -use FireflyIII\Services\Spectre\Object\Transaction; -use FireflyIII\Services\Spectre\Request\CreateTokenRequest; -use FireflyIII\Services\Spectre\Request\ListAccountsRequest; -use FireflyIII\Services\Spectre\Request\ListCustomersRequest; -use FireflyIII\Services\Spectre\Request\ListLoginsRequest; -use FireflyIII\Services\Spectre\Request\ListTransactionsRequest; -use FireflyIII\Services\Spectre\Request\NewCustomerRequest; -use Illuminate\Support\Collection; +use FireflyIII\Support\Import\Routine\Spectre\StageImportDataHandler; +use FireflyIII\Support\Import\Routine\Spectre\StageAuthenticatedHandler; +use FireflyIII\Support\Import\Routine\Spectre\StageNewHandler; use Log; -use Preferences; /** - * Class FileRoutine + * Class SpectreRoutine */ class SpectreRoutine implements RoutineInterface { - /** @var Collection */ - public $errors; - /** @var Collection */ - public $journals; - /** @var int */ - public $lines = 0; + /** @var ImportJob */ - private $job; + private $importJob; /** @var ImportJobRepositoryInterface */ private $repository; /** - * ImportRoutine constructor. - */ - public function __construct() - { - $this->journals = new Collection; - $this->errors = new Collection; - } - - /** - * @return Collection - */ - public function getErrors(): Collection - { - return $this->errors; - } - - /** - * @return Collection - */ - public function getJournals(): Collection - { - return $this->journals; - } - - /** - * @return int - */ - public function getLines(): int - { - return $this->lines; - } - - /** - * A Spectre job that ends up here is either "configured" or "running", and will be set to "running" - * when it is "configured". + * At the end of each run(), the import routine must set the job to the expected status. * - * Job has several stages, stored in extended status key 'stage' - * - * initial: just begun, nothing happened. action: get a customer and a token. Next status: has-token - * has-token: redirect user to sandstorm, make user login. set job to: user-logged-in - * user-logged-in: customer has an attempt. action: analyse/get attempt and go for next status. - * if attempt failed: job status is error, save a warning somewhere? - * if success, try to get accounts. Save in config key 'accounts'. set status: have-accounts and "configuring" - * - * have-accounts: make user link accounts and select accounts to import from. - * - * If job is "configuring" and stage "have-accounts" then present the accounts and make user link them to - * own asset accounts. Store this mapping, set config to "have-account-mapping" and job status configured". - * - * have-account-mapping: start downloading transactions? - * - * - * @return bool - * - * @throws FireflyException - * @throws SpectreException - * @throws \Illuminate\Container\EntryNotFoundException - */ - public function run(): bool - { - if ('configured' === $this->getStatus()) { - $this->repository->updateStatus($this->job, 'running'); - } - Log::info(sprintf('Start with import job %s using Spectre.', $this->job->key)); - set_time_limit(0); - - // check if job has token first! - $stage = $this->getConfig()['stage'] ?? 'unknown'; - - switch ($stage) { - case 'initial': - // get customer and token: - $this->runStageInitial(); - break; - case 'has-token': - // import routine does nothing at this point: - break; - case 'user-logged-in': - $this->runStageLoggedIn(); - break; - case 'have-account-mapping': - $this->runStageHaveMapping(); - break; - default: - throw new FireflyException(sprintf('Cannot handle stage %s', $stage)); - } - - return true; - } - - /** - * @param ImportJob $job - */ - public function setJob(ImportJob $job) - { - $this->job = $job; - $this->repository = app(ImportJobRepositoryInterface::class); - $this->repository->setUser($job->user); - } - - /** - * @return Customer - * - * @throws \FireflyIII\Exceptions\FireflyException - * @throws \FireflyIII\Services\Spectre\Exception\SpectreException - * @throws \Illuminate\Container\EntryNotFoundException - */ - protected function createCustomer(): Customer - { - $newCustomerRequest = new NewCustomerRequest($this->job->user); - $customer = null; - try { - $newCustomerRequest->call(); - $customer = $newCustomerRequest->getCustomer(); - } catch (Exception $e) { - // already exists, must fetch customer instead. - Log::warning(sprintf('Customer exists already for user, fetch it: %s', $e->getMessage())); - } - if (null === $customer) { - $getCustomerRequest = new ListCustomersRequest($this->job->user); - $getCustomerRequest->call(); - $customers = $getCustomerRequest->getCustomers(); - /** @var Customer $current */ - foreach ($customers as $current) { - if ('default_ff3_customer' === $current->getIdentifier()) { - $customer = $current; - break; - } - } - } - - Preferences::setForUser($this->job->user, 'spectre_customer', $customer->toArray()); - - return $customer; - } - - /** - * @return Customer - * - * @throws FireflyException - * @throws SpectreException - * @throws \Illuminate\Container\EntryNotFoundException - */ - protected function getCustomer(): Customer - { - $config = $this->getConfig(); - if (null !== $config['customer']) { - $customer = new Customer($config['customer']); - - return $customer; - } - - $customer = $this->createCustomer(); - $config['customer'] = [ - 'id' => $customer->getId(), - 'identifier' => $customer->getIdentifier(), - 'secret' => $customer->getSecret(), - ]; - $this->setConfig($config); - - return $customer; - } - - /** - * @param Customer $customer - * @param string $returnUri - * - * @return Token - * - * @throws \FireflyIII\Exceptions\FireflyException - * @throws \FireflyIII\Services\Spectre\Exception\SpectreException - * @throws \Illuminate\Container\EntryNotFoundException - */ - protected function getToken(Customer $customer, string $returnUri): Token - { - $request = new CreateTokenRequest($this->job->user); - $request->setUri($returnUri); - $request->setCustomer($customer); - $request->call(); - Log::debug('Call to get token is finished'); - - return $request->getToken(); - } - - /** - * @throws FireflyException - * @throws SpectreException - * @throws \Illuminate\Container\EntryNotFoundException - */ - protected function runStageInitial(): void - { - Log::debug('In runStageInitial()'); - - // create customer if user does not have one: - $customer = $this->getCustomer(); - Log::debug(sprintf('Customer ID is %s', $customer->getId())); - - // use customer to request a token: - $uri = route('import.status', [$this->job->key]); - $token = $this->getToken($customer, $uri); - Log::debug(sprintf('Token is %s', $token->getToken())); - - // update job, give it the token: - $config = $this->getConfig(); - $config['has-token'] = true; - $config['token'] = $token->getToken(); - $config['token-expires'] = $token->getExpiresAt()->format('U'); - $config['token-url'] = $token->getConnectUrl(); - $config['stage'] = 'has-token'; - $this->setConfig($config); - - Log::debug('Job config is now', $config); - - // update job, set status to "configuring". - $this->setStatus('configuring'); - Log::debug(sprintf('Job status is now %s', $this->job->status)); - $this->addStep(); - } - - /** - * @throws FireflyException - * @throws SpectreException - * @throws \Illuminate\Container\EntryNotFoundException - */ - protected function runStageLoggedIn(): void - { - Log::debug('In runStageLoggedIn'); - // list all logins: - $customer = $this->getCustomer(); - $request = new ListLoginsRequest($this->job->user); - $request->setCustomer($customer); - $request->call(); - - $logins = $request->getLogins(); - /** @var Login $final */ - $final = null; - // loop logins, find the latest with no error in it: - $time = 0; - /** @var Login $login */ - foreach ($logins as $login) { - $attempt = $login->getLastAttempt(); - $attemptTime = (int)$attempt->getCreatedAt()->format('U'); - if ($attemptTime > $time && null === $attempt->getFailErrorClass()) { - $time = $attemptTime; - $final = $login; - } - } - if (null === $final) { - Log::error('Could not find a valid login for this user.'); - $this->repository->addError($this->job, 0, 'Spectre connection failed. Did you use invalid credentials, press Cancel or failed the 2FA challenge?'); - $this->repository->setStatus($this->job, 'error'); - - return; - } - $this->addStep(); - - // list the users accounts using this login. - $accountRequest = new ListAccountsRequest($this->job->user); - $accountRequest->setLogin($login); - $accountRequest->call(); - $accounts = $accountRequest->getAccounts(); - - // store accounts in job: - $all = []; - /** @var Account $account */ - foreach ($accounts as $account) { - $all[] = $account->toArray(); - } - - // update job: - $config = $this->getConfig(); - $config['accounts'] = $all; - $config['login'] = $login->toArray(); - $config['stage'] = 'have-accounts'; - - $this->setConfig($config); - $this->setStatus('configuring'); - $this->addStep(); - } - - /** - * Shorthand method. - */ - private function addStep() - { - $this->repository->addStepsDone($this->job, 1); - } - - /** - * Shorthand - * - * @param int $steps - */ - private function addTotalSteps(int $steps) - { - $this->repository->addTotalSteps($this->job, $steps); - } - - /** - * @return array - */ - private function getConfig(): array - { - return $this->repository->getConfiguration($this->job); - } - - /** - * Shorthand method. - * - * @return array - */ - private function getExtendedStatus(): array - { - return $this->repository->getExtendedStatus($this->job); - } - - /** - * Shorthand method. - * - * @return string - */ - private function getStatus(): string - { - return $this->repository->getStatus($this->job); - } - - /** - * @param array $all + * The final status of the routine must be "provider_finished". * * @throws FireflyException */ - private function importTransactions(array $all) + public function run(): void { - Log::debug('Going to import transactions'); - $collection = new Collection; - // create import objects? - foreach ($all as $accountId => $data) { - Log::debug(sprintf('Now at account #%d', $accountId)); - /** @var Transaction $transaction */ - foreach ($data['transactions'] as $transaction) { - Log::debug(sprintf('Now at transaction #%d', $transaction->getId())); - /** @var Account $account */ - $account = $data['account']; - $importJournal = new ImportJournal; - $importJournal->setUser($this->job->user); - $importJournal->asset->setDefaultAccountId($data['import_id']); - // call set value a bunch of times for various data entries: - $tags = []; - $tags[] = $transaction->getMode(); - $tags[] = $transaction->getStatus(); - if ($transaction->isDuplicated()) { - $tags[] = 'possibly-duplicated'; - } - $extra = $transaction->getExtra()->toArray(); - $notes = ''; - // double space for newline in Markdown. - $notes .= (string)trans('import.imported_from_account', ['account' => $account->getName()]) . ' ' . "\n"; + Log::debug(sprintf('Now in SpectreRoutine::run() with status "%s" and stage "%s".', $this->importJob->status, $this->importJob->stage)); + $valid = ['ready_to_run']; // should be only ready_to_run + if (\in_array($this->importJob->status, $valid, true)) { + switch ($this->importJob->stage) { + default: + throw new FireflyException(sprintf('SpectreRoutine cannot handle stage "%s".', $this->importJob->stage)); // @codeCoverageIgnore + case 'new': + // list all of the users logins. + $this->repository->setStatus($this->importJob, 'running'); + /** @var StageNewHandler $handler */ + $handler = app(StageNewHandler::class); + $handler->setImportJob($this->importJob); + $handler->run(); - foreach ($extra as $key => $value) { - switch ($key) { - case 'account_number': - $importJournal->setValue(['role' => 'account-number', 'value' => $value]); - break; - case 'original_category': - case 'original_subcategory': - case 'customer_category_code': - case 'customer_category_name': - $tags[] = $value; - break; - case 'payee': - $importJournal->setValue(['role' => 'opposing-name', 'value' => $value]); - break; - case 'original_amount': - $importJournal->setValue(['role' => 'amount_foreign', 'value' => $value]); - break; - case 'original_currency_code': - $importJournal->setValue(['role' => 'foreign-currency-code', 'value' => $value]); - break; - default: - $notes .= $key . ': ' . $value . ' '; // for newline in Markdown. + // if count logins is zero, go to authenticate stage + if ($handler->getCountLogins() === 0) { + $this->repository->setStage($this->importJob, 'do-authenticate'); + $this->repository->setStatus($this->importJob, 'ready_to_run'); + + return; } - } - // hash - $importJournal->setHash($transaction->getHash()); + // or return to config to select login. + $this->repository->setStage($this->importJob, 'choose-login'); + $this->repository->setStatus($this->importJob, 'need_job_config'); + break; + case 'do-authenticate': + // set job to require config. + $this->repository->setStatus($this->importJob, 'need_job_config'); - // account ID (Firefly III account): - $importJournal->setValue(['role' => 'account-id', 'value' => $data['import_id'], 'mapped' => $data['import_id']]); + return; + case 'authenticated': + $this->repository->setStatus($this->importJob, 'running'); + // get accounts from login, store in job. + /** @var StageAuthenticatedHandler $handler */ + $handler = app(StageAuthenticatedHandler::class); + $handler->setImportJob($this->importJob); + $handler->run(); - // description: - $importJournal->setValue(['role' => 'description', 'value' => $transaction->getDescription()]); - - // date: - $importJournal->setValue(['role' => 'date-transaction', 'value' => $transaction->getMadeOn()->toIso8601String()]); - - // amount - $importJournal->setValue(['role' => 'amount', 'value' => $transaction->getAmount()]); - $importJournal->setValue(['role' => 'currency-code', 'value' => $transaction->getCurrencyCode()]); - - // various meta fields: - $importJournal->setValue(['role' => 'category-name', 'value' => $transaction->getCategory()]); - $importJournal->setValue(['role' => 'note', 'value' => $notes]); - $importJournal->setValue(['role' => 'tags-comma', 'value' => implode(',', $tags)]); - $collection->push($importJournal); + // return to config to select account(s). + $this->repository->setStage($this->importJob, 'choose-accounts'); + $this->repository->setStatus($this->importJob, 'need_job_config'); + break; + case 'go-for-import': + // user has chosen account mapping. Should now be ready to import data. + $this->repository->setStatus($this->importJob, 'running'); + $this->repository->setStage($this->importJob, 'do_import'); + /** @var StageImportDataHandler $handler */ + $handler = app(StageImportDataHandler::class); + $handler->setImportJob($this->importJob); + $handler->run(); + $this->repository->setStatus($this->importJob, 'provider_finished'); + $this->repository->setStage($this->importJob, 'final'); } } - $this->addStep(); - Log::debug(sprintf('Going to try and store all %d them.', $collection->count())); - - $this->addTotalSteps(7 * $collection->count()); - // try to store them (seven steps per transaction) - $storage = new ImportStorage; - - $storage->setJob($this->job); - $storage->setDateFormat('Y-m-d\TH:i:sO'); - $storage->setObjects($collection); - $storage->store(); - Log::info('Back in importTransactions()'); - - // link to tag - /** @var TagRepositoryInterface $repository */ - $repository = app(TagRepositoryInterface::class); - $repository->setUser($this->job->user); - $data = [ - 'tag' => trans('import.import_with_key', ['key' => $this->job->key]), - 'date' => new Carbon, - 'description' => null, - 'latitude' => null, - 'longitude' => null, - 'zoomLevel' => null, - 'tagMode' => 'nothing', - ]; - $tag = $repository->store($data); - $extended = $this->getExtendedStatus(); - $extended['tag'] = $tag->id; - $this->setExtendedStatus($extended); - - Log::debug(sprintf('Created tag #%d ("%s")', $tag->id, $tag->tag)); - Log::debug('Looping journals...'); - $journalIds = $storage->journals->pluck('id')->toArray(); - $tagId = $tag->id; - $this->addTotalSteps(\count($journalIds)); - - foreach ($journalIds as $journalId) { - Log::debug(sprintf('Linking journal #%d to tag #%d...', $journalId, $tagId)); - DB::table('tag_transaction_journal')->insert(['transaction_journal_id' => $journalId, 'tag_id' => $tagId]); - $this->addStep(); - } - Log::info(sprintf('Linked %d journals to tag #%d ("%s")', $storage->journals->count(), $tag->id, $tag->tag)); - - // set status to "finished"? - // update job: - $this->setStatus('finished'); - $this->addStep(); - } /** - * @throws FireflyException - * @throws SpectreException - * @throws \Illuminate\Container\EntryNotFoundException - */ - private function runStageHaveMapping() - { - $config = $this->getConfig(); - $accounts = $config['accounts'] ?? []; - $all = []; - $count = 0; - /** @var array $accountArray */ - foreach ($accounts as $accountArray) { - $account = new Account($accountArray); - $importId = (int)($config['accounts-mapped'][$account->getId()] ?? 0.0); - $doImport = 0 !== $importId; - if (!$doImport) { - Log::debug(sprintf('Will NOT import from Spectre account #%d ("%s")', $account->getId(), $account->getName())); - continue; - } - // grab all transactions - $listTransactionsRequest = new ListTransactionsRequest($this->job->user); - $listTransactionsRequest->setAccount($account); - $listTransactionsRequest->call(); - $transactions = $listTransactionsRequest->getTransactions(); - $all[$account->getId()] = [ - 'account' => $account, - 'import_id' => $importId, - 'transactions' => $transactions, - ]; - $count += \count($transactions); - } - Log::debug(sprintf('Total number of transactions: %d', $count)); - $this->addStep(); - - $this->importTransactions($all); - } - - /** - * Shorthand. + * @param ImportJob $importJob * - * @param array $config + * @return void */ - private function setConfig(array $config): void + public function setImportJob(ImportJob $importJob): void { - $this->repository->setConfiguration($this->job, $config); - + $this->importJob = $importJob; + $this->repository = app(ImportJobRepositoryInterface::class); + $this->repository->setUser($importJob->user); } - /** - * Shorthand method. - * - * @param array $extended - */ - private function setExtendedStatus(array $extended): void - { - $this->repository->setExtendedStatus($this->job, $extended); - - } - - /** - * Shorthand. - * - * @param string $status - */ - private function setStatus(string $status): void - { - $this->repository->setStatus($this->job, $status); - } } diff --git a/app/Import/Specifics/AbnAmroDescription.php b/app/Import/Specifics/AbnAmroDescription.php index 47ab96db0a..b714734836 100644 --- a/app/Import/Specifics/AbnAmroDescription.php +++ b/app/Import/Specifics/AbnAmroDescription.php @@ -36,19 +36,21 @@ class AbnAmroDescription implements SpecificInterface public $row; /** + * @codeCoverageIgnore * @return string */ public static function getDescription(): string { - return 'Fixes possible problems with ABN Amro descriptions.'; + return 'import.specific_abn_descr'; } /** + * @codeCoverageIgnore * @return string */ public static function getName(): string { - return 'ABN Amro description'; + return 'import.specific_abn_name'; } /** @@ -81,7 +83,7 @@ class AbnAmroDescription implements SpecificInterface * * @return bool true if the description is GEA/BEA-format, false otherwise */ - protected function parseABNAMRODescription() + protected function parseABNAMRODescription(): bool { // See if the current description is formatted in ABN AMRO format if (preg_match('/ABN AMRO.{24} (.*)/', $this->row[7], $matches)) { @@ -99,7 +101,7 @@ class AbnAmroDescription implements SpecificInterface * * @return bool true if the description is GEA/BEAformat, false otherwise */ - protected function parseGEABEADescription() + protected function parseGEABEADescription(): bool { // See if the current description is formatted in GEA/BEA format if (preg_match('/([BG]EA) +(NR:[a-zA-Z:0-9]+) +([0-9.\/]+) +([^,]*)/', $this->row[7], $matches)) { @@ -124,7 +126,7 @@ class AbnAmroDescription implements SpecificInterface * * @return bool true if the description is SEPA format, false otherwise */ - protected function parseSepaDescription() + protected function parseSepaDescription(): bool { // See if the current description is formatted as a SEPA plain description if (preg_match('/^SEPA(.{28})/', $this->row[7], $matches)) { @@ -178,7 +180,7 @@ class AbnAmroDescription implements SpecificInterface * * @return bool true if the description is TRTP format, false otherwise */ - protected function parseTRTPDescription() + protected function parseTRTPDescription(): bool { // See if the current description is formatted in TRTP format if (preg_match_all('!\/([A-Z]{3,4})\/([^/]*)!', $this->row[7], $matches, PREG_SET_ORDER)) { @@ -196,7 +198,7 @@ class AbnAmroDescription implements SpecificInterface switch (strtoupper($key)) { case 'NAME': - $this->row[8] = $name = $value; + $this->row[8] = $value; break; case 'REMI': $newDescription = $value; diff --git a/app/Import/Specifics/IngDescription.php b/app/Import/Specifics/IngDescription.php index 4277a31df2..599f22d669 100644 --- a/app/Import/Specifics/IngDescription.php +++ b/app/Import/Specifics/IngDescription.php @@ -38,19 +38,21 @@ class IngDescription implements SpecificInterface public $row; /** + * @codeCoverageIgnore * @return string */ public static function getDescription(): string { - return 'Create better descriptions in ING import files.'; + return 'import.specific_ing_descr'; } /** + * @codeCoverageIgnore * @return string */ public static function getName(): string { - return 'ING description'; + return 'import.specific_ing_name'; } /** @@ -84,41 +86,29 @@ class IngDescription implements SpecificInterface /** * Add the Opposing name from cell 1 in the description for Betaalautomaten * Otherwise the description is only: 'Pasvolgnr: Transactie: Term:'. - * - * @return bool true */ - protected function addNameIngDescription() + protected function addNameIngDescription(): void { $this->row[8] = $this->row[1] . ' ' . $this->row[8]; - - return true; } /** * Remove IBAN number out of the description * Default description of Description is: Naam: Omschrijving: IBAN: . - * - * @return bool true */ - protected function removeIBANIngDescription() + protected function removeIBANIngDescription(): void { // Try replace the iban number with nothing. The IBAN nr is found in the third row $this->row[8] = preg_replace('/\sIBAN:\s' . $this->row[3] . '/', '', $this->row[8]); - - return true; } /** * Remove name from the description (Remove everything before the description incl the word 'Omschrijving' ). - * - * @return bool true */ - protected function removeNameIngDescription() + protected function removeNameIngDescription(): void { // Try remove everything before the 'Omschrijving' $this->row[8] = preg_replace('/.+Omschrijving: /', '', $this->row[8]); - - return true; } /** @@ -127,7 +117,7 @@ class IngDescription implements SpecificInterface private function copyDescriptionToOpposite(): void { $search = ['Naar Oranje Spaarrekening ', 'Afschrijvingen']; - if (0 === \strlen($this->row[3])) { + if ('' === (string)$this->row[3]) { $this->row[3] = trim(str_ireplace($search, '', $this->row[8])); } } diff --git a/app/Import/Specifics/PresidentsChoice.php b/app/Import/Specifics/PresidentsChoice.php index 6db235e8e8..b01fdb28a5 100644 --- a/app/Import/Specifics/PresidentsChoice.php +++ b/app/Import/Specifics/PresidentsChoice.php @@ -28,19 +28,21 @@ namespace FireflyIII\Import\Specifics; class PresidentsChoice implements SpecificInterface { /** + * @codeCoverageIgnore * @return string */ public static function getDescription(): string { - return 'Fixes problems with files from Presidents Choice Financial.'; + return 'import.specific_pres_descr'; } /** + * @codeCoverageIgnore * @return string */ public static function getName(): string { - return 'Presidents "Choice"'; + return 'import.specific_pres_name'; } /** diff --git a/app/Import/Specifics/RabobankDescription.php b/app/Import/Specifics/RabobankDescription.php index b940239f2f..3927fedf27 100644 --- a/app/Import/Specifics/RabobankDescription.php +++ b/app/Import/Specifics/RabobankDescription.php @@ -30,19 +30,21 @@ use Log; class RabobankDescription implements SpecificInterface { /** + * @codeCoverageIgnore * @return string */ public static function getDescription(): string { - return 'Fixes possible problems with Rabobank descriptions.'; + return 'import.specific_pres_descr'; } /** + * @codeCoverageIgnore * @return string */ public static function getName(): string { - return 'Rabobank description'; + return 'import.specific_rabo_name'; } /** diff --git a/app/Import/Specifics/SnsDescription.php b/app/Import/Specifics/SnsDescription.php index b79d16b9f5..3ce3f1499e 100644 --- a/app/Import/Specifics/SnsDescription.php +++ b/app/Import/Specifics/SnsDescription.php @@ -28,19 +28,21 @@ namespace FireflyIII\Import\Specifics; class SnsDescription implements SpecificInterface { /** + * @codeCoverageIgnore * @return string */ public static function getDescription(): string { - return 'Trim quotes from SNS descriptions.'; + return 'import.specific_sns_descr'; } /** + * @codeCoverageIgnore * @return string */ public static function getName(): string { - return 'SNS description'; + return 'import.specific_sns_name'; } /** diff --git a/app/Import/Storage/ImportArrayStorage.php b/app/Import/Storage/ImportArrayStorage.php new file mode 100644 index 0000000000..01315fbe9f --- /dev/null +++ b/app/Import/Storage/ImportArrayStorage.php @@ -0,0 +1,528 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Import\Storage; + +use Carbon\Carbon; +use DB; +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Filter\InternalTransferFilter; +use FireflyIII\Models\ImportJob; +use FireflyIII\Models\Rule; +use FireflyIII\Models\Transaction; +use FireflyIII\Models\TransactionType; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use FireflyIII\Repositories\Rule\RuleRepositoryInterface; +use FireflyIII\Repositories\Tag\TagRepositoryInterface; +use FireflyIII\TransactionRules\Processor; +use Illuminate\Database\QueryException; +use Illuminate\Support\Collection; +use Log; + +/** + * Creates new transactions based upon arrays. Will first check the array for duplicates. + * + * Class ImportArrayStorage + */ +class ImportArrayStorage +{ + /** @var bool */ + private $checkForTransfers = false; + /** @var ImportJob */ + private $importJob; + /** @var JournalRepositoryInterface */ + private $journalRepos; + /** @var ImportJobRepositoryInterface */ + private $repository; + /** @var Collection */ + private $transfers; + + /** + * Set job, count transfers in the array and create the repository. + * + * @param ImportJob $importJob + */ + public function setImportJob(ImportJob $importJob): void + { + $this->importJob = $importJob; + $this->countTransfers(); + + $this->repository = app(ImportJobRepositoryInterface::class); + $this->repository->setUser($importJob->user); + + $this->journalRepos = app(JournalRepositoryInterface::class); + $this->journalRepos->setUser($importJob->user); + + Log::debug('Constructed ImportArrayStorage()'); + } + + /** + * Actually does the storing. Does three things. + * - Store journals + * - Link to tag + * - Run rules (if set to) + * + * @return Collection + * @throws FireflyException + */ + public function store(): Collection + { + // store transactions + $this->setStatus('storing_data'); + $collection = $this->storeArray(); + $this->setStatus('stored_data'); + + // link tag: + $this->setStatus('linking_to_tag'); + $this->linkToTag($collection); + $this->setStatus('linked_to_tag'); + + // run rules, if configured to. + $config = $this->importJob->configuration; + if (isset($config['apply-rules']) && $config['apply-rules'] === true) { + $this->setStatus('applying_rules'); + $this->applyRules($collection); + $this->setStatus('rules_applied'); + } + + return $collection; + } + + /** + * Applies the users rules to the created journals. + * + * @param Collection $collection + * + * @throws FireflyException + */ + private function applyRules(Collection $collection): void + { + $rules = $this->getRules(); + if ($rules->count() > 0) { + foreach ($collection as $journal) { + $rules->each( + function (Rule $rule) use ($journal) { + Log::debug(sprintf('Going to apply rule #%d to journal %d.', $rule->id, $journal->id)); + $processor = Processor::make($rule); + $processor->handleTransactionJournal($journal); + if ($rule->stop_processing) { + return false; + } + + return true; + } + ); + } + } + } + + /** + * Count the number of transfers in the array. If this is zero, don't bother checking for double transfers. + */ + private function countTransfers(): void + { + Log::debug('Now in count transfers.'); + /** @var array $array */ + $array = $this->importJob->transactions; + $count = 0; + foreach ($array as $index => $transaction) { + if (strtolower(TransactionType::TRANSFER) === $transaction['type']) { + $count++; + Log::debug(sprintf('Row #%d is a transfer, increase count to %d', ($index + 1), $count)); + } + } + if (0 === $count) { + Log::debug('Count is zero.'); + } + if ($count > 0) { + Log::debug(sprintf('Count is %d', $count)); + $this->checkForTransfers = true; + + // get users transfers. Needed for comparison. + $this->getTransfers(); + } + + } + + /** + * @param array $transaction + * + * @throws FireflyException + * @return string + */ + private function getHash(array $transaction): string + { + unset($transaction['importHashV2']); + $json = json_encode($transaction); + if ($json === false) { + throw new FireflyException('Could not encode import array. Please see the logs.', $transaction); // @codeCoverageIgnore + } + $hash = hash('sha256', $json, false); + Log::debug(sprintf('The hash is: %s', $hash)); + + return $hash; + } + + /** + * Gets the users rules. + * + * @return Collection + */ + private function getRules(): Collection + { + /** @var RuleRepositoryInterface $repository */ + $repository = app(RuleRepositoryInterface::class); + $repository->setUser($this->importJob->user); + $set = $repository->getForImport(); + + Log::debug(sprintf('Found %d user rules.', $set->count())); + + return $set; + } + + /** + * Get the users transfers, so they can be compared to whatever the user is trying to import. + */ + private function getTransfers(): void + { + Log::debug('Now in getTransfers()'); + app('preferences')->mark(); + + /** @var JournalCollectorInterface $collector */ + $collector = app(JournalCollectorInterface::class); + $collector->setUser($this->importJob->user); + $collector->setAllAssetAccounts() + ->ignoreCache() + ->setTypes([TransactionType::TRANSFER]) + ->withOpposingAccount(); + $collector->removeFilter(InternalTransferFilter::class); + $this->transfers = $collector->getJournals(); + Log::debug(sprintf('Count of getTransfers() is %d', $this->transfers->count())); + } + + /** + * Check if the hash exists for the array the user wants to import. + * + * @param string $hash + * + * @return int|null + * @throws FireflyException + */ + private function hashExists(string $hash): ?int + { + $entry = $this->journalRepos->findByHash($hash); + if (null === $entry) { + Log::debug(sprintf('Found no transactions with hash %s.', $hash)); + + return null; + } + Log::info(sprintf('Found a transaction journal with an existing hash: %s', $hash)); + + return (int)$entry->transaction_journal_id; + } + + /** + * Link all imported journals to a tag. + * + * @param Collection $collection + */ + private function linkToTag(Collection $collection): void + { + if ($collection->count() === 0) { + return; + } + /** @var TagRepositoryInterface $repository */ + $repository = app(TagRepositoryInterface::class); + $repository->setUser($this->importJob->user); + $data = [ + 'tag' => trans('import.import_with_key', ['key' => $this->importJob->key]), + 'date' => new Carbon, + 'description' => null, + 'latitude' => null, + 'longitude' => null, + 'zoomLevel' => null, + 'tagMode' => 'nothing', + ]; + $tag = $repository->store($data); + + Log::debug(sprintf('Created tag #%d ("%s")', $tag->id, $tag->tag)); + Log::debug('Looping journals...'); + $journalIds = $collection->pluck('id')->toArray(); + $tagId = $tag->id; + foreach ($journalIds as $journalId) { + Log::debug(sprintf('Linking journal #%d to tag #%d...', $journalId, $tagId)); + try { + DB::table('tag_transaction_journal')->insert(['transaction_journal_id' => $journalId, 'tag_id' => $tagId]); + } catch (QueryException $e) { + Log::error(sprintf('Could not link journal #%d to tag #%d because: %s', $journalId, $tagId, $e->getMessage())); + Log::error($e->getTraceAsString()); + } + } + Log::info(sprintf('Linked %d journals to tag #%d ("%s")', $collection->count(), $tag->id, $tag->tag)); + + $this->repository->setTag($this->importJob, $tag); + + } + + /** + * Log about a duplicate object (double hash). + * + * @param array $transaction + * @param int $existingId + */ + private function logDuplicateObject(array $transaction, int $existingId): void + { + Log::info( + 'Transaction is a duplicate, and will not be imported (the hash exists).', + [ + 'existing' => $existingId, + 'description' => $transaction['description'] ?? '', + 'amount' => $transaction['transactions'][0]['amount'] ?? 0, + 'date' => isset($transaction['date']) ? $transaction['date'] : '', + ] + ); + + } + + /** + * Log about a duplicate transfer. + * + * @param array $transaction + */ + private function logDuplicateTransfer(array $transaction): void + { + Log::info( + 'Transaction is a duplicate transfer, and will not be imported (such a transfer exists already).', + [ + 'description' => $transaction['description'] ?? '', + 'amount' => $transaction['transactions'][0]['amount'] ?? 0, + 'date' => isset($transaction['date']) ? $transaction['date'] : '', + ] + ); + } + + /** + * Shorthand method to quickly set job status + * + * @param string $status + */ + private function setStatus(string $status): void + { + $this->repository->setStatus($this->importJob, $status); + } + + /** + * Store array as journals. + * + * @return Collection + * @throws FireflyException + */ + private function storeArray(): Collection + { + /** @var array $array */ + $array = $this->importJob->transactions; + $count = \count($array); + $toStore = []; + + Log::debug(sprintf('Now in store(). Count of items is %d', $count)); + + foreach ($array as $index => $transaction) { + Log::debug(sprintf('Now at item %d out of %d', $index + 1, $count)); + $hash = $this->getHash($transaction); + $existingId = $this->hashExists($hash); + if (null !== $existingId) { + $this->logDuplicateObject($transaction, $existingId); + $this->repository->addErrorMessage( + $this->importJob, sprintf( + 'Row #%d ("%s") could not be imported. It already exists.', + $index, $transaction['description'] + ) + ); + continue; + } + if ($this->checkForTransfers) { + if ($this->transferExists($transaction)) { + $this->logDuplicateTransfer($transaction); + $this->repository->addErrorMessage( + $this->importJob, sprintf( + 'Row #%d ("%s") could not be imported. Such a transfer already exists.', + $index, + $transaction['description'] + ) + ); + continue; + } + } + $transaction['importHashV2'] = $hash; + $toStore[] = $transaction; + } + $count = \count($toStore); + if ($count === 0) { + Log::info('No transactions to store left!'); + + return new Collection; + } + + Log::debug('Going to store...'); + // now actually store them: + $collection = new Collection; + foreach ($toStore as $index => $store) { + + // do duplicate detection again! + $hash = $this->getHash($store); + $existingId = $this->hashExists($hash); + if (null !== $existingId) { + $this->logDuplicateObject($store, $existingId); + $this->repository->addErrorMessage( + $this->importJob, sprintf( + 'Row #%d ("%s") could not be imported. It already exists.', + $index, $store['description'] + ) + ); + continue; + } + + + Log::debug(sprintf('Going to store entry %d of %d', $index + 1, $count)); + // convert the date to an object: + $store['date'] = Carbon::createFromFormat('Y-m-d', $store['date']); + $store['description'] = $store['description'] === '' ? '(empty description)' : $store['description']; + // store the journal. + $journal = $this->journalRepos->store($store); + Log::debug(sprintf('Stored as journal #%d', $journal->id)); + $collection->push($journal); + } + Log::debug('DONE storing!'); + + return $collection; + } + + /** + * Check if a transfer exists. + * + * @param $transaction + * + * @return bool + */ + private function transferExists(array $transaction): bool + { + Log::debug('Check if is a double transfer.'); + if (strtolower(TransactionType::TRANSFER) !== $transaction['type']) { + Log::debug(sprintf('Is a %s, not a transfer so no.', $transaction['type'])); + + return false; + } + // how many hits do we need? + $requiredHits = count($transaction['transactions']) * 4; + $totalHits = 0; + Log::debug(sprintf('Required hits for transfer comparison is %d', $requiredHits)); + Log::debug(sprintf('Array has %d transactions.', \count($transaction['transactions']))); + Log::debug(sprintf('System has %d existing transfers', \count($this->transfers))); + // loop over each split: + foreach ($transaction['transactions'] as $current) { + + // get the amount: + $amount = (string)($current['amount'] ?? '0'); + if (bccomp($amount, '0') === -1) { + $amount = bcmul($amount, '-1'); // @codeCoverageIgnore + } + + // get the description: + $description = '' === (string)$current['description'] ? $transaction['description'] : $current['description']; + + // get the source and destination ID's: + $currentSourceIDs = [(int)$current['source_id'], (int)$current['destination_id']]; + sort($currentSourceIDs); + + // get the source and destination names: + $currentSourceNames = [(string)$current['source_name'], (string)$current['destination_name']]; + sort($currentSourceNames); + + // then loop all transfers: + /** @var Transaction $transfer */ + foreach ($this->transfers as $transfer) { + // number of hits for this split-transfer combination: + $hits = 0; + Log::debug(sprintf('Now looking at transaction journal #%d', $transfer->journal_id)); + // compare amount: + Log::debug(sprintf('Amount %s compared to %s', $amount, $transfer->transaction_amount)); + if (0 !== bccomp($amount, $transfer->transaction_amount)) { + continue; + } + ++$hits; + Log::debug(sprintf('Comparison is a hit! (%s)', $hits)); + + // compare description: + Log::debug(sprintf('Comparing "%s" to "%s"', $description, $transfer->description)); + if ($description !== $transfer->description) { + continue; // @codeCoverageIgnore + } + ++$hits; + Log::debug(sprintf('Comparison is a hit! (%s)', $hits)); + + // compare date: + $transferDate = $transfer->date->format('Y-m-d'); + Log::debug(sprintf('Comparing dates "%s" to "%s"', $transaction['date'], $transferDate)); + if ($transaction['date'] !== $transferDate) { + continue; // @codeCoverageIgnore + } + ++$hits; + Log::debug(sprintf('Comparison is a hit! (%s)', $hits)); + + // compare source and destination id's + $transferSourceIDs = [(int)$transfer->account_id, (int)$transfer->opposing_account_id]; + sort($transferSourceIDs); + Log::debug('Comparing current transaction source+dest IDs', $currentSourceIDs); + Log::debug('.. with current transfer source+dest IDs', $transferSourceIDs); + if ($currentSourceIDs === $transferSourceIDs) { + ++$hits; + Log::debug(sprintf('Source IDs are the same! (%d)', $hits)); + } + unset($transferSourceIDs); + + // compare source and destination names + $transferSource = [(string)$transfer->account_name, (int)$transfer->opposing_account_name]; + sort($transferSource); + Log::debug('Comparing current transaction source+dest names', $currentSourceNames); + Log::debug('.. with current transfer source+dest names', $transferSource); + if ($currentSourceNames === $transferSource) { + // @codeCoverageIgnoreStart + Log::debug(sprintf('Source names are the same! (%d)', $hits)); + ++$hits; + // @codeCoverageIgnoreEnd + } + $totalHits += $hits; + if ($totalHits >= $requiredHits) { + return true; + } + } + } + Log::debug(sprintf('Total hits: %d, required: %d', $totalHits, $requiredHits)); + + return $totalHits >= $requiredHits; + } + +} diff --git a/app/Import/Storage/ImportStorage.php b/app/Import/Storage/ImportStorage.php deleted file mode 100644 index e53c707ea2..0000000000 --- a/app/Import/Storage/ImportStorage.php +++ /dev/null @@ -1,375 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Import\Storage; - -use Exception; -use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Factory\TransactionJournalFactory; -use FireflyIII\Import\Object\ImportJournal; -use FireflyIII\Models\ImportJob; -use FireflyIII\Models\TransactionType; -use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; -use FireflyIII\Repositories\Journal\JournalRepositoryInterface; -use Illuminate\Support\Collection; -use Log; -use Preferences; - -/** - * Is capable of storing individual ImportJournal objects. - * Adds 7 steps per object stored: - * 1. get all import data from import journal - * 2. is not a duplicate - * 3. create the journal - * 4. store journal - * 5. run rules - * 6. run bills - * 7. finished storing object - * - * Class ImportStorage. - */ -class ImportStorage -{ - use ImportSupport; - - /** @var Collection */ - public $errors; - /** @var Collection */ - public $journals; - /** @var int */ - protected $defaultCurrencyId = 1; - /** @var ImportJob */ - protected $job; // yes, hard coded - /** @var JournalRepositoryInterface */ - protected $journalRepository; - /** @var ImportJobRepositoryInterface */ - protected $repository; - /** @var Collection */ - protected $rules; - /** @var bool */ - private $applyRules = false; - /** @var string */ - private $dateFormat = 'Ymd'; - /** @var TransactionJournalFactory */ - private $factory; - /** @var Collection */ - private $objects; - /** @var int */ - private $total = 0; - /** @var array */ - private $transfers = []; - - /** - * ImportStorage constructor. - */ - public function __construct() - { - $this->objects = new Collection; - $this->journals = new Collection; - $this->errors = new Collection; - - } - - /** - * @param string $dateFormat - */ - public function setDateFormat(string $dateFormat) - { - $this->dateFormat = $dateFormat; - } - - /** - * @param ImportJob $job - */ - public function setJob(ImportJob $job) - { - $this->repository = app(ImportJobRepositoryInterface::class); - $this->journalRepository = app(JournalRepositoryInterface::class); - $this->repository->setUser($job->user); - $this->journalRepository->setUser($job->user); - $this->factory = app(TransactionJournalFactory::class); - $this->factory->setUser($job->user); - - $config = $this->repository->getConfiguration($job); - $currency = app('amount')->getDefaultCurrencyByUser($job->user); - $this->defaultCurrencyId = $currency->id; - $this->job = $job; - $this->transfers = $this->getTransfers(); - $this->applyRules = $config['apply-rules'] ?? false; - - if (true === $this->applyRules) { - Log::debug('applyRules seems to be true, get the rules.'); - $this->rules = $this->getRules(); - } - - Log::debug(sprintf('Value of apply rules is %s', var_export($this->applyRules, true))); - } - - /** - * @param Collection $objects - */ - public function setObjects(Collection $objects) - { - $this->objects = $objects; - $this->total = $objects->count(); - } - - /** - * Do storage of import objects. Is the main function. - * - * @return bool - */ - public function store(): bool - { - $this->objects->each( - function (ImportJournal $importJournal, int $index) { - try { - $this->storeImportJournal($index, $importJournal); - $this->addStep(); - } catch (Exception $e) { - $this->errors->push($e->getMessage()); - Log::error(sprintf('Cannot import row #%d because: %s', $index, $e->getMessage())); - Log::error($e->getTraceAsString()); - } - } - ); - Log::info('ImportStorage has finished.'); - - return true; - } - - /** - * @param int $index - * @param ImportJournal $importJournal - * - * @return bool - * - * @throws FireflyException - */ - protected function storeImportJournal(int $index, ImportJournal $importJournal): bool - { - Log::debug(sprintf('Going to store object #%d/%d with description "%s"', $index + 1, $this->total, $importJournal->getDescription())); - $assetAccount = $importJournal->asset->getAccount(); - $amount = $importJournal->getAmount(); - $foreignAmount = $importJournal->getForeignAmount(); - $currencyId = $this->getCurrencyId($importJournal); - $foreignCurrencyId = $this->getForeignCurrencyId($importJournal, $currencyId); - $date = $importJournal->getDate($this->dateFormat)->format('Y-m-d'); - $opposingAccount = $this->getOpposingAccount($importJournal->opposing, $assetAccount->id, $amount); - $transactionType = $this->getTransactionType($amount, $opposingAccount); - $this->addStep(); - - /** - * Check for double transfer. - */ - $parameters = [ - 'type' => $transactionType, - 'description' => $importJournal->getDescription(), - 'amount' => $amount, - 'date' => $date, - 'asset' => $assetAccount->name, - 'opposing' => $opposingAccount->name, - ]; - if ($this->isDoubleTransfer($parameters) || $this->hashAlreadyImported($importJournal->hash)) { - // throw error - $message = sprintf('Detected a possible duplicate, skip this one (hash: %s).', $importJournal->hash); - Log::error($message, $parameters); - - // add five steps to keep the pace: - $this->addSteps(5); - - throw new FireflyException($message); - } - unset($parameters); - $this->addStep(); - - - try { - $budget = $importJournal->budget->getBudget(); - $category = $importJournal->category->getCategory(); - $bill = $importJournal->bill->getBill(); - $source = $assetAccount; - $destination = $opposingAccount; - - // switch account arounds when the transaction type is a deposit. - if ($transactionType === TransactionType::DEPOSIT) { - [$destination, $source] = [$source, $destination]; - } - // switch accounts around when the amount is negative and it's a transfer. - // credits to @NyKoF - if($transactionType === TransactionType::TRANSFER && -1 === bccomp($amount, '0')) { - [$destination, $source] = [$source, $destination]; - } - Log::debug( - sprintf('Will make #%s (%s) the source and #%s (%s) the destination.', $source->id, $source->name, $destination->id, $destination->name) - ); - $data = [ - 'user' => $this->job->user_id, - 'type' => $transactionType, - 'date' => $importJournal->getDate($this->dateFormat), - 'description' => $importJournal->getDescription(), - 'piggy_bank_id' => null, - 'piggy_bank_name' => null, - 'bill_id' => null === $bill ? null : $bill->id, - 'bill_name' => null, - 'tags' => $importJournal->tags, - 'interest_date' => $importJournal->getMetaDate('interest_date'), - 'book_date' => $importJournal->getMetaDate('book_date'), - 'process_date' => $importJournal->getMetaDate('process_date'), - 'due_date' => $importJournal->getMetaDate('due_date'), - 'payment_date' => $importJournal->getMetaDate('payment_date'), - 'invoice_date' => $importJournal->getMetaDate('invoice_date'), - 'internal_reference' => $importJournal->metaFields['internal_reference'] ?? null, - 'notes' => $importJournal->notes, - 'sepa-cc' => $importJournal->getMetaString('sepa-cc'), - 'sepa-ct-op' => $importJournal->getMetaString('sepa-ct-op'), - 'sepa-ct-id' => $importJournal->getMetaString('sepa-ct-id'), - 'sepa-db' => $importJournal->getMetaString('sepa-db'), - 'sepa-country' => $importJournal->getMetaString('sepa-country'), - 'sepa-ep' => $importJournal->getMetaString('sepa-ep'), - 'sepa-ci' => $importJournal->getMetaString('sepa-ci'), - 'importHash' => $importJournal->hash, - 'transactions' => [ - // single transaction: - [ - 'description' => null, - 'amount' => $amount, - 'currency_id' => $currencyId, - 'currency_code' => null, - 'foreign_amount' => $foreignAmount, - 'foreign_currency_id' => $foreignCurrencyId, - 'foreign_currency_code' => null, - 'budget_id' => null === $budget ? null : $budget->id, - 'budget_name' => null, - 'category_id' => null === $category ? null : $category->id, - 'category_name' => null, - 'source_id' => $source->id, - 'source_name' => null, - 'destination_id' => $destination->id, - 'destination_name' => null, - 'reconciled' => false, - 'identifier' => 0, - ], - ], - ]; - $factoryJournal = $this->factory->create($data); - $this->journals->push($factoryJournal); - } catch (FireflyException $e) { - Log::error(sprintf('Could not use factory to store journal: %s', $e->getMessage())); - Log::error($e->getTraceAsString()); - } - - $this->addStep(); - $this->addStep(); - - // run rules if config calls for it: - if (true === $this->applyRules) { - Log::info('Will apply rules to this journal.'); - $this->applyRules($factoryJournal); - } - Preferences::setForUser($this->job->user, 'lastActivity', microtime()); - - if (!(true === $this->applyRules)) { - Log::info('Will NOT apply rules to this journal.'); - } - $this->addStep(); - $this->addStep(); - - Log::info( - sprintf( - 'Imported new journal #%d: "%s", amount %s %s.', $factoryJournal->id, $factoryJournal->description, $factoryJournal->transactionCurrency->code, - $amount - ) - ); - - return true; - } - - /** - * Shorthand method. - */ - private function addStep() - { - $this->repository->addStepsDone($this->job, 1); - } - - /** - * Shorthand method - * - * @param int $steps - */ - private function addSteps(int $steps) - { - $this->repository->addStepsDone($this->job, $steps); - } - - /** - * @param array $parameters - * - * @return bool - */ - private function isDoubleTransfer(array $parameters): bool - { - Log::debug('Check if is a double transfer.'); - if (TransactionType::TRANSFER !== $parameters['type']) { - Log::debug(sprintf('Is a %s, not a transfer so no.', $parameters['type'])); - - return false; - } - - $amount = app('steam')->positive($parameters['amount']); - $names = [$parameters['asset'], $parameters['opposing']]; - - sort($names); - - foreach ($this->transfers as $transfer) { - $hits = 0; - if ($parameters['description'] === $transfer['description']) { - ++$hits; - Log::debug(sprintf('Description "%s" equals "%s", hits = %d', $parameters['description'], $transfer['description'], $hits)); - } - if ($names === $transfer['names']) { - ++$hits; - Log::debug(sprintf('Involved accounts, "%s" equals "%s", hits = %d', implode(',', $names), implode(',', $transfer['names']), $hits)); - } - if (0 === bccomp($amount, $transfer['amount'])) { - ++$hits; - Log::debug(sprintf('Amount %s equals %s, hits = %d', $amount, $transfer['amount'], $hits)); - } - if ($parameters['date'] === $transfer['date']) { - ++$hits; - Log::debug(sprintf('Date %s equals %s, hits = %d', $parameters['date'], $transfer['date'], $hits)); - } - // number of hits is 4? Then it's a match - if (4 === $hits) { - Log::error( - 'There already is a transfer imported with these properties. Compare existing with new. ', - ['existing' => $transfer, 'new' => $parameters] - ); - - return true; - } - } - - return false; - } -} diff --git a/app/Import/Storage/ImportSupport.php b/app/Import/Storage/ImportSupport.php deleted file mode 100644 index 1affa15731..0000000000 --- a/app/Import/Storage/ImportSupport.php +++ /dev/null @@ -1,304 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Import\Storage; - -use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Import\Object\ImportAccount; -use FireflyIII\Import\Object\ImportJournal; -use FireflyIII\Models\Account; -use FireflyIII\Models\AccountType; -use FireflyIII\Models\Bill; -use FireflyIII\Models\ImportJob; -use FireflyIII\Models\Rule; -use FireflyIII\Models\TransactionJournal; -use FireflyIII\Models\TransactionJournalMeta; -use FireflyIII\Models\TransactionType; -use FireflyIII\Repositories\Journal\JournalRepositoryInterface; -use FireflyIII\TransactionRules\Processor; -use Illuminate\Database\Query\JoinClause; -use Illuminate\Support\Collection; -use Log; - -/** - * Trait ImportSupport. - * - * @property int $defaultCurrencyId - * @property ImportJob $job - * @property JournalRepositoryInterface $journalRepository; - * @property Collection $rules - */ -trait ImportSupport -{ - /** - * @param TransactionJournal $journal - * - * @return bool - */ - protected function applyRules(TransactionJournal $journal): bool - { - if ($this->rules->count() > 0) { - $this->rules->each( - function (Rule $rule) use ($journal) { - Log::debug(sprintf('Going to apply rule #%d to journal %d.', $rule->id, $journal->id)); - $processor = Processor::make($rule); - $processor->handleTransactionJournal($journal); - if ($rule->stop_processing) { - return false; - } - - return true; - } - ); - } - - return true; - } - - /** - * This method finds out what the import journal's currency should be. The account itself - * is favoured (and usually it stops there). If no preference is found, the journal has a say - * and thirdly the default currency is used. - * - * @param ImportJournal $importJournal - * - * @return int - * - * @throws FireflyException - */ - private function getCurrencyId(ImportJournal $importJournal): int - { - // start with currency pref of account, if any: - $account = $importJournal->asset->getAccount(); - $currencyId = (int)$account->getMeta('currency_id'); - if ($currencyId > 0) { - return $currencyId; - } - - // use given currency - $currency = $importJournal->currency->getTransactionCurrency(); - if (null !== $currency) { - return $currency->id; - } - - // backup to default - $currency = $this->defaultCurrencyId; - - return $currency; - } - - /** - * The foreign currency is only returned when the journal has a different value from the - * currency id (see other method). - * - * @param ImportJournal $importJournal - * @param int $currencyId - * - * @see ImportSupport::getCurrencyId - * - * @return int|null - */ - private function getForeignCurrencyId(ImportJournal $importJournal, int $currencyId): ?int - { - // use given currency by import journal. - $currency = $importJournal->foreignCurrency->getTransactionCurrency(); - if (null !== $currency && (int)$currency->id !== (int)$currencyId) { - return $currency->id; - } - - // return null, because no different: - return null; - } - - /** - * The search for the opposing account is complex. Firstly, we forbid the ImportAccount to resolve into the asset - * account to prevent a situation where the transaction flows from A to A. Given the amount, we "expect" the opposing - * account to be an expense or a revenue account. However, the mapping given by the user may return something else - * entirely (usually an asset account). So whatever the expectation, the result may be anything. - * - * When the result does not match the expected type (a negative amount cannot be linked to a revenue account) the next step - * will return an error. - * - * @param ImportAccount $account - * @param int $forbiddenAccount - * @param string $amount - * - * @see ImportSupport::getTransactionType - * - * @return Account - * - * @throws FireflyException - */ - private function getOpposingAccount(ImportAccount $account, int $forbiddenAccount, string $amount): Account - { - $account->setForbiddenAccountId($forbiddenAccount); - if (bccomp($amount, '0') === -1) { - Log::debug(sprintf('%s is negative, create opposing expense account.', $amount)); - $account->setExpectedType(AccountType::EXPENSE); - - return $account->getAccount(); - } - Log::debug(sprintf('%s is positive, create opposing revenue account.', $amount)); - // amount is positive, it's a deposit, opposing is an revenue: - $account->setExpectedType(AccountType::REVENUE); - - return $account->getAccount(); - } - - /** - * @return Collection - */ - private function getRules(): Collection - { - $set = Rule::distinct() - ->where('rules.user_id', $this->job->user->id) - ->leftJoin('rule_groups', 'rule_groups.id', '=', 'rules.rule_group_id') - ->leftJoin('rule_triggers', 'rules.id', '=', 'rule_triggers.rule_id') - ->where('rule_groups.active', 1) - ->where('rule_triggers.trigger_type', 'user_action') - ->where('rule_triggers.trigger_value', 'store-journal') - ->where('rules.active', 1) - ->orderBy('rule_groups.order', 'ASC') - ->orderBy('rules.order', 'ASC') - ->get(['rules.*', 'rule_groups.order']); - Log::debug(sprintf('Found %d user rules.', $set->count())); - - return $set; - } - - /** - * Given the amount and the opposing account its easy to define which kind of transaction type should be associated with the new - * import. This may however fail when there is an unexpected mismatch between the transaction type and the opposing account. - * - * @param string $amount - * @param Account $account - * - * @return string - *x - * - * @throws FireflyException - * - * @see ImportSupport::getOpposingAccount() - */ - private function getTransactionType(string $amount, Account $account): string - { - $transactionType = TransactionType::WITHDRAWAL; - // amount is negative, it's a withdrawal, opposing is an expense: - if (bccomp($amount, '0') === -1) { - $transactionType = TransactionType::WITHDRAWAL; - } - - if (1 === bccomp($amount, '0')) { - $transactionType = TransactionType::DEPOSIT; - } - - // if opposing is an asset account, it's a transfer: - if (AccountType::ASSET === $account->accountType->type) { - Log::debug(sprintf('Opposing account #%d %s is an asset account, make transfer.', $account->id, $account->name)); - $transactionType = TransactionType::TRANSFER; - } - - // verify that opposing account is of the correct type: - if (AccountType::EXPENSE === $account->accountType->type && TransactionType::WITHDRAWAL !== $transactionType) { - $message = 'This row is imported as a withdrawal but opposing is an expense account. This cannot be!'; - Log::error($message); - throw new FireflyException($message); - } - - return $transactionType; - } - - /** - * This method returns a collection of the current transfers in the system and some meta data for - * this set. This can later be used to see if the journal that firefly is trying to import - * is not already present. - * - * @return array - */ - private function getTransfers(): array - { - $set = TransactionJournal::leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id') - ->leftJoin( - 'transactions AS source', - function (JoinClause $join) { - $join->on('transaction_journals.id', '=', 'source.transaction_journal_id')->where('source.amount', '<', 0); - } - ) - ->leftJoin( - 'transactions AS destination', - function (JoinClause $join) { - $join->on('transaction_journals.id', '=', 'destination.transaction_journal_id')->where( - 'destination.amount', - '>', - 0 - ); - } - ) - ->leftJoin('accounts as source_accounts', 'source.account_id', '=', 'source_accounts.id') - ->leftJoin('accounts as destination_accounts', 'destination.account_id', '=', 'destination_accounts.id') - ->where('transaction_journals.user_id', $this->job->user_id) - ->where('transaction_types.type', TransactionType::TRANSFER) - ->get( - ['transaction_journals.id', 'transaction_journals.encrypted', 'transaction_journals.description', - 'source_accounts.name as source_name', 'destination_accounts.name as destination_name', 'destination.amount', - 'transaction_journals.date',] - ); - $array = []; - /** @var TransactionJournal $entry */ - foreach ($set as $entry) { - $original = [app('steam')->tryDecrypt($entry->source_name), app('steam')->tryDecrypt($entry->destination_name)]; - sort($original); - $array[] = [ - 'names' => $original, - 'amount' => $entry->amount, - 'date' => $entry->date->format('Y-m-d'), - 'description' => $entry->description, - ]; - } - - return $array; - } - - /** - * Checks if the import journal has not been imported before. - * - * @param string $hash - * - * @return bool - */ - private function hashAlreadyImported(string $hash): bool - { - $json = json_encode($hash); - /** @var TransactionJournalMeta $entry */ - $entry = TransactionJournalMeta::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id') - ->where('data', $json) - ->where('name', 'importHash') - ->first(); - if (null !== $entry) { - Log::error(sprintf('A journal with hash %s has already been imported (spoiler: it\'s journal #%d)', $hash, $entry->transaction_journal_id)); - - return true; - } - - return false; - } -} diff --git a/app/Mail/AccessTokenCreatedMail.php b/app/Mail/AccessTokenCreatedMail.php new file mode 100644 index 0000000000..6e0e43e8a4 --- /dev/null +++ b/app/Mail/AccessTokenCreatedMail.php @@ -0,0 +1,68 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Mail; + + +use Illuminate\Bus\Queueable; +use Illuminate\Mail\Mailable; +use Illuminate\Queue\SerializesModels; +use Laravel\Passport\Token; + +/** + * Class AccessTokenCreatedMail + */ +class AccessTokenCreatedMail extends Mailable +{ + + use Queueable, SerializesModels; + + /** @var string Email address of admin */ + public $email; + /** @var string IP address of admin */ + public $ipAddress; + + /** + * AccessTokenCreatedMail constructor. + * + * @param string $email + * @param string $ipAddress + * @param Token $token + */ + public function __construct(string $email, string $ipAddress) + { + $this->email = $email; + $this->ipAddress = $ipAddress; + } + + /** + * Build the message. + * + * @return $this + */ + public function build() + { + return $this->view('emails.access-token-created-html')->text('emails.access-token-created-text') + ->subject('A new access token was created'); + } +} \ No newline at end of file diff --git a/app/Mail/ConfirmEmailChangeMail.php b/app/Mail/ConfirmEmailChangeMail.php index 4a0e5dd1cd..9289671ea9 100644 --- a/app/Mail/ConfirmEmailChangeMail.php +++ b/app/Mail/ConfirmEmailChangeMail.php @@ -68,6 +68,6 @@ class ConfirmEmailChangeMail extends Mailable public function build() { return $this->view('emails.confirm-email-change-html')->text('emails.confirm-email-change-text') - ->subject('Your Firefly III email address has changed.'); + ->subject('Your Firefly III email address has changed'); } } diff --git a/app/Mail/OAuthTokenCreatedMail.php b/app/Mail/OAuthTokenCreatedMail.php new file mode 100644 index 0000000000..5036c1225d --- /dev/null +++ b/app/Mail/OAuthTokenCreatedMail.php @@ -0,0 +1,70 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Mail; + +use Illuminate\Bus\Queueable; +use Illuminate\Mail\Mailable; +use Illuminate\Queue\SerializesModels; +use Laravel\Passport\Client; + + +/** + * Class OAuthTokenCreatedMail + */ +class OAuthTokenCreatedMail extends Mailable +{ + use Queueable, SerializesModels; + + /** @var Client The client */ + public $client; + /** @var string Email address of admin */ + public $email; + /** @var string IP address of admin */ + public $ipAddress; + + /** + * OAuthTokenCreatedMail constructor. + * + * @param string $email + * @param string $ipAddress + * @param Client $client + */ + public function __construct(string $email, string $ipAddress, Client $client) + { + $this->email = $email; + $this->ipAddress = $ipAddress; + $this->client = $client; + } + + /** + * Build the message. + * + * @return $this + */ + public function build(): self + { + return $this->view('emails.oauth-client-created-html')->text('emails.oauth-client-created-text') + ->subject('A new OAuth client has been created'); + } +} \ No newline at end of file diff --git a/app/Mail/UndoEmailChangeMail.php b/app/Mail/UndoEmailChangeMail.php index 94a6b5b5ab..a47d6ee9f4 100644 --- a/app/Mail/UndoEmailChangeMail.php +++ b/app/Mail/UndoEmailChangeMail.php @@ -66,6 +66,6 @@ class UndoEmailChangeMail extends Mailable public function build() { return $this->view('emails.undo-email-change-html')->text('emails.undo-email-change-text') - ->subject('Your Firefly III email address has changed.'); + ->subject('Your Firefly III email address has changed'); } } diff --git a/app/Models/Account.php b/app/Models/Account.php index 3e823b5a9a..1e79b0aa2c 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -24,6 +24,7 @@ namespace FireflyIII\Models; use Crypt; use FireflyIII\Exceptions\FireflyException; +use FireflyIII\User; use Illuminate\Contracts\Encryption\DecryptException; use Illuminate\Database\Eloquent\Builder as EloquentBuilder; use Illuminate\Database\Eloquent\Model; @@ -31,16 +32,16 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Query\JoinClause; -use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Log; -use FireflyIII\Models\AccountType; -use FireflyIII\Models\AccountMeta; -use FireflyIII\User; -use FireflyIII\Models\Transaction; -use FireflyIII\Models\PiggyBank; +use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** * Class Account. + * + * @property int $id + * @property string $name + * @property string $iban + * @property AccountType $accountType */ class Account extends Model { diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php index 5602821e59..9729d5a34f 100644 --- a/app/Models/AccountType.php +++ b/app/Models/AccountType.php @@ -28,6 +28,8 @@ use FireflyIII\Models\Account; /** * Class AccountType. + * @property string $type + * */ class AccountType extends Model { diff --git a/app/Models/Bill.php b/app/Models/Bill.php index e42126e39d..bf4c01ff12 100644 --- a/app/Models/Bill.php +++ b/app/Models/Bill.php @@ -29,10 +29,14 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use FireflyIII\Models\Attachment; /** * Class Bill. + * + * @property bool $active + * @property int $transaction_currency_id + * @property string $amount_min + * @property string $amount_max */ class Bill extends Model { diff --git a/app/Models/ImportJob.php b/app/Models/ImportJob.php index a984176a9b..7a9759f263 100644 --- a/app/Models/ImportJob.php +++ b/app/Models/ImportJob.php @@ -22,33 +22,28 @@ declare(strict_types=1); namespace FireflyIII\Models; -use Crypt; -use FireflyIII\Exceptions\FireflyException; use FireflyIII\User; use Illuminate\Database\Eloquent\Model; -use Log; -use Storage; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; /** * Class ImportJob. * - * @property User $user + * @property array $transactions + * @property array $configuration + * @property User $user + * @property int $user_id + * @property string $status + * @property string $stage + * @property string $key + * @property string $provider + * @property string $file_type + * @property int $tag_id + * @property Tag $tag */ class ImportJob extends Model { - /** - * @var array - */ - public $validStatus - = [ - 'new', - 'configuring', - 'configured', - 'running', - 'error', - 'finished', - ]; + /** * The attributes that should be casted to native types. * @@ -56,9 +51,15 @@ class ImportJob extends Model */ protected $casts = [ - 'created_at' => 'datetime', - 'updated_at' => 'datetime', + 'created_at' => 'datetime', + 'updated_at' => 'datetime', + 'configuration' => 'array', + 'extended_status' => 'array', + 'transactions' => 'array', + 'errors' => 'array', ]; + /** @var array */ + protected $fillable = ['key', 'user_id', 'file_type', 'provider', 'status', 'stage', 'configuration', 'extended_status', 'transactions', 'errors']; /** * @param $value @@ -66,7 +67,6 @@ class ImportJob extends Model * @return mixed * * @throws NotFoundHttpException - * @throws FireflyException */ public static function routeBinder(string $value): ImportJob { @@ -74,11 +74,6 @@ class ImportJob extends Model $key = trim($value); $importJob = auth()->user()->importJobs()->where('key', $key)->first(); if (null !== $importJob) { - // must have valid status: - if (!\in_array($importJob->status, $importJob->validStatus)) { - throw new FireflyException(sprintf('ImportJob with key "%s" has invalid status "%s"', $importJob->key, $importJob->status)); - } - return $importJob; } } @@ -86,112 +81,21 @@ class ImportJob extends Model } /** - * @param int $count + * @codeCoverageIgnore + * @return \Illuminate\Database\Eloquent\Relations\MorphMany */ - public function addTotalSteps(int $count) + public function attachments() { - $status = $this->extended_status; - $status['steps'] += $count; - $this->extended_status = $status; - $this->save(); - Log::debug(sprintf('Add %d to total steps for job "%s" making total steps %d', $count, $this->key, $status['steps'])); - } - - /** - * @param string $status - * - * @throws FireflyException - */ - public function change(string $status): void - { - if (\in_array($status, $this->validStatus)) { - Log::debug(sprintf('Job status set (in model) to "%s"', $status)); - $this->status = $status; - $this->save(); - - return; - } - throw new FireflyException(sprintf('Status "%s" is invalid for job "%s".', $status, $this->key)); - - } - - /** - * @param $value - * - * @return mixed - */ - public function getConfigurationAttribute($value) - { - if (null === $value) { - return []; - } - if (0 === \strlen($value)) { - return []; - } - - return json_decode($value, true); - } - - /** - * @param $value - * - * @return mixed - */ - public function getExtendedStatusAttribute($value) - { - if (0 === \strlen((string)$value)) { - return []; - } - - return json_decode($value, true); + return $this->morphMany(Attachment::class, 'attachable'); } /** * @codeCoverageIgnore - * - * @param $value + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ - public function setConfigurationAttribute($value) + public function tag() { - $this->attributes['configuration'] = json_encode($value); - } - - /** - * @codeCoverageIgnore - * - * @param $value - */ - public function setExtendedStatusAttribute($value) - { - $this->attributes['extended_status'] = json_encode($value); - } - - /** - * @param $value - */ - public function setStatusAttribute(string $value) - { - if (\in_array($value, $this->validStatus)) { - $this->attributes['status'] = $value; - } - } - - /** - * @return string - * - * @throws \Illuminate\Contracts\Encryption\DecryptException - * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException - */ - public function uploadFileContents(): string - { - $fileName = $this->key . '.upload'; - $disk = Storage::disk('upload'); - $encryptedContent = $disk->get($fileName); - $content = Crypt::decrypt($encryptedContent); - $content = trim($content); - Log::debug(sprintf('Content size is %d bytes.', \strlen($content))); - - return $content; + return $this->belongsTo(Tag::class); } /** diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php index eefd0d0706..4e13b540c5 100644 --- a/app/Models/PiggyBank.php +++ b/app/Models/PiggyBank.php @@ -36,6 +36,11 @@ use FireflyIII\Models\Account; /** * Class PiggyBank. + * + * @property Carbon $targetdate + * @property Carbon $startdate + * @property string $targetamount + * */ class PiggyBank extends Model { @@ -132,32 +137,6 @@ class PiggyBank extends Model return $value; } - /** - * @deprecated - * @return string - */ - public function getSuggestedMonthlyAmount(): string - { - $savePerMonth = '0'; - if ($this->targetdate && $this->currentRelevantRep()->currentamount < $this->targetamount) { - $now = Carbon::now(); - $diffInMonths = $now->diffInMonths($this->targetdate, false); - $remainingAmount = bcsub($this->targetamount, $this->currentRelevantRep()->currentamount); - - // more than 1 month to go and still need money to save: - if ($diffInMonths > 0 && 1 === bccomp($remainingAmount, '0')) { - $savePerMonth = bcdiv($remainingAmount, (string)$diffInMonths); - } - - // less than 1 month to go but still need money to save: - if (0 === $diffInMonths && 1 === bccomp($remainingAmount, '0')) { - $savePerMonth = $remainingAmount; - } - } - - return $savePerMonth; - } - /** * @param Carbon $date * diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php index c1644456f4..3efac08652 100644 --- a/app/Models/PiggyBankRepetition.php +++ b/app/Models/PiggyBankRepetition.php @@ -29,6 +29,7 @@ use FireflyIII\Models\PiggyBank; /** * Class PiggyBankRepetition. + * @property string $currentamount */ class PiggyBankRepetition extends Model { diff --git a/app/Models/Preference.php b/app/Models/Preference.php index 16a092a18c..3a873f7086 100644 --- a/app/Models/Preference.php +++ b/app/Models/Preference.php @@ -34,6 +34,7 @@ use FireflyIII\User; * Class Preference. * * @property mixed $data + * @property string $name */ class Preference extends Model { @@ -49,7 +50,7 @@ class Preference extends Model ]; /** @var array */ - protected $fillable = ['user_id', 'data', 'name', 'data']; + protected $fillable = ['user_id', 'data', 'name']; /** * @param $value diff --git a/app/Models/Rule.php b/app/Models/Rule.php index ed2d1161bb..e6e65ba73e 100644 --- a/app/Models/Rule.php +++ b/app/Models/Rule.php @@ -32,6 +32,9 @@ use FireflyIII\Models\RuleAction; /** * Class Rule. + * @property bool $stop_processing + * @property int $id + * @property \Illuminate\Support\Collection $ruleTriggers */ class Rule extends Model { diff --git a/app/Models/RuleGroup.php b/app/Models/RuleGroup.php index f16c6079ae..cfe4ae2c35 100644 --- a/app/Models/RuleGroup.php +++ b/app/Models/RuleGroup.php @@ -30,6 +30,7 @@ use FireflyIII\Models\Rule; /** * Class RuleGroup. + * @property bool $active */ class RuleGroup extends Model { diff --git a/app/Models/RuleTrigger.php b/app/Models/RuleTrigger.php index 3b68656a91..58265d0d1c 100644 --- a/app/Models/RuleTrigger.php +++ b/app/Models/RuleTrigger.php @@ -23,10 +23,12 @@ declare(strict_types=1); namespace FireflyIII\Models; use Illuminate\Database\Eloquent\Model; -use FireflyIII\Models\Rule; /** * Class RuleTrigger. + * + * @property string $trigger_value + * @property string $trigger_type */ class RuleTrigger extends Model { diff --git a/app/Models/Tag.php b/app/Models/Tag.php index 11a9d8fadd..9a085b0325 100644 --- a/app/Models/Tag.php +++ b/app/Models/Tag.php @@ -25,12 +25,18 @@ namespace FireflyIII\Models; use Crypt; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; +use Illuminate\Support\Collection; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use FireflyIII\User; use FireflyIII\Models\TransactionJournal; /** * Class Tag. + * + * @property Collection $transactionJournals + * @property string $tag + * @property int $id + * @property \Carbon\Carbon $date */ class Tag extends Model { diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php index 14ed95095b..b591f1d956 100644 --- a/app/Models/Transaction.php +++ b/app/Models/Transaction.php @@ -27,11 +27,6 @@ use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use FireflyIII\Models\TransactionJournal; -use FireflyIII\Models\TransactionCurrency; -use FireflyIII\Models\Category; -use FireflyIII\Models\Budget; -use FireflyIII\Models\Account; /** * Class Transaction. @@ -49,12 +44,14 @@ use FireflyIII\Models\Account; * @property string $account_iban * @property string $account_number * @property string $account_bic + * @property string $account_type * @property string $account_currency_code * @property int $opposing_account_id * @property string $opposing_account_name * @property string $opposing_account_iban * @property string $opposing_account_number * @property string $opposing_account_bic + * @property string $opposing_account_type * @property string $opposing_currency_code * @property int $transaction_budget_id * @property string $transaction_budget_name @@ -74,6 +71,7 @@ use FireflyIII\Models\Account; * @property string $description * @property bool $is_split * @property int $attachmentCount + * @property int $transaction_currency_id */ class Transaction extends Model { diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php index ef74e55f19..439962a257 100644 --- a/app/Models/TransactionCurrency.php +++ b/app/Models/TransactionCurrency.php @@ -31,6 +31,7 @@ use FireflyIII\Models\TransactionJournal; * Class TransactionCurrency. * * @property string $code + * @property int $decimal_places * */ class TransactionCurrency extends Model diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index 6432d371b4..40595f644d 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -51,6 +51,7 @@ use FireflyIII\Models\Attachment; * Class TransactionJournal. * * @property User $user + * @property int $bill_id */ class TransactionJournal extends Model { diff --git a/app/Models/TransactionJournalMeta.php b/app/Models/TransactionJournalMeta.php index 5016de36e2..bef13e7fa8 100644 --- a/app/Models/TransactionJournalMeta.php +++ b/app/Models/TransactionJournalMeta.php @@ -29,6 +29,8 @@ use FireflyIII\Models\TransactionJournal; /** * Class TransactionJournalMeta. + * @property string $name + * @property int $transaction_journal_id */ class TransactionJournalMeta extends Model { diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php index dbbb775f7e..67a1b906e1 100644 --- a/app/Models/TransactionType.php +++ b/app/Models/TransactionType.php @@ -29,6 +29,7 @@ use FireflyIII\Models\TransactionJournal; /** * Class TransactionType. + * @property string $type */ class TransactionType extends Model { diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 75b5dc0921..352e357d22 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -22,6 +22,7 @@ declare(strict_types=1); namespace FireflyIII\Providers; +use Exception; use FireflyIII\Events\AdminRequestedTestMessage; use FireflyIII\Events\RegisteredUser; use FireflyIII\Events\RequestedNewPassword; @@ -29,10 +30,18 @@ use FireflyIII\Events\RequestedVersionCheckStatus; use FireflyIII\Events\StoredTransactionJournal; use FireflyIII\Events\UpdatedTransactionJournal; use FireflyIII\Events\UserChangedEmail; +use FireflyIII\Mail\OAuthTokenCreatedMail; use FireflyIII\Models\PiggyBank; use FireflyIII\Models\PiggyBankRepetition; +use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Auth\Events\Login; use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider; +use Laravel\Passport\Client; +use Laravel\Passport\Events\AccessTokenCreated; +use Log; +use Mail; +use Request; +use Session; /** * Class EventServiceProvider. @@ -82,6 +91,10 @@ class EventServiceProvider extends ServiceProvider UpdatedTransactionJournal::class => [ 'FireflyIII\Handlers\Events\UpdatedJournalEventHandler@processRules', ], + // API related events: + AccessTokenCreated::class => [ + 'FireflyIII\Handlers\Events\APIEventHandler@accessTokenCreated', + ], ]; /** @@ -91,14 +104,13 @@ class EventServiceProvider extends ServiceProvider public function boot() { parent::boot(); - $this->registerDeleteEvents(); $this->registerCreateEvents(); } /** * */ - protected function registerCreateEvents() + protected function registerCreateEvents(): void { // move this routine to a filter // in case of repeated piggy banks and/or other problems. @@ -112,13 +124,36 @@ class EventServiceProvider extends ServiceProvider $repetition->save(); } ); + Client::created( + function (Client $oauthClient) { + /** @var UserRepositoryInterface $repository */ + $repository = app(UserRepositoryInterface::class); + $user = $repository->findNull((int)$oauthClient->user_id); + if (null === $user) { + Log::error('OAuth client generated but no user associated.'); + + return; + } + + $email = $user->email; + $ipAddress = Request::ip(); + + Log::debug(sprintf('Now in EventServiceProvider::registerCreateEvents. Email is %s, IP is %s', $email, $ipAddress)); + try { + Log::debug('Trying to send message...'); + Mail::to($email)->send(new OAuthTokenCreatedMail($email, $ipAddress, $oauthClient)); + // @codeCoverageIgnoreStart + } catch (Exception $e) { + Log::debug('Send message failed! :('); + Log::error($e->getMessage()); + Log::error($e->getTraceAsString()); + Session::flash('error', 'Possible email error: ' . $e->getMessage()); + } + Log::debug('If no error above this line, message was sent.'); + + + } + ); } - /** - * - */ - protected function registerDeleteEvents() - { - - } } diff --git a/app/Repositories/Account/AccountRepositoryInterface.php b/app/Repositories/Account/AccountRepositoryInterface.php index 8c8bdaf7ea..7820888a99 100644 --- a/app/Repositories/Account/AccountRepositoryInterface.php +++ b/app/Repositories/Account/AccountRepositoryInterface.php @@ -66,10 +66,9 @@ interface AccountRepositoryInterface * @param string $number * @param array $types * - * @deprecated - * @return Account + * @return Account|null */ - public function findByAccountNumber(string $number, array $types): Account; + public function findByAccountNumber(string $number, array $types): ?Account; /** * @param string $iban diff --git a/app/Repositories/Account/FindAccountsTrait.php b/app/Repositories/Account/FindAccountsTrait.php index d520af06fe..79451ff6e4 100644 --- a/app/Repositories/Account/FindAccountsTrait.php +++ b/app/Repositories/Account/FindAccountsTrait.php @@ -58,12 +58,9 @@ trait FindAccountsTrait /** * @param string $number * @param array $types - * - * - * @deprecated - * @return Account + * @return Account|null */ - public function findByAccountNumber(string $number, array $types): Account + public function findByAccountNumber(string $number, array $types): ?Account { $query = $this->user->accounts() ->leftJoin('account_meta', 'account_meta.account_id', '=', 'accounts.id') @@ -81,7 +78,7 @@ trait FindAccountsTrait return $accounts->first(); } - return new Account; + return null; } /** diff --git a/app/Repositories/Attachment/AttachmentRepository.php b/app/Repositories/Attachment/AttachmentRepository.php index 23cf6e9fad..36d38ade9d 100644 --- a/app/Repositories/Attachment/AttachmentRepository.php +++ b/app/Repositories/Attachment/AttachmentRepository.php @@ -24,6 +24,7 @@ namespace FireflyIII\Repositories\Attachment; use Carbon\Carbon; use Crypt; +use Exception; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Models\Attachment; use FireflyIII\Models\Note; @@ -52,7 +53,11 @@ class AttachmentRepository implements AttachmentRepositoryInterface $helper = app(AttachmentHelperInterface::class); $file = $helper->getAttachmentLocation($attachment); - unlink($file); + try { + unlink($file); + } catch (Exception $e) { + Log::error(sprintf('Could not delete file for attachment %d.', $attachment->id)); + } $attachment->delete(); return true; diff --git a/app/Repositories/Bill/BillRepository.php b/app/Repositories/Bill/BillRepository.php index a78481ddfb..e7aabdee2a 100644 --- a/app/Repositories/Bill/BillRepository.php +++ b/app/Repositories/Bill/BillRepository.php @@ -26,6 +26,7 @@ use Carbon\Carbon; use DB; use FireflyIII\Factory\BillFactory; use FireflyIII\Models\Bill; +use FireflyIII\Models\Note; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; @@ -242,6 +243,36 @@ class BillRepository implements BillRepositoryInterface return $sum; } + /** + * Get all bills with these ID's. + * + * @param array $billIds + * + * @return Collection + */ + public function getByIds(array $billIds): Collection + { + return $this->user->bills()->whereIn('id', $billIds)->get(); + } + + /** + * Get text or return empty string. + * + * @param Bill $bill + * + * @return string + */ + public function getNoteText(Bill $bill): string + { + /** @var Note $note */ + $note = $bill->notes()->first(); + if (null !== $note) { + return (string)$note->text; + } + + return ''; + } + /** * @param Bill $bill * @@ -374,11 +405,11 @@ class BillRepository implements BillRepositoryInterface $rules = $this->user->rules() ->leftJoin('rule_actions', 'rule_actions.rule_id', '=', 'rules.id') ->where('rule_actions.action_type', 'link_to_bill') - ->get(['rules.id', 'rules.title', 'rule_actions.action_value']); + ->get(['rules.id', 'rules.title', 'rule_actions.action_value', 'rules.active']); $array = []; foreach ($rules as $rule) { $array[$rule->action_value] = $array[$rule->action_value] ?? []; - $array[$rule->action_value][] = ['id' => $rule->id, 'title' => $rule->title]; + $array[$rule->action_value][] = ['id' => $rule->id, 'title' => $rule->title, 'active' => $rule->active]; } $return = []; foreach ($collection as $bill) { @@ -554,5 +585,4 @@ class BillRepository implements BillRepositoryInterface return $service->update($bill, $data); } - } diff --git a/app/Repositories/Bill/BillRepositoryInterface.php b/app/Repositories/Bill/BillRepositoryInterface.php index c53c8aa6e3..3c9e1fa8f9 100644 --- a/app/Repositories/Bill/BillRepositoryInterface.php +++ b/app/Repositories/Bill/BillRepositoryInterface.php @@ -24,7 +24,6 @@ namespace FireflyIII\Repositories\Bill; use Carbon\Carbon; use FireflyIII\Models\Bill; -use FireflyIII\Models\TransactionJournal; use FireflyIII\User; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; @@ -99,6 +98,24 @@ interface BillRepositoryInterface */ public function getBillsUnpaidInRange(Carbon $start, Carbon $end): string; + /** + * Get all bills with these ID's. + * + * @param array $billIds + * + * @return Collection + */ + public function getByIds(array $billIds): Collection; + + /** + * Get text or return empty string. + * + * @param Bill $bill + * + * @return string + */ + public function getNoteText(Bill $bill): string; + /** * @param Bill $bill * diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index 903c2b0f27..c0ee968441 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -458,6 +458,18 @@ class BudgetRepository implements BudgetRepositoryInterface return $set; } + /** + * Get all budgets with these ID's. + * + * @param array $budgetIds + * + * @return Collection + */ + public function getByIds(array $budgetIds): Collection + { + return $this->user->budgets()->whereIn('id', $budgetIds)->get(); + } + /** * @return Collection */ diff --git a/app/Repositories/Budget/BudgetRepositoryInterface.php b/app/Repositories/Budget/BudgetRepositoryInterface.php index 36879ca327..a929e92484 100644 --- a/app/Repositories/Budget/BudgetRepositoryInterface.php +++ b/app/Repositories/Budget/BudgetRepositoryInterface.php @@ -34,6 +34,16 @@ use Illuminate\Support\Collection; */ interface BudgetRepositoryInterface { + + /** + * Get all budgets with these ID's. + * + * @param array $budgetIds + * + * @return Collection + */ + public function getByIds(array $budgetIds): Collection; + /** * A method that returns the amount of money budgeted per day for this budget, * on average. diff --git a/app/Repositories/Category/CategoryRepository.php b/app/Repositories/Category/CategoryRepository.php index 82964375f8..23dd873db0 100644 --- a/app/Repositories/Category/CategoryRepository.php +++ b/app/Repositories/Category/CategoryRepository.php @@ -153,6 +153,18 @@ class CategoryRepository implements CategoryRepositoryInterface return $firstJournalDate; } + /** + * Get all categories with ID's. + * + * @param array $categoryIds + * + * @return Collection + */ + public function getByIds(array $categoryIds): Collection + { + return $this->user->categories()->whereIn('id', $categoryIds)->get(); + } + /** * Returns a list of all the categories belonging to a user. * @@ -493,7 +505,7 @@ class CategoryRepository implements CategoryRepositoryInterface // check transactions: $query = $category->transactions() ->leftJoin('transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id') - ->orderBy('transaction_journals.date', 'DESC'); + ->orderBy('transaction_journals.date', 'ASC'); $lastTransaction = $query->first(['transaction_journals.*']); if (null !== $lastTransaction) { diff --git a/app/Repositories/Category/CategoryRepositoryInterface.php b/app/Repositories/Category/CategoryRepositoryInterface.php index e224ef84e7..8c16732bcb 100644 --- a/app/Repositories/Category/CategoryRepositoryInterface.php +++ b/app/Repositories/Category/CategoryRepositoryInterface.php @@ -32,6 +32,7 @@ use Illuminate\Support\Collection; */ interface CategoryRepositoryInterface { + /** * @param Category $category * @@ -84,6 +85,15 @@ interface CategoryRepositoryInterface */ public function firstUseDate(Category $category): ?Carbon; + /** + * Get all categories with ID's. + * + * @param array $categoryIds + * + * @return Collection + */ + public function getByIds(array $categoryIds): Collection; + /** * Returns a list of all the categories belonging to a user. * diff --git a/app/Repositories/Currency/CurrencyRepository.php b/app/Repositories/Currency/CurrencyRepository.php index c79aedf8ab..4258432124 100644 --- a/app/Repositories/Currency/CurrencyRepository.php +++ b/app/Repositories/Currency/CurrencyRepository.php @@ -305,9 +305,9 @@ class CurrencyRepository implements CurrencyRepositoryInterface /** * @param array $data * - * @return TransactionCurrency + * @return TransactionCurrency|null */ - public function store(array $data): TransactionCurrency + public function store(array $data): ?TransactionCurrency { /** @var TransactionCurrencyFactory $factory */ $factory = app(TransactionCurrencyFactory::class); diff --git a/app/Repositories/Currency/CurrencyRepositoryInterface.php b/app/Repositories/Currency/CurrencyRepositoryInterface.php index 2462ae8af5..6f1be847d7 100644 --- a/app/Repositories/Currency/CurrencyRepositoryInterface.php +++ b/app/Repositories/Currency/CurrencyRepositoryInterface.php @@ -170,9 +170,9 @@ interface CurrencyRepositoryInterface /** * @param array $data * - * @return TransactionCurrency + * @return TransactionCurrency|null */ - public function store(array $data): TransactionCurrency; + public function store(array $data): ?TransactionCurrency; /** * @param TransactionCurrency $currency diff --git a/app/Repositories/ImportJob/ImportJobRepository.php b/app/Repositories/ImportJob/ImportJobRepository.php index 353c33e9bb..4d42698aec 100644 --- a/app/Repositories/ImportJob/ImportJobRepository.php +++ b/app/Repositories/ImportJob/ImportJobRepository.php @@ -24,10 +24,14 @@ namespace FireflyIII\Repositories\ImportJob; use Crypt; use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\Attachment; use FireflyIII\Models\ImportJob; +use FireflyIII\Models\Tag; use FireflyIII\Models\TransactionJournalMeta; use FireflyIII\Repositories\User\UserRepositoryInterface; use FireflyIII\User; +use Illuminate\Support\Collection; +use Illuminate\Support\MessageBag; use Illuminate\Support\Str; use Log; use SplFileObject; @@ -39,9 +43,19 @@ use Symfony\Component\HttpFoundation\File\UploadedFile; */ class ImportJobRepository implements ImportJobRepositoryInterface { + /** @var \Illuminate\Contracts\Filesystem\Filesystem */ + protected $uploadDisk; + /** @var int */ + private $maxUploadSize; /** @var User */ private $user; + public function __construct() + { + $this->maxUploadSize = (int)config('firefly.maxUploadSize'); + $this->uploadDisk = Storage::disk('upload'); + } + /** * @param ImportJob $job * @param int $index @@ -57,6 +71,24 @@ class ImportJobRepository implements ImportJobRepositoryInterface return $this->setExtendedStatus($job, $extended); } + /** + * Add message to job. + * + * @param ImportJob $job + * @param string $error + * + * @return ImportJob + */ + public function addErrorMessage(ImportJob $job, string $error): ImportJob + { + $errors = $job->errors; + $errors[] = $error; + $job->errors = $errors; + $job->save(); + + return $job; + } + /** * @param ImportJob $job * @param int $steps @@ -108,34 +140,36 @@ class ImportJobRepository implements ImportJobRepositoryInterface } /** - * @param string $type + * @param string $importProvider * * @return ImportJob * * @throws FireflyException */ - public function create(string $type): ImportJob + public function create(string $importProvider): ImportJob { - $count = 0; - $type = strtolower($type); + $count = 0; + $importProvider = strtolower($importProvider); while ($count < 30) { $key = Str::random(12); $existing = $this->findByKey($key); if (null === $existing->id) { - $importJob = new ImportJob; - $importJob->user()->associate($this->user); - $importJob->file_type = $type; - $importJob->key = Str::random(12); - $importJob->status = 'new'; - $importJob->configuration = []; - $importJob->extended_status = [ - 'steps' => 0, - 'done' => 0, - 'tag' => 0, - 'errors' => [], - ]; - $importJob->save(); + $importJob = ImportJob::create( + [ + 'user_id' => $this->user->id, + 'tag_id' => null, + 'provider' => $importProvider, + 'file_type' => '', + 'key' => Str::random(12), + 'status' => 'new', + 'stage' => 'new', + 'configuration' => [], + 'extended_status' => [], + 'transactions' => [], + 'errors' => [], + ] + ); // breaks the loop: return $importJob; @@ -161,6 +195,18 @@ class ImportJobRepository implements ImportJobRepositoryInterface return $result; } + /** + * Return all attachments for job. + * + * @param ImportJob $job + * + * @return Collection + */ + public function getAttachments(ImportJob $job): Collection + { + return $job->attachments()->get(); + } + /** * Return configuration of job. * @@ -308,12 +354,13 @@ class ImportJobRepository implements ImportJobRepositoryInterface */ public function setConfiguration(ImportJob $job, array $configuration): ImportJob { - Log::debug(sprintf('Incoming config for job "%s" is: ', $job->key), $configuration); + Log::debug('Updating configuration...'); + //Log::debug(sprintf('Incoming config for job "%s" is: ', $job->key), $configuration); $currentConfig = $job->configuration; $newConfig = array_merge($currentConfig, $configuration); $job->configuration = $newConfig; $job->save(); - Log::debug(sprintf('Set config of job "%s" to: ', $job->key), $newConfig); + //Log::debug(sprintf('Set config of job "%s" to: ', $job->key), $newConfig); return $job; } @@ -334,6 +381,20 @@ class ImportJobRepository implements ImportJobRepositoryInterface return $job; } + /** + * @param ImportJob $job + * @param string $stage + * + * @return ImportJob + */ + public function setStage(ImportJob $job, string $stage): ImportJob + { + $job->stage = $stage; + $job->save(); + + return $job; + } + /** * @param ImportJob $job * @param string $status @@ -342,6 +403,7 @@ class ImportJobRepository implements ImportJobRepositoryInterface */ public function setStatus(ImportJob $job, string $status): ImportJob { + Log::debug(sprintf('Set status of job "%s" to "%s"', $job->key, $status)); $job->status = $status; $job->save(); @@ -363,6 +425,20 @@ class ImportJobRepository implements ImportJobRepositoryInterface return $this->setExtendedStatus($job, $status); } + /** + * @param ImportJob $job + * @param Tag $tag + * + * @return ImportJob + */ + public function setTag(ImportJob $job, Tag $tag): ImportJob + { + $job->tag()->associate($tag); + $job->save(); + + return $job; + } + /** * @param ImportJob $job * @param int $count @@ -378,6 +454,20 @@ class ImportJobRepository implements ImportJobRepositoryInterface return $this->setExtendedStatus($job, $status); } + /** + * @param ImportJob $job + * @param array $transactions + * + * @return ImportJob + */ + public function setTransactions(ImportJob $job, array $transactions): ImportJob + { + $job->transactions = $transactions; + $job->save(); + + return $job; + } + /** * @param User $user */ @@ -386,6 +476,114 @@ class ImportJobRepository implements ImportJobRepositoryInterface $this->user = $user; } + /** + * Handle upload for job. + * + * @param ImportJob $job + * @param string $name + * @param UploadedFile $file + * + * @return MessageBag + * @throws FireflyException + */ + public function storeCLIUpload(ImportJob $job, string $name, string $fileName): MessageBag + { + $messages = new MessageBag; + + if (!file_exists($fileName)) { + $messages->add('notfound', sprintf('File not found: %s', $fileName)); + + return $messages; + } + + $count = $job->attachments()->get()->filter( + function (Attachment $att) use ($name) { + return $att->filename === $name; + } + )->count(); + + if ($count > 0) { + // don't upload, but also don't complain about it. + Log::error(sprintf('Detected duplicate upload. Will ignore second "%s" file.', $name)); + + return new MessageBag; + } + $content = file_get_contents($fileName); + $attachment = new Attachment; // create Attachment object. + $attachment->user()->associate($job->user); + $attachment->attachable()->associate($job); + $attachment->md5 = md5($content); + $attachment->filename = $name; + $attachment->mime = 'plain/txt'; + $attachment->size = \strlen($content); + $attachment->uploaded = 0; + $attachment->save(); + $encrypted = Crypt::encrypt($content); + + // store it: + $this->uploadDisk->put($attachment->fileName(), $encrypted); + $attachment->uploaded = 1; // update attachment + $attachment->save(); + + // return it. + return new MessageBag; + } + + /** + * Handle upload for job. + * + * @param ImportJob $job + * @param string $name + * @param UploadedFile $file + * + * @return MessageBag + * @throws FireflyException + */ + public function storeFileUpload(ImportJob $job, string $name, UploadedFile $file): MessageBag + { + $messages = new MessageBag; + if ($this->validSize($file)) { + $name = e($file->getClientOriginalName()); + $messages->add('size', (string)trans('validation.file_too_large', ['name' => $name])); + + return $messages; + } + $count = $job->attachments()->get()->filter( + function (Attachment $att) use ($name) { + return $att->filename === $name; + } + )->count(); + + if ($count > 0) { + // don't upload, but also don't complain about it. + Log::error(sprintf('Detected duplicate upload. Will ignore second "%s" file.', $name)); + + return new MessageBag; + } + + $attachment = new Attachment; // create Attachment object. + $attachment->user()->associate($job->user); + $attachment->attachable()->associate($job); + $attachment->md5 = md5_file($file->getRealPath()); + $attachment->filename = $name; + $attachment->mime = $file->getMimeType(); + $attachment->size = $file->getSize(); + $attachment->uploaded = 0; + $attachment->save(); + $fileObject = $file->openFile('r'); + $fileObject->rewind(); + $content = $fileObject->fread($file->getSize()); + $encrypted = Crypt::encrypt($content); + + // store it: + $this->uploadDisk->put($attachment->fileName(), $encrypted); + $attachment->uploaded = 1; // update attachment + $attachment->save(); + + // return it. + return new MessageBag; + } + /** * @param ImportJob $job * @param string $status @@ -403,6 +601,8 @@ class ImportJobRepository implements ImportJobRepositoryInterface /** * Return import file content. * + * @deprecated + * * @param ImportJob $job * * @return string @@ -412,4 +612,18 @@ class ImportJobRepository implements ImportJobRepositoryInterface { return $job->uploadFileContents(); } + + /** + * @codeCoverageIgnore + * + * @param UploadedFile $file + * + * @return bool + */ + protected function validSize(UploadedFile $file): bool + { + $size = $file->getSize(); + + return $size > $this->maxUploadSize; + } } diff --git a/app/Repositories/ImportJob/ImportJobRepositoryInterface.php b/app/Repositories/ImportJob/ImportJobRepositoryInterface.php index 5bb3a905cb..baf1d51ce1 100644 --- a/app/Repositories/ImportJob/ImportJobRepositoryInterface.php +++ b/app/Repositories/ImportJob/ImportJobRepositoryInterface.php @@ -22,8 +22,12 @@ declare(strict_types=1); namespace FireflyIII\Repositories\ImportJob; +use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\ImportJob; +use FireflyIII\Models\Tag; use FireflyIII\User; +use Illuminate\Support\Collection; +use Illuminate\Support\MessageBag; use Symfony\Component\HttpFoundation\File\UploadedFile; /** @@ -31,6 +35,63 @@ use Symfony\Component\HttpFoundation\File\UploadedFile; */ interface ImportJobRepositoryInterface { + /** + * Return all attachments for job. + * + * @param ImportJob $job + * + * @return Collection + */ + public function getAttachments(ImportJob $job): Collection; + + /** + * Handle upload for job. + * + * @param ImportJob $job + * @param string $name + * @param UploadedFile $file + * + * @return MessageBag + * @throws FireflyException + */ + public function storeFileUpload(ImportJob $job, string $name, UploadedFile $file): MessageBag; + + /** + * Store file. + * + * @param ImportJob $job + * @param string $name + * @param string $fileName + * + * @return MessageBag + */ + public function storeCLIUpload(ImportJob $job, string $name, string $fileName): MessageBag; + + /** + * @param ImportJob $job + * @param array $transactions + * + * @return ImportJob + */ + public function setTransactions(ImportJob $job, array $transactions): ImportJob; + + /** + * @param ImportJob $job + * @param Tag $tag + * + * @return ImportJob + */ + public function setTag(ImportJob $job, Tag $tag): ImportJob; + + /** + * Add message to job. + * + * @param ImportJob $job + * @param string $error + * + * @return ImportJob + */ + public function addErrorMessage(ImportJob $job, string $error): ImportJob; /** * @param ImportJob $job @@ -67,11 +128,11 @@ interface ImportJobRepositoryInterface public function countByHash(string $hash): int; /** - * @param string $type + * @param string $importProvider * * @return ImportJob */ - public function create(string $type): ImportJob; + public function create(string $importProvider): ImportJob; /** * @param string $key @@ -145,6 +206,14 @@ interface ImportJobRepositoryInterface */ public function setStatus(ImportJob $job, string $status): ImportJob; + /** + * @param ImportJob $job + * @param string $stage + * + * @return ImportJob + */ + public function setStage(ImportJob $job, string $stage): ImportJob; + /** * @param ImportJob $job * @param int $steps diff --git a/app/Repositories/Journal/JournalRepository.php b/app/Repositories/Journal/JournalRepository.php index 43081d4058..e5dc693a60 100644 --- a/app/Repositories/Journal/JournalRepository.php +++ b/app/Repositories/Journal/JournalRepository.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Repositories\Journal; use Carbon\Carbon; +use DB; use Exception; use FireflyIII\Factory\TransactionJournalFactory; use FireflyIII\Factory\TransactionJournalMetaFactory; @@ -32,6 +33,7 @@ use FireflyIII\Models\Note; use FireflyIII\Models\PiggyBankEvent; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; +use FireflyIII\Models\TransactionJournalMeta; use FireflyIII\Models\TransactionType; use FireflyIII\Services\Internal\Destroy\JournalDestroyService; use FireflyIII\Services\Internal\Update\JournalUpdateService; @@ -147,6 +149,32 @@ class JournalRepository implements JournalRepositoryInterface return $journal; } + /** + * Find a journal by its hash. + * + * @param string $hash + * + * @return TransactionJournalMeta|null + */ + public function findByHash(string $hash): ?TransactionJournalMeta + { + $jsonEncode = json_encode($hash); + $hashOfHash = hash('sha256', $jsonEncode); + Log::debug(sprintf('JSON encoded hash is: %s', $jsonEncode)); + Log::debug(sprintf('Hash of hash is: %s', $hashOfHash)); + + $result = TransactionJournalMeta + ::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id') + ->where('hash', $hashOfHash) + ->where('name', 'importHashV2') + ->first(['journal_meta.*']); + if (null === $result) { + Log::debug('Result is null'); + } + + return $result; + } + /** * Find a specific journal. * diff --git a/app/Repositories/Journal/JournalRepositoryInterface.php b/app/Repositories/Journal/JournalRepositoryInterface.php index 70011c6106..33ea68806d 100644 --- a/app/Repositories/Journal/JournalRepositoryInterface.php +++ b/app/Repositories/Journal/JournalRepositoryInterface.php @@ -27,6 +27,7 @@ use FireflyIII\Models\Account; use FireflyIII\Models\Note; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; +use FireflyIII\Models\TransactionJournalMeta; use FireflyIII\Models\TransactionType; use FireflyIII\User; use Illuminate\Support\Collection; @@ -37,6 +38,14 @@ use Illuminate\Support\MessageBag; */ interface JournalRepositoryInterface { + /** + * Find a journal by its hash. + * + * @param string $hash + * + * @return TransactionJournalMeta|null + */ + public function findByHash(string $hash): ?TransactionJournalMeta; /** * @param TransactionJournal $journal diff --git a/app/Repositories/PiggyBank/PiggyBankRepository.php b/app/Repositories/PiggyBank/PiggyBankRepository.php index 2612cf245c..677b48c23e 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepository.php +++ b/app/Repositories/PiggyBank/PiggyBankRepository.php @@ -104,6 +104,22 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface return bccomp($amount, $savedSoFar) <= 0; } + /** + * Correct order of piggies in case of issues. + */ + public function correctOrder(): void + { + $set = $this->user->piggyBanks()->orderBy('order', 'ASC')->get(); + $current = 1; + foreach ($set as $piggyBank) { + if ((int)$piggyBank->order !== $current) { + $piggyBank->order = $current; + $piggyBank->save(); + } + $current++; + } + } + /** * @param PiggyBank $piggyBank * @param string $amount @@ -308,6 +324,39 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface return $piggyBank->piggyBankRepetitions()->first(); } + /** + * Returns the suggested amount the user should save per month, or "". + * + * @param PiggyBank $piggyBank + * + * @return string + */ + public function getSuggestedMonthlyAmount(PiggyBank $piggyBank): string + { + $savePerMonth = '0'; + $repetition = $this->getRepetition($piggyBank); + if(null === $repetition) { + return $savePerMonth; + } + if (null !== $piggyBank->targetdate && $repetition->currentamount < $piggyBank->targetamount) { + $now = Carbon::now(); + $diffInMonths = $now->diffInMonths($piggyBank->targetdate, false); + $remainingAmount = bcsub($piggyBank->targetamount, $repetition->currentamount); + + // more than 1 month to go and still need money to save: + if ($diffInMonths > 0 && 1 === bccomp($remainingAmount, '0')) { + $savePerMonth = bcdiv($remainingAmount, (string)$diffInMonths); + } + + // less than 1 month to go but still need money to save: + if (0 === $diffInMonths && 1 === bccomp($remainingAmount, '0')) { + $savePerMonth = $remainingAmount; + } + } + + return $savePerMonth; + } + /** * Get for piggy account what is left to put in piggies. * @@ -327,7 +376,7 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface /** @var PiggyBank $current */ foreach ($piggies as $current) { $repetition = $this->getRepetition($current); - if(null !== $repetition) { + if (null !== $repetition) { $balance = bcsub($balance, $repetition->currentamount); } } @@ -379,14 +428,10 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface * * @return bool */ - public function setOrder(int $piggyBankId, int $order): bool + public function setOrder(PiggyBank $piggyBank, int $order): bool { - $piggyBank = PiggyBank::leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id')->where('accounts.user_id', $this->user->id) - ->where('piggy_banks.id', $piggyBankId)->first(['piggy_banks.*']); - if ($piggyBank) { - $piggyBank->order = $order; - $piggyBank->save(); - } + $piggyBank->order = $order; + $piggyBank->save(); return true; } diff --git a/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php b/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php index 59e217d2f3..9b22a8d3b8 100644 --- a/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php +++ b/app/Repositories/PiggyBank/PiggyBankRepositoryInterface.php @@ -67,6 +67,11 @@ interface PiggyBankRepositoryInterface */ public function canRemoveAmount(PiggyBank $piggyBank, string $amount): bool; + /** + * Correct order of piggies in case of issues. + */ + public function correctOrder(): void; + /** * Create a new event. * @@ -168,6 +173,15 @@ interface PiggyBankRepositoryInterface */ public function getRepetition(PiggyBank $piggyBank): ?PiggyBankRepetition; + /** + * Returns the suggested amount the user should save per month, or "". + * + * @param PiggyBank $piggyBank + * + * @return string + */ + public function getSuggestedMonthlyAmount(PiggyBank $piggyBank): string; + /** * Get for piggy account what is left to put in piggies. * @@ -196,12 +210,12 @@ interface PiggyBankRepositoryInterface /** * Set specific piggy bank to specific order. * - * @param int $piggyBankId - * @param int $order + * @param PiggyBank $piggyBank + * @param int $order * * @return bool */ - public function setOrder(int $piggyBankId, int $order): bool; + public function setOrder(PiggyBank $piggyBank, int $order): bool; /** * @param User $user diff --git a/app/Repositories/Rule/RuleRepository.php b/app/Repositories/Rule/RuleRepository.php index f6cd24e1c0..06d29aefa0 100644 --- a/app/Repositories/Rule/RuleRepository.php +++ b/app/Repositories/Rule/RuleRepository.php @@ -28,6 +28,7 @@ use FireflyIII\Models\RuleAction; use FireflyIII\Models\RuleGroup; use FireflyIII\Models\RuleTrigger; use FireflyIII\User; +use Illuminate\Support\Collection; /** * Class RuleRepository. @@ -89,6 +90,26 @@ class RuleRepository implements RuleRepositoryInterface return $this->user->ruleGroups()->first(); } + /** + * Get the rules for a user tailored to the import process. + * + * @return Collection + */ + public function getForImport(): Collection + { + return Rule::distinct() + ->where('rules.user_id', $this->user->id) + ->leftJoin('rule_groups', 'rule_groups.id', '=', 'rules.rule_group_id') + ->leftJoin('rule_triggers', 'rules.id', '=', 'rule_triggers.rule_id') + ->where('rule_groups.active', 1) + ->where('rule_triggers.trigger_type', 'user_action') + ->where('rule_triggers.trigger_value', 'store-journal') + ->where('rules.active', 1) + ->orderBy('rule_groups.order', 'ASC') + ->orderBy('rules.order', 'ASC') + ->get(['rules.*', 'rule_groups.order']); + } + /** * @param RuleGroup $ruleGroup * diff --git a/app/Repositories/Rule/RuleRepositoryInterface.php b/app/Repositories/Rule/RuleRepositoryInterface.php index b3c1215e40..5fcdd4c89d 100644 --- a/app/Repositories/Rule/RuleRepositoryInterface.php +++ b/app/Repositories/Rule/RuleRepositoryInterface.php @@ -27,12 +27,14 @@ use FireflyIII\Models\RuleAction; use FireflyIII\Models\RuleGroup; use FireflyIII\Models\RuleTrigger; use FireflyIII\User; +use Illuminate\Support\Collection; /** * Interface RuleRepositoryInterface. */ interface RuleRepositoryInterface { + /** * @return int */ @@ -57,6 +59,13 @@ interface RuleRepositoryInterface */ public function getFirstRuleGroup(): RuleGroup; + /** + * Get the rules for a user tailored to the import process. + * + * @return Collection + */ + public function getForImport(): Collection; + /** * @param RuleGroup $ruleGroup * diff --git a/app/Repositories/Tag/TagRepository.php b/app/Repositories/Tag/TagRepository.php index e893ec152e..90c545cb58 100644 --- a/app/Repositories/Tag/TagRepository.php +++ b/app/Repositories/Tag/TagRepository.php @@ -105,6 +105,7 @@ class TagRepository implements TagRepositoryInterface /** * @param int $tagId * + * @deprecated * @return Tag */ public function find(int $tagId): Tag @@ -335,7 +336,6 @@ class TagRepository implements TagRepositoryInterface } ) ->groupBy(['tags.id', 'tags.tag']); - // add date range (or not): if (null === $year) { Log::debug('Get tags without a date.'); @@ -453,4 +453,23 @@ class TagRepository implements TagRepositoryInterface return (int)($range[0] + $extra); } -} + + /** + * @param int $tagId + * + * @return Tag|null + */ + public function findNull(int $tagId): ?Tag + { + return $this->user->tags()->find($tagId); + } + + /** + * Will return the newest tag (if known) or NULL. + * + * @return Tag|null + */ + public function newestTag(): ?Tag + { + return $this->user->tags()->whereNotNull('date')->orderBy('date', 'DESC')->first(); +}} diff --git a/app/Repositories/Tag/TagRepositoryInterface.php b/app/Repositories/Tag/TagRepositoryInterface.php index f17b57118b..e4e8b44ba5 100644 --- a/app/Repositories/Tag/TagRepositoryInterface.php +++ b/app/Repositories/Tag/TagRepositoryInterface.php @@ -69,6 +69,13 @@ interface TagRepositoryInterface /** * @param int $tagId * + * @return Tag|null + */ + public function findNull(int $tagId): ?Tag; + + /** + * @param int $tagId + * @deprecated * @return Tag */ public function find(int $tagId): Tag; @@ -109,10 +116,16 @@ interface TagRepositoryInterface public function lastUseDate(Tag $tag): Carbon; /** + * Will return the newest tag (if known) or NULL. * @return Tag|null */ public function oldestTag(): ?Tag; + /** + * Will return the newest tag (if known) or NULL. + * @return Tag|null + */ + public function newestTag(): ?Tag; /** * @param User $user */ diff --git a/app/Repositories/TransactionType/TransactionTypeRepositoryInterface.php b/app/Repositories/TransactionType/TransactionTypeRepositoryInterface.php index 976f48196d..0e84c6dbff 100644 --- a/app/Repositories/TransactionType/TransactionTypeRepositoryInterface.php +++ b/app/Repositories/TransactionType/TransactionTypeRepositoryInterface.php @@ -28,7 +28,6 @@ use FireflyIII\Models\TransactionType; /** * Interface TransactionTypeRepositoryInterface * - * @package FireflyIII\Repositories\TransactionType */ interface TransactionTypeRepositoryInterface { diff --git a/app/Rules/BelongsUser.php b/app/Rules/BelongsUser.php index 91acc6cc54..c96ba66a19 100644 --- a/app/Rules/BelongsUser.php +++ b/app/Rules/BelongsUser.php @@ -1,6 +1,4 @@ . */ +declare(strict_types=1); + namespace FireflyIII\Rules; use FireflyIII\Exceptions\FireflyException; diff --git a/app/Rules/ValidTransactions.php b/app/Rules/ValidTransactions.php index d60f4cc679..888c98adf7 100644 --- a/app/Rules/ValidTransactions.php +++ b/app/Rules/ValidTransactions.php @@ -1,6 +1,4 @@ . */ +declare(strict_types=1); + + namespace FireflyIII\Rules; use FireflyIII\Models\Transaction; diff --git a/app/Services/Bunq/ApiContext.php b/app/Services/Bunq/ApiContext.php new file mode 100644 index 0000000000..b657fcf18f --- /dev/null +++ b/app/Services/Bunq/ApiContext.php @@ -0,0 +1,92 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Services\Bunq; + +use bunq\Context\ApiContext as BunqApiContext; +use bunq\Context\BunqContext; +use bunq\Exception\BadRequestException; +use bunq\Exception\BunqException; +use bunq\Util\BunqEnumApiEnvironmentType; +use Exception; +use FireflyIII\Exceptions\FireflyException; +use Log; + +/** + * Special class to hide away bunq's static initialisation methods. + * + * Class ApiContext + */ +class ApiContext +{ + /** + * @param BunqEnumApiEnvironmentType $environmentType + * @param string $apiKey + * @param string $description + * @param array $permittedIps + * @param string|null $proxyUrl + * + * @throws FireflyException + * @return BunqApiContext + */ + public function create(BunqEnumApiEnvironmentType $environmentType, string $apiKey, string $description, array $permittedIps, string $proxyUrl = null + ) { + $permittedIps = $permittedIps ?? []; + try { + $context = BunqApiContext::create($environmentType, $apiKey, $description, $permittedIps, $proxyUrl); + } catch (BunqException|BadRequestException|Exception $e) { + $message = $e->getMessage(); + Log::error($message); + Log::error($e->getTraceAsString()); + + if (stripos($message, 'Generating a new private key failed')) { + $message = 'Could not generate key-material. Please make sure OpenSSL is installed and configured: http://bit.ly/FF3-openSSL'; + } + throw new FireflyException($message); + } + + return $context; + } + + /** + * @throws FireflyException + * + * @param string $jsonString + */ + public function fromJson(string $jsonString): void + { + try { + $apiContext = BunqApiContext::fromJson($jsonString); + BunqContext::loadApiContext($apiContext); + } catch (BadRequestException|BunqException|Exception $e) { + $message = $e->getMessage(); + Log::error($message); + Log::error($e->getTraceAsString()); + + if (stripos($message, 'Generating a new private key failed')) { + $message = 'Could not generate key-material. Please make sure OpenSSL is installed and configured: http://bit.ly/FF3-openSSL'; + } + throw new FireflyException($message); + } + } +} \ No newline at end of file diff --git a/app/Services/Bunq/Id/DeviceSessionId.php b/app/Services/Bunq/Id/DeviceSessionId.php deleted file mode 100644 index 91c5233870..0000000000 --- a/app/Services/Bunq/Id/DeviceSessionId.php +++ /dev/null @@ -1,30 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Services\Bunq\Id; - -/** - * Class DeviceSessionId. - */ -class DeviceSessionId extends BunqId -{ -} diff --git a/app/Services/Bunq/Id/InstallationId.php b/app/Services/Bunq/Id/InstallationId.php deleted file mode 100644 index ec3053165c..0000000000 --- a/app/Services/Bunq/Id/InstallationId.php +++ /dev/null @@ -1,30 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Services\Bunq\Id; - -/** - * Class InstallationId. - */ -class InstallationId extends BunqId -{ -} diff --git a/app/Services/Bunq/MonetaryAccount.php b/app/Services/Bunq/MonetaryAccount.php new file mode 100644 index 0000000000..bb77c54a80 --- /dev/null +++ b/app/Services/Bunq/MonetaryAccount.php @@ -0,0 +1,57 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Services\Bunq; + +use bunq\Exception\BunqException; +use bunq\Model\Generated\Endpoint\BunqResponseMonetaryAccountList; +use bunq\Model\Generated\Endpoint\MonetaryAccount as BunqMonetaryAccount; +use Exception; +use FireflyIII\Exceptions\FireflyException; + +/** + * Class MonetaryAccount + */ +class MonetaryAccount +{ + /** + * @param array $params + * @param array $customHeaders + * + * @return BunqResponseMonetaryAccountList + * @throws FireflyException + */ + public function listing(array $params = null, array $customHeaders = null): BunqResponseMonetaryAccountList + { + $params = $params ?? []; + $customHeaders = $customHeaders ?? []; + try { + $result = BunqMonetaryAccount::listing($params, $customHeaders); + } catch (BunqException|Exception $e) { + throw new FireflyException($e->getMessage()); + } + + return $result; + } + +} \ No newline at end of file diff --git a/app/Services/Bunq/Object/Alias.php b/app/Services/Bunq/Object/Alias.php deleted file mode 100644 index 0c29f74136..0000000000 --- a/app/Services/Bunq/Object/Alias.php +++ /dev/null @@ -1,84 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Services\Bunq\Object; - -/** - * Class Alias. - */ -class Alias extends BunqObject -{ - /** @var string */ - private $name; - /** @var string */ - private $type; - /** @var string */ - private $value; - - /** - * Alias constructor. - * - * @param array $data - */ - public function __construct(array $data) - { - $this->type = $data['type']; - $this->name = $data['name']; - $this->value = $data['value']; - } - - /** - * @return string - */ - public function getName(): string - { - return $this->name; - } - - /** - * @return string - */ - public function getType(): string - { - return $this->type; - } - - /** - * @return string - */ - public function getValue(): string - { - return $this->value; - } - - /** - * @return array - */ - public function toArray(): array - { - return [ - 'type' => $this->type, - 'name' => $this->name, - 'value' => $this->value, - ]; - } -} diff --git a/app/Services/Bunq/Object/Avatar.php b/app/Services/Bunq/Object/Avatar.php deleted file mode 100644 index 91c7847527..0000000000 --- a/app/Services/Bunq/Object/Avatar.php +++ /dev/null @@ -1,60 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Services\Bunq\Object; - -/** - * Class Avatar. - */ -class Avatar extends BunqObject -{ - /** @var string */ - private $anchorUuid; - /** @var Image */ - private $image; - /** @var string */ - private $uuid; - - /** - * Avatar constructor. - * - * @param array $data - */ - public function __construct(array $data) - { - $this->uuid = $data['uuid']; - $this->anchorUuid = $data['anchor_uuid']; - $this->image = new Image($data['image']); - } - - /** - * @return array - */ - public function toArray(): array - { - return [ - 'uuid' => $this->uuid, - 'anchor_uuid' => $this->anchorUuid, - 'image' => $this->image->toArray(), - ]; - } -} diff --git a/app/Services/Bunq/Object/DeviceServer.php b/app/Services/Bunq/Object/DeviceServer.php deleted file mode 100644 index 2fd34992ee..0000000000 --- a/app/Services/Bunq/Object/DeviceServer.php +++ /dev/null @@ -1,90 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Services\Bunq\Object; - -use Carbon\Carbon; -use FireflyIII\Services\Bunq\Id\DeviceServerId; - -use FireflyIII\Exceptions\FireflyException; - -/** - * Class DeviceServer - */ -class DeviceServer extends BunqObject -{ - /** @var Carbon */ - private $created; - /** @var string */ - private $description; - /** @var DeviceServerId */ - private $id; - /** @var string */ - private $ip; - /** @var string */ - private $status; - /** @var Carbon */ - private $updated; - - /** - * DeviceServer constructor. - * - * @param array $data - * - */ - public function __construct(array $data) - { - $id = new DeviceServerId(); - $id->setId($data['id']); - $this->id = $id; - $this->created = Carbon::createFromFormat('Y-m-d H:i:s.u', $data['created']); - $this->updated = Carbon::createFromFormat('Y-m-d H:i:s.u', $data['updated']); - $this->ip = $data['ip']; - $this->description = $data['description']; - $this->status = $data['status']; - } - - /** - * @return DeviceServerId - */ - public function getId(): DeviceServerId - { - return $this->id; - } - - /** - * @return string - */ - public function getIp(): string - { - return $this->ip; - } - - /** - * @return array - * @throws FireflyException - */ - public function toArray(): array - { - throw new FireflyException(sprintf('Cannot convert %s to array.', \get_class($this))); - } -} diff --git a/app/Services/Bunq/Object/Image.php b/app/Services/Bunq/Object/Image.php deleted file mode 100644 index bfc36cdff4..0000000000 --- a/app/Services/Bunq/Object/Image.php +++ /dev/null @@ -1,66 +0,0 @@ -. - */ - -declare(strict_types=1); - -namespace FireflyIII\Services\Bunq\Object; - -/** - * Class Image - */ -class Image extends BunqObject -{ - /** @var string */ - private $attachmentPublicUuid; - /** @var string */ - private $contentType; - /** @var int */ - private $height; - /** @var int */ - private $width; - - /** - * Image constructor. - * - * @param array $data - */ - public function __construct(array $data) - { - $this->attachmentPublicUuid = $data['attachment_public_uuid'] ?? null; - $this->height = $data['height'] ?? null; - $this->width = $data['width'] ?? null; - $this->contentType = $data['content_type'] ?? null; - } - - /** - * @return array - */ - public function toArray(): array - { - return [ - 'attachment_public_uuid' => $this->attachmentPublicUuid, - 'height' => $this->height, - 'width' => $this->width, - 'content_type' => $this->contentType, - ]; - } - -} diff --git a/app/Services/Bunq/Object/LabelMonetaryAccount.php b/app/Services/Bunq/Object/LabelMonetaryAccount.php deleted file mode 100644 index f9d89a456d..0000000000 --- a/app/Services/Bunq/Object/LabelMonetaryAccount.php +++ /dev/null @@ -1,83 +0,0 @@ -. - */ - -declare(strict_types=1); - -namespace FireflyIII\Services\Bunq\Object; - -use FireflyIII\Exceptions\FireflyException; - -/** - * Class LabelMonetaryAccount - */ -class LabelMonetaryAccount extends BunqObject -{ - /** @var Avatar */ - private $avatar; - /** @var string */ - private $country; - /** @var string */ - private $iban; - /** @var bool */ - private $isLight; - /** @var LabelUser */ - private $labelUser; - - /** - * LabelMonetaryAccount constructor. - * - * @param array $data - */ - public function __construct(array $data) - { - $this->iban = $data['iban']; - $this->isLight = $data['is_light']; - $this->avatar = isset($data['avatar']) ? new Avatar($data['avatar']) : null; - $this->labelUser = new LabelUser($data['label_user']); - $this->country = $data['country']; - } - - /** - * @return string|null - */ - public function getIban(): ?string - { - return $this->iban; - } - - /** - * @return LabelUser - */ - public function getLabelUser(): LabelUser - { - return $this->labelUser; - } - - /** - * @return array - * @throws FireflyException - */ - public function toArray(): array - { - throw new FireflyException(sprintf('Cannot convert %s to array.', \get_class($this))); - } - -} diff --git a/app/Services/Bunq/Object/LabelUser.php b/app/Services/Bunq/Object/LabelUser.php deleted file mode 100644 index d0a465a984..0000000000 --- a/app/Services/Bunq/Object/LabelUser.php +++ /dev/null @@ -1,89 +0,0 @@ -. - */ - -declare(strict_types=1); - -namespace FireflyIII\Services\Bunq\Object; - -use FireflyIII\Exceptions\FireflyException; -/** - * Class LabelUser - */ -class LabelUser extends BunqObject -{ - /** @var Avatar */ - private $avatar; - /** @var string */ - private $country; - /** @var string */ - private $displayName; - /** @var string */ - private $publicNickName; - /** @var string */ - private $uuid; - - /** - * LabelUser constructor. - * - * @param array $data - */ - public function __construct(array $data) - { - $this->uuid = $data['uuid']; - $this->displayName = $data['display_name']; - $this->country = $data['country']; - $this->publicNickName = $data['public_nick_name']; - $this->avatar = isset($data['avatar']) ? new Avatar($data['avatar']) : null; - } - - /** - * @return Avatar - */ - public function getAvatar(): Avatar - { - return $this->avatar; - } - - /** - * @return string - */ - public function getDisplayName(): string - { - return $this->displayName; - } - - /** - * @return string - */ - public function getPublicNickName(): string - { - return $this->publicNickName; - } - - /** - * @return array - * @throws FireflyException - */ - public function toArray(): array - { - throw new FireflyException(sprintf('Cannot convert %s to array.', \get_class($this))); - } -} diff --git a/app/Services/Bunq/Object/MonetaryAccountBank.php b/app/Services/Bunq/Object/MonetaryAccountBank.php deleted file mode 100644 index 6360cb289f..0000000000 --- a/app/Services/Bunq/Object/MonetaryAccountBank.php +++ /dev/null @@ -1,198 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Services\Bunq\Object; - -use Carbon\Carbon; - -/** - * Class MonetaryAccountBank. - */ -class MonetaryAccountBank extends BunqObject -{ - /** @var array */ - private $aliases = []; - /** @var Avatar */ - private $avatar; - /** @var Amount */ - private $balance; - /** @var Carbon */ - private $created; - /** @var string */ - private $currency; - /** @var Amount */ - private $dailyLimit; - /** @var Amount */ - private $dailySpent; - /** @var string */ - private $description; - /** @var int */ - private $id; - /** @var MonetaryAccountProfile */ - private $monetaryAccountProfile; - /** @var array */ - private $notificationFilters = []; - /** @var Amount */ - private $overdraftLimit; - /** @var string */ - private $publicUuid; - /** @var string */ - private $reason; - /** @var string */ - private $reasonDescription; - /** @var MonetaryAccountSetting */ - private $setting; - /** @var string */ - private $status; - /** @var string */ - private $subStatus; - /** @var Carbon */ - private $updated; - /** @var int */ - private $userId; - - /** - * MonetaryAccountBank constructor. - * - * @param array $data - * - */ - public function __construct(array $data) - { - $this->id = $data['id']; - $this->created = Carbon::createFromFormat('Y-m-d H:i:s.u', $data['created']); - $this->updated = Carbon::createFromFormat('Y-m-d H:i:s.u', $data['updated']); - $this->balance = new Amount($data['balance']); - $this->currency = $data['currency']; - $this->dailyLimit = new Amount($data['daily_limit']); - $this->dailySpent = new Amount($data['daily_spent']); - $this->description = $data['description']; - $this->publicUuid = $data['public_uuid']; - $this->status = $data['status']; - $this->subStatus = $data['sub_status']; - $this->userId = $data['user_id']; - $this->monetaryAccountProfile = new MonetaryAccountProfile($data['monetary_account_profile']); - $this->setting = new MonetaryAccountSetting($data['setting']); - $this->overdraftLimit = new Amount($data['overdraft_limit']); - $this->avatar = isset($data['avatar']) ? new Avatar($data['avatar']) : null; - $this->reason = $data['reason'] ?? ''; - $this->reasonDescription = $data['reason_description'] ?? ''; - - // create aliases: - foreach ($data['alias'] as $alias) { - $this->aliases[] = new Alias($alias); - } - /** @var array $filter */ - foreach ($data['notification_filters'] as $filter) { - $this->notificationFilters[] = new NotificationFilter($filter); - } - } - - /** - * @return array - */ - public function getAliases(): array - { - return $this->aliases; - } - - /** - * @return Amount - */ - public function getBalance(): Amount - { - return $this->balance; - } - - /** - * @return string - */ - public function getCurrency(): string - { - return $this->currency; - } - - /** - * @return string - */ - public function getDescription(): string - { - return $this->description; - } - - /** - * @return int - */ - public function getId(): int - { - return $this->id; - } - - /** - * @return MonetaryAccountSetting - */ - public function getSetting(): MonetaryAccountSetting - { - return $this->setting; - } - - /** - * @return array - */ - public function toArray(): array - { - $data = [ - 'id' => $this->id, - 'created' => $this->created->format('Y-m-d H:i:s.u'), - 'updated' => $this->updated->format('Y-m-d H:i:s.u'), - 'balance' => $this->balance->toArray(), - 'currency' => $this->currency, - 'daily_limit' => $this->dailyLimit->toArray(), - 'daily_spent' => $this->dailySpent->toArray(), - 'description' => $this->description, - 'public_uuid' => $this->publicUuid, - 'status' => $this->status, - 'sub_status' => $this->subStatus, - 'user_id' => $this->userId, - 'monetary_account_profile' => $this->monetaryAccountProfile->toArray(), - 'setting' => $this->setting->toArray(), - 'overdraft_limit' => $this->overdraftLimit->toArray(), - 'avatar' => null === $this->avatar ? null : $this->avatar->toArray(), - 'reason' => $this->reason, - 'reason_description' => $this->reasonDescription, - 'alias' => [], - 'notification_filters' => [], - ]; - - /** @var Alias $alias */ - foreach ($this->aliases as $alias) { - $data['alias'][] = $alias->toArray(); - } - - /** @var NotificationFilter $filter */ - foreach ($this->notificationFilters as $filter) { - $data['notification_filters'][] = $filter->toArray(); - } - - return $data; - } -} diff --git a/app/Services/Bunq/Object/MonetaryAccountProfile.php b/app/Services/Bunq/Object/MonetaryAccountProfile.php deleted file mode 100644 index d81672ddd5..0000000000 --- a/app/Services/Bunq/Object/MonetaryAccountProfile.php +++ /dev/null @@ -1,67 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Services\Bunq\Object; - -/** - * Class MonetaryAccountProfile. - */ -class MonetaryAccountProfile extends BunqObject -{ - /** @var string */ - private $profileActionRequired; - /** @var Amount */ - private $profileAmountRequired; - /** - * @var null - */ - private $profileDrain; - /** - * @var null - */ - private $profileFill; - - /** - * MonetaryAccountProfile constructor. - * - * @param array $data - */ - public function __construct(array $data) - { - $this->profileDrain = null; - $this->profileFill = null; - $this->profileActionRequired = $data['profile_action_required']; - $this->profileAmountRequired = new Amount($data['profile_amount_required']); - - } - - /** - * @return array - */ - public function toArray(): array - { - return [ - 'profile_action_required' => $this->profileActionRequired, - 'profile_amount_required' => $this->profileAmountRequired->toArray(), - ]; - } -} diff --git a/app/Services/Bunq/Object/MonetaryAccountSetting.php b/app/Services/Bunq/Object/MonetaryAccountSetting.php deleted file mode 100644 index 0356b1aa83..0000000000 --- a/app/Services/Bunq/Object/MonetaryAccountSetting.php +++ /dev/null @@ -1,85 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Services\Bunq\Object; - -/** - * Class MonetaryAccountSetting. - */ -class MonetaryAccountSetting extends BunqObject -{ - /** @var string */ - private $color; - /** @var string */ - private $defaultAvatarStatus; - /** @var string */ - private $restrictionChat; - - /** - * MonetaryAccountSetting constructor. - * - * @param array $data - */ - public function __construct(array $data) - { - $this->color = $data['color']; - $this->defaultAvatarStatus = $data['default_avatar_status']; - $this->restrictionChat = $data['restriction_chat']; - - } - - /** - * @return string - */ - public function getColor(): string - { - return $this->color; - } - - /** - * @return string - */ - public function getDefaultAvatarStatus(): string - { - return $this->defaultAvatarStatus; - } - - /** - * @return string - */ - public function getRestrictionChat(): string - { - return $this->restrictionChat; - } - - /** - * @return array - */ - public function toArray(): array - { - return [ - 'color' => $this->color, - 'default_avatar_status' => $this->defaultAvatarStatus, - 'restriction_chat' => $this->restrictionChat, - ]; - } -} diff --git a/app/Services/Bunq/Object/Payment.php b/app/Services/Bunq/Object/Payment.php deleted file mode 100644 index d9fb3072cd..0000000000 --- a/app/Services/Bunq/Object/Payment.php +++ /dev/null @@ -1,145 +0,0 @@ -. - */ - -declare(strict_types=1); - -namespace FireflyIII\Services\Bunq\Object; - -use Carbon\Carbon; -use FireflyIII\Exceptions\FireflyException; - -/** - * Class Payment - */ -class Payment extends BunqObject -{ - /** @var LabelMonetaryAccount */ - private $alias; - /** @var Amount */ - private $amount; - /** @var array */ - private $attachments = []; - /** @var LabelMonetaryAccount */ - private $counterParty; - /** @var Carbon */ - private $created; - /** @var string */ - private $description; - /** @var int */ - private $id; - /** @var string */ - private $merchantReference; - /** @var int */ - private $monetaryAccountId; - /** @var string */ - private $subType; - /** @var string */ - private $type; - /** @var Carbon */ - private $updated; - - /** - * Payment constructor. - * - * @param array $data - * - */ - public function __construct(array $data) - { - $this->id = $data['id']; - $this->created = Carbon::createFromFormat('Y-m-d H:i:s.u', $data['created']); - $this->updated = Carbon::createFromFormat('Y-m-d H:i:s.u', $data['updated']); - $this->monetaryAccountId = (int)$data['monetary_account_id']; - $this->amount = new Amount($data['amount']); - $this->description = $data['description']; - $this->type = $data['type']; - $this->merchantReference = $data['merchant_reference']; - $this->alias = new LabelMonetaryAccount($data['alias']); - $this->counterParty = new LabelMonetaryAccount($data['counterparty_alias']); - $this->subType = $data['sub_type']; - } - - /** - * @return Amount - */ - public function getAmount(): Amount - { - return $this->amount; - } - - /** - * @return LabelMonetaryAccount|null - */ - public function getCounterParty(): ?LabelMonetaryAccount - { - return $this->counterParty; - } - - /** - * @return Carbon - */ - public function getCreated(): Carbon - { - return $this->created; - } - - /** - * @return string - */ - public function getDescription(): string - { - return $this->description; - } - - /** - * @return int - */ - public function getId(): int - { - return $this->id; - } - - /** - * @return string - */ - public function getSubType(): string - { - return $this->subType; - } - - /** - * @return string - */ - public function getType(): string - { - return $this->type; - } - - /** - * @return array - * @throws FireflyException - */ - public function toArray(): array - { - throw new FireflyException(sprintf('Cannot convert %s to array.', \get_class($this))); - } - -} diff --git a/app/Services/Bunq/Object/ServerPublicKey.php b/app/Services/Bunq/Object/ServerPublicKey.php deleted file mode 100644 index 4a665fda99..0000000000 --- a/app/Services/Bunq/Object/ServerPublicKey.php +++ /dev/null @@ -1,68 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Services\Bunq\Object; - -/** - * Class ServerPublicKey. - */ -class ServerPublicKey extends BunqObject -{ - /** @var string */ - private $publicKey; - - /** - * ServerPublicKey constructor. - * - * @param array $response - */ - public function __construct(array $response) - { - $this->publicKey = $response['server_public_key']; - } - - /** - * @return string - */ - public function getPublicKey(): string - { - return $this->publicKey; - } - - /** - * @param string $publicKey - */ - public function setPublicKey(string $publicKey) - { - $this->publicKey = $publicKey; - } - - /** - * @return array - */ - public function toArray(): array - { - return [ - 'server_public_key' => $this->publicKey, - ]; - } -} diff --git a/app/Services/Bunq/Object/UserCompany.php b/app/Services/Bunq/Object/UserCompany.php deleted file mode 100644 index 13508afdb5..0000000000 --- a/app/Services/Bunq/Object/UserCompany.php +++ /dev/null @@ -1,188 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Services\Bunq\Object; - -use Carbon\Carbon; - -/** - * Class UserCompany. - */ -class UserCompany extends BunqObject -{ - /** - * @var - */ - private $addressMain; - /** - * @var - */ - private $addressPostal; - /** @var array */ - private $aliases = []; - /** - * @var - */ - private $avatar; - /** @var string */ - private $cocNumber; - /** @var string */ - private $counterBankIban; - /** @var Carbon */ - private $created; - /** - * @var - */ - private $dailyLimit; - /** - * @var - */ - private $directorAlias; - /** @var string */ - private $displayName; - /** @var int */ - private $id; - /** @var string */ - private $language; - /** @var string */ - private $name; - /** @var array */ - private $notificationFilters = []; - /** @var string */ - private $publicNickName; - /** @var string */ - private $publicUuid; - /** @var string */ - private $region; - /** @var string */ - private $sectorOfIndustry; - /** @var int */ - private $sessionTimeout; - /** @var string */ - private $status; - /** @var string */ - private $subStatus; - /** @var string */ - private $typeOfBusinessEntity; - /** @var array */ - private $ubos = []; - /** @var Carbon */ - private $updated; - /** @var int */ - private $versionTos; - - /** - * UserCompany constructor. - * - * @param array $data - * - */ - public function __construct(array $data) - { - if (\count($data) === 0 || (isset($data['id']) && (int)$data['id'] === 0)) { - $this->id = 0; - $this->created = new Carbon; - $this->updated = new Carbon; - - return; - } - $this->id = (int)$data['id']; - $this->created = Carbon::createFromFormat('Y-m-d H:i:s.u', $data['created']); - $this->updated = Carbon::createFromFormat('Y-m-d H:i:s.u', $data['updated']); - $this->status = $data['status']; - $this->subStatus = $data['sub_status']; - $this->publicUuid = $data['public_uuid']; - $this->displayName = $data['display_name']; - $this->publicNickName = $data['public_nick_name']; - $this->language = $data['language']; - $this->region = $data['region']; - $this->sessionTimeout = (int)$data['session_timeout']; - $this->versionTos = (int)$data['version_terms_of_service']; - $this->cocNumber = $data['chamber_of_commerce_number']; - $this->typeOfBusinessEntity = $data['type_of_business_entity'] ?? ''; - $this->sectorOfIndustry = $data['sector_of_industry'] ?? ''; - $this->counterBankIban = $data['counter_bank_iban']; - $this->name = $data['name']; - - // TODO alias - // TODO avatar - // TODO daily_limit_without_confirmation_login - // TODO notification_filters - // TODO address_main - // TODO address_postal - // TODO director_alias - // TODO ubo - // TODO customer - // TODO customer_limit - // TODO billing_contract - // TODO pack_membership - } - - /** - * @return int - */ - public function getId(): int - { - return $this->id; - } - - /** - * @return array - */ - public function toArray(): array - { - $data = [ - 'id' => $this->id, - 'created' => $this->created->format('Y-m-d H:i:s.u'), - 'updated' => $this->updated->format('Y-m-d H:i:s.u'), - 'status' => $this->status, - 'sub_status' => $this->subStatus, - 'public_uuid' => $this->publicUuid, - 'display_name' => $this->displayName, - 'public_nick_name' => $this->publicNickName, - 'language' => $this->language, - 'region' => $this->region, - 'session_timeout' => $this->sessionTimeout, - 'version_terms_of_service' => $this->versionTos, - 'chamber_of_commerce_number' => $this->cocNumber, - 'type_of_business_entity' => $this->typeOfBusinessEntity, - 'sector_of_industry' => $this->sectorOfIndustry, - 'counter_bank_iban' => $this->counterBankIban, - 'name' => $this->name, - ]; - - // TODO alias - // TODO avatar - // TODO daily_limit_without_confirmation_login - // TODO notification_filters - // TODO address_main - // TODO address_postal - // TODO director_alias - // TODO ubo - // TODO customer - // TODO customer_limit - // TODO billing_contract - // TODO pack_membership - - return $data; - } -} diff --git a/app/Services/Bunq/Object/UserLight.php b/app/Services/Bunq/Object/UserLight.php deleted file mode 100644 index 2ffed83609..0000000000 --- a/app/Services/Bunq/Object/UserLight.php +++ /dev/null @@ -1,87 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Services\Bunq\Object; - -use Carbon\Carbon; -use FireflyIII\Exceptions\FireflyException; -/** - * Class UserLight. - */ -class UserLight extends BunqObject -{ - /** @var array */ - private $aliases = []; - /** @var Carbon */ - private $created; - /** @var string */ - private $displayName; - /** @var string */ - private $firstName; - /** @var int */ - private $id; - /** @var string */ - private $lastName; - /** @var string */ - private $legalName; - /** @var string */ - private $middleName; - /** @var string */ - private $publicNickName; - /** @var string */ - private $publicUuid; - /** @var Carbon */ - private $updated; - - /** - * UserLight constructor. - * - * @param array $data - * - */ - public function __construct(array $data) - { - if (0 === \count($data)) { - return; - } - $this->id = (int)$data['id']; - $this->created = Carbon::createFromFormat('Y-m-d H:i:s.u', $data['created']); - $this->updated = Carbon::createFromFormat('Y-m-d H:i:s.u', $data['updated']); - $this->publicUuid = $data['public_uuid']; - $this->displayName = $data['display_name']; - $this->publicNickName = $data['public_nick_name']; - $this->firstName = $data['first_name']; - $this->middleName = $data['middle_name']; - $this->lastName = $data['last_name']; - $this->legalName = $data['legal_name']; - // aliases - } - - /** - * @return array - * @throws FireflyException - */ - public function toArray(): array - { - throw new FireflyException(sprintf('Cannot convert %s to array.', \get_class($this))); - } -} diff --git a/app/Services/Bunq/Object/UserPerson.php b/app/Services/Bunq/Object/UserPerson.php deleted file mode 100644 index 10a2737e20..0000000000 --- a/app/Services/Bunq/Object/UserPerson.php +++ /dev/null @@ -1,210 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Services\Bunq\Object; - -use Carbon\Carbon; - -/** - * Class UserPerson. - */ -class UserPerson extends BunqObject -{ - /** - * @var - */ - private $addressMain; - /** - * @var - */ - private $addressPostal; - /** @var array */ - private $aliases = []; - /** - * @var - */ - private $avatar; - /** @var array */ - private $billingContracts = []; - /** @var string */ - private $countryOfBirth; - /** @var Carbon */ - private $created; - /** - * @var - */ - private $customer; - /** - * @var - */ - private $customerLimit; - /** - * @var - */ - private $dailyLimit; - /** @var Carbon */ - private $dateOfBirth; - /** @var string */ - private $displayName; - /** @var string */ - private $documentCountry; - /** @var string */ - private $documentNumber; - /** @var string */ - private $documentType; - /** @var string */ - private $firstName; - /** @var string */ - private $gender; - /** @var int */ - private $id; - /** @var string */ - private $language; - /** @var string */ - private $lastName; - /** @var string */ - private $legalName; - /** @var string */ - private $middleName; - /** @var string */ - private $nationality; - /** @var array */ - private $notificationFilters = []; - /** @var string */ - private $placeOfBirth; - /** @var string */ - private $publicNickName; - /** @var string */ - private $publicUuid; - /** - * @var mixed - */ - private $region; - /** @var int */ - private $sessionTimeout; - /** @var string */ - private $status; - /** @var string */ - private $subStatus; - /** @var string */ - private $taxResident; - /** @var Carbon */ - private $updated; - /** @var int */ - private $versionTos; - - /** - * UserPerson constructor. - * - * @param array $data - * - */ - public function __construct(array $data) - { - if (0 === \count($data)) { - $this->created = new Carbon; - $this->updated = new Carbon; - $this->dateOfBirth = new Carbon; - - return; - } - - $this->id = (int)$data['id']; - $this->created = Carbon::createFromFormat('Y-m-d H:i:s.u', $data['created']); - $this->updated = Carbon::createFromFormat('Y-m-d H:i:s.u', $data['updated']); - $this->status = $data['status']; - $this->subStatus = $data['sub_status']; - $this->publicUuid = $data['public_uuid']; - $this->displayName = $data['display_name']; - $this->publicNickName = $data['public_nick_name']; - $this->language = $data['language']; - $this->region = $data['region']; - $this->sessionTimeout = (int)$data['session_timeout']; - $this->firstName = $data['first_name']; - $this->middleName = $data['middle_name']; - $this->lastName = $data['last_name']; - $this->legalName = $data['legal_name']; - $this->taxResident = $data['tax_resident']; - $this->dateOfBirth = Carbon::createFromFormat('Y-m-d', $data['date_of_birth']); - $this->placeOfBirth = $data['place_of_birth']; - $this->countryOfBirth = $data['country_of_birth']; - $this->nationality = $data['nationality']; - $this->gender = $data['gender']; - $this->versionTos = (int)$data['version_terms_of_service']; - $this->documentNumber = $data['document_number']; - $this->documentType = $data['document_type']; - $this->documentCountry = $data['document_country_of_issuance']; - - // TODO create aliases - // TODO create avatar - // TODO create daily limit - // TODO create notification filters - // TODO create address main, postal - // TODO document front, back attachment - // TODO customer, customer_limit - // TODO billing contracts - } - - /** - * @return int - */ - public function getId(): int - { - return $this->id; - } - - /** - * @return array - */ - public function toArray(): array - { - $data = [ - 'id' => $this->id, - 'created' => $this->created->format('Y-m-d H:i:s.u'), - 'updated' => $this->updated->format('Y-m-d H:i:s.u'), - 'status' => $this->status, - 'sub_status' => $this->subStatus, - 'public_uuid' => $this->publicUuid, - 'display_name' => $this->displayName, - 'public_nick_name' => $this->publicNickName, - 'language' => $this->language, - 'region' => $this->region, - 'session_timeout' => $this->sessionTimeout, - 'first_name' => $this->firstName, - 'middle_name' => $this->middleName, - 'last_name' => $this->lastName, - 'legal_name' => $this->legalName, - 'tax_resident' => $this->taxResident, - 'date_of_birth' => $this->dateOfBirth->format('Y-m-d'), - 'place_of_birth' => $this->placeOfBirth, - 'country_of_birth' => $this->countryOfBirth, - 'nationality' => $this->nationality, - 'gender' => $this->gender, - 'version_terms_of_service' => $this->versionTos, - 'document_number' => $this->documentNumber, - 'document_type' => $this->documentType, - 'document_country_of_issuance' => $this->documentCountry, - ]; - - return $data; - } -} diff --git a/app/Services/Bunq/Payment.php b/app/Services/Bunq/Payment.php new file mode 100644 index 0000000000..e8c91dfd53 --- /dev/null +++ b/app/Services/Bunq/Payment.php @@ -0,0 +1,61 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Services\Bunq; + +use bunq\Exception\BunqException; +use bunq\Model\Generated\Endpoint\BunqResponsePaymentList; +use bunq\Model\Generated\Endpoint\Payment as BunqPayment; +use Exception; +use FireflyIII\Exceptions\FireflyException; + +/** + * Class Payment + */ +class Payment +{ + /** + * @param int|null $monetaryAccountId + * @param array|null $params + * @param array|null $customHeaders + * + * @throws FireflyException + * @return BunqResponsePaymentList + */ + public function listing(int $monetaryAccountId = null, array $params = null, array $customHeaders = null): BunqResponsePaymentList + { + $monetaryAccountId = $monetaryAccountId ?? 0; + $params = $params ?? []; + $customHeaders = $customHeaders ?? []; + try { + $result = BunqPayment::listing($monetaryAccountId, $params, $customHeaders); + } catch (BunqException|Exception $e) { + throw new FireflyException($e->getMessage()); + } + + return $result; + + + } + +} \ No newline at end of file diff --git a/app/Services/Bunq/Request/BunqRequest.php b/app/Services/Bunq/Request/BunqRequest.php deleted file mode 100644 index f8a66a6347..0000000000 --- a/app/Services/Bunq/Request/BunqRequest.php +++ /dev/null @@ -1,525 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Services\Bunq\Request; - -use Exception; -use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Services\Bunq\Object\ServerPublicKey; -use Log; -use Requests; - -/** - * Class BunqRequest. - */ -abstract class BunqRequest -{ - /** @var string */ - protected $secret = ''; - /** @var ServerPublicKey */ - protected $serverPublicKey; - /** @var string */ - private $privateKey = ''; - /** @var string */ - private $server; - /** - * @var array - */ - private $upperCaseHeaders - = [ - 'x-bunq-client-response-id' => 'X-Bunq-Client-Response-Id', - 'x-bunq-client-request-id' => 'X-Bunq-Client-Request-Id', - ]; - /** @var string */ - private $version = 'v1'; - - /** - * BunqRequest constructor. - */ - public function __construct() - { - $this->server = (string)config('import.options.bunq.server'); - $this->version = (string)config('import.options.bunq.version'); - Log::debug(sprintf('Created new BunqRequest with server "%s" and version "%s"', $this->server, $this->version)); - } - - /** - * - */ - abstract public function call(): void; - - /** - * @return string - */ - public function getServer(): string - { - return $this->server; - } - - /** - * @return ServerPublicKey - */ - public function getServerPublicKey(): ServerPublicKey - { - return $this->serverPublicKey; - } - - /** - * @param ServerPublicKey $serverPublicKey - */ - public function setServerPublicKey(ServerPublicKey $serverPublicKey) - { - $this->serverPublicKey = $serverPublicKey; - } - - /** - * @param string $privateKey - */ - public function setPrivateKey(string $privateKey) - { - $this->privateKey = $privateKey; - } - - /** - * @param string $secret - */ - public function setSecret(string $secret) - { - $this->secret = $secret; - } - - /** - * @param string $method - * @param string $uri - * @param array $headers - * @param string $data - * - * @return string - * - * @throws FireflyException - */ - protected function generateSignature(string $method, string $uri, array $headers, string $data): string - { - if (0 === \strlen($this->privateKey)) { - throw new FireflyException('No private key present.'); - } - if ('get' === strtolower($method) || 'delete' === strtolower($method)) { - $data = ''; - } - $uri = sprintf('/%s/%s', $this->version, $uri); - $toSign = sprintf("%s %s\n", strtoupper($method), $uri); - - Log::debug(sprintf('Message to sign (without data): %s', $toSign)); - - $headersToSign = ['Cache-Control', 'User-Agent']; - ksort($headers); - foreach ($headers as $name => $value) { - if (\in_array($name, $headersToSign) || 'X-Bunq-' === substr($name, 0, 7)) { - $toSign .= sprintf("%s: %s\n", $name, $value); - } - } - $toSign .= "\n" . $data; - $signature = ''; - - - openssl_sign($toSign, $signature, $this->privateKey, OPENSSL_ALGO_SHA256); - $signature = base64_encode($signature); - - return $signature; - } - - /** - * @param string $key - * @param array $response - * - * @return array - */ - protected function getArrayFromResponse(string $key, array $response): array - { - $result = []; - if (isset($response['Response'])) { - foreach ($response['Response'] as $entry) { - $currentKey = key($entry); - $data = current($entry); - if ($currentKey === $key) { - $result[] = $data; - } - } - } - - return $result; - } - - /** - * @return array - */ - protected function getDefaultHeaders(): array - { - $userAgent = sprintf('FireflyIII v%s', config('firefly.version')); - - return [ - 'X-Bunq-Client-Request-Id' => uniqid('FFIII', true), - 'Cache-Control' => 'no-cache', - 'User-Agent' => $userAgent, - 'X-Bunq-Language' => 'en_US', - 'X-Bunq-Region' => 'nl_NL', - 'X-Bunq-Geolocation' => '0 0 0 0 NL', - ]; - } - - /** - * @param string $key - * @param array $response - * - * @return array - */ - protected function getKeyFromResponse(string $key, array $response): array - { - if (isset($response['Response'])) { - foreach ($response['Response'] as $entry) { - $currentKey = key($entry); - $data = current($entry); - if ($currentKey === $key) { - return $data; - } - } - } - - return []; - } - - /** - * @param string $uri - * @param array $headers - * - * @return array - * - * @throws FireflyException - */ - protected function sendSignedBunqDelete(string $uri, array $headers): array - { - if (0 === \strlen($this->server)) { - throw new FireflyException('No bunq server defined'); - } - - $fullUri = $this->makeUri($uri); - $signature = $this->generateSignature('delete', $uri, $headers, ''); - $headers['X-Bunq-Client-Signature'] = $signature; - - Log::debug(sprintf('Going to send a signed bunq DELETE to %s', $fullUri)); - - try { - $response = Requests::delete($fullUri, $headers); - } catch (Exception $e) { - return ['Error' => [0 => ['error_description' => $e->getMessage(), 'error_description_translated' => $e->getMessage()]]]; - } - - $body = $response->body; - $array = json_decode($body, true); - $responseHeaders = $response->headers->getAll(); - $statusCode = (int)$response->status_code; - $array['ResponseHeaders'] = $responseHeaders; - $array['ResponseStatusCode'] = $statusCode; - - Log::debug(sprintf('Response to DELETE %s is %s', $fullUri, $body)); - if ($this->isErrorResponse($array)) { - $this->throwResponseError($array); - } - - if (!$this->verifyServerSignature($body, $responseHeaders, $statusCode)) { - throw new FireflyException(sprintf('Could not verify signature for request to "%s"', $uri)); - } - - return $array; - } - - /** - * @param string $uri - * @param array $data - * @param array $headers - * - * @return array - * - * @throws FireflyException - */ - protected function sendSignedBunqGet(string $uri, array $data, array $headers): array - { - if (0 === \strlen($this->server)) { - throw new FireflyException('No bunq server defined'); - } - - $body = json_encode($data); - $fullUri = $this->makeUri($uri); - $signature = $this->generateSignature('get', $uri, $headers, $body); - $headers['X-Bunq-Client-Signature'] = $signature; - - Log::debug(sprintf('Going to send a signed bunq GET to %s', $fullUri)); - - try { - $response = Requests::get($fullUri, $headers); - } catch (Exception $e) { - return ['Error' => [0 => ['error_description' => $e->getMessage(), 'error_description_translated' => $e->getMessage()]]]; - } - - $body = $response->body; - $array = json_decode($body, true); - $responseHeaders = $response->headers->getAll(); - $statusCode = (int)$response->status_code; - $array['ResponseHeaders'] = $responseHeaders; - $array['ResponseStatusCode'] = $statusCode; - - if ($this->isErrorResponse($array)) { - $this->throwResponseError($array); - } - - if (!$this->verifyServerSignature($body, $responseHeaders, $statusCode)) { - throw new FireflyException(sprintf('Could not verify signature for request to "%s"', $uri)); - } - - return $array; - } - - /** - * @param string $uri - * @param array $data - * @param array $headers - * - * @return array - * @throws FireflyException - */ - protected function sendSignedBunqPost(string $uri, array $data, array $headers): array - { - $body = json_encode($data); - $fullUri = $this->makeUri($uri); - $signature = $this->generateSignature('post', $uri, $headers, $body); - $headers['X-Bunq-Client-Signature'] = $signature; - - Log::debug(sprintf('Going to send a signed bunq POST request to: %s', $fullUri), $headers); - - try { - $response = Requests::post($fullUri, $headers, $body); - } catch (Exception $e) { - return ['Error' => [0 => ['error_description' => $e->getMessage(), 'error_description_translated' => $e->getMessage()]]]; - } - Log::debug('Seems to have NO exceptions in Response'); - $body = $response->body; - $array = json_decode($body, true); - $responseHeaders = $response->headers->getAll(); - $statusCode = (int)$response->status_code; - $array['ResponseHeaders'] = $responseHeaders; - $array['ResponseStatusCode'] = $statusCode; - - if ($this->isErrorResponse($array)) { - $this->throwResponseError($array); - } - - if (!$this->verifyServerSignature($body, $responseHeaders, $statusCode)) { - throw new FireflyException(sprintf('Could not verify signature for request to "%s"', $uri)); - } - - return $array; - } - - /** - * @param string $uri - * @param array $headers - * - * @return array - * @throws FireflyException - */ - protected function sendUnsignedBunqDelete(string $uri, array $headers): array - { - $fullUri = $this->makeUri($uri); - - Log::debug(sprintf('Going to send a UNsigned bunq DELETE to %s', $fullUri)); - - try { - $response = Requests::delete($fullUri, $headers); - } catch (Exception $e) { - return ['Error' => [0 => ['error_description' => $e->getMessage(), 'error_description_translated' => $e->getMessage()]]]; - } - $body = $response->body; - $array = json_decode($body, true); - $responseHeaders = $response->headers->getAll(); - $statusCode = $response->status_code; - $array['ResponseHeaders'] = $responseHeaders; - $array['ResponseStatusCode'] = $statusCode; - - if ($this->isErrorResponse($array)) { - $this->throwResponseError($array); - } - - return $array; - } - - /** - * @param string $uri - * @param array $data - * @param array $headers - * - * @return array - * @throws FireflyException - */ - protected function sendUnsignedBunqPost(string $uri, array $data, array $headers): array - { - $body = json_encode($data); - $fullUri = $this->makeUri($uri); - - Log::debug(sprintf('Going to send an UNsigned bunq POST to: %s', $fullUri)); - - try { - $response = Requests::post($fullUri, $headers, $body); - } catch (Exception $e) { - return ['Error' => [0 => ['error_description' => $e->getMessage(), 'error_description_translated' => $e->getMessage()]]]; - } - $body = $response->body; - $array = json_decode($body, true); - $responseHeaders = $response->headers->getAll(); - $statusCode = $response->status_code; - $array['ResponseHeaders'] = $responseHeaders; - $array['ResponseStatusCode'] = $statusCode; - - if ($this->isErrorResponse($array)) { - $this->throwResponseError($array); - } - - return $array; - } - - /** - * @param array $response - * - * @return bool - */ - private function isErrorResponse(array $response): bool - { - - $key = key($response); - if ('Error' === $key) { - Log::error('Response IS an error response!'); - - return true; - } - Log::debug('Response is not an error response'); - - return false; - } - - /** - * @param array $headers - * - * @return string - */ - private function joinHeaders(array $headers): string - { - $string = ''; - foreach ($headers as $header => $value) { - $string .= $header . ': ' . trim($value) . "\n"; - } - - return $string; - } - - /** - * Make full API URI - * - * @param string $uri - * - * @return string - */ - private function makeUri(string $uri): string - { - return 'https://' . $this->server . '/' . $this->version . '/' . $uri; - } - - /** - * @param array $response - * - * @throws FireflyException - */ - private function throwResponseError(array $response) - { - $message = []; - if (isset($response['Error'])) { - foreach ($response['Error'] as $error) { - $message[] = $error['error_description']; - } - } - throw new FireflyException('Bunq ERROR ' . $response['ResponseStatusCode'] . ': ' . implode(', ', $message)); - } - - /** - * @param string $body - * @param array $headers - * @param int $statusCode - * - * @return bool - * @throws FireflyException - */ - private function verifyServerSignature(string $body, array $headers, int $statusCode): bool - { - Log::debug('Going to verify signature for body+headers+status'); - $dataToVerify = $statusCode . "\n"; - $verifyHeaders = []; - - // false when no public key is present - if (null === $this->serverPublicKey) { - Log::error('No public key present in class, so return FALSE.'); - - return false; - } - foreach ($headers as $header => $value) { - // skip non-bunq headers or signature - if ('x-bunq-' !== substr($header, 0, 7) || 'x-bunq-server-signature' === $header) { - continue; - } - // need to have upper case variant of header: - if (!isset($this->upperCaseHeaders[$header])) { - throw new FireflyException(sprintf('No upper case variant for header "%s"', $header)); - } - $header = $this->upperCaseHeaders[$header]; - $verifyHeaders[$header] = $value[0]; - } - // sort verification headers: - ksort($verifyHeaders); - - // add them to data to sign: - $dataToVerify .= $this->joinHeaders($verifyHeaders); - $signature = $headers['x-bunq-server-signature'][0]; - $dataToVerify .= "\n" . $body; - $result = openssl_verify($dataToVerify, base64_decode($signature), $this->serverPublicKey->getPublicKey(), OPENSSL_ALGO_SHA256); - - if (\is_int($result) && $result < 1) { - Log::error(sprintf('Result of verification is %d, return false.', $result)); - - return false; - } - if (!\is_int($result)) { - Log::error(sprintf('Result of verification is a boolean (%d), return false.', $result)); - - return false; - } - Log::info('Signature is a match, return true.'); - - return true; - } -} diff --git a/app/Services/Bunq/Request/DeleteDeviceSessionRequest.php b/app/Services/Bunq/Request/DeleteDeviceSessionRequest.php deleted file mode 100644 index 758d0531e9..0000000000 --- a/app/Services/Bunq/Request/DeleteDeviceSessionRequest.php +++ /dev/null @@ -1,55 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Services\Bunq\Request; - -use FireflyIII\Services\Bunq\Token\SessionToken; -use Log; - -/** - * Class DeleteDeviceSessionRequest. - */ -class DeleteDeviceSessionRequest extends BunqRequest -{ - /** @var SessionToken */ - private $sessionToken; - - /** - */ - public function call(): void - { - Log::debug('Going to send bunq delete session request.'); - $uri = sprintf('session/%d', $this->sessionToken->getId()); - $headers = $this->getDefaultHeaders(); - $headers['X-Bunq-Client-Authentication'] = $this->sessionToken->getToken(); - $this->sendSignedBunqDelete($uri, $headers); - - } - - /** - * @param SessionToken $sessionToken - */ - public function setSessionToken(SessionToken $sessionToken) - { - $this->sessionToken = $sessionToken; - } -} diff --git a/app/Services/Bunq/Request/DeviceServerRequest.php b/app/Services/Bunq/Request/DeviceServerRequest.php deleted file mode 100644 index 5bb6f4e33f..0000000000 --- a/app/Services/Bunq/Request/DeviceServerRequest.php +++ /dev/null @@ -1,91 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Services\Bunq\Request; - -use FireflyIII\Services\Bunq\Id\DeviceServerId; -use FireflyIII\Services\Bunq\Token\InstallationToken; -use Log; - -/** - * Class DeviceServerRequest. - */ -class DeviceServerRequest extends BunqRequest -{ - /** @var string */ - private $description = ''; - /** @var DeviceServerId */ - private $deviceServerId; - /** @var InstallationToken */ - private $installationToken; - /** @var array */ - private $permittedIps = []; - - /** - * @throws \FireflyIII\Exceptions\FireflyException - */ - public function call(): void - { - Log::debug('Now in DeviceServerRequest::call()'); - $uri = 'device-server'; - $data = ['description' => $this->description, 'secret' => $this->secret, 'permitted_ips' => $this->permittedIps]; - $headers = $this->getDefaultHeaders(); - $headers['X-Bunq-Client-Authentication'] = $this->installationToken->getToken(); - - $response = $this->sendSignedBunqPost($uri, $data, $headers); - $deviceServerId = new DeviceServerId; - $deviceServerId->setId((int)$response['Response'][0]['Id']['id']); - $this->deviceServerId = $deviceServerId; - } - - /** - * @return DeviceServerId - */ - public function getDeviceServerId(): DeviceServerId - { - return $this->deviceServerId; - } - - /** - * @param string $description - */ - public function setDescription(string $description) - { - $this->description = $description; - } - - /** - * @param InstallationToken $installationToken - */ - public function setInstallationToken(InstallationToken $installationToken) - { - $this->installationToken = $installationToken; - } - - /** - * @param array $permittedIps - */ - public function setPermittedIps(array $permittedIps) - { - $this->permittedIps = $permittedIps; - } -} diff --git a/app/Services/Bunq/Request/DeviceSessionRequest.php b/app/Services/Bunq/Request/DeviceSessionRequest.php deleted file mode 100644 index a8c34fe224..0000000000 --- a/app/Services/Bunq/Request/DeviceSessionRequest.php +++ /dev/null @@ -1,155 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Services\Bunq\Request; - -use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Services\Bunq\Id\DeviceSessionId; -use FireflyIII\Services\Bunq\Object\UserCompany; -use FireflyIII\Services\Bunq\Object\UserPerson; -use FireflyIII\Services\Bunq\Token\InstallationToken; -use FireflyIII\Services\Bunq\Token\SessionToken; - -/** - * Class DeviceSessionRequest. - */ -class DeviceSessionRequest extends BunqRequest -{ - /** @var DeviceSessionId */ - private $deviceSessionId; - /** @var InstallationToken */ - private $installationToken; - /** @var SessionToken */ - private $sessionToken; - /** @var UserCompany */ - private $userCompany; - /** @var UserPerson */ - private $userPerson; - - /** - * @throws FireflyException - */ - public function call(): void - { - $uri = 'session-server'; - $data = ['secret' => $this->secret]; - $headers = $this->getDefaultHeaders(); - $headers['X-Bunq-Client-Authentication'] = $this->installationToken->getToken(); - $response = $this->sendSignedBunqPost($uri, $data, $headers); - - $this->deviceSessionId = $this->extractDeviceSessionId($response); - $this->sessionToken = $this->extractSessionToken($response); - $this->userPerson = $this->extractUserPerson($response); - $this->userCompany = $this->extractUserCompany($response); - - } - - /** - * @return DeviceSessionId - */ - public function getDeviceSessionId(): DeviceSessionId - { - return $this->deviceSessionId; - } - - /** - * @return SessionToken - */ - public function getSessionToken(): SessionToken - { - return $this->sessionToken; - } - - /** - * @return UserCompany - */ - public function getUserCompany(): UserCompany - { - return $this->userCompany; - } - - /** - * @return UserPerson - */ - public function getUserPerson(): UserPerson - { - return $this->userPerson; - } - - /** - * @param InstallationToken $installationToken - */ - public function setInstallationToken(InstallationToken $installationToken) - { - $this->installationToken = $installationToken; - } - - /** - * @param array $response - * - * @return DeviceSessionId - */ - private function extractDeviceSessionId(array $response): DeviceSessionId - { - $data = $this->getKeyFromResponse('Id', $response); - $deviceSessionId = new DeviceSessionId; - $deviceSessionId->setId((int)$data['id']); - - return $deviceSessionId; - } - - /** - * @param array $response - * - * @return SessionToken - */ - private function extractSessionToken(array $response): SessionToken - { - $data = $this->getKeyFromResponse('Token', $response); - - return new SessionToken($data); - } - - /** - * @param $response - * - * @return UserCompany - */ - private function extractUserCompany($response): UserCompany - { - $data = $this->getKeyFromResponse('UserCompany', $response); - - return new UserCompany($data); - } - - /** - * @param $response - * - * @return UserPerson - */ - private function extractUserPerson($response): UserPerson - { - $data = $this->getKeyFromResponse('UserPerson', $response); - - return new UserPerson($data); - } -} diff --git a/app/Services/Bunq/Request/InstallationTokenRequest.php b/app/Services/Bunq/Request/InstallationTokenRequest.php deleted file mode 100644 index d22614654a..0000000000 --- a/app/Services/Bunq/Request/InstallationTokenRequest.php +++ /dev/null @@ -1,140 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Services\Bunq\Request; - -use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Services\Bunq\Id\InstallationId; -use FireflyIII\Services\Bunq\Object\ServerPublicKey; -use FireflyIII\Services\Bunq\Token\InstallationToken; -use Log; - -/** - * Class InstallationTokenRequest. - */ -class InstallationTokenRequest extends BunqRequest -{ - /** @var InstallationId */ - private $installationId; - /** @var InstallationToken */ - private $installationToken; - /** @var string */ - private $publicKey = ''; - - /** - * @throws \FireflyIII\Exceptions\FireflyException - */ - public function call(): void - { - Log::debug('Now in InstallationTokenRequest::call()'); - $uri = 'installation'; - $data = ['client_public_key' => $this->publicKey]; - $headers = $this->getDefaultHeaders(); - $response = $this->sendUnsignedBunqPost($uri, $data, $headers); - //Log::debug('Installation request response', $response); - - $this->installationId = $this->extractInstallationId($response); - $this->serverPublicKey = $this->extractServerPublicKey($response); - $this->installationToken = $this->extractInstallationToken($response); - Log::debug('No errors! We have installation ID!'); - Log::debug(sprintf('Installation ID: %s', $this->installationId->getId())); - Log::debug(sprintf('Installation token: %s', $this->installationToken->getToken())); - Log::debug('Server public key: (not included)'); - } - - /** - * @return InstallationId - */ - public function getInstallationId(): InstallationId - { - return $this->installationId; - } - - /** - * @return InstallationToken - */ - public function getInstallationToken(): InstallationToken - { - return $this->installationToken; - } - - /** - * @return string - */ - public function getPublicKey(): string - { - return $this->publicKey; - } - - /** - * @param string $publicKey - */ - public function setPublicKey(string $publicKey) - { - $this->publicKey = $publicKey; - } - - /** - * @param array $response - * - * @return InstallationId - * @throws FireflyException - */ - private function extractInstallationId(array $response): InstallationId - { - $installationId = new InstallationId; - $data = $this->getKeyFromResponse('Id', $response); - - if (!isset($data['id'])) { - Log::error('No installation token in bunq response.', $response); - throw new FireflyException('There is no installation token in the bunq response. Sorry, I cannot continue.'); - } - - $installationId->setId($data['id']); - - return $installationId; - } - - /** - * @param array $response - * - * @return InstallationToken - */ - private function extractInstallationToken(array $response): InstallationToken - { - $data = $this->getKeyFromResponse('Token', $response); - - return new InstallationToken($data); - } - - /** - * @param array $response - * - * @return ServerPublicKey - */ - private function extractServerPublicKey(array $response): ServerPublicKey - { - $data = $this->getKeyFromResponse('ServerPublicKey', $response); - - return new ServerPublicKey($data); - } -} diff --git a/app/Services/Bunq/Request/ListDeviceServerRequest.php b/app/Services/Bunq/Request/ListDeviceServerRequest.php deleted file mode 100644 index a143150ddf..0000000000 --- a/app/Services/Bunq/Request/ListDeviceServerRequest.php +++ /dev/null @@ -1,87 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Services\Bunq\Request; - -use FireflyIII\Services\Bunq\Object\DeviceServer; -use FireflyIII\Services\Bunq\Token\InstallationToken; -use Illuminate\Support\Collection; -use Log; - -/** - * Class ListDeviceServerRequest. - */ -class ListDeviceServerRequest extends BunqRequest -{ - /** @var Collection */ - private $devices; - /** @var InstallationToken */ - private $installationToken; - - public function __construct() - { - parent::__construct(); - $this->devices = new Collection; - Log::debug('Constructed ListDeviceServerRequest'); - } - - /** - * @throws \FireflyIII\Exceptions\FireflyException - */ - public function call(): void - { - Log::debug('Now in ListDeviceServerRequest::call()'); - $uri = 'device-server'; - $data = []; - $headers = $this->getDefaultHeaders(); - $headers['X-Bunq-Client-Authentication'] = $this->installationToken->getToken(); - $response = $this->sendSignedBunqGet($uri, $data, $headers); - Log::debug('Returned from sending device-server list request!'); - // create device server objects: - $raw = $this->getArrayFromResponse('DeviceServer', $response); - Log::debug(sprintf('Count %d entries in response array.', \count($raw))); - Log::debug('Full response', $response); - /** @var array $entry */ - foreach ($raw as $entry) { - $server = new DeviceServer($entry); - Log::debug(sprintf('Created server "%s" with IP "%s"', $server->getId()->getId(), $server->getIp())); - $this->devices->push($server); - } - - } - - /** - * @return Collection - */ - public function getDevices(): Collection - { - return $this->devices; - } - - /** - * @param InstallationToken $installationToken - */ - public function setInstallationToken(InstallationToken $installationToken) - { - $this->installationToken = $installationToken; - } -} diff --git a/app/Services/Bunq/Request/ListMonetaryAccountRequest.php b/app/Services/Bunq/Request/ListMonetaryAccountRequest.php deleted file mode 100644 index 6860a8a076..0000000000 --- a/app/Services/Bunq/Request/ListMonetaryAccountRequest.php +++ /dev/null @@ -1,85 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Services\Bunq\Request; - -use FireflyIII\Services\Bunq\Object\MonetaryAccountBank; -use FireflyIII\Services\Bunq\Token\SessionToken; -use Illuminate\Support\Collection; - -/** - * Class ListMonetaryAccountRequest. - */ -class ListMonetaryAccountRequest extends BunqRequest -{ - /** @var Collection */ - private $monetaryAccounts; - /** @var SessionToken */ - private $sessionToken; - /** @var int */ - private $userId = 0; - - /** - * @throws \FireflyIII\Exceptions\FireflyException - */ - public function call(): void - { - $this->monetaryAccounts = new Collection; - $uri = sprintf('user/%d/monetary-account', $this->userId); - $data = []; - $headers = $this->getDefaultHeaders(); - $headers['X-Bunq-Client-Authentication'] = $this->sessionToken->getToken(); - $response = $this->sendSignedBunqGet($uri, $data, $headers); - - // create device server objects: - $raw = $this->getArrayFromResponse('MonetaryAccountBank', $response); - foreach ($raw as $entry) { - $account = new MonetaryAccountBank($entry); - $this->monetaryAccounts->push($account); - } - - } - - /** - * @return Collection - */ - public function getMonetaryAccounts(): Collection - { - return $this->monetaryAccounts; - } - - /** - * @param SessionToken $sessionToken - */ - public function setSessionToken(SessionToken $sessionToken) - { - $this->sessionToken = $sessionToken; - } - - /** - * @param int $userId - */ - public function setUserId(int $userId) - { - $this->userId = $userId; - } -} diff --git a/app/Services/Bunq/Request/ListPaymentRequest.php b/app/Services/Bunq/Request/ListPaymentRequest.php deleted file mode 100644 index 9b3eb4ac6f..0000000000 --- a/app/Services/Bunq/Request/ListPaymentRequest.php +++ /dev/null @@ -1,107 +0,0 @@ -. - */ - -declare(strict_types=1); - -namespace FireflyIII\Services\Bunq\Request; - -use FireflyIII\Services\Bunq\Object\MonetaryAccountBank; -use FireflyIII\Services\Bunq\Object\Payment; -use FireflyIII\Services\Bunq\Token\SessionToken; -use Illuminate\Support\Collection; - - -/** - * Class ListPaymentRequest - */ -class ListPaymentRequest extends BunqRequest -{ - - /** @var MonetaryAccountBank */ - private $account; - /** @var Collection */ - private $payments; - /** @var SessionToken */ - private $sessionToken; - /** @var int */ - private $userId = 0; - - /** - * TODO support pagination. - * TODO impose limits on import. - * - * @throws \FireflyIII\Exceptions\FireflyException - */ - public function call(): void - { - $break = false; - $this->payments = new Collection; - $uri = sprintf('user/%d/monetary-account/%d/payment', $this->userId, $this->account->getId()); - $headers = $this->getDefaultHeaders(); - $headers['X-Bunq-Client-Authentication'] = $this->sessionToken->getToken(); - while ($break === false) { - $response = $this->sendSignedBunqGet($uri, [], $headers); - $uri = str_replace('/v1/', '', $response['Pagination']['future_url']); - $break = true; - - // create payment objects: - $raw = $this->getArrayFromResponse('Payment', $response); - foreach ($raw as $entry) { - $payment = new Payment($entry); - $this->payments->push($payment); - } - } - - } - - /** - * @return Collection - */ - public function getPayments(): Collection - { - return $this->payments; - } - - - /** - * @param MonetaryAccountBank $account - */ - public function setAccount(MonetaryAccountBank $account): void - { - $this->account = $account; - } - - /** - * @param SessionToken $sessionToken - */ - public function setSessionToken(SessionToken $sessionToken): void - { - $this->sessionToken = $sessionToken; - } - - /** - * @param int $userId - */ - public function setUserId(int $userId): void - { - $this->userId = $userId; - } -} diff --git a/app/Services/Bunq/Request/ListUserRequest.php b/app/Services/Bunq/Request/ListUserRequest.php deleted file mode 100644 index 32b3cdf32c..0000000000 --- a/app/Services/Bunq/Request/ListUserRequest.php +++ /dev/null @@ -1,95 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Services\Bunq\Request; - -use FireflyIII\Services\Bunq\Object\UserCompany; -use FireflyIII\Services\Bunq\Object\UserLight; -use FireflyIII\Services\Bunq\Object\UserPerson; -use FireflyIII\Services\Bunq\Token\SessionToken; - -/** - * Class ListUserRequest. - */ -class ListUserRequest extends BunqRequest -{ - /** @var SessionToken */ - private $sessionToken; - /** @var UserCompany */ - private $userCompany; - /** @var UserLight */ - private $userLight; - /** @var UserPerson */ - private $userPerson; - - /** - */ - public function call(): void - { - $uri = 'user'; - $data = []; - $headers = $this->getDefaultHeaders(); - $headers['X-Bunq-Client-Authentication'] = $this->sessionToken->getToken(); - $response = $this->sendSignedBunqGet($uri, $data, $headers); - - // create user objects: - $light = $this->getKeyFromResponse('UserLight', $response); - $company = $this->getKeyFromResponse('UserCompany', $response); - $person = $this->getKeyFromResponse('UserPerson', $response); - $this->userLight = new UserLight($light); - $this->userCompany = new UserCompany($company); - $this->userPerson = new UserPerson($person); - - } - - /** - * @return UserCompany - */ - public function getUserCompany(): UserCompany - { - return $this->userCompany; - } - - /** - * @return UserLight - */ - public function getUserLight(): UserLight - { - return $this->userLight; - } - - /** - * @return UserPerson - */ - public function getUserPerson(): UserPerson - { - return $this->userPerson; - } - - /** - * @param SessionToken $sessionToken - */ - public function setSessionToken(SessionToken $sessionToken) - { - $this->sessionToken = $sessionToken; - } -} diff --git a/app/Services/Bunq/Token/BunqToken.php b/app/Services/Bunq/Token/BunqToken.php deleted file mode 100644 index a83716408d..0000000000 --- a/app/Services/Bunq/Token/BunqToken.php +++ /dev/null @@ -1,107 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Services\Bunq\Token; - -use Carbon\Carbon; - -/** - * Class BunqToken. - */ -class BunqToken -{ - /** @var Carbon */ - private $created; - /** @var int */ - private $id = 0; - /** @var string */ - private $token = ''; - /** @var Carbon */ - private $updated; - - /** - * BunqToken constructor. - * - * @param array $response - */ - public function __construct(array $response) - { - $this->makeTokenFromResponse($response); - } - - /** - * @return Carbon - */ - public function getCreated(): Carbon - { - return $this->created; - } - - /** - * @return int - */ - public function getId(): int - { - return $this->id; - } - - /** - * @return string - */ - public function getToken(): string - { - return $this->token; - } - - /** - * @return Carbon - */ - public function getUpdated(): Carbon - { - return $this->updated; - } - - /** - * @return array - */ - public function toArray(): array - { - return [ - 'id' => $this->id, - 'created' => $this->created->format('Y-m-d H:i:s.u'), - 'updated' => $this->updated->format('Y-m-d H:i:s.u'), - 'token' => $this->token, - ]; - } - - /** - * @param array $response - * - */ - protected function makeTokenFromResponse(array $response): void - { - $this->id = $response['id']; - $this->created = Carbon::createFromFormat('Y-m-d H:i:s.u', $response['created']); - $this->updated = Carbon::createFromFormat('Y-m-d H:i:s.u', $response['updated']); - $this->token = $response['token']; - } -} diff --git a/app/Services/Bunq/Token/InstallationToken.php b/app/Services/Bunq/Token/InstallationToken.php deleted file mode 100644 index 2826658292..0000000000 --- a/app/Services/Bunq/Token/InstallationToken.php +++ /dev/null @@ -1,30 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Services\Bunq\Token; - -/** - * Class InstallationToken. - */ -class InstallationToken extends BunqToken -{ -} diff --git a/app/Services/Github/Object/GithubObject.php b/app/Services/Github/Object/GithubObject.php index c3f13ab04c..0b83f4bf58 100644 --- a/app/Services/Github/Object/GithubObject.php +++ b/app/Services/Github/Object/GithubObject.php @@ -23,7 +23,8 @@ declare(strict_types=1); namespace FireflyIII\Services\Github\Object; /** - * Class SpectreObject + * @codeCoverageIgnore + * Class GithubObject */ class GithubObject { diff --git a/app/Services/Github/Object/Release.php b/app/Services/Github/Object/Release.php index 33cfa91415..d9bf4ed408 100644 --- a/app/Services/Github/Object/Release.php +++ b/app/Services/Github/Object/Release.php @@ -27,6 +27,7 @@ use Carbon\Carbon; /** + * @codeCoverageIgnore * Class Release */ class Release extends GithubObject diff --git a/app/Services/Github/Request/GithubRequest.php b/app/Services/Github/Request/GithubRequest.php index 8c2175baaa..3e7a5ca5d6 100644 --- a/app/Services/Github/Request/GithubRequest.php +++ b/app/Services/Github/Request/GithubRequest.php @@ -26,7 +26,6 @@ namespace FireflyIII\Services\Github\Request; /** * Interface GithubRequest * - * @package FireflyIII\Services\Github\Request */ interface GithubRequest { diff --git a/app/Services/IP/IPRetrievalInterface.php b/app/Services/IP/IPRetrievalInterface.php index 69ca1132a9..f8a36580b4 100644 --- a/app/Services/IP/IPRetrievalInterface.php +++ b/app/Services/IP/IPRetrievalInterface.php @@ -26,7 +26,6 @@ namespace FireflyIII\Services\IP; /** * Interface IPRetrievalInterface * - * @package FireflyIII\Services\IP */ interface IPRetrievalInterface { @@ -37,4 +36,4 @@ interface IPRetrievalInterface * @return null|string */ public function getIP(): ?string; -} \ No newline at end of file +} diff --git a/app/Services/IP/IpifyOrg.php b/app/Services/IP/IpifyOrg.php index 89256e9024..2e72e23c9c 100644 --- a/app/Services/IP/IpifyOrg.php +++ b/app/Services/IP/IpifyOrg.php @@ -57,4 +57,4 @@ class IpifyOrg implements IPRetrievalInterface return (string)$response->body; } -} \ No newline at end of file +} diff --git a/app/Services/Internal/File/EncryptService.php b/app/Services/Internal/File/EncryptService.php index e3a21e898e..4426e77100 100644 --- a/app/Services/Internal/File/EncryptService.php +++ b/app/Services/Internal/File/EncryptService.php @@ -23,8 +23,8 @@ declare(strict_types=1); namespace FireflyIII\Services\Internal\File; -use FireflyIII\Exceptions\FireflyException; use Crypt; +use FireflyIII\Exceptions\FireflyException; /** * Class EncryptService diff --git a/app/Services/Internal/Support/AccountServiceTrait.php b/app/Services/Internal/Support/AccountServiceTrait.php index 7fd65fb224..a32fb802f9 100644 --- a/app/Services/Internal/Support/AccountServiceTrait.php +++ b/app/Services/Internal/Support/AccountServiceTrait.php @@ -42,7 +42,6 @@ use Validator; /** * Trait AccountServiceTrait * - * @package FireflyIII\Services\Internal\Support */ trait AccountServiceTrait { @@ -347,6 +346,9 @@ trait AccountServiceTrait Log::debug(sprintf('Updated meta-field "%s":"%s" for #%d ("%s") ', $field, $data[$field], $account->id, $account->name)); } } + if (null !== $entry && isset($data[$field]) && \strlen((string)$data[$field]) === 0) { + $entry->delete(); + } } } diff --git a/app/Services/Internal/Support/BillServiceTrait.php b/app/Services/Internal/Support/BillServiceTrait.php index 2f60a8cf39..4c34e7c7d0 100644 --- a/app/Services/Internal/Support/BillServiceTrait.php +++ b/app/Services/Internal/Support/BillServiceTrait.php @@ -31,7 +31,6 @@ use Illuminate\Support\Collection; /** * Trait BillServiceTrait * - * @package FireflyIII\Services\Internal\Support */ trait BillServiceTrait { diff --git a/app/Services/Internal/Support/JournalServiceTrait.php b/app/Services/Internal/Support/JournalServiceTrait.php index 99e5376852..e6ab014cab 100644 --- a/app/Services/Internal/Support/JournalServiceTrait.php +++ b/app/Services/Internal/Support/JournalServiceTrait.php @@ -28,11 +28,11 @@ use FireflyIII\Factory\TagFactory; use FireflyIII\Factory\TransactionJournalMetaFactory; use FireflyIII\Models\Note; use FireflyIII\Models\TransactionJournal; +use Log; /** * Trait JournalServiceTrait * - * @package FireflyIII\Services\Internal\Support */ trait JournalServiceTrait { @@ -90,14 +90,20 @@ trait JournalServiceTrait */ protected function storeMeta(TransactionJournal $journal, array $data, string $field): void { + if (!isset($data[$field])) { + Log::debug(sprintf('Want to store meta-field "%s", but no value.', $field)); + return; } $set = [ 'journal' => $journal, 'name' => $field, - 'data' => $data[$field], + 'data' => (string)$data[$field], ]; + + Log::debug(sprintf('Going to store meta-field "%s", with value "%s".', $field, (string)$data[$field])); + /** @var TransactionJournalMetaFactory $factory */ $factory = app(TransactionJournalMetaFactory::class); $factory->updateOrCreate($set); diff --git a/app/Services/Internal/Support/TransactionServiceTrait.php b/app/Services/Internal/Support/TransactionServiceTrait.php index 59cb9e6a49..06fe1fe99c 100644 --- a/app/Services/Internal/Support/TransactionServiceTrait.php +++ b/app/Services/Internal/Support/TransactionServiceTrait.php @@ -42,7 +42,6 @@ use Log; /** * Trait TransactionServiceTrait * - * @package FireflyIII\Services\Internal\Support */ trait TransactionServiceTrait { @@ -100,15 +99,17 @@ trait TransactionServiceTrait * @param int|null $accountId * @param string|null $accountName * - * @return Account + * @return Account|null */ - public function findAccount(?string $expectedType, ?int $accountId, ?string $accountName): Account + public function findAccount(?string $expectedType, ?int $accountId, ?string $accountName): ?Account { $accountId = (int)$accountId; $accountName = (string)$accountName; $repository = app(AccountRepositoryInterface::class); $repository->setUser($this->user); + Log::debug(sprintf('Going to find account #%d ("%s")', $accountId, $accountName)); + if (null === $expectedType) { return $repository->findNull($accountId); } @@ -247,6 +248,7 @@ trait TransactionServiceTrait */ protected function setForeignAmount(Transaction $transaction, ?string $amount): void { + $amount = '' === (string)$amount ? null : $amount; $transaction->foreign_amount = $amount; $transaction->save(); } diff --git a/app/Services/Internal/Update/AccountUpdateService.php b/app/Services/Internal/Update/AccountUpdateService.php index 41eb9af480..8c3875c138 100644 --- a/app/Services/Internal/Update/AccountUpdateService.php +++ b/app/Services/Internal/Update/AccountUpdateService.php @@ -51,7 +51,7 @@ class AccountUpdateService $account->iban = $data['iban']; $account->save(); - if(isset($data['currency_id']) && $data['currency_id'] === 0) { + if (isset($data['currency_id']) && $data['currency_id'] === 0) { unset($data['currency_id']); } diff --git a/app/Services/Internal/Update/JournalUpdateService.php b/app/Services/Internal/Update/JournalUpdateService.php index 3964818fd5..8dde0112c2 100644 --- a/app/Services/Internal/Update/JournalUpdateService.php +++ b/app/Services/Internal/Update/JournalUpdateService.php @@ -57,7 +57,7 @@ class JournalUpdateService $service = app(TransactionUpdateService::class); $service->setUser($journal->user); - // create transactions + // create transactions: /** @var TransactionFactory $factory */ $factory = app(TransactionFactory::class); $factory->setUser($journal->user); @@ -105,6 +105,12 @@ class JournalUpdateService // connect tags: $this->connectTags($journal, $data); + // remove category from journal: + $journal->categories()->sync([]); + + // remove budgets from journal: + $journal->budgets()->sync([]); + // update or create custom fields: // store date meta fields (if present): $this->storeMeta($journal, $data, 'interest_date'); @@ -162,6 +168,8 @@ class JournalUpdateService foreach ($journal->transactions as $transaction) { $service->updateCategory($transaction, $category); } + // make journal empty: + $journal->categories()->sync([]); return $journal; } diff --git a/app/Services/Spectre/Exception/DuplicatedCustomerException.php b/app/Services/Spectre/Exception/DuplicatedCustomerException.php index c735679bf6..2bbdc668b4 100644 --- a/app/Services/Spectre/Exception/DuplicatedCustomerException.php +++ b/app/Services/Spectre/Exception/DuplicatedCustomerException.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Services\Spectre\Exception; /** + * @codeCoverageIgnore * Class DuplicatedCustomerException */ class DuplicatedCustomerException extends SpectreException diff --git a/app/Services/Spectre/Exception/SpectreException.php b/app/Services/Spectre/Exception/SpectreException.php index e0539c95ff..b96c244325 100644 --- a/app/Services/Spectre/Exception/SpectreException.php +++ b/app/Services/Spectre/Exception/SpectreException.php @@ -26,6 +26,7 @@ namespace FireflyIII\Services\Spectre\Exception; use Exception; /** + * @codeCoverageIgnore * Class SpectreException */ class SpectreException extends Exception diff --git a/app/Services/Spectre/Exception/WrongRequestFormatException.php b/app/Services/Spectre/Exception/WrongRequestFormatException.php index ac0469f068..ba9a3be93c 100644 --- a/app/Services/Spectre/Exception/WrongRequestFormatException.php +++ b/app/Services/Spectre/Exception/WrongRequestFormatException.php @@ -24,9 +24,10 @@ declare(strict_types=1); namespace FireflyIII\Services\Spectre\Exception; /** + * @codeCoverageIgnore * Class WrongRequestFormatException */ class WrongRequestFormatException extends SpectreException { -} \ No newline at end of file +} diff --git a/app/Services/Spectre/Object/Account.php b/app/Services/Spectre/Object/Account.php index ccab07722c..fa7367b770 100644 --- a/app/Services/Spectre/Object/Account.php +++ b/app/Services/Spectre/Object/Account.php @@ -26,6 +26,7 @@ namespace FireflyIII\Services\Spectre\Object; use Carbon\Carbon; /** + * @codeCoverageIgnore * Class Account */ class Account extends SpectreObject @@ -70,6 +71,30 @@ class Account extends SpectreObject } } + /** + * @return float + */ + public function getBalance(): float + { + return $this->balance; + } + + /** + * @return string + */ + public function getCurrencyCode(): string + { + return $this->currencyCode; + } + + /** + * @return array + */ + public function getExtra(): array + { + return $this->extra; + } + /** * @return int */ @@ -86,6 +111,14 @@ class Account extends SpectreObject return $this->name; } + /** + * @return string + */ + public function getNature(): string + { + return $this->nature; + } + /** * @return array */ diff --git a/app/Services/Spectre/Object/Attempt.php b/app/Services/Spectre/Object/Attempt.php index 1bc5c6f882..6aecd25246 100644 --- a/app/Services/Spectre/Object/Attempt.php +++ b/app/Services/Spectre/Object/Attempt.php @@ -26,6 +26,7 @@ namespace FireflyIII\Services\Spectre\Object; use Carbon\Carbon; /** + * @codeCoverageIgnore * Class Attempt */ class Attempt extends SpectreObject @@ -58,6 +59,8 @@ class Attempt extends SpectreObject private $failErrorClass; /** @var string */ private $failMessage; + /** @var array */ + private $fetchScopes = []; /** @var bool */ private $finished; /** @var bool */ @@ -84,12 +87,10 @@ class Attempt extends SpectreObject private $successAt; /** @var Carbon */ private $toDate; - /** @var Carbon */ - private $updatedAt; - /** @var string */ - private $userAgent; // undocumented - /** @var array */ - private $fetchScopes = []; + /** @var Carbon */ + private $updatedAt; // undocumented +/** @var string */ + private $userAgent; /** * Attempt constructor. @@ -114,7 +115,7 @@ class Attempt extends SpectreObject $this->failAt = new Carbon($data['fail_at']); $this->failErrorClass = $data['fail_error_class']; $this->failMessage = $data['fail_message']; - $this->fetchScopes = $data['fetch_scopes']; + $this->fetchScopes = $data['fetch_scopes']; $this->finished = $data['finished']; $this->finishedRecent = $data['finished_recent']; $this->fromDate = new Carbon($data['from_date']); @@ -185,7 +186,7 @@ class Attempt extends SpectreObject 'fail_at' => $this->failAt->toIso8601String(), 'fail_error_class' => $this->failErrorClass, 'fail_message' => $this->failMessage, - 'fetch_scopes' => $this->fetchScopes, + 'fetch_scopes' => $this->fetchScopes, 'finished' => $this->finished, 'finished_recent' => $this->finishedRecent, 'from_date' => $this->fromDate->toIso8601String(), diff --git a/app/Services/Spectre/Object/Customer.php b/app/Services/Spectre/Object/Customer.php index 36a08a3ccf..10b76424ca 100644 --- a/app/Services/Spectre/Object/Customer.php +++ b/app/Services/Spectre/Object/Customer.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Services\Spectre\Object; /** + * @codeCoverageIgnore * Class Customer */ class Customer extends SpectreObject diff --git a/app/Services/Spectre/Object/Holder.php b/app/Services/Spectre/Object/Holder.php index f7545a0283..ac07e953c0 100644 --- a/app/Services/Spectre/Object/Holder.php +++ b/app/Services/Spectre/Object/Holder.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace FireflyIII\Services\Spectre\Object; /** + * @codeCoverageIgnore * Class Holder */ class Holder extends SpectreObject diff --git a/app/Services/Spectre/Object/Login.php b/app/Services/Spectre/Object/Login.php index 0db4fe52b9..6a8fad38e7 100644 --- a/app/Services/Spectre/Object/Login.php +++ b/app/Services/Spectre/Object/Login.php @@ -27,6 +27,7 @@ use Carbon\Carbon; /** + * @codeCoverageIgnore * Class Login */ class Login extends SpectreObject @@ -96,6 +97,14 @@ class Login extends SpectreObject } + /** + * @return string + */ + public function getCountryCode(): string + { + return $this->countryCode; + } + /** * @return int */ @@ -112,6 +121,38 @@ class Login extends SpectreObject return $this->lastAttempt; } + /** + * @return Carbon + */ + public function getLastSuccessAt(): Carbon + { + return $this->lastSuccessAt; + } + + /** + * @return string + */ + public function getProviderName(): string + { + return $this->providerName; + } + + /** + * @return string + */ + public function getStatus(): string + { + return $this->status; + } + + /** + * @return Carbon + */ + public function getUpdatedAt(): Carbon + { + return $this->updatedAt; + } + /** * @return array */ @@ -129,7 +170,7 @@ class Login extends SpectreObject 'id' => $this->id, 'last_attempt' => $this->lastAttempt->toArray(), 'last_success_at' => $this->lastSuccessAt->toIso8601String(), - 'next_refresh_possible_at' => $this->nextRefreshPossibleAt, + 'next_refresh_possible_at' => $this->nextRefreshPossibleAt->toIso8601String(), 'provider_code' => $this->providerCode, 'provider_id' => $this->providerId, 'provider_name' => $this->providerName, diff --git a/app/Services/Spectre/Object/SpectreObject.php b/app/Services/Spectre/Object/SpectreObject.php index f731cdf317..57ecdb686e 100644 --- a/app/Services/Spectre/Object/SpectreObject.php +++ b/app/Services/Spectre/Object/SpectreObject.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Services\Spectre\Object; /** + * @codeCoverageIgnore * Class SpectreObject */ class SpectreObject diff --git a/app/Services/Spectre/Object/Token.php b/app/Services/Spectre/Object/Token.php index 28b5494c6c..42c1263db2 100644 --- a/app/Services/Spectre/Object/Token.php +++ b/app/Services/Spectre/Object/Token.php @@ -26,6 +26,7 @@ namespace FireflyIII\Services\Spectre\Object; use Carbon\Carbon; /** + * @codeCoverageIgnore * Class Token */ class Token extends SpectreObject @@ -73,4 +74,16 @@ class Token extends SpectreObject return $this->token; } + /** + * + */ + public function toArray(): array + { + return [ + 'connect_url' => $this->connectUrl, + 'expires_at' => $this->expiresAt->toW3cString(), + 'token' => $this->token, + ]; + } + } diff --git a/app/Services/Spectre/Object/Transaction.php b/app/Services/Spectre/Object/Transaction.php index 4109f95c68..58739d23e9 100644 --- a/app/Services/Spectre/Object/Transaction.php +++ b/app/Services/Spectre/Object/Transaction.php @@ -26,6 +26,7 @@ namespace FireflyIII\Services\Spectre\Object; use Carbon\Carbon; /** + * @codeCoverageIgnore * Class Transaction */ class Transaction extends SpectreObject @@ -112,9 +113,9 @@ class Transaction extends SpectreObject } /** - * @return TransactionExtra + * @return TransactionExtra|null */ - public function getExtra(): TransactionExtra + public function getExtra(): ?TransactionExtra { return $this->extra; } @@ -167,6 +168,38 @@ class Transaction extends SpectreObject return $this->mode; } + /** + * @return array + */ + public function getOpposingAccountData(): array + { + $data = [ + 'name' => null, + 'iban' => null, + 'number' => null, + 'bic' => null, + ]; + $extra = $this->getExtra(); + if (null !== $extra) { + $arr = $extra->toArray(); + foreach ($arr as $key => $value) { + switch ($key) { + case 'account_number': + $data['number'] = $value; + $data['name'] = $data['name'] ?? trans('import.spectre_account_with_number', ['number' => $value]); + break; + case 'payee': + $data['name'] = $value; + break; + default: + break; + } + } + } + + return $data; + } + /** * @return string */ diff --git a/app/Services/Spectre/Object/TransactionExtra.php b/app/Services/Spectre/Object/TransactionExtra.php index 01538c1bd1..28ca9da498 100644 --- a/app/Services/Spectre/Object/TransactionExtra.php +++ b/app/Services/Spectre/Object/TransactionExtra.php @@ -26,6 +26,7 @@ namespace FireflyIII\Services\Spectre\Object; use Carbon\Carbon; /** + * @codeCoverageIgnore * Class TransactionExtra */ class TransactionExtra extends SpectreObject diff --git a/app/Services/Spectre/Request/CreateTokenRequest.php b/app/Services/Spectre/Request/CreateTokenRequest.php index 1705759daa..c700d7b78c 100644 --- a/app/Services/Spectre/Request/CreateTokenRequest.php +++ b/app/Services/Spectre/Request/CreateTokenRequest.php @@ -51,7 +51,7 @@ class CreateTokenRequest extends SpectreRequest $data = [ 'data' => [ 'customer_id' => $this->customer->getId(), - 'fetch_scopes' => ['accounts', 'transactions'], + 'fetch_scopes' => ['accounts', 'transactions'], 'daily_refresh' => true, 'include_fake_providers' => true, 'show_consent_confirmation' => true, diff --git a/app/Services/Spectre/Request/ListAccountsRequest.php b/app/Services/Spectre/Request/ListAccountsRequest.php index a1e87f72eb..eedb0d2382 100644 --- a/app/Services/Spectre/Request/ListAccountsRequest.php +++ b/app/Services/Spectre/Request/ListAccountsRequest.php @@ -24,7 +24,6 @@ declare(strict_types=1); namespace FireflyIII\Services\Spectre\Request; use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Services\Spectre\Exception\SpectreException; use FireflyIII\Services\Spectre\Object\Account; use FireflyIII\Services\Spectre\Object\Login; use Log; diff --git a/app/Services/Spectre/Request/ListLoginsRequest.php b/app/Services/Spectre/Request/ListLoginsRequest.php index 99f1d16b9f..49379bd96e 100644 --- a/app/Services/Spectre/Request/ListLoginsRequest.php +++ b/app/Services/Spectre/Request/ListLoginsRequest.php @@ -26,6 +26,7 @@ namespace FireflyIII\Services\Spectre\Request; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Services\Spectre\Object\Customer; use FireflyIII\Services\Spectre\Object\Login; +use Illuminate\Support\Collection; use Log; /** @@ -64,12 +65,19 @@ class ListLoginsRequest extends SpectreRequest } else { Log::debug('No next page.'); } - + $collection = new Collection; // store logins: /** @var array $loginArray */ foreach ($response['data'] as $loginArray) { - $this->logins[] = new Login($loginArray); + $collection->push(new Login($loginArray)); } + // sort logins by date created: + $sorted = $collection->sortByDesc( + function (Login $login) { + return $login->getUpdatedAt()->timestamp; + } + ); + $this->logins = $sorted->toArray(); } } diff --git a/app/Services/Spectre/Request/ListTransactionsRequest.php b/app/Services/Spectre/Request/ListTransactionsRequest.php index dfa8c566ff..1a9b419a0f 100644 --- a/app/Services/Spectre/Request/ListTransactionsRequest.php +++ b/app/Services/Spectre/Request/ListTransactionsRequest.php @@ -24,7 +24,6 @@ declare(strict_types=1); namespace FireflyIII\Services\Spectre\Request; use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Services\Spectre\Exception\SpectreException; use FireflyIII\Services\Spectre\Object\Account; use FireflyIII\Services\Spectre\Object\Transaction; use Log; diff --git a/app/Services/Spectre/Request/SpectreRequest.php b/app/Services/Spectre/Request/SpectreRequest.php index dedbac6537..6b735de91b 100644 --- a/app/Services/Spectre/Request/SpectreRequest.php +++ b/app/Services/Spectre/Request/SpectreRequest.php @@ -30,7 +30,7 @@ use Requests; use Requests_Response; /** - * Class BunqRequest. + * Class SpectreRequest */ abstract class SpectreRequest { @@ -47,37 +47,13 @@ abstract class SpectreRequest /** @var User */ private $user; - /** - * SpectreRequest constructor. - * - * @param User $user - * - * @throws \Psr\Container\NotFoundExceptionInterface - * @throws \Psr\Container\ContainerExceptionInterface - */ - public function __construct(User $user) - { - $this->user = $user; - $this->server = 'https://' . config('import.options.spectre.server'); - $this->expiresAt = time() + 180; - $privateKey = app('preferences')->get('spectre_private_key', null); - $this->privateKey = $privateKey->data; - - // set client ID - $appId = app('preferences')->get('spectre_app_id', null); - $this->appId = $appId->data; - - // set service secret - $secret = app('preferences')->get('spectre_secret', null); - $this->secret = $secret->data; - } - /** * */ abstract public function call(): void; /** + * @codeCoverageIgnore * @return string */ public function getAppId(): string @@ -86,6 +62,8 @@ abstract class SpectreRequest } /** + * @codeCoverageIgnore + * * @param string $appId */ public function setAppId(string $appId): void @@ -94,6 +72,7 @@ abstract class SpectreRequest } /** + * @codeCoverageIgnore * @return string */ public function getSecret(): string @@ -102,6 +81,8 @@ abstract class SpectreRequest } /** + * @codeCoverageIgnore + * * @param string $secret */ public function setSecret(string $secret): void @@ -110,6 +91,7 @@ abstract class SpectreRequest } /** + * @codeCoverageIgnore * @return string */ public function getServer(): string @@ -118,6 +100,8 @@ abstract class SpectreRequest } /** + * @codeCoverageIgnore + * * @param string $privateKey */ public function setPrivateKey(string $privateKey): void @@ -125,6 +109,30 @@ abstract class SpectreRequest $this->privateKey = $privateKey; } + /** + * @param User $user + */ + public function setUser(User $user): void + { + $this->user = $user; + $this->server = 'https://' . config('import.options.spectre.server'); + $this->expiresAt = time() + 180; + $privateKey = app('preferences')->getForUser($user, 'spectre_private_key', null); + $this->privateKey = $privateKey->data; + + // set client ID + $appId = app('preferences')->getForUser($user, 'spectre_app_id', null); + if (null !== $appId && '' !== (string)$appId->data) { + $this->appId = $appId->data; + } + + // set service secret + $secret = app('preferences')->getForUser($user, 'spectre_secret', null); + if (null !== $secret && '' !== (string)$secret->data) { + $this->secret = $secret->data; + } + } + /** * @param string $method * @param string $uri diff --git a/app/Support/Binder/AccountList.php b/app/Support/Binder/AccountList.php index 24b249db28..2c1baab334 100644 --- a/app/Support/Binder/AccountList.php +++ b/app/Support/Binder/AccountList.php @@ -23,6 +23,7 @@ declare(strict_types=1); namespace FireflyIII\Support\Binder; use FireflyIII\Models\Account; +use FireflyIII\Models\AccountType; use Illuminate\Routing\Route; use Illuminate\Support\Collection; use Log; @@ -44,22 +45,35 @@ class AccountList implements BinderInterface public static function routeBinder(string $value, Route $route): Collection { if (auth()->check()) { - $list = []; - $incoming = explode(',', $value); - foreach ($incoming as $entry) { - $list[] = (int)$entry; + + $collection = new Collection; + if ($value === 'allAssetAccounts') { + /** @var \Illuminate\Support\Collection $collection */ + $collection = auth()->user()->accounts() + ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id') + ->where('account_types.type', AccountType::ASSET) + ->get(['accounts.*']); } - $list = array_unique($list); - if (\count($list) === 0) { - Log::error('Account list is empty.'); - throw new NotFoundHttpException; // @codeCoverageIgnore + if ($value !== 'allAssetAccounts') { + + $list = []; + $incoming = explode(',', $value); + foreach ($incoming as $entry) { + $list[] = (int)$entry; + } + $list = array_unique($list); + if (\count($list) === 0) { + Log::error('Account list is empty.'); + throw new NotFoundHttpException; // @codeCoverageIgnore + } + + /** @var \Illuminate\Support\Collection $collection */ + $collection = auth()->user()->accounts() + ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id') + ->whereIn('accounts.id', $list) + ->get(['accounts.*']); } - /** @var \Illuminate\Support\Collection $collection */ - $collection = auth()->user()->accounts() - ->leftJoin('account_types', 'account_types.id', '=', 'accounts.account_type_id') - ->whereIn('accounts.id', $list) - ->get(['accounts.*']); if ($collection->count() > 0) { $collection = $collection->sortBy( function (Account $account) { diff --git a/app/Services/Bunq/Id/BunqId.php b/app/Support/Binder/ImportProvider.php similarity index 52% rename from app/Services/Bunq/Id/BunqId.php rename to app/Support/Binder/ImportProvider.php index 1b657519f0..b06cff4dc1 100644 --- a/app/Services/Bunq/Id/BunqId.php +++ b/app/Support/Binder/ImportProvider.php @@ -1,8 +1,7 @@ id = $data['id']; + $providers = array_keys((array)config('import.enabled')); + if (\in_array($value, $providers, true)) { + return $value; } - } - - /** - * @return int - */ - public function getId(): int - { - return $this->id; - } - - /** - * @param int $id - */ - public function setId(int $id) - { - $this->id = $id; - } - - /** - * @return array - */ - public function toArray(): array - { - return [ - 'id' => $this->id, - ]; + throw new NotFoundHttpException; } } diff --git a/app/Support/Binder/SimpleJournalList.php b/app/Support/Binder/SimpleJournalList.php index 0b3dadf344..c356331b48 100644 --- a/app/Support/Binder/SimpleJournalList.php +++ b/app/Support/Binder/SimpleJournalList.php @@ -108,4 +108,4 @@ class SimpleJournalList implements BinderInterface } throw new NotFoundHttpException; } -} \ No newline at end of file +} diff --git a/app/Support/ExpandedForm.php b/app/Support/ExpandedForm.php index cbfc8c48ac..17467594c0 100644 --- a/app/Support/ExpandedForm.php +++ b/app/Support/ExpandedForm.php @@ -27,9 +27,12 @@ use Carbon\Carbon; use Eloquent; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; +use FireflyIII\Models\RuleGroup; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; +use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; +use Form; use Illuminate\Support\Collection; use Illuminate\Support\MessageBag; use RuntimeException; @@ -47,6 +50,7 @@ class ExpandedForm * * @return string * @throws \FireflyIII\Exceptions\FireflyException + * @throws \Throwable */ public function amount(string $name, $value = null, array $options = []): string { @@ -93,25 +97,54 @@ class ExpandedForm return $this->currencyField($name, 'amount-small', $value, $options); } + /** + * @param string $name + * @param $selected + * @param null $options + * + * @return string + * @throws \Throwable + */ + public function assetAccountCheckList(string $name, $options = null): string + { + $options = $options ?? []; + $label = $this->label($name, $options); + $options = $this->expandOptionArray($name, $label, $options); + $classes = $this->getHolderClasses($name); + $selected = request()->old($name) ?? []; + + // get all asset accounts: + /** @var AccountRepositoryInterface $repository */ + $repository = app(AccountRepositoryInterface::class); + $assetAccounts = $repository->getAccountsByType([AccountType::ASSET, AccountType::DEFAULT]); + $grouped = []; + // group accounts: + /** @var Account $account */ + foreach ($assetAccounts as $account) { + $role = $repository->getMetaValue($account, 'accountRole'); + if (null === $role) { + $role = 'no_account_type'; // @codeCoverageIgnore + } + $key = (string)trans('firefly.opt_group_' . $role); + $grouped[$key][$account->id] = $account->name; + } + + unset($options['class']); + $html = view('form.assetAccountCheckList', compact('classes', 'selected', 'name', 'label', 'options', 'grouped'))->render(); + + return $html; + } + /** * @param string $name * @param null $value * @param array $options * * @return string + * @throws \Throwable */ public function assetAccountList(string $name, $value = null, array $options = []): string { - // properties for cache - $cache = new CacheProperties; - $cache->addProperty('exp-form-asset-list'); - $cache->addProperty($name); - $cache->addProperty($value); - $cache->addProperty($options); - - if ($cache->has()) { - return $cache->get(); - } // make repositories /** @var AccountRepositoryInterface $repository */ $repository = app(AccountRepositoryInterface::class); @@ -139,7 +172,6 @@ class ExpandedForm $grouped[$key][$account->id] = $account->name . ' (' . app('amount')->formatAnything($currency, $balance, false) . ')'; } $res = $this->select($name, $grouped, $value, $options); - $cache->store($res); return $res; } @@ -193,19 +225,10 @@ class ExpandedForm * @param array $options * * @return string + * @throws \Throwable */ public function currencyList(string $name, $value = null, array $options = []): string { - // properties for cache - $cache = new CacheProperties; - $cache->addProperty('exp-form-currency-list'); - $cache->addProperty($name); - $cache->addProperty($value); - $cache->addProperty($options); - - if ($cache->has()) { - return $cache->get(); - } /** @var CurrencyRepositoryInterface $currencyRepos */ $currencyRepos = app(CurrencyRepositoryInterface::class); @@ -217,7 +240,6 @@ class ExpandedForm $array[$currency->id] = $currency->name . ' (' . $currency->symbol . ')'; } $res = $this->select($name, $array, $value, $options); - $cache->store($res); return $res; } @@ -351,28 +373,6 @@ class ExpandedForm return $selectList; } - /** - * @param string $name - * @param array $list - * @param null $selected - * @param array $options - * - * @return string - * @throws \Throwable - */ - public function multiCheckbox(string $name, array $list = [], $selected = null, array $options = []): string - { - $label = $this->label($name, $options); - $options = $this->expandOptionArray($name, $label, $options); - $classes = $this->getHolderClasses($name); - $selected = $this->fillFieldValue($name, $selected); - - unset($options['class']); - $html = view('form.multiCheckbox', compact('classes', 'name', 'label', 'selected', 'options', 'list'))->render(); - - return $html; - } - /** * @param string $name * @param array $list @@ -516,6 +516,59 @@ class ExpandedForm return $html; } + /** + * @param string $name + * @param null $value + * @param array $options + * + * @return string + * @throws \Throwable + */ + public function ruleGroupList(string $name, $value = null, array $options = []): string + { + /** @var RuleGroupRepositoryInterface $groupRepos */ + $groupRepos = app(RuleGroupRepositoryInterface::class); + + // get all currencies: + $list = $groupRepos->get(); + $array = []; + /** @var RuleGroup $group */ + foreach ($list as $group) { + $array[$group->id] = $group->title; + } + + return $this->select($name, $array, $value, $options); + } + + /** + * @param string $name + * @param null $value + * @param null $options + * + * @return \Illuminate\Support\HtmlString + */ + public function ruleGroupListWithEmpty(string $name, $value = null, $options = null) + { + $options = $options ?? []; + $options['class'] = 'form-control'; + /** @var RuleGroupRepositoryInterface $groupRepos */ + $groupRepos = app(RuleGroupRepositoryInterface::class); + + // get all currencies: + $list = $groupRepos->get(); + $array = [ + 0 => trans('firefly.none_in_select_list'), + ]; + /** @var RuleGroup $group */ + foreach ($list as $group) { + if (isset($options['hidden']) && (int)$options['hidden'] !== $group->id) { + $array[$group->id] = $group->title; + } + } + + return Form::select($name, $array, $value, $options); + } + /** * @param string $name * @param array $list diff --git a/app/Support/Import/Configuration/Bunq/HaveAccounts.php b/app/Support/Import/Configuration/Bunq/HaveAccounts.php deleted file mode 100644 index 3291c843e8..0000000000 --- a/app/Support/Import/Configuration/Bunq/HaveAccounts.php +++ /dev/null @@ -1,152 +0,0 @@ -. - */ - -declare(strict_types=1); - -namespace FireflyIII\Support\Import\Configuration\Bunq; - -use FireflyIII\Models\Account; -use FireflyIII\Models\AccountType; -use FireflyIII\Models\ImportJob; -use FireflyIII\Repositories\Account\AccountRepositoryInterface; -use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; -use FireflyIII\Support\Import\Configuration\ConfigurationInterface; -use Illuminate\Support\Collection; - -/** - * Class HaveAccounts - */ -class HaveAccounts implements ConfigurationInterface -{ - /** @var ImportJob */ - private $job; - - /** - * Get the data necessary to show the configuration screen. - * - * @return array - */ - public function getData(): array - { - /** @var AccountRepositoryInterface $accountRepository */ - $accountRepository = app(AccountRepositoryInterface::class); - /** @var CurrencyRepositoryInterface $currencyRepository */ - $currencyRepository = app(CurrencyRepositoryInterface::class); - $config = $this->job->configuration; - $collection = $accountRepository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]); - $defaultCurrency = app('amount')->getDefaultCurrency(); - $dbAccounts = []; - /** @var Account $dbAccount */ - foreach ($collection as $dbAccount) { - $id = $dbAccount->id; - $currencyId = (int)$accountRepository->getMetaValue($dbAccount, 'currency_id'); - $currency = $currencyRepository->findNull($currencyId); - $dbAccounts[$id] = [ - 'account' => $dbAccount, - 'currency' => $currency ?? $defaultCurrency, - ]; - } - - // loop Bunq accounts: - /** - * @var int $index - * @var array $bunqAccount - */ - foreach ($config['accounts'] as $index => $bunqAccount) { - // find accounts with currency code - $code = $bunqAccount['currency']; - $selection = $this->filterAccounts($dbAccounts, $code); - $config['accounts'][$index]['options'] = app('expandedform')->makeSelectList($selection); - } - - - return [ - 'config' => $config, - ]; - } - - /** - * Return possible warning to user. - * - * @return string - */ - public function getWarningMessage(): string - { - return ''; - } - - /** - * @param ImportJob $job - * - * @return ConfigurationInterface - */ - public function setJob(ImportJob $job) - { - $this->job = $job; - - return $this; - } - - /** - * Store the result. - * - * @param array $data - * - * @return bool - */ - public function storeConfiguration(array $data): bool - { - $accounts = $data['bunq_account_id'] ?? []; - $mapping = []; - foreach ($accounts as $bunqId) { - $bunqId = (int)$bunqId; - $doImport = (int)($data['do_import'][$bunqId] ?? 0.0) === 1; - $account = (int)($data['import'][$bunqId] ?? 0.0); - if ($doImport) { - $mapping[$bunqId] = $account; - } - } - $config = $this->job->configuration; - $config['accounts-mapped'] = $mapping; - $this->job->configuration = $config; - $this->job->save(); - - return true; - } - - /** - * @param array $dbAccounts - * @param string $code - * - * @return Collection - */ - private function filterAccounts(array $dbAccounts, string $code): Collection - { - $collection = new Collection; - foreach ($dbAccounts as $accountId => $data) { - if ($data['currency']->code === $code) { - $collection->push($data['account']); - } - } - - return $collection; - } -} diff --git a/app/Support/Import/Configuration/File/Initial.php b/app/Support/Import/Configuration/File/Initial.php deleted file mode 100644 index e9232c12a5..0000000000 --- a/app/Support/Import/Configuration/File/Initial.php +++ /dev/null @@ -1,143 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Support\Import\Configuration\File; - -use FireflyIII\Models\ImportJob; -use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; -use FireflyIII\Support\Import\Configuration\ConfigurationInterface; -use Log; - -/** - * Class Initial. - */ -class Initial implements ConfigurationInterface -{ - /** @var ImportJob */ - private $job; - - /** @var ImportJobRepositoryInterface */ - private $repository; - - /** @var string */ - private $warning = ''; - - public function __construct() - { - Log::debug('Constructed Initial.'); - } - - /** - * Get the data necessary to show the configuration screen. - * - * @return array - */ - public function getData(): array - { - $importFileTypes = []; - $defaultImportType = config('import.options.file.default_import_format'); - - foreach (config('import.options.file.import_formats') as $type) { - $importFileTypes[$type] = trans('import.import_file_type_' . $type); - } - - return [ - 'default_type' => $defaultImportType, - 'file_types' => $importFileTypes, - ]; - } - - /** - * Return possible warning to user. - * - * @return string - */ - public function getWarningMessage(): string - { - return $this->warning; - } - - /** - * @param ImportJob $job - * - * @return ConfigurationInterface - */ - public function setJob(ImportJob $job): ConfigurationInterface - { - $this->job = $job; - $this->repository = app(ImportJobRepositoryInterface::class); - $this->repository->setUser($job->user); - - return $this; - } - - /** - * Store the result. - * - * @param array $data - * - * @return bool - */ - public function storeConfiguration(array $data): bool - { - Log::debug('Now in storeConfiguration for file Upload.'); - $config = $this->getConfig(); - $type = $data['import_file_type'] ?? 'csv'; // assume it's a CSV file. - $config['file-type'] = \in_array($type, config('import.options.file.import_formats'), true) ? $type : 'csv'; - - // update config: - $this->repository->setConfiguration($this->job, $config); - - // make repository process file: - $uploaded = $this->repository->processFile($this->job, $data['import_file'] ?? null); - Log::debug(sprintf('Result of upload is %s', var_export($uploaded, true))); - - // process config, if present: - if (isset($data['configuration_file'])) { - Log::debug('Will also upload configuration.'); - $this->repository->processConfiguration($this->job, $data['configuration_file']); - } - - if (false === $uploaded) { - $this->warning = (string)trans('firefly.upload_error'); - - return true; - } - - // if file was upload safely, assume we can go to the next stage: - $config = $this->getConfig(); - $config['stage'] = 'upload-config'; - $this->repository->setConfiguration($this->job, $config); - - return true; - } - - /** - * Short hand method. - * - * @return array - */ - private function getConfig(): array - { - return $this->repository->getConfiguration($this->job); - } -} diff --git a/app/Support/Import/Configuration/File/Map.php b/app/Support/Import/Configuration/File/Map.php deleted file mode 100644 index 3072d88e9f..0000000000 --- a/app/Support/Import/Configuration/File/Map.php +++ /dev/null @@ -1,318 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Support\Import\Configuration\File; - -use FireflyIII\Exceptions\FireflyException; -use FireflyIII\Import\Mapper\MapperInterface; -use FireflyIII\Import\MapperPreProcess\PreProcessorInterface; -use FireflyIII\Import\Specifics\SpecificInterface; -use FireflyIII\Models\ImportJob; -use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; -use FireflyIII\Support\Import\Configuration\ConfigurationInterface; -use League\Csv\Reader; -use League\Csv\Statement; -use Log; - -/** - * Class Mapping. - */ -class Map implements ConfigurationInterface -{ - /** @var array that holds each column to be mapped by the user */ - private $data = []; - /** @var ImportJob */ - private $job; - /** @var ImportJobRepositoryInterface */ - private $repository; - /** @var array */ - private $validSpecifics = []; - - /** - * @return array - * - * @throws FireflyException - * @throws \League\Csv\Exception - */ - public function getData(): array - { - $this->getMappableColumns(); - - // in order to actually map we also need all possible values from the CSV file. - $config = $this->getConfig(); - $content = $this->repository->uploadFileContents($this->job); - $offset = 0; - /** @var Reader $reader */ - $reader = Reader::createFromString($content); - $reader->setDelimiter($config['delimiter']); - if ($config['has-headers']) { - $offset = 1; - } - $stmt = (new Statement)->offset($offset); - $results = $stmt->process($reader); - $this->validSpecifics = array_keys(config('csv.import_specifics')); - $indexes = array_keys($this->data); - $rowIndex = 0; - foreach ($results as $rowIndex => $row) { - $row = $this->runSpecifics($row); - - //do something here - foreach ($indexes as $index) { // this is simply 1, 2, 3, etc. - if (!isset($row[$index])) { - // don't really know how to handle this. Just skip, for now. - continue; - } - $value = trim($row[$index]); - if (\strlen($value) > 0) { - // we can do some preprocessing here, - // which is exclusively to fix the tags: - if (null !== $this->data[$index]['preProcessMap'] && \strlen($this->data[$index]['preProcessMap']) > 0) { - /** @var PreProcessorInterface $preProcessor */ - $preProcessor = app($this->data[$index]['preProcessMap']); - $result = $preProcessor->run($value); - $this->data[$index]['values'] = array_merge($this->data[$index]['values'], $result); - - Log::debug($rowIndex . ':' . $index . 'Value before preprocessor', ['value' => $value]); - Log::debug($rowIndex . ':' . $index . 'Value after preprocessor', ['value-new' => $result]); - Log::debug($rowIndex . ':' . $index . 'Value after joining', ['value-complete' => $this->data[$index]['values']]); - - continue; - } - - $this->data[$index]['values'][] = $value; - } - } - } - $setIndexes = array_keys($this->data); - foreach ($setIndexes as $index) { - $this->data[$index]['values'] = array_unique($this->data[$index]['values']); - asort($this->data[$index]['values']); - // if the count of this array is zero, there is nothing to map. - if (\count($this->data[$index]['values']) === 0) { - unset($this->data[$index]); - } - } - unset($setIndexes); - - // save number of rows, thus number of steps, in job: - $steps = $rowIndex * 5; - $extended = $this->job->extended_status; - $extended['steps'] = $steps; - $this->job->extended_status = $extended; - $this->job->save(); - - return $this->data; - } - - /** - * Return possible warning to user. - * - * @return string - */ - public function getWarningMessage(): string - { - return ''; - } - - /** - * @param ImportJob $job - * - * @return ConfigurationInterface - */ - public function setJob(ImportJob $job): ConfigurationInterface - { - $this->job = $job; - $this->repository = app(ImportJobRepositoryInterface::class); - $this->repository->setUser($job->user); - - return $this; - } - - /** - * Store the result. - * - * @param array $data - * - * @return bool - */ - public function storeConfiguration(array $data): bool - { - $config = $this->getConfig(); - - if (isset($data['mapping'])) { - foreach ($data['mapping'] as $index => $array) { - $config['column-mapping-config'][$index] = []; - foreach ($array as $value => $mapId) { - $mapId = (int)$mapId; - if (0 !== $mapId) { - $config['column-mapping-config'][$index][$value] = $mapId; - } - } - } - } - - // set thing to be completed. - $config['stage'] = 'ready'; - $this->saveConfig($config); - - return true; - } - - /** - * @param string $column - * - * @return MapperInterface - */ - private function createMapper(string $column): MapperInterface - { - $mapperClass = config('csv.import_roles.' . $column . '.mapper'); - $mapperName = sprintf('\\FireflyIII\\Import\Mapper\\%s', $mapperClass); - - return app($mapperName); - } - - /** - * Short hand method. - * - * @return array - */ - private function getConfig(): array - { - return $this->repository->getConfiguration($this->job); - } - - /** - * @return bool - * - * @throws FireflyException - */ - private function getMappableColumns(): bool - { - $config = $this->getConfig(); - /** - * @var int - * @var bool $mustBeMapped - */ - foreach ($config['column-do-mapping'] as $index => $mustBeMapped) { - $column = $this->validateColumnName($config['column-roles'][$index] ?? '_ignore'); - $shouldMap = $this->shouldMapColumn($column, $mustBeMapped); - if ($shouldMap) { - // create configuration entry for this specific column and add column to $this->data array for later processing. - $this->data[$index] = [ - 'name' => $column, - 'index' => $index, - 'options' => $this->createMapper($column)->getMap(), - 'preProcessMap' => $this->getPreProcessorName($column), - 'values' => [], - ]; - } - } - - return true; - } - - /** - * @param string $column - * - * @return string - */ - private function getPreProcessorName(string $column): string - { - $name = ''; - $hasPreProcess = config('csv.import_roles.' . $column . '.pre-process-map'); - $preProcessClass = config('csv.import_roles.' . $column . '.pre-process-mapper'); - - if (null !== $hasPreProcess && true === $hasPreProcess && null !== $preProcessClass) { - $name = sprintf('\\FireflyIII\\Import\\MapperPreProcess\\%s', $preProcessClass); - } - - return $name; - } - - /** - * @param array $row - * - * @return array - * - * @throws FireflyException - */ - private function runSpecifics(array $row): array - { - // run specifics here: - // and this is the point where the specifix go to work. - $config = $this->getConfig(); - $specifics = $config['specifics'] ?? []; - $names = array_keys($specifics); - foreach ($names as $name) { - if (!\in_array($name, $this->validSpecifics)) { - throw new FireflyException(sprintf('"%s" is not a valid class name', $name)); - } - $class = config('csv.import_specifics.' . $name); - /** @var SpecificInterface $specific */ - $specific = app($class); - - // it returns the row, possibly modified: - $row = $specific->run($row); - } - - return $row; - } - - /** - * @param array $array - */ - private function saveConfig(array $array) - { - $this->repository->setConfiguration($this->job, $array); - } - - /** - * @param string $column - * @param bool $mustBeMapped - * - * @return bool - */ - private function shouldMapColumn(string $column, bool $mustBeMapped): bool - { - $canBeMapped = config('csv.import_roles.' . $column . '.mappable'); - - return $canBeMapped && $mustBeMapped; - } - - /** - * @param string $column - * - * @return string - * - * @throws FireflyException - */ - private function validateColumnName(string $column): string - { - // is valid column? - $validColumns = array_keys(config('csv.import_roles')); - if (!\in_array($column, $validColumns)) { - throw new FireflyException(sprintf('"%s" is not a valid column.', $column)); - } - - return $column; - } -} diff --git a/app/Support/Import/Configuration/File/Roles.php b/app/Support/Import/Configuration/File/Roles.php deleted file mode 100644 index 9b5b786a6c..0000000000 --- a/app/Support/Import/Configuration/File/Roles.php +++ /dev/null @@ -1,366 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Support\Import\Configuration\File; - -use FireflyIII\Import\Specifics\SpecificInterface; -use FireflyIII\Models\ImportJob; -use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; -use FireflyIII\Support\Import\Configuration\ConfigurationInterface; -use League\Csv\Reader; -use League\Csv\Statement; -use Log; - -/** - * Class Roles. - */ -class Roles implements ConfigurationInterface -{ - /** - * @var array - */ - private $data = []; - /** @var ImportJob */ - private $job; - /** @var ImportJobRepositoryInterface */ - private $repository; - /** @var string */ - private $warning = ''; - - /** - * Get the data necessary to show the configuration screen. - * - * @return array - * - * @throws \League\Csv\Exception - */ - public function getData(): array - { - $content = $this->repository->uploadFileContents($this->job); - $config = $this->getConfig(); - $headers = []; - $offset = 0; - - // create CSV reader. - $reader = Reader::createFromString($content); - $reader->setDelimiter($config['delimiter']); - - // CSV headers. Ignore reader. Simply get the first row. - if ($config['has-headers']) { - $offset = 1; - $stmt = (new Statement)->limit(1)->offset(0); - $records = $stmt->process($reader); - $headers = $records->fetchOne(0); - Log::debug('Detected file headers:', $headers); - } - - // example rows: - $stmt = (new Statement)->limit((int)config('csv.example_rows', 5))->offset($offset); - // set data: - $roles = $this->getRoles(); - asort($roles); - $this->data = [ - 'examples' => [], - 'roles' => $roles, - 'total' => 0, - 'headers' => $headers, - ]; - - $records = $stmt->process($reader); - foreach ($records as $row) { - $row = array_values($row); - $row = $this->processSpecifics($row); - $count = \count($row); - $this->data['total'] = $count > $this->data['total'] ? $count : $this->data['total']; - $this->processRow($row); - } - - $this->updateColumCount(); - $this->makeExamplesUnique(); - - return $this->data; - } - - /** - * Return possible warning to user. - * - * @return string - */ - public function getWarningMessage(): string - { - return $this->warning; - } - - /** - * @param ImportJob $job - * - * @return ConfigurationInterface - */ - public function setJob(ImportJob $job): ConfigurationInterface - { - $this->job = $job; - $this->repository = app(ImportJobRepositoryInterface::class); - $this->repository->setUser($job->user); - - return $this; - } - - /** - * Store the result. - * - * @param array $data - * - * @return bool - */ - public function storeConfiguration(array $data): bool - { - Log::debug('Now in storeConfiguration of Roles.'); - $config = $this->getConfig(); - $count = $config['column-count']; - for ($i = 0; $i < $count; ++$i) { - $role = $data['role'][$i] ?? '_ignore'; - $mapping = isset($data['map'][$i]) && $data['map'][$i] === '1' ? true : false; - $config['column-roles'][$i] = $role; - $config['column-do-mapping'][$i] = $mapping; - Log::debug(sprintf('Column %d has been given role %s (mapping: %s)', $i, $role, var_export($mapping, true))); - } - - $this->saveConfig($config); - $this->ignoreUnmappableColumns(); - $res = $this->isRolesComplete(); - if ($res === true) { - $config = $this->getConfig(); - $config['stage'] = 'map'; - $this->saveConfig($config); - $this->isMappingNecessary(); - } - - return true; - } - - /** - * Short hand method. - * - * @return array - */ - private function getConfig(): array - { - return $this->repository->getConfiguration($this->job); - } - - /** - * @return array - */ - private function getRoles(): array - { - $roles = []; - foreach (array_keys(config('csv.import_roles')) as $role) { - $roles[$role] = trans('import.column_' . $role); - } - - return $roles; - } - - /** - * @return bool - */ - private function ignoreUnmappableColumns(): bool - { - Log::debug('Now in ignoreUnmappableColumns()'); - $config = $this->getConfig(); - $count = $config['column-count']; - for ($i = 0; $i < $count; ++$i) { - $role = $config['column-roles'][$i] ?? '_ignore'; - $mapping = $config['column-do-mapping'][$i] ?? false; - Log::debug(sprintf('Role for column %d is %s, and mapping is %s', $i, $role, var_export($mapping, true))); - - if ('_ignore' === $role && true === $mapping) { - $mapping = false; - Log::debug(sprintf('Column %d has type %s so it cannot be mapped.', $i, $role)); - } - $config['column-do-mapping'][$i] = $mapping; - } - $this->saveConfig($config); - - return true; - } - - /** - * @return bool - */ - private function isMappingNecessary() - { - $config = $this->getConfig(); - $count = $config['column-count']; - $toBeMapped = 0; - for ($i = 0; $i < $count; ++$i) { - $mapping = $config['column-do-mapping'][$i] ?? false; - if (true === $mapping) { - ++$toBeMapped; - } - } - Log::debug(sprintf('Found %d columns that need mapping.', $toBeMapped)); - if (0 === $toBeMapped) { - $config['stage'] = 'ready'; - } - - $this->saveConfig($config); - - return true; - } - - /** - * @return bool - */ - private function isRolesComplete(): bool - { - $config = $this->getConfig(); - $count = $config['column-count']; - $assigned = 0; - - // check if data actually contains amount column (foreign amount does not count) - $hasAmount = false; - $hasForeignAmount = false; - $hasForeignCode = false; - for ($i = 0; $i < $count; ++$i) { - $role = $config['column-roles'][$i] ?? '_ignore'; - if ('_ignore' !== $role) { - ++$assigned; - } - if (\in_array($role, ['amount', 'amount_credit', 'amount_debit'])) { - $hasAmount = true; - } - if ($role === 'foreign-currency-code') { - $hasForeignCode = true; - } - if ($role === 'amount_foreign') { - $hasForeignAmount = true; - } - } - Log::debug( - sprintf( - 'Assigned is %d, hasAmount %s, hasForeignCode %s, hasForeignAmount %s', - $assigned, - var_export($hasAmount, true), - var_export($hasForeignCode, true), - var_export($hasForeignAmount, true) - ) - ); - // all assigned and correct foreign info - if ($assigned > 0 && $hasAmount && ($hasForeignCode === $hasForeignAmount)) { - $this->warning = ''; - $this->saveConfig($config); - Log::debug('isRolesComplete() returns true.'); - - return true; - } - // warn if has foreign amount but no currency code: - if ($hasForeignAmount && !$hasForeignCode) { - $this->warning = (string)trans('import.foreign_amount_warning'); - Log::debug('isRolesComplete() returns FALSE because foreign amount present without foreign code.'); - - return false; - } - - if (0 === $assigned || !$hasAmount) { - $this->warning = (string)trans('import.roles_warning'); - Log::debug('isRolesComplete() returns FALSE because no amount present.'); - - return false; - } - Log::debug('isRolesComplete() returns FALSE because no reason.'); - - return false; - } - - /** - * make unique example data. - */ - private function makeExamplesUnique(): bool - { - foreach ($this->data['examples'] as $index => $values) { - $this->data['examples'][$index] = array_unique($values); - } - - return true; - } - - /** - * @param array $row - * - * @return bool - */ - private function processRow(array $row): bool - { - foreach ($row as $index => $value) { - $value = trim($value); - if (\strlen($value) > 0) { - $this->data['examples'][$index][] = $value; - } - } - - return true; - } - - /** - * run specifics here: - * and this is the point where the specifix go to work. - * - * @param array $row - * - * @return array - */ - private function processSpecifics(array $row): array - { - $config = $this->getConfig(); - $specifics = $config['specifics'] ?? []; - $names = array_keys($specifics); - foreach ($names as $name) { - /** @var SpecificInterface $specific */ - $specific = app('FireflyIII\Import\Specifics\\' . $name); - $row = $specific->run($row); - } - - return $row; - } - - /** - * @param array $array - */ - private function saveConfig(array $array) - { - $this->repository->setConfiguration($this->job, $array); - } - - /** - * @return bool - */ - private function updateColumCount(): bool - { - $config = $this->getConfig(); - $count = $this->data['total']; - $config['column-count'] = $count; - $this->saveConfig($config); - - return true; - } -} diff --git a/app/Support/Import/Configuration/File/UploadConfig.php b/app/Support/Import/Configuration/File/UploadConfig.php deleted file mode 100644 index 3a699c76d4..0000000000 --- a/app/Support/Import/Configuration/File/UploadConfig.php +++ /dev/null @@ -1,189 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace FireflyIII\Support\Import\Configuration\File; - -use FireflyIII\Models\AccountType; -use FireflyIII\Models\ImportJob; -use FireflyIII\Repositories\Account\AccountRepositoryInterface; -use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; -use FireflyIII\Support\Import\Configuration\ConfigurationInterface; -use Log; - -/** - * Class UploadConfig. - */ -class UploadConfig implements ConfigurationInterface -{ - /** @var AccountRepositoryInterface */ - private $accountRepository; - /** - * @var ImportJob - */ - private $job; - /** @var ImportJobRepositoryInterface */ - private $repository; - - /** - * @return array - */ - public function getData(): array - { - $accounts = $this->accountRepository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]); - $delimiters = [ - ',' => trans('form.csv_comma'), - ';' => trans('form.csv_semicolon'), - 'tab' => trans('form.csv_tab'), - ]; - $config = $this->getConfig(); - $config['date-format'] = $config['date-format'] ?? 'Ymd'; - $specifics = []; - $this->saveConfig($config); - - // collect specifics. - foreach (config('csv.import_specifics') as $name => $className) { - $specifics[$name] = [ - 'name' => $className::getName(), - 'description' => $className::getDescription(), - ]; - } - - $data = [ - 'accounts' => app('expandedform')->makeSelectList($accounts), - 'specifix' => [], - 'delimiters' => $delimiters, - 'specifics' => $specifics, - ]; - - return $data; - } - - /** - * Return possible warning to user. - * - * @return string - */ - public function getWarningMessage(): string - { - return ''; - } - - /** - * @param ImportJob $job - * - * @return ConfigurationInterface - */ - public function setJob(ImportJob $job): ConfigurationInterface - { - $this->job = $job; - $this->repository = app(ImportJobRepositoryInterface::class); - $this->accountRepository = app(AccountRepositoryInterface::class); - $this->repository->setUser($job->user); - $this->accountRepository->setUser($job->user); - - return $this; - } - - /** - * Store the result. - * - * @param array $data - * - * @return bool - */ - public function storeConfiguration(array $data): bool - { - Log::debug('Now in Initial::storeConfiguration()'); - $config = $this->getConfig(); - $importId = (int)($data['csv_import_account'] ?? 0.0); - $account = $this->accountRepository->find($importId); - $delimiter = (string)$data['csv_delimiter']; - - // set "headers": - $config['has-headers'] = (int)($data['has_headers'] ?? 0.0) === 1; - $config['date-format'] = (string)$data['date_format']; - $config['delimiter'] = 'tab' === $delimiter ? "\t" : $delimiter; - $config['apply-rules'] = (int)($data['apply_rules'] ?? 0.0) === 1; - - Log::debug('Entered import account.', ['id' => $importId]); - - - if (null !== $account->id) { - Log::debug('Found account.', ['id' => $account->id, 'name' => $account->name]); - $config['import-account'] = $account->id; - } - - if (null === $account->id) { - Log::error('Could not find anything for csv_import_account.', ['id' => $importId]); - } - $config = $this->storeSpecifics($data, $config); - Log::debug('Final config is ', $config); - - // onto the next stage! - - $config['stage'] = 'roles'; - $this->saveConfig($config); - - return true; - } - - /** - * Short hand method. - * - * @return array - */ - private function getConfig(): array - { - return $this->repository->getConfiguration($this->job); - } - - /** - * @param array $array - */ - private function saveConfig(array $array) - { - $this->repository->setConfiguration($this->job, $array); - } - - /** - * @param array $data - * @param array $config - * - * @return array - */ - private function storeSpecifics(array $data, array $config): array - { - // loop specifics. - if (isset($data['specifics']) && \is_array($data['specifics'])) { - $names = array_keys($data['specifics']); - foreach ($names as $name) { - // verify their content. - $className = sprintf('FireflyIII\Import\Specifics\%s', $name); - if (class_exists($className)) { - $config['specifics'][$name] = 1; - } - } - } - - return $config; - } -} diff --git a/app/Support/Import/Configuration/Spectre/HaveAccounts.php b/app/Support/Import/Configuration/Spectre/HaveAccounts.php deleted file mode 100644 index 2219748065..0000000000 --- a/app/Support/Import/Configuration/Spectre/HaveAccounts.php +++ /dev/null @@ -1,153 +0,0 @@ -. - */ - -declare(strict_types=1); - -namespace FireflyIII\Support\Import\Configuration\Spectre; - - -use FireflyIII\Models\Account; -use FireflyIII\Models\AccountType; -use FireflyIII\Models\ImportJob; -use FireflyIII\Repositories\Account\AccountRepositoryInterface; -use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; -use FireflyIII\Support\Import\Configuration\ConfigurationInterface; -use Illuminate\Support\Collection; - -/** - * Class HaveAccounts - */ -class HaveAccounts implements ConfigurationInterface -{ - /** @var ImportJob */ - private $job; - - /** - * Get the data necessary to show the configuration screen. - * - * @return array - */ - public function getData(): array - { - /** @var AccountRepositoryInterface $accountRepository */ - $accountRepository = app(AccountRepositoryInterface::class); - /** @var CurrencyRepositoryInterface $currencyRepository */ - $currencyRepository = app(CurrencyRepositoryInterface::class); - $config = $this->job->configuration; - $collection = $accountRepository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET]); - $defaultCurrency = app('amount')->getDefaultCurrency(); - $dbAccounts = []; - /** @var Account $dbAccount */ - foreach ($collection as $dbAccount) { - $id = $dbAccount->id; - $currencyId = (int)$dbAccount->getMeta('currency_id'); - $currency = $currencyRepository->find($currencyId); - $dbAccounts[$id] = [ - 'account' => $dbAccount, - 'currency' => null === $currency->id ? $defaultCurrency : $currency, - ]; - } - - // loop Spectre accounts: - /** - * @var int $index - * @var array $spectreAccount - */ - foreach ($config['accounts'] as $index => $spectreAccount) { - // find accounts with currency code - $code = $spectreAccount['currency_code']; - $selection = $this->filterAccounts($dbAccounts, $code); - $config['accounts'][$index]['options'] = app('expandedform')->makeSelectList($selection); - } - - - return [ - 'config' => $config, - ]; - } - - /** - * Return possible warning to user. - * - * @return string - */ - public function getWarningMessage(): string - { - return ''; - } - - /** - * @param ImportJob $job - * - * @return ConfigurationInterface - */ - public function setJob(ImportJob $job) - { - $this->job = $job; - - return $this; - } - - /** - * Store the result. - * - * @param array $data - * - * @return bool - */ - public function storeConfiguration(array $data): bool - { - $accounts = $data['spectre_account_id'] ?? []; - $mapping = []; - foreach ($accounts as $spectreId) { - $spectreId = (int)$spectreId; - $doImport = (int)($data['do_import'][$spectreId] ?? 0.0) === 1; - $account = (int)($data['import'][$spectreId] ?? 0.0); - if ($doImport) { - $mapping[$spectreId] = $account; - } - } - $config = $this->job->configuration; - $config['accounts-mapped'] = $mapping; - $this->job->configuration = $config; - $this->job->save(); - - return true; - } - - /** - * @param array $dbAccounts - * @param string $code - * - * @return Collection - */ - private function filterAccounts(array $dbAccounts, string $code): Collection - { - $collection = new Collection; - foreach ($dbAccounts as $accountId => $data) { - if ($data['currency']->code === $code) { - $collection->push($data['account']); - } - } - - return $collection; - } -} diff --git a/app/Support/Import/Information/BunqInformation.php b/app/Support/Import/Information/BunqInformation.php index 9b180baca9..afd170c1b5 100644 --- a/app/Support/Import/Information/BunqInformation.php +++ b/app/Support/Import/Information/BunqInformation.php @@ -37,6 +37,8 @@ use Log; use Preferences; /** + * @codeCoverageIgnore + * @deprecated * Class BunqInformation. */ class BunqInformation implements InformationInterface diff --git a/app/Support/Import/Information/GetSpectreCustomerTrait.php b/app/Support/Import/Information/GetSpectreCustomerTrait.php new file mode 100644 index 0000000000..62660e7a48 --- /dev/null +++ b/app/Support/Import/Information/GetSpectreCustomerTrait.php @@ -0,0 +1,107 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\Information; + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\ImportJob; +use FireflyIII\Services\Spectre\Object\Customer; +use FireflyIII\Services\Spectre\Request\ListCustomersRequest; +use FireflyIII\Services\Spectre\Request\NewCustomerRequest; +use Log; + +/** + * Trait GetSpectreCustomerTrait + * + */ +trait GetSpectreCustomerTrait +{ + /** + * @param ImportJob $importJob + * + * @return Customer + * @throws FireflyException + */ + protected function getCustomer(ImportJob $importJob): Customer + { + Log::debug('Now in GetSpectreCustomerTrait::getCustomer()'); + $customer = $this->getExistingCustomer($importJob); + if (null === $customer) { + Log::debug('The customer is NULL, will fire a newCustomerRequest.'); + /** @var NewCustomerRequest $request */ + $request = app(NewCustomerRequest::class); + $request->setUser($importJob->user); + // todo what if customer is still null? + $customer = $request->getCustomer(); + + } + + Log::debug('The customer is not null.'); + + return $customer; + } + + /** + * @param ImportJob $importJob + * + * @return Customer|null + * @throws FireflyException + */ + protected function getExistingCustomer(ImportJob $importJob): ?Customer + { + Log::debug('Now in GetSpectreCustomerTrait::getExistingCustomer()'); + $customer = null; + + // check users preferences. + $preference = app('preferences')->getForUser($importJob->user, 'spectre_customer', null); + if (null !== $preference) { + Log::debug('Customer is in user configuration'); + $customer = new Customer($preference->data); + + return $customer; + } + + /** @var ListCustomersRequest $request */ + $request = app(ListCustomersRequest::class); + $request->setUser($importJob->user); + $request->call(); + $customers = $request->getCustomers(); + + Log::debug(sprintf('Found %d customer(s)', \count($customers))); + /** @var Customer $current */ + foreach ($customers as $current) { + if ('default_ff3_customer' === $current->getIdentifier()) { + $customer = $current; + Log::debug('Found the correct customer.'); + break; + } + Log::debug(sprintf('Skip customer with name "%s"', $current->getIdentifier())); + } + if (null !== $customer) { + // store in preferences. + app('preferences')->setForUser($importJob->user, 'spectre_customer', $customer->toArray()); + } + + return $customer; + } +} \ No newline at end of file diff --git a/app/Support/Import/Information/GetSpectreTokenTrait.php b/app/Support/Import/Information/GetSpectreTokenTrait.php new file mode 100644 index 0000000000..15c10202e4 --- /dev/null +++ b/app/Support/Import/Information/GetSpectreTokenTrait.php @@ -0,0 +1,59 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\Information; + +use FireflyIII\Models\ImportJob; +use FireflyIII\Services\Spectre\Object\Customer; +use FireflyIII\Services\Spectre\Object\Token; +use FireflyIII\Services\Spectre\Request\CreateTokenRequest; +use Log; + +/** + * Trait GetSpectreTokenTrait + * + * @package FireflyIII\Support\Import\Information + */ +trait GetSpectreTokenTrait +{ + /** + * @param ImportJob $importJob + * @param Customer $customer + * + * @return Token + * @throws \FireflyIII\Exceptions\FireflyException + */ + protected function getToken(ImportJob $importJob, Customer $customer): Token + { + Log::debug('Now in GetSpectreTokenTrait::ChooseLoginsHandler::getToken()'); + /** @var CreateTokenRequest $request */ + $request = app(CreateTokenRequest::class); + $request->setUser($importJob->user); + $request->setUri(route('import.job.status.index', [$importJob->key])); + $request->setCustomer($customer); + $request->call(); + Log::debug('Call to get token is finished'); + + return $request->getToken(); + } +} \ No newline at end of file diff --git a/app/Support/Import/Information/InformationInterface.php b/app/Support/Import/Information/InformationInterface.php index 69181c651d..0e23f7df70 100644 --- a/app/Support/Import/Information/InformationInterface.php +++ b/app/Support/Import/Information/InformationInterface.php @@ -25,6 +25,7 @@ namespace FireflyIII\Support\Import\Information; use FireflyIII\User; /** + * @deprecated * Interface InformationInterface. */ interface InformationInterface diff --git a/app/Services/Bunq/Object/Amount.php b/app/Support/Import/JobConfiguration/Bunq/BunqJobConfigurationInterface.php similarity index 50% rename from app/Services/Bunq/Object/Amount.php rename to app/Support/Import/JobConfiguration/Bunq/BunqJobConfigurationInterface.php index ec93a1d88b..3a52f6af99 100644 --- a/app/Services/Bunq/Object/Amount.php +++ b/app/Support/Import/JobConfiguration/Bunq/BunqJobConfigurationInterface.php @@ -1,7 +1,7 @@ . */ + declare(strict_types=1); -namespace FireflyIII\Services\Bunq\Object; +namespace FireflyIII\Support\Import\JobConfiguration\Bunq; +use FireflyIII\Models\ImportJob; +use Illuminate\Support\MessageBag; /** - * Class Amount. + * Interface BunqJobConfigurationInterface */ -class Amount extends BunqObject +interface BunqJobConfigurationInterface { - /** @var string */ - private $currency; - /** @var string */ - private $value; + /** + * Return true when this stage is complete. + * + * @return bool + */ + public function configurationComplete(): bool; + /** - * Amount constructor. + * Store the job configuration. * * @param array $data + * + * @return MessageBag */ - public function __construct(array $data) - { - $this->currency = $data['currency']; - $this->value = $data['value']; - - } - - /** - * @return string - */ - public function getCurrency(): string - { - return $this->currency; - } - - /** - * @return string - */ - public function getValue(): string - { - return $this->value; - } + public function configureJob(array $data): MessageBag; /** + * Get data for config view. + * * @return array */ - public function toArray(): array - { - return [ - 'currency' => $this->currency, - 'value' => $this->value, - ]; - } -} + public function getNextData(): array; + + /** + * Get the view for this stage. + * + * @return string + */ + public function getNextView(): string; + + /** + * Set the import job. + * + * @param ImportJob $importJob + */ + public function setImportJob(ImportJob $importJob): void; + +} \ No newline at end of file diff --git a/app/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandler.php b/app/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandler.php new file mode 100644 index 0000000000..247a7a2916 --- /dev/null +++ b/app/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandler.php @@ -0,0 +1,219 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\JobConfiguration\Bunq; + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\Account as AccountModel; +use FireflyIII\Models\AccountType; +use FireflyIII\Models\ImportJob; +use FireflyIII\Models\TransactionCurrency; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use Illuminate\Support\MessageBag; + +/** + * Class ChooseAccountsHandler + */ +class ChooseAccountsHandler implements BunqJobConfigurationInterface +{ + + /** @var AccountRepositoryInterface */ + private $accountRepository; + /** @var CurrencyRepositoryInterface */ + private $currencyRepository; + /** @var ImportJob */ + private $importJob; + /** @var ImportJobRepositoryInterface */ + private $repository; + + /** + * Return true when this stage is complete. + * + * @return bool + */ + public function configurationComplete(): bool + { + $config = $this->repository->getConfiguration($this->importJob); + $mapping = $config['mapping'] ?? []; + $complete = \count($mapping) > 0; + if ($complete === true) { + // move job to correct stage to download transactions + $this->repository->setStage($this->importJob, 'go-for-import'); + } + + return $complete; + } + + /** + * Store the job configuration. + * + * @param array $data + * + * @return MessageBag + * @throws FireflyException + */ + public function configureJob(array $data): MessageBag + { + $config = $this->repository->getConfiguration($this->importJob); + $accounts = $config['accounts'] ?? []; + $mapping = $data['account_mapping'] ?? []; + $final = []; + if (\count($accounts) === 0) { + throw new FireflyException('No bunq accounts found. Import cannot continue.'); // @codeCoverageIgnore + } + if (\count($mapping) === 0) { + $messages = new MessageBag; + $messages->add('nomap', trans('import.bunq_no_mapping')); + + return $messages; + } + foreach ($mapping as $bunqId => $localId) { + $bunqId = (int)$bunqId; + $localId = (int)$localId; + + // validate each + $bunqId = $this->validBunqAccount($bunqId); + $accountId = $this->validLocalAccount($localId); + $final[$bunqId] = $accountId; + } + $config['mapping'] = $final; + $this->repository->setConfiguration($this->importJob, $config); + + return new MessageBag; + } + + /** + * Get data for config view. + * + * @return array + * @throws FireflyException + */ + public function getNextData(): array + { + $config = $this->repository->getConfiguration($this->importJob); + $accounts = $config['accounts'] ?? []; + if (\count($accounts) === 0) { + throw new FireflyException('No bunq accounts found. Import cannot continue.'); // @codeCoverageIgnore + } + // list the users accounts: + $collection = $this->accountRepository->getAccountsByType([AccountType::ASSET]); + + $localAccounts = []; + /** @var AccountModel $localAccount */ + foreach ($collection as $localAccount) { + $accountId = $localAccount->id; + $currencyId = (int)$this->accountRepository->getMetaValue($localAccount, 'currency_id'); + $currency = $this->getCurrency($currencyId); + $localAccounts[$accountId] = [ + 'name' => $localAccount->name, + 'iban' => $localAccount->iban, + 'code' => $currency->code, + ]; + } + + return [ + 'accounts' => $accounts, + 'local_accounts' => $localAccounts, + ]; + } + + /** + * @codeCoverageIgnore + * + * Get the view for this stage. + * + * @return string + */ + public function getNextView(): string + { + return 'import.bunq.choose-accounts'; + } + + /** + * Set the import job. + * + * @param ImportJob $importJob + */ + public function setImportJob(ImportJob $importJob): void + { + $this->importJob = $importJob; + $this->repository = app(ImportJobRepositoryInterface::class); + $this->accountRepository = app(AccountRepositoryInterface::class); + $this->currencyRepository = app(CurrencyRepositoryInterface::class); + $this->repository->setUser($importJob->user); + $this->currencyRepository->setUser($importJob->user); + $this->accountRepository->setUser($importJob->user); + } + + /** + * @param int $currencyId + * + * @return TransactionCurrency + */ + private function getCurrency(int $currencyId): TransactionCurrency + { + $currency = $this->currencyRepository->findNull($currencyId); + if (null === $currency) { + return app('amount')->getDefaultCurrencyByUser($this->importJob->user); + } + + return $currency; + + } + + /** + * @param int $bunqId + * + * @return int + */ + private function validBunqAccount(int $bunqId): int + { + $config = $this->repository->getConfiguration($this->importJob); + $accounts = $config['accounts'] ?? []; + /** @var array $bunqAccount */ + foreach ($accounts as $bunqAccount) { + if ((int)$bunqAccount['id'] === $bunqId) { + return $bunqId; + } + } + + return 0; + } + + /** + * @param int $accountId + * + * @return int + */ + private function validLocalAccount(int $accountId): int + { + $account = $this->accountRepository->findNull($accountId); + if (null === $account) { + return 0; + } + + return $accountId; + } +} \ No newline at end of file diff --git a/app/Support/Import/JobConfiguration/Bunq/NewBunqJobHandler.php b/app/Support/Import/JobConfiguration/Bunq/NewBunqJobHandler.php new file mode 100644 index 0000000000..2f3f208c93 --- /dev/null +++ b/app/Support/Import/JobConfiguration/Bunq/NewBunqJobHandler.php @@ -0,0 +1,108 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\JobConfiguration\Bunq; + +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use Illuminate\Support\MessageBag; +use Log; + +/** + * Class NewBunqJobHandler + */ +class NewBunqJobHandler implements BunqJobConfigurationInterface +{ + /** @var ImportJob */ + private $importJob; + /** @var ImportJobRepositoryInterface */ + private $repository; + + /** + * Return true when this stage is complete. + * + * @return bool + */ + public function configurationComplete(): bool + { + // simply set the job configuration "apply-rules" to true. + $config = $this->repository->getConfiguration($this->importJob); + $config['apply-rules'] = true; + $this->repository->setConfiguration($this->importJob, $config); + + return true; + } + + /** + * @codeCoverageIgnore + * Store the job configuration. + * + * @param array $data + * + * @return MessageBag + */ + public function configureJob(array $data): MessageBag + { + Log::debug('NewBunqJobHandler::configureJob always returns an empty message bag.'); + + return new MessageBag; + } + + /** + * @codeCoverageIgnore + * Get data for config view. + * + * @return array + */ + public function getNextData(): array + { + Log::debug('NewBunqJobHandler::getNextData always returns an empty array.'); + + return []; + } + + /** + * @codeCoverageIgnore + * Get the view for this stage. + * + * @return string + */ + public function getNextView(): string + { + Log::debug('NewBunqJobHandler::getNextView always returns "".'); + + return ''; + } + + /** + * Set the import job. + * + * @param ImportJob $importJob + */ + public function setImportJob(ImportJob $importJob): void + { + $this->importJob = $importJob; + $this->repository = app(ImportJobRepositoryInterface::class); + $this->repository->setUser($importJob->user); + } +} \ No newline at end of file diff --git a/app/Support/Import/JobConfiguration/File/ConfigureMappingHandler.php b/app/Support/Import/JobConfiguration/File/ConfigureMappingHandler.php new file mode 100644 index 0000000000..5e4c6df1f2 --- /dev/null +++ b/app/Support/Import/JobConfiguration/File/ConfigureMappingHandler.php @@ -0,0 +1,350 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\JobConfiguration\File; + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; +use FireflyIII\Import\Mapper\MapperInterface; +use FireflyIII\Import\Specifics\SpecificInterface; +use FireflyIII\Models\Attachment; +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use Illuminate\Support\Collection; +use Illuminate\Support\MessageBag; +use League\Csv\Exception; +use League\Csv\Reader; +use League\Csv\Statement; +use Log; + +/** + * Class ConfigureMappingHandler + */ +class ConfigureMappingHandler implements FileConfigurationInterface +{ + /** @var AttachmentHelperInterface */ + private $attachments; + /** @var array */ + private $columnConfig; + /** @var ImportJob */ + private $importJob; + /** @var ImportJobRepositoryInterface */ + private $repository; + + /** + * Apply the users selected specifics on the current row. + * + * @param array $config + * @param array $row + * + * @return array + */ + public function applySpecifics(array $config, array $row): array + { + // run specifics here: + // and this is the point where the specifix go to work. + $validSpecifics = array_keys(config('csv.import_specifics')); + $specifics = $config['specifics'] ?? []; + $names = array_keys($specifics); + foreach ($names as $name) { + if (!\in_array($name, $validSpecifics, true)) { + continue; + } + $class = config(sprintf('csv.import_specifics.%s', $name)); + /** @var SpecificInterface $specific */ + $specific = app($class); + + // it returns the row, possibly modified: + $row = $specific->run($row); + } + + return $row; + } + + /** + * Store data associated with current stage. + * + * @param array $data + * + * @return MessageBag + */ + public function configureJob(array $data): MessageBag + { + $config = $this->importJob->configuration; + + if (isset($data['mapping']) && \is_array($data['mapping'])) { + foreach ($data['mapping'] as $index => $array) { + $config['column-mapping-config'][$index] = []; + foreach ($array as $value => $mapId) { + $mapId = (int)$mapId; + if (0 !== $mapId) { + $config['column-mapping-config'][$index][(string)$value] = $mapId; + } + } + } + } + $this->repository->setConfiguration($this->importJob, $config); + $this->repository->setStage($this->importJob, 'ready_to_run'); + + return new MessageBag; + } + + /** + * Create the "mapper" class that will eventually return the correct data for the user + * to map against. For example: a list of asset accounts. A list of budgets. A list of tags. + * + * @param string $column + * + * @return MapperInterface + * @throws FireflyException + */ + public function createMapper(string $column): MapperInterface + { + $mapperClass = config('csv.import_roles.' . $column . '.mapper'); + $mapperName = sprintf('FireflyIII\\Import\Mapper\\%s', $mapperClass); + if (!class_exists($mapperName)) { + throw new FireflyException(sprintf('Class "%s" does not exist. Cannot map "%s"', $mapperName, $column)); // @codeCoverageIgnore + } + + return app($mapperName); + } + + /** + * For each column in the configuration of the job, will: + * - validate the role. + * - validate if it can be used for mapping + * - if so, create an entry in $columnConfig + * + * @param array $config + * + * @return array the column configuration. + * @throws FireflyException + */ + public function doColumnConfig(array $config): array + { + /** @var array $requestMapping */ + $requestMapping = $config['column-do-mapping'] ?? []; + $columnConfig = []; + /** + * @var int + * @var bool $mustBeMapped + */ + foreach ($requestMapping as $index => $requested) { + // sanitize column name, so we're sure it's valid. + $column = $this->sanitizeColumnName($config['column-roles'][$index] ?? '_ignore'); + $doMapping = $this->doMapOfColumn($column, $requested); + if ($doMapping) { + // user want to map this column. And this is possible. + $columnConfig[$index] = [ + 'name' => $column, + 'options' => $this->createMapper($column)->getMap(), + 'preProcessMap' => $this->getPreProcessorName($column), + 'values' => [], + ]; + } + } + + return $columnConfig; + } + + /** + * For each $name given, and if the user wants to map the column, will return + * true when the column can also be mapped. + * + * Unmappable columns will always return false. + * Mappable columns will return $requested. + * + * @param string $name + * @param bool $requested + * + * @return bool + */ + public function doMapOfColumn(string $name, bool $requested): bool + { + $canBeMapped = config('csv.import_roles.' . $name . '.mappable'); + + return $canBeMapped === true && $requested === true; + } + + /** + * Get the data necessary to show the configuration screen. + * + * @return array + * @throws FireflyException + */ + public function getNextData(): array + { + $config = $this->importJob->configuration; + $columnConfig = $this->doColumnConfig($config); + + // in order to actually map we also need to read the FULL file. + try { + $reader = $this->getReader(); + // @codeCoverageIgnoreStart + } catch (Exception $e) { + Log::error($e->getMessage()); + throw new FireflyException('Cannot get reader: ' . $e->getMessage()); + } + // @codeCoverageIgnoreEnd + + // get ALL values for the mappable columns from the CSV file: + $columnConfig = $this->getValuesForMapping($reader, $config, $columnConfig); + + return $columnConfig; + } + + /** + * Will return the name of the pre-processor: a special class that will clean up any input that may be found + * in the users input (aka the file uploaded). Only two examples exist at this time: a space or comma separated + * list of tags. + * + * @param string $column + * + * @return string + */ + public function getPreProcessorName(string $column): string + { + $name = ''; + $hasPreProcess = config(sprintf('csv.import_roles.%s.pre-process-map', $column)); + $preProcessClass = config(sprintf('csv.import_roles.%s.pre-process-mapper', $column)); + + if (null !== $hasPreProcess && true === $hasPreProcess && null !== $preProcessClass) { + $name = sprintf('FireflyIII\\Import\\MapperPreProcess\\%s', $preProcessClass); + } + + return $name; + } + + /** + * Return an instance of a CSV file reader so content of the file can be read. + * + * @throws \League\Csv\Exception + */ + public function getReader(): Reader + { + $content = ''; + /** @var Collection $collection */ + $collection = $this->repository->getAttachments($this->importJob); + /** @var Attachment $attachment */ + foreach ($collection as $attachment) { + if ($attachment->filename === 'import_file') { + $content = $this->attachments->getAttachmentContent($attachment); + break; + } + } + $config = $this->repository->getConfiguration($this->importJob); + $reader = Reader::createFromString($content); + $reader->setDelimiter($config['delimiter']); + + return $reader; + } + + /** + * Read the CSV file. For each row, check for each column: + * + * - If it can be mapped. And if so, + * - Run the pre-processor + * - Add the value to the list of "values" that the user must map. + * + * @param Reader $reader + * @param array $columnConfig + * + * @return array + * @throws FireflyException + */ + public function getValuesForMapping(Reader $reader, array $config, array $columnConfig): array + { + $offset = isset($config['has-headers']) && $config['has-headers'] === true ? 1 : 0; + try { + $stmt = (new Statement)->offset($offset); + // @codeCoverageIgnoreStart + } catch (Exception $e) { + throw new FireflyException(sprintf('Could not create reader: %s', $e->getMessage())); + } + // @codeCoverageIgnoreEnd + $results = $stmt->process($reader); + $mappableColumns = array_keys($columnConfig); // the actually columns that can be mapped. + foreach ($results as $lineIndex => $line) { + Log::debug(sprintf('Trying to collect values for line #%d', $lineIndex)); + $line = $this->applySpecifics($config, $line); + + /** @var int $columnIndex */ + foreach ($mappableColumns as $columnIndex) { // this is simply 1, 2, 3, etc. + if (!isset($line[$columnIndex])) { + // don't need to handle this. Continue. + continue; + } + $value = trim($line[$columnIndex]); + if (\strlen($value) === 0) { + // value is empty, ignore it. + continue; + } + $columnConfig[$columnIndex]['values'][] = $value; + } + } + + // loop array again. This time, do uniqueness. + // and remove arrays that have 0 values. + foreach ($mappableColumns as $columnIndex) { + $columnConfig[$columnIndex]['values'] = array_unique($columnConfig[$columnIndex]['values']); + asort($columnConfig[$columnIndex]['values']); + // if the count of this array is zero, there is nothing to map. + if (\count($columnConfig[$columnIndex]['values']) === 0) { + unset($columnConfig[$columnIndex]); + } + } + + return $columnConfig; + } + + /** + * For each given column name, will return either the name (when it's a valid one) + * or return the _ignore column. + * + * @param string $name + * + * @return string + */ + public function sanitizeColumnName(string $name): string + { + /** @var array $validColumns */ + $validColumns = array_keys(config('csv.import_roles')); + if (!\in_array($name, $validColumns, true)) { + $name = '_ignore'; + } + + return $name; + } + + /** + * @param ImportJob $importJob + */ + public function setImportJob(ImportJob $importJob): void + { + $this->importJob = $importJob; + $this->repository = app(ImportJobRepositoryInterface::class); + $this->repository->setUser($importJob->user); + $this->attachments = app(AttachmentHelperInterface::class); + $this->columnConfig = []; + } +} diff --git a/app/Support/Import/JobConfiguration/File/ConfigureRolesHandler.php b/app/Support/Import/JobConfiguration/File/ConfigureRolesHandler.php new file mode 100644 index 0000000000..699917e711 --- /dev/null +++ b/app/Support/Import/JobConfiguration/File/ConfigureRolesHandler.php @@ -0,0 +1,414 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\JobConfiguration\File; + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; +use FireflyIII\Import\Specifics\SpecificInterface; +use FireflyIII\Models\Attachment; +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use Illuminate\Support\Collection; +use Illuminate\Support\MessageBag; +use League\Csv\Exception; +use League\Csv\Reader; +use League\Csv\Statement; +use Log; + +/** + * Class ConfigureRolesHandler + */ +class ConfigureRolesHandler implements FileConfigurationInterface +{ + /** @var AttachmentHelperInterface */ + private $attachments; + /** @var array */ + private $examples; + /** @var ImportJob */ + private $importJob; + /** @var ImportJobRepositoryInterface */ + private $repository; + /** @var int */ + private $totalColumns; + + /** + * Verifies that the configuration of the job is actually complete, and valid. + * + * @param array $config + * + * @return MessageBag + */ + public function configurationComplete(array $config): MessageBag + { + /** @var array $roles */ + $roles = $config['column-roles']; + $count = $config['column-count']; + $assigned = 0; + + // check if data actually contains amount column (foreign amount does not count) + $hasAmount = false; + $hasForeignAmount = false; + $hasForeignCode = false; + foreach ($roles as $role) { + if ('_ignore' !== $role) { + ++$assigned; + } + if (\in_array($role, ['amount', 'amount_credit', 'amount_debit'])) { + $hasAmount = true; + } + if ($role === 'foreign-currency-code') { + $hasForeignCode = true; + } + if ($role === 'amount_foreign') { + $hasForeignAmount = true; + } + } + + // all assigned and correct foreign info + if ($assigned > 0 && $hasAmount && ($hasForeignCode === $hasForeignAmount)) { + return new MessageBag; + } + if (0 === $assigned || !$hasAmount) { + $message = (string)trans('import.job_config_roles_rwarning'); + $messages = new MessageBag(); + $messages->add('error', $message); + + return $messages; + } + + // warn if has foreign amount but no currency code: + if ($hasForeignAmount && !$hasForeignCode) { + $message = (string)trans('import.job_config_roles_fa_warning'); + $messages = new MessageBag(); + $messages->add('error', $message); + + return $messages; + } + + + return new MessageBag; // @codeCoverageIgnore + } + + /** + * Store data associated with current stage. + * + * @param array $data + * + * @return MessageBag + */ + public function configureJob(array $data): MessageBag + { + $config = $this->importJob->configuration; + $count = $config['column-count']; + for ($i = 0; $i < $count; ++$i) { + $role = $data['role'][$i] ?? '_ignore'; + $mapping = (isset($data['map'][$i]) && $data['map'][$i] === '1'); + $config['column-roles'][$i] = $role; + $config['column-do-mapping'][$i] = $mapping; + Log::debug(sprintf('Column %d has been given role %s (mapping: %s)', $i, $role, var_export($mapping, true))); + } + $config = $this->ignoreUnmappableColumns($config); + $messages = $this->configurationComplete($config); + + if ($messages->count() === 0) { + $this->repository->setStage($this->importJob, 'ready_to_run'); + if ($this->isMappingNecessary($config)) { + $this->repository->setStage($this->importJob, 'map'); + } + $this->repository->setConfiguration($this->importJob, $config); + } + + return $messages; + } + + /** + * Extracts example data from a single row and store it in the class. + * + * @param array $line + */ + public function getExampleFromLine(array $line): void + { + foreach ($line as $column => $value) { + $value = trim($value); + if (\strlen($value) > 0) { + $this->examples[$column][] = $value; + } + } + } + + /** + * @return array + */ + public function getExamples(): array + { + return $this->examples; + } + + /** + * Return a bunch of examples from the CSV file the user has uploaded. + * + * @param Reader $reader + * @param array $config + * + * @throws FireflyException + */ + public function getExamplesFromFile(Reader $reader, array $config): void + { + $limit = (int)config('csv.example_rows', 5); + $offset = isset($config['has-headers']) && $config['has-headers'] === true ? 1 : 0; + + // make statement. + try { + $stmt = (new Statement)->limit($limit)->offset($offset); + // @codeCoverageIgnoreStart + } catch (Exception $e) { + Log::error($e->getMessage()); + throw new FireflyException($e->getMessage()); + } + // @codeCoverageIgnoreEnd + + // grab the records: + $records = $stmt->process($reader); + /** @var array $line */ + foreach ($records as $line) { + $line = array_values($line); + $line = $this->processSpecifics($config, $line); + $count = \count($line); + $this->totalColumns = $count > $this->totalColumns ? $count : $this->totalColumns; + $this->getExampleFromLine($line); + } + // save column count: + $this->saveColumCount(); + $this->makeExamplesUnique(); + } + + /** + * Get the header row, if one is present. + * + * @param Reader $reader + * @param array $config + * + * @return array + * @throws FireflyException + */ + public function getHeaders(Reader $reader, array $config): array + { + $headers = []; + if (isset($config['has-headers']) && $config['has-headers'] === true) { + try { + $stmt = (new Statement)->limit(1)->offset(0); + $records = $stmt->process($reader); + $headers = $records->fetchOne(0); + // @codeCoverageIgnoreStart + } catch (Exception $e) { + Log::error($e->getMessage()); + throw new FireflyException($e->getMessage()); + } + // @codeCoverageIgnoreEnd + Log::debug('Detected file headers:', $headers); + } + + return $headers; + } + + /** + * Get the data necessary to show the configuration screen. + * + * @return array + * @throws FireflyException + */ + public function getNextData(): array + { + try { + $reader = $this->getReader(); + // @codeCoverageIgnoreStart + } catch (Exception $e) { + Log::error($e->getMessage()); + throw new FireflyException($e->getMessage()); + } + // @codeCoverageIgnoreEnd + $configuration = $this->importJob->configuration; + $headers = $this->getHeaders($reader, $configuration); + + // get example rows: + $this->getExamplesFromFile($reader, $configuration); + + return [ + 'examples' => $this->examples, + 'roles' => $this->getRoles(), + 'total' => $this->totalColumns, + 'headers' => $headers, + ]; + } + + /** + * Return an instance of a CSV file reader so content of the file can be read. + * + * @throws \League\Csv\Exception + */ + public function getReader(): Reader + { + $content = ''; + /** @var Collection $collection */ + $collection = $this->repository->getAttachments($this->importJob); + /** @var Attachment $attachment */ + foreach ($collection as $attachment) { + if ($attachment->filename === 'import_file') { + $content = $this->attachments->getAttachmentContent($attachment); + break; + } + } + $config = $this->repository->getConfiguration($this->importJob); + $reader = Reader::createFromString($content); + $reader->setDelimiter($config['delimiter']); + + return $reader; + } + + /** + * Returns all possible roles and translate their name. Then sort them. + * + * @codeCoverageIgnore + * @return array + */ + public function getRoles(): array + { + $roles = []; + foreach (array_keys(config('csv.import_roles')) as $role) { + $roles[$role] = trans('import.column_' . $role); + } + asort($roles); + + return $roles; + } + + /** + * If the user has checked columns that cannot be mapped to any value, this function will + * uncheck them and return the configuration again. + * + * @param array $config + * + * @return array + */ + public function ignoreUnmappableColumns(array $config): array + { + $count = $config['column-count']; + for ($i = 0; $i < $count; ++$i) { + $role = $config['column-roles'][$i] ?? '_ignore'; + $mapping = $config['column-do-mapping'][$i] ?? false; + // if the column can be mapped depends on the config: + $canMap = (bool)config(sprintf('csv.import_roles.%s.mappable', $role)); + $mapping = $mapping && $canMap; + $config['column-do-mapping'][$i] = $mapping; + } + + return $config; + } + + /** + * Returns false when it's not necessary to map values. This saves time and is user friendly + * (will skip to the next screen). + * + * @param array $config + * + * @return bool + */ + public function isMappingNecessary(array $config): bool + { + /** @var array $doMapping */ + $doMapping = $config['column-do-mapping'] ?? []; + $toBeMapped = 0; + foreach ($doMapping as $doMap) { + if (true === $doMap) { + ++$toBeMapped; + } + } + + return !(0 === $toBeMapped); + } + + /** + * Make sure that the examples do not contain double data values. + */ + public function makeExamplesUnique(): void + { + foreach ($this->examples as $index => $values) { + $this->examples[$index] = array_unique($values); + } + } + + /** + * if the user has configured specific fixes to be applied, they must be applied to the example data as well. + * + * @param array $config + * @param array $line + * + * @return array + */ + public function processSpecifics(array $config, array $line): array + { + $validSpecifics = array_keys(config('csv.import_specifics')); + $specifics = $config['specifics'] ?? []; + $names = array_keys($specifics); + foreach ($names as $name) { + if (!\in_array($name, $validSpecifics, true)) { + continue; + } + /** @var SpecificInterface $specific */ + $specific = app('FireflyIII\Import\Specifics\\' . $name); + $line = $specific->run($line); + } + + return $line; + + } + + /** + * Save the column count in the job. It's used in a later stage. + * TODO move config out of this method (make it a parameter). + * + * @return void + */ + public function saveColumCount(): void + { + $config = $this->importJob->configuration; + $config['column-count'] = $this->totalColumns; + $this->repository->setConfiguration($this->importJob, $config); + } + + /** + * Set job and some start values. + * + * @param ImportJob $importJob + */ + public function setImportJob(ImportJob $importJob): void + { + $this->importJob = $importJob; + $this->repository = app(ImportJobRepositoryInterface::class); + $this->repository->setUser($importJob->user); + $this->attachments = app(AttachmentHelperInterface::class); + $this->totalColumns = 0; + $this->examples = []; + } +} diff --git a/app/Support/Import/JobConfiguration/File/ConfigureUploadHandler.php b/app/Support/Import/JobConfiguration/File/ConfigureUploadHandler.php new file mode 100644 index 0000000000..144d472f86 --- /dev/null +++ b/app/Support/Import/JobConfiguration/File/ConfigureUploadHandler.php @@ -0,0 +1,162 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\JobConfiguration\File; + +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use Illuminate\Support\MessageBag; +use Log; + + +/** + * Class ConfigureUploadHandler + */ +class ConfigureUploadHandler implements FileConfigurationInterface +{ + /** @var ImportJob */ + private $importJob; + + /** @var ImportJobRepositoryInterface */ + private $repository; + + /** @var AccountRepositoryInterface */ + private $accountRepos; + + /** + * Get the data necessary to show the configuration screen. + * + * @return array + */ + public function getNextData(): array + { + $delimiters = [ + ',' => trans('form.csv_comma'), + ';' => trans('form.csv_semicolon'), + 'tab' => trans('form.csv_tab'), + ]; + $config = $this->importJob->configuration; + $config['date-format'] = $config['date-format'] ?? 'Ymd'; + $specifics = []; + $this->repository->setConfiguration($this->importJob, $config); + + // collect specifics. + foreach (config('csv.import_specifics') as $name => $className) { + $specifics[$name] = [ + 'name' => trans($className::getName()), + 'description' => trans($className::getDescription()), + ]; + } + + $data = [ + 'accounts' => [], + 'delimiters' => $delimiters, + 'specifics' => $specifics, + ]; + + return $data; + } + + /** + * @param ImportJob $importJob + */ + public function setImportJob(ImportJob $importJob): void + { + $this->importJob = $importJob; + $this->repository = app(ImportJobRepositoryInterface::class); + $this->repository->setUser($importJob->user); + $this->accountRepos = app(AccountRepositoryInterface::class); + $this->accountRepos->setUser($importJob->user); + + } + + /** + * Store data associated with current stage. + * + * @param array $data + * + * @return MessageBag + */ + public function configureJob(array $data): MessageBag + { + $config = $this->importJob->configuration; + $complete = true; + + // collect values: + $importId = isset($data['csv_import_account']) ? (int)$data['csv_import_account'] : 0; + $delimiter = (string)$data['csv_delimiter']; + $config['has-headers'] = (int)($data['has_headers'] ?? 0.0) === 1; + $config['date-format'] = (string)$data['date_format']; + $config['delimiter'] = 'tab' === $delimiter ? "\t" : $delimiter; + $config['apply-rules'] = (int)($data['apply_rules'] ?? 0.0) === 1; + $config['specifics'] = $this->getSpecifics($data); + // validate values: + $account = $this->accountRepos->findNull($importId); + + // respond to invalid account: + if (null === $account) { + Log::error('Could not find anything for csv_import_account.', ['id' => $importId]); + $complete = false; + } + if (null !== $account) { + $config['import-account'] = $account->id; + } + + $this->repository->setConfiguration($this->importJob, $config); + if ($complete) { + $this->repository->setStage($this->importJob, 'roles'); + } + if (!$complete) { + $messages = new MessageBag; + $messages->add('account', trans('import.invalid_import_account')); + + return $messages; + } + + return new MessageBag; + } + + /** + * @param array $data + * + * @return array + */ + public function getSpecifics(array $data): array + { + $return = []; + // check if specifics given are correct: + if (isset($data['specifics']) && \is_array($data['specifics'])) { + + foreach ($data['specifics'] as $name) { + // verify their content. + $className = sprintf('FireflyIII\\Import\\Specifics\\%s', $name); + if (class_exists($className)) { + $return[$name] = 1; + } + } + } + + return $return; + } +} diff --git a/app/Support/Import/Configuration/ConfigurationInterface.php b/app/Support/Import/JobConfiguration/File/FileConfigurationInterface.php similarity index 63% rename from app/Support/Import/Configuration/ConfigurationInterface.php rename to app/Support/Import/JobConfiguration/File/FileConfigurationInterface.php index 40c53c4a5b..3597ec4206 100644 --- a/app/Support/Import/Configuration/ConfigurationInterface.php +++ b/app/Support/Import/JobConfiguration/File/FileConfigurationInterface.php @@ -1,7 +1,7 @@ . + */ + + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\JobConfiguration\File; + +use Exception; +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; +use FireflyIII\Models\Attachment; +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use Illuminate\Support\Collection; +use Illuminate\Support\MessageBag; +use Log; + +/** + * Class NewFileJobHandler + */ +class NewFileJobHandler implements FileConfigurationInterface +{ + /** @var AttachmentHelperInterface */ + private $attachments; + /** @var ImportJob */ + private $importJob; + /** @var ImportJobRepositoryInterface */ + private $repository; + + /** + * Store data associated with current stage. + * + * @param array $data + * + * @throws FireflyException + * @return MessageBag + */ + public function configureJob(array $data): MessageBag + { + // nothing to store, validate upload + // and push to next stage. + $messages = $this->validateAttachments(); + + if ($messages->count() > 0) { + return $messages; + } + + // store config if it's in one of the attachments. + $this->storeConfiguration(); + + // set file type in config: + $config = $this->repository->getConfiguration($this->importJob); + $config['file-type'] = $data['import_file_type']; + $this->repository->setConfiguration($this->importJob, $config); + $this->repository->setStage($this->importJob, 'configure-upload'); + + return new MessageBag(); + + } + + /** + * + * Get the data necessary to show the configuration screen. + * @codeCoverageIgnore + * @return array + */ + public function getNextData(): array + { + /** @var array $allowedTypes */ + $allowedTypes = config('import.options.file.import_formats'); + $importFileTypes = []; + $defaultImportType = config('import.options.file.default_import_format'); + foreach ($allowedTypes as $type) { + $importFileTypes[$type] = trans('import.import_file_type_' . $type); + } + + return [ + 'default_type' => $defaultImportType, + 'file_types' => $importFileTypes, + ]; + } + + /** + * @param ImportJob $job + */ + public function setImportJob(ImportJob $importJob): void + { + $this->importJob = $importJob; + $this->repository = app(ImportJobRepositoryInterface::class); + $this->attachments = app(AttachmentHelperInterface::class); + $this->repository->setUser($importJob->user); + } + + /** + * Store config from job. + * + * @throws FireflyException + */ + public function storeConfiguration(): void + { + /** @var Collection $attachments */ + $attachments = $this->repository->getAttachments($this->importJob); + /** @var Attachment $attachment */ + foreach ($attachments as $attachment) { + // if file is configuration file, store it into the job. + if ($attachment->filename === 'configuration_file') { + $this->storeConfig($attachment); + } + } + } + + /** + * Check if all attachments are UTF8. + * + * @return MessageBag + * @throws FireflyException + */ + public function validateAttachments(): MessageBag + { + $messages = new MessageBag; + /** @var Collection $attachments */ + $attachments = $this->repository->getAttachments($this->importJob); + /** @var Attachment $attachment */ + foreach ($attachments as $attachment) { + + // check if content is UTF8: + if (!$this->isUTF8($attachment)) { + $message = trans('import.file_not_utf8'); + Log::error($message); + $messages->add('import_file', $message); + // delete attachment: + try { + $attachment->delete(); + // @codeCoverageIgnoreStart + } catch (Exception $e) { + throw new FireflyException(sprintf('Could not delete attachment: %s', $e->getMessage())); + } + + // @codeCoverageIgnoreEnd + + return $messages; + } + + // if file is configuration file, store it into the job. + if ($attachment->filename === 'configuration_file') { + $this->storeConfig($attachment); + } + } + + return $messages; + } + + /** + * @param Attachment $attachment + * + * @return bool + */ + private function isUTF8(Attachment $attachment): bool + { + $content = $this->attachments->getAttachmentContent($attachment); + $result = mb_detect_encoding($content, 'UTF-8', true); + if ($result === false) { + return false; + } + if ($result !== 'ASCII' && $result !== 'UTF-8') { + return false; // @codeCoverageIgnore + } + + return true; + } + + /** + * Take attachment, extract config, and put in job.\ + * + * @param Attachment $attachment + * + * @throws FireflyException + */ + private function storeConfig(Attachment $attachment): void + { + $content = $this->attachments->getAttachmentContent($attachment); + $json = json_decode($content, true); + if (null !== $json) { + $this->repository->setConfiguration($this->importJob, $json); + } + } +} diff --git a/app/Support/Import/JobConfiguration/Spectre/AuthenticatedHandler.php b/app/Support/Import/JobConfiguration/Spectre/AuthenticatedHandler.php new file mode 100644 index 0000000000..1c9fff6b4f --- /dev/null +++ b/app/Support/Import/JobConfiguration/Spectre/AuthenticatedHandler.php @@ -0,0 +1,95 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\JobConfiguration\Spectre; + +use FireflyIII\Models\ImportJob; +use Illuminate\Support\MessageBag; +use Log; + +/** + * @codeCoverageIgnore + * + * Class AuthenticatedHandler + */ +class AuthenticatedHandler implements SpectreJobConfigurationInterface +{ + /** + * Return true when this stage is complete. + * + * @return bool + */ + public function configurationComplete(): bool + { + Log::debug('AuthenticatedConfigHandler::configurationComplete() always returns true'); + + return true; + } + + /** + * Store the job configuration. + * + * @param array $data + * + * @return MessageBag + */ + public function configureJob(array $data): MessageBag + { + Log::debug('AuthenticatedConfigHandler::configureJob() always returns empty message bag'); + + return new MessageBag(); + } + + /** + * Get data for config view. + * + * @return array + */ + public function getNextData(): array + { + Log::debug('AuthenticatedConfigHandler::getNextData() always returns []'); + + return []; + } + + /** + * Get the view for this stage. + * + * @return string + */ + public function getNextView(): string + { + Log::debug('AuthenticatedConfigHandler::getNextView() always returns ""'); + + return ''; + } + + /** + * Set the import job. + * + * @param ImportJob $importJob + */ + public function setImportJob(ImportJob $importJob): void + { + } +} \ No newline at end of file diff --git a/app/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandler.php b/app/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandler.php new file mode 100644 index 0000000000..ee85ebfb8d --- /dev/null +++ b/app/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandler.php @@ -0,0 +1,252 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\JobConfiguration\Spectre; + + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\Account as AccountModel; +use FireflyIII\Models\AccountType; +use FireflyIII\Models\ImportJob; +use FireflyIII\Models\TransactionCurrency; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Services\Spectre\Object\Account as SpectreAccount; +use FireflyIII\Services\Spectre\Object\Login; +use Illuminate\Support\MessageBag; +use Log; + +/** + * Class ChooseAccountsHandler + * + */ +class ChooseAccountsHandler implements SpectreJobConfigurationInterface +{ + + /** @var AccountRepositoryInterface */ + private $accountRepository; + /** @var CurrencyRepositoryInterface */ + private $currencyRepository; + /** @var ImportJob */ + private $importJob; + /** @var ImportJobRepositoryInterface */ + private $repository; + + /** + * Return true when this stage is complete. + * + * @return bool + */ + public function configurationComplete(): bool + { + Log::debug('Now in ChooseAccountsHandler::configurationComplete()'); + $config = $this->importJob->configuration; + $importAccounts = $config['account_mapping'] ?? []; + $complete = \count($importAccounts) > 0 && $importAccounts !== [0 => 0]; + if ($complete) { + // todo also actually validate content. + Log::debug('Looks like user has mapped import accounts to Firefly III accounts', $importAccounts); + $this->repository->setStage($this->importJob, 'go-for-import'); + } + + return $complete; + } + + /** + * Store the job configuration. + * + * @param array $data + * + * @return MessageBag + */ + public function configureJob(array $data): MessageBag + { + Log::debug('Now in ChooseAccountsHandler::configureJob()', $data); + $config = $this->importJob->configuration; + $mapping = $data['account_mapping'] ?? []; + $final = []; + foreach ($mapping as $spectreId => $localId) { + // validate each + $spectreId = $this->validSpectreAccount((int)$spectreId); + $accountId = $this->validLocalAccount((int)$localId); + $final[$spectreId] = $accountId; + + } + Log::debug('Final mapping is:', $final); + $messages = new MessageBag; + $config['account_mapping'] = $final; + + $this->repository->setConfiguration($this->importJob, $config); + if ($final === [0 => 0] || \count($final) === 0) { + $messages->add('count', trans('import.spectre_no_mapping')); + } + + return $messages; + } + + /** + * Get data for config view. + * + * @return array + * @throws FireflyException + */ + public function getNextData(): array + { + Log::debug('Now in ChooseAccountsHandler::getnextData()'); + $config = $this->importJob->configuration; + $accounts = $config['accounts'] ?? []; + if (\count($accounts) === 0) { + throw new FireflyException('It seems you have no accounts with this bank. The import cannot continue.'); // @codeCoverageIgnore + } + $converted = []; + foreach ($accounts as $accountArray) { + $converted[] = new SpectreAccount($accountArray); + } + + // get the provider that was used. + $login = null; + $logins = $config['all-logins'] ?? []; + $selected = $config['selected-login'] ?? 0; + if (\count($logins) === 0) { + throw new FireflyException('It seems you have no configured logins in this import job. The import cannot continue.'); // @codeCoverageIgnore + } + Log::debug(sprintf('Selected login to use is %d', $selected)); + if ($selected === 0) { + $login = new Login($logins[0]); + Log::debug(sprintf('Will use login %d (%s %s)', $login->getId(), $login->getProviderName(), $login->getCountryCode())); + } + if ($selected !== 0) { + foreach ($logins as $loginArray) { + $loginId = $loginArray['id'] ?? -1; + if ($loginId === $selected) { + $login = new Login($loginArray); + Log::debug(sprintf('Will use login %d (%s %s)', $login->getId(), $login->getProviderName(), $login->getCountryCode())); + } + } + } + if (null === $login) { + throw new FireflyException('Was not able to determine which login to use. The import cannot continue.'); // @codeCoverageIgnore + } + + // list the users accounts: + $accounts = $this->accountRepository->getAccountsByType([AccountType::ASSET]); + + $array = []; + /** @var AccountModel $account */ + foreach ($accounts as $account) { + $accountId = $account->id; + $currencyId = (int)$this->accountRepository->getMetaValue($account, 'currency_id'); + $currency = $this->getCurrency($currencyId); + $array[$accountId] = [ + 'name' => $account->name, + 'iban' => $account->iban, + 'code' => $currency->code, + ]; + } + + return [ + 'accounts' => $converted, + 'ff_accounts' => $array, + 'login' => $login, + + ]; + } + + /** + * @codeCoverageIgnore + * Get the view for this stage. + * + * @return string + */ + public function getNextView(): string + { + return 'import.spectre.accounts'; + } + + /** + * @codeCoverageIgnore + * Set the import job. + * + * @param ImportJob $importJob + */ + public function setImportJob(ImportJob $importJob): void + { + $this->importJob = $importJob; + $this->repository = app(ImportJobRepositoryInterface::class); + $this->accountRepository = app(AccountRepositoryInterface::class); + $this->currencyRepository = app(CurrencyRepositoryInterface::class); + $this->repository->setUser($importJob->user); + $this->currencyRepository->setUser($importJob->user); + $this->accountRepository->setUser($importJob->user); + } + + /** + * @param int $currencyId + * + * @return TransactionCurrency + */ + private function getCurrency(int $currencyId): TransactionCurrency + { + $currency = $this->currencyRepository->findNull($currencyId); + if (null === $currency) { + return app('amount')->getDefaultCurrencyByUser($this->importJob->user); + } + + return $currency; + + } + + /** + * @param int $accountId + * + * @return int + */ + private function validLocalAccount(int $accountId): int + { + $account = $this->accountRepository->findNull($accountId); + if (null === $account) { + return 0; + } + + return $accountId; + } + + /** + * @param int $accountId + * + * @return int + */ + private function validSpectreAccount(int $accountId): int + { + $config = $this->importJob->configuration; + $accounts = $config['accounts'] ?? []; + foreach ($accounts as $account) { + if ((int)$account['id'] === $accountId) { + return $accountId; + } + } + + return 0; + } +} \ No newline at end of file diff --git a/app/Support/Import/JobConfiguration/Spectre/ChooseLoginHandler.php b/app/Support/Import/JobConfiguration/Spectre/ChooseLoginHandler.php new file mode 100644 index 0000000000..1687a0689d --- /dev/null +++ b/app/Support/Import/JobConfiguration/Spectre/ChooseLoginHandler.php @@ -0,0 +1,150 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\JobConfiguration\Spectre; + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Services\Spectre\Object\Customer; +use FireflyIII\Services\Spectre\Object\Login; +use FireflyIII\Services\Spectre\Object\Token; +use FireflyIII\Services\Spectre\Request\CreateTokenRequest; +use FireflyIII\Services\Spectre\Request\ListCustomersRequest; +use FireflyIII\Services\Spectre\Request\NewCustomerRequest; +use FireflyIII\Support\Import\Information\GetSpectreCustomerTrait; +use FireflyIII\Support\Import\Information\GetSpectreTokenTrait; +use Illuminate\Support\MessageBag; +use Log; + + +/** + * Class ChooseLoginHandler + * + */ +class ChooseLoginHandler implements SpectreJobConfigurationInterface +{ + use GetSpectreCustomerTrait, GetSpectreTokenTrait; + /** @var ImportJob */ + private $importJob; + /** @var ImportJobRepositoryInterface */ + private $repository; + + /** + * Return true when this stage is complete. + * + * @return bool + */ + public function configurationComplete(): bool + { + Log::debug('Now in ChooseLoginHandler::configurationComplete()'); + $config = $this->importJob->configuration; + if (isset($config['selected-login'])) { + Log::debug('config[selected-login] is set, return true.'); + + return true; + } + Log::debug('config[selected-login] is not set, return false.'); + + return false; + } + + /** + * Store the job configuration. + * + * @param array $data + * + * @return MessageBag + * @throws FireflyException + */ + public function configureJob(array $data): MessageBag + { + Log::debug('Now in ChooseLoginHandler::configureJob()'); + $selectedLogin = (int)($data['spectre_login_id'] ?? 0.0); + $config = $this->importJob->configuration; + $config['selected-login'] = $selectedLogin; + $this->repository->setConfiguration($this->importJob, $config); + Log::debug(sprintf('The selected login by the user is #%d', $selectedLogin)); + + // if selected login is zero, create a new one. + if ($selectedLogin === 0) { + Log::debug('Login is zero, get Spectre customer + token and store it in config.'); + $customer = $this->getCustomer($this->importJob); + // get a token for the user and redirect to next stage + $token = $this->getToken($this->importJob, $customer); + $config['customer'] = $customer->toArray(); + $config['token'] = $token->toArray(); + $this->repository->setConfiguration($this->importJob, $config); + // move job to correct stage to redirect to Spectre: + $this->repository->setStage($this->importJob, 'do-authenticate'); + + return new MessageBag; + + } + $this->repository->setStage($this->importJob, 'authenticated'); + + return new MessageBag; + } + + /** + * Get data for config view. + * + * @return array + */ + public function getNextData(): array + { + Log::debug('Now in ChooseLoginHandler::getNextData()'); + $config = $this->importJob->configuration; + $data = ['logins' => []]; + $logins = $config['all-logins'] ?? []; + Log::debug(sprintf('Count of logins in configuration is %d.', \count($logins))); + foreach ($logins as $login) { + $data['logins'][] = new Login($login); + } + + return $data; + } + + /** + * @codeCoverageIgnore + * Get the view for this stage. + * + * @return string + */ + public function getNextView(): string + { + return 'import.spectre.choose-login'; + } + + /** + * Set the import job. + * + * @param ImportJob $importJob + */ + public function setImportJob(ImportJob $importJob): void + { + $this->importJob = $importJob; + $this->repository = app(ImportJobRepositoryInterface::class); + $this->repository->setUser($importJob->user); + } +} \ No newline at end of file diff --git a/app/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandler.php b/app/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandler.php new file mode 100644 index 0000000000..0699e9dd72 --- /dev/null +++ b/app/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandler.php @@ -0,0 +1,129 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\JobConfiguration\Spectre; + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Services\Spectre\Object\Token; +use FireflyIII\Support\Import\Information\GetSpectreCustomerTrait; +use FireflyIII\Support\Import\Information\GetSpectreTokenTrait; +use Illuminate\Support\MessageBag; +use Log; + +/** + * Class AuthenticateConfig + * + */ +class DoAuthenticateHandler implements SpectreJobConfigurationInterface +{ + use GetSpectreTokenTrait, GetSpectreCustomerTrait; + /** @var ImportJob */ + private $importJob; + /** @var ImportJobRepositoryInterface */ + private $repository; + + /** + * @codeCoverageIgnore + * Return true when this stage is complete. + * + * always returns false. + * + * @return bool + */ + public function configurationComplete(): bool + { + Log::debug('DoAuthenticateHandler::configurationComplete() will always return false'); + + return false; + } + + /** + * @codeCoverageIgnore + * Store the job configuration. + * + * @param array $data + * + * @return MessageBag + */ + public function configureJob(array $data): MessageBag + { + Log::debug('DoAuthenticateHandler::configureJob() will do nothing.'); + + return new MessageBag; + } + + /** + * Get data for config view. + * + * @return array + * @throws FireflyException + */ + public function getNextData(): array + { + Log::debug('Now in DoAuthenticateHandler::getNextData()'); + + // getNextData() only makes sure the job is ready for the next stage. + $this->repository->setStatus($this->importJob, 'ready_to_run'); + $this->repository->setStage($this->importJob, 'authenticated'); + + // get token from configuration: + $config = $this->importJob->configuration; + $token = isset($config['token']) ? new Token($config['token']) : null; + + if (null === $token) { + // get a new one from Spectre: + Log::debug('No existing token, get a new one.'); + // get a new token from Spectre. + $customer = $this->getCustomer($this->importJob); + $token = $this->getToken($this->importJob, $customer); + } + + return ['token-url' => $token->getConnectUrl()]; + } + + /** + * @codeCoverageIgnore + * Get the view for this stage. + * + * @return string + */ + public function getNextView(): string + { + return 'import.spectre.redirect'; + } + + /** + * @codeCoverageIgnore + * Set the import job. + * + * @param ImportJob $importJob + */ + public function setImportJob(ImportJob $importJob): void + { + $this->importJob = $importJob; + $this->repository = app(ImportJobRepositoryInterface::class); + $this->repository->setUser($importJob->user); + } +} \ No newline at end of file diff --git a/app/Support/Import/JobConfiguration/Spectre/NewSpectreJobHandler.php b/app/Support/Import/JobConfiguration/Spectre/NewSpectreJobHandler.php new file mode 100644 index 0000000000..8381de8639 --- /dev/null +++ b/app/Support/Import/JobConfiguration/Spectre/NewSpectreJobHandler.php @@ -0,0 +1,98 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\JobConfiguration\Spectre; + + +use FireflyIII\Models\ImportJob; +use Illuminate\Support\MessageBag; +use Log; + +/** + * @codeCoverageIgnore + * + * Class NewSpectreJobHandler + * + */ +class NewSpectreJobHandler implements SpectreJobConfigurationInterface +{ + + /** + * Return true when this stage is complete. + * + * @return bool + */ + public function configurationComplete(): bool + { + Log::debug('NewSpectreJobHandler::configurationComplete() always returns true'); + + return true; + } + + /** + * Store the job configuration. + * + * @param array $data + * + * @return MessageBag + */ + public function configureJob(array $data): MessageBag + { + Log::debug('NewSpectreJobHandler::configureJob() always returns an empty message bag'); + + return new MessageBag; + } + + /** + * Get data for config view. + * + * @return array + */ + public function getNextData(): array + { + Log::debug('NewSpectreJobHandler::getNextData() always returns []'); + + return []; + } + + /** + * Get the view for this stage. + * + * @return string + */ + public function getNextView(): string + { + Log::debug('NewSpectreJobHandler::getNextView() always returns ""'); + + return ''; + } + + /** + * Set the import job. + * + * @param ImportJob $importJob + */ + public function setImportJob(ImportJob $importJob): void + { + } +} \ No newline at end of file diff --git a/app/Support/Import/JobConfiguration/Spectre/SpectreJobConfigurationInterface.php b/app/Support/Import/JobConfiguration/Spectre/SpectreJobConfigurationInterface.php new file mode 100644 index 0000000000..6dbf38b1b4 --- /dev/null +++ b/app/Support/Import/JobConfiguration/Spectre/SpectreJobConfigurationInterface.php @@ -0,0 +1,74 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\JobConfiguration\Spectre; + + +use FireflyIII\Models\ImportJob; +use Illuminate\Support\MessageBag; + +/** + * Interface SpectreJobConfigurationInterface + * + */ +interface SpectreJobConfigurationInterface +{ + /** + * Return true when this stage is complete. + * + * @return bool + */ + public function configurationComplete(): bool; + + + /** + * Store the job configuration. + * + * @param array $data + * + * @return MessageBag + */ + public function configureJob(array $data): MessageBag; + + /** + * Get data for config view. + * + * @return array + */ + public function getNextData(): array; + + /** + * Get the view for this stage. + * + * @return string + */ + public function getNextView(): string; + + /** + * Set the import job. + * + * @param ImportJob $importJob + */ + public function setImportJob(ImportJob $importJob): void; + +} \ No newline at end of file diff --git a/app/Support/Import/Placeholder/ColumnValue.php b/app/Support/Import/Placeholder/ColumnValue.php new file mode 100644 index 0000000000..edefbcc168 --- /dev/null +++ b/app/Support/Import/Placeholder/ColumnValue.php @@ -0,0 +1,114 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\Placeholder; + +/** + * Class ColumnValue + * @codeCoverageIgnore + */ +class ColumnValue +{ + /** @var int */ + private $mappedValue; + /** @var string */ + private $originalRole; + /** @var string */ + private $role; + /** @var string */ + private $value; + + /** + * ColumnValue constructor. + */ + public function __construct() + { + $this->mappedValue = 0; + } + + /** + * @return int + */ + public function getMappedValue(): int + { + return $this->mappedValue; + } + + /** + * @param int $mappedValue + */ + public function setMappedValue(int $mappedValue): void + { + $this->mappedValue = $mappedValue; + } + + /** + * @return string + */ + public function getOriginalRole(): string + { + return $this->originalRole; + } + + /** + * @param string $originalRole + */ + public function setOriginalRole(string $originalRole): void + { + $this->originalRole = $originalRole; + } + + /** + * @return string + */ + public function getRole(): string + { + return $this->role; + } + + /** + * @param string $role + */ + public function setRole(string $role): void + { + $this->role = $role; + } + + /** + * @return string + */ + public function getValue(): string + { + return $this->value; + } + + /** + * @param string $value + */ + public function setValue(string $value): void + { + $this->value = $value; + } + + +} diff --git a/app/Support/Import/Placeholder/ImportTransaction.php b/app/Support/Import/Placeholder/ImportTransaction.php new file mode 100644 index 0000000000..a9ce98af63 --- /dev/null +++ b/app/Support/Import/Placeholder/ImportTransaction.php @@ -0,0 +1,451 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\Placeholder; + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Import\Converter\Amount; +use FireflyIII\Import\Converter\AmountCredit; +use FireflyIII\Import\Converter\AmountDebit; +use FireflyIII\Import\Converter\ConverterInterface; +use Log; + +/** + * Class ImportTransaction + */ +class ImportTransaction +{ + /** @var string */ + public $accountBic; + /** @var string */ + public $accountIban; + /** @var int */ + public $accountId; + /** @var string */ + public $accountName; + /** @var string */ + public $accountNumber; + /** @var string */ + public $amount; + /** @var string */ + public $amountCredit; + /** @var string */ + public $amountDebit; + /** @var int */ + public $billId; + /** @var string */ + public $billName; + /** @var int */ + public $budgetId; + /** @var string */ + public $budgetName; + /** @var int */ + public $categoryId; + /** @var string */ + public $categoryName; + /** @var string */ + public $currencyCode; + /** @var int */ + public $currencyId; + /** @var string */ + public $currencyName; + /** @var string */ + public $currencySymbol; + /** @var string */ + public $date; + /** @var string */ + public $description; + /** @var string */ + public $externalId; + /** @var string */ + public $foreignAmount; + /** @var string */ + public $foreignCurrencyCode; + /** @var int */ + public $foreignCurrencyId; + /** @var array */ + public $meta; + /** @var array */ + public $modifiers; + /** @var string */ + public $note; + /** @var string */ + public $opposingBic; + /** @var string */ + public $opposingIban; + /** @var int */ + public $opposingId; + /** @var string */ + public $opposingName; + /** @var string */ + public $opposingNumber; + /** @var array */ + public $tags; + + /** + * ImportTransaction constructor. + */ + public function __construct() + { + $this->tags = []; + $this->modifiers = []; + $this->meta = []; + $this->description = ''; + $this->note = ''; + + // mappable items, set to 0: + $this->accountId = 0; + $this->budgetId = 0; + $this->billId = 0; + $this->currencyId = 0; + $this->categoryId = 0; + $this->foreignCurrencyId = 0; + $this->opposingId = 0; + + } + + /** + * @param ColumnValue $columnValue + * + * @throws FireflyException + */ + public function addColumnValue(ColumnValue $columnValue): void + { + switch ($columnValue->getRole()) { + default: + // @codeCoverageIgnoreStart + throw new FireflyException( + sprintf('ImportTransaction cannot handle role "%s" with value "%s"', $columnValue->getRole(), $columnValue->getValue()) + ); + // @codeCoverageIgnoreEnd + case 'account-id': + // could be the result of a mapping? + $this->accountId = $this->getMappedValue($columnValue); + break; + case 'account-iban': + $this->accountIban = $columnValue->getValue(); + break; + case 'account-name': + $this->accountName = $columnValue->getValue(); + break; + case 'account-bic': + $this->accountBic = $columnValue->getValue(); + break; + case 'account-number': + $this->accountNumber = $columnValue->getValue(); + break; + case 'amount_debit': + $this->amountDebit = $columnValue->getValue(); + break; + case 'amount_credit': + $this->amountCredit = $columnValue->getValue(); + break; + case 'amount': + $this->amount = $columnValue->getValue(); + break; + case 'amount_foreign': + $this->foreignAmount = $columnValue->getValue(); + break; + case 'bill-id': + $this->billId = $this->getMappedValue($columnValue); + break; + case 'bill-name': + $this->billName = $columnValue->getValue(); + break; + case 'budget-id': + $this->budgetId = $this->getMappedValue($columnValue); + break; + case 'budget-name': + $this->budgetName = $columnValue->getValue(); + break; + case 'category-id': + $this->categoryId = $this->getMappedValue($columnValue); + break; + case 'category-name': + $this->categoryName = $columnValue->getValue(); + break; + case 'currency-id': + $this->currencyId = $this->getMappedValue($columnValue); + break; + case 'currency-name': + $this->currencyName = $columnValue->getValue(); + break; + case 'currency-code': + $this->currencyCode = $columnValue->getValue(); + break; + case 'currency-symbol': + $this->currencySymbol = $columnValue->getValue(); + break; + case 'external-id': + $this->externalId = $columnValue->getValue(); + break; + case 'sepa-ct-id'; + case 'sepa-ct-op'; + case 'sepa-db'; + case 'sepa-cc': + case 'sepa-country'; + case 'sepa-ep'; + case 'sepa-ci'; + case 'internal-reference': + case 'date-interest': + case 'date-invoice': + case 'date-book': + case 'date-payment': + case 'date-process': + case 'date-due': + $this->meta[$columnValue->getRole()] = $columnValue->getValue(); + break; + case 'foreign-currency-id': + $this->foreignCurrencyId = $this->getMappedValue($columnValue); + break; + case 'foreign-currency-code': + $this->foreignCurrencyCode = $columnValue->getValue(); + break; + case 'date-transaction': + $this->date = $columnValue->getValue(); + break; + case 'description': + $this->description = trim($this->description . ' ' . $columnValue->getValue()); + break; + case 'note': + $this->note = trim($this->note . ' ' . $columnValue->getValue()); + break; + case 'opposing-id': + $this->opposingId = $this->getMappedValue($columnValue); + break; + case 'opposing-iban': + $this->opposingIban = $columnValue->getValue(); + break; + case 'opposing-name': + $this->opposingName = $columnValue->getValue(); + break; + case 'opposing-bic': + $this->opposingBic = $columnValue->getValue(); + break; + case 'opposing-number': + $this->opposingNumber = $columnValue->getValue(); + break; + case 'rabo-debit-credit': + case 'ing-debit-credit': + $this->modifiers[$columnValue->getRole()] = $columnValue->getValue(); + break; + case 'tags-comma': + $tags = explode(',', $columnValue->getValue()); + $this->tags = array_unique(array_merge($this->tags, $tags)); + break; + case 'tags-space': + $tags = explode(' ', $columnValue->getValue()); + $this->tags = array_unique(array_merge($this->tags, $tags)); + break; + case '_ignore': + break; + + } + } + + /** + * Calculate the amount of this transaction. + * + * @return string + * @throws FireflyException + */ + public function calculateAmount(): string + { + Log::debug('Now in importTransaction->calculateAmount()'); + $info = $this->selectAmountInput(); + $class = $info['class'] ?? ''; + if ('' === $class) { + Log::error('No amount information (conversion class) for this row.'); + + return ''; + } + + Log::debug(sprintf('Converter class is %s', $info['class'])); + /** @var ConverterInterface $amountConverter */ + $amountConverter = app($info['class']); + $result = $amountConverter->convert($info['amount']); + Log::debug(sprintf('First attempt to convert gives "%s"', $result)); + // modify + /** + * @var string $role + * @var string $modifier + */ + foreach ($this->modifiers as $role => $modifier) { + $class = sprintf('FireflyIII\\Import\\Converter\\%s', config(sprintf('csv.import_roles.%s.converter', $role))); + /** @var ConverterInterface $converter */ + $converter = app($class); + Log::debug(sprintf('Now launching converter %s', $class)); + $conversion = $converter->convert($modifier); + if ($conversion === -1) { + $result = app('steam')->negative($result); + } + if ($conversion === 1) { + $result = app('steam')->positive($result); + } + Log::debug(sprintf('convertedAmount after conversion is %s', $result)); + } + + Log::debug(sprintf('After modifiers the result is: "%s"', $result)); + + + return $result; + } + + /** + * The method that calculates the foreign amount isn't nearly as complex,\ + * because Firefly III only supports one foreign amount field. So the foreign amount is there + * or isn't. That's about it. However, if it's there, modifiers will be applied too. + * + * @return string + */ + public function calculateForeignAmount(): string + { + if (null === $this->foreignAmount) { + Log::debug('ImportTransaction holds no foreign amount info.'); + + return ''; + } + /** @var ConverterInterface $amountConverter */ + $amountConverter = app(Amount::class); + $result = $amountConverter->convert($this->foreignAmount); + Log::debug(sprintf('First attempt to convert foreign amount gives "%s"', $result)); + /** + * @var string $role + * @var string $modifier + */ + foreach ($this->modifiers as $role => $modifier) { + $class = sprintf('FireflyIII\\Import\\Converter\\%s', config(sprintf('csv.import_roles.%s.converter', $role))); + /** @var ConverterInterface $converter */ + $converter = app($class); + Log::debug(sprintf('Now launching converter %s', $class)); + $conversion = $converter->convert($modifier); + if ($conversion === -1) { + $result = app('steam')->negative($result); + } + if ($conversion === 1) { + $result = app('steam')->positive($result); + } + Log::debug(sprintf('Foreign amount after conversion is %s', $result)); + } + + Log::debug(sprintf('After modifiers the foreign amount is: "%s"', $result)); + + return $result; + } + + /** + * This array is being used to map the account the user is using. + * + * @codeCoverageIgnore + * @return array + */ + public function getAccountData(): array + { + return [ + 'iban' => $this->accountIban, + 'name' => $this->accountName, + 'number' => $this->accountNumber, + 'bic' => $this->accountBic, + ]; + } + + /** + * @codeCoverageIgnore + * @return array + */ + public function getCurrencyData(): array + { + return [ + 'name' => $this->currencyName, + 'code' => $this->currencyCode, + 'symbol' => $this->currencySymbol, + ]; + } + + /** + * @codeCoverageIgnore + * @return array + */ + public function getForeignCurrencyData(): array + { + return [ + 'code' => $this->foreignCurrencyCode, + ]; + } + + /** + * @codeCoverageIgnore + * @return array + */ + public function getOpposingAccountData(): array + { + return [ + 'iban' => $this->opposingIban, + 'name' => $this->opposingName, + 'number' => $this->opposingNumber, + 'bic' => $this->opposingBic, + ]; + } + + /** + * Returns the mapped value if it exists in the ColumnValue object. + * + * @param ColumnValue $columnValue + * + * @return int + */ + private function getMappedValue(ColumnValue $columnValue): int + { + return $columnValue->getMappedValue() > 0 ? $columnValue->getMappedValue() : (int)$columnValue->getValue(); + } + + /** + * This methods decides which input value to use for the amount calculation. + * + * @return array + */ + private function selectAmountInput(): array + { + $info = []; + $converterClass = ''; + if (null !== $this->amount) { + Log::debug('Amount value is not NULL, assume this is the correct value.'); + $converterClass = Amount::class; + $info['amount'] = $this->amount; + } + if (null !== $this->amountDebit) { + Log::debug('Amount DEBIT value is not NULL, assume this is the correct value (overrules Amount).'); + $converterClass = AmountDebit::class; + $info['amount'] = $this->amountDebit; + } + if (null !== $this->amountCredit) { + Log::debug('Amount CREDIT value is not NULL, assume this is the correct value (overrules Amount and AmountDebit).'); + $converterClass = AmountCredit::class; + $info['amount'] = $this->amountCredit; + } + $info['class'] = $converterClass; + + return $info; + } + +} diff --git a/app/Support/Import/Routine/Bunq/StageImportDataHandler.php b/app/Support/Import/Routine/Bunq/StageImportDataHandler.php new file mode 100644 index 0000000000..24ec36257a --- /dev/null +++ b/app/Support/Import/Routine/Bunq/StageImportDataHandler.php @@ -0,0 +1,296 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\Routine\Bunq; + +use bunq\Model\Generated\Endpoint\Payment as BunqPayment; +use bunq\Model\Generated\Object\LabelMonetaryAccount; +use Carbon\Carbon; +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Factory\AccountFactory; +use FireflyIII\Models\Account as LocalAccount; +use FireflyIII\Models\AccountType; +use FireflyIII\Models\ImportJob; +use FireflyIII\Models\Preference; +use FireflyIII\Models\TransactionType; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Services\Bunq\ApiContext; +use FireflyIII\Services\Bunq\Payment; +use Log; + +/** + * Class StageImportDataHandler + */ +class StageImportDataHandler +{ + /** @var AccountFactory */ + private $accountFactory; + /** @var AccountRepositoryInterface */ + private $accountRepository; + /** @var ImportJob */ + private $importJob; + /** @var ImportJobRepositoryInterface */ + private $repository; + /** @var array */ + private $transactions; + + /** + * @codeCoverageIgnore + * @return array + */ + public function getTransactions(): array + { + return $this->transactions; + } + + /** + * + * @throws FireflyException + */ + public function run(): void + { + $this->getContext(); + $config = $this->repository->getConfiguration($this->importJob); + $accounts = $config['accounts'] ?? []; + $mapping = $config['mapping'] ?? []; + $collection = [[]]; + /** @var array $bunqAccount */ + foreach ($accounts as $bunqAccount) { + $bunqAccountId = $bunqAccount['id'] ?? 0; + $localId = $mapping[$bunqAccountId] ?? 0; + Log::debug(sprintf('Looping accounts, now at bunq account #%d and local account #%d', $bunqAccountId, $localId)); + if ($localId !== 0 && $bunqAccountId !== 0) { + $localAccount = $this->getLocalAccount((int)$localId); + $collection[] = $this->getTransactionsFromBunq($bunqAccountId, $localAccount); + } + } + $totalSet = array_merge(...$collection); + $this->transactions = $totalSet; + } + + /** + * @param ImportJob $importJob + * + * @return void + */ + public function setImportJob(ImportJob $importJob): void + { + $this->transactions = []; + $this->importJob = $importJob; + $this->repository = app(ImportJobRepositoryInterface::class); + $this->accountRepository = app(AccountRepositoryInterface::class); + $this->accountFactory = app(AccountFactory::class); + $this->repository->setUser($importJob->user); + $this->accountRepository->setUser($importJob->user); + $this->accountFactory->setUser($importJob->user); + } + + /** + * @param BunqPayment $payment + * @param LocalAccount $source + * + * @return array + */ + private function convertPayment(BunqPayment $payment, LocalAccount $source): array + { + Log::debug(sprintf('Now at payment with ID #%d', $payment->getId())); + $type = TransactionType::WITHDRAWAL; + $counterParty = $payment->getCounterpartyAlias(); + $amount = $payment->getAmount(); + $paymentId = $payment->getId(); + + Log::debug(sprintf('Amount is %s %s', $amount->getCurrency(), $amount->getValue())); + $expected = AccountType::EXPENSE; + if (bccomp($amount->getValue(), '0') === 1) { + // amount + means that its a deposit. + $expected = AccountType::REVENUE; + $type = TransactionType::DEPOSIT; + Log::debug('Will make opposing account revenue.'); + } + $destination = $this->convertToAccount($counterParty, $expected); + + // switch source and destination if necessary. + if (bccomp($amount->getValue(), '0') === 1) { + Log::debug('Will make it a deposit.'); + [$source, $destination] = [$destination, $source]; + } + + if ($source->accountType->type === AccountType::ASSET && $destination->accountType->type === AccountType::ASSET) { + $type = TransactionType::TRANSFER; + Log::debug('Both are assets, will make transfer.'); + } + $created = new Carbon($payment->getCreated()); + $storeData = [ + 'user' => $this->importJob->user_id, + 'type' => $type, + 'date' => $created->format('Y-m-d'), + 'description' => $payment->getDescription(), + 'piggy_bank_id' => null, + 'piggy_bank_name' => null, + 'bill_id' => null, + 'bill_name' => null, + 'tags' => [$payment->getType(), $payment->getSubType()], + 'internal_reference' => $paymentId, + 'external_id' => $paymentId, + 'notes' => null, + 'bunq_payment_id' => $paymentId, + 'transactions' => [ + // single transaction: + [ + 'description' => null, + 'amount' => $amount->getValue(), + 'currency_id' => null, + 'currency_code' => $amount->getCurrency(), + 'foreign_amount' => null, + 'foreign_currency_id' => null, + 'foreign_currency_code' => null, + 'budget_id' => null, + 'budget_name' => null, + 'category_id' => null, + 'category_name' => null, + 'source_id' => $source->id, + 'source_name' => null, + 'destination_id' => $destination->id, + 'destination_name' => null, + 'reconciled' => false, + 'identifier' => 0, + ], + ], + ]; + + return $storeData; + } + + /** + * @param LabelMonetaryAccount $party + * @param string $expectedType + * + * @return LocalAccount + */ + private function convertToAccount(LabelMonetaryAccount $party, string $expectedType): LocalAccount + { + Log::debug('in convertToAccount()'); + if ($party->getIban() !== null) { + // find opposing party by IBAN first. + $result = $this->accountRepository->findByIbanNull($party->getIban(), [$expectedType]); + if (null !== $result) { + Log::debug(sprintf('Search for %s resulted in account %s (#%d)', $party->getIban(), $result->name, $result->id)); + + return $result; + } + + // try to find asset account just in case: + if ($expectedType !== AccountType::ASSET) { + $result = $this->accountRepository->findByIbanNull($party->getIban(), [AccountType::ASSET]); + if (null !== $result) { + Log::debug(sprintf('Search for Asset "%s" resulted in account %s (#%d)', $party->getIban(), $result->name, $result->id)); + + return $result; + } + } + } + + // create new account: + $data = [ + 'user_id' => $this->importJob->user_id, + 'iban' => $party->getIban(), + 'name' => $party->getLabelUser()->getDisplayName(), + 'account_type_id' => null, + 'accountType' => $expectedType, + 'virtualBalance' => null, + 'active' => true, + ]; + $account = $this->accountFactory->create($data); + Log::debug( + sprintf( + 'Converted label monetary account %s to %s account %s (#%d)', + $party->getLabelUser()->getDisplayName(), + $expectedType, + $account->name, $account->id + ) + ); + + return $account; + } + + /** + * @throws FireflyException + */ + private function getContext(): void + { + /** @var Preference $preference */ + $preference = app('preferences')->getForUser($this->importJob->user, 'bunq_api_context', null); + if (null !== $preference && '' !== (string)$preference->data) { + // restore API context + /** @var ApiContext $apiContext */ + $apiContext = app(ApiContext::class); + $apiContext->fromJson($preference->data); + + return; + } + throw new FireflyException('The bunq API context is unexpectedly empty.'); // @codeCoverageIgnore + } + + /** + * @param int $accountId + * + * @return LocalAccount + * @throws FireflyException + */ + private function getLocalAccount(int $accountId): LocalAccount + { + $account = $this->accountRepository->findNull($accountId); + if (null === $account) { + throw new FireflyException(sprintf('Cannot find Firefly III asset account with ID #%d. Job must stop now.', $accountId)); // @codeCoverageIgnore + } + if ($account->accountType->type !== AccountType::ASSET) { + throw new FireflyException(sprintf('Account with ID #%d is not an asset account. Job must stop now.', $accountId)); // @codeCoverageIgnore + } + + return $account; + } + + /** + * @param int $bunqAccountId + * @param LocalAccount $localAccount + * + * @return array + * @throws FireflyException + */ + private function getTransactionsFromBunq(int $bunqAccountId, LocalAccount $localAccount): array + { + $return = []; + // make request: + /** @var Payment $paymentRequest */ + $paymentRequest = app(Payment::class); + $result = $paymentRequest->listing($bunqAccountId, ['count' => 100]); + // loop result: + /** @var BunqPayment $payment */ + foreach ($result->getValue() as $payment) { + $return[] = $this->convertPayment($payment, $localAccount); + } + + return $return; + } +} \ No newline at end of file diff --git a/app/Support/Import/Routine/Bunq/StageNewHandler.php b/app/Support/Import/Routine/Bunq/StageNewHandler.php new file mode 100644 index 0000000000..05f057337c --- /dev/null +++ b/app/Support/Import/Routine/Bunq/StageNewHandler.php @@ -0,0 +1,272 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\Routine\Bunq; + +use bunq\exception\BunqException; +use bunq\Model\Generated\Endpoint\MonetaryAccount as BunqMonetaryAccount; +use bunq\Model\Generated\Endpoint\MonetaryAccountBank; +use bunq\Model\Generated\Endpoint\MonetaryAccountJoint; +use bunq\Model\Generated\Endpoint\MonetaryAccountLight; +use bunq\Model\Generated\Object\CoOwner; +use bunq\Model\Generated\Object\Pointer; +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\ImportJob; +use FireflyIII\Models\Preference; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Services\Bunq\ApiContext; +use FireflyIII\Services\Bunq\MonetaryAccount; +use Log; + +/** + * Class StageNewHandler + */ +class StageNewHandler +{ + /** @var ImportJob */ + private $importJob; + /** @var ImportJobRepositoryInterface */ + private $repository; + + /** + * @throws FireflyException + */ + public function run(): void + { + /** @var Preference $preference */ + $preference = app('preferences')->getForUser($this->importJob->user, 'bunq_api_context', null); + if (null !== $preference && '' !== (string)$preference->data) { + // restore API context + /** @var ApiContext $apiContext */ + $apiContext = app(ApiContext::class); + $apiContext->fromJson($preference->data); + + // list bunq accounts: + $accounts = $this->listAccounts(); + + // store in job: + $config = $this->repository->getConfiguration($this->importJob); + $config['accounts'] = $accounts; + $this->repository->setConfiguration($this->importJob, $config); + + return; + } + throw new FireflyException('The bunq API context is unexpectedly empty.'); // @codeCoverageIgnore + } // @codeCoverageIgnore + + /** + * @param ImportJob $importJob + * + * @return void + */ + public function setImportJob(ImportJob $importJob): void + { + $this->importJob = $importJob; + $this->repository = app(ImportJobRepositoryInterface::class); + $this->repository->setUser($importJob->user); + } + + /** + * @return array + * @throws FireflyException + */ + private function listAccounts(): array + { + $accounts = []; + /** @var MonetaryAccount $lister */ + $lister = app(MonetaryAccount::class); + $result = $lister->listing(); + + /** @var BunqMonetaryAccount $monetaryAccount */ + foreach ($result->getValue() as $monetaryAccount) { + try { + $object = $monetaryAccount->getReferencedObject(); + // @codeCoverageIgnoreStart + } catch (BunqException $e) { + throw new FireflyException($e->getMessage()); + } + // @codeCoverageIgnoreEnd + if (null !== $object) { + $array = null; + switch (\get_class($object)) { + case MonetaryAccountBank::class: + /** @var MonetaryAccountBank $object */ + $array = $this->processMab($object); + break; + case MonetaryAccountJoint::class: + /** @var MonetaryAccountJoint $object */ + $array = $this->processMaj($object); + break; + case MonetaryAccountLight::class: + /** @var MonetaryAccountLight $object */ + $array = $this->processMal($object); + break; + default: + // @codeCoverageIgnoreStart + throw new FireflyException(sprintf('Bunq import routine cannot handle account of type "%s".', \get_class($object))); + // @codeCoverageIgnoreEnd + } + if (null !== $array) { + $accounts[] = $array; + } + } + } + + return $accounts; + } + + /** + * @param MonetaryAccountBank $mab + * + * @return array + */ + private function processMab(MonetaryAccountBank $mab): array + { + $setting = $mab->getSetting(); + $return = [ + 'id' => $mab->getId(), + 'currency_code' => $mab->getCurrency(), + 'description' => $mab->getDescription(), + 'balance' => $mab->getBalance(), + 'status' => $mab->getStatus(), + 'type' => 'MonetaryAccountBank', + 'aliases' => [], + ]; + + if (null !== $setting) { + $return['settings'] = [ + 'color' => $mab->getSetting()->getColor(), + 'default_avatar_status' => $mab->getSetting()->getDefaultAvatarStatus(), + 'restriction_chat' => $mab->getSetting()->getRestrictionChat(), + ]; + } + if (null !== $mab->getAlias()) { + /** @var Pointer $alias */ + foreach ($mab->getAlias() as $alias) { + $return['aliases'][] = [ + 'type' => $alias->getType(), + 'name' => $alias->getName(), + 'value' => $alias->getValue(), + ]; + } + } + + return $return; + } + + /** + * @param MonetaryAccountJoint $maj + * + * @return array + */ + private function processMaj(MonetaryAccountJoint $maj): array + { + Log::debug('Now processing a MAJ'); + $setting = $maj->getSetting(); + $return = [ + 'id' => $maj->getId(), + 'currency_code' => $maj->getCurrency(), + 'description' => $maj->getDescription(), + 'balance' => $maj->getBalance(), + 'status' => $maj->getStatus(), + 'type' => 'MonetaryAccountJoint', + 'co-owners' => [], + 'aliases' => [], + ]; + + if (null !== $setting) { + $return['settings'] = [ + 'color' => $maj->getSetting()->getColor(), + 'default_avatar_status' => $maj->getSetting()->getDefaultAvatarStatus(), + 'restriction_chat' => $maj->getSetting()->getRestrictionChat(), + ]; + Log::debug('Setting is not null.'); + } + if (null !== $maj->getAlias()) { + Log::debug(sprintf('Alias is not NULL. Count is %d', \count($maj->getAlias()))); + /** @var Pointer $alias */ + foreach ($maj->getAlias() as $alias) { + $return['aliases'][] = [ + 'type' => $alias->getType(), + 'name' => $alias->getName(), + 'value' => $alias->getValue(), + ]; + } + } + $coOwners = $maj->getAllCoOwner() ?? []; + Log::debug(sprintf('Count of getAllCoOwner is %d', \count($coOwners))); + /** @var CoOwner $coOwner */ + foreach ($coOwners as $coOwner) { + $alias = $coOwner->getAlias(); + if (null !== $alias) { + Log::debug('Alias is not NULL'); + $name = (string)$alias->getDisplayName(); + Log::debug(sprintf('Name is "%s"', $name)); + if ('' !== $name) { + $return['co-owners'][] = $name; + } + } + } + + return $return; + } + + /** + * @param MonetaryAccountLight $mal + * + * @return array + */ + private function processMal(MonetaryAccountLight $mal): array + { + $setting = $mal->getSetting(); + $return = [ + 'id' => $mal->getId(), + 'currency_code' => $mal->getCurrency(), + 'description' => $mal->getDescription(), + 'balance' => $mal->getBalance(), + 'status' => $mal->getStatus(), + 'type' => 'MonetaryAccountLight', + 'aliases' => [], + ]; + + if (null !== $setting) { + $return['settings'] = [ + 'color' => $mal->getSetting()->getColor(), + 'default_avatar_status' => $mal->getSetting()->getDefaultAvatarStatus(), + 'restriction_chat' => $mal->getSetting()->getRestrictionChat(), + ]; + } + if (null !== $mal->getAlias()) { + /** @var Pointer $alias */ + foreach ($mal->getAlias() as $alias) { + $return['aliases'][] = [ + 'type' => $alias->getType(), + 'name' => $alias->getName(), + 'value' => $alias->getValue(), + ]; + } + } + + return $return; + } +} \ No newline at end of file diff --git a/app/Services/Bunq/Id/DeviceServerId.php b/app/Support/Import/Routine/Fake/StageAhoyHandler.php similarity index 59% rename from app/Services/Bunq/Id/DeviceServerId.php rename to app/Support/Import/Routine/Fake/StageAhoyHandler.php index e5758ae8d2..8c4bb211c0 100644 --- a/app/Services/Bunq/Id/DeviceServerId.php +++ b/app/Support/Import/Routine/Fake/StageAhoyHandler.php @@ -1,8 +1,7 @@ . */ + declare(strict_types=1); -namespace FireflyIII\Services\Bunq\Id; +namespace FireflyIII\Support\Import\Routine\Fake; + +use FireflyIII\Exceptions\FireflyException; +use Log; /** - * Class DeviceServerId. + * @codeCoverageIgnore + * Class StageAhoyHandler */ -class DeviceServerId extends BunqId +class StageAhoyHandler { + /** + * @throws FireflyException + */ + public function run(): void + { + for ($i = 0; $i < 5; $i++) { + Log::debug(sprintf('Am now in stage AHOY hander, sleeping... (%d)', $i)); + sleep(1); + } + } + } diff --git a/app/Support/Import/Routine/Fake/StageFinalHandler.php b/app/Support/Import/Routine/Fake/StageFinalHandler.php new file mode 100644 index 0000000000..23d02676ca --- /dev/null +++ b/app/Support/Import/Routine/Fake/StageFinalHandler.php @@ -0,0 +1,147 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\Routine\Fake; + +use Carbon\Carbon; +use FireflyIII\Models\ImportJob; + +/** + * @codeCoverageIgnore + * Class StageFinalHandler + * + */ +class StageFinalHandler +{ + /** @var ImportJob */ + private $importJob; + + /** + * @return array + */ + public function getTransactions(): array + { + $transactions = []; + + for ($i = 0; $i < 5; $i++) { + $transaction = [ + 'type' => 'withdrawal', + 'date' => Carbon::create()->format('Y-m-d'), + 'tags' => '', + 'user' => $this->importJob->user_id, + + // all custom fields: + 'internal_reference' => null, + 'notes' => null, + + // journal data: + 'description' => 'Some random description #' . random_int(1, 10000), + 'piggy_bank_id' => null, + 'piggy_bank_name' => null, + 'bill_id' => null, + 'bill_name' => null, + + // transaction data: + 'transactions' => [ + [ + 'currency_id' => null, + 'currency_code' => 'EUR', + 'description' => null, + 'amount' => random_int(500, 5000) / 100, + 'budget_id' => null, + 'budget_name' => null, + 'category_id' => null, + 'category_name' => null, + 'source_id' => null, + 'source_name' => 'Checking Account', + 'destination_id' => null, + 'destination_name' => 'Random expense account #' . random_int(1, 10000), + 'foreign_currency_id' => null, + 'foreign_currency_code' => null, + 'foreign_amount' => null, + 'reconciled' => false, + 'identifier' => 0, + ], + ], + ]; + + $transactions[] = $transaction; + } + + // add a transfer I know exists already + $transactions[] = [ + 'type' => 'transfer', + 'date' => '2017-02-28', + 'tags' => '', + 'user' => $this->importJob->user_id, + + // all custom fields: + 'internal_reference' => null, + 'notes' => null, + + // journal data: + 'description' => 'Saving money for February', + 'piggy_bank_id' => null, + 'piggy_bank_name' => null, + 'bill_id' => null, + 'bill_name' => null, + + // transaction data: + 'transactions' => [ + [ + 'currency_id' => null, + 'currency_code' => 'EUR', + 'description' => null, + 'amount' => '140', + 'budget_id' => null, + 'budget_name' => null, + 'category_id' => null, + 'category_name' => null, + 'source_id' => 1, + 'source_name' => 'Checking Account', + 'destination_id' => 2, + 'destination_name' => null, + 'foreign_currency_id' => null, + 'foreign_currency_code' => null, + 'foreign_amount' => null, + 'reconciled' => false, + 'identifier' => 0, + ], + ], + ]; + + + return $transactions; + + } + + /** + * @param ImportJob $importJob + */ + public function setImportJob(ImportJob $importJob): void + { + $this->importJob = $importJob; + } + +} diff --git a/app/Services/Bunq/Token/SessionToken.php b/app/Support/Import/Routine/Fake/StageNewHandler.php similarity index 59% rename from app/Services/Bunq/Token/SessionToken.php rename to app/Support/Import/Routine/Fake/StageNewHandler.php index 46e9cf3e88..2c0f7cdd3c 100644 --- a/app/Services/Bunq/Token/SessionToken.php +++ b/app/Support/Import/Routine/Fake/StageNewHandler.php @@ -1,7 +1,7 @@ . */ + declare(strict_types=1); -namespace Bunq\Token; +namespace FireflyIII\Support\Import\Routine\Fake; -namespace FireflyIII\Services\Bunq\Token; +use FireflyIII\Exceptions\FireflyException; +use Log; /** - * Class SessionToken. + * @codeCoverageIgnore + * Class StageNewHandler */ -class SessionToken extends BunqToken +class StageNewHandler { + /** + * @throws FireflyException + */ + public function run(): void + { + for ($i = 0; $i < 5; $i++) { + Log::debug(sprintf('Am now in stage new hander, sleeping... (%d)', $i)); + sleep(1); + } + } + } diff --git a/app/Support/Import/Routine/File/AssetAccountMapper.php b/app/Support/Import/Routine/File/AssetAccountMapper.php new file mode 100644 index 0000000000..23851d531d --- /dev/null +++ b/app/Support/Import/Routine/File/AssetAccountMapper.php @@ -0,0 +1,121 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\Routine\File; + +use FireflyIII\Models\Account; +use FireflyIII\Models\AccountType; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\User; +use Log; + +/** + * Class AssetAccountMapper + */ +class AssetAccountMapper +{ + /** @var int */ + private $defaultAccount; + /** @var AccountRepositoryInterface */ + private $repository; + /** @var User */ + private $user; + + /** + * Based upon data in the importable, try to find or create the asset account account. + * + * @param int|null $accountId + * @param array $data + * + * @return Account + */ + public function map(?int $accountId, array $data): Account + { + Log::debug('Now in AssetAccountMapper::map()'); + if ((int)$accountId > 0) { + // find asset account with this ID: + $result = $this->repository->findNull($accountId); + if (null !== $result && $result->accountType->type === AccountType::ASSET) { + Log::debug(sprintf('Found asset account "%s" based on given ID %d', $result->name, $accountId)); + + return $result; + } + if (null !== $result && $result->accountType->type !== AccountType::ASSET) { + Log::warning( + sprintf('Found account "%s" based on given ID %d but its a %s, return nothing.', $result->name, $accountId, $result->accountType->type) + ); + } + } + // find by (respectively): + // IBAN, accountNumber, name, + $fields = ['iban' => 'findByIbanNull', 'number' => 'findByAccountNumber', 'name' => 'findByName']; + foreach ($fields as $field => $function) { + $value = (string)($data[$field] ?? ''); + if ('' === $value) { + Log::debug(sprintf('Array does not contain a value for %s. Continue', $field)); + continue; + } + $result = $this->repository->$function($value, [AccountType::ASSET]); + Log::debug(sprintf('Going to run %s() with argument "%s" (asset account)', $function, $value)); + if (null !== $result) { + Log::debug(sprintf('Found asset account "%s". Return it!', $result->name)); + + return $result; + } + } + Log::debug('Found nothing. Will return default account.'); + // still NULL? Return default account. + $default = null; + if ($this->defaultAccount > 0) { + $default = $this->repository->findNull($this->defaultAccount); + } + if (null === $default) { + Log::debug('Default account is NULL! Simply result first account in system.'); + $default = $this->repository->getAccountsByType([AccountType::ASSET])->first(); + } + + Log::debug(sprintf('Return default account "%s" (#%d). Return it!', $default->name, $default->id)); + + return $default; + } + + /** + * @param int $defaultAccount + */ + public function setDefaultAccount(int $defaultAccount): void + { + $this->defaultAccount = $defaultAccount; + } + + /** + * @param User $user + */ + public function setUser(User $user): void + { + $this->user = $user; + $this->repository = app(AccountRepositoryInterface::class); + $this->defaultAccount = 0; + $this->repository->setUser($user); + + } +} \ No newline at end of file diff --git a/app/Support/Import/Routine/File/CSVProcessor.php b/app/Support/Import/Routine/File/CSVProcessor.php new file mode 100644 index 0000000000..0d338f0fb4 --- /dev/null +++ b/app/Support/Import/Routine/File/CSVProcessor.php @@ -0,0 +1,90 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\Routine\File; + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\ImportJob; +use Log; + + +/** + * Class CSVProcessor + * + */ +class CSVProcessor implements FileProcessorInterface +{ + /** @var ImportJob */ + private $importJob; + + /** + * Fires the file processor. + * + * @return array + * @throws FireflyException + */ + public function run(): array + { + Log::debug('Now in CSVProcessor() run'); + + // create separate objects to handle separate tasks: + /** @var LineReader $lineReader */ + $lineReader = app(LineReader::class); + $lineReader->setImportJob($this->importJob); + $lines = $lineReader->getLines(); + + // convert each line into a small set of "ColumnValue" objects, + // joining each with its mapped counterpart. + /** @var MappingConverger $mappingConverger */ + $mappingConverger = app(MappingConverger::class); + $mappingConverger->setImportJob($this->importJob); + $converged = $mappingConverger->converge($lines); + + // validate mapped values: + /** @var MappedValuesValidator $validator */ + $validator = app(MappedValuesValidator::class); + $validator->setImportJob($this->importJob); + $mappedValues = $validator->validate($mappingConverger->getMappedValues()); + + // make import transaction things from these objects. + /** @var ImportableCreator $creator */ + $creator = app(ImportableCreator::class); + $importables = $creator->convertSets($converged); + + /** @var ImportableConverter $converter */ + $converter = app(ImportableConverter::class); + $converter->setImportJob($this->importJob); + $converter->setMappedValues($mappedValues); + + return $converter->convert($importables); + } + + /** + * @param ImportJob $importJob + */ + public function setImportJob(ImportJob $importJob): void + { + Log::debug('Now in setImportJob()'); + $this->importJob = $importJob; + } +} diff --git a/app/Support/Import/Routine/File/CurrencyMapper.php b/app/Support/Import/Routine/File/CurrencyMapper.php new file mode 100644 index 0000000000..2dd366d4d6 --- /dev/null +++ b/app/Support/Import/Routine/File/CurrencyMapper.php @@ -0,0 +1,97 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\Routine\File; + +use FireflyIII\Models\TransactionCurrency; +use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; +use FireflyIII\User; +use Log; + +/** + * Class CurrencyMapper + */ +class CurrencyMapper +{ + /** @var CurrencyRepositoryInterface */ + private $repository; + /** @var User */ + private $user; + + /** + * @param int|null $currencyId + * @param array $data + * + * @return TransactionCurrency|null + */ + public function map(?int $currencyId, array $data): ?TransactionCurrency + { + Log::debug('Now in CurrencyMapper::map()'); + if ((int)$currencyId > 0) { + $result = $this->repository->findNull($currencyId); + if (null !== $result) { + Log::debug(sprintf('Found currency %s based on ID, return it.', $result->code)); + + return $result; + } + } + // try to find it by all other fields. + $fields = ['code' => 'findByCodeNull', 'symbol' => 'findBySymbolNull', 'name' => 'findByNameNull']; + foreach ($fields as $field => $function) { + $value = (string)($data[$field] ?? ''); + if ('' === $value) { + Log::debug(sprintf('Array does not contain a value for %s. Continue', $field)); + continue; + } + Log::debug(sprintf('Will search for currency using %s() and argument "%s".', $function, $value)); + $result = $this->repository->$function($value); + if (null !== $result) { + Log::debug(sprintf('Found result: Currency #%d, code "%s"', $result->id, $result->code)); + + return $result; + } + } + // if still nothing, and fields not null, try to create it + $code = $data['code'] ?? null; + $creation = [ + 'code' => $code, + 'name' => $data['name'] ?? $code, + 'symbol' => $data['symbol'] ?? $code, + 'decimal_places' => 2, + ]; + + // could be NULL + return $this->repository->store($creation); + } + + /** + * @param User $user + */ + public function setUser(User $user): void + { + $this->user = $user; + $this->repository = app(CurrencyRepositoryInterface::class); + $this->repository->setUser($user); + } + +} \ No newline at end of file diff --git a/app/Services/Bunq/Object/NotificationFilter.php b/app/Support/Import/Routine/File/FileProcessorInterface.php similarity index 65% rename from app/Services/Bunq/Object/NotificationFilter.php rename to app/Support/Import/Routine/File/FileProcessorInterface.php index f6fe9bd3a1..c361dd9a44 100644 --- a/app/Services/Bunq/Object/NotificationFilter.php +++ b/app/Support/Import/Routine/File/FileProcessorInterface.php @@ -1,7 +1,7 @@ . */ + declare(strict_types=1); -namespace FireflyIII\Services\Bunq\Object; +namespace FireflyIII\Support\Import\Routine\File; +use FireflyIII\Models\ImportJob; + /** - * Class NotificationFilter. + * Interface FileProcessorInterface + * */ -class NotificationFilter extends BunqObject +interface FileProcessorInterface { + /** - * NotificationFilter constructor. + * Fires the file processor. * - * @param array $data - */ - public function __construct(array $data) - { - - } - - /** * @return array */ - public function toArray(): array - { - return []; - } + public function run(): array; + + /** + * Set values. + * + * @param ImportJob $importJob + */ + public function setImportJob(ImportJob $importJob): void; } diff --git a/app/Support/Import/Routine/File/ImportableConverter.php b/app/Support/Import/Routine/File/ImportableConverter.php new file mode 100644 index 0000000000..5084f24743 --- /dev/null +++ b/app/Support/Import/Routine/File/ImportableConverter.php @@ -0,0 +1,290 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\Routine\File; + +use Carbon\Carbon; +use Carbon\Exceptions\InvalidDateException; +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\AccountType; +use FireflyIII\Models\ImportJob; +use FireflyIII\Models\TransactionCurrency; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Support\Import\Placeholder\ImportTransaction; +use InvalidArgumentException; +use Log; + +/** + * Class ImportableConverter + */ +class ImportableConverter +{ + /** @var AssetAccountMapper */ + private $assetMapper; + /** @var array */ + private $config; + /** @var CurrencyMapper */ + private $currencyMapper; + /** @var TransactionCurrency */ + private $defaultCurrency; + /** @var ImportJob */ + private $importJob; + /** @var array */ + private $mappedValues; + /** @var OpposingAccountMapper */ + private $opposingMapper; + /** @var ImportJobRepositoryInterface */ + private $repository; + + /** + * Convert ImportTransaction to factory-compatible array. + * + * @param array $importables + * + * @return array + */ + public function convert(array $importables): array + { + $total = \count($importables); + Log::debug(sprintf('Going to convert %d import transactions', $total)); + $result = []; + /** @var ImportTransaction $importable */ + foreach ($importables as $index => $importable) { + Log::debug(sprintf('Now going to parse importable %d of %d', $index + 1, $total)); + try { + $entry = $this->convertSingle($importable); + } catch (FireflyException $e) { + $this->repository->addErrorMessage($this->importJob, sprintf('Row #%d: %s', $index + 1, $e->getMessage())); + continue; + } + if (null !== $entry) { + $result[] = $entry; + } + } + + return $result; + } + + /** + * @param ImportJob $importJob + */ + public function setImportJob(ImportJob $importJob): void + { + $this->importJob = $importJob; + $this->config = $importJob->configuration; + + // repository is used for error messages + $this->repository = app(ImportJobRepositoryInterface::class); + $this->repository->setUser($importJob->user); + + // asset account mapper can map asset accounts (makes sense right?) + $this->assetMapper = app(AssetAccountMapper::class); + $this->assetMapper->setUser($importJob->user); + $this->assetMapper->setDefaultAccount($this->config['import-account'] ?? 0); + + // opposing account mapper: + $this->opposingMapper = app(OpposingAccountMapper::class); + $this->opposingMapper->setUser($importJob->user); + + // currency mapper: + $this->currencyMapper = app(CurrencyMapper::class); + $this->currencyMapper->setUser($importJob->user); + $this->defaultCurrency = app('amount')->getDefaultCurrencyByUser($importJob->user); + } + + /** + * @codeCoverageIgnore + * + * @param array $mappedValues + */ + public function setMappedValues(array $mappedValues): void + { + $this->mappedValues = $mappedValues; + } + + /** + * @param ImportTransaction $importable + * + * @throws FireflyException + * @return array + */ + private function convertSingle(ImportTransaction $importable): array + { + Log::debug(sprintf('Description is: "%s"', $importable->description)); + $amount = $importable->calculateAmount(); + $foreignAmount = $importable->calculateForeignAmount(); + if ('' === $amount) { + $amount = $foreignAmount; + } + if ('' === $amount) { + throw new FireflyException('No transaction amount information.'); + } + + $transactionType = 'unknown'; + $accountId = $this->verifyObjectId('account-id', $importable->accountId); + $billId = $this->verifyObjectId('bill-id', $importable->billId); + $budgetId = $this->verifyObjectId('budget-id', $importable->budgetId); + $currencyId = $this->verifyObjectId('currency-id', $importable->currencyId); + $categoryId = $this->verifyObjectId('category-id', $importable->categoryId); + $foreignCurrencyId = $this->verifyObjectId('foreign-currency-id', $importable->foreignCurrencyId); + $opposingId = $this->verifyObjectId('opposing-id', $importable->opposingId); + + $source = $this->assetMapper->map($accountId, $importable->getAccountData()); + $destination = $this->opposingMapper->map($opposingId, $amount, $importable->getOpposingAccountData()); + $currency = $this->currencyMapper->map($currencyId, $importable->getCurrencyData()); + $foreignCurrency = $this->currencyMapper->map($foreignCurrencyId, $importable->getForeignCurrencyData()); + + if (null === $currency) { + Log::debug(sprintf('Could not map currency, use default (%s)', $this->defaultCurrency->code)); + $currency = $this->defaultCurrency; + } + Log::debug(sprintf('"%s" (#%d) is source and "%s" (#%d) is destination.', $source->name, $source->id, $destination->name, $destination->id)); + + if (bccomp($amount, '0') === 1) { + // amount is positive? Then switch: + [$destination, $source] = [$source, $destination]; + Log::debug( + sprintf( + '%s is positive, so "%s" (#%d) is now source and "%s" (#%d) is now destination.', + $amount, $source->name, $source->id, $destination->name, $destination->id + ) + ); + } + + if ($source->accountType->type === AccountType::ASSET && $destination->accountType->type === AccountType::ASSET) { + Log::debug('Source and destination are asset accounts. This is a transfer.'); + $transactionType = 'transfer'; + } + if ($source->accountType->type === AccountType::REVENUE) { + Log::debug('Source is a revenue account. This is a deposit.'); + $transactionType = 'deposit'; + } + if ($destination->accountType->type === AccountType::EXPENSE) { + Log::debug('Destination is an expense account. This is a withdrawal.'); + $transactionType = 'withdrawal'; + } + if ($destination->id === $source->id) { + throw new FireflyException( + sprintf( + 'Source ("%s", #%d) and destination ("%s", #%d) are the same account.', $source->name, $source->id, $destination->name, $destination->id + ) + ); + } + + if ($transactionType === 'unknown') { + $message = sprintf( + 'Cannot determine transaction type. Source account is a %s, destination is a %s', $source->accountType->type, $destination->accountType->type + ); + Log::error($message, ['source' => $source->toArray(), 'dest' => $destination->toArray()]); + throw new FireflyException($message); + } + + // throw error when both are he same + + try { + $date = Carbon::createFromFormat($this->config['date-format'] ?? 'Ymd', $importable->date); + } catch (InvalidDateException|InvalidArgumentException $e) { + Log::error($e->getMessage()); + Log::error($e->getTraceAsString()); + $date = new Carbon; + } + + + $dateStr = $date->format('Y-m-d'); + + return [ + 'type' => $transactionType, + 'date' => $dateStr, + 'tags' => $importable->tags, + 'user' => $this->importJob->user_id, + 'notes' => $importable->note, + + // all custom fields: + 'internal_reference' => $importable->meta['internal-reference'] ?? null, + 'sepa-cc' => $importable->meta['sepa-cc'] ?? null, + 'sepa-ct-op' => $importable->meta['sepa-ct-op'] ?? null, + 'sepa-ct-id' => $importable->meta['sepa-ct-id'] ?? null, + 'sepa-db' => $importable->meta['sepa-db'] ?? null, + 'sepa-country' => $importable->meta['sepa-countru'] ?? null, + 'sepa-ep' => $importable->meta['sepa-ep'] ?? null, + 'sepa-ci' => $importable->meta['sepa-ci'] ?? null, + 'interest_date' => $importable->meta['date-interest'] ?? null, + 'book_date' => $importable->meta['date-book'] ?? null, + 'process_date' => $importable->meta['date-process'] ?? null, + 'due_date' => $importable->meta['date-due'] ?? null, + 'payment_date' => $importable->meta['date-payment'] ?? null, + 'invoice_date' => $importable->meta['date-invoice'] ?? null, + 'external_id' => $importable->externalId, + + // journal data: + 'description' => $importable->description, + 'piggy_bank_id' => null, + 'piggy_bank_name' => null, + 'bill_id' => $billId, + 'bill_name' => null === $billId ? $importable->billName : null, + + // transaction data: + 'transactions' => [ + [ + 'currency_id' => $currency->id, + 'currency_code' => null, + 'description' => null, + 'amount' => $amount, + 'budget_id' => $budgetId, + 'budget_name' => null === $budgetId ? $importable->budgetName : null, + 'category_id' => $categoryId, + 'category_name' => null === $categoryId ? $importable->categoryName : null, + 'source_id' => $source->id, + 'source_name' => null, + 'destination_id' => $destination->id, + 'destination_name' => null, + 'foreign_currency_id' => $foreignCurrencyId, + 'foreign_currency_code' => null === $foreignCurrency ? null : $foreignCurrency->code, + 'foreign_amount' => $foreignAmount, + 'reconciled' => false, + 'identifier' => 0, + ], + ], + ]; + } + + /** + * A small function that verifies if this particular key (ID) is present in the list + * of valid keys. + * + * @param string $key + * @param int $objectId + * + * @return int|null + */ + private function verifyObjectId(string $key, int $objectId): ?int + { + if (isset($this->mappedValues[$key]) && \in_array($objectId, $this->mappedValues[$key], true)) { + return $objectId; + } + + return null; + } + + +} \ No newline at end of file diff --git a/app/Support/Import/Routine/File/ImportableCreator.php b/app/Support/Import/Routine/File/ImportableCreator.php new file mode 100644 index 0000000000..9a4310a6f0 --- /dev/null +++ b/app/Support/Import/Routine/File/ImportableCreator.php @@ -0,0 +1,72 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\Routine\File; + +use FireflyIII\Support\Import\Placeholder\ColumnValue; +use FireflyIII\Support\Import\Placeholder\ImportTransaction; + +/** + * Takes an array of arrays of ColumnValue objects and returns one (1) ImportTransaction + * for each line. + * + * @codeCoverageIgnore + * + * Class ImportableCreator + */ +class ImportableCreator +{ + /** + * @param array $sets + * + * @return array + * @throws \FireflyIII\Exceptions\FireflyException + */ + public function convertSets(array $sets): array + { + $return = []; + foreach ($sets as $set) { + $return[] = $this->convertSet($set); + } + + return $return; + } + + /** + * @param array $set + * + * @return ImportTransaction + * @throws \FireflyIII\Exceptions\FireflyException + */ + private function convertSet(array $set): ImportTransaction + { + $transaction = new ImportTransaction; + /** @var ColumnValue $entry */ + foreach ($set as $entry) { + $transaction->addColumnValue($entry); + } + + return $transaction; + } + +} \ No newline at end of file diff --git a/app/Support/Import/Routine/File/LineReader.php b/app/Support/Import/Routine/File/LineReader.php new file mode 100644 index 0000000000..36744c5d38 --- /dev/null +++ b/app/Support/Import/Routine/File/LineReader.php @@ -0,0 +1,173 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\Routine\File; + +use Exception; +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; +use FireflyIII\Import\Specifics\SpecificInterface; +use FireflyIII\Models\Attachment; +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use League\Csv\Reader; +use League\Csv\Statement; +use Log; + +/** + * Class LineReader + */ +class LineReader +{ + /** @var AttachmentHelperInterface */ + private $attachments; + /** @var ImportJob */ + private $importJob; + /** @var ImportJobRepositoryInterface */ + private $repository; + + /** + * Grab all lines from the import job. + * + * @return array + * @throws FireflyException + */ + public function getLines(): array + { + try { + $reader = $this->getReader(); + // @codeCoverageIgnoreStart + } catch (Exception $e) { + Log::error($e->getMessage()); + throw new FireflyException('Cannot get reader: ' . $e->getMessage()); + } + // @codeCoverageIgnoreEnd + // get all lines from file: + $lines = $this->getAllLines($reader); + + // apply specifics and return. + return $this->applySpecifics($lines); + } + + /** + * @param ImportJob $importJob + */ + public function setImportJob(ImportJob $importJob): void + { + $this->importJob = $importJob; + $this->repository = app(ImportJobRepositoryInterface::class); + $this->attachments = app(AttachmentHelperInterface::class); + $this->repository->setUser($importJob->user); + } + + /** + * @param array $lines + * + * @return array + */ + private function applySpecifics(array $lines): array + { + $config = $this->importJob->configuration; + $validSpecifics = array_keys(config('csv.import_specifics')); + $specifics = $config['specifics'] ?? []; + $names = array_keys($specifics); + $toApply = []; + foreach ($names as $name) { + if (!\in_array($name, $validSpecifics, true)) { + continue; + } + $class = config(sprintf('csv.import_specifics.%s', $name)); + $toApply[] = app($class); + } + $return = []; + /** @var array $line */ + foreach ($lines as $line) { + /** @var SpecificInterface $specific */ + foreach ($toApply as $specific) { + $line = $specific->run($line); + } + $return[] = $line; + } + + return $return; + } + + /** + * @param Reader $reader + * + * @return array + * @throws FireflyException + */ + private function getAllLines(Reader $reader): array + { + /** @var array $config */ + $config = $this->importJob->configuration; + Log::debug('now in getLines()'); + $offset = isset($config['has-headers']) && $config['has-headers'] === true ? 1 : 0; + try { + $stmt = (new Statement)->offset($offset); + // @codeCoverageIgnoreStart + } catch (Exception $e) { + throw new FireflyException(sprintf('Could not execute statement: %s', $e->getMessage())); + } + // @codeCoverageIgnoreEnd + $results = $stmt->process($reader); + $lines = []; + foreach ($results as $line) { + $lines[] = array_values($line); + } + + return $lines; + } + + /** + * @return Reader + * @throws FireflyException + */ + private function getReader(): Reader + { + Log::debug('Now in getReader()'); + $content = ''; + $collection = $this->repository->getAttachments($this->importJob); + /** @var Attachment $attachment */ + foreach ($collection as $attachment) { + if ($attachment->filename === 'import_file') { + $content = $this->attachments->getAttachmentContent($attachment); + break; + } + } + $config = $this->repository->getConfiguration($this->importJob); + $reader = Reader::createFromString($content); + try { + $reader->setDelimiter($config['delimiter'] ?? ','); + // @codeCoverageIgnoreStart + } catch (\League\Csv\Exception $e) { + throw new FireflyException(sprintf('Cannot set delimiter: %s', $e->getMessage())); + } + // @codeCoverageIgnoreEnd + + return $reader; + } + + +} \ No newline at end of file diff --git a/app/Support/Import/Routine/File/MappedValuesValidator.php b/app/Support/Import/Routine/File/MappedValuesValidator.php new file mode 100644 index 0000000000..8526b2b1f7 --- /dev/null +++ b/app/Support/Import/Routine/File/MappedValuesValidator.php @@ -0,0 +1,128 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\Routine\File; + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Bill\BillRepositoryInterface; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; +use FireflyIII\Repositories\Category\CategoryRepositoryInterface; +use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use Log; + +/** + * Class MappedValuesValidator + */ +class MappedValuesValidator +{ + /** @var AccountRepositoryInterface */ + private $accountRepos; + /** @var BillRepositoryInterface */ + private $billRepos; + /** @var BudgetRepositoryInterface */ + private $budgetRepos; + /** @var CategoryRepositoryInterface */ + private $catRepos; + /** @var CurrencyRepositoryInterface */ + private $currencyRepos; + /** @var ImportJob */ + private $importJob; + /** @var ImportJobRepositoryInterface */ + private $repository; + + /** + * @param ImportJob $importJob + */ + public function setImportJob(ImportJob $importJob): void + { + $this->importJob = $importJob; + + $this->repository = app(ImportJobRepositoryInterface::class); + $this->accountRepos = app(AccountRepositoryInterface::class); + $this->currencyRepos = app(CurrencyRepositoryInterface::class); + $this->billRepos = app(BillRepositoryInterface::class); + $this->budgetRepos = app(BudgetRepositoryInterface::class); + $this->catRepos = app(CategoryRepositoryInterface::class); + + $this->repository->setUser($importJob->user); + $this->accountRepos->setUser($importJob->user); + $this->currencyRepos->setUser($importJob->user); + $this->billRepos->setUser($importJob->user); + $this->budgetRepos->setUser($importJob->user); + $this->catRepos->setUser($importJob->user); + } + + + /** + * @param array $mappings + * + * @return array + * @throws FireflyException + */ + public function validate(array $mappings): array + { + $return = []; + Log::debug('Now in validateMappedValues()'); + foreach ($mappings as $role => $values) { + $values = array_unique($values); + if (\count($values) > 0) { + switch ($role) { + default: + throw new FireflyException(sprintf('Cannot validate mapped values for role "%s"', $role)); // @codeCoverageIgnore + case 'opposing-id': + case 'account-id': + $set = $this->accountRepos->getAccountsById($values); + $valid = $set->pluck('id')->toArray(); + $return[$role] = $valid; + break; + case 'currency-id': + case 'foreign-currency-id': + $set = $this->currencyRepos->getByIds($values); + $valid = $set->pluck('id')->toArray(); + $return[$role] = $valid; + break; + case 'bill-id': + $set = $this->billRepos->getByIds($values); + $valid = $set->pluck('id')->toArray(); + $return[$role] = $valid; + break; + case 'budget-id': + $set = $this->budgetRepos->getByIds($values); + $valid = $set->pluck('id')->toArray(); + $return[$role] = $valid; + break; + case 'category-id': + $set = $this->catRepos->getByIds($values); + $valid = $set->pluck('id')->toArray(); + $return[$role] = $valid; + break; + } + } + } + + return $return; + } +} \ No newline at end of file diff --git a/app/Support/Import/Routine/File/MappingConverger.php b/app/Support/Import/Routine/File/MappingConverger.php new file mode 100644 index 0000000000..08fd612526 --- /dev/null +++ b/app/Support/Import/Routine/File/MappingConverger.php @@ -0,0 +1,214 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\Routine\File; + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Support\Import\Placeholder\ColumnValue; +use Log; + +/** + * Class MappingConverger + */ +class MappingConverger +{ + /** @var array */ + private $doMapping; + /** @var ImportJob */ + private $importJob; + /** @var array */ + private $mappedValues; + /** @var array */ + private $mapping; + /** @var ImportJobRepositoryInterface */ + private $repository; + /** @var array */ + private $roles; + + /** + * Each cell in the CSV file could be linked to a mapped value. This depends on the role of + * the column and the content of the cell. This method goes over all cells, and using their + * associated role, will see if it has been linked to a mapped value. These mapped values + * are all IDs of objects in the Firefly III database. + * + * If such a mapping exists the role of the cell changes to whatever the mapped value is. + * + * Examples: + * + * - Cell with content "Checking Account" and role "account-name". Mapping links "Checking Account" to account-id 2. + * - Cell with content "Checking Account" and role "description". No mapping, so value and role remains the same. + * + * @param array $lines + * + * @return array + * @throws FireflyException + */ + public function converge(array $lines): array + { + Log::debug('Start converging process.'); + $collection = []; + $total = \count($lines); + /** @var array $line */ + foreach ($lines as $lineIndex => $line) { + Log::debug(sprintf('Now converging line %d out of %d.', $lineIndex + 1, $total)); + $set = $this->processLine($line); + $collection[] = $set; + } + + return $collection; + + } + + /** + * @codeCoverageIgnore + * @return array + */ + public function getMappedValues(): array + { + return $this->mappedValues; + } + + /** + * @param ImportJob $importJob + */ + public function setImportJob(ImportJob $importJob): void + { + $this->importJob = $importJob; + $this->repository = app(ImportJobRepositoryInterface::class); + $this->repository->setUser($importJob->user); + $this->mappedValues = []; + $config = $importJob->configuration; + $this->roles = $config['column-roles'] ?? []; + $this->mapping = $config['column-mapping-config'] ?? []; + $this->doMapping = $config['column-do-mapping'] ?? []; + } + + /** + * If the value in the column is mapped to a certain ID, + * the column where this ID must be placed will change. + * + * For example, if you map role "budget-name" with value "groceries" to 1, + * then that should become the budget-id. Not the name. + * + * @param int $column + * @param int $mapped + * + * @return string + * @throws FireflyException + */ + private function getRoleForColumn(int $column, int $mapped): string + { + $role = $this->roles[$column] ?? '_ignore'; + if ($mapped === 0) { + Log::debug(sprintf('Column #%d with role "%s" is not mapped.', $column, $role)); + + return $role; + } + if (!(isset($this->doMapping[$column]) && $this->doMapping[$column] === true)) { + + return $role; + } + switch ($role) { + default: + throw new FireflyException(sprintf('Cannot indicate new role for mapped role "%s"', $role)); // @codeCoverageIgnore + case 'account-id': + case 'account-name': + case 'account-iban': + case 'account-number': + $newRole = 'account-id'; + break; + case 'bill-id': + case 'bill-name': + $newRole = 'bill-id'; + break; + case 'budget-id': + case 'budget-name': + $newRole = 'budget-id'; + break; + case 'currency-id': + case 'currency-name': + case 'currency-code': + case 'currency-symbol': + $newRole = 'currency-id'; + break; + case 'category-id': + case 'category-name': + $newRole = 'category-id'; + break; + case 'foreign-currency-id': + case 'foreign-currency-code': + $newRole = 'foreign-currency-id'; + break; + case 'opposing-id': + case 'opposing-name': + case 'opposing-iban': + case 'opposing-number': + $newRole = 'opposing-id'; + break; + } + Log::debug(sprintf('Role was "%s", but because of mapping (mapped to #%d), role becomes "%s"', $role, $mapped, $newRole)); + + // also store the $mapped values in a "mappedValues" array. + $this->mappedValues[$newRole][] = $mapped; + + return $newRole; + } + + /** + * @param array $line + * + * @return array + * @throws FireflyException + */ + private function processLine(array $line): array + { + $return = []; + foreach ($line as $columnIndex => $value) { + $value = trim($value); + $originalRole = $this->roles[$columnIndex] ?? '_ignore'; + Log::debug(sprintf('Now at column #%d (%s), value "%s"', $columnIndex, $originalRole, $value)); + if ($originalRole !== '_ignore' && \strlen($value) > 0) { + + // is a mapped value present? + $mapped = $this->mapping[$columnIndex][$value] ?? 0; + // the role might change. + $role = $this->getRoleForColumn($columnIndex, $mapped); + + $columnValue = new ColumnValue; + $columnValue->setValue($value); + $columnValue->setRole($role); + $columnValue->setMappedValue($mapped); + $columnValue->setOriginalRole($originalRole); + $return[] = $columnValue; + } + if ('' === $value) { + Log::debug('Column skipped because value is empty.'); + } + } + + return $return; + } + +} \ No newline at end of file diff --git a/app/Support/Import/Routine/File/OpposingAccountMapper.php b/app/Support/Import/Routine/File/OpposingAccountMapper.php new file mode 100644 index 0000000000..2ba07bf2ef --- /dev/null +++ b/app/Support/Import/Routine/File/OpposingAccountMapper.php @@ -0,0 +1,137 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\Routine\File; + +use FireflyIII\Models\Account; +use FireflyIII\Models\AccountType; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\User; +use Log; + +/** + * Class OpposingAccountMapper + */ +class OpposingAccountMapper +{ + /** @var AccountRepositoryInterface */ + private $repository; + /** @var User */ + private $user; + + /** + * @param int|null $accountId + * @param string $amount + * @param array $data + * + * @return Account + */ + public function map(?int $accountId, string $amount, array $data): Account + { + Log::debug('Now in OpposingAccountMapper::map()'); + // default assumption is we're looking for an expense account. + $expectedType = AccountType::EXPENSE; + $result = null; + Log::debug(sprintf('Going to search for accounts of type %s', $expectedType)); + if (bccomp($amount, '0') === 1) { + // more than zero. + $expectedType = AccountType::REVENUE; + Log::debug(sprintf('Because amount is %s, will instead search for accounts of type %s', $amount, $expectedType)); + } + + if ((int)$accountId > 0) { + // find any account with this ID: + $result = $this->repository->findNull($accountId); + if (null !== $result && ($result->accountType->type === $expectedType || $result->accountType->type === AccountType::ASSET)) { + Log::debug(sprintf('Found account "%s" (%s) based on given ID %d. Return it!', $result->name, $result->accountType->type, $accountId)); + + return $result; + } + if (null !== $result && $result->accountType->type !== $expectedType) { + Log::warning( + sprintf( + 'Found account "%s" (%s) based on given ID %d, but need a %s. Return nothing.', $result->name, $result->accountType->type, $accountId, + $expectedType + ) + ); + } + } + // if result is not null, system has found an account + // but it's of the wrong type. If we dont have a name, use + // the result's name, iban in the search below. + if (null !== $result && '' === (string)($data['name'] ?? '')) { + Log::debug(sprintf('Will search for account with name "%s" instead of NULL.', $result->name)); + $data['name'] = $result->name; + } + if (null !== $result && '' !== (string)$result->iban && '' === ($data['iban'] ?? '')) { + Log::debug(sprintf('Will search for account with IBAN "%s" instead of NULL.', $result->iban)); + $data['iban'] = $result->iban; + } + + // first search for $expectedType, then find asset: + $searchTypes = [$expectedType, AccountType::ASSET]; + foreach ($searchTypes as $type) { + // find by (respectively): + // IBAN, accountNumber, name, + $fields = ['iban' => 'findByIbanNull', 'number' => 'findByAccountNumber', 'name' => 'findByName']; + foreach ($fields as $field => $function) { + $value = (string)($data[$field] ?? ''); + if ('' === $value) { + Log::debug(sprintf('Array does not contain a value for %s. Continue', $field)); + continue; + } + Log::debug(sprintf('Will search for account of type "%s" using %s() and argument "%s".', $type, $function, $value)); + $result = $this->repository->$function($value, [$type]); + if (null !== $result) { + Log::debug(sprintf('Found result: Account #%d, named "%s"', $result->id, $result->name)); + + return $result; + } + } + } + // not found? Create it! + $creation = [ + 'name' => $data['name'] ?? '(no name)', + 'iban' => $data['iban'] ?? null, + 'accountNumber' => $data['number'] ?? null, + 'account_type_id' => null, + 'accountType' => $expectedType, + 'active' => true, + 'BIC' => $data['bic'] ?? null, + ]; + Log::debug('Will try to store a new account: ', $creation); + + return $this->repository->store($creation); + } + + /** + * @param User $user + */ + public function setUser(User $user): void + { + $this->user = $user; + $this->repository = app(AccountRepositoryInterface::class); + $this->repository->setUser($user); + + } +} \ No newline at end of file diff --git a/app/Support/Import/Routine/Spectre/StageAuthenticatedHandler.php b/app/Support/Import/Routine/Spectre/StageAuthenticatedHandler.php new file mode 100644 index 0000000000..49bd98579e --- /dev/null +++ b/app/Support/Import/Routine/Spectre/StageAuthenticatedHandler.php @@ -0,0 +1,151 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\Routine\Spectre; + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Services\Spectre\Object\Account; +use FireflyIII\Services\Spectre\Object\Login; +use FireflyIII\Services\Spectre\Request\ListAccountsRequest; +use FireflyIII\Services\Spectre\Request\ListLoginsRequest; +use FireflyIII\Support\Import\Information\GetSpectreCustomerTrait; +use Log; + +/** + * Class StageAuthenticatedHandler + */ +class StageAuthenticatedHandler +{ + use GetSpectreCustomerTrait; + /** @var ImportJob */ + private $importJob; + /** @var ImportJobRepositoryInterface */ + private $repository; + + /** + * User has selected a login (a bank). Will grab all accounts from this bank. + * Then make user pick some to import from. + * + * @throws FireflyException + */ + public function run(): void + { + Log::debug('Now in StageAuthenticatedHandler::run()'); + // grab a list of logins. + $config = $this->importJob->configuration; + $logins = $config['all-logins'] ?? []; + Log::debug(sprintf('%d logins in config', \count($logins))); + if (\count($logins) === 0) { + // get logins from Spectre. + $logins = $this->getLogins(); + $config['all-logins'] = $logins; + } + + $selectedLogin = $config['selected-login'] ?? 0; + $login = null; + Log::debug(sprintf('$selectedLogin is %d', $selectedLogin)); + foreach ($logins as $loginArray) { + $loginId = $loginArray['id'] ?? -1; + if ($loginId === $selectedLogin) { + $login = new Login($loginArray); + Log::debug(sprintf('Selected login "%s" ("%s") which is in the array with logins.', $login->getProviderName(), $login->getCountryCode())); + } + } + if (null === $login) { + $login = new Login($logins[0]); + Log::debug(sprintf('Login is null, simply use the first one "%s" ("%s") from the array.', $login->getProviderName(), $login->getCountryCode())); + } + + // with existing login we can grab accounts from this login. + $accounts = $this->getAccounts($login); + $config['accounts'] = []; + /** @var Account $account */ + foreach ($accounts as $account) { + Log::debug(sprintf('Found account #%d ("%s") within Login.', $account->getId(), $account->getName())); + $config['accounts'][] = $account->toArray(); + } + $this->repository->setConfiguration($this->importJob, $config); + + } + + /** + * @param ImportJob $importJob + */ + public function setImportJob(ImportJob $importJob): void + { + $this->importJob = $importJob; + $this->repository = app(ImportJobRepositoryInterface::class); + $this->repository->setUser($importJob->user); + } + + /** + * @param Login $login + * + * @return array + * @throws FireflyException + */ + private function getAccounts(Login $login): array + { + Log::debug(sprintf('Now in StageAuthenticatedHandler::getAccounts() for login #%d', $login->getId())); + /** @var ListAccountsRequest $request */ + $request = app(ListAccountsRequest::class); + $request->setUser($this->importJob->user); + $request->setLogin($login); + $request->call(); + $accounts = $request->getAccounts(); + Log::debug(sprintf('Found %d accounts using login', \count($accounts))); + + return $accounts; + } + + /** + * @return array + * @throws FireflyException + */ + private function getLogins(): array + { + Log::debug('Now in StageAuthenticatedHandler::getLogins().'); + $customer = $this->getCustomer($this->importJob); + + /** @var ListLoginsRequest $request */ + $request = app(ListLoginsRequest::class); + $request->setUser($this->importJob->user); + $request->setCustomer($customer); + $request->call(); + $logins = $request->getLogins(); + $return = []; + + Log::debug(sprintf('Found %d logins in users Spectre account.', \count($logins))); + + /** @var Login $login */ + foreach ($logins as $login) { + $return[] = $login->toArray(); + } + + return $return; + } + + +} \ No newline at end of file diff --git a/app/Support/Import/Routine/Spectre/StageImportDataHandler.php b/app/Support/Import/Routine/Spectre/StageImportDataHandler.php new file mode 100644 index 0000000000..d8fe9ad981 --- /dev/null +++ b/app/Support/Import/Routine/Spectre/StageImportDataHandler.php @@ -0,0 +1,283 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\Routine\Spectre; + + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\Account as LocalAccount; +use FireflyIII\Models\AccountType; +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Services\Spectre\Object\Account as SpectreAccount; +use FireflyIII\Services\Spectre\Object\Transaction as SpectreTransaction; +use FireflyIII\Services\Spectre\Request\ListTransactionsRequest; +use FireflyIII\Support\Import\Routine\File\OpposingAccountMapper; +use Log; + +/** + * Class StageImportDataHandler + * + */ +class StageImportDataHandler +{ + /** @var AccountRepositoryInterface */ + private $accountRepository; + /** @var ImportJob */ + private $importJob; + /** @var OpposingAccountMapper */ + private $mapper; + /** @var ImportJobRepositoryInterface */ + private $repository; + + /** + * @throws FireflyException + */ + public function run(): void + { + Log::debug('Now in StageImportDataHandler::run()'); + $config = $this->importJob->configuration; + $accounts = $config['accounts'] ?? []; + Log::debug(sprintf('Count of accounts in array is %d', \count($accounts))); + if (\count($accounts) === 0) { + throw new FireflyException('There are no accounts in this import job. Cannot continue.'); // @codeCoverageIgnore + } + $toImport = $config['account_mapping'] ?? []; + $totalSet = [[]]; + foreach ($toImport as $spectreId => $localId) { + if ((int)$localId > 0) { + Log::debug(sprintf('Will get transactions from Spectre account #%d and save them in Firefly III account #%d', $spectreId, $localId)); + $spectreAccount = $this->getSpectreAccount((int)$spectreId); + $localAccount = $this->getLocalAccount((int)$localId); + $merge = $this->getTransactions($spectreAccount, $localAccount); + $totalSet[] = $merge; + Log::debug( + sprintf('Found %d transactions in account "%s" (%s)', \count($merge), $spectreAccount->getName(), $spectreAccount->getCurrencyCode()) + ); + continue; + } + Log::debug(sprintf('Local account is = zero, will not import from Spectr account with ID #%d', $spectreId)); + } + $totalSet = array_merge(...$totalSet); + Log::debug(sprintf('Found %d transactions in total.', \count($totalSet))); + $this->repository->setTransactions($this->importJob, $totalSet); + } + + + /** + * @param ImportJob $importJob + * + * @return void + */ + public function setImportJob(ImportJob $importJob): void + { + $this->importJob = $importJob; + $this->repository = app(ImportJobRepositoryInterface::class); + $this->accountRepository = app(AccountRepositoryInterface::class); + $this->mapper = app(OpposingAccountMapper::class); + $this->accountRepository->setUser($importJob->user); + $this->repository->setUser($importJob->user); + $this->mapper->setUser($importJob->user); + } + + /** + * @param array $transactions + * @param SpectreAccount $spectreAccount + * @param LocalAccount $originalSource + * + * @return array + */ + private function convertToArray(array $transactions, SpectreAccount $spectreAccount, LocalAccount $originalSource): array + { + $array = []; + $total = \count($transactions); + Log::debug(sprintf('Now in StageImportDataHandler::convertToArray() with count %d', \count($transactions))); + /** @var SpectreTransaction $transaction */ + foreach ($transactions as $index => $transaction) { + Log::debug(sprintf('Now creating array for transaction %d of %d', $index + 1, $total)); + $extra = []; + if (null !== $transaction->getExtra()) { + $extra = $transaction->getExtra()->toArray(); + } + $destinationData = $transaction->getOpposingAccountData(); + $amount = $transaction->getAmount(); + $source = $originalSource; + $destination = $this->mapper->map(null, $amount, $destinationData); + $notes = (string)trans('import.imported_from_account', ['account' => $spectreAccount->getName()]) . ' ' . "\n"; + $foreignAmount = null; + $foreignCurrencyCode = null; + + $currencyCode = $transaction->getCurrencyCode(); + $type = 'withdrawal'; + // switch source and destination if amount is greater than zero. + if (bccomp($amount, '0') === 1) { + [$source, $destination] = [$destination, $source]; + $type = 'deposit'; + } + + Log::debug(sprintf('Mapped destination to #%d ("%s")', $destination->id, $destination->name)); + Log::debug(sprintf('Set source to #%d ("%s")', $source->id, $source->name)); + + // put some data in tags: + $tags = []; + $tags[] = $transaction->getMode(); + $tags[] = $transaction->getStatus(); + if ($transaction->isDuplicated()) { + $tags[] = 'possibly-duplicated'; + } + + // get extra fields: + foreach ($extra as $key => $value) { + if ('' === (string)$value) { + continue; + } + switch ($key) { + case 'original_category': + case 'original_subcategory': + case 'customer_category_code': + case 'customer_category_name': + $tags[] = $value; + break; + case 'original_amount': + $foreignAmount = $value; + Log::debug(sprintf('Foreign amount is now %s', $value)); + break; + case 'original_currency_code': + $foreignCurrencyCode = $value; + Log::debug(sprintf('Foreign currency code is now %s', $value)); + break; + default: + $notes .= $key . ': ' . $value . ' ' . "\n"; // for newline in Markdown. + } + } + + $entry = [ + 'type' => $type, + 'date' => $transaction->getMadeOn()->format('Y-m-d'), + 'tags' => $tags, + 'user' => $this->importJob->user_id, + 'notes' => $notes, + + // all custom fields: + 'external_id' => (string)$transaction->getId(), + + // journal data: + 'description' => $transaction->getDescription(), + 'piggy_bank_id' => null, + 'piggy_bank_name' => null, + 'bill_id' => null, + 'bill_name' => null, + + // transaction data: + 'transactions' => [ + [ + 'currency_id' => null, + 'currency_code' => $currencyCode, + 'description' => null, + 'amount' => $amount, + 'budget_id' => null, + 'budget_name' => null, + 'category_id' => null, + 'category_name' => $transaction->getCategory(), + 'source_id' => $source->id, + 'source_name' => null, + 'destination_id' => $destination->id, + 'destination_name' => null, + 'foreign_currency_id' => null, + 'foreign_currency_code' => $foreignCurrencyCode, + 'foreign_amount' => $foreignAmount, + 'reconciled' => false, + 'identifier' => 0, + ], + ], + ]; + $array[] = $entry; + } + Log::debug(sprintf('Return %d entries', \count($array))); + + return $array; + } + + /** + * @param int $accountId + * + * @return LocalAccount + * @throws FireflyException + */ + private function getLocalAccount(int $accountId): LocalAccount + { + $account = $this->accountRepository->findNull($accountId); + if (null === $account) { + throw new FireflyException(sprintf('Cannot find Firefly III asset account with ID #%d. Job must stop now.', $accountId)); // @codeCoverageIgnore + } + if ($account->accountType->type !== AccountType::ASSET) { + throw new FireflyException(sprintf('Account with ID #%d is not an asset account. Job must stop now.', $accountId)); // @codeCoverageIgnore + } + + return $account; + } + + /** + * @param int $accountId + * + * @return SpectreAccount + * @throws FireflyException + */ + private function getSpectreAccount(int $accountId): SpectreAccount + { + $config = $this->importJob->configuration; + $accounts = $config['accounts'] ?? []; + foreach ($accounts as $account) { + $spectreId = (int)($account['id'] ?? 0.0); + if ($spectreId === $accountId) { + return new SpectreAccount($account); + } + } + throw new FireflyException(sprintf('Cannot find Spectre account with ID #%d in configuration. Job will exit.', $accountId)); // @codeCoverageIgnore + } + + /** + * @param SpectreAccount $spectreAccount + * @param LocalAccount $localAccount + * + * @return array + * @throws FireflyException + */ + private function getTransactions(SpectreAccount $spectreAccount, LocalAccount $localAccount): array + { + // grab all transactions + /** @var ListTransactionsRequest $request */ + $request = app(ListTransactionsRequest::class); + $request->setUser($this->importJob->user); + + $request->setAccount($spectreAccount); + $request->call(); + + $transactions = $request->getTransactions(); + + return $this->convertToArray($transactions, $spectreAccount, $localAccount); + } + + +} \ No newline at end of file diff --git a/app/Support/Import/Routine/Spectre/StageNewHandler.php b/app/Support/Import/Routine/Spectre/StageNewHandler.php new file mode 100644 index 0000000000..e381730b64 --- /dev/null +++ b/app/Support/Import/Routine/Spectre/StageNewHandler.php @@ -0,0 +1,107 @@ +. + */ + +declare(strict_types=1); + +namespace FireflyIII\Support\Import\Routine\Spectre; + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Services\Spectre\Object\Login; +use FireflyIII\Services\Spectre\Request\ListLoginsRequest; +use FireflyIII\Support\Import\Information\GetSpectreCustomerTrait; +use Log; + +/** + * Class StageNewHandler + * + */ +class StageNewHandler +{ + use GetSpectreCustomerTrait; + /** @var int */ + private $countLogins = 0; + /** @var ImportJob */ + private $importJob; + /** @var ImportJobRepositoryInterface */ + private $repository; + + /** + * @codeCoverageIgnore + * @return int + */ + public function getCountLogins(): int + { + return $this->countLogins; + } + + + /** + * Tasks for this stage: + * + * - List all of the users logins. + * - If zero, return to "get-token" stage and make user make a login. That stage redirects here. + * - If one or more, list and let user select. + * + * @throws FireflyException + */ + public function run(): void + { + Log::debug('Now in ManageLoginsHandler::run()'); + $customer = $this->getCustomer($this->importJob); + $config = $this->repository->getConfiguration($this->importJob); + + Log::debug('Going to get a list of logins.'); + /** @var ListLoginsRequest $request */ + $request = app(ListLoginsRequest::class); + $request->setUser($this->importJob->user); + $request->setCustomer($customer); + $request->call(); + + $list = $request->getLogins(); + + // count is zero? + $this->countLogins = \count($list); + Log::debug(sprintf('Number of logins is %d', $this->countLogins)); + if ($this->countLogins > 0) { + $store = []; + /** @var Login $login */ + foreach ($list as $login) { + $store[] = $login->toArray(); + } + + $config['all-logins'] = $store; + $this->repository->setConfiguration($this->importJob, $config); + Log::debug('Stored all logins in configuration.'); + } + } + + /** + * @param ImportJob $importJob + */ + public function setImportJob(ImportJob $importJob): void + { + $this->importJob = $importJob; + $this->repository = app(ImportJobRepositoryInterface::class); + $this->repository->setUser($importJob->user); + } +} \ No newline at end of file diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php index cbb4645d76..c2bfa7bf81 100644 --- a/app/Support/Navigation.php +++ b/app/Support/Navigation.php @@ -190,10 +190,12 @@ class Navigation return $currentEnd; } + if (!isset($functionMap[$repeatFreq])) { throw new FireflyException(sprintf('Cannot do endOfPeriod for $repeat_freq "%s"', $repeatFreq)); } $function = $functionMap[$repeatFreq]; + if (isset($modifierMap[$repeatFreq])) { $currentEnd->$function($modifierMap[$repeatFreq]); diff --git a/app/Support/Twig/General.php b/app/Support/Twig/General.php index 66548bd11b..a2945e833d 100644 --- a/app/Support/Twig/General.php +++ b/app/Support/Twig/General.php @@ -106,7 +106,7 @@ class General extends Twig_Extension $what = $args[2]; // name of the route. $activeWhat = $context['what'] ?? false; - if ($what === $activeWhat && !(false === strpos(Route::getCurrentRoute()->getName(), $route))) { + if ($what === $activeWhat && !(false === stripos(Route::getCurrentRoute()->getName(), $route))) { return 'active'; } diff --git a/app/Support/Twig/PiggyBank.php b/app/Support/Twig/PiggyBank.php index 4b5f7dd711..6096acf3de 100644 --- a/app/Support/Twig/PiggyBank.php +++ b/app/Support/Twig/PiggyBank.php @@ -45,13 +45,6 @@ class PiggyBank extends Twig_Extension } ); - $functions[] = new Twig_SimpleFunction( - 'suggestedMonthlyAmount', - function (PB $piggyBank) { - return $piggyBank->getSuggestedMonthlyAmount(); - } - ); - return $functions; } diff --git a/app/TransactionRules/Actions/LinkToBill.php b/app/TransactionRules/Actions/LinkToBill.php index 192c01c352..6ffb84cb8e 100644 --- a/app/TransactionRules/Actions/LinkToBill.php +++ b/app/TransactionRules/Actions/LinkToBill.php @@ -57,6 +57,7 @@ class LinkToBill implements ActionInterface { /** @var BillRepositoryInterface $repository */ $repository = app(BillRepositoryInterface::class); + $repository->setUser($this->action->rule->user); $billName = (string)$this->action->action_value; $bill = $repository->findByName($billName); diff --git a/app/TransactionRules/Actions/SetDestinationAccount.php b/app/TransactionRules/Actions/SetDestinationAccount.php index 2ba82a4c7e..1ad5fb1a46 100644 --- a/app/TransactionRules/Actions/SetDestinationAccount.php +++ b/app/TransactionRules/Actions/SetDestinationAccount.php @@ -102,6 +102,9 @@ class SetDestinationAccount implements ActionInterface // update destination transaction with new destination account: // get destination transaction: $transaction = $journal->transactions()->where('amount', '>', 0)->first(); + if(null === $transaction) { + return true; + } $transaction->account_id = $this->newDestinationAccount->id; $transaction->save(); $journal->touch(); @@ -131,7 +134,7 @@ class SetDestinationAccount implements ActionInterface /** * */ - private function findExpenseAccount() + private function findExpenseAccount(): void { $account = $this->repository->findByName($this->action->action_value, [AccountType::EXPENSE]); if (null === $account) { diff --git a/app/Transformers/PiggyBankTransformer.php b/app/Transformers/PiggyBankTransformer.php index 4c7172476a..5afe13a6ca 100644 --- a/app/Transformers/PiggyBankTransformer.php +++ b/app/Transformers/PiggyBankTransformer.php @@ -166,6 +166,7 @@ class PiggyBankTransformer extends TransformerAbstract 'percentage' => $percentage, 'current_amount' => $currentAmount, 'left_to_save' => round($leftToSave, $decimalPlaces), + 'save_per_month' => $piggyRepos->getSuggestedMonthlyAmount($piggyBank), 'startdate' => $startDate, 'targetdate' => $targetDate, 'order' => (int)$piggyBank->order, diff --git a/app/Transformers/TransactionTransformer.php b/app/Transformers/TransactionTransformer.php index 1956162c06..60a5f75f16 100644 --- a/app/Transformers/TransactionTransformer.php +++ b/app/Transformers/TransactionTransformer.php @@ -31,6 +31,7 @@ use FireflyIII\Models\TransactionType; use League\Fractal\Resource\Collection as FractalCollection; use League\Fractal\Resource\Item; use League\Fractal\TransformerAbstract; +use Log; use Symfony\Component\HttpFoundation\ParameterBag; /** @@ -214,6 +215,7 @@ class TransactionTransformer extends TransformerAbstract // switch on type for consistency switch ($transaction->transaction_type_type) { case TransactionType::WITHDRAWAL: + Log::debug(sprintf('%d is a withdrawal', $transaction->journal_id)); $data['source_id'] = $transaction->account_id; $data['source_name'] = $transaction->account_name; $data['source_iban'] = $transaction->account_iban; @@ -222,6 +224,8 @@ class TransactionTransformer extends TransformerAbstract $data['destination_name'] = $transaction->opposing_account_name; $data['destination_iban'] = $transaction->opposing_account_iban; $data['destination_type'] = $transaction->opposing_account_type; + Log::debug(sprintf('source_id / account_id is %d', $transaction->account_id)); + Log::debug(sprintf('source_name / account_name is "%s"', $transaction->account_name)); break; case TransactionType::DEPOSIT: case TransactionType::TRANSFER: diff --git a/app/User.php b/app/User.php index 27b9f1bea7..3e3150fd13 100644 --- a/app/User.php +++ b/app/User.php @@ -1,8 +1,8 @@ . */ +declare(strict_types=1); + namespace FireflyIII; use FireflyIII\Events\RequestedNewPassword; @@ -53,6 +55,8 @@ use FireflyIII\Models\Attachment; /** * Class User. + * @property int $id + * @property string $email */ class User extends Authenticatable { diff --git a/app/Validation/FireflyValidator.php b/app/Validation/FireflyValidator.php index c27cb6d6a4..1f9571e99d 100644 --- a/app/Validation/FireflyValidator.php +++ b/app/Validation/FireflyValidator.php @@ -472,12 +472,13 @@ class FireflyValidator extends Validator $query = DB::table('piggy_banks')->whereNull('piggy_banks.deleted_at') ->leftJoin('accounts', 'accounts.id', '=', 'piggy_banks.account_id')->where('accounts.user_id', auth()->user()->id); if (null !== $exclude) { - $query->where('piggy_banks.id', '!=', $exclude); + $query->where('piggy_banks.id', '!=', (int)$exclude); } $set = $query->get(['piggy_banks.*']); /** @var PiggyBank $entry */ foreach ($set as $entry) { + $fieldValue = $this->tryDecrypt($entry->name); if ($fieldValue === $value) { return false; diff --git a/changelog.md b/changelog.md index 486fa44639..d16497a54c 100644 --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,40 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [4.7.4] - 2015-06-03 +### Added +- [Issue 1409](https://github.com/firefly-iii/firefly-iii/issues/1409), add Indian Rupee and explain that users can do this themselves [issue 1413](https://github.com/firefly-iii/firefly-iii/issues/1413) +- [Issue 1445](https://github.com/firefly-iii/firefly-iii/issues/1445), upgrade Curl in Docker image. +- [Issue 1386](https://github.com/firefly-iii/firefly-iii/issues/1386), quick links to often used pages. +- [Issue 1405](https://github.com/firefly-iii/firefly-iii/issues/1405), show proposed amount to piggy banks. +- [Issue 1416](https://github.com/firefly-iii/firefly-iii/issues/1416), ability to delete lost attachments. + +### Changed +- A completely rewritten import routine that can handle bunq (thanks everybody for testing!), CSV files and Spectre. Please make sure you read about this at http://bit.ly/FF3-new-import +- [Issue 1392](https://github.com/firefly-iii/firefly-iii/issues/1392), explicitly mention rules are inactive (when they are). +- [Issue 1406](https://github.com/firefly-iii/firefly-iii/issues/1406), bill conversion to rules will be smarter about the rules they create. + +### Fixed +- [Issue 1369](https://github.com/firefly-iii/firefly-iii/issues/1369), you can now properly order piggy banks again. +- [Issue 1389](https://github.com/firefly-iii/firefly-iii/issues/1389), null-pointer in the import routine. +- [Issue 1400](https://github.com/firefly-iii/firefly-iii/issues/1400), missing translation. +- [Issue 1403](https://github.com/firefly-iii/firefly-iii/issues/1403), bill would always be marked as inactive in edit screen. +- [Issue 1418](https://github.com/firefly-iii/firefly-iii/issues/1418), missing note text on bill page. +- Export routine would break when encountering un-decryptable files. +- [Issue 1425](https://github.com/firefly-iii/firefly-iii/issues/1425), empty fields when edit multiple transactions at once. +- [Issue 1449](https://github.com/firefly-iii/firefly-iii/issues/1449), bad calculations in "budget left to spend" view. +- [Issue 1451](https://github.com/firefly-iii/firefly-iii/issues/1451), same but in another view. +- [Issue 1453](https://github.com/firefly-iii/firefly-iii/issues/1453), same as [issue 1403](https://github.com/firefly-iii/firefly-iii/issues/1403). +- [Issue 1455](https://github.com/firefly-iii/firefly-iii/issues/1455), could add income to a budget. +- [Issue 1442](https://github.com/firefly-iii/firefly-iii/issues/1442), issues with editing a split deposit. +- [Issue 1452](https://github.com/firefly-iii/firefly-iii/issues/1452), date range problems with tags. +- [Issue 1458](https://github.com/firefly-iii/firefly-iii/issues/1458), same for transactions. + + +### Security +- [Issue 1415](https://github.com/firefly-iii/firefly-iii/issues/1415), will email you when OAuth2 keys are generated. + + ## [4.7.3.2] - 2018-05-16 ### Fixed - Forgot to increase the version number :(. diff --git a/composer.json b/composer.json index 50b5f8aeec..9abb0009b2 100644 --- a/composer.json +++ b/composer.json @@ -52,6 +52,7 @@ "ext-xml": "*", "ext-zip": "*", "bacon/bacon-qr-code": "1.*", + "bunq/sdk_php": "dev-master#8c1faefc111d9b970168a1837ca165d854954941", "davejamesmiller/laravel-breadcrumbs": "5.*", "doctrine/dbal": "2.*", "fideloper/proxy": "4.*", @@ -68,7 +69,6 @@ "twig/twig": "1.*" }, "require-dev": { - "barryvdh/laravel-debugbar": "^3.1", "barryvdh/laravel-ide-helper": "2.*", "filp/whoops": "2.*", "fzaninotto/faker": "1.*", diff --git a/composer.lock b/composer.lock index 0b6597545f..e1f8241676 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "24e8f33f0aee75d76cdec72c97ecc3cd", + "content-hash": "312e75271d4570f83bc7554892a3b6ab", "packages": [ { "name": "bacon/bacon-qr-code", @@ -53,17 +53,80 @@ "time": "2017-10-17T09:59:25+00:00" }, { - "name": "davejamesmiller/laravel-breadcrumbs", - "version": "5.0.0", + "name": "bunq/sdk_php", + "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/davejamesmiller/laravel-breadcrumbs.git", - "reference": "590cb313d783460bdac4d3a801c83e6ecf561eb7" + "url": "https://github.com/bunq/sdk_php.git", + "reference": "8c1faefc111d9b970168a1837ca165d854954941" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/davejamesmiller/laravel-breadcrumbs/zipball/590cb313d783460bdac4d3a801c83e6ecf561eb7", - "reference": "590cb313d783460bdac4d3a801c83e6ecf561eb7", + "url": "https://api.github.com/repos/bunq/sdk_php/zipball/8c1faefc111d9b970168a1837ca165d854954941", + "reference": "8c1faefc111d9b970168a1837ca165d854954941", + "shasum": "" + }, + "require": { + "ext-curl": "*", + "ext-json": "*", + "ext-mbstring": "*", + "guzzlehttp/guzzle": "~6", + "php": "^7.0.13" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^2.4", + "jakub-onderka/php-parallel-lint": "^0.9.2", + "phpro/grumphp": "^0.11.6", + "phpstan/phpstan": "^0.8", + "phpunit/phpunit": "^5.7", + "sebastian/phpcpd": "^3.0", + "sensiolabs/security-checker": "^4.1" + }, + "bin": [ + "bin/bunq-install" + ], + "type": "library", + "autoload": { + "psr-4": { + "bunq\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "bunq", + "email": "sdk@bunq.com", + "homepage": "https://www.bunq.com", + "role": "Owner" + } + ], + "description": "bunq PHP SDK", + "homepage": "https://bunq.com/", + "keywords": [ + "api", + "bunq", + "finance", + "open-banking", + "payment", + "sepa" + ], + "time": "2018-05-30T09:01:50+00:00" + }, + { + "name": "davejamesmiller/laravel-breadcrumbs", + "version": "5.1.0", + "source": { + "type": "git", + "url": "https://github.com/davejamesmiller/laravel-breadcrumbs.git", + "reference": "2a02abfeca13acba6d528f4fcd385570452308f7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/davejamesmiller/laravel-breadcrumbs/zipball/2a02abfeca13acba6d528f4fcd385570452308f7", + "reference": "2a02abfeca13acba6d528f4fcd385570452308f7", "shasum": "" }, "require": { @@ -109,7 +172,7 @@ "keywords": [ "laravel" ], - "time": "2018-02-10T19:00:08+00:00" + "time": "2018-05-05T19:30:03+00:00" }, { "name": "defuse/php-encryption", @@ -1087,16 +1150,16 @@ }, { "name": "laravel/framework", - "version": "v5.6.18", + "version": "v5.6.23", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "088f286d0b5145275ced93799e23980a81898d10" + "reference": "f547f0a71a12763d1adb8493237d541c9e3a5d10" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/088f286d0b5145275ced93799e23980a81898d10", - "reference": "088f286d0b5145275ced93799e23980a81898d10", + "url": "https://api.github.com/repos/laravel/framework/zipball/f547f0a71a12763d1adb8493237d541c9e3a5d10", + "reference": "f547f0a71a12763d1adb8493237d541c9e3a5d10", "shasum": "" }, "require": { @@ -1222,7 +1285,7 @@ "framework", "laravel" ], - "time": "2018-04-26T13:25:23+00:00" + "time": "2018-05-22T14:55:57+00:00" }, { "name": "laravel/passport", @@ -1295,16 +1358,16 @@ }, { "name": "laravelcollective/html", - "version": "v5.6.7", + "version": "v5.6.9", "source": { "type": "git", "url": "https://github.com/LaravelCollective/html.git", - "reference": "38f2c6ff0d3dfc497175a5cff5e24b3937f6e2c9" + "reference": "fda9d3dad85ecea609ef9c6323d6923536cf5643" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/LaravelCollective/html/zipball/38f2c6ff0d3dfc497175a5cff5e24b3937f6e2c9", - "reference": "38f2c6ff0d3dfc497175a5cff5e24b3937f6e2c9", + "url": "https://api.github.com/repos/LaravelCollective/html/zipball/fda9d3dad85ecea609ef9c6323d6923536cf5643", + "reference": "fda9d3dad85ecea609ef9c6323d6923536cf5643", "shasum": "" }, "require": { @@ -1359,7 +1422,7 @@ ], "description": "HTML and Form Builders for the Laravel Framework", "homepage": "https://laravelcollective.com", - "time": "2018-04-26T16:09:18+00:00" + "time": "2018-05-30T16:09:07+00:00" }, { "name": "lcobucci/jwt", @@ -1409,7 +1472,7 @@ { "name": "Luís Otávio Cobucci Oblonczyk", "email": "lcobucci@gmail.com", - "role": "developer" + "role": "Developer" } ], "description": "A simple library to work with JSON Web Token and JSON Web Signature", @@ -1490,16 +1553,16 @@ }, { "name": "league/csv", - "version": "9.1.3", + "version": "9.1.4", "source": { "type": "git", "url": "https://github.com/thephpleague/csv.git", - "reference": "0d0b12f1a0093a6c39014a5d118f6ba4274539ee" + "reference": "9c8ad06fb5d747c149875beb6133566c00eaa481" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/csv/zipball/0d0b12f1a0093a6c39014a5d118f6ba4274539ee", - "reference": "0d0b12f1a0093a6c39014a5d118f6ba4274539ee", + "url": "https://api.github.com/repos/thephpleague/csv/zipball/9c8ad06fb5d747c149875beb6133566c00eaa481", + "reference": "9c8ad06fb5d747c149875beb6133566c00eaa481", "shasum": "" }, "require": { @@ -1553,7 +1616,7 @@ "read", "write" ], - "time": "2018-03-12T07:20:01+00:00" + "time": "2018-05-01T18:32:48+00:00" }, { "name": "league/event", @@ -1607,16 +1670,16 @@ }, { "name": "league/flysystem", - "version": "1.0.44", + "version": "1.0.45", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "168dbe519737221dc87d17385cde33073881fd02" + "reference": "a99f94e63b512d75f851b181afcdf0ee9ebef7e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/168dbe519737221dc87d17385cde33073881fd02", - "reference": "168dbe519737221dc87d17385cde33073881fd02", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a99f94e63b512d75f851b181afcdf0ee9ebef7e6", + "reference": "a99f94e63b512d75f851b181afcdf0ee9ebef7e6", "shasum": "" }, "require": { @@ -1687,7 +1750,7 @@ "sftp", "storage" ], - "time": "2018-04-06T09:58:14+00:00" + "time": "2018-05-07T08:44:23+00:00" }, { "name": "league/fractal", @@ -2738,16 +2801,16 @@ }, { "name": "symfony/console", - "version": "v4.0.8", + "version": "v4.1.0", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "aad9a6fe47319f22748fd764f52d3a7ca6fa6b64" + "reference": "2d5d973bf9933d46802b01010bd25c800c87c242" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/aad9a6fe47319f22748fd764f52d3a7ca6fa6b64", - "reference": "aad9a6fe47319f22748fd764f52d3a7ca6fa6b64", + "url": "https://api.github.com/repos/symfony/console/zipball/2d5d973bf9933d46802b01010bd25c800c87c242", + "reference": "2d5d973bf9933d46802b01010bd25c800c87c242", "shasum": "" }, "require": { @@ -2767,7 +2830,7 @@ "symfony/process": "~3.4|~4.0" }, "suggest": { - "psr/log": "For using the console logger", + "psr/log-implementation": "For using the console logger", "symfony/event-dispatcher": "", "symfony/lock": "", "symfony/process": "" @@ -2775,7 +2838,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -2802,20 +2865,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-04-03T05:24:00+00:00" + "time": "2018-05-30T07:26:09+00:00" }, { "name": "symfony/css-selector", - "version": "v4.0.8", + "version": "v4.1.0", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "03f965583147957f1ecbad7ea1c9d6fd5e525ec2" + "reference": "03ac71606ecb0b0ce792faa17d74cc32c2949ef4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/03f965583147957f1ecbad7ea1c9d6fd5e525ec2", - "reference": "03f965583147957f1ecbad7ea1c9d6fd5e525ec2", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/03ac71606ecb0b0ce792faa17d74cc32c2949ef4", + "reference": "03ac71606ecb0b0ce792faa17d74cc32c2949ef4", "shasum": "" }, "require": { @@ -2824,7 +2887,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -2855,20 +2918,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2018-03-19T22:35:49+00:00" + "time": "2018-05-30T07:26:09+00:00" }, { "name": "symfony/debug", - "version": "v4.0.8", + "version": "v4.1.0", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "5961d02d48828671f5d8a7805e06579d692f6ede" + "reference": "449f8b00b28ab6e6912c3e6b920406143b27193b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/5961d02d48828671f5d8a7805e06579d692f6ede", - "reference": "5961d02d48828671f5d8a7805e06579d692f6ede", + "url": "https://api.github.com/repos/symfony/debug/zipball/449f8b00b28ab6e6912c3e6b920406143b27193b", + "reference": "449f8b00b28ab6e6912c3e6b920406143b27193b", "shasum": "" }, "require": { @@ -2884,7 +2947,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -2911,20 +2974,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2018-04-03T05:24:00+00:00" + "time": "2018-05-16T14:33:22+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.0.8", + "version": "v4.1.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "63353a71073faf08f62caab4e6889b06a787f07b" + "reference": "2391ed210a239868e7256eb6921b1bd83f3087b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/63353a71073faf08f62caab4e6889b06a787f07b", - "reference": "63353a71073faf08f62caab4e6889b06a787f07b", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/2391ed210a239868e7256eb6921b1bd83f3087b5", + "reference": "2391ed210a239868e7256eb6921b1bd83f3087b5", "shasum": "" }, "require": { @@ -2947,7 +3010,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -2974,20 +3037,20 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2018-04-06T07:35:43+00:00" + "time": "2018-04-06T07:35:57+00:00" }, { "name": "symfony/finder", - "version": "v4.0.8", + "version": "v4.1.0", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "ca27c02b7a3fef4828c998c2ff9ba7aae1641c49" + "reference": "087e2ee0d74464a4c6baac4e90417db7477dc238" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/ca27c02b7a3fef4828c998c2ff9ba7aae1641c49", - "reference": "ca27c02b7a3fef4828c998c2ff9ba7aae1641c49", + "url": "https://api.github.com/repos/symfony/finder/zipball/087e2ee0d74464a4c6baac4e90417db7477dc238", + "reference": "087e2ee0d74464a4c6baac4e90417db7477dc238", "shasum": "" }, "require": { @@ -2996,7 +3059,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -3023,20 +3086,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2018-04-04T05:10:37+00:00" + "time": "2018-05-16T14:33:22+00:00" }, { "name": "symfony/http-foundation", - "version": "v4.0.8", + "version": "v4.1.0", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "d0864a82e5891ab61d31eecbaa48bed5a09b8e6c" + "reference": "a916c88390fb861ee21f12a92b107d51bb68af99" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/d0864a82e5891ab61d31eecbaa48bed5a09b8e6c", - "reference": "d0864a82e5891ab61d31eecbaa48bed5a09b8e6c", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/a916c88390fb861ee21f12a92b107d51bb68af99", + "reference": "a916c88390fb861ee21f12a92b107d51bb68af99", "shasum": "" }, "require": { @@ -3044,12 +3107,13 @@ "symfony/polyfill-mbstring": "~1.1" }, "require-dev": { + "predis/predis": "~1.0", "symfony/expression-language": "~3.4|~4.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -3076,33 +3140,34 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2018-04-03T05:24:00+00:00" + "time": "2018-05-25T14:55:38+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.0.8", + "version": "v4.1.0", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "6dd620d96d64456075536ffe3c6c4658dd689021" + "reference": "b5ab9d4cdbfd369083744b6b5dfbf454e31e5f90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6dd620d96d64456075536ffe3c6c4658dd689021", - "reference": "6dd620d96d64456075536ffe3c6c4658dd689021", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/b5ab9d4cdbfd369083744b6b5dfbf454e31e5f90", + "reference": "b5ab9d4cdbfd369083744b6b5dfbf454e31e5f90", "shasum": "" }, "require": { "php": "^7.1.3", "psr/log": "~1.0", "symfony/debug": "~3.4|~4.0", - "symfony/event-dispatcher": "~3.4|~4.0", - "symfony/http-foundation": "~3.4.4|~4.0.4" + "symfony/event-dispatcher": "~4.1", + "symfony/http-foundation": "~4.1", + "symfony/polyfill-ctype": "~1.8" }, "conflict": { "symfony/config": "<3.4", - "symfony/dependency-injection": "<3.4.5|<4.0.5,>=4", - "symfony/var-dumper": "<3.4", + "symfony/dependency-injection": "<4.1", + "symfony/var-dumper": "<4.1", "twig/twig": "<1.34|<2.4,>=2" }, "provide": { @@ -3114,7 +3179,7 @@ "symfony/config": "~3.4|~4.0", "symfony/console": "~3.4|~4.0", "symfony/css-selector": "~3.4|~4.0", - "symfony/dependency-injection": "^3.4.5|^4.0.5", + "symfony/dependency-injection": "^4.1", "symfony/dom-crawler": "~3.4|~4.0", "symfony/expression-language": "~3.4|~4.0", "symfony/finder": "~3.4|~4.0", @@ -3123,7 +3188,7 @@ "symfony/stopwatch": "~3.4|~4.0", "symfony/templating": "~3.4|~4.0", "symfony/translation": "~3.4|~4.0", - "symfony/var-dumper": "~3.4|~4.0" + "symfony/var-dumper": "~4.1" }, "suggest": { "symfony/browser-kit": "", @@ -3135,7 +3200,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -3162,20 +3227,75 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2018-04-06T16:25:03+00:00" + "time": "2018-05-30T12:52:34+00:00" }, { - "name": "symfony/polyfill-mbstring", - "version": "v1.7.0", + "name": "symfony/polyfill-ctype", + "version": "v1.8.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b" + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b", - "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae", + "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.8-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + }, + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "time": "2018-04-30T19:57:29+00:00" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.8.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "3296adf6a6454a050679cde90f95350ad604b171" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171", + "reference": "3296adf6a6454a050679cde90f95350ad604b171", "shasum": "" }, "require": { @@ -3187,7 +3307,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "1.8-dev" } }, "autoload": { @@ -3221,20 +3341,20 @@ "portable", "shim" ], - "time": "2018-01-30T19:27:44+00:00" + "time": "2018-04-26T10:06:28+00:00" }, { "name": "symfony/polyfill-php56", - "version": "v1.7.0", + "version": "v1.8.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "ebc999ce5f14204c5150b9bd15f8f04e621409d8" + "reference": "af98553c84912459db3f636329567809d639a8f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/ebc999ce5f14204c5150b9bd15f8f04e621409d8", - "reference": "ebc999ce5f14204c5150b9bd15f8f04e621409d8", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/af98553c84912459db3f636329567809d639a8f6", + "reference": "af98553c84912459db3f636329567809d639a8f6", "shasum": "" }, "require": { @@ -3244,7 +3364,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "1.8-dev" } }, "autoload": { @@ -3277,20 +3397,20 @@ "portable", "shim" ], - "time": "2018-01-30T19:27:44+00:00" + "time": "2018-04-26T10:06:28+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.7.0", + "version": "v1.8.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "8eca20c8a369e069d4f4c2ac9895144112867422" + "reference": "a4576e282d782ad82397f3e4ec1df8e0f0cafb46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/8eca20c8a369e069d4f4c2ac9895144112867422", - "reference": "8eca20c8a369e069d4f4c2ac9895144112867422", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/a4576e282d782ad82397f3e4ec1df8e0f0cafb46", + "reference": "a4576e282d782ad82397f3e4ec1df8e0f0cafb46", "shasum": "" }, "require": { @@ -3299,7 +3419,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "1.8-dev" } }, "autoload": { @@ -3332,20 +3452,20 @@ "portable", "shim" ], - "time": "2018-01-31T17:43:24+00:00" + "time": "2018-04-26T10:06:28+00:00" }, { "name": "symfony/polyfill-util", - "version": "v1.7.0", + "version": "v1.8.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-util.git", - "reference": "e17c808ec4228026d4f5a8832afa19be85979563" + "reference": "1a5ad95d9436cbff3296034fe9f8d586dce3fb3a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/e17c808ec4228026d4f5a8832afa19be85979563", - "reference": "e17c808ec4228026d4f5a8832afa19be85979563", + "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/1a5ad95d9436cbff3296034fe9f8d586dce3fb3a", + "reference": "1a5ad95d9436cbff3296034fe9f8d586dce3fb3a", "shasum": "" }, "require": { @@ -3354,7 +3474,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "1.8-dev" } }, "autoload": { @@ -3384,20 +3504,20 @@ "polyfill", "shim" ], - "time": "2018-01-31T18:08:44+00:00" + "time": "2018-04-26T10:06:28+00:00" }, { "name": "symfony/process", - "version": "v4.0.8", + "version": "v4.1.0", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "d7dc1ee5dfe9f732cb1bba7310f5b99f2b7a6d25" + "reference": "73445bd33b0d337c060eef9652b94df72b6b3434" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/d7dc1ee5dfe9f732cb1bba7310f5b99f2b7a6d25", - "reference": "d7dc1ee5dfe9f732cb1bba7310f5b99f2b7a6d25", + "url": "https://api.github.com/repos/symfony/process/zipball/73445bd33b0d337c060eef9652b94df72b6b3434", + "reference": "73445bd33b0d337c060eef9652b94df72b6b3434", "shasum": "" }, "require": { @@ -3406,7 +3526,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -3433,7 +3553,7 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2018-04-03T05:24:00+00:00" + "time": "2018-05-30T07:26:09+00:00" }, { "name": "symfony/psr-http-message-bridge", @@ -3497,16 +3617,16 @@ }, { "name": "symfony/routing", - "version": "v4.0.8", + "version": "v4.1.0", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "0663036dd57dbfd4e9ff29f75bbd5dd3253ebe71" + "reference": "180b51c66d10f09e562c9ebc395b39aacb2cf8a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/0663036dd57dbfd4e9ff29f75bbd5dd3253ebe71", - "reference": "0663036dd57dbfd4e9ff29f75bbd5dd3253ebe71", + "url": "https://api.github.com/repos/symfony/routing/zipball/180b51c66d10f09e562c9ebc395b39aacb2cf8a2", + "reference": "180b51c66d10f09e562c9ebc395b39aacb2cf8a2", "shasum": "" }, "require": { @@ -3538,7 +3658,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -3571,20 +3691,20 @@ "uri", "url" ], - "time": "2018-04-04T13:50:32+00:00" + "time": "2018-05-30T07:26:09+00:00" }, { "name": "symfony/translation", - "version": "v4.0.8", + "version": "v4.1.0", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "e20a9b7f9f62cb33a11638b345c248e7d510c938" + "reference": "16328f5b217cebc8dd4adfe4aeeaa8c377581f5a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/e20a9b7f9f62cb33a11638b345c248e7d510c938", - "reference": "e20a9b7f9f62cb33a11638b345c248e7d510c938", + "url": "https://api.github.com/repos/symfony/translation/zipball/16328f5b217cebc8dd4adfe4aeeaa8c377581f5a", + "reference": "16328f5b217cebc8dd4adfe4aeeaa8c377581f5a", "shasum": "" }, "require": { @@ -3599,20 +3719,21 @@ "require-dev": { "psr/log": "~1.0", "symfony/config": "~3.4|~4.0", + "symfony/console": "~3.4|~4.0", "symfony/dependency-injection": "~3.4|~4.0", "symfony/finder": "~2.8|~3.0|~4.0", "symfony/intl": "~3.4|~4.0", "symfony/yaml": "~3.4|~4.0" }, "suggest": { - "psr/log": "To use logging capability in translator", + "psr/log-implementation": "To use logging capability in translator", "symfony/config": "", "symfony/yaml": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -3639,20 +3760,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2018-02-22T10:50:29+00:00" + "time": "2018-05-30T07:26:09+00:00" }, { "name": "symfony/var-dumper", - "version": "v4.0.8", + "version": "v4.1.0", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "e1b4d008100f4d203cc38b0d793ad6252d8d8af0" + "reference": "bc88ad53e825ebacc7b190bbd360781fce381c64" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e1b4d008100f4d203cc38b0d793ad6252d8d8af0", - "reference": "e1b4d008100f4d203cc38b0d793ad6252d8d8af0", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/bc88ad53e825ebacc7b190bbd360781fce381c64", + "reference": "bc88ad53e825ebacc7b190bbd360781fce381c64", "shasum": "" }, "require": { @@ -3661,20 +3782,26 @@ "symfony/polyfill-php72": "~1.5" }, "conflict": { - "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0" + "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0", + "symfony/console": "<3.4" }, "require-dev": { "ext-iconv": "*", + "symfony/process": "~3.4|~4.0", "twig/twig": "~1.34|~2.4" }, "suggest": { "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).", - "ext-intl": "To show region name in time zone dump" + "ext-intl": "To show region name in time zone dump", + "symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script" }, + "bin": [ + "Resources/bin/var-dump-server" + ], "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -3708,7 +3835,7 @@ "debug", "dump" ], - "time": "2018-04-04T05:10:37+00:00" + "time": "2018-04-29T07:56:09+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -3874,16 +4001,16 @@ }, { "name": "zendframework/zend-diactoros", - "version": "1.7.1", + "version": "1.7.2", "source": { "type": "git", "url": "https://github.com/zendframework/zend-diactoros.git", - "reference": "bf26aff803a11c5cc8eb7c4878a702c403ec67f1" + "reference": "741e7a571836f038de731105f4742ca8a164e43a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/bf26aff803a11c5cc8eb7c4878a702c403ec67f1", - "reference": "bf26aff803a11c5cc8eb7c4878a702c403ec67f1", + "url": "https://api.github.com/repos/zendframework/zend-diactoros/zipball/741e7a571836f038de731105f4742ca8a164e43a", + "reference": "741e7a571836f038de731105f4742ca8a164e43a", "shasum": "" }, "require": { @@ -3903,7 +4030,8 @@ "extra": { "branch-alias": { "dev-master": "1.7.x-dev", - "dev-develop": "1.8.x-dev" + "dev-develop": "1.8.x-dev", + "dev-release-2.0": "2.0.x-dev" } }, "autoload": { @@ -3922,78 +4050,10 @@ "psr", "psr-7" ], - "time": "2018-02-26T15:44:50+00:00" + "time": "2018-05-29T16:53:08+00:00" } ], "packages-dev": [ - { - "name": "barryvdh/laravel-debugbar", - "version": "v3.1.4", - "source": { - "type": "git", - "url": "https://github.com/barryvdh/laravel-debugbar.git", - "reference": "7a91480cc6e597caed5117a3c5d685f06d35c5a1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/7a91480cc6e597caed5117a3c5d685f06d35c5a1", - "reference": "7a91480cc6e597caed5117a3c5d685f06d35c5a1", - "shasum": "" - }, - "require": { - "illuminate/routing": "5.5.x|5.6.x", - "illuminate/session": "5.5.x|5.6.x", - "illuminate/support": "5.5.x|5.6.x", - "maximebf/debugbar": "~1.15.0", - "php": ">=7.0", - "symfony/debug": "^3|^4", - "symfony/finder": "^3|^4" - }, - "require-dev": { - "illuminate/framework": "5.5.x" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.2-dev" - }, - "laravel": { - "providers": [ - "Barryvdh\\Debugbar\\ServiceProvider" - ], - "aliases": { - "Debugbar": "Barryvdh\\Debugbar\\Facade" - } - } - }, - "autoload": { - "psr-4": { - "Barryvdh\\Debugbar\\": "src/" - }, - "files": [ - "src/helpers.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Barry vd. Heuvel", - "email": "barryvdh@gmail.com" - } - ], - "description": "PHP Debugbar integration for Laravel", - "keywords": [ - "debug", - "debugbar", - "laravel", - "profiler", - "webprofiler" - ], - "time": "2018-03-06T08:35:31+00:00" - }, { "name": "barryvdh/laravel-ide-helper", "version": "v2.4.3", @@ -4377,79 +4437,18 @@ ], "time": "2018-02-24T18:55:28+00:00" }, - { - "name": "maximebf/debugbar", - "version": "v1.15.0", - "source": { - "type": "git", - "url": "https://github.com/maximebf/php-debugbar.git", - "reference": "30e7d60937ee5f1320975ca9bc7bcdd44d500f07" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/30e7d60937ee5f1320975ca9bc7bcdd44d500f07", - "reference": "30e7d60937ee5f1320975ca9bc7bcdd44d500f07", - "shasum": "" - }, - "require": { - "php": ">=5.3.0", - "psr/log": "^1.0", - "symfony/var-dumper": "^2.6|^3.0|^4.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.0|^5.0" - }, - "suggest": { - "kriswallsmith/assetic": "The best way to manage assets", - "monolog/monolog": "Log using Monolog", - "predis/predis": "Redis storage" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.14-dev" - } - }, - "autoload": { - "psr-4": { - "DebugBar\\": "src/DebugBar/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Maxime Bouroumeau-Fuseau", - "email": "maxime.bouroumeau@gmail.com", - "homepage": "http://maximebf.com" - }, - { - "name": "Barry vd. Heuvel", - "email": "barryvdh@gmail.com" - } - ], - "description": "Debug bar in the browser for php application", - "homepage": "https://github.com/maximebf/php-debugbar", - "keywords": [ - "debug", - "debugbar" - ], - "time": "2017-12-15T11:13:46+00:00" - }, { "name": "mockery/mockery", - "version": "1.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "1bac8c362b12f522fdd1f1fa3556284c91affa38" + "reference": "99e29d3596b16dabe4982548527d5ddf90232e99" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/1bac8c362b12f522fdd1f1fa3556284c91affa38", - "reference": "1bac8c362b12f522fdd1f1fa3556284c91affa38", + "url": "https://api.github.com/repos/mockery/mockery/zipball/99e29d3596b16dabe4982548527d5ddf90232e99", + "reference": "99e29d3596b16dabe4982548527d5ddf90232e99", "shasum": "" }, "require": { @@ -4458,7 +4457,8 @@ "php": ">=5.6.0" }, "require-dev": { - "phpunit/phpunit": "~5.7|~6.1" + "phpdocumentor/phpdocumentor": "^2.9", + "phpunit/phpunit": "~5.7.10|~6.5" }, "type": "library", "extra": { @@ -4487,8 +4487,8 @@ "homepage": "http://davedevelopment.co.uk" } ], - "description": "Mockery is a simple yet flexible PHP mock object framework for use in unit testing with PHPUnit, PHPSpec or any other testing framework. Its core goal is to offer a test double framework with a succinct API capable of clearly defining all possible object operations and interactions using a human readable Domain Specific Language (DSL). Designed as a drop in alternative to PHPUnit's phpunit-mock-objects library, Mockery is easy to integrate with PHPUnit and can operate alongside phpunit-mock-objects without the World ending.", - "homepage": "http://github.com/mockery/mockery", + "description": "Mockery is a simple yet flexible PHP mock object framework", + "homepage": "https://github.com/mockery/mockery", "keywords": [ "BDD", "TDD", @@ -4501,29 +4501,32 @@ "test double", "testing" ], - "time": "2017-10-06T16:20:43+00:00" + "time": "2018-05-08T08:54:48+00:00" }, { "name": "myclabs/deep-copy", - "version": "1.7.0", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e" + "reference": "478465659fd987669df0bd8a9bf22a8710e5f1b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", - "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/478465659fd987669df0bd8a9bf22a8710e5f1b6", + "reference": "478465659fd987669df0bd8a9bf22a8710e5f1b6", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0" + "php": "^7.1" + }, + "replace": { + "myclabs/deep-copy": "self.version" }, "require-dev": { "doctrine/collections": "^1.0", "doctrine/common": "^2.6", - "phpunit/phpunit": "^4.1" + "phpunit/phpunit": "^7.1" }, "type": "library", "autoload": { @@ -4546,7 +4549,7 @@ "object", "object graph" ], - "time": "2017-10-19T19:58:43+00:00" + "time": "2018-05-29T17:25:09+00:00" }, { "name": "phar-io/manifest", @@ -4652,16 +4655,16 @@ }, { "name": "php-coveralls/php-coveralls", - "version": "v2.0.0", + "version": "v2.1.0", "source": { "type": "git", "url": "https://github.com/php-coveralls/php-coveralls.git", - "reference": "3eaf7eb689cdf6b86801a3843940d974dc657068" + "reference": "3b00c229726f892bfdadeaf01ea430ffd04a939d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-coveralls/php-coveralls/zipball/3eaf7eb689cdf6b86801a3843940d974dc657068", - "reference": "3eaf7eb689cdf6b86801a3843940d974dc657068", + "url": "https://api.github.com/repos/php-coveralls/php-coveralls/zipball/3b00c229726f892bfdadeaf01ea430ffd04a939d", + "reference": "3b00c229726f892bfdadeaf01ea430ffd04a939d", "shasum": "" }, "require": { @@ -4687,7 +4690,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "2.1-dev" } }, "autoload": { @@ -4731,7 +4734,7 @@ "github", "test" ], - "time": "2017-12-08T14:28:16+00:00" + "time": "2018-05-22T23:11:08+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -4950,23 +4953,23 @@ }, { "name": "phpunit/php-code-coverage", - "version": "6.0.3", + "version": "6.0.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "774a82c0c5da4c1c7701790c262035d235ab7856" + "reference": "865662550c384bc1db7e51d29aeda1c2c161d69a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/774a82c0c5da4c1c7701790c262035d235ab7856", - "reference": "774a82c0c5da4c1c7701790c262035d235ab7856", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/865662550c384bc1db7e51d29aeda1c2c161d69a", + "reference": "865662550c384bc1db7e51d29aeda1c2c161d69a", "shasum": "" }, "require": { "ext-dom": "*", "ext-xmlwriter": "*", "php": "^7.1", - "phpunit/php-file-iterator": "^1.4.2", + "phpunit/php-file-iterator": "^2.0", "phpunit/php-text-template": "^1.2.1", "phpunit/php-token-stream": "^3.0", "sebastian/code-unit-reverse-lookup": "^1.0.1", @@ -5009,29 +5012,29 @@ "testing", "xunit" ], - "time": "2018-04-06T15:39:20+00:00" + "time": "2018-06-01T07:51:50+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "1.4.5", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4" + "reference": "e20525b0c2945c7c317fff95660698cb3d2a53bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4", - "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/e20525b0c2945c7c317fff95660698cb3d2a53bc", + "reference": "e20525b0c2945c7c317fff95660698cb3d2a53bc", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -5046,7 +5049,7 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], @@ -5056,7 +5059,7 @@ "filesystem", "iterator" ], - "time": "2017-11-27T13:52:08+00:00" + "time": "2018-05-28T12:13:49+00:00" }, { "name": "phpunit/php-text-template", @@ -5199,35 +5202,35 @@ }, { "name": "phpunit/phpunit", - "version": "7.1.4", + "version": "7.2.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "6d51299e307dc510149e0b7cd1931dd11770e1cb" + "reference": "3cf0836680bf5c365c627e8566d46c9e1f544db9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6d51299e307dc510149e0b7cd1931dd11770e1cb", - "reference": "6d51299e307dc510149e0b7cd1931dd11770e1cb", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3cf0836680bf5c365c627e8566d46c9e1f544db9", + "reference": "3cf0836680bf5c365c627e8566d46c9e1f544db9", "shasum": "" }, "require": { + "doctrine/instantiator": "^1.1", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", - "myclabs/deep-copy": "^1.6.1", + "myclabs/deep-copy": "^1.7", "phar-io/manifest": "^1.0.1", "phar-io/version": "^1.0", "php": "^7.1", "phpspec/prophecy": "^1.7", - "phpunit/php-code-coverage": "^6.0.1", - "phpunit/php-file-iterator": "^1.4.3", + "phpunit/php-code-coverage": "^6.0.7", + "phpunit/php-file-iterator": "^2.0", "phpunit/php-text-template": "^1.2.1", "phpunit/php-timer": "^2.0", - "phpunit/phpunit-mock-objects": "^6.1.1", - "sebastian/comparator": "^2.1 || ^3.0", + "sebastian/comparator": "^3.0", "sebastian/diff": "^3.0", "sebastian/environment": "^3.1", "sebastian/exporter": "^3.1", @@ -5236,10 +5239,14 @@ "sebastian/resource-operations": "^1.0", "sebastian/version": "^2.0.1" }, + "conflict": { + "phpunit/phpunit-mock-objects": "*" + }, "require-dev": { "ext-pdo": "*" }, "suggest": { + "ext-soap": "*", "ext-xdebug": "*", "phpunit/php-invoker": "^2.0" }, @@ -5249,7 +5256,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "7.1-dev" + "dev-master": "7.2-dev" } }, "autoload": { @@ -5275,63 +5282,7 @@ "testing", "xunit" ], - "time": "2018-04-18T13:41:53+00:00" - }, - { - "name": "phpunit/phpunit-mock-objects", - "version": "6.1.1", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "70c740bde8fd9ea9ea295be1cd875dd7b267e157" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/70c740bde8fd9ea9ea295be1cd875dd7b267e157", - "reference": "70c740bde8fd9ea9ea295be1cd875dd7b267e157", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.0.5", - "php": "^7.1", - "phpunit/php-text-template": "^1.2.1", - "sebastian/exporter": "^3.1" - }, - "require-dev": { - "phpunit/phpunit": "^7.0" - }, - "suggest": { - "ext-soap": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "6.1-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" - } - ], - "description": "Mock Object library for PHPUnit", - "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", - "keywords": [ - "mock", - "xunit" - ], - "time": "2018-04-11T04:50:36+00:00" + "time": "2018-06-01T07:54:27+00:00" }, { "name": "roave/security-advisories", @@ -5339,23 +5290,23 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "9deddd9fc64853356d688a1514318abb2d9f3d4b" + "reference": "4d93302eb93402083f5abe72002fe8dc35e12dae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/9deddd9fc64853356d688a1514318abb2d9f3d4b", - "reference": "9deddd9fc64853356d688a1514318abb2d9f3d4b", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/4d93302eb93402083f5abe72002fe8dc35e12dae", + "reference": "4d93302eb93402083f5abe72002fe8dc35e12dae", "shasum": "" }, "conflict": { "3f/pygmentize": "<1.2", - "adodb/adodb-php": "<5.20.6", + "adodb/adodb-php": "<5.20.12", "amphp/artax": "<1.0.6|>=2,<2.0.6", "amphp/http": "<1.0.1", "asymmetricrypt/asymmetricrypt": ">=0,<9.9.99", "aws/aws-sdk-php": ">=3,<3.2.1", "bugsnag/bugsnag-laravel": ">=2,<2.0.2", - "cakephp/cakephp": ">=1.3,<1.3.18|>=2,<2.4.99|>=2.5,<2.5.99|>=2.6,<2.6.12|>=2.7,<2.7.6|>=3,<3.0.15|>=3.1,<3.1.4", + "cakephp/cakephp": ">=1.3,<1.3.18|>=2,<2.4.99|>=2.5,<2.5.99|>=2.6,<2.6.12|>=2.7,<2.7.6|>=3,<3.0.15|>=3.1,<3.1.4|>=3.4,<3.4.14|>=3.5,<3.5.17|>=3.6,<3.6.4", "cart2quote/module-quotation": ">=4.1.6,<=4.4.5|>=5,<5.4.4", "cartalyst/sentry": "<=2.1.6", "codeigniter/framework": "<=3.0.6", @@ -5375,13 +5326,14 @@ "doctrine/mongodb-odm-bundle": ">=2,<3.0.1", "doctrine/orm": ">=2,<2.4.8|>=2.5,<2.5.1", "dompdf/dompdf": ">=0.6,<0.6.2", - "drupal/core": ">=7,<7.58|>=8,<8.4.6|>=8.5,<8.5.1", - "drupal/drupal": ">=7,<7.58|>=8,<8.4.6|>=8.5,<8.5.1", + "drupal/core": ">=7,<7.59|>=8,<8.4.8|>=8.5,<8.5.3", + "drupal/drupal": ">=7,<7.59|>=8,<8.4.8|>=8.5,<8.5.3", "erusev/parsedown": "<1.7", "ezsystems/ezpublish-legacy": ">=5.3,<5.3.12.3|>=5.4,<5.4.11.3|>=2017.8,<2017.8.1.1|>=2017.12,<2017.12.2.1", "firebase/php-jwt": "<2", "friendsofsymfony/rest-bundle": ">=1.2,<1.2.2", "friendsofsymfony/user-bundle": ">=1.2,<1.3.5", + "fuel/core": "<1.8.1", "gree/jose": "<=2.2", "gregwar/rst": "<1.0.3", "guzzlehttp/guzzle": ">=6,<6.2.1|>=4.0.0-rc2,<4.2.4|>=5,<5.3.1", @@ -5427,16 +5379,18 @@ "symfony/dependency-injection": ">=2,<2.0.17", "symfony/form": ">=2.3,<2.3.35|>=2.4,<2.6.12|>=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13", "symfony/framework-bundle": ">=2,<2.3.18|>=2.4,<2.4.8|>=2.5,<2.5.2", - "symfony/http-foundation": ">=2,<2.3.27|>=2.4,<2.5.11|>=2.6,<2.6.6", + "symfony/http-foundation": ">=2,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", "symfony/http-kernel": ">=2,<2.3.29|>=2.4,<2.5.12|>=2.6,<2.6.8", "symfony/intl": ">=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13", "symfony/routing": ">=2,<2.0.19", - "symfony/security": ">=2,<2.0.25|>=2.1,<2.1.13|>=2.2,<2.2.9|>=2.3,<2.3.37|>=2.4,<2.6.13|>=2.7,<2.7.9|>=2.7.30,<2.7.32|>=2.8.23,<2.8.25|>=3.2.10,<3.2.12|>=3.3.3,<3.3.5", - "symfony/security-core": ">=2.4,<2.6.13|>=2.7,<2.7.9|>=2.7.30,<2.7.32|>=2.8,<2.8.6|>=2.8.23,<2.8.25|>=3,<3.0.6|>=3.2.10,<3.2.12|>=3.3.3,<3.3.5", - "symfony/security-csrf": ">=2.7,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13", - "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13", + "symfony/security": ">=2,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", + "symfony/security-bundle": ">=2,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", + "symfony/security-core": ">=2.4,<2.6.13|>=2.7,<2.7.9|>=2.7.30,<2.7.32|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", + "symfony/security-csrf": ">=2.4,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", + "symfony/security-guard": ">=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", + "symfony/security-http": ">=2.3,<2.3.41|>=2.4,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", "symfony/serializer": ">=2,<2.0.11", - "symfony/symfony": ">=2,<2.3.41|>=2.4,<2.7.38|>=2.8,<2.8.31|>=3,<3.2.14|>=3.3,<3.3.13", + "symfony/symfony": ">=2,<2.7.48|>=2.8,<2.8.41|>=3,<3.3.17|>=3.4,<3.4.11|>=4,<4.0.11", "symfony/translation": ">=2,<2.0.17", "symfony/validator": ">=2,<2.0.24|>=2.1,<2.1.12|>=2.2,<2.2.5|>=2.3,<2.3.3", "symfony/web-profiler-bundle": ">=2,<2.3.19|>=2.4,<2.4.9|>=2.5,<2.5.4", @@ -5494,7 +5448,7 @@ } ], "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", - "time": "2018-04-22T05:30:14+00:00" + "time": "2018-05-30T02:58:56+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -6061,7 +6015,7 @@ }, { "name": "symfony/class-loader", - "version": "v3.4.8", + "version": "v3.4.11", "source": { "type": "git", "url": "https://github.com/symfony/class-loader.git", @@ -6117,21 +6071,22 @@ }, { "name": "symfony/config", - "version": "v4.0.8", + "version": "v4.1.0", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "7c19370ab04e9ac05b74a504198e165f5ccf6dd8" + "reference": "5ceefc256caecc3e25147c4e5b933de71d0020c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/7c19370ab04e9ac05b74a504198e165f5ccf6dd8", - "reference": "7c19370ab04e9ac05b74a504198e165f5ccf6dd8", + "url": "https://api.github.com/repos/symfony/config/zipball/5ceefc256caecc3e25147c4e5b933de71d0020c4", + "reference": "5ceefc256caecc3e25147c4e5b933de71d0020c4", "shasum": "" }, "require": { "php": "^7.1.3", - "symfony/filesystem": "~3.4|~4.0" + "symfony/filesystem": "~3.4|~4.0", + "symfony/polyfill-ctype": "~1.8" }, "conflict": { "symfony/finder": "<3.4" @@ -6148,7 +6103,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -6175,29 +6130,30 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2018-03-19T22:35:49+00:00" + "time": "2018-05-16T14:33:22+00:00" }, { "name": "symfony/filesystem", - "version": "v4.0.8", + "version": "v4.1.0", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "5d2d655b2c72fc4d9bf7e9bf14f72a447b940f21" + "reference": "562bf7005b55fd80d26b582d28e3e10f2dd5ae9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/5d2d655b2c72fc4d9bf7e9bf14f72a447b940f21", - "reference": "5d2d655b2c72fc4d9bf7e9bf14f72a447b940f21", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/562bf7005b55fd80d26b582d28e3e10f2dd5ae9c", + "reference": "562bf7005b55fd80d26b582d28e3e10f2dd5ae9c", "shasum": "" }, "require": { - "php": "^7.1.3" + "php": "^7.1.3", + "symfony/polyfill-ctype": "~1.8" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -6224,20 +6180,20 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2018-02-22T10:50:29+00:00" + "time": "2018-05-30T07:26:09+00:00" }, { "name": "symfony/stopwatch", - "version": "v4.0.8", + "version": "v4.1.0", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "6795ffa2f8eebedac77f045aa62c0c10b2763042" + "reference": "07463bbbbbfe119045a24c4a516f92ebd2752784" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/6795ffa2f8eebedac77f045aa62c0c10b2763042", - "reference": "6795ffa2f8eebedac77f045aa62c0c10b2763042", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/07463bbbbbfe119045a24c4a516f92ebd2752784", + "reference": "07463bbbbbfe119045a24c4a516f92ebd2752784", "shasum": "" }, "require": { @@ -6246,7 +6202,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -6273,24 +6229,25 @@ ], "description": "Symfony Stopwatch Component", "homepage": "https://symfony.com", - "time": "2018-02-19T16:50:22+00:00" + "time": "2018-02-19T16:51:42+00:00" }, { "name": "symfony/yaml", - "version": "v4.0.8", + "version": "v4.1.0", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "8b34ebb5989df61cbd77eff29a02c4db9ac1069c" + "reference": "80e4bfa9685fc4a09acc4a857ec16974a9cd944e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/8b34ebb5989df61cbd77eff29a02c4db9ac1069c", - "reference": "8b34ebb5989df61cbd77eff29a02c4db9ac1069c", + "url": "https://api.github.com/repos/symfony/yaml/zipball/80e4bfa9685fc4a09acc4a857ec16974a9cd944e", + "reference": "80e4bfa9685fc4a09acc4a857ec16974a9cd944e", "shasum": "" }, "require": { - "php": "^7.1.3" + "php": "^7.1.3", + "symfony/polyfill-ctype": "~1.8" }, "conflict": { "symfony/console": "<3.4" @@ -6304,7 +6261,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "autoload": { @@ -6331,7 +6288,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2018-04-03T05:24:00+00:00" + "time": "2018-05-30T07:26:09+00:00" }, { "name": "theseer/tokenizer", @@ -6427,6 +6384,7 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { + "bunq/sdk_php": 20, "roave/security-advisories": 20 }, "prefer-stable": false, diff --git a/config/breadcrumbs.php b/config/breadcrumbs.php index ea323c8789..716bb21787 100644 --- a/config/breadcrumbs.php +++ b/config/breadcrumbs.php @@ -1,6 +1,4 @@ . */ +declare(strict_types=1); + return [ /* diff --git a/config/csv.php b/config/csv.php index 8f6ff88f9a..4af268d126 100644 --- a/config/csv.php +++ b/config/csv.php @@ -1,15 +1,8 @@ . */ +declare(strict_types=1); + +use FireflyIII\Import\Specifics\AbnAmroDescription; +use FireflyIII\Import\Specifics\IngDescription; +use FireflyIII\Import\Specifics\PresidentsChoice; +use FireflyIII\Import\Specifics\RabobankDescription; +use FireflyIII\Import\Specifics\SnsDescription; return [ diff --git a/config/firefly.php b/config/firefly.php index 28cb8b08f9..c0fe9ed9ea 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -1,5 +1,26 @@ . + */ + declare(strict_types=1); use FireflyIII\Export\Exporter\CsvExporter; @@ -55,31 +76,10 @@ use FireflyIII\TransactionRules\Triggers\ToAccountStarts; use FireflyIII\TransactionRules\Triggers\TransactionType; use FireflyIII\TransactionRules\Triggers\UserAction; -/** - * firefly.php - * Copyright (c) 2017 thegrumpydictator@gmail.com - * - * This file is part of Firefly III. - * - * Firefly III is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Firefly III is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Firefly III. If not, see . - */ - - /* * DO NOT EDIT THIS FILE. IT IS AUTO GENERATED. * - * ANY OPTIONS IN THIS FILE YOU CAN SAFELY EDIT CAN BE FOUND IN THE USER INTERFACE OF FIRFELY III. + * ANY OPTIONS IN THIS FILE YOU CAN SAFELY EDIT CAN BE FOUND IN THE USER INTERFACE OF FIREFLY III. */ return [ @@ -88,9 +88,9 @@ return [ 'is_demo_site' => false, ], 'encryption' => null === env('USE_ENCRYPTION') || env('USE_ENCRYPTION') === true, - 'version' => '4.7.3.2', + 'version' => '4.7.4', 'api_version' => '0.3', - 'db_version' => 3, + 'db_version' => 4, 'maxUploadSize' => 15242880, 'allowedMimes' => [ /* plain files */ @@ -158,10 +158,6 @@ return [ 'export_formats' => [ 'csv' => CsvExporter::class, ], - 'spectre' => [ - 'server' => 'https://www.saltedge.com', - ], - 'default_export_format' => 'csv', 'default_import_format' => 'csv', 'bill_periods' => ['weekly', 'monthly', 'quarterly', 'half-year', 'yearly'], @@ -283,6 +279,7 @@ return [ 'user' => \FireflyIII\User::class, // strings + 'import_provider' => \FireflyIII\Support\Binder\ImportProvider::class, // dates 'start_date' => \FireflyIII\Support\Binder\Date::class, diff --git a/config/google2fa.php b/config/google2fa.php index 2ff91b26c2..ff1ec61523 100644 --- a/config/google2fa.php +++ b/config/google2fa.php @@ -1,6 +1,4 @@ . */ +declare(strict_types=1); + + return [ /* diff --git a/config/hashing.php b/config/hashing.php index 77a4458077..daecb9634d 100644 --- a/config/hashing.php +++ b/config/hashing.php @@ -1,4 +1,25 @@ . + */ + declare(strict_types=1); return [ diff --git a/config/import.php b/config/import.php index 22961bab99..ed49fa8417 100644 --- a/config/import.php +++ b/config/import.php @@ -1,20 +1,8 @@ . */ +declare(strict_types=1); + +use FireflyIII\Import\JobConfiguration\BunqJobConfiguration; +use FireflyIII\Import\JobConfiguration\FakeJobConfiguration; +use FireflyIII\Import\JobConfiguration\FileJobConfiguration; +use FireflyIII\Import\JobConfiguration\SpectreJobConfiguration; +use FireflyIII\Import\Prerequisites\BunqPrerequisites; +use FireflyIII\Import\Prerequisites\FakePrerequisites; +use FireflyIII\Import\Prerequisites\SpectrePrerequisites; +use FireflyIII\Import\Routine\BunqRoutine; +use FireflyIII\Import\Routine\FakeRoutine; +use FireflyIII\Import\Routine\FileRoutine; +use FireflyIII\Import\Routine\SpectreRoutine; +use FireflyIII\Support\Import\Routine\File\CSVProcessor; return [ - 'enabled' => [ + // these import providers are available: + 'enabled' => [ + 'fake' => true, 'file' => true, 'bunq' => true, 'spectre' => true, 'plaid' => false, + 'quovo' => false, + 'yodlee' => false, + 'bad' => false, // always disabled ], - 'prerequisites' => [ - 'file' => FilePrerequisites::class, + // demo user can use these import providers (when enabled): + 'allowed_for_demo' => [ + 'fake' => true, + 'file' => false, + 'bunq' => false, + 'spectre' => false, + 'plaid' => false, + 'quovo' => false, + 'yodlee' => false, + ], + // a normal user user can use these import providers (when enabled): + 'allowed_for_user' => [ + 'fake' => false, + 'file' => true, + 'bunq' => true, + 'spectre' => true, + 'plaid' => true, + 'quovo' => true, + 'yodlee' => true, + ], + // some providers have pre-requisites. + 'has_prereq' => [ + 'fake' => true, + 'file' => false, + 'bunq' => true, + 'spectre' => true, + 'plaid' => true, + 'quovo' => true, + 'yodlee' => true, + ], + // if so, there must be a class to handle them. + 'prerequisites' => [ + 'fake' => FakePrerequisites::class, + 'file' => false, 'bunq' => BunqPrerequisites::class, 'spectre' => SpectrePrerequisites::class, - 'plaid' => 'FireflyIII\Import\Prerequisites\PlaidPrerequisites', - + 'plaid' => false, + 'quovo' => false, + 'yodlee' => false, ], - 'configuration' => [ - 'file' => FileConfigurator::class, - 'bunq' => BunqConfigurator::class, - 'spectre' => SpectreConfigurator::class, - 'plaid' => 'FireflyIII\Import\Configuration\PlaidConfigurator', + // some providers may need extra configuration per job + 'has_job_config' => [ + 'fake' => true, + 'file' => true, + 'bunq' => true, + 'spectre' => true, + 'plaid' => false, + 'quovo' => false, + 'yodlee' => false, ], - 'routine' => [ + // if so, this is the class that handles it. + 'configuration' => [ + 'fake' => FakeJobConfiguration::class, + 'file' => FileJobConfiguration::class, + 'bunq' => BunqJobConfiguration::class, + 'spectre' => SpectreJobConfiguration::class, + 'plaid' => false, + 'quovo' => false, + 'yodlee' => false, + ], + // this is the routine that runs the actual import. + 'routine' => [ + 'fake' => FakeRoutine::class, 'file' => FileRoutine::class, 'bunq' => BunqRoutine::class, 'spectre' => SpectreRoutine::class, - 'plaid' => 'FireflyIII\Import\Routine\PlaidRoutine', + 'plaid' => false, + 'quovo' => false, + 'yodlee' => false, ], - 'options' => [ - 'file' => [ + 'options' => [ + 'fake' => [], + 'file' => [ 'import_formats' => ['csv'], // mt940 'default_import_format' => 'csv', 'processors' => [ - 'csv' => CsvProcessor::class, + 'csv' => CSVProcessor::class, ], ], - 'bunq' => [ - 'server' => 'api.bunq.com', // sandbox.public.api.bunq.com - api.bunq.com - 'version' => 'v1', + 'bunq' => [ + 'live' => [ + 'server' => 'api.bunq.com', + 'version' => 'v1', + ], + 'sandbox' => [ + 'server' => 'sandbox.public.api.bunq.com', // sandbox.public.api.bunq.com - api.bunq.com + 'version' => 'v1', + ], ], 'spectre' => [ 'server' => 'www.saltedge.com', ], - ], - 'default_config' => [ - 'file' => [ - 'has-config-file' => true, - 'auto-start' => false, - ], - 'bunq' => [ - 'has-config-file' => false, - 'auto-start' => true, - ], - 'spectre' => [ - 'has-config-file' => false, - 'auto-start' => true, - ], - 'plaid' => [ - 'has-config-file' => false, - 'auto-start' => true, - ], + 'plaid' => [], + 'quovo' => [], + 'yodlee' => [], ], ]; diff --git a/config/twigbridge.php b/config/twigbridge.php index 63b6398f22..f4a2c2167a 100644 --- a/config/twigbridge.php +++ b/config/twigbridge.php @@ -1,22 +1,8 @@ . */ +declare(strict_types=1); + +use TwigBridge\Extension\Laravel\Auth; +use TwigBridge\Extension\Laravel\Config; +use TwigBridge\Extension\Laravel\Dump; +use TwigBridge\Extension\Laravel\Input; +use TwigBridge\Extension\Laravel\Session; +use TwigBridge\Extension\Laravel\Str; +use TwigBridge\Extension\Laravel\Translator; +use TwigBridge\Extension\Laravel\Url; +use TwigBridge\Extension\Loader\Facades; +use TwigBridge\Extension\Loader\Filters; +use TwigBridge\Extension\Loader\Functions; +use TwigBridge\Twig\Template; /** * Configuration options for Twig. @@ -188,7 +188,7 @@ return [ 'is_safe' => [ 'date', 'text', 'select', 'balance', 'optionsList', 'checkbox', 'amount', 'tags', 'integer', 'textarea', 'location', 'multiRadio', 'file', 'multiCheckbox', 'staticText', 'amountSmall', 'password', 'nonSelectableBalance', 'nonSelectableAmount', - 'number', 'assetAccountList','amountNoCurrency','currencyList' + 'number', 'assetAccountList','amountNoCurrency','currencyList','ruleGroupList','assetAccountCheckList','ruleGroupListWithEmpty' ], ], 'Form' => [ diff --git a/config/upgrade.php b/config/upgrade.php index afdc4a4f88..58def7e7f9 100644 --- a/config/upgrade.php +++ b/config/upgrade.php @@ -28,13 +28,16 @@ return [ '4.3' => 'Make sure you run the migrations and clear your cache. If you need more help, please check Github or the Firefly III website.', '4.6.3' => 'This will be the last version to require PHP7.0. Future versions will require PHP7.1 minimum.', '4.6.4' => 'This version of Firefly III requires PHP7.1.', - '4.7.3' => 'This version of Firefly III handles bills differently. See https://goo.gl/zkVdrF for more information.', + '4.7.3' => 'This version of Firefly III handles bills differently. See http://bit.ly/FF3-new-bills for more information.', + '4.7.4' => 'This version of Firefly III has a new import routine. See http://bit.ly/FF3-new-import for more information.', ], 'install' => [ '4.3' => 'Welcome to Firefly! Make sure you follow the installation guide. If you need more help, please check Github or the Firefly III website. The installation guide has a FAQ which you should check out as well.', '4.6.3' => 'This will be the last version to require PHP7.0. Future versions will require PHP7.1 minimum.', '4.6.4' => 'This version of Firefly III requires PHP7.1.', + '4.7.3' => 'This version of Firefly III handles bills differently. See http://bit.ly/FF3-new-bills for more information.', + '4.7.4' => 'This version of Firefly III has a new import routine. See http://bit.ly/FF3-new-import for more information.', ], ], ]; diff --git a/database/migrations/2018_01_01_000001_create_oauth_auth_codes_table.php b/database/migrations/2018_01_01_000001_create_oauth_auth_codes_table.php index 9ea338668d..068f187e0d 100644 --- a/database/migrations/2018_01_01_000001_create_oauth_auth_codes_table.php +++ b/database/migrations/2018_01_01_000001_create_oauth_auth_codes_table.php @@ -1,7 +1,6 @@ . */ +declare(strict_types=1); + use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; diff --git a/database/migrations/2018_01_01_000002_create_oauth_access_tokens_table.php b/database/migrations/2018_01_01_000002_create_oauth_access_tokens_table.php index 4c9574d3e8..00889896fb 100644 --- a/database/migrations/2018_01_01_000002_create_oauth_access_tokens_table.php +++ b/database/migrations/2018_01_01_000002_create_oauth_access_tokens_table.php @@ -1,7 +1,6 @@ . */ +declare(strict_types=1); + use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; diff --git a/database/migrations/2018_01_01_000003_create_oauth_refresh_tokens_table.php b/database/migrations/2018_01_01_000003_create_oauth_refresh_tokens_table.php index db3a09a15e..1d6199d904 100644 --- a/database/migrations/2018_01_01_000003_create_oauth_refresh_tokens_table.php +++ b/database/migrations/2018_01_01_000003_create_oauth_refresh_tokens_table.php @@ -1,7 +1,6 @@ . */ +declare(strict_types=1); + use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; diff --git a/database/migrations/2018_01_01_000004_create_oauth_clients_table.php b/database/migrations/2018_01_01_000004_create_oauth_clients_table.php index 7a93146474..cbd08eb1db 100644 --- a/database/migrations/2018_01_01_000004_create_oauth_clients_table.php +++ b/database/migrations/2018_01_01_000004_create_oauth_clients_table.php @@ -1,7 +1,6 @@ . */ +declare(strict_types=1); + use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; diff --git a/database/migrations/2018_01_01_000005_create_oauth_personal_access_clients_table.php b/database/migrations/2018_01_01_000005_create_oauth_personal_access_clients_table.php index 9ec29ce525..e584f7fc4b 100644 --- a/database/migrations/2018_01_01_000005_create_oauth_personal_access_clients_table.php +++ b/database/migrations/2018_01_01_000005_create_oauth_personal_access_clients_table.php @@ -1,7 +1,6 @@ . */ +declare(strict_types=1); + use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; diff --git a/database/migrations/2018_03_19_141348_changes_for_v472.php b/database/migrations/2018_03_19_141348_changes_for_v472.php index 0960d6e381..00997e749e 100644 --- a/database/migrations/2018_03_19_141348_changes_for_v472.php +++ b/database/migrations/2018_03_19_141348_changes_for_v472.php @@ -1,4 +1,25 @@ . + */ + declare(strict_types=1); use Illuminate\Database\Migrations\Migration; diff --git a/database/migrations/2018_04_07_210913_changes_for_v473.php b/database/migrations/2018_04_07_210913_changes_for_v473.php index 0e9492ca88..a6067a92e7 100644 --- a/database/migrations/2018_04_07_210913_changes_for_v473.php +++ b/database/migrations/2018_04_07_210913_changes_for_v473.php @@ -1,5 +1,27 @@ . + */ + +declare(strict_types=1); + use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; diff --git a/database/migrations/2018_04_29_174524_changes_for_v474.php b/database/migrations/2018_04_29_174524_changes_for_v474.php new file mode 100644 index 0000000000..cdc6208f35 --- /dev/null +++ b/database/migrations/2018_04_29_174524_changes_for_v474.php @@ -0,0 +1,63 @@ +. + */ + +declare(strict_types=1); + +use Illuminate\Database\Migrations\Migration; +use Illuminate\Database\Schema\Blueprint; + +/** + * Class ChangesForV474 + */ +class ChangesForV474 extends Migration +{ + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } + + /** + * Run the migrations. + * + * @return void + */ + public function up() + { + Schema::table( + 'import_jobs', + function (Blueprint $table) { + $table->string('provider', 50)->after('file_type')->default(''); + $table->string('stage', 50)->after('status')->default(''); + $table->longText('transactions')->after('extended_status')->nullable(); + $table->longText('errors')->after('transactions')->nullable(); + + $table->integer('tag_id', false, true)->nullable()->after('user_id'); + $table->foreign('tag_id')->references('id')->on('tags')->onDelete('set null'); + } + ); + } +} diff --git a/database/seeds/ConfigSeeder.php b/database/seeds/ConfigSeeder.php index e37857aa81..e5c8d250d5 100644 --- a/database/seeds/ConfigSeeder.php +++ b/database/seeds/ConfigSeeder.php @@ -1,5 +1,26 @@ . + */ + use FireflyIII\Models\Configuration; use Illuminate\Database\Seeder; diff --git a/database/seeds/TransactionCurrencySeeder.php b/database/seeds/TransactionCurrencySeeder.php index 1fc5dce66d..764dd26469 100644 --- a/database/seeds/TransactionCurrencySeeder.php +++ b/database/seeds/TransactionCurrencySeeder.php @@ -58,6 +58,7 @@ class TransactionCurrencySeeder extends Seeder $currencies[] = ['code' => 'JPY', 'name' => 'Japanese yen', 'symbol' => '¥', 'decimal_places' => 2]; $currencies[] = ['code' => 'RMB', 'name' => 'Chinese yuan', 'symbol' => '元', 'decimal_places' => 2]; $currencies[] = ['code' => 'RUB', 'name' => 'Russian ruble ', 'symbol' => '₽', 'decimal_places' => 2]; + $currencies[] = ['code' => 'INR', 'name' => 'Indian rupee', 'symbol' => '₹', 'decimal_places' => 2]; // international currencies $currencies[] = ['code' => 'XBT', 'name' => 'Bitcoin', 'symbol' => '₿', 'decimal_places' => 8]; diff --git a/public/css/firefly.css b/public/css/firefly.css index 25487e0ffe..dacc76681a 100644 --- a/public/css/firefly.css +++ b/public/css/firefly.css @@ -153,7 +153,7 @@ body.waiting * { } span.info-box-text a, span.info-box-number a { - color: #000; + color: #fff; } span.info-box-icon a { @@ -161,7 +161,7 @@ span.info-box-icon a { } span.info-box-text a:hover, span.info-box-number a:hover { - color: #000; + color: #fff; text-decoration: underline; } @@ -169,4 +169,4 @@ span.info-box-text a:hover, span.info-box-number a:hover { max-height: 300px; overflow-y: auto; overflow-x: hidden; -} \ No newline at end of file +} diff --git a/public/images/logos/fake.png b/public/images/logos/fake.png new file mode 100644 index 0000000000..cc22b72065 Binary files /dev/null and b/public/images/logos/fake.png differ diff --git a/public/images/logos/quovo.png b/public/images/logos/quovo.png new file mode 100644 index 0000000000..cf17bef456 Binary files /dev/null and b/public/images/logos/quovo.png differ diff --git a/public/images/logos/yodlee.png b/public/images/logos/yodlee.png new file mode 100644 index 0000000000..fbd5803b40 Binary files /dev/null and b/public/images/logos/yodlee.png differ diff --git a/public/index.php b/public/index.php index 86d14aca18..1a28dc9bab 100644 --- a/public/index.php +++ b/public/index.php @@ -57,6 +57,7 @@ require __DIR__ . '/../vendor/autoload.php'; /** @noinspection UsingInclusionOnceReturnValueInspection */ $app = require_once __DIR__ . '/../bootstrap/app.php'; + /* |-------------------------------------------------------------------------- | Run The Application @@ -74,7 +75,6 @@ $kernel = $app->make(Illuminate\Contracts\Http\Kernel::class); $response = $kernel->handle( $request = Illuminate\Http\Request::capture() ); - $response->send(); $kernel->terminate($request, $response); diff --git a/app/Import/FileProcessor/FileProcessorInterface.php b/public/js/ff/import/file/configure-upload.js similarity index 51% rename from app/Import/FileProcessor/FileProcessorInterface.php rename to public/js/ff/import/file/configure-upload.js index 7b6de00ade..ec138f6f71 100644 --- a/app/Import/FileProcessor/FileProcessorInterface.php +++ b/public/js/ff/import/file/configure-upload.js @@ -1,7 +1,6 @@ -. */ -declare(strict_types=1); -namespace FireflyIII\Import\FileProcessor; +$(function () { + "use strict"; -use FireflyIII\Models\ImportJob; -use Illuminate\Support\Collection; + var importMultiSelect = { + disableIfEmpty: true, + selectAllText: selectAllText, + nonSelectedText: nonSelectedText, + nSelectedText: nSelectedText, + allSelectedText: allSelectedText, + includeSelectAllOption: true, + enableFiltering: true, + enableCaseInsensitiveFiltering: true, + filterPlaceholder: filterPlaceholder, + enableHTML: true, + }; -/** - * Interface FileProcessorInterface. - */ -interface FileProcessorInterface -{ - /** - * @return Collection - */ - public function getObjects(): Collection; +// make account select a hip new bootstrap multi-select thing. + $('#inputSpecifics').multiselect(importMultiSelect); - /** - * @return bool - */ - public function run(): bool; - - /** - * @param ImportJob $job - * - * @return FileProcessorInterface - */ - public function setJob(ImportJob $job): FileProcessorInterface; -} +}); \ No newline at end of file diff --git a/public/js/ff/import/status.js b/public/js/ff/import/status.js index 73f621239c..46c176e2da 100644 --- a/public/js/ff/import/status.js +++ b/public/js/ff/import/status.js @@ -63,6 +63,10 @@ function checkJobStatus() { */ function reportFailedJob(jqxhr, textStatus, error) { console.log('In reportFailedJob()'); + + // cancel refresh + clearTimeout(timeOutId); + // hide all possible boxes: $('.statusbox').hide(); @@ -133,6 +137,7 @@ function reportOnJobStatus(data) { $('#import-status-more-info').html(data.finishedText); break; case "error": + clearTimeout(timeOutId); console.log('Job reports ERROR.'); // hide all possible boxes: $('.statusbox').hide(); diff --git a/public/js/ff/import/status_v2.js b/public/js/ff/import/status_v2.js new file mode 100644 index 0000000000..d5cafb34a7 --- /dev/null +++ b/public/js/ff/import/status_v2.js @@ -0,0 +1,296 @@ +/* + * status_v2.js + * Copyright (c) 2018 thegrumpydictator@gmail.com + * + * This file is part of Firefly III. + * + * Firefly III is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Firefly III is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Firefly III. If not, see . + */ + +/** global: jobStatusUri */ + +var timeOutId; +var jobRunRoutineStarted = false; +var jobStorageRoutineStarted = false; +var checkInitialInterval = 1000; +var checkNextInterval = 500; +var maxLoops = 60; +var totalLoops = 0; +var startCount = 0; +var jobFailed = false; +// set to true when error is reported. +// will prevent double error reporting +var reportedError = false; + + +$(function () { + "use strict"; + timeOutId = setTimeout(checkJobJSONStatus, checkInitialInterval); +}); + +/** + * Downloads some JSON and responds to its content to see what the status is of the current import job. + */ +function checkJobJSONStatus() { + console.log('In checkJobJSONStatus()'); + if (jobFailed === false) { + $.getJSON(jobStatusUri).done(reportJobJSONDone).fail(reportJobJSONFailure); + } + if (jobFailed === true) { + console.error('Job has failed, will not check.'); + } +} + +/** + * Reports to the user what the state is of the current job. + * + * @param data + */ +function reportJobJSONDone(data) { + console.log('In reportJobJSONDone() with status "' + data.status + '"'); + console.log(data); + switch (data.status) { + case "ready_to_run": + if (startCount > 0) { + jobRunRoutineStarted = false; + } + startCount++; + sendJobPOSTStart(); + recheckJobJSONStatus(); + break; + case "need_job_config": + console.log("Will redirect user to " + jobConfigurationUri); + // redirect user to configuration for this job. + window.location.replace(jobConfigurationUri); + break; + case 'error': + reportJobError(data); + break; + case 'provider_finished': + // call routine to store stuff: + sendJobPOSTStore(); + recheckJobJSONStatus(); + break; + case "storage_finished": + case "finished": + showJobResults(data); + break; + default: + console.warn('No specific action for status ' + data.status); + showProgressBox(data.status); + recheckJobJSONStatus(); + + } +} + +/** + * + * @param data + */ +function showJobResults(data) { + console.log('In showJobResults()'); + // hide all boxes. + $('.statusbox').hide(); + + // render the count: + $('#import-status-more-info').append($('').html(data.report_txt)); + + // render relevant data from JSON thing. + if (data.errors.length > 0) { + $('#import-status-error-txt').show(); + data.errors.forEach(function (element) { + console.error(element); + $('#import-status-errors').append($('
  • ').text(element)); + }); + } + if(data.download_config) { + $('#import-status-download').append($('').html(data.download_config_text)); + } + + // show success box. + $('.status_finished').show(); + +} + +/** + * Will refresh and get job status. + */ +function recheckJobJSONStatus() { + console.log('In recheckJobJSONStatus()'); + if (maxLoops !== 0 && totalLoops < maxLoops && jobFailed === false) { + timeOutId = setTimeout(checkJobJSONStatus, checkNextInterval); + } + if (maxLoops !== 0) { + console.log('max: ' + maxLoops + ' current: ' + totalLoops); + } + if (jobFailed === true) { + console.error('Job has failed, will not do recheck.'); + } + totalLoops++; +} + +/** + * Start the job. + */ +function sendJobPOSTStart() { + console.log('In sendJobPOSTStart()'); + if (jobRunRoutineStarted) { + console.log('Import job already started!'); + return; + } + if (jobFailed === true) { + console.log('Job has failed, will not start again.'); + return; + } + console.log('Job was started'); + jobRunRoutineStarted = true; + $.post(jobStartUri, {_token: token}).fail(reportJobPOSTFailure).done(reportJobPOSTDone) +} + +/** + * Start the storage routine for this job. + */ +function sendJobPOSTStore() { + console.log('In sendJobPOSTStore()'); + if (jobStorageRoutineStarted) { + console.log('Store job already started!'); + return; + } + if (jobFailed === true) { + console.log('Job has failed, will not start again.'); + return; + } + console.log('Storage job has started!'); + jobStorageRoutineStarted = true; + $.post(jobStorageStartUri, {_token: token}).fail(reportJobPOSTFailure).done(reportJobPOSTDone) +} + + +/** + * Function is called when the JSON array could not be retrieved. + * + * @param xhr + * @param status + * @param error + */ +function reportJobJSONFailure(xhr, status, error) { + console.log('In reportJobJSONFailure()'); + jobFailed = true; + if (reportedError === false) { + reportedError = true; + // cancel checking again for job status: + clearTimeout(timeOutId); + + + // hide status boxes: + $('.statusbox').hide(); + + // show fatal error box: + $('.fatal_error').show(); + $('.fatal_error_txt').text('Cannot get status of current job: ' + status + ': ' + error); + } +} + +/** + * + */ +function showProgressBox(status) { + console.log('In showProgressBox()'); + // hide fatal error box: + $('.fatal_error').hide(); + + // hide initial status box: + $('.status_initial').hide(); + + // show running box: + $('.status_running').show(); + + if (status === 'running' || status === 'ready_to_run') { + $('#import-status-txt').text(langImportRunning); + return; + } + if (status === 'storing_data' || status === 'storage_finished' || status === 'stored_data') { + $('#import-status-txt').text(langImportStoring); + return; + } + if (status === 'applying_rules' || status === 'linking_to_tag' || status === 'linked_to_tag' || status === 'rules_applied') { + $('#import-status-txt').text(langImportRules); + return; + } + + $('#import-status-txt').text('Job status: ' + status); + + +} + +/** + * Function is called when the job could not be started. + * + * @param xhr + * @param status + * @param error + */ +function reportJobPOSTFailure(xhr, status, error) { + console.log('In reportJobPOSTFailure()'); + // cancel checking again for job status: + clearTimeout(timeOutId); + if (reportedError === false) { + reportedError = true; + // hide status boxes: + $('.statusbox').hide(); + + // show fatal error box: + $('.fatal_error').show(); + console.error('Job could not be started or crashed: ' + status + ': ' + error); + $('.fatal_error_txt').text('Job could not be started or crashed: ' + status + ': ' + error); + // show error box. + } +} + +/** + * Show error to user. + */ +function reportJobError(data) { + console.log('In reportJobError()'); + // cancel checking again for job status: + clearTimeout(timeOutId); + if (reportedError === false) { + reportedError = true; + // hide status boxes: + $('.statusbox').hide(); + // show fatal error box: + $('.fatal_error').show(); + console.error(data.report_txt); + $('.fatal_error_txt').text('Job reports error. Please start again. Apologies. Error message is: ' + data.report_txt); + } +} + +function reportJobPOSTDone(data) { + console.log('In function reportJobPOSTDone() with status "' + data.status + '"'); + if (data.status === 'NOK' && reportedError === false) { + reportedError = true; + // cancel checking again for job status: + clearTimeout(timeOutId); + + // hide status boxes: + $('.statusbox').hide(); + + // show fatal error box: + $('.fatal_error').show(); + console.error(data.message); + $('.fatal_error_txt').text('Job could not be started or crashed: ' + data.message); + + + } +} \ No newline at end of file diff --git a/public/js/ff/piggy-banks/index.js b/public/js/ff/piggy-banks/index.js index 292d7f7f7d..009e2dda6f 100644 --- a/public/js/ff/piggy-banks/index.js +++ b/public/js/ff/piggy-banks/index.js @@ -83,13 +83,31 @@ function removeMoney(e) { function stopSorting() { "use strict"; $('.loadSpin').addClass('fa fa-refresh fa-spin'); - var order = []; + $.each($('#sortable-piggy>tbody>tr'), function (i, v) { var holder = $(v); + var position = parseInt(holder.data('position')); + var originalOrder = parseInt(holder.data('order')); + var name = holder.data('name'); var id = holder.data('id'); - order.push(id); - }); - $.post('piggy-banks/sort', {order: order, _token: token}).done(function () { - $('.loadSpin').removeClass('fa fa-refresh fa-spin'); + var newOrder; + if (position === i) { + // not changed, position is what it should be. + return; + } + if (position < i) { + // position is less. + console.log('"' + name + '" has moved up from position ' + originalOrder + ' to ' + (i+1)); + } + if (position > i) { + console.log('"' + name + '" has moved up from position ' + originalOrder + ' to ' + (i+1)); + } + // update position: + holder.data('position', i); + newOrder = i+1; + + $.post('piggy-banks/set-order/' + id, {order: newOrder, _token: token}) }); + $('.loadSpin').removeClass('fa fa-refresh fa-spin'); + } \ No newline at end of file diff --git a/public/js/ff/transactions/split/edit.js b/public/js/ff/transactions/split/edit.js index 9b5aae1e99..a99a39f651 100644 --- a/public/js/ff/transactions/split/edit.js +++ b/public/js/ff/transactions/split/edit.js @@ -33,12 +33,12 @@ $(document).ready(function () { $.getJSON('json/expense-accounts').done(function (data) { destAccounts = data; - $('input[name$="destination_account_name]"]').typeahead({source: destAccounts, autoSelect: false}); + $('input[name$="destination_name]"]').typeahead({source: destAccounts, autoSelect: false}); }); $.getJSON('json/revenue-accounts').done(function (data) { srcAccounts = data; - $('input[name$="source_account_name]"]').typeahead({source: srcAccounts, autoSelect: false}); + $('input[name$="source_name]"]').typeahead({source: srcAccounts, autoSelect: false}); }); $.getJSON('json/categories').done(function (data) { @@ -123,11 +123,11 @@ function cloneDivRow() { source.find('input[name$="][amount]"]').val("").on('change', calculateBothSums); source.find('input[name$="][foreign_amount]"]').val("").on('change', calculateBothSums); if (destAccounts.length > 0) { - source.find('input[name$="destination_account_name]"]').typeahead({source: destAccounts, autoSelect: false}); + source.find('input[name$="destination_name]"]').typeahead({source: destAccounts, autoSelect: false}); } if (srcAccounts.length > 0) { - source.find('input[name$="source_account_name]"]').typeahead({source: srcAccounts, autoSelect: false}); + source.find('input[name$="source_name]"]').typeahead({source: srcAccounts, autoSelect: false}); } if (categories.length > 0) { source.find('input[name$="category_name]"]').typeahead({source: categories, autoSelect: false}); @@ -186,12 +186,12 @@ function resetDivSplits() { input.attr('name', 'transactions[' + i + '][transaction_description]'); }); // ends with ][destination_account_name] - $.each($('input[name$="][destination_account_name]"]'), function (i, v) { + $.each($('input[name$="][destination_name]"]'), function (i, v) { var input = $(v); input.attr('name', 'transactions[' + i + '][destination_account_name]'); }); // ends with ][source_account_name] - $.each($('input[name$="][source_account_name]"]'), function (i, v) { + $.each($('input[name$="][source_name]"]'), function (i, v) { var input = $(v); input.attr('name', 'transactions[' + i + '][source_account_name]'); }); diff --git a/readme.md b/readme.md index 05e6bd0d8f..ca966ebf2b 100644 --- a/readme.md +++ b/readme.md @@ -7,6 +7,9 @@ Packagist License + + Patreon +

    @@ -32,9 +35,9 @@ ## Introduction "Firefly III" is a (self-hosted) manager for your personal finances. It can help you keep track of your expenses and income, so you can spend less and save more. Firefly III supports the use of budgets, categories and tags. It can import data from external sources and it has many neat financial reports available. Here are some screenshots: -[![The index of Firefly III](https://firefly-iii.org/static/screenshots/4.7.0/tiny/index.png)](https://firefly-iii.org/static/screenshots/4.7.0/index.png) [![The account overview of Firefly III](https://firefly-iii.org/static/screenshots/4.7.0/tiny/account.png)](https://firefly-iii.org/static/screenshots/4.7.0/account.png) +[![The index of Firefly III](https://firefly-iii.org/static/screenshots/4.7.4/tiny/index.png)](https://firefly-iii.org/static/screenshots/4.7.4/index.png) [![The account overview of Firefly III](https://firefly-iii.org/static/screenshots/4.7.4/tiny/account.png)](https://firefly-iii.org/static/screenshots/4.7.4/account.png) -[![Overview of all budgets](https://firefly-iii.org/static/screenshots/4.7.0/tiny/budget.png)](https://firefly-iii.org/static/screenshots/4.7.0/budget.png) [![Overview of a category](https://firefly-iii.org/static/screenshots/4.7.0/tiny/category.png)](https://firefly-iii.org/static/screenshots/4.7.0/category.png) +[![Overview of all budgets](https://firefly-iii.org/static/screenshots/4.7.4/tiny/budget.png)](https://firefly-iii.org/static/screenshots/4.7.4/budget.png) [![Overview of a category](https://firefly-iii.org/static/screenshots/4.7.4/tiny/category.png)](https://firefly-iii.org/static/screenshots/4.7.4/category.png) ### Purpose Personal financial management is pretty difficult, and everybody has their own approach to it. Some people make budgets, other people limit their cashflow by throwing away their credit cards, others try to increase their current cashflow. There are tons of ways to save and earn money. Firefly III works on the principle that if you know where you're money is going, you can stop it from going there. @@ -48,6 +51,7 @@ Most importantly... * Firefly III runs on your own server, so you are fully in control of your data. It will not contact other sites or servers. * You can import from over 2500 financial providers, in 55 countries when you enable the [Spectre API](http://firefly-iii.readthedocs.io/en/latest/import/spectre.html). +* You can import from [bunq](https://www.bunq.com/). * You can import CSV files from practically any bank. * Firefly III features an JSON REST API. * If you feel you’re missing something you can just ask me and I’ll add it! diff --git a/resources/lang/de_DE/auth.php b/resources/lang/de_DE/auth.php index 89e83d4fc7..5973e3031e 100644 --- a/resources/lang/de_DE/auth.php +++ b/resources/lang/de_DE/auth.php @@ -1,9 +1,8 @@ . */ -return [ - /* - |-------------------------------------------------------------------------- - | Authentication Language Lines - |-------------------------------------------------------------------------- - | - | The following language lines are used during authentication for various - | messages that we need to display to the user. You are free to modify - | these language lines according to your application's requirements. - | - */ +declare(strict_types=1); +return [ 'failed' => 'Falscher Benutzername und/oder falsches Passwort.', 'throttle' => 'Zu viele Anmeldeversuche. Bitte versuchen Sie es in :seconds Sekunden erneut.', ]; diff --git a/resources/lang/de_DE/bank.php b/resources/lang/de_DE/bank.php index 8826020cbf..5d00b1e685 100644 --- a/resources/lang/de_DE/bank.php +++ b/resources/lang/de_DE/bank.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ ]; diff --git a/resources/lang/de_DE/breadcrumbs.php b/resources/lang/de_DE/breadcrumbs.php index 89da61a42c..777321a6f0 100644 --- a/resources/lang/de_DE/breadcrumbs.php +++ b/resources/lang/de_DE/breadcrumbs.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'home' => 'Startseite', 'edit_currency' => 'Währung „:name†bearbeiten', diff --git a/resources/lang/de_DE/components.php b/resources/lang/de_DE/components.php index 27cc4cdd9b..eab77f0c4f 100644 --- a/resources/lang/de_DE/components.php +++ b/resources/lang/de_DE/components.php @@ -1,5 +1,4 @@ . */ +declare(strict_types=1); + return [ // profile 'personal_access_tokens' => 'Persönliche Zugangs-Authentifizierungsschlüssel', diff --git a/resources/lang/de_DE/config.php b/resources/lang/de_DE/config.php index 51bb831575..a42da571da 100644 --- a/resources/lang/de_DE/config.php +++ b/resources/lang/de_DE/config.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'html_language' => 'de', 'locale' => 'de, Deutsch, de_DE, de_DE.utf8, de_DE.UTF-8', diff --git a/resources/lang/de_DE/csv.php b/resources/lang/de_DE/csv.php index 622a49202a..aae109a40a 100644 --- a/resources/lang/de_DE/csv.php +++ b/resources/lang/de_DE/csv.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ ]; diff --git a/resources/lang/de_DE/demo.php b/resources/lang/de_DE/demo.php index d0dfca4076..479be2661f 100644 --- a/resources/lang/de_DE/demo.php +++ b/resources/lang/de_DE/demo.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'no_demo_text' => 'Leider gibt es keine zusätzlichen Demo-Erklärungen für diese Seite.', 'see_help_icon' => 'Vielleicht erfahren Sie mehr über das -Icon in der oberen rechten Ecke.', @@ -32,5 +33,5 @@ return [ 'currencies-index' => 'Firefly III kann mit Zahlungen in unterschiedlichen Währungen umgeben. Obwohl es den Euro standardmäßig nutzt, ist es möglich, US-Dollar oder andere Währungen zu verwenden. Eine kleine Auswahl an Währungen wird bereitgestellt, Sie können jedoch weitere hinzufügen. Eine Veränderung der Standardwährung verändert keine bestehende Buchungen. Firefly III unterstützt die Verwendung mehrerer Währungen zur gleichen Zeit.', 'transactions-index' => 'Diese Ausgaben, Einnahmen und Umbuchungen sind nicht besonders einfallsreich. Sie wurden automatisch generiert.', 'piggy-banks-index' => 'Hier wurden bereits drei Sparschweine angelegt. Der Betrag in den Sparschweinen kann über die Plus-/Minus-Buttons angepasst werden. Klicken Sie auf den Namen des Sparschweins um weitere Informationen einzusehen.', - 'import-index' => 'Natürlich kann jede CSV-Datei in Firefly III importiert werden', + 'import-index' => 'Jede CSV-Datei kann in Firefly III importiert werden. Es wird auch der Import von Daten aus Bunq und Spectre unterstützt. Weitere Banken und Finanzaggregatoren werden in Zukunft implementiert. Als Demo-Anwender können Sie jedoch nur einen „Scheinâ€-Anbieter in Aktion erleben. Es werden einige zufällige Transaktionen generiert, um Ihnen zu zeigen, wie der Prozess funktioniert.', ]; diff --git a/resources/lang/de_DE/firefly.php b/resources/lang/de_DE/firefly.php index 847652b6f3..6bbbcaf6de 100644 --- a/resources/lang/de_DE/firefly.php +++ b/resources/lang/de_DE/firefly.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // general stuff: 'close' => 'Schließen', @@ -179,6 +180,7 @@ return [ 'authorization_request_intro' => ':client bittet um Erlaubnis, auf Ihre Finanzverwaltung zuzugreifen. Möchten Sie :client erlauben auf diese Datensätze zuzugreifen?', 'scopes_will_be_able' => 'Diese Anwendung kann:', 'button_authorize' => 'Erlauben', + 'none_in_select_list' => '(Keine)', // check for updates: 'update_check_title' => 'Nach Updates suchen', @@ -232,7 +234,7 @@ return [ 'export_status_make_exporter' => 'Export wird erstellt...', 'export_status_collecting_journals' => 'Ihre Ãœberweisungen werden erfasst ...', 'export_status_collected_journals' => 'Buchungen erfasst!', - 'export_status_converting_to_export_format' => 'Buchungen werden umgewandelt …', + 'export_status_converting_to_export_format' => 'Buchungen werden umgewandelt...', 'export_status_converted_to_export_format' => 'Ihre Buchungen wurden erfasst!', 'export_status_creating_journal_file' => 'Exportdatei wird erstellt...', 'export_status_created_journal_file' => 'Exportdatei erstellt!', @@ -296,7 +298,7 @@ return [ 'delete_rule' => 'Lösche Regel ":title"', 'update_rule' => 'Regel bearbeiten', 'test_rule_triggers' => 'Ãœbereinstimmende Buchungen anzeigen', - 'warning_transaction_subset' => 'Aus Geschwindigkeitsgründen beschränkt sich diese Liste auf :max_num_transactions Buchungen und zeigt möglicherweise nur einen Teil dieser an.', + 'warning_transaction_subset' => 'Aus Geschwindigkeitsgründen beschränkt sich diese Liste auf :max_num_transactions Buchungen und zeigt möglicherweise nur einen Teil dieser an', 'warning_no_matching_transactions' => 'Keine übereinstimmenden Buchungen gefunden. Aus Geschwindigkeitsgründen werden nur die letzten :num_transactions Buchungen überprüft.', 'warning_no_valid_triggers' => 'Keine gültigen Trigger gefunden.', 'apply_rule_selection' => 'Regel „:title†auf eine Auswahl Ihrer Buchungen anwenden', @@ -402,15 +404,15 @@ return [ 'rule_action_set_source_account' => 'Lege Quellkonto als :action_value fest', 'rule_action_set_destination_account_choice' => 'Zielkonto festlegen...', 'rule_action_set_destination_account' => 'Lege Zielkonto als :action_value fest', - 'rule_action_append_notes_choice' => 'Notizen anhängen mit …', + 'rule_action_append_notes_choice' => 'Notizen anhängen mit..', 'rule_action_append_notes' => 'Notizen mit „:action_value†anhängen', - 'rule_action_prepend_notes_choice' => 'Notizen voranstellen mit …', + 'rule_action_prepend_notes_choice' => 'Notizen voranstellen mit..', 'rule_action_prepend_notes' => 'Notizen „:action_value†voranstellen', 'rule_action_clear_notes_choice' => 'Alle Notizen entfernen', 'rule_action_clear_notes' => 'Alle Notizen entfernen', - 'rule_action_set_notes_choice' => 'Notizen festlegen auf …', - 'rule_action_link_to_bill_choice' => 'Mit einer Rechnung verknüpfen …', - 'rule_action_link_to_bill' => 'Mit Rechnung „:action_value†verknüpfen …', + 'rule_action_set_notes_choice' => 'Notizen festlegen auf..', + 'rule_action_link_to_bill_choice' => 'Mit einer Rechnung verknüpfen..', + 'rule_action_link_to_bill' => 'Mit Rechnung „:action_value†verknüpfen', 'rule_action_set_notes' => 'Notizen auf „:action_value†festlegen', 'rules_have_read_warning' => 'Haben Sie die Warnung gelesen?', @@ -667,6 +669,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?', 'bill_will_automatch' => 'Rechnung wird automatisch mit passenden Buchungen verknüpft', 'skips_over' => 'überschreitet', 'bill_store_error' => 'Beim Speichern Ihrer neuen Rechnung ist ein unerwarteter Fehler aufgetreten. Bitte überprüfen Sie die Protokolldateien.', + 'list_inactive_rule' => 'Inaktive Regeln', // accounts: 'details_for_asset' => 'Informationen zum Bestandskonto „:nameâ€', @@ -802,6 +805,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?', 'opt_group_savingAsset' => 'Sparkonten', 'opt_group_sharedAsset' => 'Gemeinsame Bestandskonten', 'opt_group_ccAsset' => 'Kreditkarten', + 'opt_group_cashWalletAsset' => 'Geldbörsen', 'notes' => 'Notizen', 'unknown_journal_error' => 'Die Buchung konnte nicht gespeichert werden. Bitte überprüfen Sie die Protokolldateien.', @@ -817,6 +821,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?', 'language' => 'Sprache', 'new_savings_account' => ':bank_name-Sparkonto', 'cash_wallet' => 'Geldbörse', + 'currency_not_present' => 'Wenn die Währung, die Sie normalerweise verwenden, nicht aufgeführt ist, machen Sie sich keine Sorgen. Unter Optionen âžœ Währungen können Sie eigene Währungen anlegen.', // home page: 'yourAccounts' => 'Deine Konten', @@ -1014,6 +1019,7 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?', 'remove_money_from_piggy_title' => 'Geld dem Sparschwein „:name†entnehmen', 'add' => 'Hinzufügen', 'no_money_for_piggy' => 'Sie haben kein Geld, welches Sie in dieses Sparschwein geben können.', + 'suggested_savings_per_month' => 'Monatlich empfohlen', 'remove' => 'Entfernen', 'max_amount_add' => 'Der maximale Betrag, den Sie hinzufügen können ist', @@ -1149,27 +1155,9 @@ Sollen zusätzlich Ihre Girokonten angezeigt werden?', 'no_edit_multiple_left' => 'Sie haben keine gültigen Buchungen zur Bearbeitung ausgewählt.', 'cannot_convert_split_journal' => 'Eine Splitbuchung konnte nicht umgesetzt werden', - // import bread crumbs and titles: - 'import' => 'Importieren', - 'import_data' => 'Daten importieren', - 'import_general_index_file' => 'Datei importieren', - 'import_from_bunq' => 'Von „bunq†importieren', - 'import_using_spectre' => 'Import mit Spectre', - 'import_using_plaid' => 'Import mit Plaid', - 'import_config_bread_crumb' => 'Import einrichten', - - // import index page: + // Import page (general strings only) 'import_index_title' => 'Daten in Firefly III importieren', - 'import_index_sub_title' => 'Index', - 'import_general_index_intro' => 'Willkommen beim Importassistenten von Firefly III. Es gibt einige Möglichkeiten, Daten in Firefly III zu importieren, die hier als Schaltflächen angezeigt werden.', - 'upload_error' => 'Die hochgeladene Datei konnte nicht verarbeitet werden. Möglicherweise handelt es sich um einen ungültigen Dateityp oder eine ungültige Kodierung. Die Protokolldateien enthalten weitere Informationen.', - 'reset_import_settings_title' => 'Importeinstellungen zurücksetzen', - 'reset_import_settings_text' => 'Ãœber diese Links können Sie Ihre Importeinstellungen für bestimmte Anbieter zurücksetzen. Dies ist nützlich, wenn fehlerhafte Einstellungen den Import von Daten verhindern.', - 'reset_settings_bunq' => 'Bunq-API-Schlüssel entfernen (lokale externe IP-Adresse und Bunq-bezogene RSA-Schlüssel).', - 'reset_settings_spectre' => '„Spectreâ€-Geheimnisse und -IDs entfernen. Dadurch wird auch Ihr „Spectreâ€-Schlüsselpaar entfernt. Denken Sie daran, die neue Version zu aktualisieren.', - 'settings_reset_for_bunq' => 'Bunq-Einstellungen zurückgesetzt', - 'settings_reset_for_spectre' => 'Spectre-Einstellungen zurückgesetzt', - + 'import_data' => 'Daten importieren', // sandstorm.io errors and messages: 'sandstorm_not_available' => 'Diese Funktion ist nicht verfügbar, wenn Sie Firefly III in einer Sandstorm.io-Umgebung verwenden.', diff --git a/resources/lang/de_DE/form.php b/resources/lang/de_DE/form.php index 1085d6f86b..3195ec20e9 100644 --- a/resources/lang/de_DE/form.php +++ b/resources/lang/de_DE/form.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // new user: 'bank_name' => 'Name der Bank', @@ -184,6 +185,13 @@ return [ 'blocked' => 'Ist blockiert?', 'blocked_code' => 'Grund für Block', + // import + 'apply_rules' => 'Regeln anwenden', + 'artist' => 'Interpret', + 'album' => 'Album', + 'song' => 'Titel', + + // admin 'domain' => 'Domain', 'single_user_mode' => 'Registrierung deaktivieren', diff --git a/resources/lang/de_DE/import.php b/resources/lang/de_DE/import.php index 7915af59a7..2e2c30e8e5 100644 --- a/resources/lang/de_DE/import.php +++ b/resources/lang/de_DE/import.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ - // status of import: + // ALL breadcrumbs and subtitles: + 'index_breadcrumb' => 'Daten in Firefly III importieren', + 'prerequisites_breadcrumb_fake' => 'Voraussetzungen für den Scheinimportanbieter', + 'prerequisites_breadcrumb_spectre' => 'Voraussetzungen für Spectre', + 'prerequisites_breadcrumb_bunq' => 'Voraussetzungen für bunq', + 'job_configuration_breadcrumb' => 'Konfiguration für „:keyâ€', + 'job_status_breadcrumb' => 'Importstatus für „:keyâ€', + 'cannot_create_for_provider' => 'Firefly III konnte keine Aufgabe für den Anbieter „:provider†erstellen.', + + // index page: + 'general_index_title' => 'Datei importieren', + 'general_index_intro' => 'Willkommen beim Importassistenten von Firefly III. Es gibt einige Möglichkeiten, Daten in Firefly III zu importieren, die hier als Schaltflächen angezeigt werden.', + // import provider strings (index): + 'button_fake' => 'Importfunktion testen', + 'button_file' => 'Datei importieren', + 'button_bunq' => 'Von „bunq†importieren', + 'button_spectre' => 'Importieren mit Spectre', + 'button_plaid' => 'Import mit Plaid', + 'button_yodlee' => 'Importieren mit Yodlee', + 'button_quovo' => 'Import mit Quovo', + // global config box (index) + 'global_config_title' => 'Allgemeine Importkonfiguration', + 'global_config_text' => 'In Zukunft wird dieses Feld Einstellungen enthalten, die für ALLE oben genannten Importanbieter gelten.', + // prerequisites box (index) + 'need_prereq_title' => 'Importvoraussetzungen', + 'need_prereq_intro' => 'Einige Importmethoden benötigen Ihre Aufmerksamkeit, bevor sie verwendet werden können. Beispielsweise benötigen sie spezielle API-Schlüssel oder Anwendungsgeheimnisse. Sie können sie hier konfigurieren. Das Symbol zeigt an, ob diese Voraussetzungen erfüllt sind.', + 'do_prereq_fake' => 'Voraussetzungen für den Scheinanbieter', + 'do_prereq_file' => 'Voraussetzungen für den Dateiimport', + 'do_prereq_bunq' => 'Voraussetzungen für den Import aus Bunq', + 'do_prereq_spectre' => 'Voraussetzungen für den Import mit Spectre', + 'do_prereq_plaid' => 'Voraussetzungen für den Import mit Plaid', + 'do_prereq_yodlee' => 'Voraussetzungen für den Import mit Yodlee', + 'do_prereq_quovo' => 'Voraussetzungen für den Import mit Quovo', + // provider config box (index) + 'can_config_title' => 'Einstellungen importieren', + 'can_config_intro' => 'Einige Importmethoden können nach Ihren Wünschen konfiguriert werden. Sie verfügen über zusätzliche Einstellungen, die Sie anpassen können.', + 'do_config_fake' => 'Konfiguration für den Scheinanbieter', + 'do_config_file' => 'Konfiguration für Dateiimporte', + 'do_config_bunq' => 'Konfiguration für den Import aus bunq', + 'do_config_spectre' => 'Konfiguration für den Import aus Spectre', + 'do_config_plaid' => 'Konfiguration für den Import aus Plaid', + 'do_config_yodlee' => 'Konfiguration für den Import aus Yodlee', + 'do_config_quovo' => 'Konfiguration für den Import aus Quovo', + + // prerequisites: + 'prereq_fake_title' => 'Voraussetzungen für einen Import vom Scheinimportanbieter', + 'prereq_fake_text' => 'Dieser Scheinanbieter benötigt einen eigenen API-Schlüssel. Dieser muss 32 Zeichen lang sein. Sie können diese hier verwenden: 123456789012345678901234567890', + 'prereq_spectre_title' => 'Voraussetzungen für einen Import durch Verwendung der Spectre-API', + 'prereq_spectre_text' => 'Um Daten über die Spectre-API (v4) zu importieren, müssen Sie Firefly III zwei geheime Werte zur Verfügung stellen. Diese können auf der Geheimnisse-Seite gefunden werden.', + 'prereq_spectre_pub' => 'Ebenso muss die Spectre-API den öffentlichen Schlüssel kennen, der unten angezeigt wird. Ohne diesen wird sie Sie nicht erkennen. Bitte geben Sie diesen öffentlichen Schlüssel auf Ihrer Geheimnisse-Seite ein.', + 'prereq_bunq_title' => 'Voraussetzungen für einen Import von bunq', + 'prereq_bunq_text' => 'Um aus „bunq†importieren zu können, benötigen Sie einen API-Schlüssel. Sie können diesen über die App bekommen. Bitte beachten Sie, dass sich die Importfunktion von „bunq†noch im BETA-Stadium befindet. Es wurde nur gegen die Sandbox-API getestet.', + 'prereq_bunq_ip' => '„bunq†benötigt Ihre öffentlich zugängliche IP-Adresse. Firefly III versuchte, diese mithilfe des ipify-Diensts auszufüllen. Stellen Sie sicher, dass diese IP-Adresse korrekt ist, da sonst der Import fehlschlägt.', + // prerequisites success messages: + 'prerequisites_saved_for_fake' => 'Schein-API-Schlüssel erfolgreich gespeichert!', + 'prerequisites_saved_for_spectre' => 'App-ID und Geheimnis gespeichert!', + 'prerequisites_saved_for_bunq' => 'API-Schlüssel und IP gespeichert!', + + // job configuration: + 'job_config_apply_rules_title' => 'Aufgabenkonfiguration - Regeln übernehmen?', + 'job_config_apply_rules_text' => 'Sobald der Scheinanbieter ausgeführt wird, können Ihre Regeln auf die Buchungen angewendet werden. Dies erhöht die Zeit für den Import.', + 'job_config_input' => 'Ihre Eingaben', + // job configuration for the fake provider: + 'job_config_fake_artist_title' => 'Albumname eingeben', + 'job_config_fake_artist_text' => 'Viele Importassistent haben einige Konfigurationsschritte, die Sie ausführen müssen. Im Falle des gefälschten Importanbieters müssen Sie einige seltsame Fragen beantworten. Geben Sie in diesem Fall „David Bowie†ein, um fortzufahren.', + 'job_config_fake_song_title' => 'Titelnamen eingeben', + 'job_config_fake_song_text' => 'Nennen Sie den Song „Goldene Jahreâ€, um mit dem Scheinimport fortzufahren.', + 'job_config_fake_album_title' => 'Albumname eingeben', + 'job_config_fake_album_text' => 'Einige Importassistenten benötigen nach der Hälfte des Imports zusätzliche Daten. Im Falle des Scheinimportanbieter müssen Sie einige seltsame Fragen beantworten. Geben Sie „Station zu Station†ein, um fortzufahren.', + // job configuration form the file provider + 'job_config_file_upload_title' => 'Import einrichten (1/4) • Ihre Datei hochladen', + 'job_config_file_upload_text' => 'Diese Assistent wird Ihnen helfen, Dateien von Ihrer Bank in Firefly III zu importieren. ', + 'job_config_file_upload_help' => 'Wählen Sie Ihre Datei aus. Bitte stellen Sie sicher, dass die Datei UTF-8-kodiert ist.', + 'job_config_file_upload_config_help' => 'Wenn Sie zuvor Daten in Firefly III importiert haben, verfügen Sie möglicherweise über eine Konfigurationsdatei, die Ihnen die Konfigurationswerte vorgibt. Für einige Banken haben andere Benutzer freundlicherweise ihreKonfigurationsdatei zur Verfügung gestellt.', + 'job_config_file_upload_type_help' => 'Typ der hochzuladenden Datei auswählen', + 'job_config_file_upload_submit' => 'Dateien hochladen', + 'import_file_type_csv' => 'CSV (Kommagetrennte Werte)', + 'file_not_utf8' => 'Die hochgeladene Datei ist nicht als UTF-8 oder ASCII kodiert. Firefly III kann mit solchen Dateien nicht umgehen. Bitte verwenden Sie „Notepad++†oder „Sublimeâ€, um Ihre Datei in UTF-8 zu konvertieren.', + 'job_config_uc_title' => 'Import einrichten (2/4) • Allgemeine Datei-Einstellungen', + 'job_config_uc_text' => 'Um Ihre Datei korrekt importieren zu können, überprüfen Sie bitte die folgenden Optionen.', + 'job_config_uc_header_help' => 'Markieren Sie dieses Feld, wenn die erste Zeile Ihrer CSV-Datei die Spaltenüberschriften enthält.', + 'job_config_uc_date_help' => 'Datumsformat in Ihrer Datei. Folgen Sie dem auf dieser Seite angegebenen Format. Der Standardwert analysiert Daten, die wie folgt aussehen: :dateExample.', + 'job_config_uc_delimiter_help' => 'Wählen Sie das Feldtrennzeichen, das in Ihrer Eingabedatei verwendet wird. Wenn nicht sicher, ist das Komma die sicherste Option.', + 'job_config_uc_account_help' => 'Wenn Ihre Datei KEINE Informationen über Ihr(e) Anlagenkont(o/en) enthält, wählen Sie über dieses Auswahlmenü aus, zu welchem Konto die Buchungen in der Datei gehören.', + 'job_config_uc_apply_rules_title' => 'Regeln anwenden', + 'job_config_uc_apply_rules_text' => 'Wendet Ihre Regeln auf jede importierte Buchung an. Beachten Sie, dass dies den Import erheblich verlangsamt.', + 'job_config_uc_specifics_title' => 'Bankspezifische Einstellungen', + 'job_config_uc_specifics_txt' => 'Einige Banken liefern schlecht formatierte Dateien. Firefly III kann diese automatisch korrigieren. Wenn Ihre Bank solche Dateien liefert, diese aber hier nicht aufgeführt sind, öffnen Sie bitte einen Fehlerbericht auf GitHub.', + 'job_config_uc_submit' => 'Fortsetzen', + 'invalid_import_account' => 'Sie haben ein ungültiges Konto zum Importieren ausgewählt.', + // job configuration for Spectre: + 'job_config_spectre_login_title' => 'Wählen Sie Ihre Zugangsdaten', + 'job_config_spectre_login_text' => 'Firefly III hat :count bestehende Zugangsdaten in Ihrem Spectre-Konto gefunden. Von welchem möchten Sie importieren?', + 'spectre_login_status_active' => 'Aktiv', + 'spectre_login_status_inactive' => 'Inaktiv', + 'spectre_login_status_disabled' => 'Deaktiviert', + 'spectre_login_new_login' => 'Melden Sie sich bei einer anderen Bank oder einer dieser Banken mit anderen Zugangsdaten an.', + 'job_config_spectre_accounts_title' => 'Import-Konten auswählen', + 'job_config_spectre_accounts_text' => 'Sie haben „:name†(:country) gewählt. Sie haben :count Konto(s) bei diesem Anbieter. Bitte wählen Sie das/die Firefly III-Kont(o/en), auf dem/denen die Buchungen von diesen Konten gespeichert werden sollen. Denken Sie daran, dass zum Importieren von Daten sowohl das Firefly III-Konto als auch das „:nameâ€-Konto dieselbe Währung haben müssen.', + 'spectre_no_supported_accounts' => 'Von diesem Konto können Sie nicht importieren, da die Währungen nicht übereinstimmen.', + 'spectre_do_not_import' => '(Nicht importieren)', + 'spectre_no_mapping' => 'Es scheint, dass Sie keine Konten zum Importieren ausgewählt haben.', + 'imported_from_account' => 'Von „:account†importiert', + 'spectre_account_with_number' => 'Konto :number', + // job configuration for bunq: + 'job_config_bunq_accounts_title' => 'bunq-Konten', + 'job_config_bunq_accounts_text' => 'Dies sind jene Konten, die mit Ihrem „bunqâ€-Konto verknüpft sind. Bitte wählen Sie die Konten aus, von denen Sie importieren möchten, und in welches Konto die Buchungen importiert werden sollen.', + 'bunq_no_mapping' => 'Es scheint, dass Sie keine Konten ausgewählt haben.', + 'should_download_config' => 'Sie sollten die Konfigurationsdatei für diesen Aufgabe herunterladen. Dies wird zukünftige Importe erheblich erleichtern.', + 'share_config_file' => 'Wenn Sie Daten von einer öffentlichen Bank importiert haben, sollten Sie Ihre Konfigurationsdatei freigeben, damit es für andere Benutzer einfach ist, ihre Daten zu importieren. Wenn Sie Ihre Konfigurationsdatei freigeben, werden Ihre finanziellen Daten nicht preisgegeben.', + + // keys from "extra" array: + 'spectre_extra_key_iban' => 'IBAN', + 'spectre_extra_key_swift' => 'SWIFT Code', + 'spectre_extra_key_status' => 'Status', + 'spectre_extra_key_card_type' => 'Kartentyp', + 'spectre_extra_key_account_name' => 'Kontoname', + 'spectre_extra_key_client_name' => 'Client-Name', + 'spectre_extra_key_account_number' => 'Kontonummer', + 'spectre_extra_key_blocked_amount' => 'Gesperrter Betrag', + 'spectre_extra_key_available_amount' => 'Verfügbarer Betrag', + 'spectre_extra_key_credit_limit' => 'Kreditrahmen', + 'spectre_extra_key_interest_rate' => 'Zinssatz', + 'spectre_extra_key_expiry_date' => 'Gültig bis', + 'spectre_extra_key_open_date' => 'Anfangsdatum', + 'spectre_extra_key_current_time' => 'Aktuelle Uhrzeit', + 'spectre_extra_key_current_date' => 'Aktuelles Datum', + 'spectre_extra_key_cards' => 'Karten', + 'spectre_extra_key_units' => 'Einheiten', + 'spectre_extra_key_unit_price' => 'Stückpreis', + 'spectre_extra_key_transactions_count' => 'Anzahl der Buchungen', + + // specifics: + 'specific_ing_name' => 'ING NL', + 'specific_ing_descr' => 'Bessere Beschreibungen im ING-Export erstellen', + 'specific_sns_name' => 'SNS / Volksbank NL', + 'specific_sns_descr' => 'Anführungszeichen aus SNS/Volksbank-Exportdateien entfernen', + 'specific_abn_name' => 'ABN•AMRO NL', + 'specific_abn_descr' => 'Behebt mögliche Probleme mit ABN•AMRO-Dateien', + 'specific_rabo_name' => 'Rabobank NL', + 'specific_rabo_descr' => 'Behebt mögliche Probleme mit Rabobank-Dateien', + 'specific_pres_name' => 'President\'s Choice Financial CA', + 'specific_pres_descr' => 'Behebt mögliche Probleme mit PC-Dateien', + // job configuration for file provider (stage: roles) + 'job_config_roles_title' => 'Import einrichten (3/4) • Funktion jeder Spalte festlegen', + 'job_config_roles_text' => 'Jede Spalte in Ihrer CSV-Datei enthält bestimmte Daten. Bitte geben Sie an, welche Art von Daten enthalten sind. Die Option "Daten zuordnen" bedeutet, dass jeder Eintrag in der Spalte mit einem Wert aus Ihrer der Datenbank ersetzt wird. Eine oft zugeordnete Spalte ist die Spalte, welche die IBAN des fremden Kontos enthält. Diese können leicht mit bereits angelegten IBANs in Ihrer Datenbank verglichen werden.', + 'job_config_roles_submit' => 'Fortsetzen', + 'job_config_roles_column_name' => 'Name der Spalte', + 'job_config_roles_column_example' => 'Spaltenbeispieldaten', + 'job_config_roles_column_role' => 'Bedeutung der Spalte', + 'job_config_roles_do_map_value' => 'Diese Werte zuordnen', + 'job_config_roles_no_example' => 'Keine Beispieldaten vorhanden', + 'job_config_roles_fa_warning' => 'Wenn Sie eine Spalte als mit einem Betrag in einer Fremdwährung kennzeichnen, müssen Sie auch die Spalte mit der entsprechenden Währung festlegen.', + 'job_config_roles_rwarning' => 'Markieren Sie mindestens die Spalte, die den jeweiligen Betrag enthält. Darüber hinaus sollten eine Spalte für die Beschreibung, das Datum und das Gegenkonto ausgewählt werden.', + 'job_config_roles_colum_count' => 'Spalte', + // job config for the file provider (stage: mapping): + 'job_config_map_title' => 'Import einrichten (4/4) - Importdaten mit Firefly III-Daten verknüpfen', + 'job_config_map_text' => 'In den folgenden Tabellen zeigt der linke Wert Informationen, die sich in Ihrer hochgeladenen Datei befinden. Es ist Ihre Aufgabe, diesen Wert, wenn möglich, einem bereits in der Datenbank vorhandenen zuzuordnen. Firefly wird sich an diese Zuordnung halten. Wenn kein Wert für die Zuordnung vorhanden ist oder Sie den bestimmten Wert nicht abbilden möchten, wählen Sie nichts aus.', + 'job_config_map_nothing' => 'Ihre Datei enthält keine Daten, die bestehenden Werten zugeordnet werden können. Klicken Sie „Import starten†um fortzufahren.', + 'job_config_field_value' => 'Feldwert', + 'job_config_field_mapped' => 'Zugeordnet zu', + 'map_do_not_map' => '(keine Zuordnung)', + 'job_config_map_submit' => 'Import starten', + + + // import status page: + 'import_with_key' => 'Mit Schlüssel „:key†importieren', 'status_wait_title' => 'Bitte warten...', 'status_wait_text' => 'Diese Box wird gleich ausgeblendet.', - 'status_fatal_title' => 'Ein schwerwiegender Fehler ist aufgetreten', - 'status_fatal_text' => 'Es ist ein schwerwiegender Fehler aufgetreten und die Importroutine kann nicht fortgeführt werden. Bitte sehen Sie sich die Erklärung in rot unten an.', - 'status_fatal_more' => 'Wenn der Fehler eine Zeitüberschreitung ist, wird der Import mittendrin gestoppt. Bei einigen Serverkonfigurationen wird lediglich der Server gestoppt, während der Import im Hintergrund ausgeführt wird. Um dies zu überprüfen, überprüfen Sie die Protokolldateien. Wenn das Problem weiterhin besteht, sollten Sie stattdessen den Import über die Befehlszeile in Erwägung ziehen.', - 'status_ready_title' => 'Der Import ist startbereit', - 'status_ready_text' => 'Der Import ist bereit zu starten. Alle Einstellungen wurden von Ihnen erledigt. Bitte laden Sie die Konfigurationsdatei herunter. Diese wird Ihnen beim Import helfen, sollte dieser nicht wie gewünscht verlaufen. Um den Import tatsächlich zu starten führen Sie den folgenden Befehl in der Konsole aus oder nutzen Sie den Web-basierten Import. Abhängig von ihrer Konfiguration wird Ihnen der Konsolenimport mehr Rückmeldungen geben.', - 'status_ready_noconfig_text' => 'Der Import ist bereit zu starten. Alle Einstellungen wurden von Ihnen erledigt. Um den Import tatsächlich zu starten führen Sie den folgenden Befehl in der Konsole aus oder nutzen Sie den Web-basierten Import. Abhängig von ihrer Konfiguration wird Ihnen der Konsolenimport mehr Rückmeldungen geben.', - 'status_ready_config' => 'Konfiguration herunterladen', - 'status_ready_start' => 'Importieren starten', - 'status_ready_share' => 'Bitte denken Sie darüber nach ihre Konfiguration herunterzuladen und in der Ãœbersicht der Import-Einstellungen zu teilen. Dieses erlaubt es anderen Nutzern von Firefly III ihre Daten unkomplizierter zu importieren.', - 'status_job_new' => 'Die Aufgabe ist neu.', - 'status_job_configuring' => 'Der Import wird konfiguriert.', - 'status_job_configured' => 'Der Import ist konfiguriert.', - 'status_job_running' => 'Import wird ausgeführt … Bitte warten …', - 'status_job_error' => 'Ein Fehler ist aufgetreten.', - 'status_job_finished' => 'Import abgeschlossen!', 'status_running_title' => 'Import wird ausgeführt', - 'status_running_placeholder' => 'Bitte auf die Aktualisierung warten …', - 'status_finished_title' => 'Importassistent abgeschlossen', - 'status_finished_text' => 'Der Importassistent hat Ihre Daten importiert.', - 'status_errors_title' => 'Fehler beim Importieren', - 'status_errors_single' => 'Beim Import ist ein Fehler aufgetreten. Dieser scheint aber nicht schwerwiegend zu sein.', - 'status_errors_multi' => 'Beim Importieren sind einige Fehler aufgetreten. Diese scheinen aber nicht schwerwiegend zu sein.', - 'status_bread_crumb' => 'Importstatus', - 'status_sub_title' => 'Importstatus', - 'config_sub_title' => 'Import einrichten', - 'status_finished_job' => 'Die importierten :count Ãœberweisungen finden Sie im Schlagwort :tag.', - 'status_finished_no_tag' => 'Firefly III hat keine Daten aus Ihrer Import-Datei gesammelt.', - 'import_with_key' => 'Mit Schlüssel „:key†importieren', + 'status_job_running' => 'Bitte warten, Import wird ausgeführt …', + 'status_job_storing' => 'Bitte warten, Daten werden gespeichert …', + 'status_job_rules' => 'Bitte warten, Regeln werden angewendet …', + 'status_fatal_title' => 'Schwerwiegender Fehler', + 'status_fatal_text' => 'Der Import hat einen Fehler verursacht, der nicht behoben werden konnte. Entschuldigung!', + 'status_fatal_more' => 'Diese (möglicherweise sehr kryptische) Fehlermeldung wurde durch Protokolldateien ergänzt, die Sie auf Ihrer Festplatte oder im Docker-Container finden, von dem aus Sie Firefly III ausführen.', + 'status_finished_title' => 'Importieren abgeschlossen', + 'status_finished_text' => 'Import abgeschlossen.', + 'finished_with_errors' => 'Beim Import gab es einige Fehler. Bitte prüfen Sie diese sorgfältig.', + 'unknown_import_result' => 'Unbekanntes Importergebnis', + 'result_no_transactions' => 'Es wurden keine Buchungen importiert. Vielleicht waren sie alle Duplikate, sind einfach keine Buchungen, die importiert werden könnten. Vielleicht können Ihnen die Protokolldateien sagen, was passiert ist. Wenn Sie regelmäßig Daten importieren, ist dies normal.', + 'result_one_transaction' => 'Es wurde genau eine Buchung importiert. Diese wurde unter dem Schlagwort :tag gespeichert, wo Sie diese weiter untersuchen können.', + 'result_many_transactions' => 'Firefly III hat :count Buchungen importiert. Diese wurden unter dem Schlagwort :tag gespeichert, wo Sie diese weiter untersuchen können.', - // file, upload something - 'file_upload_title' => 'Import einrichten (1/4) • Ihre Datei hochladen', - 'file_upload_text' => 'Dieser Assistent hilft Ihnen, Dateien von Ihrer Bank in Firefly III zu importieren. Bitte sehen Sie sich die Hilfeseiten in der oberen rechten Ecke an.', - 'file_upload_fields' => 'Felder', - 'file_upload_help' => 'Datei auswählen', - 'file_upload_config_help' => 'Wenn Sie bereits zuvor Daten in Firefly III importiert haben, haben Sie eventuell eine Konfigurationsdatei, welche einige Einstellungen für Sie voreinstellt. Für einige Banken haben andere Nutzer freundlicherweise bereits ihre Konfigurationsdatei zur Verfügung gestellt', - 'file_upload_type_help' => 'Wählen Sie den Typ der hochzuladenden Datei', - 'file_upload_submit' => 'Dateien hochladen', - // file, upload types - 'import_file_type_csv' => 'CSV (Kommagetrennte Werte)', + // general errors and warnings: + 'bad_job_status' => 'Um auf diese Seite zuzugreifen, darf Ihr Importauftrag nicht den Status „:status†haben.', - // file, initial config for CSV - 'csv_initial_title' => 'Import einrichten (2/4) • Grundlegende Einrichtung des CSV-Imports', - 'csv_initial_text' => 'Um Ihre Datei korrekt importieren zu können, überprüfen Sie bitte die folgenden Optionen.', - 'csv_initial_box' => 'Standard CSV Importeinstellungen', - 'csv_initial_box_title' => 'Standard CSV Importeinstellungen', - 'csv_initial_header_help' => 'Hier auswählen, wenn die erste Zeilen der CSV-Datei die Spaltenüberschriften enthält.', - 'csv_initial_date_help' => 'Datumsformat in ihrer CSV-Datei. Geben Sie das Format so an, wie es diese Seite zeigt. Die Standardeinstellung ergibt Daten die so aussehen: :dateExample.', - 'csv_initial_delimiter_help' => 'Wählen Sie das Trennzeichen, welches in ihrer Datei genutzt wird. Wenn Sie nicht sicher sind ist Komma die sicherste Option.', - 'csv_initial_import_account_help' => 'Wenn ihre CSV-Datei KEINE Informationen über ihre Bestandskont(o/n) enthält, nutzen Sie bitte diese Auswahlmenü um anzugeben, zu welchem Bestandskonto die Buchungen in der CSV-Datei gehören.', - 'csv_initial_submit' => 'Fortfahren mit Schritt 3/4', - - // file, new options: - 'file_apply_rules_title' => 'Regeln anwenden', - 'file_apply_rules_description' => 'Regeln anwenden. Beachten Sie, dass dadurch der Import erheblich verlangsamt wird.', - 'file_match_bills_title' => 'Rechnungen zuordnen', - 'file_match_bills_description' => 'Ordnen Sie Ihre Rechnungen den neu erstellten Ausgaben zu. Beachten Sie, dass dadurch der Import erheblich verlangsamt wird.', - - // file, roles config - 'csv_roles_title' => 'Import einrichten (3/4) • Funktion jeder Spalte festlegen', - 'csv_roles_text' => 'Jede Spalte in Ihrer CSV-Datei enthält bestimmte Daten. Bitte geben Sie an, welche Art von Daten enthalten sind. Die Option "Daten zuordnen" bedeutet, dass jeder Eintrag in der Spalte mit einem Wert aus Ihrer der Datenbank ersetzt wird. Eine oft zugeordnete Spalte ist die Spalte, welche die IBAN des fremden Kontos enthält. Diese können leicht mit bereits angelegten IBANs in Ihrer Datenbank verglichen werden.', - 'csv_roles_table' => 'Tabelle', - 'csv_roles_column_name' => 'Name der Spalte', - 'csv_roles_column_example' => 'Beispieldaten', - 'csv_roles_column_role' => 'Bedeutung der Spalte', - 'csv_roles_do_map_value' => 'Diese Werte zuordnen', - 'csv_roles_column' => 'Spalte', - 'csv_roles_no_example_data' => 'Keine Beispieldaten vorhanden', - 'csv_roles_submit' => 'Fortfahren mit Schritt 4/4', - - // not csv, but normal warning - 'roles_warning' => 'Markieren Sie mindestens die Spalte, die den jeweiligen Betrag enthält. Darüber hinaus sollten eine Spalte für die Beschreibung, das Datum und das Gegenkonto ausgewählt werden.', - 'foreign_amount_warning' => 'Wenn Sie eine Spalte als Fremdwährung markieren, müssen Sie auch die Spalte festlegen, welche angibt, welche Währung es ist.', - - // file, map data - 'file_map_title' => 'Import einrichten (4/4) - Importdaten mit Firefly III-Daten verknüpfen', - 'file_map_text' => 'In den folgenden Tabellen zeigt der linke Wert Informationen, die sich in Ihrer hochgeladenen Datei befinden. Es ist Ihre Aufgabe, diesen Wert, wenn möglich, einem bereits in der Datenbank vorhandenen zuzuordnen. Firefly wird sich an diese Zuordnung halten. Wenn kein Wert für die Zuordnung vorhanden ist oder Sie den bestimmten Wert nicht abbilden möchten, wählen Sie nichts aus.', - 'file_map_field_value' => 'Feldwert', - 'file_map_field_mapped_to' => 'Zugeordnet zu', - 'map_do_not_map' => '(keine Zuordnung)', - 'file_map_submit' => 'Import starten', - 'file_nothing_to_map' => 'Ihree Datei enthält keine Daten, die bestehenden Werten zugeordnet werden können. Klicken Sie "Import starten" um fortzufahren.', - - // map things. + // column roles for CSV import: 'column__ignore' => '(diese Spalte ignorieren)', 'column_account-iban' => 'Bestandskonto (IBAN)', 'column_account-id' => 'Kennung des Bestandkontos (passend zu FF3)', @@ -158,48 +261,4 @@ return [ 'column_note' => 'Notiz(en)', 'column_internal-reference' => 'Interne Referenz', - // prerequisites - 'prerequisites' => 'Voraussetzungen', - - // bunq - 'bunq_prerequisites_title' => 'Voraussetzungen für einen Import von bunq', - 'bunq_prerequisites_text' => 'Um aus „bunq†importieren zu können, benötigen Sie einen API-Schlüssel. Sie können diesen über die App bekommen. Bitte beachten Sie, dass sich die Importfunktion von „bunq†noch im BETA-Stadium befindet. Es wurde nur gegen die Sandbox-API getestet.', - 'bunq_prerequisites_text_ip' => '„Bunq†benötigt Ihre öffentlich zugängliche IP-Adresse. Firefly III versuchte, diese mithilfe des ipify-Diensts auszufüllen. Stellen Sie sicher, dass diese IP-Adresse korrekt ist, da sonst der Import fehlschlägt.', - 'bunq_do_import' => 'Ja, von diesem Konto importieren', - 'bunq_accounts_title' => 'Bunq-Konten', - 'bunq_accounts_text' => 'Dies sind jene Konten, die mit Ihrem „bunqâ€-Konto verknüpft sind. Bitte wählen Sie die Konten aus, von denen Sie importieren möchten, und in welches Konto die Buchungen importiert werden sollen.', - - // Spectre - 'spectre_title' => 'Importieren mit Spectre', - 'spectre_prerequisites_title' => 'Voraussetzungen für einen Import von Spectre', - 'spectre_prerequisites_text' => 'Um Daten über die Spectre-API (v4) zu importieren, müssen Sie Firefly III zwei geheime Werte zur Verfügung stellen. Diese können auf der Geheimnisse-Seite gefunden werden.', - 'spectre_enter_pub_key' => 'Der Import funktioniert nur, wenn Sie diesen öffentlichen Schlüssel auf Ihrer Sicherheitsseite eingeben.', - 'spectre_accounts_title' => 'Import-Konten auswählen', - 'spectre_accounts_text' => 'Die Konten auf der linken Seite wurde von Spectre gefunden und können für den Import verwendet werden. Ordnen Sie jeweils ein eigenes Konto zu, in das die Buchungen importiert werden sollen. Nicht ausgwählte Konten werden beim Import ignoriert.', - 'spectre_do_import' => 'Ja, von diesem Konto importieren', - 'spectre_no_supported_accounts' => 'Von diesem Konto können Sie nicht importieren, da die Währungen nicht übereinstimmen.', - - // keys from "extra" array: - 'spectre_extra_key_iban' => 'IBAN', - 'spectre_extra_key_swift' => 'BIC (SWIFT) Code', - 'spectre_extra_key_status' => 'Status', - 'spectre_extra_key_card_type' => 'Art der Kreditkarte', - 'spectre_extra_key_account_name' => 'Kontoname', - 'spectre_extra_key_client_name' => 'Kundenname', - 'spectre_extra_key_account_number' => 'Kontonummer', - 'spectre_extra_key_blocked_amount' => 'Gesperrter Betrag', - 'spectre_extra_key_available_amount' => 'Verfügbarer Betrag', - 'spectre_extra_key_credit_limit' => 'Kreditrahmen', - 'spectre_extra_key_interest_rate' => 'Zinssatz', - 'spectre_extra_key_expiry_date' => 'Ablaufdatum', - 'spectre_extra_key_open_date' => 'Anfangsdatum', - 'spectre_extra_key_current_time' => 'Aktuelle Uhrzeit', - 'spectre_extra_key_current_date' => 'Aktuelles Datum', - 'spectre_extra_key_cards' => 'Karten', - 'spectre_extra_key_units' => 'Einheiten', - 'spectre_extra_key_unit_price' => 'Stückpreis', - 'spectre_extra_key_transactions_count' => 'Anzahl Transaktionen', - - // various other strings: - 'imported_from_account' => 'Von „:account†importiert', ]; diff --git a/resources/lang/de_DE/intro.php b/resources/lang/de_DE/intro.php index 8ebc5d6e6a..2d170551b8 100644 --- a/resources/lang/de_DE/intro.php +++ b/resources/lang/de_DE/intro.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // index 'index_intro' => 'Wilkommen auf der Startseite von Firefly III. Bitte nehmen Sie sich die Zeit, um ein Gefühl dafür zu bekommen, wie Firefly III funktioniert.', @@ -92,7 +93,7 @@ return [ 'piggy-banks_show_piggyEvents' => 'Hinzufügungen oder Entfernungen sind hier ebenfalls aufgeführt.', // bill index - 'bills_index_rules' => 'Hier sehen Sie, welche Regeln prüfen, ob diese Rechnung betroffen ist.', + 'bills_index_rules' => 'Hier sehen Sie, welche Regeln prüfen, ob diese Rechnung betroffen ist', 'bills_index_paid_in_period' => 'Dieses Feld zeigt an, wann die Rechnung zuletzt bezahlt wurde.', 'bills_index_expected_in_period' => 'Dieses Feld zeigt für jede Rechnung an, ob und wann die nächste Rechnung erwartet wird.', diff --git a/resources/lang/de_DE/list.php b/resources/lang/de_DE/list.php index 7e80eccc99..f2d030e3f7 100644 --- a/resources/lang/de_DE/list.php +++ b/resources/lang/de_DE/list.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'buttons' => 'Schaltflächen', 'icon' => 'Symbol', @@ -111,10 +112,15 @@ return [ 'sepa-cc' => 'SEPA • Verrechnungsschlüssel', 'sepa-ep' => 'SEPA • Externer Verwendungszweck', 'sepa-ci' => 'SEPA • Identifikationsnummer des Zahlungsempfängers', + 'external_id' => 'Externe Kennung', 'account_at_bunq' => 'Konto bei „bunqâ€', 'file_name' => 'Dateiname', 'file_size' => 'Dateigröße', 'file_type' => 'Dateityp', 'attached_to' => 'Zugewiesen zu', 'file_exists' => 'Datei existiert', + 'spectre_bank' => 'Bank', + 'spectre_last_use' => 'Letzte Anmeldung', + 'spectre_status' => 'Status', + 'bunq_payment_id' => 'bunq-Zahlungskennung', ]; diff --git a/resources/lang/de_DE/pagination.php b/resources/lang/de_DE/pagination.php index bcc5ee0bee..5df96ca481 100644 --- a/resources/lang/de_DE/pagination.php +++ b/resources/lang/de_DE/pagination.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'previous' => '« Vorherige', 'next' => 'Nächste »', diff --git a/resources/lang/de_DE/passwords.php b/resources/lang/de_DE/passwords.php index 7b15def6ef..8888015525 100644 --- a/resources/lang/de_DE/passwords.php +++ b/resources/lang/de_DE/passwords.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'password' => 'Passwörter müssen mindestens 6 Zeichen lang sein und übereinstimmen.', 'user' => 'Wir können keinen Benutzer mit dieser E-Mail Adresse finden.', diff --git a/resources/lang/de_DE/validation.php b/resources/lang/de_DE/validation.php index 3ada9a3c1d..7cc5d3de94 100644 --- a/resources/lang/de_DE/validation.php +++ b/resources/lang/de_DE/validation.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'iban' => 'Dies ist keine gültige IBAN.', 'source_equals_destination' => 'Das Quellkonto entspricht dem Zielkonto', @@ -109,7 +110,8 @@ return [ 'in_array' => ':attribute existiert nicht in :other.', 'present' => 'Das :attribute Feld muss vorhanden sein.', 'amount_zero' => 'Der Gesamtbetrag darf nicht Null sein', - 'secure_password' => 'Das ist kein sicheres Passwort. Bitte versuchen Sie es erneut. Weitere Informationen finden Sie unter https://goo.gl/NCh2tN', + 'unique_piggy_bank_for_user' => 'Der Name des Sparschweins muss eindeutig sein.', + 'secure_password' => 'Das ist kein sicheres Passwort. Bitte versuchen Sie es erneut. Weitere Informationen finden Sie unter https://github.com/firefly-iii/help/wiki/Secure-password', 'attributes' => [ 'email' => 'E-Mail Adresse', 'description' => 'Beschreibung', diff --git a/resources/lang/en_US/auth.php b/resources/lang/en_US/auth.php index ccd226ea90..a8a29b2131 100644 --- a/resources/lang/en_US/auth.php +++ b/resources/lang/en_US/auth.php @@ -1,9 +1,8 @@ . */ -return [ - /* - |-------------------------------------------------------------------------- - | Authentication Language Lines - |-------------------------------------------------------------------------- - | - | The following language lines are used during authentication for various - | messages that we need to display to the user. You are free to modify - | these language lines according to your application's requirements. - | - */ +declare(strict_types=1); +return [ 'failed' => 'These credentials do not match our records.', 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', ]; diff --git a/resources/lang/en_US/bank.php b/resources/lang/en_US/bank.php index 8826020cbf..5d00b1e685 100644 --- a/resources/lang/en_US/bank.php +++ b/resources/lang/en_US/bank.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ ]; diff --git a/resources/lang/en_US/breadcrumbs.php b/resources/lang/en_US/breadcrumbs.php index 88ebc2aa8b..3a98e01f6f 100644 --- a/resources/lang/en_US/breadcrumbs.php +++ b/resources/lang/en_US/breadcrumbs.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'home' => 'Home', 'edit_currency' => 'Edit currency ":name"', diff --git a/resources/lang/en_US/components.php b/resources/lang/en_US/components.php index 50092e06fd..6299088f8e 100644 --- a/resources/lang/en_US/components.php +++ b/resources/lang/en_US/components.php @@ -1,5 +1,4 @@ . */ +declare(strict_types=1); + return [ // profile 'personal_access_tokens' => 'Personal access tokens', diff --git a/resources/lang/en_US/config.php b/resources/lang/en_US/config.php index b435777385..f7a905591f 100644 --- a/resources/lang/en_US/config.php +++ b/resources/lang/en_US/config.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'html_language' => 'en', 'locale' => 'en, English, en_US, en_US.utf8, en_US.UTF-8', diff --git a/resources/lang/en_US/csv.php b/resources/lang/en_US/csv.php index 622a49202a..aae109a40a 100644 --- a/resources/lang/en_US/csv.php +++ b/resources/lang/en_US/csv.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ ]; diff --git a/resources/lang/en_US/demo.php b/resources/lang/en_US/demo.php index 8de0eb8fb2..640ab10298 100644 --- a/resources/lang/en_US/demo.php +++ b/resources/lang/en_US/demo.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'no_demo_text' => 'Sorry, there is no extra demo-explanation text for this page.', 'see_help_icon' => 'However, the -icon in the top right corner may tell you more.', @@ -32,5 +33,5 @@ return [ 'currencies-index' => 'Firefly III supports multiple currencies. Although it defaults to the Euro it can be set to the US Dollar and many other currencies. As you can see a small selection of currencies has been included but you can add your own if you wish to. Changing the default currency will not change the currency of existing transactions however: Firefly III supports the use of multiple currencies at the same time.', 'transactions-index' => 'These expenses, deposits and transfers are not particularly imaginative. They have been generated automatically.', 'piggy-banks-index' => 'As you can see, there are three piggy banks. Use the plus and minus buttons to influence the amount of money in each piggy bank. Click the name of the piggy bank to see the administration for each piggy bank.', - 'import-index' => 'Of course, any CSV file can be imported into Firefly III', + 'import-index' => 'Any CSV file can be imported into Firefly III. It also supports importing data from bunq and Spectre. Other banks and financial aggregators will be implemented in the future. As a demo-user however, you can only see the "fake"-provider in action. It will generate some random transactions to show you how the process works.', ]; diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php index 19233057ac..bd4b5d4bd1 100644 --- a/resources/lang/en_US/firefly.php +++ b/resources/lang/en_US/firefly.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // general stuff: 'close' => 'Close', @@ -179,6 +180,7 @@ return [ 'authorization_request_intro' => ':client is requesting permission to access your financial administration. Would you like to authorize :client to access these records?', 'scopes_will_be_able' => 'This application will be able to:', 'button_authorize' => 'Authorize', + 'none_in_select_list' => '(none)', // check for updates: 'update_check_title' => 'Check for updates', @@ -666,6 +668,7 @@ return [ 'bill_will_automatch' => 'Bill will automatically linked to matching transactions', 'skips_over' => 'skips over', 'bill_store_error' => 'An unexpected error occurred while storing your new bill. Please check the log files', + 'list_inactive_rule' => 'inactive rule', // accounts: 'details_for_asset' => 'Details for asset account ":name"', @@ -801,6 +804,7 @@ return [ 'opt_group_savingAsset' => 'Savings accounts', 'opt_group_sharedAsset' => 'Shared asset accounts', 'opt_group_ccAsset' => 'Credit cards', + 'opt_group_cashWalletAsset' => 'Cash wallets', 'notes' => 'Notes', 'unknown_journal_error' => 'Could not store the transaction. Please check the log files.', @@ -816,6 +820,7 @@ return [ 'language' => 'Language', 'new_savings_account' => ':bank_name savings account', 'cash_wallet' => 'Cash wallet', + 'currency_not_present' => 'If the currency you normally use is not listed do not worry. You can create your own currencies under Options > Currencies.', // home page: 'yourAccounts' => 'Your accounts', @@ -1013,6 +1018,7 @@ return [ 'remove_money_from_piggy_title' => 'Remove money from piggy bank ":name"', 'add' => 'Add', 'no_money_for_piggy' => 'You have no money to put in this piggy bank.', + 'suggested_savings_per_month' => 'Suggested per month', 'remove' => 'Remove', 'max_amount_add' => 'The maximum amount you can add is', @@ -1148,27 +1154,9 @@ return [ 'no_edit_multiple_left' => 'You have selected no valid transactions to edit.', 'cannot_convert_split_journal' => 'Cannot convert a split transaction', - // import bread crumbs and titles: - 'import' => 'Import', - 'import_data' => 'Import data', - 'import_general_index_file' => 'Import a file', - 'import_from_bunq' => 'Import from bunq', - 'import_using_spectre' => 'Import using Spectre', - 'import_using_plaid' => 'Import using Plaid', - 'import_config_bread_crumb' => 'Set up your import', - - // import index page: + // Import page (general strings only) 'import_index_title' => 'Import data into Firefly III', - 'import_index_sub_title' => 'Index', - 'import_general_index_intro' => 'Welcome to Firefly III\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.', - 'upload_error' => 'The file you have uploaded could not be processed. Possibly it is of an invalid file type or encoding. The log files will have more information.', - 'reset_import_settings_title' => 'Reset import configuration', - 'reset_import_settings_text' => 'You can use these links to reset your import settings for specific providers. This is useful when bad settings stop you from importing data.', - 'reset_settings_bunq' => 'Remove bunq API key, local external IP address and bunq related RSA keys.', - 'reset_settings_spectre' => 'Remove Spectre secrets and ID\'s. This will also remove your Spectre keypair. Remember to update the new one.', - 'settings_reset_for_bunq' => 'Bunq settings reset.', - 'settings_reset_for_spectre' => 'Spectre settings reset.', - + 'import_data' => 'Import data', // sandstorm.io errors and messages: 'sandstorm_not_available' => 'This function is not available when you are using Firefly III within a Sandstorm.io environment.', diff --git a/resources/lang/en_US/form.php b/resources/lang/en_US/form.php index 1b134859b0..39955eb731 100644 --- a/resources/lang/en_US/form.php +++ b/resources/lang/en_US/form.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // new user: 'bank_name' => 'Bank name', @@ -184,6 +185,13 @@ return [ 'blocked' => 'Is blocked?', 'blocked_code' => 'Reason for block', + // import + 'apply_rules' => 'Apply rules', + 'artist' => 'Artist', + 'album' => 'Album', + 'song' => 'Song', + + // admin 'domain' => 'Domain', 'single_user_mode' => 'Disable user registration', diff --git a/resources/lang/en_US/import.php b/resources/lang/en_US/import.php index 0fdbee1048..feb4f58645 100644 --- a/resources/lang/en_US/import.php +++ b/resources/lang/en_US/import.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ - // status of import: + // ALL breadcrumbs and subtitles: + 'index_breadcrumb' => 'Import data into Firefly III', + 'prerequisites_breadcrumb_fake' => 'Prerequisites for the fake import provider', + 'prerequisites_breadcrumb_spectre' => 'Prerequisites for Spectre', + 'prerequisites_breadcrumb_bunq' => 'Prerequisites for bunq', + 'job_configuration_breadcrumb' => 'Configuration for ":key"', + 'job_status_breadcrumb' => 'Import status for ":key"', + 'cannot_create_for_provider' => 'Firefly III cannot create a job for the ":provider"-provider.', + + // index page: + 'general_index_title' => 'Import a file', + 'general_index_intro' => 'Welcome to Firefly III\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.', + // import provider strings (index): + 'button_fake' => 'Fake an import', + 'button_file' => 'Import a file', + 'button_bunq' => 'Import from bunq', + 'button_spectre' => 'Import using Spectre', + 'button_plaid' => 'Import using Plaid', + 'button_yodlee' => 'Import using Yodlee', + 'button_quovo' => 'Import using Quovo', + // global config box (index) + 'global_config_title' => 'Global import configuration', + 'global_config_text' => 'In the future, this box will feature preferences that apply to ALL import providers above.', + // prerequisites box (index) + 'need_prereq_title' => 'Import prerequisites', + 'need_prereq_intro' => 'Some import methods need your attention before they can be used. For example, they might require special API keys or application secrets. You can configure them here. The icon indicates if these prerequisites have been met.', + 'do_prereq_fake' => 'Prerequisites for the fake provider', + 'do_prereq_file' => 'Prerequisites for file imports', + 'do_prereq_bunq' => 'Prerequisites for imports from bunq', + 'do_prereq_spectre' => 'Prerequisites for imports using Spectre', + 'do_prereq_plaid' => 'Prerequisites for imports using Plaid', + 'do_prereq_yodlee' => 'Prerequisites for imports using Yodlee', + 'do_prereq_quovo' => 'Prerequisites for imports using Quovo', + // provider config box (index) + 'can_config_title' => 'Import configuration', + 'can_config_intro' => 'Some import methods can be configured to your liking. They have extra settings you can tweak.', + 'do_config_fake' => 'Configuration for the fake provider', + 'do_config_file' => 'Configuration for file imports', + 'do_config_bunq' => 'Configuration for bunq imports', + 'do_config_spectre' => 'Configuration for imports from Spectre', + 'do_config_plaid' => 'Configuration for imports from Plaid', + 'do_config_yodlee' => 'Configuration for imports from Yodlee', + 'do_config_quovo' => 'Configuration for imports from Quovo', + + // prerequisites: + 'prereq_fake_title' => 'Prerequisites for an import from the fake import provider', + 'prereq_fake_text' => 'This fake provider requires a fake API key. It must be 32 characters long. You can use this one: 123456789012345678901234567890AA', + 'prereq_spectre_title' => 'Prerequisites for an import using the Spectre API', + 'prereq_spectre_text' => 'In order to import data using the Spectre API (v4), you must provide Firefly III with two secret values. They can be found on the secrets page.', + 'prereq_spectre_pub' => 'Likewise, the Spectre API needs to know the public key you see below. Without it, it will not recognize you. Please enter this public key on your secrets page.', + 'prereq_bunq_title' => 'Prerequisites for an import from bunq', + 'prereq_bunq_text' => 'In order to import from bunq, you need to obtain an API key. You can do this through the app. Please note that the import function for bunq is in BETA. It has only been tested against the sandbox API.', + 'prereq_bunq_ip' => 'bunq requires your externally facing IP address. Firefly III has tried to fill this in using the ipify service. Make sure this IP address is correct, or the import will fail.', + // prerequisites success messages: + 'prerequisites_saved_for_fake' => 'Fake API key stored successfully!', + 'prerequisites_saved_for_spectre' => 'App ID and secret stored!', + 'prerequisites_saved_for_bunq' => 'API key and IP stored!', + + // job configuration: + 'job_config_apply_rules_title' => 'Job configuration - apply your rules?', + 'job_config_apply_rules_text' => 'Once the fake provider has run, your rules can be applied to the transactions. This adds time to the import.', + 'job_config_input' => 'Your input', + // job configuration for the fake provider: + 'job_config_fake_artist_title' => 'Enter album name', + 'job_config_fake_artist_text' => 'Many import routines have a few configuration steps you must go through. In the case of the fake import provider, you must answer some weird questions. In this case, enter "David Bowie" to continue.', + 'job_config_fake_song_title' => 'Enter song name', + 'job_config_fake_song_text' => 'Mention the song "Golden years" to continue with the fake import.', + 'job_config_fake_album_title' => 'Enter album name', + 'job_config_fake_album_text' => 'Some import routines require extra data halfway through the import. In the case of the fake import provider, you must answer some weird questions. Enter "Station to station" to continue.', + // job configuration form the file provider + 'job_config_file_upload_title' => 'Import setup (1/4) - Upload your file', + 'job_config_file_upload_text' => 'This routine will help you import files from your bank into Firefly III. ', + 'job_config_file_upload_help' => 'Select your file. Please make sure the file is UTF-8 encoded.', + 'job_config_file_upload_config_help' => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their configuration file', + 'job_config_file_upload_type_help' => 'Select the type of file you will upload', + 'job_config_file_upload_submit' => 'Upload files', + 'import_file_type_csv' => 'CSV (comma separated values)', + 'file_not_utf8' => 'The file you have uploaded is not encoded as UTF-8 or ASCII. Firefly III cannot handle such files. Please use Notepad++ or Sublime to convert your file to UTF-8.', + 'job_config_uc_title' => 'Import setup (2/4) - Basic file setup', + 'job_config_uc_text' => 'To be able to import your file correctly, please validate the options below.', + 'job_config_uc_header_help' => 'Check this box if the first row of your CSV file are the column titles.', + 'job_config_uc_date_help' => 'Date time format in your file. Follow the format as this page indicates. The default value will parse dates that look like this: :dateExample.', + 'job_config_uc_delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.', + 'job_config_uc_account_help' => 'If your file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the file belong to.', + 'job_config_uc_apply_rules_title' => 'Apply rules', + 'job_config_uc_apply_rules_text' => 'Applies your rules to every imported transaction. Note that this slows the import significantly.', + 'job_config_uc_specifics_title' => 'Bank-specific options', + 'job_config_uc_specifics_txt' => 'Some banks deliver badly formatted files. Firefly III can fix those automatically. If your bank delivers such files but it\'s not listed here, please open an issue on GitHub.', + 'job_config_uc_submit' => 'Continue', + 'invalid_import_account' => 'You have selected an invalid account to import into.', + // job configuration for Spectre: + 'job_config_spectre_login_title' => 'Choose your login', + 'job_config_spectre_login_text' => 'Firefly III has found :count existing login(s) in your Spectre account. Which one would you like to use to import from?', + 'spectre_login_status_active' => 'Active', + 'spectre_login_status_inactive' => 'Inactive', + 'spectre_login_status_disabled' => 'Disabled', + 'spectre_login_new_login' => 'Login with another bank, or one of these banks with different credentials.', + 'job_config_spectre_accounts_title' => 'Select accounts to import from', + 'job_config_spectre_accounts_text' => 'You have selected ":name" (:country). You have :count account(s) available from this provider. Please select the Firefly III asset account(s) where the transactions from these accounts should be stored. Remember, in order to import data both the Firefly III account and the ":name"-account must have the same currency.', + 'spectre_no_supported_accounts' => 'You cannot import from this account due to a currency mismatch.', + 'spectre_do_not_import' => '(do not import)', + 'spectre_no_mapping' => 'It seems you have not selected any accounts to import from.', + 'imported_from_account' => 'Imported from ":account"', + 'spectre_account_with_number' => 'Account :number', + // job configuration for bunq: + 'job_config_bunq_accounts_title' => 'bunq accounts', + 'job_config_bunq_accounts_text' => 'These are the accounts associated with your bunq account. Please select the accounts from which you want to import, and in which account the transactions must be imported.', + 'bunq_no_mapping' => 'It seems you have not selected any accounts.', + 'should_download_config' => 'You should download the configuration file for this job. This will make future imports way easier.', + 'share_config_file' => 'If you have imported data from a public bank, you should share your configuration file so it will be easy for other users to import their data. Sharing your configuration file will not expose your financial details.', + + // keys from "extra" array: + 'spectre_extra_key_iban' => 'IBAN', + 'spectre_extra_key_swift' => 'SWIFT', + 'spectre_extra_key_status' => 'Status', + 'spectre_extra_key_card_type' => 'Card type', + 'spectre_extra_key_account_name' => 'Account name', + 'spectre_extra_key_client_name' => 'Client name', + 'spectre_extra_key_account_number' => 'Account number', + 'spectre_extra_key_blocked_amount' => 'Blocked amount', + 'spectre_extra_key_available_amount' => 'Available amount', + 'spectre_extra_key_credit_limit' => 'Credit limit', + 'spectre_extra_key_interest_rate' => 'Interest rate', + 'spectre_extra_key_expiry_date' => 'Expiry date', + 'spectre_extra_key_open_date' => 'Open date', + 'spectre_extra_key_current_time' => 'Current time', + 'spectre_extra_key_current_date' => 'Current date', + 'spectre_extra_key_cards' => 'Cards', + 'spectre_extra_key_units' => 'Units', + 'spectre_extra_key_unit_price' => 'Unit price', + 'spectre_extra_key_transactions_count' => 'Transaction count', + + // specifics: + 'specific_ing_name' => 'ING NL', + 'specific_ing_descr' => 'Create better descriptions in ING exports', + 'specific_sns_name' => 'SNS / Volksbank NL', + 'specific_sns_descr' => 'Trim quotes from SNS / Volksbank export files', + 'specific_abn_name' => 'ABN AMRO NL', + 'specific_abn_descr' => 'Fixes potential problems with ABN AMRO files', + 'specific_rabo_name' => 'Rabobank NL', + 'specific_rabo_descr' => 'Fixes potential problems with Rabobank files', + 'specific_pres_name' => 'President\'s Choice Financial CA', + 'specific_pres_descr' => 'Fixes potential problems with PC files', + // job configuration for file provider (stage: roles) + 'job_config_roles_title' => 'Import setup (3/4) - Define each column\'s role', + 'job_config_roles_text' => 'Each column in your CSV file contains certain data. Please indicate what kind of data the importer should expect. The option to "map" data means that you will link each entry found in the column to a value in your database. An often mapped column is the column that contains the IBAN of the opposing account. That can be easily matched to IBAN\'s present in your database already.', + 'job_config_roles_submit' => 'Continue', + 'job_config_roles_column_name' => 'Name of column', + 'job_config_roles_column_example' => 'Column example data', + 'job_config_roles_column_role' => 'Column data meaning', + 'job_config_roles_do_map_value' => 'Map these values', + 'job_config_roles_no_example' => 'No example data available', + 'job_config_roles_fa_warning' => 'If you mark a column as containing an amount in a foreign currency, you must also set the column that contains which currency it is.', + 'job_config_roles_rwarning' => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.', + 'job_config_roles_colum_count' => 'Column', + // job config for the file provider (stage: mapping): + 'job_config_map_title' => 'Import setup (4/4) - Connect import data to Firefly III data', + 'job_config_map_text' => 'In the following tables, the left value shows you information found in your uploaded file. It is your task to map this value, if possible, to a value already present in your database. Firefly will stick to this mapping. If there is no value to map to, or you do not wish to map the specific value, select nothing.', + 'job_config_map_nothing' => 'There is no data present in your file that you can map to existing values. Please press "Start the import" to continue.', + 'job_config_field_value' => 'Field value', + 'job_config_field_mapped' => 'Mapped to', + 'map_do_not_map' => '(do not map)', + 'job_config_map_submit' => 'Start the import', + + + // import status page: + 'import_with_key' => 'Import with key \':key\'', 'status_wait_title' => 'Please hold...', 'status_wait_text' => 'This box will disappear in a moment.', - 'status_fatal_title' => 'A fatal error occurred', - 'status_fatal_text' => 'A fatal error occurred, which the import-routine cannot recover from. Please see the explanation in red below.', - 'status_fatal_more' => 'If the error is a time-out, the import will have stopped half-way. For some server configurations, it is merely the server that stopped while the import keeps running in the background. To verify this, check out the log files. If the problem persists, consider importing over the command line instead.', - 'status_ready_title' => 'Import is ready to start', - 'status_ready_text' => 'The import is ready to start. All the configuration you needed to do has been done. Please download the configuration file. It will help you with the import should it not go as planned. To actually run the import, you can either execute the following command in your console, or run the web-based import. Depending on your configuration, the console import will give you more feedback.', - 'status_ready_noconfig_text' => 'The import is ready to start. All the configuration you needed to do has been done. To actually run the import, you can either execute the following command in your console, or run the web-based import. Depending on your configuration, the console import will give you more feedback.', - 'status_ready_config' => 'Download configuration', - 'status_ready_start' => 'Start the import', - 'status_ready_share' => 'Please consider downloading your configuration and sharing it at the import configuration center. This will allow other users of Firefly III to import their files more easily.', - 'status_job_new' => 'The job is brand new.', - 'status_job_configuring' => 'The import is being configured.', - 'status_job_configured' => 'The import is configured.', - 'status_job_running' => 'The import is running.. Please wait..', - 'status_job_error' => 'The job has generated an error.', - 'status_job_finished' => 'The import has finished!', 'status_running_title' => 'The import is running', - 'status_running_placeholder' => 'Please hold for an update...', - 'status_finished_title' => 'Import routine finished', - 'status_finished_text' => 'The import routine has imported your data.', - 'status_errors_title' => 'Errors during the import', - 'status_errors_single' => 'An error has occurred during the import. It does not appear to be fatal.', - 'status_errors_multi' => 'Some errors occurred during the import. These do not appear to be fatal.', - 'status_bread_crumb' => 'Import status', - 'status_sub_title' => 'Import status', - 'config_sub_title' => 'Set up your import', - 'status_finished_job' => 'The :count transactions imported can be found in tag :tag.', - 'status_finished_no_tag' => 'Firefly III has not collected any transactions from your import file.', - 'import_with_key' => 'Import with key \':key\'', + 'status_job_running' => 'Please wait, running the import...', + 'status_job_storing' => 'Please wait, storing data...', + 'status_job_rules' => 'Please wait, running rules...', + 'status_fatal_title' => 'Fatal error', + 'status_fatal_text' => 'The import has suffered from an error it could not recover from. Apologies!', + 'status_fatal_more' => 'This (possibly very cryptic) error message is complemented by log files, which you can find on your hard drive, or in the Docker container where you run Firefly III from.', + 'status_finished_title' => 'Import finished', + 'status_finished_text' => 'The import has finished.', + 'finished_with_errors' => 'There were some errors during the import. Please review them carefully.', + 'unknown_import_result' => 'Unknown import result', + 'result_no_transactions' => 'No transactions have been imported. Perhaps they were all duplicates is simply no transactions where present to be imported. Perhaps the log files can tell you what happened. If you import data regularly, this is normal.', + 'result_one_transaction' => 'Exactly one transaction has been imported. It is stored under tag :tag where you can inspect it further.', + 'result_many_transactions' => 'Firefly III has imported :count transactions. They are stored under tag :tag where you can inspect them further.', - // file, upload something - 'file_upload_title' => 'Import setup (1/4) - Upload your file', - 'file_upload_text' => 'This routine will help you import files from your bank into Firefly III. Please check out the help pages in the top right corner.', - 'file_upload_fields' => 'Fields', - 'file_upload_help' => 'Select your file', - 'file_upload_config_help' => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their configuration file', - 'file_upload_type_help' => 'Select the type of file you will upload', - 'file_upload_submit' => 'Upload files', - // file, upload types - 'import_file_type_csv' => 'CSV (comma separated values)', + // general errors and warnings: + 'bad_job_status' => 'To access this page, your import job cannot have status ":status".', - // file, initial config for CSV - 'csv_initial_title' => 'Import setup (2/4) - Basic CSV import setup', - 'csv_initial_text' => 'To be able to import your file correctly, please validate the options below.', - 'csv_initial_box' => 'Basic CSV import setup', - 'csv_initial_box_title' => 'Basic CSV import setup options', - 'csv_initial_header_help' => 'Check this box if the first row of your CSV file are the column titles.', - 'csv_initial_date_help' => 'Date time format in your CSV. Follow the format like this page indicates. The default value will parse dates that look like this: :dateExample.', - 'csv_initial_delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.', - 'csv_initial_import_account_help' => 'If your CSV file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the CSV belong to.', - 'csv_initial_submit' => 'Continue with step 3/4', - - // file, new options: - 'file_apply_rules_title' => 'Apply rules', - 'file_apply_rules_description' => 'Apply your rules. Note that this slows the import significantly.', - 'file_match_bills_title' => 'Match bills', - 'file_match_bills_description' => 'Match your bills to newly created withdrawals. Note that this slows the import significantly.', - - // file, roles config - 'csv_roles_title' => 'Import setup (3/4) - Define each column\'s role', - 'csv_roles_text' => 'Each column in your CSV file contains certain data. Please indicate what kind of data the importer should expect. The option to "map" data means that you will link each entry found in the column to a value in your database. An often mapped column is the column that contains the IBAN of the opposing account. That can be easily matched to IBAN\'s present in your database already.', - 'csv_roles_table' => 'Table', - 'csv_roles_column_name' => 'Name of column', - 'csv_roles_column_example' => 'Column example data', - 'csv_roles_column_role' => 'Column data meaning', - 'csv_roles_do_map_value' => 'Map these values', - 'csv_roles_column' => 'Column', - 'csv_roles_no_example_data' => 'No example data available', - 'csv_roles_submit' => 'Continue with step 4/4', - - // not csv, but normal warning - 'roles_warning' => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.', - 'foreign_amount_warning' => 'If you mark a column as containing an amount in a foreign currency, you must also set the column that contains which currency it is.', - - // file, map data - 'file_map_title' => 'Import setup (4/4) - Connect import data to Firefly III data', - 'file_map_text' => 'In the following tables, the left value shows you information found in your uploaded file. It is your task to map this value, if possible, to a value already present in your database. Firefly will stick to this mapping. If there is no value to map to, or you do not wish to map the specific value, select nothing.', - 'file_map_field_value' => 'Field value', - 'file_map_field_mapped_to' => 'Mapped to', - 'map_do_not_map' => '(do not map)', - 'file_map_submit' => 'Start the import', - 'file_nothing_to_map' => 'There is no data present in your file that you can map to existing values. Please press "Start the import" to continue.', - - // map things. + // column roles for CSV import: 'column__ignore' => '(ignore this column)', 'column_account-iban' => 'Asset account (IBAN)', 'column_account-id' => 'Asset account ID (matching FF3)', @@ -158,48 +261,4 @@ return [ 'column_note' => 'Note(s)', 'column_internal-reference' => 'Internal reference', - // prerequisites - 'prerequisites' => 'Prerequisites', - - // bunq - 'bunq_prerequisites_title' => 'Prerequisites for an import from bunq', - 'bunq_prerequisites_text' => 'In order to import from bunq, you need to obtain an API key. You can do this through the app. Please note that the import function for bunq is in BETA. It has only been tested against the sandbox API.', - 'bunq_prerequisites_text_ip' => 'Bunq requires your externally facing IP address. Firefly III has tried to fill this in using the ipify service. Make sure this IP address is correct, or the import will fail.', - 'bunq_do_import' => 'Yes, import from this account', - 'bunq_accounts_title' => 'Bunq accounts', - 'bunq_accounts_text' => 'These are the accounts associated with your bunq account. Please select the accounts from which you want to import, and in which account the transactions must be imported.', - - // Spectre - 'spectre_title' => 'Import using Spectre', - 'spectre_prerequisites_title' => 'Prerequisites for an import using Spectre', - 'spectre_prerequisites_text' => 'In order to import data using the Spectre API (v4), you must provide Firefly III with two secret values. They can be found on the secrets page.', - 'spectre_enter_pub_key' => 'The import will only work when you enter this public key on your secrets page.', - 'spectre_accounts_title' => 'Select accounts to import from', - 'spectre_accounts_text' => 'Each account on the left below has been found by Spectre and can be imported into Firefly III. Please select the asset account that should hold any given transactions. If you do not wish to import from any particular account, remove the check from the checkbox.', - 'spectre_do_import' => 'Yes, import from this account', - 'spectre_no_supported_accounts' => 'You cannot import from this account due to a currency mismatch.', - - // keys from "extra" array: - 'spectre_extra_key_iban' => 'IBAN', - 'spectre_extra_key_swift' => 'SWIFT', - 'spectre_extra_key_status' => 'Status', - 'spectre_extra_key_card_type' => 'Card type', - 'spectre_extra_key_account_name' => 'Account name', - 'spectre_extra_key_client_name' => 'Client name', - 'spectre_extra_key_account_number' => 'Account number', - 'spectre_extra_key_blocked_amount' => 'Blocked amount', - 'spectre_extra_key_available_amount' => 'Available amount', - 'spectre_extra_key_credit_limit' => 'Credit limit', - 'spectre_extra_key_interest_rate' => 'Interest rate', - 'spectre_extra_key_expiry_date' => 'Expiry date', - 'spectre_extra_key_open_date' => 'Open date', - 'spectre_extra_key_current_time' => 'Current time', - 'spectre_extra_key_current_date' => 'Current date', - 'spectre_extra_key_cards' => 'Cards', - 'spectre_extra_key_units' => 'Units', - 'spectre_extra_key_unit_price' => 'Unit price', - 'spectre_extra_key_transactions_count' => 'Transaction count', - - // various other strings: - 'imported_from_account' => 'Imported from ":account"', ]; diff --git a/resources/lang/en_US/intro.php b/resources/lang/en_US/intro.php index 1d442a8d48..dd24288522 100644 --- a/resources/lang/en_US/intro.php +++ b/resources/lang/en_US/intro.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // index 'index_intro' => 'Welcome to the index page of Firefly III. Please take the time to walk through this intro to get a feeling of how Firefly III works.', diff --git a/resources/lang/en_US/list.php b/resources/lang/en_US/list.php index 05ffa9c72c..bd11777b11 100644 --- a/resources/lang/en_US/list.php +++ b/resources/lang/en_US/list.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'buttons' => 'Buttons', 'icon' => 'Icon', @@ -111,10 +112,15 @@ return [ 'sepa-cc' => 'SEPA Clearing Code', 'sepa-ep' => 'SEPA External Purpose', 'sepa-ci' => 'SEPA Creditor Identifier', + 'external_id' => 'External ID', 'account_at_bunq' => 'Account with bunq', 'file_name' => 'File name', 'file_size' => 'File size', 'file_type' => 'File type', 'attached_to' => 'Attached to', 'file_exists' => 'File exists', + 'spectre_bank' => 'Bank', + 'spectre_last_use' => 'Last login', + 'spectre_status' => 'Status', + 'bunq_payment_id' => 'bunq payment ID', ]; diff --git a/resources/lang/en_US/pagination.php b/resources/lang/en_US/pagination.php index 8bdf7ed01d..cdf4ca9a6d 100644 --- a/resources/lang/en_US/pagination.php +++ b/resources/lang/en_US/pagination.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'previous' => '« Previous', 'next' => 'Next »', diff --git a/resources/lang/en_US/passwords.php b/resources/lang/en_US/passwords.php index 72f4f769a7..7ab0503080 100644 --- a/resources/lang/en_US/passwords.php +++ b/resources/lang/en_US/passwords.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'password' => 'Passwords must be at least six characters and match the confirmation.', 'user' => 'We can\'t find a user with that e-mail address.', diff --git a/resources/lang/en_US/validation.php b/resources/lang/en_US/validation.php index 46988a77d6..9ca9ec0f61 100644 --- a/resources/lang/en_US/validation.php +++ b/resources/lang/en_US/validation.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'iban' => 'This is not a valid IBAN.', 'source_equals_destination' => 'The source account equals the destination account', @@ -109,7 +110,8 @@ return [ 'in_array' => 'The :attribute field does not exist in :other.', 'present' => 'The :attribute field must be present.', 'amount_zero' => 'The total amount cannot be zero', - 'secure_password' => 'This is not a secure password. Please try again. For more information, visit https://goo.gl/NCh2tN', + 'unique_piggy_bank_for_user' => 'The name of the piggy bank must be unique.', + 'secure_password' => 'This is not a secure password. Please try again. For more information, visit http://bit.ly/FF3-password-security', 'attributes' => [ 'email' => 'email address', 'description' => 'description', diff --git a/resources/lang/es_ES/auth.php b/resources/lang/es_ES/auth.php index b91042a71f..7a42e8dbde 100644 --- a/resources/lang/es_ES/auth.php +++ b/resources/lang/es_ES/auth.php @@ -1,9 +1,8 @@ . */ -return [ - /* - |-------------------------------------------------------------------------- - | Authentication Language Lines - |-------------------------------------------------------------------------- - | - | The following language lines are used during authentication for various - | messages that we need to display to the user. You are free to modify - | these language lines according to your application's requirements. - | - */ +declare(strict_types=1); +return [ 'failed' => 'Las credenciales no coinciden con los registros.', 'throttle' => 'Demasiados intentos de inicio de sesión. Por favor reintente en :seconds segundos.', ]; diff --git a/resources/lang/es_ES/bank.php b/resources/lang/es_ES/bank.php index 8826020cbf..5d00b1e685 100644 --- a/resources/lang/es_ES/bank.php +++ b/resources/lang/es_ES/bank.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ ]; diff --git a/resources/lang/es_ES/breadcrumbs.php b/resources/lang/es_ES/breadcrumbs.php index 39f6cc84e4..f1b9067035 100644 --- a/resources/lang/es_ES/breadcrumbs.php +++ b/resources/lang/es_ES/breadcrumbs.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'home' => 'Inicio', 'edit_currency' => 'Editar moneda ":name"', diff --git a/resources/lang/es_ES/components.php b/resources/lang/es_ES/components.php index cd7dcbdfb4..e5083bdd1e 100644 --- a/resources/lang/es_ES/components.php +++ b/resources/lang/es_ES/components.php @@ -1,5 +1,4 @@ . */ +declare(strict_types=1); + return [ // profile 'personal_access_tokens' => 'Tokens de acceso personal', diff --git a/resources/lang/es_ES/config.php b/resources/lang/es_ES/config.php index 6d084206a4..d5bebf299c 100644 --- a/resources/lang/es_ES/config.php +++ b/resources/lang/es_ES/config.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'html_language' => 'es', 'locale' => 'es, Spanish, es_ES, es_ES.utf8, es_ES.UTF-8', diff --git a/resources/lang/es_ES/csv.php b/resources/lang/es_ES/csv.php index 622a49202a..aae109a40a 100644 --- a/resources/lang/es_ES/csv.php +++ b/resources/lang/es_ES/csv.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ ]; diff --git a/resources/lang/es_ES/demo.php b/resources/lang/es_ES/demo.php index 95caa87b6a..67a5f2fe85 100644 --- a/resources/lang/es_ES/demo.php +++ b/resources/lang/es_ES/demo.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'no_demo_text' => 'Lamentablemente no hay textos de ayuda para esta página.', 'see_help_icon' => 'Sin embargo, el ícono en la esquina superior-derecha puede tener más información.', @@ -32,5 +33,5 @@ return [ 'currencies-index' => 'Firefly III admite múltiples monedas. A pesar de que la moneda por defecto es el Euro, se puede seleccionar el Dólar de EE.UU, y muchas otras monedas. Como se puede ver se ha incluido una pequeña selección de monedas, pero puedes agregar tu propia moneda si lo deseas. Sin embargo, cambiar la moneda predeterminada no cambiará la moneda de las transacciones existentes: Firefly III admite el uso de varias monedas al mismo tiempo.', 'transactions-index' => 'Estos gastos, depósitos y transferencias no son particularmente imaginativos. Se han generado automáticamente.', 'piggy-banks-index' => 'Como puede ver, hay tres alcancías. Utilice los botones más y menos para influir en la cantidad de dinero en cada alcancía. Haga clic en el nombre de la alcancía para ver la administración de cada una.', - 'import-index' => 'Por supuesto, cualquier archivo CSV puede ser importado dentro de Firefly III', + 'import-index' => 'Any CSV file can be imported into Firefly III. It also supports importing data from bunq and Spectre. Other banks and financial aggregators will be implemented in the future. As a demo-user however, you can only see the "fake"-provider in action. It will generate some random transactions to show you how the process works.', ]; diff --git a/resources/lang/es_ES/firefly.php b/resources/lang/es_ES/firefly.php index f4724c75bc..70fe05fe79 100644 --- a/resources/lang/es_ES/firefly.php +++ b/resources/lang/es_ES/firefly.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // general stuff: 'close' => 'Cerrar', @@ -179,6 +180,7 @@ return [ 'authorization_request_intro' => 'El :client está solicitando permiso para acceder a su administración financiera. ¿Desea autorizar :client para acceder a estos registros?', 'scopes_will_be_able' => 'Esta aplicación podrá:', 'button_authorize' => 'Autorizar', + 'none_in_select_list' => '(none)', // check for updates: 'update_check_title' => 'Ver actualizaciones', @@ -666,6 +668,7 @@ return [ 'bill_will_automatch' => 'Bill se vinculara automáticamente a transacciones coincidentes', 'skips_over' => 'salta sobre', 'bill_store_error' => 'An unexpected error occurred while storing your new bill. Please check the log files', + 'list_inactive_rule' => 'inactive rule', // accounts: 'details_for_asset' => 'Detalles para la cuenta de activos ":name"', @@ -801,6 +804,7 @@ return [ 'opt_group_savingAsset' => 'Cuenta de ahorros', 'opt_group_sharedAsset' => 'Cuenta de activos compartidas', 'opt_group_ccAsset' => 'Tarjetas de credito', + 'opt_group_cashWalletAsset' => 'Cash wallets', 'notes' => 'Notas', 'unknown_journal_error' => 'Could not store the transaction. Please check the log files.', @@ -817,6 +821,7 @@ return [ 'language' => 'Language', 'new_savings_account' => ':bank_name savings account', 'cash_wallet' => 'Cash wallet', + 'currency_not_present' => 'If the currency you normally use is not listed do not worry. You can create your own currencies under Options > Currencies.', // home page: 'yourAccounts' => 'Tus cuentas', @@ -1014,6 +1019,7 @@ return [ 'remove_money_from_piggy_title' => 'Quitar dinero de la alcancía ":name"', 'add' => 'Añadir', 'no_money_for_piggy' => 'Usted no tiene dinero para colocar en esta alcancía.', + 'suggested_savings_per_month' => 'Suggested per month', 'remove' => 'Eliminar', 'max_amount_add' => 'La cantidad máxima que usted puede agregar es', @@ -1149,27 +1155,9 @@ return [ 'no_edit_multiple_left' => 'Usted ha seleccionado transacciones no validas para editar.', 'cannot_convert_split_journal' => 'No se puede convertir una transacción dividida', - // import bread crumbs and titles: - 'import' => 'Importar', - 'import_data' => 'Importar datos', - 'import_general_index_file' => 'Importar un archivo', - 'import_from_bunq' => 'Importar de bunq', - 'import_using_spectre' => 'Importar usando Spectre', - 'import_using_plaid' => 'Importar usando cuadros', - 'import_config_bread_crumb' => 'Configure su importación', - - // import index page: + // Import page (general strings only) 'import_index_title' => 'Importar datos a Firefly III', - 'import_index_sub_title' => 'Ãndice', - 'import_general_index_intro' => 'Bienvenido a la rutina de importación de Firefly III. Hay algunas formas de importar datos a Firefly III, que se muestran aquí como botones.', - 'upload_error' => 'The file you have uploaded could not be processed. Possibly it is of an invalid file type or encoding. The log files will have more information.', - 'reset_import_settings_title' => 'Reset import configuration', - 'reset_import_settings_text' => 'You can use these links to reset your import settings for specific providers. This is useful when bad settings stop you from importing data.', - 'reset_settings_bunq' => 'Remove bunq API key, local external IP address and bunq related RSA keys.', - 'reset_settings_spectre' => 'Remove Spectre secrets and ID\'s. This will also remove your Spectre keypair. Remember to update the new one.', - 'settings_reset_for_bunq' => 'Bunq settings reset.', - 'settings_reset_for_spectre' => 'Spectre settings reset.', - + 'import_data' => 'Importar datos', // sandstorm.io errors and messages: 'sandstorm_not_available' => 'Esta función no esta disponible cuando usted esta utilizando Firefly III dentro de un ambiente Sandstorm.io.', diff --git a/resources/lang/es_ES/form.php b/resources/lang/es_ES/form.php index ae6ce896fc..11d94d8b7f 100644 --- a/resources/lang/es_ES/form.php +++ b/resources/lang/es_ES/form.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // new user: 'bank_name' => 'Banco', @@ -184,6 +185,13 @@ return [ 'blocked' => '¿Está bloqueado?', 'blocked_code' => 'Razón del bloqueo', + // import + 'apply_rules' => 'Apply rules', + 'artist' => 'Artist', + 'album' => 'Album', + 'song' => 'Song', + + // admin 'domain' => 'Dominio', 'single_user_mode' => 'Deshabilitar registro de usuario', diff --git a/resources/lang/es_ES/import.php b/resources/lang/es_ES/import.php index b7b53f9877..8a812e4689 100644 --- a/resources/lang/es_ES/import.php +++ b/resources/lang/es_ES/import.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ - // status of import: + // ALL breadcrumbs and subtitles: + 'index_breadcrumb' => 'Import data into Firefly III', + 'prerequisites_breadcrumb_fake' => 'Prerequisites for the fake import provider', + 'prerequisites_breadcrumb_spectre' => 'Prerequisites for Spectre', + 'prerequisites_breadcrumb_bunq' => 'Prerequisites for bunq', + 'job_configuration_breadcrumb' => 'Configuration for ":key"', + 'job_status_breadcrumb' => 'Import status for ":key"', + 'cannot_create_for_provider' => 'Firefly III cannot create a job for the ":provider"-provider.', + + // index page: + 'general_index_title' => 'Import a file', + 'general_index_intro' => 'Welcome to Firefly III\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.', + // import provider strings (index): + 'button_fake' => 'Fake an import', + 'button_file' => 'Import a file', + 'button_bunq' => 'Import from bunq', + 'button_spectre' => 'Import using Spectre', + 'button_plaid' => 'Import using Plaid', + 'button_yodlee' => 'Import using Yodlee', + 'button_quovo' => 'Import using Quovo', + // global config box (index) + 'global_config_title' => 'Global import configuration', + 'global_config_text' => 'In the future, this box will feature preferences that apply to ALL import providers above.', + // prerequisites box (index) + 'need_prereq_title' => 'Import prerequisites', + 'need_prereq_intro' => 'Some import methods need your attention before they can be used. For example, they might require special API keys or application secrets. You can configure them here. The icon indicates if these prerequisites have been met.', + 'do_prereq_fake' => 'Prerequisites for the fake provider', + 'do_prereq_file' => 'Prerequisites for file imports', + 'do_prereq_bunq' => 'Prerequisites for imports from bunq', + 'do_prereq_spectre' => 'Prerequisites for imports using Spectre', + 'do_prereq_plaid' => 'Prerequisites for imports using Plaid', + 'do_prereq_yodlee' => 'Prerequisites for imports using Yodlee', + 'do_prereq_quovo' => 'Prerequisites for imports using Quovo', + // provider config box (index) + 'can_config_title' => 'Import configuration', + 'can_config_intro' => 'Some import methods can be configured to your liking. They have extra settings you can tweak.', + 'do_config_fake' => 'Configuration for the fake provider', + 'do_config_file' => 'Configuration for file imports', + 'do_config_bunq' => 'Configuration for bunq imports', + 'do_config_spectre' => 'Configuration for imports from Spectre', + 'do_config_plaid' => 'Configuration for imports from Plaid', + 'do_config_yodlee' => 'Configuration for imports from Yodlee', + 'do_config_quovo' => 'Configuration for imports from Quovo', + + // prerequisites: + 'prereq_fake_title' => 'Prerequisites for an import from the fake import provider', + 'prereq_fake_text' => 'This fake provider requires a fake API key. It must be 32 characters long. You can use this one: 123456789012345678901234567890AA', + 'prereq_spectre_title' => 'Prerequisites for an import using the Spectre API', + 'prereq_spectre_text' => 'In order to import data using the Spectre API (v4), you must provide Firefly III with two secret values. They can be found on the secrets page.', + 'prereq_spectre_pub' => 'Likewise, the Spectre API needs to know the public key you see below. Without it, it will not recognize you. Please enter this public key on your secrets page.', + 'prereq_bunq_title' => 'Prerequisites for an import from bunq', + 'prereq_bunq_text' => 'In order to import from bunq, you need to obtain an API key. You can do this through the app. Please note that the import function for bunq is in BETA. It has only been tested against the sandbox API.', + 'prereq_bunq_ip' => 'bunq requires your externally facing IP address. Firefly III has tried to fill this in using the ipify service. Make sure this IP address is correct, or the import will fail.', + // prerequisites success messages: + 'prerequisites_saved_for_fake' => 'Fake API key stored successfully!', + 'prerequisites_saved_for_spectre' => 'App ID and secret stored!', + 'prerequisites_saved_for_bunq' => 'API key and IP stored!', + + // job configuration: + 'job_config_apply_rules_title' => 'Job configuration - apply your rules?', + 'job_config_apply_rules_text' => 'Once the fake provider has run, your rules can be applied to the transactions. This adds time to the import.', + 'job_config_input' => 'Your input', + // job configuration for the fake provider: + 'job_config_fake_artist_title' => 'Enter album name', + 'job_config_fake_artist_text' => 'Many import routines have a few configuration steps you must go through. In the case of the fake import provider, you must answer some weird questions. In this case, enter "David Bowie" to continue.', + 'job_config_fake_song_title' => 'Enter song name', + 'job_config_fake_song_text' => 'Mention the song "Golden years" to continue with the fake import.', + 'job_config_fake_album_title' => 'Enter album name', + 'job_config_fake_album_text' => 'Some import routines require extra data halfway through the import. In the case of the fake import provider, you must answer some weird questions. Enter "Station to station" to continue.', + // job configuration form the file provider + 'job_config_file_upload_title' => 'Import setup (1/4) - Upload your file', + 'job_config_file_upload_text' => 'This routine will help you import files from your bank into Firefly III. ', + 'job_config_file_upload_help' => 'Select your file. Please make sure the file is UTF-8 encoded.', + 'job_config_file_upload_config_help' => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their configuration file', + 'job_config_file_upload_type_help' => 'Select the type of file you will upload', + 'job_config_file_upload_submit' => 'Upload files', + 'import_file_type_csv' => 'CSV (valores separados por comas)', + 'file_not_utf8' => 'The file you have uploaded is not encoded as UTF-8 or ASCII. Firefly III cannot handle such files. Please use Notepad++ or Sublime to convert your file to UTF-8.', + 'job_config_uc_title' => 'Import setup (2/4) - Basic file setup', + 'job_config_uc_text' => 'To be able to import your file correctly, please validate the options below.', + 'job_config_uc_header_help' => 'Check this box if the first row of your CSV file are the column titles.', + 'job_config_uc_date_help' => 'Date time format in your file. Follow the format as this page indicates. The default value will parse dates that look like this: :dateExample.', + 'job_config_uc_delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.', + 'job_config_uc_account_help' => 'If your file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the file belong to.', + 'job_config_uc_apply_rules_title' => 'Apply rules', + 'job_config_uc_apply_rules_text' => 'Applies your rules to every imported transaction. Note that this slows the import significantly.', + 'job_config_uc_specifics_title' => 'Bank-specific options', + 'job_config_uc_specifics_txt' => 'Some banks deliver badly formatted files. Firefly III can fix those automatically. If your bank delivers such files but it\'s not listed here, please open an issue on GitHub.', + 'job_config_uc_submit' => 'Continue', + 'invalid_import_account' => 'You have selected an invalid account to import into.', + // job configuration for Spectre: + 'job_config_spectre_login_title' => 'Choose your login', + 'job_config_spectre_login_text' => 'Firefly III has found :count existing login(s) in your Spectre account. Which one would you like to use to import from?', + 'spectre_login_status_active' => 'Active', + 'spectre_login_status_inactive' => 'Inactive', + 'spectre_login_status_disabled' => 'Disabled', + 'spectre_login_new_login' => 'Login with another bank, or one of these banks with different credentials.', + 'job_config_spectre_accounts_title' => 'Select accounts to import from', + 'job_config_spectre_accounts_text' => 'You have selected ":name" (:country). You have :count account(s) available from this provider. Please select the Firefly III asset account(s) where the transactions from these accounts should be stored. Remember, in order to import data both the Firefly III account and the ":name"-account must have the same currency.', + 'spectre_no_supported_accounts' => 'You cannot import from this account due to a currency mismatch.', + 'spectre_do_not_import' => '(do not import)', + 'spectre_no_mapping' => 'It seems you have not selected any accounts to import from.', + 'imported_from_account' => 'Imported from ":account"', + 'spectre_account_with_number' => 'Account :number', + // job configuration for bunq: + 'job_config_bunq_accounts_title' => 'bunq accounts', + 'job_config_bunq_accounts_text' => 'These are the accounts associated with your bunq account. Please select the accounts from which you want to import, and in which account the transactions must be imported.', + 'bunq_no_mapping' => 'It seems you have not selected any accounts.', + 'should_download_config' => 'You should download the configuration file for this job. This will make future imports way easier.', + 'share_config_file' => 'If you have imported data from a public bank, you should share your configuration file so it will be easy for other users to import their data. Sharing your configuration file will not expose your financial details.', + + // keys from "extra" array: + 'spectre_extra_key_iban' => 'IBAN', + 'spectre_extra_key_swift' => 'SWIFT', + 'spectre_extra_key_status' => 'Status', + 'spectre_extra_key_card_type' => 'Card type', + 'spectre_extra_key_account_name' => 'Account name', + 'spectre_extra_key_client_name' => 'Client name', + 'spectre_extra_key_account_number' => 'Account number', + 'spectre_extra_key_blocked_amount' => 'Blocked amount', + 'spectre_extra_key_available_amount' => 'Available amount', + 'spectre_extra_key_credit_limit' => 'Credit limit', + 'spectre_extra_key_interest_rate' => 'Interest rate', + 'spectre_extra_key_expiry_date' => 'Expiry date', + 'spectre_extra_key_open_date' => 'Open date', + 'spectre_extra_key_current_time' => 'Current time', + 'spectre_extra_key_current_date' => 'Current date', + 'spectre_extra_key_cards' => 'Cards', + 'spectre_extra_key_units' => 'Units', + 'spectre_extra_key_unit_price' => 'Unit price', + 'spectre_extra_key_transactions_count' => 'Transaction count', + + // specifics: + 'specific_ing_name' => 'ING NL', + 'specific_ing_descr' => 'Create better descriptions in ING exports', + 'specific_sns_name' => 'SNS / Volksbank NL', + 'specific_sns_descr' => 'Trim quotes from SNS / Volksbank export files', + 'specific_abn_name' => 'ABN AMRO NL', + 'specific_abn_descr' => 'Fixes potential problems with ABN AMRO files', + 'specific_rabo_name' => 'Rabobank NL', + 'specific_rabo_descr' => 'Fixes potential problems with Rabobank files', + 'specific_pres_name' => 'President\'s Choice Financial CA', + 'specific_pres_descr' => 'Fixes potential problems with PC files', + // job configuration for file provider (stage: roles) + 'job_config_roles_title' => 'Import setup (3/4) - Define each column\'s role', + 'job_config_roles_text' => 'Each column in your CSV file contains certain data. Please indicate what kind of data the importer should expect. The option to "map" data means that you will link each entry found in the column to a value in your database. An often mapped column is the column that contains the IBAN of the opposing account. That can be easily matched to IBAN\'s present in your database already.', + 'job_config_roles_submit' => 'Continue', + 'job_config_roles_column_name' => 'Name of column', + 'job_config_roles_column_example' => 'Column example data', + 'job_config_roles_column_role' => 'Column data meaning', + 'job_config_roles_do_map_value' => 'Map these values', + 'job_config_roles_no_example' => 'No example data available', + 'job_config_roles_fa_warning' => 'If you mark a column as containing an amount in a foreign currency, you must also set the column that contains which currency it is.', + 'job_config_roles_rwarning' => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.', + 'job_config_roles_colum_count' => 'Column', + // job config for the file provider (stage: mapping): + 'job_config_map_title' => 'Import setup (4/4) - Connect import data to Firefly III data', + 'job_config_map_text' => 'In the following tables, the left value shows you information found in your uploaded file. It is your task to map this value, if possible, to a value already present in your database. Firefly will stick to this mapping. If there is no value to map to, or you do not wish to map the specific value, select nothing.', + 'job_config_map_nothing' => 'There is no data present in your file that you can map to existing values. Please press "Start the import" to continue.', + 'job_config_field_value' => 'Field value', + 'job_config_field_mapped' => 'Mapped to', + 'map_do_not_map' => '(no mapear)', + 'job_config_map_submit' => 'Start the import', + + + // import status page: + 'import_with_key' => 'Importar con la clave \':key\'', 'status_wait_title' => 'Por favor espere...', 'status_wait_text' => 'Esta caja va a desaparecer en un momento.', - 'status_fatal_title' => 'Un error fatal ha ocurrido', - 'status_fatal_text' => 'Un error fatal ocurrió, del cual la rutina de importación no se puede recuperar. Por favor, vea la explicación en rojo a continuación.', - 'status_fatal_more' => 'Si el error es de tiempo en espera, la importación se detendrá a mitad de camino. Para algunas configuraciones de servidor, es simplemente que el servidor se detuvo mientras la importación se sigue ejecutando en segundo plano. Para verificar esto, revise los archivos de logs. Si el problema persiste, considere importar a través de la linea de comando.', - 'status_ready_title' => 'La Importación esta lista para comenzar', - 'status_ready_text' => 'La importación está lista para comenzar. Toda la configuración que necesitaba hacer ya está hecha. Por favor descargue el archivo de configuración. Le ayudará con la importación en caso de que no vaya según lo planeado. Para ejecutar la importación, puede ejecutar el siguiente comando en su consola, o utilizar la importación a través de la interfaz web. Dependiendo de su configuración, la importación de la consola le ofrecerá más comentarios de ayuda.', - 'status_ready_noconfig_text' => 'La importación está lista para comenzar. Toda la configuración que necesitaba hacer ya está hecha. Para ejecutar la importación, puede ejecutar el siguiente comando en su consola, o utilizar la importación a través de la interfaz web. Dependiendo de su configuración, la importación de la consola le ofrecerá más comentarios de ayuda.', - 'status_ready_config' => 'Configuración de descarga', - 'status_ready_start' => 'Comenzar la importación', - 'status_ready_share' => 'Por favor considere descargar su configuración y compartirla en centro de configuración de importación. Esto permitirá a otros usuarios de Firefly III importar sus archivos de manera más fácil.', - 'status_job_new' => 'El trabajo es completamente nuevo.', - 'status_job_configuring' => 'La importación se está configurando.', - 'status_job_configured' => 'La importación está configurada.', - 'status_job_running' => 'La importación se está ejecutando... Por favor, espere.', - 'status_job_error' => 'El trabajo generó un error.', - 'status_job_finished' => '¡La importación ha terminado!', 'status_running_title' => 'La importación se está ejecutando', - 'status_running_placeholder' => 'Por favor espere por la actualización...', - 'status_finished_title' => 'Rutina de importación terminada', - 'status_finished_text' => 'La rutina de importación ha importado sus datos.', - 'status_errors_title' => 'Errores durante la importación', - 'status_errors_single' => 'Ha ocurrido un error durante la importación. No parece ser fatal.', - 'status_errors_multi' => 'Algunos errores ocurrieron durante la importación. No parecen ser fatales.', - 'status_bread_crumb' => 'Estado de la importación', - 'status_sub_title' => 'Estado de la importación', - 'config_sub_title' => 'Configure su importación', - 'status_finished_job' => 'Las :count transacciones importadas pueden ser encontradas en la etiqueta .', - 'status_finished_no_tag' => 'Firefly III has not collected any transactions from your import file.', - 'import_with_key' => 'Importar con la clave \':key\'', + 'status_job_running' => 'Please wait, running the import...', + 'status_job_storing' => 'Please wait, storing data...', + 'status_job_rules' => 'Please wait, running rules...', + 'status_fatal_title' => 'Fatal error', + 'status_fatal_text' => 'The import has suffered from an error it could not recover from. Apologies!', + 'status_fatal_more' => 'This (possibly very cryptic) error message is complemented by log files, which you can find on your hard drive, or in the Docker container where you run Firefly III from.', + 'status_finished_title' => 'Import finished', + 'status_finished_text' => 'The import has finished.', + 'finished_with_errors' => 'There were some errors during the import. Please review them carefully.', + 'unknown_import_result' => 'Unknown import result', + 'result_no_transactions' => 'No transactions have been imported. Perhaps they were all duplicates is simply no transactions where present to be imported. Perhaps the log files can tell you what happened. If you import data regularly, this is normal.', + 'result_one_transaction' => 'Exactly one transaction has been imported. It is stored under tag :tag where you can inspect it further.', + 'result_many_transactions' => 'Firefly III has imported :count transactions. They are stored under tag :tag where you can inspect them further.', - // file, upload something - 'file_upload_title' => 'Confirguración de importación (1/4) - Suba su archivo', - 'file_upload_text' => 'Esta rutina le ayudará a importar archivos de su banco a Firefly III. Por favor revise las páginas de ayuda en la esquina superior derecha.', - 'file_upload_fields' => 'Campos', - 'file_upload_help' => 'Seleccione sus archivos', - 'file_upload_config_help' => 'Si previamente ha importado datos en Firefly III, puede tener un archivo de configuración, el cual preestablecerá valores de configuración para usted. Para algunos bancos, otros usuarios han proporcionado amablemente sus archivos de configuración', - 'file_upload_type_help' => 'Seleccione el tipo de archivo que subirá', - 'file_upload_submit' => 'Subir archivos', - // file, upload types - 'import_file_type_csv' => 'CSV (valores separados por comas)', + // general errors and warnings: + 'bad_job_status' => 'To access this page, your import job cannot have status ":status".', - // file, initial config for CSV - 'csv_initial_title' => 'Configuración de importación (2/4) - Configuración básica CSV de importación', - 'csv_initial_text' => 'Para poder importar su archivo correctamente, por favor valide las opciones a continuación.', - 'csv_initial_box' => 'Configuración de importación de CSV simple', - 'csv_initial_box_title' => 'Opciones de configuración para importación de CSV simple', - 'csv_initial_header_help' => 'Marque esta casilla si la primera fila de su archivo CSV son los títulos de las columnas.', - 'csv_initial_date_help' => 'Formato de fecha y hora en el CSV. siga un formato como esta paginaindica.El valor por defecto.', - 'csv_initial_delimiter_help' => 'Elija el delimitador de campos de su archivo de entrada. si no esta seguro, la coma es la opción.', - 'csv_initial_import_account_help' => 'Si su archivo CSV NO contiene información sobre su (s) cuenta (s) de activos. Use este menú desplegable para seleccionar a que cuenta pertenecen las transacciones en el archivo CSV.', - 'csv_initial_submit' => 'Continúe con el paso 3/4', - - // file, new options: - 'file_apply_rules_title' => 'Aplicar reglas', - 'file_apply_rules_description' => 'Aplique sus reglas. tenga en cuenta que esto reduce significativamente la importación.', - 'file_match_bills_title' => 'Unir facturas', - 'file_match_bills_description' => 'Haga coincidir sus facturas con los retiros recién creados. Tenga en cuenta que esto reduce significativamente la importación.', - - // file, roles config - 'csv_roles_title' => 'Configuración de importación (3/4) defina el rol de cada columna', - 'csv_roles_text' => 'Cada columna en su archivo CSV contiene cierto datos. Por favor indique que tipo de datos debe esperar el importador. la opción de "map" datos significa que enlazara cada entrada encontrada en la columna con un valor en su base de datos. A menudo una columna mapeada es la columna que contiene el IBAN ya presentes en su base de datos.', - 'csv_roles_table' => 'Tabla', - 'csv_roles_column_name' => 'Nombre de la columna', - 'csv_roles_column_example' => 'Datos de ejemplo de columna', - 'csv_roles_column_role' => 'Significado de los datos de la columna', - 'csv_roles_do_map_value' => 'Mapear estos valores', - 'csv_roles_column' => 'Columna', - 'csv_roles_no_example_data' => 'No hay datos de ejemplo disponibles', - 'csv_roles_submit' => 'Continúe en el paso 4/4', - - // not csv, but normal warning - 'roles_warning' => 'Por lo menos, marque una columna como la columna de importe. también es aconsejable seleccionar una columna para la descripción. la fecha y la cuenta contraria.', - 'foreign_amount_warning' => 'Si usted marca una columna que contiene un importe en una moneda extranjera, usted también debe establecer la columna que contiene que moneda es.', - - // file, map data - 'file_map_title' => 'Configuración de importación (4/4) - Conecta datos de importación a los datos de Firefly III', - 'file_map_text' => 'En las siguientes tablas, el valor de la izquierda muestra información encontrada en el Csv cargado. Es su tarea mapear este valor, si es posible, a un valor ya presente en su base de datos. Firefly Iii respetara este mapeo. Si no hay un valor hacia el cual mapear o no se desea mapear un valor especifico, no seleccione ninguno.', - 'file_map_field_value' => 'Valor del campo', - 'file_map_field_mapped_to' => 'Asignado a', - 'map_do_not_map' => '(no mapear)', - 'file_map_submit' => 'Comenzar la importación', - 'file_nothing_to_map' => 'No hay datos presentes en su archivo que pueda asignar a los valores existentes. Por favor presione "comenzar la importación" para continuar.', - - // map things. + // column roles for CSV import: 'column__ignore' => '(Ignorar esta columna)', 'column_account-iban' => 'Caja de ahorros (IBAN)', 'column_account-id' => 'Identificación de Cuenta de ingresos (coincide con FF3)', @@ -158,48 +261,4 @@ return [ 'column_note' => 'Nota (s)', 'column_internal-reference' => 'Internal reference', - // prerequisites - 'prerequisites' => 'Prerequisitos', - - // bunq - 'bunq_prerequisites_title' => 'Pre requisitos para una importación de bunq', - 'bunq_prerequisites_text' => 'In order to import from bunq, you need to obtain an API key. You can do this through the app. Please note that the import function for bunq is in BETA. It has only been tested against the sandbox API.', - 'bunq_prerequisites_text_ip' => 'Bunq requires your externally facing IP address. Firefly III has tried to fill this in using the ipify service. Make sure this IP address is correct, or the import will fail.', - 'bunq_do_import' => 'Yes, import from this account', - 'bunq_accounts_title' => 'Bunq accounts', - 'bunq_accounts_text' => 'These are the accounts associated with your bunq account. Please select the accounts from which you want to import, and in which account the transactions must be imported.', - - // Spectre - 'spectre_title' => 'Importar usando Spectre', - 'spectre_prerequisites_title' => 'Pre requisitos para una importación usando Spectre', - 'spectre_prerequisites_text' => 'In order to import data using the Spectre API (v4), you must provide Firefly III with two secret values. They can be found on the secrets page.', - 'spectre_enter_pub_key' => 'The import will only work when you enter this public key on your secrets page.', - 'spectre_accounts_title' => 'Seleccionar cuentas para importar desde', - 'spectre_accounts_text' => 'Cada cuenta a la izquierda abajo ha sido encontrada por Spectre y puede ser importada en Firefly III. Por favor seleccione la cuenta de activo que debe contener cualquier transacción determinada. Si usted no desea importar desde una cuenta en particular, elimine el cheque de la casilla de verificación.', - 'spectre_do_import' => 'Si, importar desde esta cuenta', - 'spectre_no_supported_accounts' => 'You cannot import from this account due to a currency mismatch.', - - // keys from "extra" array: - 'spectre_extra_key_iban' => 'IBAN', - 'spectre_extra_key_swift' => 'SWIFT', - 'spectre_extra_key_status' => 'Estatus', - 'spectre_extra_key_card_type' => 'Tipo de tarjeta', - 'spectre_extra_key_account_name' => 'Nombre de la cuenta', - 'spectre_extra_key_client_name' => 'Nombre del cliente', - 'spectre_extra_key_account_number' => 'Numero de cuenta', - 'spectre_extra_key_blocked_amount' => 'Monto bloqueado', - 'spectre_extra_key_available_amount' => 'Monto disponible', - 'spectre_extra_key_credit_limit' => 'Limite de credito', - 'spectre_extra_key_interest_rate' => 'Tasa de interés', - 'spectre_extra_key_expiry_date' => 'Fecha de vencimiento', - 'spectre_extra_key_open_date' => 'Fecha de apertura', - 'spectre_extra_key_current_time' => 'Tiempo actual', - 'spectre_extra_key_current_date' => 'Fecha actual', - 'spectre_extra_key_cards' => 'Tarjetas', - 'spectre_extra_key_units' => 'Unidades', - 'spectre_extra_key_unit_price' => 'Precio unitario', - 'spectre_extra_key_transactions_count' => 'Cuenta de transacciones', - - // various other strings: - 'imported_from_account' => 'Importado de ":account"', ]; diff --git a/resources/lang/es_ES/intro.php b/resources/lang/es_ES/intro.php index 108538f286..85e0787ae5 100644 --- a/resources/lang/es_ES/intro.php +++ b/resources/lang/es_ES/intro.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // index 'index_intro' => 'Bienvenido a la página de índice de Firefly III. Por favor tómate tu tiempo para revisar esta guía y que puedas hacerte una idea de cómo funciona Firefly III.', diff --git a/resources/lang/es_ES/list.php b/resources/lang/es_ES/list.php index 8d217d74ad..2aa21df77b 100644 --- a/resources/lang/es_ES/list.php +++ b/resources/lang/es_ES/list.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'buttons' => 'Botones', 'icon' => 'Icono', @@ -111,10 +112,15 @@ return [ 'sepa-cc' => 'SEPA Clearing Code', 'sepa-ep' => 'SEPA External Purpose', 'sepa-ci' => 'SEPA Creditor Identifier', + 'external_id' => 'External ID', 'account_at_bunq' => 'Account with bunq', 'file_name' => 'File name', 'file_size' => 'File size', 'file_type' => 'File type', 'attached_to' => 'Attached to', 'file_exists' => 'File exists', + 'spectre_bank' => 'Bank', + 'spectre_last_use' => 'Last login', + 'spectre_status' => 'Status', + 'bunq_payment_id' => 'bunq payment ID', ]; diff --git a/resources/lang/es_ES/pagination.php b/resources/lang/es_ES/pagination.php index 2d1f80dee3..faf55a8055 100644 --- a/resources/lang/es_ES/pagination.php +++ b/resources/lang/es_ES/pagination.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'previous' => '« Anterior', 'next' => 'Siguiente »', diff --git a/resources/lang/es_ES/passwords.php b/resources/lang/es_ES/passwords.php index fa4177fdd0..893ad8a347 100644 --- a/resources/lang/es_ES/passwords.php +++ b/resources/lang/es_ES/passwords.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'password' => 'Las contraseñas deben tener al menos seis caracteres y coincidir entre sí.', 'user' => 'No podemos encontrar un usuario con esa dirección de correo electrónico.', diff --git a/resources/lang/es_ES/validation.php b/resources/lang/es_ES/validation.php index 551c826cd7..227ebdc572 100644 --- a/resources/lang/es_ES/validation.php +++ b/resources/lang/es_ES/validation.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'iban' => 'Este no es un IBAN válido.', 'source_equals_destination' => 'The source account equals the destination account', @@ -109,7 +110,8 @@ return [ 'in_array' => 'El campo :attribute no existe en :other.', 'present' => 'El campo :attribute debe estar presente.', 'amount_zero' => 'La cantidad total no puede ser cero', - 'secure_password' => 'Esta contraseña no es segura. Por favor inténtalo de nuevo. Para más información, visita https://goo.gl/NCh2tN', + 'unique_piggy_bank_for_user' => 'The name of the piggy bank must be unique.', + 'secure_password' => 'This is not a secure password. Please try again. For more information, visit http://bit.ly/FF3-password-security', 'attributes' => [ 'email' => 'dirección de correo electrónico', 'description' => 'descripcion', diff --git a/resources/lang/fr_FR/auth.php b/resources/lang/fr_FR/auth.php index 9ba5b70756..689b6966af 100644 --- a/resources/lang/fr_FR/auth.php +++ b/resources/lang/fr_FR/auth.php @@ -1,9 +1,8 @@ . */ -return [ - /* - |-------------------------------------------------------------------------- - | Authentication Language Lines - |-------------------------------------------------------------------------- - | - | The following language lines are used during authentication for various - | messages that we need to display to the user. You are free to modify - | these language lines according to your application's requirements. - | - */ +declare(strict_types=1); +return [ 'failed' => 'Ces identifiants n\'ont aucune correspondance.', 'throttle' => 'Trop de tentatives de connexion. Veuillez essayer à nouveau dans :seconds secondes.', ]; diff --git a/resources/lang/fr_FR/bank.php b/resources/lang/fr_FR/bank.php index 8826020cbf..5d00b1e685 100644 --- a/resources/lang/fr_FR/bank.php +++ b/resources/lang/fr_FR/bank.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ ]; diff --git a/resources/lang/fr_FR/breadcrumbs.php b/resources/lang/fr_FR/breadcrumbs.php index d6cd58e38d..044aade71c 100644 --- a/resources/lang/fr_FR/breadcrumbs.php +++ b/resources/lang/fr_FR/breadcrumbs.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'home' => 'Accueil', 'edit_currency' => 'Modifier la devise "%name"', @@ -48,9 +49,9 @@ return [ 'edit_journal' => 'Éditer la transaction ":description"', 'edit_reconciliation' => 'Éditer ":description"', 'delete_journal' => 'Supprimer la transaction ":description"', - 'tags' => 'Mots-clés', + 'tags' => 'Tags', 'createTag' => 'Créer un nouveau mot-clé', 'edit_tag' => 'Éditer le mot-clé ":tag"', - 'delete_tag' => 'Supprimer le mot-clé ":tag"', + 'delete_tag' => 'Supprimer le tag ":tag"', 'delete_journal_link' => 'Supprimer le lien entre les transactions', ]; diff --git a/resources/lang/fr_FR/components.php b/resources/lang/fr_FR/components.php index 554ef63b9e..aa225dcf01 100644 --- a/resources/lang/fr_FR/components.php +++ b/resources/lang/fr_FR/components.php @@ -1,5 +1,4 @@ . */ +declare(strict_types=1); + return [ // profile 'personal_access_tokens' => 'Jeton d\'accès personnel', diff --git a/resources/lang/fr_FR/config.php b/resources/lang/fr_FR/config.php index 8a41af96fe..763721bdba 100644 --- a/resources/lang/fr_FR/config.php +++ b/resources/lang/fr_FR/config.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'html_language' => 'fr', 'locale' => 'fr, French, fr_FR, fr_FR.utf8, fr_FR.UTF-8', diff --git a/resources/lang/fr_FR/csv.php b/resources/lang/fr_FR/csv.php index 622a49202a..aae109a40a 100644 --- a/resources/lang/fr_FR/csv.php +++ b/resources/lang/fr_FR/csv.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ ]; diff --git a/resources/lang/fr_FR/demo.php b/resources/lang/fr_FR/demo.php index e76bc8b812..94171d0aa6 100644 --- a/resources/lang/fr_FR/demo.php +++ b/resources/lang/fr_FR/demo.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'no_demo_text' => 'Désolé, il n’y a aucun texte supplémentaire de démonstration ou d\'explication pour cette page.', 'see_help_icon' => 'Cependant, l\'icône située dans le coin supérieur droit peut vous en dire plus.', @@ -32,5 +33,5 @@ return [ 'currencies-index' => 'Firefly III prend en charge plusieurs devises. Bien que l\'Euro soit la devise par défaut, cette dernière peut être changée pour le Dollar américain et de nombreuses autres devises. Comme vous pouvez le remarquer une petite sélection des monnaies a été incluse, mais vous pouvez ajouter vos propres devises si vous le souhaitez. Gardez à l\'esprit que la modification de la devise par défaut ne modifie pas la monnaie des transactions existantes : Firefly III prend en charge l’utilisation de plusieurs devises en même temps.', 'transactions-index' => 'Ces dépenses, dépôts et transferts ne sont pas particulièrement imaginatifs. Ils ont été générés automatiquement.', 'piggy-banks-index' => 'Comme vous pouvez le voir, il y a trois tirelires. Utilisez les boutons plus et moins pour influer sur le montant d’argent dans chaque tirelire. Cliquez sur le nom de la tirelire pour voir l’administration pour chaque tirelire.', - 'import-index' => 'Bien sûr, n’importe quel fichier CSV peut être importé dans Firefly III', + 'import-index' => 'Any CSV file can be imported into Firefly III. It also supports importing data from bunq and Spectre. Other banks and financial aggregators will be implemented in the future. As a demo-user however, you can only see the "fake"-provider in action. It will generate some random transactions to show you how the process works.', ]; diff --git a/resources/lang/fr_FR/firefly.php b/resources/lang/fr_FR/firefly.php index 8a463c3da4..9366f83e3d 100644 --- a/resources/lang/fr_FR/firefly.php +++ b/resources/lang/fr_FR/firefly.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // general stuff: 'close' => 'Fermer', @@ -84,7 +85,7 @@ return [ 'two_factor_lost_intro' => 'Malheureusement, ce n’est pas quelque chose que vous pouvez réinitialiser depuis l’interface web. Vous avez deux choix.', 'two_factor_lost_fix_self' => 'Si vous exécutez votre propre instance de Firefly III, vérifiez les logs dans storage/logs pour obtenir des instructions.', 'two_factor_lost_fix_owner' => 'Dans le cas contraire, contactez le propriétaire du site par courriel :site_owner et demandez-lui de réinitialiser votre authentification à deux facteurs.', - 'warning_much_data' => ':days de données peuvent prendre un certain temps à charger.', + 'warning_much_data' => ':days jours de données peuvent prendre un certain temps à charger.', 'registered' => 'Vous avez été enregistré avec succès !', 'Default asset account' => 'Compte d’actif par défaut', 'no_budget_pointer' => 'Vous semblez n’avoir encore aucun budget. Vous devez en créer un sur la page des budgets. Les budgets peuvent vous aider à garder une trace des dépenses.', @@ -179,6 +180,7 @@ return [ 'authorization_request_intro' => ':client demande l\'autorisation d\'accéder à votre administration financière. Souhaitez-vous autoriser :client à accéder à ces enregistrements?', 'scopes_will_be_able' => 'Cette application pourra :', 'button_authorize' => 'Autoriser', + 'none_in_select_list' => '(aucun)', // check for updates: 'update_check_title' => 'Vérifier les mises à jour', @@ -267,10 +269,10 @@ return [ 'move_rule_group_down' => 'Descendre le groupe de règles', 'save_rules_by_moving' => 'Enregistrer ces règles en les déplaçant vers un autre groupe de règles :', 'make_new_rule' => 'Créer une nouvelle règle dans le groupe de règles ":title"', - 'rule_is_strict' => 'strict rule', - 'rule_is_not_strict' => 'non-strict rule', + 'rule_is_strict' => 'règle stricte', + 'rule_is_not_strict' => 'règle non stricte', 'rule_help_stop_processing' => 'Lorsque vous cochez cette case, les règles suivantes de ce groupe ne seront pas exécutées.', - 'rule_help_strict' => 'In strict rules ALL triggers must fire for the action(s) to be executed. In non-strict rules, ANY trigger is enough for the action(s) to be executed.', + 'rule_help_strict' => 'Dans les règles strictes, TOUS les déclencheurs doivent être activés pour les actions à exécuter. Dans les règles non strictes, N\'IMPORTE QUEL déclencheur est suffisant pour que l\'action soit exécutée.', 'rule_help_active' => 'Les règles inactives ne se déclencheront jamais.', 'stored_new_rule' => 'Nouvelle règle créée avec le titre ":title"', 'deleted_rule' => 'Règle supprimée avec le titre ":title"', @@ -541,7 +543,7 @@ return [ 'attachment_deleted' => 'Pièce jointe ":name" supprimée', 'attachment_updated' => 'Pièce jointe ":name" mise à jour', 'upload_max_file_size' => 'Taille maximum du fichier : :size', - 'list_all_attachments' => 'List of all attachments', + 'list_all_attachments' => 'Liste de toutes les pièces jointes', // transaction index 'title_expenses' => 'Dépenses', @@ -584,7 +586,7 @@ return [ 'converted_to_Deposit' => 'La transaction a été convertie en dépôt', 'converted_to_Transfer' => 'La transaction a été convertie en transfert', 'invalid_convert_selection' => 'Le compte que vous avez sélectionné est déjà utilisé dans cette transaction ou n\'existe pas.', - 'source_or_dest_invalid' => 'Cannot find the correct transaction details. Conversion is not possible.', + 'source_or_dest_invalid' => 'Impossible de trouver les détails de transaction corrects. La conversion n\'est pas possible.', // create new stuff: 'create_new_withdrawal' => 'Créer une nouvelle dépense', @@ -641,8 +643,8 @@ return [ 'over_budget_warn' => ' Normalement vous budgétez :amount par jour. Là c\'est :over_amount par jour.', // bills: - 'match_between_amounts' => 'Bill matches transactions between :low and :high.', - 'bill_related_rules' => 'Rules related to this bill', + 'match_between_amounts' => 'Factures correspondes à des transactions entre :low et :high.', + 'bill_related_rules' => 'Règles reliées à cette facture', 'repeats' => 'Répétitions', 'connected_journals' => 'Opérations liées', 'auto_match_on' => 'Automatiquement mis en correspondance par Firefly III', @@ -652,13 +654,13 @@ return [ 'deleted_bill' => 'Facture ":name" supprimée', 'edit_bill' => 'Modifier la facture : ":name"', 'more' => 'Plus', - 'rescan_old' => 'Run rules again, on all transactions', + 'rescan_old' => 'Exécuter les règles à nouveau, sur toutes les transactions', 'update_bill' => 'Mettre à jour la facture', 'updated_bill' => 'Facture ":name" mise à jour', 'store_new_bill' => 'Créer une nouvelle facture', 'stored_new_bill' => 'Nouvelle facture ":name" créée', 'cannot_scan_inactive_bill' => 'Les factures inactives ne peuvent pas être analysées.', - 'rescanned_bill' => 'Rescanned everything, and linked :total transaction(s) to the bill.', + 'rescanned_bill' => 'Tout a été redéfini et lié aux :total transaction(s) de la facture.', 'average_bill_amount_year' => 'Montant moyen des factures ( :year)', 'average_bill_amount_overall' => 'Montant moyen de la facture (global)', 'bill_is_active' => 'Facture en cours', @@ -666,6 +668,7 @@ return [ 'bill_will_automatch' => 'La facture sera automatiquement liée aux transactions correspondantes', 'skips_over' => 'saute', 'bill_store_error' => 'Une erreur inattendue s\'est produite lors du stockage de votre nouvelle facture. Veuillez vérifier les fichiers journaux', + 'list_inactive_rule' => 'règle inactive', // accounts: 'details_for_asset' => 'Détails pour le compte d’actif ":name"', @@ -699,7 +702,7 @@ return [ 'delete_reconciliation' => 'Supprimer le rapprochement', 'update_reconciliation' => 'Mettre à jour le rapprochement', 'amount_cannot_be_zero' => 'Le montant ne peut pas être zéro', - 'end_of_reconcile_period' => 'Fin de la période de rapptrochement : :period', + 'end_of_reconcile_period' => 'Fin de la période de rapprochement: :period', 'start_of_reconcile_period' => 'Début de la période de rapprochement : :period', 'start_balance' => 'Solde initial', 'end_balance' => 'Solde de clotûre', @@ -801,6 +804,7 @@ return [ 'opt_group_savingAsset' => 'Comptes d\'épargne', 'opt_group_sharedAsset' => 'Comptes d\'actifs partagés', 'opt_group_ccAsset' => 'Cartes de crédit', + 'opt_group_cashWalletAsset' => 'Portefeuilles d\'argent', 'notes' => 'Notes', 'unknown_journal_error' => 'Impossible de stocker la transaction. Veuillez vérifier les fichiers journaux.', @@ -812,10 +816,11 @@ return [ 'savings_balance_text' => 'Firefly III créera automatiquement un compte d\'épargne pour vous. Par défaut, il n\'y aura pas d\'argent dans votre compte d\'épargne, mais si vous le dites à Firefly III, le solde sera stocké en tant que tel.', 'finish_up_new_user' => 'C\'est tout ! Vous pouvez continuer en appuyant sur Envoyer. Vous passerez à l\'index de Firefly III.', 'stored_new_accounts_new_user' => 'Super ! Vos nouveaux comptes ont été créés.', - 'set_preferred_language' => 'If you prefer to use Firefly III in another language, please indicate so here.', - 'language' => 'Language', - 'new_savings_account' => ':bank_name savings account', - 'cash_wallet' => 'Cash wallet', + 'set_preferred_language' => 'Si vous préférez utiliser Firefly III dans une autre langue, veuillez l\'indiquer ici.', + 'language' => 'Langage', + 'new_savings_account' => ':bank_name compte d\'épargne', + 'cash_wallet' => 'Porte-monnaie', + 'currency_not_present' => 'If the currency you normally use is not listed do not worry. You can create your own currencies under Options > Currencies.', // home page: 'yourAccounts' => 'Vos comptes', @@ -964,7 +969,7 @@ return [ 'account_role_sharedAsset' => 'Compte d\'actif partagé', 'account_role_savingAsset' => 'Compte d’épargne', 'account_role_ccAsset' => 'Carte de crédit', - 'account_role_cashWalletAsset' => 'Cash wallet', + 'account_role_cashWalletAsset' => 'Porte-monnaie', 'budget_chart_click' => 'Cliquez sur le nom du budget dans le tableau ci-dessus pour voir un graphique.', 'category_chart_click' => 'Cliquez sur un nom de catégorie dans le tableau ci-dessus pour voir un graphique.', 'in_out_accounts' => 'Gagné et dépensé par compte', @@ -1013,6 +1018,7 @@ return [ 'remove_money_from_piggy_title' => 'Retirer l’argent de la tirelire ":name"', 'add' => 'Ajouter', 'no_money_for_piggy' => 'Vous n\'avez pas d\'argent à placer dans cette tirelire.', + 'suggested_savings_per_month' => 'Suggested per month', 'remove' => 'Enlever', 'max_amount_add' => 'Le montant maximum que vous pouvez ajouter est', @@ -1024,7 +1030,7 @@ return [ 'events' => 'Evènements', 'target_amount' => 'Montant cible', 'start_date' => 'Date de début', - 'no_start_date' => 'No start date', + 'no_start_date' => 'Pas de date de début', 'target_date' => 'Date cible', 'no_target_date' => 'Aucune date butoir', 'table' => 'Tableau', @@ -1066,7 +1072,7 @@ return [ 'total_size' => 'taille totale', 'budget_or_budgets' => 'budget(s)', 'budgets_with_limits' => 'budget(s) avec montant configuré', - 'nr_of_rules_in_total_groups' => ':count_rules règle(s) dans :count_groups groupe(s) de règles', + 'nr_of_rules_in_total_groups' => ':count_rules règle(s) dans :count_groups groupe(s) de règles', 'tag_or_tags' => 'tag·s', 'configuration_updated' => 'La configuration a été mise à jour', 'setting_is_demo_site' => 'Site de démonstration', @@ -1148,27 +1154,9 @@ return [ 'no_edit_multiple_left' => 'Vous n\'avez sélectionné aucune transaction valide à éditer.', 'cannot_convert_split_journal' => 'Vous ne pouvez pas convertir une transaction ventilée', - // import bread crumbs and titles: - 'import' => 'Import', - 'import_data' => 'Importer des données', - 'import_general_index_file' => 'Importer un fichier', - 'import_from_bunq' => 'Importer depuis bunq', - 'import_using_spectre' => 'Importer en utilisant Spectre', - 'import_using_plaid' => 'Importer en utilisant Plaid', - 'import_config_bread_crumb' => 'Configurez votre import', - - // import index page: + // Import page (general strings only) 'import_index_title' => 'Importer des données dans Firefly III', - 'import_index_sub_title' => 'Index', - 'import_general_index_intro' => 'Bienvenue dans la routine d\'importation de Firefly III. Il existe différentes façons d\'importer des données dans Firefly III, affichées ici sous forme de boutons.', - 'upload_error' => 'Le fichier que vous avez téléchargé n\'a pas pu être traité. Peut-être qu\'il s\'agit d\'un type de fichier ou d\'un encodage invalide. Plus d\'informations dans les fichiers journaux.', - 'reset_import_settings_title' => 'Reset import configuration', - 'reset_import_settings_text' => 'You can use these links to reset your import settings for specific providers. This is useful when bad settings stop you from importing data.', - 'reset_settings_bunq' => 'Remove bunq API key, local external IP address and bunq related RSA keys.', - 'reset_settings_spectre' => 'Remove Spectre secrets and ID\'s. This will also remove your Spectre keypair. Remember to update the new one.', - 'settings_reset_for_bunq' => 'Bunq settings reset.', - 'settings_reset_for_spectre' => 'Spectre settings reset.', - + 'import_data' => 'Importer des données', // sandstorm.io errors and messages: 'sandstorm_not_available' => 'Cette fonction n\'est pas disponible lorsque vous utilisez Firefly III dans un environnement Sandstorm.io.', diff --git a/resources/lang/fr_FR/form.php b/resources/lang/fr_FR/form.php index a5c0395e57..5c57f4717a 100644 --- a/resources/lang/fr_FR/form.php +++ b/resources/lang/fr_FR/form.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // new user: 'bank_name' => 'Nom de la banque', @@ -184,6 +185,13 @@ return [ 'blocked' => 'Est bloqué?', 'blocked_code' => 'Raison du blocage', + // import + 'apply_rules' => 'Apply rules', + 'artist' => 'Artist', + 'album' => 'Album', + 'song' => 'Song', + + // admin 'domain' => 'Domaine', 'single_user_mode' => 'Désactiver le formulaire d\'inscription', diff --git a/resources/lang/fr_FR/import.php b/resources/lang/fr_FR/import.php index b12206bc30..a111bb834e 100644 --- a/resources/lang/fr_FR/import.php +++ b/resources/lang/fr_FR/import.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ - // status of import: + // ALL breadcrumbs and subtitles: + 'index_breadcrumb' => 'Import data into Firefly III', + 'prerequisites_breadcrumb_fake' => 'Prerequisites for the fake import provider', + 'prerequisites_breadcrumb_spectre' => 'Prerequisites for Spectre', + 'prerequisites_breadcrumb_bunq' => 'Prerequisites for bunq', + 'job_configuration_breadcrumb' => 'Configuration for ":key"', + 'job_status_breadcrumb' => 'Import status for ":key"', + 'cannot_create_for_provider' => 'Firefly III cannot create a job for the ":provider"-provider.', + + // index page: + 'general_index_title' => 'Import a file', + 'general_index_intro' => 'Welcome to Firefly III\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.', + // import provider strings (index): + 'button_fake' => 'Fake an import', + 'button_file' => 'Import a file', + 'button_bunq' => 'Import from bunq', + 'button_spectre' => 'Import using Spectre', + 'button_plaid' => 'Import using Plaid', + 'button_yodlee' => 'Import using Yodlee', + 'button_quovo' => 'Import using Quovo', + // global config box (index) + 'global_config_title' => 'Global import configuration', + 'global_config_text' => 'In the future, this box will feature preferences that apply to ALL import providers above.', + // prerequisites box (index) + 'need_prereq_title' => 'Import prerequisites', + 'need_prereq_intro' => 'Some import methods need your attention before they can be used. For example, they might require special API keys or application secrets. You can configure them here. The icon indicates if these prerequisites have been met.', + 'do_prereq_fake' => 'Prerequisites for the fake provider', + 'do_prereq_file' => 'Prerequisites for file imports', + 'do_prereq_bunq' => 'Prerequisites for imports from bunq', + 'do_prereq_spectre' => 'Prerequisites for imports using Spectre', + 'do_prereq_plaid' => 'Prerequisites for imports using Plaid', + 'do_prereq_yodlee' => 'Prerequisites for imports using Yodlee', + 'do_prereq_quovo' => 'Prerequisites for imports using Quovo', + // provider config box (index) + 'can_config_title' => 'Import configuration', + 'can_config_intro' => 'Some import methods can be configured to your liking. They have extra settings you can tweak.', + 'do_config_fake' => 'Configuration for the fake provider', + 'do_config_file' => 'Configuration for file imports', + 'do_config_bunq' => 'Configuration for bunq imports', + 'do_config_spectre' => 'Configuration for imports from Spectre', + 'do_config_plaid' => 'Configuration for imports from Plaid', + 'do_config_yodlee' => 'Configuration for imports from Yodlee', + 'do_config_quovo' => 'Configuration for imports from Quovo', + + // prerequisites: + 'prereq_fake_title' => 'Prerequisites for an import from the fake import provider', + 'prereq_fake_text' => 'This fake provider requires a fake API key. It must be 32 characters long. You can use this one: 123456789012345678901234567890AA', + 'prereq_spectre_title' => 'Prerequisites for an import using the Spectre API', + 'prereq_spectre_text' => 'In order to import data using the Spectre API (v4), you must provide Firefly III with two secret values. They can be found on the secrets page.', + 'prereq_spectre_pub' => 'Likewise, the Spectre API needs to know the public key you see below. Without it, it will not recognize you. Please enter this public key on your secrets page.', + 'prereq_bunq_title' => 'Prerequisites for an import from bunq', + 'prereq_bunq_text' => 'In order to import from bunq, you need to obtain an API key. You can do this through the app. Please note that the import function for bunq is in BETA. It has only been tested against the sandbox API.', + 'prereq_bunq_ip' => 'bunq requires your externally facing IP address. Firefly III has tried to fill this in using the ipify service. Make sure this IP address is correct, or the import will fail.', + // prerequisites success messages: + 'prerequisites_saved_for_fake' => 'Fake API key stored successfully!', + 'prerequisites_saved_for_spectre' => 'App ID and secret stored!', + 'prerequisites_saved_for_bunq' => 'API key and IP stored!', + + // job configuration: + 'job_config_apply_rules_title' => 'Job configuration - apply your rules?', + 'job_config_apply_rules_text' => 'Once the fake provider has run, your rules can be applied to the transactions. This adds time to the import.', + 'job_config_input' => 'Your input', + // job configuration for the fake provider: + 'job_config_fake_artist_title' => 'Enter album name', + 'job_config_fake_artist_text' => 'Many import routines have a few configuration steps you must go through. In the case of the fake import provider, you must answer some weird questions. In this case, enter "David Bowie" to continue.', + 'job_config_fake_song_title' => 'Enter song name', + 'job_config_fake_song_text' => 'Mention the song "Golden years" to continue with the fake import.', + 'job_config_fake_album_title' => 'Enter album name', + 'job_config_fake_album_text' => 'Some import routines require extra data halfway through the import. In the case of the fake import provider, you must answer some weird questions. Enter "Station to station" to continue.', + // job configuration form the file provider + 'job_config_file_upload_title' => 'Import setup (1/4) - Upload your file', + 'job_config_file_upload_text' => 'This routine will help you import files from your bank into Firefly III. ', + 'job_config_file_upload_help' => 'Select your file. Please make sure the file is UTF-8 encoded.', + 'job_config_file_upload_config_help' => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their configuration file', + 'job_config_file_upload_type_help' => 'Select the type of file you will upload', + 'job_config_file_upload_submit' => 'Upload files', + 'import_file_type_csv' => 'CSV (valeurs séparées par des virgules)', + 'file_not_utf8' => 'The file you have uploaded is not encoded as UTF-8 or ASCII. Firefly III cannot handle such files. Please use Notepad++ or Sublime to convert your file to UTF-8.', + 'job_config_uc_title' => 'Import setup (2/4) - Basic file setup', + 'job_config_uc_text' => 'To be able to import your file correctly, please validate the options below.', + 'job_config_uc_header_help' => 'Check this box if the first row of your CSV file are the column titles.', + 'job_config_uc_date_help' => 'Date time format in your file. Follow the format as this page indicates. The default value will parse dates that look like this: :dateExample.', + 'job_config_uc_delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.', + 'job_config_uc_account_help' => 'If your file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the file belong to.', + 'job_config_uc_apply_rules_title' => 'Apply rules', + 'job_config_uc_apply_rules_text' => 'Applies your rules to every imported transaction. Note that this slows the import significantly.', + 'job_config_uc_specifics_title' => 'Bank-specific options', + 'job_config_uc_specifics_txt' => 'Some banks deliver badly formatted files. Firefly III can fix those automatically. If your bank delivers such files but it\'s not listed here, please open an issue on GitHub.', + 'job_config_uc_submit' => 'Continue', + 'invalid_import_account' => 'You have selected an invalid account to import into.', + // job configuration for Spectre: + 'job_config_spectre_login_title' => 'Choose your login', + 'job_config_spectre_login_text' => 'Firefly III has found :count existing login(s) in your Spectre account. Which one would you like to use to import from?', + 'spectre_login_status_active' => 'Active', + 'spectre_login_status_inactive' => 'Inactive', + 'spectre_login_status_disabled' => 'Disabled', + 'spectre_login_new_login' => 'Login with another bank, or one of these banks with different credentials.', + 'job_config_spectre_accounts_title' => 'Select accounts to import from', + 'job_config_spectre_accounts_text' => 'You have selected ":name" (:country). You have :count account(s) available from this provider. Please select the Firefly III asset account(s) where the transactions from these accounts should be stored. Remember, in order to import data both the Firefly III account and the ":name"-account must have the same currency.', + 'spectre_no_supported_accounts' => 'You cannot import from this account due to a currency mismatch.', + 'spectre_do_not_import' => '(do not import)', + 'spectre_no_mapping' => 'It seems you have not selected any accounts to import from.', + 'imported_from_account' => 'Imported from ":account"', + 'spectre_account_with_number' => 'Account :number', + // job configuration for bunq: + 'job_config_bunq_accounts_title' => 'bunq accounts', + 'job_config_bunq_accounts_text' => 'These are the accounts associated with your bunq account. Please select the accounts from which you want to import, and in which account the transactions must be imported.', + 'bunq_no_mapping' => 'It seems you have not selected any accounts.', + 'should_download_config' => 'You should download the configuration file for this job. This will make future imports way easier.', + 'share_config_file' => 'If you have imported data from a public bank, you should share your configuration file so it will be easy for other users to import their data. Sharing your configuration file will not expose your financial details.', + + // keys from "extra" array: + 'spectre_extra_key_iban' => 'IBAN', + 'spectre_extra_key_swift' => 'SWIFT', + 'spectre_extra_key_status' => 'Status', + 'spectre_extra_key_card_type' => 'Card type', + 'spectre_extra_key_account_name' => 'Account name', + 'spectre_extra_key_client_name' => 'Client name', + 'spectre_extra_key_account_number' => 'Account number', + 'spectre_extra_key_blocked_amount' => 'Blocked amount', + 'spectre_extra_key_available_amount' => 'Available amount', + 'spectre_extra_key_credit_limit' => 'Credit limit', + 'spectre_extra_key_interest_rate' => 'Interest rate', + 'spectre_extra_key_expiry_date' => 'Expiry date', + 'spectre_extra_key_open_date' => 'Open date', + 'spectre_extra_key_current_time' => 'Current time', + 'spectre_extra_key_current_date' => 'Current date', + 'spectre_extra_key_cards' => 'Cards', + 'spectre_extra_key_units' => 'Units', + 'spectre_extra_key_unit_price' => 'Unit price', + 'spectre_extra_key_transactions_count' => 'Transaction count', + + // specifics: + 'specific_ing_name' => 'ING NL', + 'specific_ing_descr' => 'Create better descriptions in ING exports', + 'specific_sns_name' => 'SNS / Volksbank NL', + 'specific_sns_descr' => 'Trim quotes from SNS / Volksbank export files', + 'specific_abn_name' => 'ABN AMRO NL', + 'specific_abn_descr' => 'Fixes potential problems with ABN AMRO files', + 'specific_rabo_name' => 'Rabobank NL', + 'specific_rabo_descr' => 'Fixes potential problems with Rabobank files', + 'specific_pres_name' => 'President\'s Choice Financial CA', + 'specific_pres_descr' => 'Fixes potential problems with PC files', + // job configuration for file provider (stage: roles) + 'job_config_roles_title' => 'Import setup (3/4) - Define each column\'s role', + 'job_config_roles_text' => 'Each column in your CSV file contains certain data. Please indicate what kind of data the importer should expect. The option to "map" data means that you will link each entry found in the column to a value in your database. An often mapped column is the column that contains the IBAN of the opposing account. That can be easily matched to IBAN\'s present in your database already.', + 'job_config_roles_submit' => 'Continue', + 'job_config_roles_column_name' => 'Name of column', + 'job_config_roles_column_example' => 'Column example data', + 'job_config_roles_column_role' => 'Column data meaning', + 'job_config_roles_do_map_value' => 'Map these values', + 'job_config_roles_no_example' => 'No example data available', + 'job_config_roles_fa_warning' => 'If you mark a column as containing an amount in a foreign currency, you must also set the column that contains which currency it is.', + 'job_config_roles_rwarning' => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.', + 'job_config_roles_colum_count' => 'Column', + // job config for the file provider (stage: mapping): + 'job_config_map_title' => 'Import setup (4/4) - Connect import data to Firefly III data', + 'job_config_map_text' => 'In the following tables, the left value shows you information found in your uploaded file. It is your task to map this value, if possible, to a value already present in your database. Firefly will stick to this mapping. If there is no value to map to, or you do not wish to map the specific value, select nothing.', + 'job_config_map_nothing' => 'There is no data present in your file that you can map to existing values. Please press "Start the import" to continue.', + 'job_config_field_value' => 'Field value', + 'job_config_field_mapped' => 'Mapped to', + 'map_do_not_map' => '(ne pas mapper)', + 'job_config_map_submit' => 'Start the import', + + + // import status page: + 'import_with_key' => 'Importer avec la clé \':key\'', 'status_wait_title' => 'Veuillez patienter...', 'status_wait_text' => 'Cette boîte disparaîtra dans un instant.', - 'status_fatal_title' => 'Une erreur fatale est survenue', - 'status_fatal_text' => 'Une erreur fatale est survenue que le traitement d\'importation ne peut pas récupérer. Voir l\'explication en rouge ci-dessous.', - 'status_fatal_more' => 'Si l\'erreur est un time-out, l\'importation sera arrêtée pendant son traitement. Pour certaines configurations de serveur, ce n\'est que le serveur qui s\'est arrêté alors que l\'importation continue de fonctionner en arrière-plan. Pour vérifier cela, consultez les fichiers journaux. Si le problème persiste, envisagez d\'importer plutôt par ligne de commande.', - 'status_ready_title' => 'L\'importation est prête à démarrer', - 'status_ready_text' => 'L\'importation est prête à démarrer. Toute la configuration requise été effectuée. Vous pouvez téléchargez le fichier de configuration. Cela vous permettra de recommencer rapidement l\'importation si tout ne fonctionnait pas comme prévu. Pour exécuter l\'importation, vous pouvez soit exécuter la commande suivante dans la console du serveur, soit exécuter l\'importation depuis cette page web. Selon votre configuration générale, l\'importation via la console vous donnera plus de détails.', - 'status_ready_noconfig_text' => 'L\'importation est prête à démarrer. Toute la configuration requise été effectuée. Pour exécuter l\'importation, vous pouvez soit exécuter la commande suivante dans la console du serveur, soit exécuter l\'importation depuis cette page web. Selon votre configuration générale, l\'importation via la console vous donnera plus de détails.', - 'status_ready_config' => 'Télécharger la configuration', - 'status_ready_start' => 'Démarrer l\'importation', - 'status_ready_share' => 'Vous pouvez télécharger votre configuration et de la partager dans le centre de configuration d\'import. Cela permettra à d\'autres utilisateurs de Firefly III d\'importer leurs fichiers plus facilement.', - 'status_job_new' => 'Le travail est tout récent.', - 'status_job_configuring' => 'L\'importation est en cours de configuration.', - 'status_job_configured' => 'L\'importation est configurée.', - 'status_job_running' => 'L\'importation est en cours... Veuillez patienter...', - 'status_job_error' => 'Le travail a généré une erreur.', - 'status_job_finished' => 'L\'importation est terminée !', 'status_running_title' => 'L\'importation est en cours d\'exécution', - 'status_running_placeholder' => 'Attendez pour une mise à jour...', - 'status_finished_title' => 'Le traitement d\'importation est terminé', - 'status_finished_text' => 'Le traitement d\'importation a importé vos données.', - 'status_errors_title' => 'Erreurs lors de l\'importation', - 'status_errors_single' => 'Une erreur est survenue lors de l\'importation. Cela ne semble pas être fatal.', - 'status_errors_multi' => 'Certaines erreurs sont survenues lors de l\'importation. Celles-ci ne semblent pas être fatales.', - 'status_bread_crumb' => 'Statut d\'importation', - 'status_sub_title' => 'Statut d\'importation', - 'config_sub_title' => 'Configurez votre importation', - 'status_finished_job' => 'The :count transactions imported can be found in tag :tag.', - 'status_finished_no_tag' => 'Firefly III has not collected any transactions from your import file.', - 'import_with_key' => 'Importer avec la clé \':key\'', + 'status_job_running' => 'Please wait, running the import...', + 'status_job_storing' => 'Please wait, storing data...', + 'status_job_rules' => 'Please wait, running rules...', + 'status_fatal_title' => 'Fatal error', + 'status_fatal_text' => 'The import has suffered from an error it could not recover from. Apologies!', + 'status_fatal_more' => 'This (possibly very cryptic) error message is complemented by log files, which you can find on your hard drive, or in the Docker container where you run Firefly III from.', + 'status_finished_title' => 'Import finished', + 'status_finished_text' => 'The import has finished.', + 'finished_with_errors' => 'There were some errors during the import. Please review them carefully.', + 'unknown_import_result' => 'Unknown import result', + 'result_no_transactions' => 'No transactions have been imported. Perhaps they were all duplicates is simply no transactions where present to be imported. Perhaps the log files can tell you what happened. If you import data regularly, this is normal.', + 'result_one_transaction' => 'Exactly one transaction has been imported. It is stored under tag :tag where you can inspect it further.', + 'result_many_transactions' => 'Firefly III has imported :count transactions. They are stored under tag :tag where you can inspect them further.', - // file, upload something - 'file_upload_title' => 'Configuration de l\'importation (1/4) - Téléchargez votre fichier', - 'file_upload_text' => 'Ce traitement vous aidera à importer des fichiers de votre banque dans Firefly III. Consultez les pages d\'aide en haut à droite.', - 'file_upload_fields' => 'Champs', - 'file_upload_help' => 'Sélectionnez votre fichier', - 'file_upload_config_help' => 'Si vous avez précédemment importé des données dans Firefly III, vous avez peut-être téléchargé un fichier de configuration qui définit les relations entre les différents champs. Pour certaines banques, des utilisateurs ont bien voulu partager leur fichier ici : fichiers de configuration.', - 'file_upload_type_help' => 'Sélectionnez le type de fichier que vous allez télécharger', - 'file_upload_submit' => 'Envoyer des fichiers', - // file, upload types - 'import_file_type_csv' => 'CSV (valeurs séparées par des virgules)', + // general errors and warnings: + 'bad_job_status' => 'To access this page, your import job cannot have status ":status".', - // file, initial config for CSV - 'csv_initial_title' => 'Configuration d\'importation (2/4) - Configuration d\'importation CSV', - 'csv_initial_text' => 'Pour pouvoir importer votre fichier correctement, veuillez valider les options ci-dessous.', - 'csv_initial_box' => 'Configuration d\'importation CSV de base', - 'csv_initial_box_title' => 'Options de configuration de l\'importation CSV de base', - 'csv_initial_header_help' => 'Cochez cette case si la première ligne de votre fichier CSV contient les entêtes des colonnes.', - 'csv_initial_date_help' => 'Date time format in your CSV. Follow the format like this page indicates. The default value will parse dates that look like this: :dateExample.', - 'csv_initial_delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.', - 'csv_initial_import_account_help' => 'If your CSV file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the CSV belong to.', - 'csv_initial_submit' => 'Passez à l’étape 3/4', - - // file, new options: - 'file_apply_rules_title' => 'Appliquer les règles', - 'file_apply_rules_description' => 'Apply your rules. Note that this slows the import significantly.', - 'file_match_bills_title' => 'Faire correspondre les factures', - 'file_match_bills_description' => 'Match your bills to newly created withdrawals. Note that this slows the import significantly.', - - // file, roles config - 'csv_roles_title' => 'Import setup (3/4) - Define each column\'s role', - 'csv_roles_text' => 'Each column in your CSV file contains certain data. Please indicate what kind of data the importer should expect. The option to "map" data means that you will link each entry found in the column to a value in your database. An often mapped column is the column that contains the IBAN of the opposing account. That can be easily matched to IBAN\'s present in your database already.', - 'csv_roles_table' => 'Tableau', - 'csv_roles_column_name' => 'Nom de colonne', - 'csv_roles_column_example' => 'Données d\'exemple de colonne', - 'csv_roles_column_role' => 'Signification des données de colonne', - 'csv_roles_do_map_value' => 'Mapper ces valeurs', - 'csv_roles_column' => 'Colonne', - 'csv_roles_no_example_data' => 'Aucun exemple de données disponible', - 'csv_roles_submit' => 'Passez à l’étape 4/4', - - // not csv, but normal warning - 'roles_warning' => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.', - 'foreign_amount_warning' => 'If you mark a column as containing an amount in a foreign currency, you must also set the column that contains which currency it is.', - - // file, map data - 'file_map_title' => 'Import setup (4/4) - Connect import data to Firefly III data', - 'file_map_text' => 'In the following tables, the left value shows you information found in your uploaded file. It is your task to map this value, if possible, to a value already present in your database. Firefly will stick to this mapping. If there is no value to map to, or you do not wish to map the specific value, select nothing.', - 'file_map_field_value' => 'Valeur du champ', - 'file_map_field_mapped_to' => 'Mappé à', - 'map_do_not_map' => '(ne pas mapper)', - 'file_map_submit' => 'Démarrez l\'importation', - 'file_nothing_to_map' => 'There is no data present in your file that you can map to existing values. Please press "Start the import" to continue.', - - // map things. + // column roles for CSV import: 'column__ignore' => '(ignorer cette colonne)', 'column_account-iban' => 'Compte d’actif (IBAN)', 'column_account-id' => 'Asset account ID (matching FF3)', @@ -151,55 +254,11 @@ return [ 'column_sepa-ci' => 'SEPA Creditor Identifier', 'column_sepa-ep' => 'SEPA External Purpose', 'column_sepa-country' => 'SEPA Country Code', - 'column_tags-comma' => 'Tags (comma separated)', - 'column_tags-space' => 'Tags (space separated)', + 'column_tags-comma' => 'Tags (séparés par des virgules)', + 'column_tags-space' => 'Tags (séparé par un espace)', 'column_account-number' => 'Asset account (account number)', 'column_opposing-number' => 'Opposing account (account number)', 'column_note' => 'Note(s)', 'column_internal-reference' => 'Internal reference', - // prerequisites - 'prerequisites' => 'Prerequisites', - - // bunq - 'bunq_prerequisites_title' => 'Prerequisites for an import from bunq', - 'bunq_prerequisites_text' => 'In order to import from bunq, you need to obtain an API key. You can do this through the app. Please note that the import function for bunq is in BETA. It has only been tested against the sandbox API.', - 'bunq_prerequisites_text_ip' => 'Bunq requires your externally facing IP address. Firefly III has tried to fill this in using the ipify service. Make sure this IP address is correct, or the import will fail.', - 'bunq_do_import' => 'Yes, import from this account', - 'bunq_accounts_title' => 'Bunq accounts', - 'bunq_accounts_text' => 'These are the accounts associated with your bunq account. Please select the accounts from which you want to import, and in which account the transactions must be imported.', - - // Spectre - 'spectre_title' => 'Import using Spectre', - 'spectre_prerequisites_title' => 'Prerequisites for an import using Spectre', - 'spectre_prerequisites_text' => 'In order to import data using the Spectre API (v4), you must provide Firefly III with two secret values. They can be found on the secrets page.', - 'spectre_enter_pub_key' => 'The import will only work when you enter this public key on your secrets page.', - 'spectre_accounts_title' => 'Select accounts to import from', - 'spectre_accounts_text' => 'Each account on the left below has been found by Spectre and can be imported into Firefly III. Please select the asset account that should hold any given transactions. If you do not wish to import from any particular account, remove the check from the checkbox.', - 'spectre_do_import' => 'Yes, import from this account', - 'spectre_no_supported_accounts' => 'You cannot import from this account due to a currency mismatch.', - - // keys from "extra" array: - 'spectre_extra_key_iban' => 'IBAN', - 'spectre_extra_key_swift' => 'SWIFT', - 'spectre_extra_key_status' => 'Status', - 'spectre_extra_key_card_type' => 'Card type', - 'spectre_extra_key_account_name' => 'Account name', - 'spectre_extra_key_client_name' => 'Client name', - 'spectre_extra_key_account_number' => 'Account number', - 'spectre_extra_key_blocked_amount' => 'Blocked amount', - 'spectre_extra_key_available_amount' => 'Available amount', - 'spectre_extra_key_credit_limit' => 'Credit limit', - 'spectre_extra_key_interest_rate' => 'Interest rate', - 'spectre_extra_key_expiry_date' => 'Expiry date', - 'spectre_extra_key_open_date' => 'Open date', - 'spectre_extra_key_current_time' => 'Current time', - 'spectre_extra_key_current_date' => 'Current date', - 'spectre_extra_key_cards' => 'Cards', - 'spectre_extra_key_units' => 'Units', - 'spectre_extra_key_unit_price' => 'Unit price', - 'spectre_extra_key_transactions_count' => 'Transaction count', - - // various other strings: - 'imported_from_account' => 'Imported from ":account"', ]; diff --git a/resources/lang/fr_FR/intro.php b/resources/lang/fr_FR/intro.php index 2b4ed6d7fb..103c316b23 100644 --- a/resources/lang/fr_FR/intro.php +++ b/resources/lang/fr_FR/intro.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // index 'index_intro' => 'Bienvenue sur la page index de Firefly III. Veuillez prendre le temps de parcourir l\'introduction pour comprendre comment Firefly III fonctionne.', diff --git a/resources/lang/fr_FR/list.php b/resources/lang/fr_FR/list.php index 0001821206..ccafd1e385 100644 --- a/resources/lang/fr_FR/list.php +++ b/resources/lang/fr_FR/list.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'buttons' => 'Boutons', 'icon' => 'Icône', @@ -111,10 +112,15 @@ return [ 'sepa-cc' => 'Code de compensation SEPA', 'sepa-ep' => 'Objectif externe SEPA', 'sepa-ci' => 'Identifiant SEPA Creditor', + 'external_id' => 'External ID', 'account_at_bunq' => 'Compte avec bunq', 'file_name' => 'File name', 'file_size' => 'File size', 'file_type' => 'File type', 'attached_to' => 'Attached to', 'file_exists' => 'File exists', + 'spectre_bank' => 'Bank', + 'spectre_last_use' => 'Last login', + 'spectre_status' => 'Status', + 'bunq_payment_id' => 'bunq payment ID', ]; diff --git a/resources/lang/fr_FR/pagination.php b/resources/lang/fr_FR/pagination.php index d58666a2e4..b07c1ca899 100644 --- a/resources/lang/fr_FR/pagination.php +++ b/resources/lang/fr_FR/pagination.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'previous' => '« Précédent', 'next' => 'Suivant »', diff --git a/resources/lang/fr_FR/passwords.php b/resources/lang/fr_FR/passwords.php index 7a6e781409..e8f757293f 100644 --- a/resources/lang/fr_FR/passwords.php +++ b/resources/lang/fr_FR/passwords.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'password' => 'Les mots de passe doivent contenir au moins six caractères et correspondre à la confirmation.', 'user' => 'Nous ne pouvons pas trouver d\'utilisateur avec cette adresse e-mail.', diff --git a/resources/lang/fr_FR/validation.php b/resources/lang/fr_FR/validation.php index 68e8799c02..6ce0d06474 100644 --- a/resources/lang/fr_FR/validation.php +++ b/resources/lang/fr_FR/validation.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'iban' => 'Il ne s\'agit pas d\'un IBAN valide.', 'source_equals_destination' => 'Le compte source est égal au compte de destination', @@ -109,7 +110,8 @@ return [ 'in_array' => 'Le champ :attribute n\'existe pas dans :other.', 'present' => 'Le champs :attribute doit être rempli.', 'amount_zero' => 'Le montant total ne peut pas être zéro', - 'secure_password' => 'Ce n’est pas un mot de passe sécurisé. S’il vous plaît essayer de nouveau. Pour plus d’informations, visitez https://goo.gl/NCh2tN', + 'unique_piggy_bank_for_user' => 'The name of the piggy bank must be unique.', + 'secure_password' => 'This is not a secure password. Please try again. For more information, visit http://bit.ly/FF3-password-security', 'attributes' => [ 'email' => 'adresse email', 'description' => 'description', diff --git a/resources/lang/id_ID/auth.php b/resources/lang/id_ID/auth.php index d5c89b1738..a0fabdfc2b 100644 --- a/resources/lang/id_ID/auth.php +++ b/resources/lang/id_ID/auth.php @@ -1,9 +1,8 @@ . */ -return [ - /* - |-------------------------------------------------------------------------- - | Authentication Language Lines - |-------------------------------------------------------------------------- - | - | The following language lines are used during authentication for various - | messages that we need to display to the user. You are free to modify - | these language lines according to your application's requirements. - | - */ +declare(strict_types=1); +return [ 'failed' => 'Kredensial ini tidak sesuai dengan catatan kami.', 'throttle' => 'Terlalu banyak upaya login. Silakan coba lagi dalam :seconds detik.', ]; diff --git a/resources/lang/id_ID/bank.php b/resources/lang/id_ID/bank.php index 8826020cbf..5d00b1e685 100644 --- a/resources/lang/id_ID/bank.php +++ b/resources/lang/id_ID/bank.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ ]; diff --git a/resources/lang/id_ID/breadcrumbs.php b/resources/lang/id_ID/breadcrumbs.php index 37012db64f..a6e166fd57 100644 --- a/resources/lang/id_ID/breadcrumbs.php +++ b/resources/lang/id_ID/breadcrumbs.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'home' => 'Beranda', 'edit_currency' => 'Edit mata uang ":name"', diff --git a/resources/lang/id_ID/components.php b/resources/lang/id_ID/components.php index 50092e06fd..6299088f8e 100644 --- a/resources/lang/id_ID/components.php +++ b/resources/lang/id_ID/components.php @@ -1,5 +1,4 @@ . */ +declare(strict_types=1); + return [ // profile 'personal_access_tokens' => 'Personal access tokens', diff --git a/resources/lang/id_ID/config.php b/resources/lang/id_ID/config.php index 1d5d9e7592..64659774cd 100644 --- a/resources/lang/id_ID/config.php +++ b/resources/lang/id_ID/config.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'html_language' => 'id', 'locale' => 'id, Bahasa Indonesia, id_ID, id_ID.utf8, id_ID.UTF-8', diff --git a/resources/lang/id_ID/csv.php b/resources/lang/id_ID/csv.php index 622a49202a..aae109a40a 100644 --- a/resources/lang/id_ID/csv.php +++ b/resources/lang/id_ID/csv.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ ]; diff --git a/resources/lang/id_ID/demo.php b/resources/lang/id_ID/demo.php index be9aeac6ac..a62c929dc0 100644 --- a/resources/lang/id_ID/demo.php +++ b/resources/lang/id_ID/demo.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'no_demo_text' => 'Maaf, tidak ada teks penjelasan-penjelasan tambahan laman halaman ini.', 'see_help_icon' => 'Namun, ikon di pojok kanan atas mungkin memberi tahu Anda lebih banyak.', @@ -32,5 +33,5 @@ return [ 'currencies-index' => 'Firefly III mendukung banyak mata uang. Meski default ke Euro itu bisa diatur ke US Dollar dan banyak mata uang lainnya. Seperti yang bisa Anda lihat, sejumlah kecil mata uang telah disertakan namun Anda dapat menambahkannya sendiri jika menginginkannya. Mengubah mata uang default tidak akan mengubah mata uang dari transaksi yang ada namun: Firefly III mendukung penggunaan beberapa mata uang pada saat bersamaan.', 'transactions-index' => 'Biaya ini, deposito dan transfer tidak terlalu imajinatif. Mereka telah dihasilkan secara otomatis.', 'piggy-banks-index' => 'Seperti yang bisa Anda lihat, ada tiga celengan. Gunakan tombol plus dan minus untuk mempengaruhi jumlah uang di setiap celengan. Klik nama celengan untuk melihat administrasi masing-masing celengan.', - 'import-index' => 'Tentu saja, file CSV manapun bisa diimpor ke Firefly III', + 'import-index' => 'Any CSV file can be imported into Firefly III. It also supports importing data from bunq and Spectre. Other banks and financial aggregators will be implemented in the future. As a demo-user however, you can only see the "fake"-provider in action. It will generate some random transactions to show you how the process works.', ]; diff --git a/resources/lang/id_ID/firefly.php b/resources/lang/id_ID/firefly.php index d831542d5d..348ed93b3a 100644 --- a/resources/lang/id_ID/firefly.php +++ b/resources/lang/id_ID/firefly.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // general stuff: 'close' => 'Dekat', @@ -179,6 +180,7 @@ return [ 'authorization_request_intro' => ':client is requesting permission to access your financial administration. Would you like to authorize :client to access these records?', 'scopes_will_be_able' => 'This application will be able to:', 'button_authorize' => 'Authorize', + 'none_in_select_list' => '(none)', // check for updates: 'update_check_title' => 'Check for updates', @@ -666,6 +668,7 @@ return [ 'bill_will_automatch' => 'Tagihan akan secara otomatis terhubung ke transaksi yang sesuai', 'skips_over' => 'melompati', 'bill_store_error' => 'An unexpected error occurred while storing your new bill. Please check the log files', + 'list_inactive_rule' => 'inactive rule', // accounts: 'details_for_asset' => 'Rincian akun aset ":name"', @@ -801,6 +804,7 @@ return [ 'opt_group_savingAsset' => 'Menyimpan akun', 'opt_group_sharedAsset' => 'Akun aset bersama', 'opt_group_ccAsset' => 'Kartu kredit', + 'opt_group_cashWalletAsset' => 'Cash wallets', 'notes' => 'Notes', 'unknown_journal_error' => 'Could not store the transaction. Please check the log files.', @@ -816,6 +820,7 @@ return [ 'language' => 'Language', 'new_savings_account' => ':bank_name savings account', 'cash_wallet' => 'Cash wallet', + 'currency_not_present' => 'If the currency you normally use is not listed do not worry. You can create your own currencies under Options > Currencies.', // home page: 'yourAccounts' => 'Akun anda', @@ -1013,6 +1018,7 @@ return [ 'remove_money_from_piggy_title' => 'Hapus uang dari celengan ":name"', 'add' => 'Menambahkan', 'no_money_for_piggy' => 'Anda tidak punya uang untuk dimasukkan ke dalam celengan ini.', + 'suggested_savings_per_month' => 'Suggested per month', 'remove' => 'Menghapus', 'max_amount_add' => 'Jumlah maksimum yang bisa Anda tambahkan adalah', @@ -1148,27 +1154,9 @@ return [ 'no_edit_multiple_left' => 'Anda tidak memilih transaksi yang sah untuk diedit.', 'cannot_convert_split_journal' => 'Tidak dapat mengonversi transaksi split', - // import bread crumbs and titles: - 'import' => 'Impor', - 'import_data' => 'Impor data', - 'import_general_index_file' => 'Impor file', - 'import_from_bunq' => 'Impor dari bunq', - 'import_using_spectre' => 'Impor menggunakan momok', - 'import_using_plaid' => 'Impor menggunakan Plaid', - 'import_config_bread_crumb' => 'Siapkan impor Anda', - - // import index page: + // Import page (general strings only) 'import_index_title' => 'Impor data ke Firefly III', - 'import_index_sub_title' => 'Indeks', - 'import_general_index_intro' => 'Welcome to Firefly III\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.', - 'upload_error' => 'The file you have uploaded could not be processed. Possibly it is of an invalid file type or encoding. The log files will have more information.', - 'reset_import_settings_title' => 'Reset import configuration', - 'reset_import_settings_text' => 'You can use these links to reset your import settings for specific providers. This is useful when bad settings stop you from importing data.', - 'reset_settings_bunq' => 'Remove bunq API key, local external IP address and bunq related RSA keys.', - 'reset_settings_spectre' => 'Remove Spectre secrets and ID\'s. This will also remove your Spectre keypair. Remember to update the new one.', - 'settings_reset_for_bunq' => 'Bunq settings reset.', - 'settings_reset_for_spectre' => 'Spectre settings reset.', - + 'import_data' => 'Impor data', // sandstorm.io errors and messages: 'sandstorm_not_available' => 'Fungsi ini tidak tersedia saat Anda menggunakan Firefly III di dalam lingkungan Sandstorm.io.', diff --git a/resources/lang/id_ID/form.php b/resources/lang/id_ID/form.php index 16431078e1..6dd307210f 100644 --- a/resources/lang/id_ID/form.php +++ b/resources/lang/id_ID/form.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // new user: 'bank_name' => 'Nama Bank', @@ -184,6 +185,13 @@ return [ 'blocked' => 'Apakah diblokir?', 'blocked_code' => 'Alasan untuk blok', + // import + 'apply_rules' => 'Apply rules', + 'artist' => 'Artist', + 'album' => 'Album', + 'song' => 'Song', + + // admin 'domain' => 'Domain', 'single_user_mode' => 'Nonaktifkan pendaftaran pengguna', diff --git a/resources/lang/id_ID/import.php b/resources/lang/id_ID/import.php index a580259879..93809b1375 100644 --- a/resources/lang/id_ID/import.php +++ b/resources/lang/id_ID/import.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ - // status of import: + // ALL breadcrumbs and subtitles: + 'index_breadcrumb' => 'Import data into Firefly III', + 'prerequisites_breadcrumb_fake' => 'Prerequisites for the fake import provider', + 'prerequisites_breadcrumb_spectre' => 'Prerequisites for Spectre', + 'prerequisites_breadcrumb_bunq' => 'Prerequisites for bunq', + 'job_configuration_breadcrumb' => 'Configuration for ":key"', + 'job_status_breadcrumb' => 'Import status for ":key"', + 'cannot_create_for_provider' => 'Firefly III cannot create a job for the ":provider"-provider.', + + // index page: + 'general_index_title' => 'Import a file', + 'general_index_intro' => 'Welcome to Firefly III\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.', + // import provider strings (index): + 'button_fake' => 'Fake an import', + 'button_file' => 'Import a file', + 'button_bunq' => 'Import from bunq', + 'button_spectre' => 'Import using Spectre', + 'button_plaid' => 'Import using Plaid', + 'button_yodlee' => 'Import using Yodlee', + 'button_quovo' => 'Import using Quovo', + // global config box (index) + 'global_config_title' => 'Global import configuration', + 'global_config_text' => 'In the future, this box will feature preferences that apply to ALL import providers above.', + // prerequisites box (index) + 'need_prereq_title' => 'Import prerequisites', + 'need_prereq_intro' => 'Some import methods need your attention before they can be used. For example, they might require special API keys or application secrets. You can configure them here. The icon indicates if these prerequisites have been met.', + 'do_prereq_fake' => 'Prerequisites for the fake provider', + 'do_prereq_file' => 'Prerequisites for file imports', + 'do_prereq_bunq' => 'Prerequisites for imports from bunq', + 'do_prereq_spectre' => 'Prerequisites for imports using Spectre', + 'do_prereq_plaid' => 'Prerequisites for imports using Plaid', + 'do_prereq_yodlee' => 'Prerequisites for imports using Yodlee', + 'do_prereq_quovo' => 'Prerequisites for imports using Quovo', + // provider config box (index) + 'can_config_title' => 'Import configuration', + 'can_config_intro' => 'Some import methods can be configured to your liking. They have extra settings you can tweak.', + 'do_config_fake' => 'Configuration for the fake provider', + 'do_config_file' => 'Configuration for file imports', + 'do_config_bunq' => 'Configuration for bunq imports', + 'do_config_spectre' => 'Configuration for imports from Spectre', + 'do_config_plaid' => 'Configuration for imports from Plaid', + 'do_config_yodlee' => 'Configuration for imports from Yodlee', + 'do_config_quovo' => 'Configuration for imports from Quovo', + + // prerequisites: + 'prereq_fake_title' => 'Prerequisites for an import from the fake import provider', + 'prereq_fake_text' => 'This fake provider requires a fake API key. It must be 32 characters long. You can use this one: 123456789012345678901234567890AA', + 'prereq_spectre_title' => 'Prerequisites for an import using the Spectre API', + 'prereq_spectre_text' => 'In order to import data using the Spectre API (v4), you must provide Firefly III with two secret values. They can be found on the secrets page.', + 'prereq_spectre_pub' => 'Likewise, the Spectre API needs to know the public key you see below. Without it, it will not recognize you. Please enter this public key on your secrets page.', + 'prereq_bunq_title' => 'Prerequisites for an import from bunq', + 'prereq_bunq_text' => 'In order to import from bunq, you need to obtain an API key. You can do this through the app. Please note that the import function for bunq is in BETA. It has only been tested against the sandbox API.', + 'prereq_bunq_ip' => 'bunq requires your externally facing IP address. Firefly III has tried to fill this in using the ipify service. Make sure this IP address is correct, or the import will fail.', + // prerequisites success messages: + 'prerequisites_saved_for_fake' => 'Fake API key stored successfully!', + 'prerequisites_saved_for_spectre' => 'App ID and secret stored!', + 'prerequisites_saved_for_bunq' => 'API key and IP stored!', + + // job configuration: + 'job_config_apply_rules_title' => 'Job configuration - apply your rules?', + 'job_config_apply_rules_text' => 'Once the fake provider has run, your rules can be applied to the transactions. This adds time to the import.', + 'job_config_input' => 'Your input', + // job configuration for the fake provider: + 'job_config_fake_artist_title' => 'Enter album name', + 'job_config_fake_artist_text' => 'Many import routines have a few configuration steps you must go through. In the case of the fake import provider, you must answer some weird questions. In this case, enter "David Bowie" to continue.', + 'job_config_fake_song_title' => 'Enter song name', + 'job_config_fake_song_text' => 'Mention the song "Golden years" to continue with the fake import.', + 'job_config_fake_album_title' => 'Enter album name', + 'job_config_fake_album_text' => 'Some import routines require extra data halfway through the import. In the case of the fake import provider, you must answer some weird questions. Enter "Station to station" to continue.', + // job configuration form the file provider + 'job_config_file_upload_title' => 'Import setup (1/4) - Upload your file', + 'job_config_file_upload_text' => 'This routine will help you import files from your bank into Firefly III. ', + 'job_config_file_upload_help' => 'Select your file. Please make sure the file is UTF-8 encoded.', + 'job_config_file_upload_config_help' => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their configuration file', + 'job_config_file_upload_type_help' => 'Select the type of file you will upload', + 'job_config_file_upload_submit' => 'Upload files', + 'import_file_type_csv' => 'CSV (nilai yang dipisahkan koma)', + 'file_not_utf8' => 'The file you have uploaded is not encoded as UTF-8 or ASCII. Firefly III cannot handle such files. Please use Notepad++ or Sublime to convert your file to UTF-8.', + 'job_config_uc_title' => 'Import setup (2/4) - Basic file setup', + 'job_config_uc_text' => 'To be able to import your file correctly, please validate the options below.', + 'job_config_uc_header_help' => 'Check this box if the first row of your CSV file are the column titles.', + 'job_config_uc_date_help' => 'Date time format in your file. Follow the format as this page indicates. The default value will parse dates that look like this: :dateExample.', + 'job_config_uc_delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.', + 'job_config_uc_account_help' => 'If your file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the file belong to.', + 'job_config_uc_apply_rules_title' => 'Apply rules', + 'job_config_uc_apply_rules_text' => 'Applies your rules to every imported transaction. Note that this slows the import significantly.', + 'job_config_uc_specifics_title' => 'Bank-specific options', + 'job_config_uc_specifics_txt' => 'Some banks deliver badly formatted files. Firefly III can fix those automatically. If your bank delivers such files but it\'s not listed here, please open an issue on GitHub.', + 'job_config_uc_submit' => 'Continue', + 'invalid_import_account' => 'You have selected an invalid account to import into.', + // job configuration for Spectre: + 'job_config_spectre_login_title' => 'Choose your login', + 'job_config_spectre_login_text' => 'Firefly III has found :count existing login(s) in your Spectre account. Which one would you like to use to import from?', + 'spectre_login_status_active' => 'Active', + 'spectre_login_status_inactive' => 'Inactive', + 'spectre_login_status_disabled' => 'Disabled', + 'spectre_login_new_login' => 'Login with another bank, or one of these banks with different credentials.', + 'job_config_spectre_accounts_title' => 'Select accounts to import from', + 'job_config_spectre_accounts_text' => 'You have selected ":name" (:country). You have :count account(s) available from this provider. Please select the Firefly III asset account(s) where the transactions from these accounts should be stored. Remember, in order to import data both the Firefly III account and the ":name"-account must have the same currency.', + 'spectre_no_supported_accounts' => 'You cannot import from this account due to a currency mismatch.', + 'spectre_do_not_import' => '(do not import)', + 'spectre_no_mapping' => 'It seems you have not selected any accounts to import from.', + 'imported_from_account' => 'Imported from ":account"', + 'spectre_account_with_number' => 'Account :number', + // job configuration for bunq: + 'job_config_bunq_accounts_title' => 'bunq accounts', + 'job_config_bunq_accounts_text' => 'These are the accounts associated with your bunq account. Please select the accounts from which you want to import, and in which account the transactions must be imported.', + 'bunq_no_mapping' => 'It seems you have not selected any accounts.', + 'should_download_config' => 'You should download the configuration file for this job. This will make future imports way easier.', + 'share_config_file' => 'If you have imported data from a public bank, you should share your configuration file so it will be easy for other users to import their data. Sharing your configuration file will not expose your financial details.', + + // keys from "extra" array: + 'spectre_extra_key_iban' => 'IBAN', + 'spectre_extra_key_swift' => 'SWIFT', + 'spectre_extra_key_status' => 'Status', + 'spectre_extra_key_card_type' => 'Card type', + 'spectre_extra_key_account_name' => 'Account name', + 'spectre_extra_key_client_name' => 'Client name', + 'spectre_extra_key_account_number' => 'Account number', + 'spectre_extra_key_blocked_amount' => 'Blocked amount', + 'spectre_extra_key_available_amount' => 'Available amount', + 'spectre_extra_key_credit_limit' => 'Credit limit', + 'spectre_extra_key_interest_rate' => 'Interest rate', + 'spectre_extra_key_expiry_date' => 'Expiry date', + 'spectre_extra_key_open_date' => 'Open date', + 'spectre_extra_key_current_time' => 'Current time', + 'spectre_extra_key_current_date' => 'Current date', + 'spectre_extra_key_cards' => 'Cards', + 'spectre_extra_key_units' => 'Units', + 'spectre_extra_key_unit_price' => 'Unit price', + 'spectre_extra_key_transactions_count' => 'Transaction count', + + // specifics: + 'specific_ing_name' => 'ING NL', + 'specific_ing_descr' => 'Create better descriptions in ING exports', + 'specific_sns_name' => 'SNS / Volksbank NL', + 'specific_sns_descr' => 'Trim quotes from SNS / Volksbank export files', + 'specific_abn_name' => 'ABN AMRO NL', + 'specific_abn_descr' => 'Fixes potential problems with ABN AMRO files', + 'specific_rabo_name' => 'Rabobank NL', + 'specific_rabo_descr' => 'Fixes potential problems with Rabobank files', + 'specific_pres_name' => 'President\'s Choice Financial CA', + 'specific_pres_descr' => 'Fixes potential problems with PC files', + // job configuration for file provider (stage: roles) + 'job_config_roles_title' => 'Import setup (3/4) - Define each column\'s role', + 'job_config_roles_text' => 'Each column in your CSV file contains certain data. Please indicate what kind of data the importer should expect. The option to "map" data means that you will link each entry found in the column to a value in your database. An often mapped column is the column that contains the IBAN of the opposing account. That can be easily matched to IBAN\'s present in your database already.', + 'job_config_roles_submit' => 'Continue', + 'job_config_roles_column_name' => 'Name of column', + 'job_config_roles_column_example' => 'Column example data', + 'job_config_roles_column_role' => 'Column data meaning', + 'job_config_roles_do_map_value' => 'Map these values', + 'job_config_roles_no_example' => 'No example data available', + 'job_config_roles_fa_warning' => 'If you mark a column as containing an amount in a foreign currency, you must also set the column that contains which currency it is.', + 'job_config_roles_rwarning' => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.', + 'job_config_roles_colum_count' => 'Column', + // job config for the file provider (stage: mapping): + 'job_config_map_title' => 'Import setup (4/4) - Connect import data to Firefly III data', + 'job_config_map_text' => 'In the following tables, the left value shows you information found in your uploaded file. It is your task to map this value, if possible, to a value already present in your database. Firefly will stick to this mapping. If there is no value to map to, or you do not wish to map the specific value, select nothing.', + 'job_config_map_nothing' => 'There is no data present in your file that you can map to existing values. Please press "Start the import" to continue.', + 'job_config_field_value' => 'Field value', + 'job_config_field_mapped' => 'Mapped to', + 'map_do_not_map' => '(jangan memetakan)', + 'job_config_map_submit' => 'Start the import', + + + // import status page: + 'import_with_key' => 'Impor dengan kunci \':key\'', 'status_wait_title' => 'Tolong tunggu sebentar...', 'status_wait_text' => 'Kotak ini akan hilang dalam sekejap.', - 'status_fatal_title' => 'Sebuah kesalahan fatal terjadi', - 'status_fatal_text' => 'Kesalahan fatal terjadi, dimana rutinitas impor tidak dapat dipulihkan. Silakan lihat penjelasannya di bawah ini.', - 'status_fatal_more' => 'Jika kesalahannya adalah time-out, impor akan berhenti setengah jalan. Untuk beberapa konfigurasi server, hanya server yang berhenti sementara impor terus berjalan di latar belakang. Untuk memverifikasi ini, periksa file log. Jika masalah berlanjut, pertimbangkan untuk mengimpor lebih dari baris perintah.', - 'status_ready_title' => 'Impor sudah siap untuk memulai', - 'status_ready_text' => 'Impor sudah siap dimulai. Semua konfigurasi yang perlu Anda lakukan sudah selesai. Silahkan download file konfigurasi. Ini akan membantu Anda dengan impor seandainya tidak berjalan seperti yang direncanakan. Untuk benar-benar menjalankan impor, Anda dapat menjalankan perintah berikut di konsol Anda, atau menjalankan impor berbasis web. Bergantung pada konfigurasi Anda, impor konsol akan memberi Anda lebih banyak umpan balik.', - 'status_ready_noconfig_text' => 'Impor sudah siap dimulai. Semua konfigurasi yang perlu Anda lakukan sudah selesai. Untuk benar-benar menjalankan impor, Anda dapat menjalankan perintah berikut di konsol Anda, atau menjalankan impor berbasis web. Bergantung pada konfigurasi Anda, impor konsol akan memberi Anda lebih banyak umpan balik.', - 'status_ready_config' => 'Download konfigurasi', - 'status_ready_start' => 'Mulai impor', - 'status_ready_share' => 'Harap pertimbangkan untuk mendownload konfigurasi Anda dan membagikannya di pusat konfigurasi impor. Ini akan memungkinkan pengguna Firefly III lainnya untuk mengimpor file mereka dengan lebih mudah.', - 'status_job_new' => 'Pekerjaan itu baru.', - 'status_job_configuring' => 'Impor sedang dikonfigurasi.', - 'status_job_configured' => 'Impor dikonfigurasi.', - 'status_job_running' => 'Impor sedang berjalan.. mohon menunggu..', - 'status_job_error' => 'Pekerjaan telah menimbulkan kesalahan.', - 'status_job_finished' => 'Impor telah selesai!', 'status_running_title' => 'Impor sedang berjalan', - 'status_running_placeholder' => 'Silakan tunggu update...', - 'status_finished_title' => 'Rutin impor selesai', - 'status_finished_text' => 'Rutin impor telah mengimpor data Anda.', - 'status_errors_title' => 'Kesalahan selama impor', - 'status_errors_single' => 'Terjadi kesalahan saat mengimpor. Itu tidak tampak berakibat fatal.', - 'status_errors_multi' => 'Beberapa kesalahan terjadi saat impor. Ini tidak tampak berakibat fatal.', - 'status_bread_crumb' => 'Status impor', - 'status_sub_title' => 'Status impor', - 'config_sub_title' => 'Siapkan impor Anda', - 'status_finished_job' => 'The :count transactions imported can be found in tag :tag.', - 'status_finished_no_tag' => 'Firefly III has not collected any transactions from your import file.', - 'import_with_key' => 'Impor dengan kunci \':key\'', + 'status_job_running' => 'Please wait, running the import...', + 'status_job_storing' => 'Please wait, storing data...', + 'status_job_rules' => 'Please wait, running rules...', + 'status_fatal_title' => 'Fatal error', + 'status_fatal_text' => 'The import has suffered from an error it could not recover from. Apologies!', + 'status_fatal_more' => 'This (possibly very cryptic) error message is complemented by log files, which you can find on your hard drive, or in the Docker container where you run Firefly III from.', + 'status_finished_title' => 'Import finished', + 'status_finished_text' => 'The import has finished.', + 'finished_with_errors' => 'There were some errors during the import. Please review them carefully.', + 'unknown_import_result' => 'Unknown import result', + 'result_no_transactions' => 'No transactions have been imported. Perhaps they were all duplicates is simply no transactions where present to be imported. Perhaps the log files can tell you what happened. If you import data regularly, this is normal.', + 'result_one_transaction' => 'Exactly one transaction has been imported. It is stored under tag :tag where you can inspect it further.', + 'result_many_transactions' => 'Firefly III has imported :count transactions. They are stored under tag :tag where you can inspect them further.', - // file, upload something - 'file_upload_title' => 'Impor setup (1/4) - Upload file Anda', - 'file_upload_text' => 'Rutin ini akan membantu Anda mengimpor file dari bank Anda ke Firefly III. Silakan periksa halaman bantuan di pojok kanan atas.', - 'file_upload_fields' => 'Bidang', - 'file_upload_help' => 'Pilih file anda', - 'file_upload_config_help' => 'Jika sebelumnya Anda mengimpor data ke Firefly III, Anda mungkin memiliki file konfigurasi, yang akan menetapkan nilai konfigurasi untuk Anda. Untuk beberapa bank, pengguna lain dengan ramah memberikan berkas konfigurasi mereka', - 'file_upload_type_help' => 'Pilih jenis file yang akan anda upload', - 'file_upload_submit' => 'Unggah berkas', - // file, upload types - 'import_file_type_csv' => 'CSV (nilai yang dipisahkan koma)', + // general errors and warnings: + 'bad_job_status' => 'To access this page, your import job cannot have status ":status".', - // file, initial config for CSV - 'csv_initial_title' => 'Penyiapan impor (2/4) - Penyiapan impor CSV dasar', - 'csv_initial_text' => 'Untuk dapat mengimpor file Anda dengan benar, mohon validasi pilihan di bawah ini.', - 'csv_initial_box' => 'Penyiapan impor CSV dasar', - 'csv_initial_box_title' => 'Opsi penyiapan impor CSV dasar', - 'csv_initial_header_help' => 'Centang kotak ini jika baris pertama file CSV Anda adalah judul kolom.', - 'csv_initial_date_help' => 'Format waktu tanggal di CSV Anda. Ikuti format seperti laman ini menunjukkan. Nilai default akan mengurai tanggal yang terlihat seperti ini: :dateExample.', - 'csv_initial_delimiter_help' => 'Pilih pembatas lapangan yang digunakan dalam file masukan Anda. Jika tidak yakin, koma adalah pilihan teraman.', - 'csv_initial_import_account_help' => 'Jika file CSV TIDAK berisi informasi tentang akun aset Anda, gunakan dropdown ini untuk memilih akun mana yang menjadi tempat transaksi di CSV.', - 'csv_initial_submit' => 'Lanjutkan dengan langkah 3/4', - - // file, new options: - 'file_apply_rules_title' => 'Terapkan aturan', - 'file_apply_rules_description' => 'Terapkan peraturan Anda Perhatikan bahwa ini memperlambat impor secara signifikan.', - 'file_match_bills_title' => 'Cocokkan tagihan', - 'file_match_bills_description' => 'Cocokkan tagihan Anda dengan penarikan yang baru dibuat. Perhatikan bahwa ini memperlambat impor secara signifikan.', - - // file, roles config - 'csv_roles_title' => 'Pengaturan impor (3/4) - Tentukan peran masing-masing kolom', - 'csv_roles_text' => 'Setiap kolom dalam file CSV Anda berisi data tertentu. Tolong tunjukkan jenis data yang harus diharapkan oleh importir. Pilihan untuk "memetakan" data berarti Anda akan menghubungkan setiap entri yang ditemukan di kolom ke nilai di database Anda. Kolom yang sering dipetakan adalah kolom yang berisi IBAN dari akun lawan. Itu bisa dengan mudah disesuaikan dengan keberadaan IBAN di database Anda.', - 'csv_roles_table' => 'Meja', - 'csv_roles_column_name' => 'Nama kolom', - 'csv_roles_column_example' => 'Kolom contoh data', - 'csv_roles_column_role' => 'Data kolom berarti', - 'csv_roles_do_map_value' => 'Peta nilai-nilai ini', - 'csv_roles_column' => 'Kolom', - 'csv_roles_no_example_data' => 'Tidak ada data contoh yang tersedia', - 'csv_roles_submit' => 'Lanjutkan dengan langkah 4/4', - - // not csv, but normal warning - 'roles_warning' => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.', - 'foreign_amount_warning' => 'If you mark a column as containing an amount in a foreign currency, you must also set the column that contains which currency it is.', - - // file, map data - 'file_map_title' => 'Pengaturan impor (4/4) - Sambungkan data impor ke data Firefly III', - 'file_map_text' => 'Pada tabel berikut, nilai kiri menunjukkan informasi yang Anda temukan di file yang Anda upload. Adalah tugas Anda untuk memetakan nilai ini, jika mungkin, ke nilai yang sudah ada di database Anda. Firefly akan menempel pada pemetaan ini. Jika tidak ada nilai untuk dipetakan, atau Anda tidak ingin memetakan nilai spesifiknya, pilih yang tidak ada.', - 'file_map_field_value' => 'Nilai lapangan', - 'file_map_field_mapped_to' => 'Dipetakan ke', - 'map_do_not_map' => '(jangan memetakan)', - 'file_map_submit' => 'Mulai impor', - 'file_nothing_to_map' => 'There is no data present in your file that you can map to existing values. Please press "Start the import" to continue.', - - // map things. + // column roles for CSV import: 'column__ignore' => '(abaikan kolom ini)', 'column_account-iban' => 'Akun aset (IBAN)', 'column_account-id' => 'Asset account ID (matching FF3)', @@ -158,48 +261,4 @@ return [ 'column_note' => 'Catatan (s)', 'column_internal-reference' => 'Internal reference', - // prerequisites - 'prerequisites' => 'Prerequisites', - - // bunq - 'bunq_prerequisites_title' => 'Prasyarat untuk impor dari bunq', - 'bunq_prerequisites_text' => 'In order to import from bunq, you need to obtain an API key. You can do this through the app. Please note that the import function for bunq is in BETA. It has only been tested against the sandbox API.', - 'bunq_prerequisites_text_ip' => 'Bunq requires your externally facing IP address. Firefly III has tried to fill this in using the ipify service. Make sure this IP address is correct, or the import will fail.', - 'bunq_do_import' => 'Yes, import from this account', - 'bunq_accounts_title' => 'Bunq accounts', - 'bunq_accounts_text' => 'These are the accounts associated with your bunq account. Please select the accounts from which you want to import, and in which account the transactions must be imported.', - - // Spectre - 'spectre_title' => 'Impor menggunakan momok', - 'spectre_prerequisites_title' => 'Prasyarat untuk impor menggunakan momok', - 'spectre_prerequisites_text' => 'In order to import data using the Spectre API (v4), you must provide Firefly III with two secret values. They can be found on the secrets page.', - 'spectre_enter_pub_key' => 'The import will only work when you enter this public key on your secrets page.', - 'spectre_accounts_title' => 'Select accounts to import from', - 'spectre_accounts_text' => 'Each account on the left below has been found by Spectre and can be imported into Firefly III. Please select the asset account that should hold any given transactions. If you do not wish to import from any particular account, remove the check from the checkbox.', - 'spectre_do_import' => 'Yes, import from this account', - 'spectre_no_supported_accounts' => 'You cannot import from this account due to a currency mismatch.', - - // keys from "extra" array: - 'spectre_extra_key_iban' => 'IBAN', - 'spectre_extra_key_swift' => 'SWIFT', - 'spectre_extra_key_status' => 'Status', - 'spectre_extra_key_card_type' => 'Card type', - 'spectre_extra_key_account_name' => 'Account name', - 'spectre_extra_key_client_name' => 'Client name', - 'spectre_extra_key_account_number' => 'Account number', - 'spectre_extra_key_blocked_amount' => 'Blocked amount', - 'spectre_extra_key_available_amount' => 'Available amount', - 'spectre_extra_key_credit_limit' => 'Credit limit', - 'spectre_extra_key_interest_rate' => 'Interest rate', - 'spectre_extra_key_expiry_date' => 'Expiry date', - 'spectre_extra_key_open_date' => 'Open date', - 'spectre_extra_key_current_time' => 'Current time', - 'spectre_extra_key_current_date' => 'Current date', - 'spectre_extra_key_cards' => 'Cards', - 'spectre_extra_key_units' => 'Units', - 'spectre_extra_key_unit_price' => 'Unit price', - 'spectre_extra_key_transactions_count' => 'Transaction count', - - // various other strings: - 'imported_from_account' => 'Imported from ":account"', ]; diff --git a/resources/lang/id_ID/intro.php b/resources/lang/id_ID/intro.php index 2c47c0c340..393970564b 100644 --- a/resources/lang/id_ID/intro.php +++ b/resources/lang/id_ID/intro.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // index 'index_intro' => 'Selamat datang di halaman indeks Firefly III. Mohon luangkan waktu untuk menelusuri pengantar ini melihat bagaimana Firefly III bekerja.', diff --git a/resources/lang/id_ID/list.php b/resources/lang/id_ID/list.php index ea8d946364..d64698938c 100644 --- a/resources/lang/id_ID/list.php +++ b/resources/lang/id_ID/list.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'buttons' => 'Tombol', 'icon' => 'Ikon', @@ -111,10 +112,15 @@ return [ 'sepa-cc' => 'SEPA Clearing Code', 'sepa-ep' => 'SEPA External Purpose', 'sepa-ci' => 'SEPA Creditor Identifier', + 'external_id' => 'External ID', 'account_at_bunq' => 'Account with bunq', 'file_name' => 'File name', 'file_size' => 'File size', 'file_type' => 'File type', 'attached_to' => 'Attached to', 'file_exists' => 'File exists', + 'spectre_bank' => 'Bank', + 'spectre_last_use' => 'Last login', + 'spectre_status' => 'Status', + 'bunq_payment_id' => 'bunq payment ID', ]; diff --git a/resources/lang/id_ID/pagination.php b/resources/lang/id_ID/pagination.php index 0ec6186091..b581a04610 100644 --- a/resources/lang/id_ID/pagination.php +++ b/resources/lang/id_ID/pagination.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'previous' => '« Sebelumnya', 'next' => 'Selanjutnya »', diff --git a/resources/lang/id_ID/passwords.php b/resources/lang/id_ID/passwords.php index 766e5ac204..0081716690 100644 --- a/resources/lang/id_ID/passwords.php +++ b/resources/lang/id_ID/passwords.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'password' => 'Sandi minimal harus 6 karakter dan cocok dengan konfirmasi.', 'user' => 'Kami tidak dapat menemukan pengguna dengan alamat e-mail itu.', diff --git a/resources/lang/id_ID/validation.php b/resources/lang/id_ID/validation.php index ec4bcd3a77..00be6153a5 100644 --- a/resources/lang/id_ID/validation.php +++ b/resources/lang/id_ID/validation.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'iban' => 'Ini bukan IBAN yang valid.', 'source_equals_destination' => 'The source account equals the destination account', @@ -109,7 +110,8 @@ return [ 'in_array' => 'Bidang :attribute tidak ada in :other.', 'present' => 'Bidang :attribute harus ada.', 'amount_zero' => 'Jumlah total tidak boleh nol', - 'secure_password' => 'Ini bukan kata sandi yang aman. Silahkan coba lagi. Untuk informasi lebih lanjut, kunjungi https://goo.gl/NCh2tN', + 'unique_piggy_bank_for_user' => 'The name of the piggy bank must be unique.', + 'secure_password' => 'This is not a secure password. Please try again. For more information, visit http://bit.ly/FF3-password-security', 'attributes' => [ 'email' => 'email address', 'description' => 'description', diff --git a/resources/lang/it_IT/auth.php b/resources/lang/it_IT/auth.php index bcde25e00a..c3bc250669 100644 --- a/resources/lang/it_IT/auth.php +++ b/resources/lang/it_IT/auth.php @@ -1,9 +1,8 @@ . */ -return [ - /* - |-------------------------------------------------------------------------- - | Authentication Language Lines - |-------------------------------------------------------------------------- - | - | The following language lines are used during authentication for various - | messages that we need to display to the user. You are free to modify - | these language lines according to your application's requirements. - | - */ +declare(strict_types=1); +return [ 'failed' => 'Queste credenziali non corrispondono ai nostri record.', 'throttle' => 'Troppi tentativi di accesso. Per favore riprova tra :seconds secondi.', ]; diff --git a/resources/lang/it_IT/bank.php b/resources/lang/it_IT/bank.php index 8826020cbf..5d00b1e685 100644 --- a/resources/lang/it_IT/bank.php +++ b/resources/lang/it_IT/bank.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ ]; diff --git a/resources/lang/it_IT/breadcrumbs.php b/resources/lang/it_IT/breadcrumbs.php index 92ae5d3c73..f631ee70e8 100644 --- a/resources/lang/it_IT/breadcrumbs.php +++ b/resources/lang/it_IT/breadcrumbs.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'home' => 'Home', 'edit_currency' => 'Modifica valuta ":name"', @@ -38,7 +39,7 @@ return [ 'reports' => 'Resoconti', 'search_result' => 'Risultati di ricerca per ":query"', 'withdrawal_list' => 'Spese', - 'deposit_list' => 'Entrate, entrate e depositi', + 'deposit_list' => 'Reddito, entrate e depositi', 'transfer_list' => 'Trasferimenti', 'transfers_list' => 'Trasferimenti', 'reconciliation_list' => 'Riconciliazioni', diff --git a/resources/lang/it_IT/components.php b/resources/lang/it_IT/components.php index 82f04fce8f..296fa36c83 100644 --- a/resources/lang/it_IT/components.php +++ b/resources/lang/it_IT/components.php @@ -1,5 +1,4 @@ . */ +declare(strict_types=1); + return [ // profile 'personal_access_tokens' => 'Token di accesso personale', diff --git a/resources/lang/it_IT/config.php b/resources/lang/it_IT/config.php index acac8fc155..667e347c13 100644 --- a/resources/lang/it_IT/config.php +++ b/resources/lang/it_IT/config.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'html_language' => 'it', 'locale' => 'it, Italiano, it_IT, it_IT.utf8, it_IT.UTF-8', diff --git a/resources/lang/it_IT/csv.php b/resources/lang/it_IT/csv.php index 622a49202a..aae109a40a 100644 --- a/resources/lang/it_IT/csv.php +++ b/resources/lang/it_IT/csv.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ ]; diff --git a/resources/lang/it_IT/demo.php b/resources/lang/it_IT/demo.php index e17fd3e782..38c210d8fb 100644 --- a/resources/lang/it_IT/demo.php +++ b/resources/lang/it_IT/demo.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'no_demo_text' => 'Spiacenti, non esiste un testo dimostrativo aggiuntivo per questa pagina.', - 'see_help_icon' => 'Tuttavia, il -icon in alto a destra potrebbe dirti di più.', + 'see_help_icon' => 'Tuttavia, l\'icona in alto a destra potrebbe dirti di più.', 'index' => 'Benvenuto in Firefly III! In questa pagina ottieni una rapida panoramica delle tue finanze. Per ulteriori informazioni, controlla Account e → Account asset e, naturalmente, i budget e i resoconti. O semplicemente dai un\'occhiata in giro e vedi dove finisci.', 'accounts-index' => 'I conti degli asset sono i tuoi conti bancari personali. I conti spese sono gli account a cui si spendono soldi, come negozi e amici. I conti delle entrate sono conti da cui ricevi denaro, come il tuo lavoro, il governo o altre fonti di reddito. In questa pagina puoi modificarli o rimuoverli.', 'budgets-index' => 'Questa pagina ti mostra una panoramica dei tuoi budget. La barra in alto mostra l\'importo disponibile per essere preventivato. Questo può essere personalizzato per qualsiasi periodo facendo clic sull\'importo a destra. La quantità che hai effettivamente speso è mostrata nella barra sottostante. Di seguito sono indicate le spese per budget e ciò che hai preventivato per loro.', @@ -32,5 +33,5 @@ return [ 'currencies-index' => 'Firefly III supporta più valute. Sebbene sia impostato su Euro, può essere impostato sul dollaro USA e su molte altre valute. Come puoi vedere, è stata inclusa una piccola selezione di valute, ma puoi aggiungere la tua se lo desideri. Tuttavia, la modifica della valuta predefinita non cambierà la valuta delle transazioni esistenti: Firefly III supporta un uso di più valute allo stesso tempo.', 'transactions-index' => 'Queste spese, depositi e trasferimenti non sono particolarmente fantasiosi. Sono stati generati automaticamente.', 'piggy-banks-index' => 'Come puoi vedere, ci sono tre salvadanai. Utilizzare i pulsanti più e meno per influenzare la quantità di denaro in ogni salvadanaio. Fare clic sul nome del salvadanaio per visualizzare la gestione per ciascun salvadanaio.', - 'import-index' => 'Naturalmente, qualsiasi file CSV può essere importato in Firefly III', + 'import-index' => 'Qualsiasi file CSV può essere importato in Firefly III. Supporta anche l\'importazione di dati da bunq e Spectre. Altre banche e aggregatori finanziari saranno implementati in futuro. Tuttavia, come utente demo, puoi vedere solo il provider "fittizio" in azione. Genererà alcune transazioni casuali per mostrarti come funziona il processo.', ]; diff --git a/resources/lang/it_IT/firefly.php b/resources/lang/it_IT/firefly.php index 1ecb20c803..0532dcd126 100644 --- a/resources/lang/it_IT/firefly.php +++ b/resources/lang/it_IT/firefly.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // general stuff: 'close' => 'Chiudi', @@ -44,7 +45,7 @@ return [ 'asset_account_role_help' => 'Qualsiasi opzione aggiuntiva risultante dalla tua scelta può essere impostata in seguito.', 'Opening balance' => 'Saldo di apertura', 'create_new_stuff' => 'Crea nuove cose', - 'new_withdrawal' => 'Nuova uscita', + 'new_withdrawal' => 'Nuovo prelievo', 'create_new_transaction' => 'Crea nuova transazione', 'go_to_asset_accounts' => 'Visualizza i tuoi movimenti', 'go_to_budgets' => 'Vai ai tuoi budget', @@ -54,8 +55,8 @@ return [ 'go_to_revenue_accounts' => 'Vedi i tuoi conti entrate', 'go_to_piggies' => 'Vai ai tuoi salvadanai', 'new_deposit' => 'Nuova entrata', - 'new_transfer' => 'Nuovo giroconto', - 'new_transfers' => 'Nuovi giroconti', + 'new_transfer' => 'Nuovo trasferimento', + 'new_transfers' => 'Nuovo trasferimento', 'new_asset_account' => 'Nuova attività conto', 'new_expense_account' => 'Nuova spesa conto', 'new_revenue_account' => 'Nuova entrata conto', @@ -117,9 +118,9 @@ return [ 'chart_account_in_period' => 'Grafico di tutte le transazioni per Conto ":name" fra :start E :end', 'chart_category_in_period' => 'Grafico di tutte le transazioni per Categorie ":name" fra :start e :end', 'chart_category_all' => 'Grafico di tutte le transazioni per Categoria ":name"', - 'clone_withdrawal' => 'Duplica questo uscita', + 'clone_withdrawal' => 'Duplica questo prelievo', 'clone_deposit' => 'Duplica questa entrata', - 'clone_transfer' => 'Duplica questo giroconto', + 'clone_transfer' => 'Duplica questo trasferimento', 'multi_select_no_selection' => 'Nessuno selezionato', 'multi_select_select_all' => 'Seleziona tutto', 'multi_select_n_selected' => 'selezionato', @@ -179,6 +180,7 @@ return [ 'authorization_request_intro' => ':client sta richiedendo l\'autorizzazione per accedere alla tua amministrazione finanziaria. Desideri autorizzare :client ad accedere a questi record?', 'scopes_will_be_able' => 'Questa applicazione sarà in grado di:', 'button_authorize' => 'Autorizza', + 'none_in_select_list' => '(nessuna)', // check for updates: 'update_check_title' => 'Controlla aggiornamenti', @@ -284,9 +286,9 @@ return [ 'default_rule_trigger_from_account' => 'David Bowie', 'default_rule_action_prepend' => 'Comprato il mondo da ', 'default_rule_action_set_category' => 'Grandi spese', - 'trigger' => 'Attivare', - 'trigger_value' => 'Attiva il valore', - 'stop_processing_other_triggers' => 'Interrompe l\'elaborazione di altre attivazioni', + 'trigger' => 'Trigger', + 'trigger_value' => 'Attiva al valore', + 'stop_processing_other_triggers' => 'Interrompi l\'elaborazione di altri trigger', 'add_rule_trigger' => 'Aggiungi un nuovo trigger', 'action' => 'Azione', 'action_value' => 'Valore azione', @@ -310,25 +312,25 @@ return [ // actions and triggers 'rule_trigger_user_action' => 'L\'azione dell\'utente è ":trigger_value"', - 'rule_trigger_from_account_starts_choice' => 'Il conto di origine inizia con..', + 'rule_trigger_from_account_starts_choice' => 'Il conto di origine inizia con...', 'rule_trigger_from_account_starts' => 'Il conto di origine inizia con ":trigger_value"', - 'rule_trigger_from_account_ends_choice' => 'Il conto di origine termina con..', + 'rule_trigger_from_account_ends_choice' => 'Il conto di origine termina con...', 'rule_trigger_from_account_ends' => 'Il conto di origine termina con ":trigger_value"', - 'rule_trigger_from_account_is_choice' => 'L\'account di origine è..', - 'rule_trigger_from_account_is' => 'L\'account di origine è ":trigger_value"', - 'rule_trigger_from_account_contains_choice' => 'Il conto di origine contiene..', + 'rule_trigger_from_account_is_choice' => 'Il conto di origine è...', + 'rule_trigger_from_account_is' => 'Il conto di origine è ":trigger_value"', + 'rule_trigger_from_account_contains_choice' => 'Il conto di origine contiene...', 'rule_trigger_from_account_contains' => 'Il conto di origine contiene ":trigger_value"', - 'rule_trigger_to_account_starts_choice' => 'Il conto di destinazione inizia con..', + 'rule_trigger_to_account_starts_choice' => 'Il conto di destinazione inizia con...', 'rule_trigger_to_account_starts' => 'Il conto di destinazione inizia con ":trigger_value"', - 'rule_trigger_to_account_ends_choice' => 'Il conto di destinazione termina con..', + 'rule_trigger_to_account_ends_choice' => 'Il conto di destinazione termina con...', 'rule_trigger_to_account_ends' => 'Il conto di destinazione termina con ":trigger_value"', - 'rule_trigger_to_account_is_choice' => 'Il conto di destinazione è..', + 'rule_trigger_to_account_is_choice' => 'Il conto di destinazione è...', 'rule_trigger_to_account_is' => 'Il conto di destinazione è ":trigger_value"', - 'rule_trigger_to_account_contains_choice' => 'Il conto di destinazione contiene..', + 'rule_trigger_to_account_contains_choice' => 'Il conto di destinazione contiene...', 'rule_trigger_to_account_contains' => 'Il conto di destinazione contiene ":trigger_value"', - 'rule_trigger_transaction_type_choice' => 'La transazione è di tipo..', + 'rule_trigger_transaction_type_choice' => 'La transazione è di tipo...', 'rule_trigger_transaction_type' => 'La transazione è di tipo ":trigger_value"', - 'rule_trigger_category_is_choice' => 'La categoria è..', + 'rule_trigger_category_is_choice' => 'La categoria è...', 'rule_trigger_category_is' => 'La categoria è ":trigger_value"', 'rule_trigger_amount_less_choice' => 'L\'importo è inferiore a..', 'rule_trigger_amount_less' => 'L\'importo è inferiore a :trigger_value', @@ -347,7 +349,7 @@ return [ 'rule_trigger_budget_is_choice' => 'Il budget è...', 'rule_trigger_budget_is' => 'Il budget è ":trigger_value"', 'rule_trigger_tag_is_choice' => '(A) tag è..', - 'rule_trigger_tag_is' => 'Un tag è ":trigger_value"', + 'rule_trigger_tag_is' => 'Una etichetta è ":trigger_value"', 'rule_trigger_currency_is_choice' => 'La valuta della transazione è...', 'rule_trigger_currency_is' => 'La valuta della transazione è ":trigger_value"', 'rule_trigger_has_attachments_choice' => 'Ha almeno questo molti allegati', @@ -360,8 +362,8 @@ return [ 'rule_trigger_has_any_category' => 'La transazione ha una (qualsiasi) categoria', 'rule_trigger_has_no_budget_choice' => 'Non ha un budget', 'rule_trigger_has_no_budget' => 'La transazione non ha un budget', - 'rule_trigger_has_any_budget_choice' => 'Ha un budget (qualsiasi)', - 'rule_trigger_has_any_budget' => 'La transazione ha un budget (qualsiasi)', + 'rule_trigger_has_any_budget_choice' => 'Ha un (qualsiasi) budget', + 'rule_trigger_has_any_budget' => 'La transazione ha un (qualsiasi) budget', 'rule_trigger_has_no_tag_choice' => 'Non ha etichetta(e)', 'rule_trigger_has_no_tag' => 'La transazione non ha etichetta(e)', 'rule_trigger_has_any_tag_choice' => 'Ha una o più etichette (qualsiasi)', @@ -420,7 +422,7 @@ return [ 'rule_for_bill_title' => 'Regole generata automaticamente per la bolletta ":name"', 'rule_for_bill_description' => 'Questa regola è generata automaticamente per l\'abbinamento con la bolletta ":name".', 'create_rule_for_bill' => 'Crea una nuova regola per la bolletta ":name"', - 'create_rule_for_bill_txt' => 'Contratulazioni, hai appena creato una nuova bolletta chiamata ":name"! Firefly III può automagicamente abbinare le nuove uscite a questa bolletta. Per esempio, ogni volta che paghi l\'affitto la bolletta "affitto" verrà collegata a questa spesa. In questo modo Firefly III può visualizzare con accuratezza quali bollette sono in scadenza e quali no. Per far ciò è necessario creare una nuova regola. Firefly III ha inserito al posto tuo alcuni dettagli ragionevoli. Assicurati che questi siano corretti. Se questi valori sono corretti, Firefly III automaticamente collegherà la spesa giusta alla bolletta giusta. Controlla che i trigger siano corretti e aggiungene altri se sono sbagliati.', + 'create_rule_for_bill_txt' => 'Contratulazioni, hai appena creato una nuova bolletta chiamata ":name"! Firefly III può automagicamente abbinare le nuove uscite a questa bolletta. Per esempio, ogni volta che paghi l\'affitto la bolletta "affitto" verrà collegata a questa spesa. In questo modo Firefly III può visualizzare con accuratezza quali bollette sono in scadenza e quali no. Per far ciò è necessario creare una nuova regola. Firefly III ha inserito al posto tuo alcuni dettagli ragionevoli. Assicurati che questi siano corretti. Se questi valori sono corretti, Firefly III automaticamente collegherà il prelievo giusto alla bolletta giusta. Controlla che i trigger siano corretti e aggiungene altri se sono sbagliati.', 'new_rule_for_bill_title' => 'Regola per la bolletta ":name"', 'new_rule_for_bill_description' => 'Questa regola contrassegna le transazioni per la bolletta ":name".', @@ -541,7 +543,7 @@ return [ 'attachment_deleted' => 'Allegato eliminato ":name"', 'attachment_updated' => 'Allegato aggiornato ":name"', 'upload_max_file_size' => 'Dimensione massima del file: :size', - 'list_all_attachments' => 'List of all attachments', + 'list_all_attachments' => 'Lista di tutti gli allegati', // transaction index 'title_expenses' => 'Spese', @@ -554,42 +556,42 @@ return [ // convert stuff: 'convert_is_already_type_Withdrawal' => 'Questa transazione è già un prelievo', 'convert_is_already_type_Deposit' => 'Questa transazione è già un deposito', - 'convert_is_already_type_Transfer' => 'Questa transazione è già un giroconto', + 'convert_is_already_type_Transfer' => 'Questa transazione è già un trasferimento', 'convert_to_Withdrawal' => 'Converti ":description" in un prelievo', 'convert_to_Deposit' => 'Converti ":description" in un deposito', - 'convert_to_Transfer' => 'Converti ":description" in un giroconto', - 'convert_options_WithdrawalDeposit' => 'Convertire un prelievo in un deposito', - 'convert_options_WithdrawalTransfer' => 'Convertire un prelievo in un giroconto', - 'convert_options_DepositTransfer' => 'Convertire un deposito in un giroconto', + 'convert_to_Transfer' => 'Converti ":description" in un trasferimento', + 'convert_options_WithdrawalDeposit' => 'Converti un prelievo in un deposito', + 'convert_options_WithdrawalTransfer' => 'Converti un prelievo in un trasferimento', + 'convert_options_DepositTransfer' => 'Converti un deposito in un trasferimento', 'convert_options_DepositWithdrawal' => 'Converti un deposito in un prelievo', - 'convert_options_TransferWithdrawal' => 'Convertire un giroconto in un prelievo', + 'convert_options_TransferWithdrawal' => 'Converti un trasferimento in un prelievo', 'convert_options_TransferDeposit' => 'Converti un bonifico in un deposito', 'convert_Withdrawal_to_deposit' => 'Converti questo prelievo in un deposito', - 'convert_Withdrawal_to_transfer' => 'Converti questo prelievo in un giroconto', + 'convert_Withdrawal_to_transfer' => 'Converti questo prelievo in un trasferimento', 'convert_Deposit_to_withdrawal' => 'Converti questo deposito in un prelievo', - 'convert_Deposit_to_transfer' => 'Converti questo deposito in un giroconto', - 'convert_Transfer_to_deposit' => 'Converti questo giroconto in un deposito', - 'convert_Transfer_to_withdrawal' => 'Converti questo giroconto in un prelievo', + 'convert_Deposit_to_transfer' => 'Converti questo deposito in un trasferimento', + 'convert_Transfer_to_deposit' => 'Converti questo trasferimento in un deposito', + 'convert_Transfer_to_withdrawal' => 'Converti questo trasferimento in un prelievo', 'convert_please_set_revenue_source' => 'Si prega di scegliere il conto delle entrate da dove verranno i soldi.', 'convert_please_set_asset_destination' => 'Si prega di scegliere il conto patrimoniale dove andranno i soldi.', 'convert_please_set_expense_destination' => 'Si prega di scegliere il conto spese dove andranno i soldi.', 'convert_please_set_asset_source' => 'Si prega di scegliere il conto patrimoniale da dove verranno i soldi.', 'convert_explanation_withdrawal_deposit' => 'Se converti questo prelievo in un deposito, l\'importo verrà :amount depositato in :sourceName anziché prelevato da esso.', - 'convert_explanation_withdrawal_transfer' => 'Se converti questo prelievo in un giroconto, l\'importo verrà :amount trasferito da :sourceName a un nuovo conto attività, invece di essere pagato a :destinationName.', + 'convert_explanation_withdrawal_transfer' => 'Se converti questo prelievo in un trasferimento, l\'importo verrà :amount trasferito da :sourceName a un nuovo conto attività, invece di essere pagato a :destinationName.', 'convert_explanation_deposit_withdrawal' => 'Se converti questo deposito in un prelievo, l\'importo verrà rimosso :amount da :destinationName anziché aggiunto ad esso.', - 'convert_explanation_deposit_transfer' => 'Se converti questo deposito in un giroconto, :amount verrà trasferito da un conto attivo di tua scelta in :destinationName.', - 'convert_explanation_transfer_withdrawal' => 'Se converti questo giroconto in un prelievo, l\'importo :amount andrà da :sourceName a una nuova destinazione a titolo di spesa, anziché a :destinationName come giroconto.', - 'convert_explanation_transfer_deposit' => 'Se converti questo giroconto in un deposito, :amount verrà depositato nell\'account :destinationName anziché essere trasferito lì.', + 'convert_explanation_deposit_transfer' => 'Se converti questo deposito in un trasferimento, :amount verrà trasferito da un conto attivo di tua scelta in :destinationName.', + 'convert_explanation_transfer_withdrawal' => 'Se converti questo trasferimento in un prelievo, l\'importo :amount andrà da :sourceName a una nuova destinazione a titolo di spesa, anziché a :destinationName come trasferimento.', + 'convert_explanation_transfer_deposit' => 'Se converti questo trasferimento in un deposito, :amount verrà depositato nell\'account :destinationName anziché essere trasferito lì.', 'converted_to_Withdrawal' => 'La transazione è stata convertita in un prelievo', 'converted_to_Deposit' => 'La transazione è stata convertita in un deposito', - 'converted_to_Transfer' => 'La transazione è stata convertita in un giroconto', + 'converted_to_Transfer' => 'La transazione è stata convertita in un trasferimento', 'invalid_convert_selection' => 'Tl\'account che hai selezionato è già utilizzato in questa transazione o non esiste.', 'source_or_dest_invalid' => 'Impossibile trovare i dettagli corretti della transazione. Non è possibile effettuare la conversione.', // create new stuff: 'create_new_withdrawal' => 'Crea un nuovo prelievo', 'create_new_deposit' => 'Crea una nuova entrata', - 'create_new_transfer' => 'Crea nuovo giroconto', + 'create_new_transfer' => 'Crea nuovo trasferimento', 'create_new_asset' => 'Crea un nuovo conto attività', 'create_new_expense' => 'Crea un nuovo conto di spesa', 'create_new_revenue' => 'Crea un nuovo conto di entrate', @@ -666,6 +668,7 @@ return [ 'bill_will_automatch' => 'La bolletta verrà automaticamente collegata alle transazioni corrispondenti', 'skips_over' => 'salta sopra', 'bill_store_error' => 'Si è verificato un errore imprevisto durante la memorizzazione della nuova bolletta. Controlla i file di log', + 'list_inactive_rule' => 'regola inattiva', // accounts: 'details_for_asset' => 'Dettagli per conto attività ":name"', @@ -765,16 +768,16 @@ return [ // transactions: 'update_withdrawal' => 'Aggiorna spesa', 'update_deposit' => 'Aggiorna entrata', - 'update_transfer' => 'Aggiorna giroconto', + 'update_transfer' => 'Aggiorna trasferimento', 'updated_withdrawal' => 'Spesa aggiornata ":description"', 'updated_deposit' => 'Entrata aggiornata ":description"', - 'updated_transfer' => 'Giroconto aggiornato ":description"', + 'updated_transfer' => 'Trasferimento ":description" aggiornato', 'delete_withdrawal' => 'Elimina spesa ":description"', 'delete_deposit' => 'Elimina entrata ":description"', - 'delete_transfer' => 'Elimina giroconto ":description"', + 'delete_transfer' => 'Elimina trasferimento ":description"', 'deleted_withdrawal' => 'Spesa eliminata correttamente ":description"', 'deleted_deposit' => 'Entrata eliminata correttamente ":description"', - 'deleted_transfer' => 'Giroconto eliminato correttamente ":description"', + 'deleted_transfer' => 'Trasferimento ":description" eliminato correttamente', 'stored_journal' => 'Nuova transazione creata correttamente ":description"', 'select_transactions' => 'Seleziona transazioni', 'rule_group_select_transactions' => 'Applica ":title" a transazioni', @@ -801,6 +804,7 @@ return [ 'opt_group_savingAsset' => 'Conti risparmio', 'opt_group_sharedAsset' => 'Conti risorse condivise', 'opt_group_ccAsset' => 'Carte di credito', + 'opt_group_cashWalletAsset' => 'Contanti', 'notes' => 'Note', 'unknown_journal_error' => 'Impossibile memorizzare la transazione. Controllare i file di log.', @@ -816,6 +820,7 @@ return [ 'language' => 'Lingua', 'new_savings_account' => 'Conto di risparmio :bank_name', 'cash_wallet' => 'Contanti', + 'currency_not_present' => 'If the currency you normally use is not listed do not worry. You can create your own currencies under Options > Currencies.', // home page: 'yourAccounts' => 'I tuoi conti', @@ -823,7 +828,7 @@ return [ 'savings' => 'Risparmi', 'newWithdrawal' => 'Nuova uscita', 'newDeposit' => 'Nuovo deposito', - 'newTransfer' => 'Nuovo giroconto', + 'newTransfer' => 'Nuovo trasferimento', 'bills_to_pay' => 'Bollette da pagare', 'per_day' => 'Al giorno', 'left_to_spend_per_day' => 'Spese al giorno', @@ -858,10 +863,10 @@ return [ 'opening_balance' => 'Saldo di apertura', 'deposit' => 'Entrata', 'account' => 'Conto', - 'transfer' => 'Giroconto', + 'transfer' => 'Trasferimento', 'Withdrawal' => 'Spesa', 'Deposit' => 'Entrata', - 'Transfer' => 'Giroconto', + 'Transfer' => 'Trasferimento', 'bill' => 'Bolletta', 'yes' => 'Si', 'no' => 'No', @@ -1013,6 +1018,7 @@ return [ 'remove_money_from_piggy_title' => 'Rimuovi i soldi dal salvadanaio ":name"', 'add' => 'Aggiungi', 'no_money_for_piggy' => 'non hai soldi da mettere in questo salvadanaio.', + 'suggested_savings_per_month' => 'Suggested per month', 'remove' => 'Rimuovi', 'max_amount_add' => 'L\'importo massimo che puoi aggiungere è', @@ -1083,7 +1089,7 @@ return [ 'send_test_email' => 'Invia un messaggio di posta elettronica di prova', 'send_test_email_text' => 'Per vedere se la tua installazione è in grado di inviare e-mail, ti preghiamo di premere questo pulsante. Qui non vedrai un errore (se presente), i file di log rifletteranno eventuali errori. Puoi premere questo pulsante tutte le volte che vuoi. Non c\'è controllo dello spam. Il messaggio verrà inviato a :email e dovrebbe arrivare a breve.', 'send_message' => 'Invia messaggio', - 'send_test_triggered' => 'Il test è stato attivato. Controlla la tua casella di posta e i file di registro.', + 'send_test_triggered' => 'Il test è stato attivato. Controlla la tua casella di posta e i file di log.', // links 'journal_link_configuration' => 'Configurazione dei collegamenti di transazione', @@ -1115,7 +1121,7 @@ return [ 'journal_links' => 'Collegamenti di transazione', 'this_withdrawal' => 'Questa spesa', 'this_deposit' => 'Questa entrata', - 'this_transfer' => 'Questo giroconto', + 'this_transfer' => 'Questo trasferimento', 'overview_for_link' => 'Panoramica per tipo di collegamento ":name"', 'source_transaction' => 'Transazione di origine', 'link_description' => 'Descrizione del collegamento', @@ -1140,7 +1146,7 @@ return [ 'do_split' => 'Fai una divisione', 'split_this_withdrawal' => 'Dividi questa spesa', 'split_this_deposit' => 'Dividi questa entrata', - 'split_this_transfer' => 'Dividi questo giroconto', + 'split_this_transfer' => 'Dividi questo trasferimento', 'cannot_edit_multiple_source' => 'Non è possibile modificare la transazione n. #:id con la descrizione ":description" perché contiene più conti di origine.', 'cannot_edit_multiple_dest' => 'Non è possibile modificare la transazione n. #:id con la descrizione ":description" perché contiene più conti di destinazione.', 'cannot_edit_reconciled' => 'Non è possibile modificare la transazione n. #:id con la descrizione ":description" perché è stata contrassegnata come riconciliata.', @@ -1148,27 +1154,9 @@ return [ 'no_edit_multiple_left' => 'Non hai selezionato transazioni valide da modificare.', 'cannot_convert_split_journal' => 'Impossibile convertire una transazione divisa', - // import bread crumbs and titles: - 'import' => 'Importa', - 'import_data' => 'Importa i dati', - 'import_general_index_file' => 'Importa un file', - 'import_from_bunq' => 'Importare dal bunq', - 'import_using_spectre' => 'Importa usando Spettro', - 'import_using_plaid' => 'Importa usando Plaid', - 'import_config_bread_crumb' => 'Configura la tua importazione', - - // import index page: + // Import page (general strings only) 'import_index_title' => 'Importa i dati in Firefly III', - 'import_index_sub_title' => 'Indice', - 'import_general_index_intro' => 'Benvenuti nella routine di importazione di Firefly III. Esistono alcuni modi per importare dati in Firefly III, visualizzati qui come pulsanti.', - 'upload_error' => 'Il file che hai caricato non può essere elaborato. Probabilmente è un tipo di file o una codifica non valida. I file di log avranno maggiori informazioni.', - 'reset_import_settings_title' => 'Reimposta la configurazione di importazione', - 'reset_import_settings_text' => 'Puoi utilizzare questi collegamenti per ripristinare le impostazioni di importazione per specifici fornitori. Ciò è utile quando delle impostazioni errate impediscono l\'importazione dei dati.', - 'reset_settings_bunq' => 'Rimuovi la chiave API di bunq, l\'indirizzo IP locale esterno e le chiavi RSA correlate a bunq.', - 'reset_settings_spectre' => 'Rimuovi i segreti e gli ID di Spectre. Questo rimuoverà anche la tua coppia di chiavi di Spectre. Ricordati di aggiornare quella nuova.', - 'settings_reset_for_bunq' => 'Ripristina impostazioni bunq.', - 'settings_reset_for_spectre' => 'Ripristina impostazioni Spectre.', - + 'import_data' => 'Importa i dati', // sandstorm.io errors and messages: 'sandstorm_not_available' => 'Questa funzione non è disponibile quando si utilizza Firefly III in un ambiente Sandstorm.io.', @@ -1206,10 +1194,10 @@ return [ 'no_transactions_intro_deposit' => 'non hai ancora entrate registrate. È necessario creare voci di reddito per iniziare a gestire le tue finanze.', 'no_transactions_imperative_deposit' => 'Hai ricevuto dei soldi? Dovresti scriverlo:', 'no_transactions_create_deposit' => 'Crea una entrata', - 'no_transactions_title_transfers' => 'Creiamo un giroconto!', - 'no_transactions_intro_transfers' => 'Non hai ancora giroconti. Quando sposti denaro tra i conti attività, viene registrato come giroconto.', + 'no_transactions_title_transfers' => 'Creiamo un trasferimento!', + 'no_transactions_intro_transfers' => 'Non hai ancora trasferimenti. Quando sposti denaro tra i conti attività, viene registrato come trasferimento.', 'no_transactions_imperative_transfers' => 'Hai spostato dei soldi in giro? Dovresti scriverlo:', - 'no_transactions_create_transfers' => 'Crea un giroconto', + 'no_transactions_create_transfers' => 'Crea un trasferimento', 'no_piggies_title_default' => 'Creiamo un salvadanaio!', 'no_piggies_intro_default' => 'Non hai ancora salvadanai. Puoi creare salvadanai per dividere i tuoi risparmi e tenere traccia di ciò per cui stai risparmiando.', 'no_piggies_imperative_default' => 'Hai cose per le quali stai risparmiando? Crea un salvadanaio e tieni traccia:', diff --git a/resources/lang/it_IT/form.php b/resources/lang/it_IT/form.php index bf73d83fa4..2c47c1601f 100644 --- a/resources/lang/it_IT/form.php +++ b/resources/lang/it_IT/form.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // new user: 'bank_name' => 'Nome banca', @@ -91,7 +92,7 @@ return [ 'type' => 'Tipo', 'convert_Withdrawal' => 'Converti spesa', 'convert_Deposit' => 'Converti entrata', - 'convert_Transfer' => 'Converti giroconto', + 'convert_Transfer' => 'Converti trasferimento', 'amount' => 'Importo', 'foreign_amount' => 'Importo estero', @@ -184,6 +185,13 @@ return [ 'blocked' => 'È bloccato?', 'blocked_code' => 'Motivo del blocco', + // import + 'apply_rules' => 'Applica regole', + 'artist' => 'Artista', + 'album' => 'Album', + 'song' => 'Brano', + + // admin 'domain' => 'Dominio', 'single_user_mode' => 'Disabilita registrazione utente', @@ -202,8 +210,8 @@ return [ 'client_id' => 'ID Client', 'service_secret' => 'Servizio segreto', 'app_secret' => 'App segreto', - 'app_id' => 'App ID', - 'secret' => 'Secret', + 'app_id' => 'ID dell\'app', + 'secret' => 'Segreto', 'public_key' => 'Chiave Pubblica', 'country_code' => 'Codice Nazione', 'provider_code' => 'Banca o fornitore di dati', diff --git a/resources/lang/it_IT/import.php b/resources/lang/it_IT/import.php index 7b0b61a277..d91182b40d 100644 --- a/resources/lang/it_IT/import.php +++ b/resources/lang/it_IT/import.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ - // status of import: + // ALL breadcrumbs and subtitles: + 'index_breadcrumb' => 'Importa i dati in Firefly III', + 'prerequisites_breadcrumb_fake' => 'Prerequisiti per il fornitore di importazione fittizio', + 'prerequisites_breadcrumb_spectre' => 'Prerequisiti per Spectre', + 'prerequisites_breadcrumb_bunq' => 'Prerequisiti per bunq', + 'job_configuration_breadcrumb' => 'Configurazione per ":key"', + 'job_status_breadcrumb' => 'Stato di importazione per ":key"', + 'cannot_create_for_provider' => 'Firefly III non può creare un lavoro per il provider ":provider".', + + // index page: + 'general_index_title' => 'Importa un file', + 'general_index_intro' => 'Benvenuti nella routine di importazione di Firefly III. Esistono alcuni modi per importare dati in Firefly III, visualizzati qui come pulsanti.', + // import provider strings (index): + 'button_fake' => 'Esegui un\'importazione fittizia', + 'button_file' => 'Importa un file', + 'button_bunq' => 'Importa da bunq', + 'button_spectre' => 'Importa usando Spectre', + 'button_plaid' => 'Importa usando Plaid', + 'button_yodlee' => 'Importa usando Yodlee', + 'button_quovo' => 'Importa usando Quovo', + // global config box (index) + 'global_config_title' => 'Configurazione globale di importazione', + 'global_config_text' => 'In futuro, questo riquadro presenterà le preferenze che si applicano a TUTTI i fornitori di importazione di cui sopra.', + // prerequisites box (index) + 'need_prereq_title' => 'Prerequisiti di importazione', + 'need_prereq_intro' => 'Alcuni metodi di importazione richiedono la tua attenzione prima che possano essere utilizzati. Ad esempio, potrebbero richiedere speciali chiavi API o segreti dell\'applicazione. Puoi configurarli qui. L\'icona indica se questi prerequisiti sono stati soddisfatti.', + 'do_prereq_fake' => 'Prerequisiti per il fornitore fittizio', + 'do_prereq_file' => 'Prerequisiti per le importazioni da file', + 'do_prereq_bunq' => 'Prerequisiti per le importazioni da bunq', + 'do_prereq_spectre' => 'Prerequisiti per le importazioni usando Spectre', + 'do_prereq_plaid' => 'Prerequisiti per le importazioni usando Plaid', + 'do_prereq_yodlee' => 'Prerequisiti per le importazioni usando Yodlee', + 'do_prereq_quovo' => 'Prerequisiti per le importazioni usando Quovo', + // provider config box (index) + 'can_config_title' => 'Configurazione di importazione', + 'can_config_intro' => 'Alcuni metodi di importazione possono essere configurati a tuo piacimento. Hanno ulteriori impostazioni che puoi modificare.', + 'do_config_fake' => 'Configurazione per il fornitore fittizio', + 'do_config_file' => 'Configurazione per le importazioni da file', + 'do_config_bunq' => 'Configurazione per le importazioni da bunq', + 'do_config_spectre' => 'Configurazione per importazioni da Spectre', + 'do_config_plaid' => 'Configurazione per importazioni da Plaid', + 'do_config_yodlee' => 'Configurazione per importazioni da Yodlee', + 'do_config_quovo' => 'Configurazione per importazioni da Quovo', + + // prerequisites: + 'prereq_fake_title' => 'Prerequisiti per un\'importazione dal fornitore di importazione fittizio', + 'prereq_fake_text' => 'Questo provider fittizio richiede una chiave API fittizia. Deve contenere 32 caratteri. È possibile utilizzare questa: 123456789012345678901234567890AA', + 'prereq_spectre_title' => 'Prerequisiti per un\'importazione utilizzando le API di Spectre', + 'prereq_spectre_text' => 'Per l\'importazione dei dati attraverso le API Spectre (v4), devi fornire a Firefly III due valori segreti. Questi si possono trovare nella pagina dei segreti.', + 'prereq_spectre_pub' => 'Allo stesso modo, l\'API Spectre deve conoscere la chiave pubblica che vedi qui sotto. Senza di essa, non ti riconoscerà. Per favore inserisci questa chiave pubblica nella tua pagina dei segreti.', + 'prereq_bunq_title' => 'Prerequisiti per un\'importazione da bunq', + 'prereq_bunq_text' => 'Per importare da bunq, è necessario ottenere una chiave API. Puoi farlo attraverso l\'app. Si noti che la funzione di importazione per bunq è in BETA. È stato testato solo contro l\'API sandbox.', + 'prereq_bunq_ip' => 'bunq richiede il tuo indirizzo IP esterno. Firefly III ha provato a riempire questo campo utilizzando il servizio ipify. Assicurati che questo indirizzo IP sia corretto altrimenti l\'importazione fallirà.', + // prerequisites success messages: + 'prerequisites_saved_for_fake' => 'Chiave API fittizia memorizzata correttamente!', + 'prerequisites_saved_for_spectre' => 'ID dell\'app e segreto memorizzati!', + 'prerequisites_saved_for_bunq' => 'Chiave API e IP memorizzati!', + + // job configuration: + 'job_config_apply_rules_title' => 'Configurazione del lavoro - applicare le tue regole?', + 'job_config_apply_rules_text' => 'Una volta avviato il fornitore fittizio, le tue regole possono essere applicate alle transazioni. Questo aggiunge del tempo all\'importazione.', + 'job_config_input' => 'Il tuo input', + // job configuration for the fake provider: + 'job_config_fake_artist_title' => 'Inserisci il nome dell\'album', + 'job_config_fake_artist_text' => 'Molte routine di importazione presentano alcuni passaggi di configurazione da eseguire. Nel caso del fornitore di importazione fittizio, è necessario rispondere ad alcune domande strane. In questo caso, inserire "David Bowie" per continuare.', + 'job_config_fake_song_title' => 'Inserisci il nome del brano', + 'job_config_fake_song_text' => 'Menziona la canzone "Golden years" per continuare con l\'importazione fittizia.', + 'job_config_fake_album_title' => 'Inserisci il nome dell\'album', + 'job_config_fake_album_text' => 'Alcune routine di importazione richiedono dati aggiuntivi a metà dell\'importazione. Nel caso del fornitore di importazione fittizio, è necessario rispondere ad alcune domande strane. Inserire "Station to station" per continuare.', + // job configuration form the file provider + 'job_config_file_upload_title' => 'Configurazione importazione (1/4) - Carica il tuo file', + 'job_config_file_upload_text' => 'Questa routine ti aiuterà a importare i file dalla tua banca in Firefly III. ', + 'job_config_file_upload_help' => 'Seleziona il tuo file. Assicurati che il file sia codificato in UTF-8.', + 'job_config_file_upload_config_help' => 'Se hai precedentemente importato i dati in Firefly III, potresti avere un file di configurazione, che preimposterà i valori di configurazione per te. Per alcune banche, altri utenti hanno gentilmente fornito il loro file di configurazione', + 'job_config_file_upload_type_help' => 'Seleziona il tipo di file che caricherai', + 'job_config_file_upload_submit' => 'Carica i file', + 'import_file_type_csv' => 'CSV (valori separati da virgola)', + 'file_not_utf8' => 'Il file che hai caricato non è codificato come UTF-8 o ASCII. Firefly III non può gestire tali file. Utilizzare Notepad++ o Sublime per convertire il file in UTF-8.', + 'job_config_uc_title' => 'Configurazione di importazione (2/4) - Impostazione di base dei file', + 'job_config_uc_text' => 'Per poter importare correttamente il tuo file, ti preghiamo di convalidare le opzioni di seguito.', + 'job_config_uc_header_help' => 'Seleziona questa casella se la prima riga del tuo file CSV sono i titoli delle colonne.', + 'job_config_uc_date_help' => 'Formato della data e ora nel tuo file. Segui il formato indicato in questa pagina. Il valore predefinito analizzerà le date che assomigliano a questa: :dateExample.', + 'job_config_uc_delimiter_help' => 'Scegli il delimitatore di campo che viene utilizzato nel file di ingresso. Se non si è sicuri, la virgola è l\'opzione più sicura.', + 'job_config_uc_account_help' => 'Se il tuo file NON contiene informazioni sui tuoi conti di attività, utilizza questo menu a discesa per selezionare a quale conto appartengono le transazioni nel file.', + 'job_config_uc_apply_rules_title' => 'Applica regole', + 'job_config_uc_apply_rules_text' => 'Applica le tue regole ad ogni transazione importata. Si noti che questo rallenta l\'importazione in modo significativo.', + 'job_config_uc_specifics_title' => 'Opzioni specifiche della banca', + 'job_config_uc_specifics_txt' => 'Alcune banche forniscono file formattati in modo errato. Firefly III può sistemarli automaticamente. Se la tua banca rende disponibili tali file ma non è elencata qui, ti preghiamo di segnalare il problema su GitHub.', + 'job_config_uc_submit' => 'Continua', + 'invalid_import_account' => 'Hai selezionato un conto non valido su cui effettuare l\'importazione.', + // job configuration for Spectre: + 'job_config_spectre_login_title' => 'Scegli il tuo login', + 'job_config_spectre_login_text' => 'Firefly III ha rilevato :count login esistenti nel tuo account Spectre. Quale vorresti usare per l\'importazione?', + 'spectre_login_status_active' => 'Attivo', + 'spectre_login_status_inactive' => 'Inattivo', + 'spectre_login_status_disabled' => 'Disabilitato', + 'spectre_login_new_login' => 'Accedi con un\'altra banca o con una di queste banche con credenziali diverse.', + 'job_config_spectre_accounts_title' => 'Seleziona i conti dai quali importare', + 'job_config_spectre_accounts_text' => 'Hai selezionato ":name" (:country). Hai :count conti disponibili da questo fornitore. Seleziona i conti attività di Firefly III in cui devono essere memorizzate le transazioni da questi conti. Ricorda che, per importare i dati, sia l\'account Firefly III sia l\'account ":name" devono avere la stessa valuta.', + 'spectre_no_supported_accounts' => 'Non puoi importare da questo conto perché le valute non corrispondono.', + 'spectre_do_not_import' => '(non importare)', + 'spectre_no_mapping' => 'Sembra che tu non abbia selezionato nessun account da cui importare.', + 'imported_from_account' => 'Importato da ":account"', + 'spectre_account_with_number' => 'Conto :number', + // job configuration for bunq: + 'job_config_bunq_accounts_title' => 'Account bunq', + 'job_config_bunq_accounts_text' => 'Questi sono i conti associati al tuo account bunq. Seleziona i conti dai quali vuoi effettuare l\'importazione e in quale conto devono essere importate le transazioni.', + 'bunq_no_mapping' => 'Sembra che tu non abbia selezionato nessun account.', + 'should_download_config' => 'You should download the configuration file for this job. This will make future imports way easier.', + 'share_config_file' => 'If you have imported data from a public bank, you should share your configuration file so it will be easy for other users to import their data. Sharing your configuration file will not expose your financial details.', + + // keys from "extra" array: + 'spectre_extra_key_iban' => 'IBAN', + 'spectre_extra_key_swift' => 'SWIFT', + 'spectre_extra_key_status' => 'Stato', + 'spectre_extra_key_card_type' => 'Tipo carta', + 'spectre_extra_key_account_name' => 'Nome conto', + 'spectre_extra_key_client_name' => 'Nome cliente', + 'spectre_extra_key_account_number' => 'Numero conto', + 'spectre_extra_key_blocked_amount' => 'Importo bloccato', + 'spectre_extra_key_available_amount' => 'Importo disponibile', + 'spectre_extra_key_credit_limit' => 'Limite di credito', + 'spectre_extra_key_interest_rate' => 'Tasso d\'interesse', + 'spectre_extra_key_expiry_date' => 'Data scadenza', + 'spectre_extra_key_open_date' => 'Data apertura', + 'spectre_extra_key_current_time' => 'Ora corrente', + 'spectre_extra_key_current_date' => 'Data corrente', + 'spectre_extra_key_cards' => 'Carte', + 'spectre_extra_key_units' => 'Unità', + 'spectre_extra_key_unit_price' => 'Prezzo unitario', + 'spectre_extra_key_transactions_count' => 'Conteggio transazioni', + + // specifics: + 'specific_ing_name' => 'ING NL', + 'specific_ing_descr' => 'Crea descrizioni migliori nelle esportazioni ING', + 'specific_sns_name' => 'SNS / Volksbank NL', + 'specific_sns_descr' => 'Elimina le virgolette dai file di esportazione di SNS / Volksbank', + 'specific_abn_name' => 'ABN AMRO NL', + 'specific_abn_descr' => 'Risolvi i possibili problemi con i file ABN AMRO', + 'specific_rabo_name' => 'Rabobank NL', + 'specific_rabo_descr' => 'Risolvi i possibili problemi con i file Rabobank', + 'specific_pres_name' => 'CA finanziaria scelta dal Presidente', + 'specific_pres_descr' => 'Risolvi i possibili problemi con i file da PC', + // job configuration for file provider (stage: roles) + 'job_config_roles_title' => 'Configurazione di importazione (3/4) - Definisci il ruolo di ogni colonna', + 'job_config_roles_text' => 'Ogni colonna nel tuo file CSV contiene determinati dati. Si prega di indicare il tipo di dati che l\'importatore dovrebbe aspettarsi. L\'opzione per "mappare" i dati significa che collegherete ogni voce trovata nella colonna con un valore nel vostro database. Una colonna spesso mappata è la colonna che contiene l\'IBAN del conto. Questo può essere facilmente abbinato all\'IBAN già presente nel tuo database.', + 'job_config_roles_submit' => 'Continua', + 'job_config_roles_column_name' => 'Nome della colonna', + 'job_config_roles_column_example' => 'Dati di esempio della colonna', + 'job_config_roles_column_role' => 'Significato dei dati della colonna', + 'job_config_roles_do_map_value' => 'Mappa questi valori', + 'job_config_roles_no_example' => 'Nessun dato di esempio disponibile', + 'job_config_roles_fa_warning' => 'Se contrassegni una colonna come contenente un importo in una valuta straniera, devi anche impostare la colonna che contiene di quale valuta si tratta.', + 'job_config_roles_rwarning' => 'Come minimo, contrassegna una colonna come colonna dell\'importo. Si consiglia di selezionare anche una colonna per la descrizione, la data e il conto opposto.', + 'job_config_roles_colum_count' => 'Colonna', + // job config for the file provider (stage: mapping): + 'job_config_map_title' => 'Configurazione di importazione (4/4) - Collega i dati importati con i dati di Firefly III', + 'job_config_map_text' => 'Nelle seguenti tabelle, il valore a sinistra mostra le informazioni trovate nel file caricato. È tuo compito mappare questo valore, se possibile, su un valore già presente nel tuo database. Firefly si atterrà a questa mappatura. Se non ci sono valori da mappare o non si desidera mappare il valore specifico, non selezionare niente.', + 'job_config_map_nothing' => 'Non ci sono dati presenti nel tuo file che puoi mappare a valori esistenti. Si prega di premere "Inizia l\'importazione" per continuare.', + 'job_config_field_value' => 'Valore campo', + 'job_config_field_mapped' => 'Mappato a', + 'map_do_not_map' => '(non mappare)', + 'job_config_map_submit' => 'Inizia l\'importazione', + + + // import status page: + 'import_with_key' => 'Importa con chiave \':key\'', 'status_wait_title' => 'Per favore attendere...', 'status_wait_text' => 'Questa finestra si chiuderà tra un momento.', - 'status_fatal_title' => 'Si è verificato un errore irreversibile', - 'status_fatal_text' => 'Si è verificato un errore irreversibile per cui non è stato possibile ripristinare la routine di importazione. Si prega di vedere la spiegazione in rosso qui sotto.', - 'status_fatal_more' => 'Se l\'errore è un timeout, l\'importazione si sarà interrotta a metà. Per alcune configurazioni del server, o semplicemente il server che si è fermato mentre l\'importazione continua a funzionare in sottofondo. Per verificare questo, controlla il file di registro. Se il problema persiste, prendere in considerazione l\'importazione sulla riga di comando.', - 'status_ready_title' => 'L\'importazione è pronta per iniziare', - 'status_ready_text' => 'L\'importazione è pronta per iniziare. È stata eseguita tutta la configurazione necessaria. Si prega di scaricare il file di configurazione. Ti aiuterà con l\'importazione se non dovesse andare come previsto. Per eseguire effettivamente l\'importazione, è possibile eseguire il seguente comando nella console o eseguire l\'importazione basata sul Web. A seconda della configurazione, l\'importazione della console ti darà più feedback.', - 'status_ready_noconfig_text' => 'L\'importazione è pronta per iniziare. È stata eseguita tutta la configurazione necessaria. Per eseguire effettivamente l\'importazione, è possibile eseguire il seguente comando nella console o eseguire l\'importazione basata sul Web. A seconda della configurazione, l\'importazione della console ti darà più feedback.', - 'status_ready_config' => 'Scarica configurazione', - 'status_ready_start' => 'Inizia l\'importazione', - 'status_ready_share' => 'Ti preghiamo di considerare di scaricare la tua configurazione e di condividerla nel centro di configurazione dell\'importazione. Ciò consentirà ad altri utenti di Firefly III di importare i propri file più facilmente.', - 'status_job_new' => 'Il lavoro è nuovo di zecca.', - 'status_job_configuring' => 'L\'importazione è in fase di configurazione.', - 'status_job_configured' => 'L\'importazione è configurata.', - 'status_job_running' => 'L\'importazione è in esecuzione... Attendere...', - 'status_job_error' => 'Il lavoro ha generato un errore.', - 'status_job_finished' => 'L\'importazione è finita!', 'status_running_title' => 'L\'importazione è in esecuzione', - 'status_running_placeholder' => 'Si prega di effettuare un aggiornamento...', - 'status_finished_title' => 'Routine importa terminata', - 'status_finished_text' => 'La routine di importazione ha importato i tuoi dati.', - 'status_errors_title' => 'Errori durante l\'importazione', - 'status_errors_single' => 'Si è verificato un errore durante l\'importazione. Non sembra essere fatale.', - 'status_errors_multi' => 'Alcuni errori si sono verificati durante l\'importazione. Questi non sembrano essere fatali.', - 'status_bread_crumb' => 'Stato importazione', - 'status_sub_title' => 'Stato importazione', - 'config_sub_title' => 'Configura la tua importazione', - 'status_finished_job' => 'Le transazioni :count importate possono essere trovate nel tag :tag .', - 'status_finished_no_tag' => 'Firefly III non ha raccolto alcuna transazione dal tuo file di importazione.', - 'import_with_key' => 'Importa con chiave \':key\'', + 'status_job_running' => 'Attendere, importazione in corso...', + 'status_job_storing' => 'Attendere, memorizzazione dei dati...', + 'status_job_rules' => 'Attendere, applicazione delle regole...', + 'status_fatal_title' => 'Errore fatale', + 'status_fatal_text' => 'L\'importazione ha subito un errore irreversibile. Scusa!', + 'status_fatal_more' => 'Questo messaggio di errore (probabilmente molto criptico) è completato dai file di log, che puoi trovare sul tuo disco rigido, o nel contenitore Docker da cui esegui Firefly III.', + 'status_finished_title' => 'Importazione completata', + 'status_finished_text' => 'L\'importazione è finita.', + 'finished_with_errors' => 'Si sono verificati alcuni errori durante l\'importazione. Controllali attentamente.', + 'unknown_import_result' => 'Risultato di importazione sconosciuto', + 'result_no_transactions' => 'Nessuna transazione è stata importata. Forse erano tutte dei duplicati o semplicemente non c\'era nessuna transazione da importare. Forse i file di log possono dirti cosa è successo. Questo è normale se importi i dati regolarmente.', + 'result_one_transaction' => 'È stata importata esattamente una transazione. È memorizzata sotto l\'etichetta :tag dove è possibile ispezionarla ulteriormente.', + 'result_many_transactions' => 'Firefly III ha importato :count transazioni. Sono memorizzate sotto l\'etichetta :tag dove è possibile ispezionarle ulteriormente.', - // file, upload something - 'file_upload_title' => 'Importa configurazione (1/4) - Carica il tuo file', - 'file_upload_text' => 'Questa routine ti aiuterà a importare file dalla tua banca in Firefly III. Si prega di consultare le pagine di aiuto nell\'angolo in alto a destra.', - 'file_upload_fields' => 'Campi', - 'file_upload_help' => 'Seleziona il tuo file', - 'file_upload_config_help' => 'Se hai precedentemente importato i dati in Firefly III, potresti avere un file di configurazione, con preimpostato i valori di configurazione per te. Per alcune banche, altri utenti hanno gentilmente fornito il loro configurazione file ', - 'file_upload_type_help' => 'Seleziona il tipo di file che carichi', - 'file_upload_submit' => 'File caricati', - // file, upload types - 'import_file_type_csv' => 'CSV (valori separati da virgola)', + // general errors and warnings: + 'bad_job_status' => 'Per accedere a questa pagina, il tuo lavoro di importazione non può avere lo stato ":status".', - // file, initial config for CSV - 'csv_initial_title' => 'Importa configurazione (2/4) - Impostazione di importazione CSV di base', - 'csv_initial_text' => 'Per poter importare correttamente il tuo file, ti preghiamo di convalidare le opzioni di seguito.', - 'csv_initial_box' => 'Configurazione di importazione CSV di base', - 'csv_initial_box_title' => 'Opzioni di impostazione dell\'importazione CSV di base', - 'csv_initial_header_help' => 'Seleziona questa casella se la prima riga del tuo file CSV sono i titoli delle colonne.', - 'csv_initial_date_help' => 'Formato della data e ora nel tuo CSV. Segui il formato indica questa pagina. Il valore predefinito analizzerà le date che assomigliano a questo: :dateExample.', - 'csv_initial_delimiter_help' => 'Scegli il delimitatore di campo che viene utilizzato nel file di input. Se non si è sicuri, la virgola è l\'opzione più sicura.', - 'csv_initial_import_account_help' => 'Se il tuo file CSV NON contiene informazioni sui tuoi conti di attività, utilizza questo menu a discesa per selezionare a quale conto appartengono le transazioni nel CSV.', - 'csv_initial_submit' => 'Continua con il passo 3/4', - - // file, new options: - 'file_apply_rules_title' => 'Applica regole', - 'file_apply_rules_description' => 'Applica le tue regole. Si noti che questo rallenta l\'importazione in modo significativo.', - 'file_match_bills_title' => 'Abbina le bollette', - 'file_match_bills_description' => 'Abbina le tue bollette ai prelievi di nuova creazione. Si noti che questo rallenta l\'importazione in modo significativo.', - - // file, roles config - 'csv_roles_title' => 'Importa configurazione (3/4) - Definisci il ruolo di ogni colonna', - 'csv_roles_text' => 'Ogni colonna nel tuo file CSV contiene determinati dati. Si prega di indicare il tipo di dati che l\'importatore dovrebbe aspettarsi. L\'opzione per "mappare" i dati significa che collegherete ogni voce trovata nella colonna con un valore nel vostro database. Una colonna spesso mappata è la colonna che contiene l\'IBAN del conto. Questo può essere facilmente abbinato all\'IBAN già presente nel tuo database.', - 'csv_roles_table' => 'Tabella', - 'csv_roles_column_name' => 'Nome colonna', - 'csv_roles_column_example' => 'Colonna dati esempio', - 'csv_roles_column_role' => 'Significato dei dati di colonna', - 'csv_roles_do_map_value' => 'Mappa questi valori', - 'csv_roles_column' => 'Colonna', - 'csv_roles_no_example_data' => 'Nessun dato esempio disponibile', - 'csv_roles_submit' => 'Continua con il punto 4/4', - - // not csv, but normal warning - 'roles_warning' => 'Per lo meno, contrassegnare una colonna come colonna importo. Si consiglia di selezionare anche una colonna per la descrizione, la data e il conto avversario.', - 'foreign_amount_warning' => 'Se contrassegni una colonna come contenente un importo in una valuta straniera, devi anche impostare la colonna che contiene la valuta in cui si trova.', - - // file, map data - 'file_map_title' => 'Importa configurazione (4/4) - Collega i dati di importazione ai dati di Firefly III', - 'file_map_text' => 'Nelle seguenti tabelle, il valore a sinistra mostra le informazioni trovate nel file caricato. È tuo compito mappare questo valore, se possibile, su un valore già presente nel tuo database. Firefly si atterrà a questa mappatura. Se non ci sono valori da mappare o non si desidera mappare il valore specifico, selezionare nulla.', - 'file_map_field_value' => 'Valore campo', - 'file_map_field_mapped_to' => 'Mappato a', - 'map_do_not_map' => '(non mappare)', - 'file_map_submit' => 'Inizia l\'importazione', - 'file_nothing_to_map' => 'Non ci sono dati presenti nel tuo file che puoi mappare a valori esistenti. Si prega di premere "Inizia l\'importazione" per continuare.', - - // map things. + // column roles for CSV import: 'column__ignore' => '(ignora questa colonna)', 'column_account-iban' => 'Conto patrimonio (IBAN)', 'column_account-id' => 'Conto patrimonio ID (matching FF3)', @@ -147,10 +250,10 @@ return [ 'column_sepa-ct-id' => 'ID end-to-end del bonifico SEPA', 'column_sepa-ct-op' => 'Conto opposto bonifico SEPA', 'column_sepa-db' => 'Addebito diretto SEPA', - 'column_sepa-cc' => 'SEPA Clearing Code', - 'column_sepa-ci' => 'SEPA Creditor Identifier', + 'column_sepa-cc' => 'Codice Compensazione SEPA', + 'column_sepa-ci' => 'Identificativo Creditore SEPA', 'column_sepa-ep' => 'SEPA External Purpose', - 'column_sepa-country' => 'SEPA Country Code', + 'column_sepa-country' => 'Codice Paese SEPA', 'column_tags-comma' => 'Etichette (separate da virgola)', 'column_tags-space' => 'Etichette (separate con spazio)', 'column_account-number' => 'Conto patrimonio (numero conto)', @@ -158,48 +261,4 @@ return [ 'column_note' => 'Nota(e)', 'column_internal-reference' => 'Riferimento interno', - // prerequisites - 'prerequisites' => 'Prerequisiti', - - // bunq - 'bunq_prerequisites_title' => 'Prerequisiti per un\'importazione da bunq', - 'bunq_prerequisites_text' => 'Per importare da bunq, è necessario ottenere una chiave API. Puoi farlo attraverso l\'applicazione.', - 'bunq_prerequisites_text_ip' => 'Bunq richiede il tuo indirizzo IP esterno. Firefly III ha provato a riempire questo campo utilizzando il servizio ipify. Assicurati che questo indirizzo IP sia corretto altrimenti l\'importazione fallirà.', - 'bunq_do_import' => 'Sì, importa da questo conto', - 'bunq_accounts_title' => 'Conti Bunq', - 'bunq_accounts_text' => 'Questi sono i conti associati al tuo conto Bunq. Seleziona i conti dai quali vuoi effettuare l\'importazione e in quale conto devono essere importate le transazioni.', - - // Spectre - 'spectre_title' => 'Importa usando uno Spectre', - 'spectre_prerequisites_title' => 'Prerequisiti per un\'importazione utilizzando Spectre', - 'spectre_prerequisites_text' => 'In order to import data using the Spectre API (v4), you must provide Firefly III with two secret values. They can be found on the secrets page.', - 'spectre_enter_pub_key' => 'The import will only work when you enter this public key on your secrets page.', - 'spectre_accounts_title' => 'Seleziona i conti dai quali importare', - 'spectre_accounts_text' => 'Ogni account sulla sinistra in basso è stato trovato da Spectre e può essere importato in Firefly III. Seleziona il conto attività che dovrebbe contenere una determinata transazione. Se non desideri importare da un conto specifico, rimuovi il segno di spunta dalla casella di controllo.', - 'spectre_do_import' => 'Si, importa da questo conto', - 'spectre_no_supported_accounts' => 'You cannot import from this account due to a currency mismatch.', - - // keys from "extra" array: - 'spectre_extra_key_iban' => 'IBAN', - 'spectre_extra_key_swift' => 'SWIFT', - 'spectre_extra_key_status' => 'Stato', - 'spectre_extra_key_card_type' => 'Tipo carta', - 'spectre_extra_key_account_name' => 'Nome conto', - 'spectre_extra_key_client_name' => 'Nome cliente', - 'spectre_extra_key_account_number' => 'Numero conto', - 'spectre_extra_key_blocked_amount' => 'Importo bloccato', - 'spectre_extra_key_available_amount' => 'Importo disponibile', - 'spectre_extra_key_credit_limit' => 'Limite di credito', - 'spectre_extra_key_interest_rate' => 'Tasso d\'interesse', - 'spectre_extra_key_expiry_date' => 'Data scadenza', - 'spectre_extra_key_open_date' => 'Data apertura', - 'spectre_extra_key_current_time' => 'Ora corrente', - 'spectre_extra_key_current_date' => 'Data corrente', - 'spectre_extra_key_cards' => 'Carte', - 'spectre_extra_key_units' => 'Unità', - 'spectre_extra_key_unit_price' => 'Prezzo unità', - 'spectre_extra_key_transactions_count' => 'Conteggio delle transazioni', - - // various other strings: - 'imported_from_account' => 'Importato da ":account"', ]; diff --git a/resources/lang/it_IT/intro.php b/resources/lang/it_IT/intro.php index df49a56afa..a5b2a44c83 100644 --- a/resources/lang/it_IT/intro.php +++ b/resources/lang/it_IT/intro.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // index 'index_intro' => 'Benvenuti nella pagina indice di Firefly III. Si prega di prendersi il tempo necessario per questa introduzione per avere un\'idea di come funziona Firefly III.', @@ -120,7 +121,7 @@ return [ // create rule: 'rules_create_mandatory' => 'Scegli un titolo descrittivo e imposta quando deve essere attivata la regola.', - 'rules_create_ruletriggerholder' => 'Aggiungi tutti i trigger che desideri, ma ricorda che TUTTI i trigger devono corrispondere prima che vengano attivate azioni.', + 'rules_create_ruletriggerholder' => 'Aggiungi tutti i trigger che desideri, ma ricorda che TUTTI i trigger devono corrispondere prima che vengano attivate le azioni.', 'rules_create_test_rule_triggers' => 'Usa questo pulsante per vedere quali transazioni corrispondono alla tua regola.', 'rules_create_actions' => 'Imposta tutte le azioni che vuoi.', @@ -132,5 +133,5 @@ return [ 'currencies_index_default' => 'Firefly III ha una valuta predefinita. Puoi sempre cambiare valuta usando questi pulsanti.', // create currency - 'currencies_create_code' => 'Questo codice dovrebbe essere conforme ISO (Google per la tua nuova valuta).', + 'currencies_create_code' => 'Questo codice dovrebbe essere conforme ISO (cercalo con Google per la tua nuova valuta).', ]; diff --git a/resources/lang/it_IT/list.php b/resources/lang/it_IT/list.php index a2485211bb..4b53c93bf8 100644 --- a/resources/lang/it_IT/list.php +++ b/resources/lang/it_IT/list.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'buttons' => 'Pulsanti', 'icon' => 'Icona', @@ -68,7 +69,7 @@ return [ 'bill' => 'Conto', 'withdrawal' => 'Spesa', 'deposit' => 'Deposito', - 'transfer' => 'Giroconto', + 'transfer' => 'Trasferimento', 'type' => 'Tipo', 'completed' => 'Completato', 'iban' => 'IBAN', @@ -97,24 +98,29 @@ return [ 'number_of_transactions' => 'Numero transazioni', 'total_amount' => 'Importo totale', 'sum' => 'Somma', - 'sum_excluding_transfers' => 'Somma (esclusi i giroconti)', + 'sum_excluding_transfers' => 'Somma (esclusi i trasferimenti)', 'sum_withdrawals' => 'Somma prelievi', 'sum_deposits' => 'Somma versamenti', - 'sum_transfers' => 'Somma giroconti', + 'sum_transfers' => 'Somma dei trasferimenti', 'reconcile' => 'Riconcilia', 'account_on_spectre' => 'Conto (Spectre)', 'do_import' => 'Importo da questo conto', - 'sepa-ct-id' => 'SEPA End to End Identifier', - 'sepa-ct-op' => 'SEPA Opposing Account Identifier', - 'sepa-db' => 'SEPA Mandate Identifier', - 'sepa-country' => 'SEPA Country', - 'sepa-cc' => 'SEPA Clearing Code', + 'sepa-ct-id' => 'Identificativo End-To-End SEPA', + 'sepa-ct-op' => 'Identificativo Conto Oppositore SEPA', + 'sepa-db' => 'Identificativo Mandato SEPA', + 'sepa-country' => 'Paese SEPA', + 'sepa-cc' => 'Codice Compensazione SEPA', 'sepa-ep' => 'SEPA External Purpose', - 'sepa-ci' => 'SEPA Creditor Identifier', + 'sepa-ci' => 'Identificativo Creditore SEPA', + 'external_id' => 'ID esterno', 'account_at_bunq' => 'Conto con Bunq', - 'file_name' => 'File name', - 'file_size' => 'File size', - 'file_type' => 'File type', - 'attached_to' => 'Attached to', - 'file_exists' => 'File exists', + 'file_name' => 'Nome del file', + 'file_size' => 'Dimensione del file', + 'file_type' => 'Tipo del file', + 'attached_to' => 'Allegato a', + 'file_exists' => 'Il file esiste', + 'spectre_bank' => 'Banca', + 'spectre_last_use' => 'Ultimo accesso', + 'spectre_status' => 'Stato', + 'bunq_payment_id' => 'bunq payment ID', ]; diff --git a/resources/lang/it_IT/pagination.php b/resources/lang/it_IT/pagination.php index b65f332398..42bde66250 100644 --- a/resources/lang/it_IT/pagination.php +++ b/resources/lang/it_IT/pagination.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'previous' => '« Precedente', 'next' => 'Avanti »', diff --git a/resources/lang/it_IT/passwords.php b/resources/lang/it_IT/passwords.php index 41f194295b..3e44682679 100644 --- a/resources/lang/it_IT/passwords.php +++ b/resources/lang/it_IT/passwords.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'password' => 'Le password devono contenere almeno sei caratteri e devono corrispondere alla conferma.', 'user' => 'Non possiamo trovare un utente con questo indirizzo e-mail.', diff --git a/resources/lang/it_IT/validation.php b/resources/lang/it_IT/validation.php index af49eb7aba..f6c286443a 100644 --- a/resources/lang/it_IT/validation.php +++ b/resources/lang/it_IT/validation.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'iban' => 'Questo non è un IBAN valido.', 'source_equals_destination' => 'Il conto di origine è uguale al conto di destinazione', @@ -109,7 +110,8 @@ return [ 'in_array' => ':attribute il campo non esiste in :other.', 'present' => ':attribute il campo deve essere presente.', 'amount_zero' => 'L\'importo totale non può essere zero', - 'secure_password' => 'Questa non è una password sicura. Per favore riprova. Per ulteriori informazioni, visitare https://goo.gl/NCh2tN', + 'unique_piggy_bank_for_user' => 'The name of the piggy bank must be unique.', + 'secure_password' => 'Questa non è una password sicura. Per favore riprova. Per ulteriori informazioni, visitare http://bit.ly/FF3-password-security', 'attributes' => [ 'email' => 'indirizzo email', 'description' => 'descrizione', @@ -135,15 +137,15 @@ return [ 'rule-action.3' => 'regola azione #3', 'rule-action.4' => 'regola azione #4', 'rule-action.5' => 'regola azione #5', - 'rule-trigger-value.1' => 'regola valore trigger #1', - 'rule-trigger-value.2' => 'regola valore trigger #2', - 'rule-trigger-value.3' => 'regola valore trigger #3', - 'rule-trigger-value.4' => 'regola valore trigger #4', - 'rule-trigger-value.5' => 'regola valore trigger #5', - 'rule-trigger.1' => 'esegui regola #1', - 'rule-trigger.2' => 'esegui regola #2', - 'rule-trigger.3' => 'esegui regola #3', - 'rule-trigger.4' => 'esegui regola #4', - 'rule-trigger.5' => 'esegui regola #5', + 'rule-trigger-value.1' => 'valore #1 del trigger della regola', + 'rule-trigger-value.2' => 'valore #2 del trigger della regola', + 'rule-trigger-value.3' => 'valore #3 del trigger della regola', + 'rule-trigger-value.4' => 'valore #4 del trigger della regola', + 'rule-trigger-value.5' => 'valore #5 del trigger della regola', + 'rule-trigger.1' => 'trigger #1 della regola', + 'rule-trigger.2' => 'trigger #2 della regola', + 'rule-trigger.3' => 'trigger #3 della regola', + 'rule-trigger.4' => 'trigger #4 della regola', + 'rule-trigger.5' => 'trigger #5 della regola', ], ]; diff --git a/resources/lang/nl_NL/auth.php b/resources/lang/nl_NL/auth.php index 948cf45eba..8ef1c2fa01 100644 --- a/resources/lang/nl_NL/auth.php +++ b/resources/lang/nl_NL/auth.php @@ -1,9 +1,8 @@ . */ -return [ - /* - |-------------------------------------------------------------------------- - | Authentication Language Lines - |-------------------------------------------------------------------------- - | - | The following language lines are used during authentication for various - | messages that we need to display to the user. You are free to modify - | these language lines according to your application's requirements. - | - */ +declare(strict_types=1); +return [ 'failed' => 'Deze gegevens zijn niet correct.', 'throttle' => 'Te veel inlogpogingen. Probeer opnieuw in :seconds seconden.', ]; diff --git a/resources/lang/nl_NL/bank.php b/resources/lang/nl_NL/bank.php index 8826020cbf..5d00b1e685 100644 --- a/resources/lang/nl_NL/bank.php +++ b/resources/lang/nl_NL/bank.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ ]; diff --git a/resources/lang/nl_NL/breadcrumbs.php b/resources/lang/nl_NL/breadcrumbs.php index c15096d016..81dd5186bc 100644 --- a/resources/lang/nl_NL/breadcrumbs.php +++ b/resources/lang/nl_NL/breadcrumbs.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'home' => 'Home', 'edit_currency' => 'Wijzig valuta ":name"', diff --git a/resources/lang/nl_NL/components.php b/resources/lang/nl_NL/components.php index 4d040c691c..c3369d4673 100644 --- a/resources/lang/nl_NL/components.php +++ b/resources/lang/nl_NL/components.php @@ -1,5 +1,4 @@ . */ +declare(strict_types=1); + return [ // profile 'personal_access_tokens' => 'Persoonlijke toegangstokens', diff --git a/resources/lang/nl_NL/config.php b/resources/lang/nl_NL/config.php index 63b564e67a..d2e66fcf86 100644 --- a/resources/lang/nl_NL/config.php +++ b/resources/lang/nl_NL/config.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'html_language' => 'nl', 'locale' => 'nl, Dutch, nl_NL, nl_NL.utf8, nl_NL.UTF-8', diff --git a/resources/lang/nl_NL/csv.php b/resources/lang/nl_NL/csv.php index 622a49202a..aae109a40a 100644 --- a/resources/lang/nl_NL/csv.php +++ b/resources/lang/nl_NL/csv.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ ]; diff --git a/resources/lang/nl_NL/demo.php b/resources/lang/nl_NL/demo.php index 7611dbfe17..5f6ed1f0b2 100644 --- a/resources/lang/nl_NL/demo.php +++ b/resources/lang/nl_NL/demo.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'no_demo_text' => 'Sorry, er is geen extra uitleg voor deze pagina.', 'see_help_icon' => 'Maar het -icoontje kan je wellicht meer vertellen.', @@ -32,5 +33,5 @@ return [ 'currencies-index' => 'Firefly ondersteunt meerdere valuta\'s. Hoewel het standaard de Euro is kan je ook kiezen voor de US dollar of een van de vele anderen. Er is een kleine selectie valuta meegeleverd maar je kan je eigen valuta toevoegen. Het veranderen van de standaardvaluta verandert de bestaande transacties niet: Firefly III ondersteunt het gebruik van meerdere valuta op hetzelfde moment.', 'transactions-index' => 'Deze uitgaven, inkomsten en overschrijvingen zijn niet heel fantasierijk. Ze zijn automatisch gegenereerd.', 'piggy-banks-index' => 'Zoals je kan zien zijn er drie spaarpotjes. Gebruik de plus- en minknoppen om het bedrag in de spaarpotjes te veranderen. Klik op de naam van het spaarpotje om er de geschiedenis van te zien.', - 'import-index' => 'Uiteraard kan je elk CSV bestand importeren in Firefly III', + 'import-index' => 'Je kan elk CSV bestand importeren met Firefly III. Het is ook mogelijk om transacties te importeren van bunq en Spectre. Andere verzamelbedrijven worden ook geïntegreerd. De demo-gebruiker mag alleen de "nep"-importhulp gebruiken. Deze genereert een paar willekeurige transacties om te laten zien hoe het werkt.', ]; diff --git a/resources/lang/nl_NL/firefly.php b/resources/lang/nl_NL/firefly.php index e31e56d599..051852c28d 100644 --- a/resources/lang/nl_NL/firefly.php +++ b/resources/lang/nl_NL/firefly.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // general stuff: 'close' => 'Sluiten', @@ -179,6 +180,7 @@ return [ 'authorization_request_intro' => ':client vraagt ​​toestemming om toegang te krijgen tot je financiële administratie. Wil je :client autoriseren om toegang te krijgen tot je gegevens?', 'scopes_will_be_able' => 'Deze applicatie krijgt toegang tot:', 'button_authorize' => 'Toestaan', + 'none_in_select_list' => '(geen)', // check for updates: 'update_check_title' => 'Op updates controleren', @@ -666,6 +668,7 @@ return [ 'bill_will_automatch' => 'Waar van toepassing wordt dit contract automatisch gekoppeld aan transacties', 'skips_over' => 'slaat over', 'bill_store_error' => 'Er ging wat fout bij het opslaan van het contract. Kijk in de logbestanden', + 'list_inactive_rule' => 'inactieve regel', // accounts: 'details_for_asset' => 'Overzicht voor betaalrekening ":name"', @@ -801,6 +804,7 @@ return [ 'opt_group_savingAsset' => 'Spaarrekeningen', 'opt_group_sharedAsset' => 'Gedeelde betaalrekeningen', 'opt_group_ccAsset' => 'Creditcards', + 'opt_group_cashWalletAsset' => 'Cash portomonees', 'notes' => 'Notities', 'unknown_journal_error' => 'Kon de transactie niet opslaan. Kijk in de logbestanden.', @@ -816,6 +820,7 @@ return [ 'language' => 'Taal', 'new_savings_account' => ':bank_name spaarrekening', 'cash_wallet' => 'Cash-rekening', + 'currency_not_present' => 'Geen zorgen als de valuta die je gewend bent er niet tussen staat. Je kan je eigen valuta maken onder Opties > Valuta.', // home page: 'yourAccounts' => 'Je betaalrekeningen', @@ -1013,6 +1018,7 @@ return [ 'remove_money_from_piggy_title' => 'Haal geld uit spaarpotje ":name"', 'add' => 'Toevoegen', 'no_money_for_piggy' => 'Er is geen geld voor dit spaarpotje.', + 'suggested_savings_per_month' => 'Voorgesteld per maand', 'remove' => 'Verwijderen', 'max_amount_add' => 'Hooguit toe te voegen', @@ -1148,27 +1154,9 @@ return [ 'no_edit_multiple_left' => 'Je hebt geen geldige transacties geselecteerd.', 'cannot_convert_split_journal' => 'Kan geen gesplitste transactie omzetten', - // import bread crumbs and titles: - 'import' => 'Import', - 'import_data' => 'Importeer data', - 'import_general_index_file' => 'Importeer een bestand', - 'import_from_bunq' => 'Importeer uit bunq', - 'import_using_spectre' => 'Importeer via Spectre', - 'import_using_plaid' => 'Importeer via Plaid', - 'import_config_bread_crumb' => 'Instellen van je import', - - // import index page: + // Import page (general strings only) 'import_index_title' => 'Gegevens importeren in Firefly III', - 'import_index_sub_title' => 'Index', - 'import_general_index_intro' => 'Dit is de import-routine van Firefly III. Er zijn verschillende manieren om gegevens te importeren in Firefly III, hier als knoppen weergegeven.', - 'upload_error' => 'Het bestand dat je hebt geüpload kan niet gebruikt worden. Het is wellicht het verkeerde type of de verkeerde encoding. In de logbestanden staat meer info.', - 'reset_import_settings_title' => 'Reset importconfiguratie', - 'reset_import_settings_text' => 'Gebruik deze links om importinstellingen voor specifieke providers te resetten. Handig als verkeerde instellingen voorkomen dat je verder kan.', - 'reset_settings_bunq' => 'Verwijdert de bunq API key, je externe IP adres zoals Firefly III die kent, en de voor bunq gegenereerde RSA sleutels.', - 'reset_settings_spectre' => 'Verwijdert je Spectre secrets en ID\'s. Dit verwijdert ook je Spectre keypair. Vergeet die niet te updaten.', - 'settings_reset_for_bunq' => 'Bunq-instellingen zijn gereset.', - 'settings_reset_for_spectre' => 'Spectre-instellingen zijn gereset.', - + 'import_data' => 'Importeer data', // sandstorm.io errors and messages: 'sandstorm_not_available' => 'Deze functie werkt niet als je Firefly III gebruikt in combinatie met Sandstorm.IO.', diff --git a/resources/lang/nl_NL/form.php b/resources/lang/nl_NL/form.php index 869a935250..748af68a19 100644 --- a/resources/lang/nl_NL/form.php +++ b/resources/lang/nl_NL/form.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // new user: 'bank_name' => 'Banknaam', @@ -184,6 +185,13 @@ return [ 'blocked' => 'Is geblokkeerd?', 'blocked_code' => 'Reden voor blokkade', + // import + 'apply_rules' => 'Regels toepassen', + 'artist' => 'Artiest', + 'album' => 'Album', + 'song' => 'Nummer', + + // admin 'domain' => 'Domein', 'single_user_mode' => 'Registratie uitgeschakelen', diff --git a/resources/lang/nl_NL/import.php b/resources/lang/nl_NL/import.php index 9a76f0b19b..89381f4bf5 100644 --- a/resources/lang/nl_NL/import.php +++ b/resources/lang/nl_NL/import.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ - // status of import: + // ALL breadcrumbs and subtitles: + 'index_breadcrumb' => 'Gegevens importeren in Firefly III', + 'prerequisites_breadcrumb_fake' => 'Vereisten voor de nep-importhulp', + 'prerequisites_breadcrumb_spectre' => 'Vereisten voor Spectre', + 'prerequisites_breadcrumb_bunq' => 'Vereisten voor bunq', + 'job_configuration_breadcrumb' => 'Instellingen voor ":key"', + 'job_status_breadcrumb' => 'Importstatus voor ":key"', + 'cannot_create_for_provider' => 'Firefly III kan niet importeren met behulp van ":provider".', + + // index page: + 'general_index_title' => 'Importeer een bestand', + 'general_index_intro' => 'Dit is de import-routine van Firefly III. Er zijn verschillende manieren om gegevens te importeren in Firefly III, hier als knoppen weergegeven.', + // import provider strings (index): + 'button_fake' => 'Nepdata importeren', + 'button_file' => 'Importeer een bestand', + 'button_bunq' => 'Importeer uit bunq', + 'button_spectre' => 'Importeer via Spectre', + 'button_plaid' => 'Importeer via Plaid', + 'button_yodlee' => 'Importeer via Spectre', + 'button_quovo' => 'Importeer via Quovo', + // global config box (index) + 'global_config_title' => 'Configuratiebestand', + 'global_config_text' => 'In de toekomst bevat dit vak voorkeuren die van toepassing zijn op ALLE bovenstaande importproviders.', + // prerequisites box (index) + 'need_prereq_title' => 'Importvereisten', + 'need_prereq_intro' => 'Sommige importmethoden hebben je aandacht nodig voor ze gebruikt kunnen worden. Ze vereisen bijvoorbeeld speciale API-sleutels of geheime waardes. Je kan ze hier instellen. Het icoontje geeft aan of deze vereisten al ingevuld zijn.', + 'do_prereq_fake' => 'Vereisten voor de nep-importhulp', + 'do_prereq_file' => 'Vereisten voor het importeren van bestanden', + 'do_prereq_bunq' => 'Vereisten voor een import van bunq', + 'do_prereq_spectre' => 'Vereisten voor een import via Spectre', + 'do_prereq_plaid' => 'Vereisten voor een import via Plaid', + 'do_prereq_yodlee' => 'Vereisten voor een import via Yodlee', + 'do_prereq_quovo' => 'Vereisten voor een import via Quovo', + // provider config box (index) + 'can_config_title' => 'Importinstellingen', + 'can_config_intro' => 'Sommige importmethodes kunnen ingesteld worden zoals jij dat wilt. Er zijn extra instellingen die je aan kan passen.', + 'do_config_fake' => 'Instellingen voor de nep-importhulp', + 'do_config_file' => 'Instellingen voor importeren van bestanden', + 'do_config_bunq' => 'Instellingen voor importeren uit bunq', + 'do_config_spectre' => 'Instellingen voor importeren uit Spectre', + 'do_config_plaid' => 'Instellingen voor importeren uit Plaid', + 'do_config_yodlee' => 'Instellingen voor importeren uit Yodlee', + 'do_config_quovo' => 'Instellingen voor importeren uit Quovo', + + // prerequisites: + 'prereq_fake_title' => 'Instellingen voor importeren uit de nep-importhulp', + 'prereq_fake_text' => 'Deze nep-provider heeft een neppe API key nodig. Deze moet 32 tekens lang zijn. Je mag deze gebruiken: 123456789012345678901234567890AA', + 'prereq_spectre_title' => 'Vereisten voor een import via Spectre', + 'prereq_spectre_text' => 'Als je gegevens wilt importeren via de Spectre API (v4), moet je een aantal geheime codes bezitten. Ze zijn te vinden op de secrets pagina.', + 'prereq_spectre_pub' => 'De Spectre API moet de publieke sleutel kennen die je hieronder ziet. Zonder deze sleutel herkent Spectre je niet. Voer deze publieke sleutel in op je secrets-pagina.', + 'prereq_bunq_title' => 'Vereisten aan een import van bunq', + 'prereq_bunq_text' => 'Om te importeren vanaf bunq moet je een API key hebben. Deze kan je aanvragen in de app. Denk er aan dat deze functie in BETA is. De code is alleen getest op de sandbox API.', + 'prereq_bunq_ip' => 'bunq wilt graag je externe IP-adres weten. Firefly III heeft geprobeerd dit in te vullen met behulp van de ipify-dienst. Zorg dat je zeker weet dat dit IP-adres klopt, want anders zal de import niet werken.', + // prerequisites success messages: + 'prerequisites_saved_for_fake' => 'Nep API-sleutel is opgeslagen!', + 'prerequisites_saved_for_spectre' => 'APP ID en secret opgeslagen!', + 'prerequisites_saved_for_bunq' => 'API-sleutel en IP opgeslagen!', + + // job configuration: + 'job_config_apply_rules_title' => 'Importinstellingen - regels toepassen?', + 'job_config_apply_rules_text' => 'Als de nep-importhulp gedraaid heeft kunnen je regels worden toegepast op de transacties. Dit kost wel tijd.', + 'job_config_input' => 'Je invoer', + // job configuration for the fake provider: + 'job_config_fake_artist_title' => 'Voer albumnaam in', + 'job_config_fake_artist_text' => 'Veel importroutines hebben een paar configuratiestappen die je moet doorlopen. In het geval van de nep-importhulp moet je een aantal rare vragen beantwoorden. Voer \'David Bowie\' in om door te gaan.', + 'job_config_fake_song_title' => 'Naam van nummer', + 'job_config_fake_song_text' => 'Noem het nummer "Golden years" om door te gaan met de nep import.', + 'job_config_fake_album_title' => 'Albumnaam invoeren', + 'job_config_fake_album_text' => 'Sommige importroutines vereisen extra gegevens halverwege de import. In het geval van de nep-importhulp moet je een aantal rare vragen beantwoorden. Voer "Station naar station" in om door te gaan.', + // job configuration form the file provider + 'job_config_file_upload_title' => 'Importinstellingen (1/4) - Upload je bestand', + 'job_config_file_upload_text' => 'Met deze routine kan je bestanden van je bank importeren in Firefly III. ', + 'job_config_file_upload_help' => 'Selecteer je bestand. Zorg ervoor dat het bestand UTF-8 gecodeerd is.', + 'job_config_file_upload_config_help' => 'Als je eerder gegevens hebt geïmporteerd in Firefly III, heb je wellicht een configuratiebestand, dat een aantal zaken alvast voor je kan instellen. Voor bepaalde banken hebben andere gebruikers uit de liefde van hun hart het benodigde configuratiebestand gedeeld', + 'job_config_file_upload_type_help' => 'Selecteer het type bestand dat je zal uploaden', + 'job_config_file_upload_submit' => 'Bestanden uploaden', + 'import_file_type_csv' => 'CSV (kommagescheiden waardes)', + 'file_not_utf8' => 'Het bestand dat je hebt geüpload, is niet gecodeerd als UTF-8 of ASCII. Firefly III kan dergelijke bestanden niet verwerken. Gebruik Notepad ++ of Sublime om je bestand naar UTF-8 te converteren.', + 'job_config_uc_title' => 'Importinstellingen (2/4) - Algemene importinstellingen', + 'job_config_uc_text' => 'Om je bestand goed te kunnen importeren moet je deze opties verifiëren.', + 'job_config_uc_header_help' => 'Vink hier als de eerste rij kolomtitels bevat.', + 'job_config_uc_date_help' => 'Datum/tijd formaat in jouw bestand. Volg het formaat zoals ze het op deze pagina uitleggen. Het standaardformaat ziet er zo uit: :dateExample.', + 'job_config_uc_delimiter_help' => 'Kies het veldscheidingsteken dat in jouw bestand wordt gebruikt. Als je het niet zeker weet, is de komma de beste optie.', + 'job_config_uc_account_help' => 'Als jouw CSV bestand geen referenties bevat naar jouw betaalrekening(en), geef dan hier aan om welke rekening het gaat.', + 'job_config_uc_apply_rules_title' => 'Regels toepassen', + 'job_config_uc_apply_rules_text' => 'Past je regels toe op elke geïmporteerde transactie. Merk op dat dit de import aanzienlijk vertraagt.', + 'job_config_uc_specifics_title' => 'Bank-specifieke opties', + 'job_config_uc_specifics_txt' => 'Sommige banken leveren slecht geformatteerde bestanden aan. Firefly III kan deze automatisch corrigeren. Als jouw bank dergelijke bestanden levert, maar deze hier niet wordt vermeld, open dan een issue op GitHub.', + 'job_config_uc_submit' => 'Volgende', + 'invalid_import_account' => 'Je hebt een ongeldige betaalrekening geselecteerd om in te importeren.', + // job configuration for Spectre: + 'job_config_spectre_login_title' => 'Kies je login', + 'job_config_spectre_login_text' => 'Firefly III heeft :count bestaande login(s) gevonden in je Spectre-account. Welke wil je gebruiken om van te importeren?', + 'spectre_login_status_active' => 'Actief', + 'spectre_login_status_inactive' => 'Inactief', + 'spectre_login_status_disabled' => 'Uitgeschakeld', + 'spectre_login_new_login' => 'Log in via een andere bank, of via een van deze banken met andere inloggegevens.', + 'job_config_spectre_accounts_title' => 'Selecteer de rekeningen waaruit je wilt importeren', + 'job_config_spectre_accounts_text' => 'Je hebt ":name" (:country) geselecteerd. Je hebt :count rekening(en) bij deze provider. Kies de Firefly III betaalrekening(en) waar je de transacties in wilt opslaan. Denk er aan dat zowel de ":name"-rekeningen als de Firefly III rekeningen dezelfde valuta moeten hebben.', + 'spectre_no_supported_accounts' => 'Je kan niet importeren van deze rekening omdat de valuta niet overeen komt.', + 'spectre_do_not_import' => '(niet importeren)', + 'spectre_no_mapping' => 'Je hebt geen rekeningen geselecteerd om uit te importeren.', + 'imported_from_account' => 'Geïmporteerd uit ":account"', + 'spectre_account_with_number' => 'Rekening :number', + // job configuration for bunq: + 'job_config_bunq_accounts_title' => 'bunq rekeningen', + 'job_config_bunq_accounts_text' => 'Deze rekeningen zijn geassocieerd met je bunq-account. Kies de rekeningen waar je van wilt importeren, en geef aan waar de gegevens geïmporteerd moeten worden.', + 'bunq_no_mapping' => 'Je hebt geen rekeningen geselecteerd om uit te importeren.', + 'should_download_config' => 'Download het configuratiebestand voor deze import. Dit maakt toekomstige imports veel eenvoudiger.', + 'share_config_file' => 'Als je gegevens hebt geimporteerd van een gewone bank, deel dan je configuratiebestand zodat het makkelijk is voor andere gebruikers om hun gegevens te importeren. Als je je bestand deelt deel je natuurlijk géén privé-gegevens.', + + // keys from "extra" array: + 'spectre_extra_key_iban' => 'IBAN', + 'spectre_extra_key_swift' => 'SWIFT', + 'spectre_extra_key_status' => 'Status', + 'spectre_extra_key_card_type' => 'Kaartsoort', + 'spectre_extra_key_account_name' => 'Rekeningnaam', + 'spectre_extra_key_client_name' => 'Klantnaam', + 'spectre_extra_key_account_number' => 'Rekeningnummer', + 'spectre_extra_key_blocked_amount' => 'Geblokkeerd bedrag', + 'spectre_extra_key_available_amount' => 'Beschikbaar bedrag', + 'spectre_extra_key_credit_limit' => 'Kredietlimiet', + 'spectre_extra_key_interest_rate' => 'Rente', + 'spectre_extra_key_expiry_date' => 'Vervaldatum', + 'spectre_extra_key_open_date' => 'Openingsdatum', + 'spectre_extra_key_current_time' => 'Huidige tijd', + 'spectre_extra_key_current_date' => 'Huidige datum', + 'spectre_extra_key_cards' => 'Kaarten', + 'spectre_extra_key_units' => 'Eenheden', + 'spectre_extra_key_unit_price' => 'Prijs per eenheid', + 'spectre_extra_key_transactions_count' => 'Transacties', + + // specifics: + 'specific_ing_name' => 'ING NL', + 'specific_ing_descr' => 'Maak betere beschrijvingen in de export van ING', + 'specific_sns_name' => 'SNS / Volksbank NL', + 'specific_sns_descr' => 'Trim citaten uit exportbestanden van SNS / Volksbank', + 'specific_abn_name' => 'ABN AMRO NL', + 'specific_abn_descr' => 'Lost mogelijke problemen op met ABN AMRO-bestanden', + 'specific_rabo_name' => 'Rabobank NL', + 'specific_rabo_descr' => 'Lost mogelijke problemen op met Rabobank txt-bestanden', + 'specific_pres_name' => 'President\'s Choice Financial CA', + 'specific_pres_descr' => 'Lost mogelijke problemen op met PC bestanden', + // job configuration for file provider (stage: roles) + 'job_config_roles_title' => 'Importinstellingen (3/4) - rol van elke kolom definiëren', + 'job_config_roles_text' => 'Elke kolom in je CSV-bestand bevat bepaalde gegevens. Gelieve aan te geven wat voor soort gegevens de import-routine kan verwachten. De optie "maak een link" betekent dat u elke vermelding in die kolom linkt aan een waarde uit je database. Een vaak gelinkte kolom is die met de IBAN-code van de tegenrekening. Die kan je dan linken aan de IBAN in jouw database.', + 'job_config_roles_submit' => 'Volgende', + 'job_config_roles_column_name' => 'Kolomnaam', + 'job_config_roles_column_example' => 'Voorbeeldgegevens', + 'job_config_roles_column_role' => 'Kolomrol', + 'job_config_roles_do_map_value' => 'Maak een link', + 'job_config_roles_no_example' => 'Geen voorbeeldgegevens', + 'job_config_roles_fa_warning' => 'Als je een kolom markeert als "vreemde valuta" moet je ook aangeven in welke kolom de valuta staat.', + 'job_config_roles_rwarning' => 'Geef minstens de kolom aan waar het bedrag in staat. Als het even kan, ook een kolom voor de omschrijving, datum en de andere rekening.', + 'job_config_roles_colum_count' => 'Kolom', + // job config for the file provider (stage: mapping): + 'job_config_map_title' => 'Importinstellingen (4/4) - Link importgegevens aan Firefly III-gegevens', + 'job_config_map_text' => 'In deze tabellen is de linkerwaarde een waarde uit je CSV bestand. Jij moet de link leggen, als mogelijk, met een waarde uit jouw database. Firefly houdt zich hier aan. Als er geen waarde is, selecteer dan ook niets.', + 'job_config_map_nothing' => 'Je gaat geen gegevens importeren die te mappen zijn. Klik op "Start import" om verder te gaan.', + 'job_config_field_value' => 'Veldwaarde', + 'job_config_field_mapped' => 'Gelinkt aan', + 'map_do_not_map' => '(niet linken)', + 'job_config_map_submit' => 'Start importeren', + + + // import status page: + 'import_with_key' => 'Import met code \':key\'', 'status_wait_title' => 'Momentje...', 'status_wait_text' => 'Dit vak verdwijnt zometeen.', - 'status_fatal_title' => 'Er is een fatale fout opgetreden', - 'status_fatal_text' => 'Een fatale fout opgetreden, waar de import-routine niet van terug heeft. Zie de uitleg in het rood hieronder.', - 'status_fatal_more' => 'Als de fout een time-out is, zal de import-routine halverwege gestopt zijn. Bij bepaalde serverconfiguraties is het alleen maar de server die gestopt terwijl de import-routine op de achtergrond doorloopt. Controleer de logboekbestanden om te zien wat er aan de hand is. Als het probleem zich blijft voordoen, gebruik dan de command-line opdracht.', - 'status_ready_title' => 'De import is klaar om te beginnen', - 'status_ready_text' => 'De import kan beginnen. Alle configuratie is opgeslagen. Download dit bestand. Het kan schelen als je de import opnieuw moet doen. Om daadwerkelijk te beginnen, gebruik je of het commando in je console, of de website. Afhankelijk van hoe je Firefly III hebt ingesteld, geeft de console-methode meer feedback.', - 'status_ready_noconfig_text' => 'De import kan beginnen. Alle configuratie is opgeslagen. Om daadwerkelijk te beginnen, gebruik je of het commando in je console, of de website. Afhankelijk van hoe je Firefly III hebt ingesteld, geeft de console-methode meer feedback.', - 'status_ready_config' => 'Download importconfiguratie', - 'status_ready_start' => 'Start importeren', - 'status_ready_share' => 'Overweeg om je configuratiebestand te downloaden en te delen op de configuratiebestand-wiki. Hiermee kan je het andere Firefly III gebruikers weer makkelijker maken.', - 'status_job_new' => 'De import is gloednieuw.', - 'status_job_configuring' => 'De import wordt geconfigureerd.', - 'status_job_configured' => 'De import is geconfigureerd.', - 'status_job_running' => 'De import is bezig.. Momentje..', - 'status_job_error' => 'De import heeft een fout gegenereerd.', - 'status_job_finished' => 'Het importeren is voltooid!', 'status_running_title' => 'De import is bezig', - 'status_running_placeholder' => 'Wacht even voor een update...', - 'status_finished_title' => 'Importeren is klaar', - 'status_finished_text' => 'De import is klaar.', - 'status_errors_title' => 'Fouten tijdens het importeren', - 'status_errors_single' => 'Er is een niet-fatale fout opgetreden tijdens het importeren.', - 'status_errors_multi' => 'Er zijn een aantal niet-fatale fouten opgetreden tijdens het importeren.', - 'status_bread_crumb' => 'Status van importeren', - 'status_sub_title' => 'Status van importeren', - 'config_sub_title' => 'Instellen van je import', - 'status_finished_job' => 'De :count geïmporteerde transacties kan je vinden onder tag :tag.', - 'status_finished_no_tag' => 'Er is niets uit je bestand geïmporteerd.', - 'import_with_key' => 'Import met code \':key\'', + 'status_job_running' => 'Even geduld, de import loopt...', + 'status_job_storing' => 'Even geduld, de gegevens worden opgeslagen...', + 'status_job_rules' => 'Even gedult, je regels worden toegepast...', + 'status_fatal_title' => 'Onherstelbare fout', + 'status_fatal_text' => 'De import is tegen een fout aangelopen waar-ie niet meer van terug kan komen. Excuses!', + 'status_fatal_more' => 'Deze (waarschijnlijk zeer cryptische) foutmelding wordt aangevuld door logbestanden, die je kan vinden op je harde schijf of in de Docker-container waar je Firefly III draait.', + 'status_finished_title' => 'Importeren voltooid', + 'status_finished_text' => 'Het importeren is voltooid.', + 'finished_with_errors' => 'Er zijn enkele fouten opgetreden tijdens het importeren. Beoordeel ze zorgvuldig.', + 'unknown_import_result' => 'Onbekend importresultaat', + 'result_no_transactions' => 'Er zijn geen transacties geïmporteerd. Misschien waren ze allemaal dubbel, of er zijn simpelweg geen transacties gevonden die kunnen worden geïmporteerd. Misschien kunnen de logbestanden je vertellen wat er is gebeurd. Als je regelmatig gegevens importeert, is dit normaal.', + 'result_one_transaction' => 'Precies één transactie is geïmporteerd. Je kan deze bekijken onder tag :tag.', + 'result_many_transactions' => 'Firefly III heeft :count transacties geïmporteerd. Je kan ze inspecteren onder tag :tag.', - // file, upload something - 'file_upload_title' => 'Importinstellingen (1/4) - Upload je bestand', - 'file_upload_text' => 'Deze pagina\'s helpen je bestanden van je bank te importeren in Firefly III. Gebruik de hulp-pagina\'s linksboven voor meer informatie.', - 'file_upload_fields' => 'Velden', - 'file_upload_help' => 'Selecteer je bestand', - 'file_upload_config_help' => 'Als je eerder gegevens hebt geïmporteerd in Firefly III, heb je wellicht een configuratiebestand, dat een aantal zaken alvast voor je kan instellen. Voor bepaalde banken hebben andere gebruikers uit de liefde van hun hart het benodigde configuratiebestand gedeeld', - 'file_upload_type_help' => 'Selecteer het type bestand dat je zal uploaden', - 'file_upload_submit' => 'Bestanden uploaden', - // file, upload types - 'import_file_type_csv' => 'CSV (kommagescheiden waardes)', + // general errors and warnings: + 'bad_job_status' => 'Om deze pagina te bekijken mag je import-job niet de status ":status" hebben.', - // file, initial config for CSV - 'csv_initial_title' => 'Importinstellingen (2/4) - Algemene CVS importinstellingen', - 'csv_initial_text' => 'Om je bestand goed te kunnen importeren moet je deze opties verifiëren.', - 'csv_initial_box' => 'Algemene CVS importinstellingen', - 'csv_initial_box_title' => 'Algemene CVS importinstellingen', - 'csv_initial_header_help' => 'Vink hier als de eerste rij kolomtitels bevat.', - 'csv_initial_date_help' => 'Datum/tijd formaat in jouw CSV bestand. Volg het formaat zoals ze het op deze pagina uitleggen. Het standaardformaat ziet er zo uit: :dateExample.', - 'csv_initial_delimiter_help' => 'Kies het veldscheidingsteken dat in jouw bestand wordt gebruikt. Als je het niet zeker weet, is de komma de beste optie.', - 'csv_initial_import_account_help' => 'Als jouw CSV bestand geen referenties bevat naar jouw rekening(en), geef dan hier aan om welke rekening het gaat.', - 'csv_initial_submit' => 'Ga verder met stap 3/4', - - // file, new options: - 'file_apply_rules_title' => 'Regels toepassen', - 'file_apply_rules_description' => 'Past regels toe tijdens de import. Dit vertraagt de import behoorlijk.', - 'file_match_bills_title' => 'Match contracten', - 'file_match_bills_description' => 'Checkt of bestaande contracten matchen met nieuwe uitgaves. Dit vertraagt de import behoorlijk.', - - // file, roles config - 'csv_roles_title' => 'Importinstellingen (3/4) - rol van elke kolom definiëren', - 'csv_roles_text' => 'Elke kolom in je CSV-bestand bevat bepaalde gegevens. Gelieve aan te geven wat voor soort gegevens de import-routine kan verwachten. De optie "maak een link" betekent dat u elke vermelding in die kolom linkt aan een waarde uit je database. Een vaak gelinkte kolom is die met de IBAN-code van de tegenrekening. Die kan je dan linken aan de IBAN in jouw database.', - 'csv_roles_table' => 'Tabel', - 'csv_roles_column_name' => 'Kolomnaam', - 'csv_roles_column_example' => 'Voorbeeldgegevens', - 'csv_roles_column_role' => 'Kolomrol', - 'csv_roles_do_map_value' => 'Maak een link', - 'csv_roles_column' => 'Kolom', - 'csv_roles_no_example_data' => 'Geen voorbeeldgegevens', - 'csv_roles_submit' => 'Ga verder met stap 4/4', - - // not csv, but normal warning - 'roles_warning' => 'Geef minstens de kolom aan waar het bedrag in staat. Als het even kan, ook een kolom voor de omschrijving, datum en de andere rekening.', - 'foreign_amount_warning' => 'Als je een kolom markeert als "vreemde valuta" moet je ook aangeven in welke kolom de valuta staat.', - - // file, map data - 'file_map_title' => 'Importinstellingen (4/4) - Link importgegevens aan Firefly III-gegevens', - 'file_map_text' => 'In deze tabellen is de linkerwaarde een waarde uit je CSV bestand. Jij moet de link leggen, als mogelijk, met een waarde uit jouw database. Firefly houdt zich hier aan. Als er geen waarde is, selecteer dan ook niets.', - 'file_map_field_value' => 'Veldwaarde', - 'file_map_field_mapped_to' => 'Gelinkt aan', - 'map_do_not_map' => '(niet linken)', - 'file_map_submit' => 'Start importeren', - 'file_nothing_to_map' => 'Je gaat geen gegevens importeren die te mappen zijn. Klik op "Start import" om verder te gaan.', - - // map things. + // column roles for CSV import: 'column__ignore' => '(negeer deze kolom)', 'column_account-iban' => 'Betaalrekening (IBAN)', 'column_account-id' => 'Betaalrekening (ID gelijk aan FF3)', @@ -158,48 +261,4 @@ return [ 'column_note' => 'Opmerking(en)', 'column_internal-reference' => 'Interne referentie', - // prerequisites - 'prerequisites' => 'Vereisten', - - // bunq - 'bunq_prerequisites_title' => 'Voorwaarden voor een import van bunq', - 'bunq_prerequisites_text' => 'Om te importeren vanaf bunq moet je een API key hebben. Deze kan je aanvragen in de app. Denk er aan dat deze functie in BETA is. De code is alleen getest op de sandbox API.', - 'bunq_prerequisites_text_ip' => 'Bunq wilt graag je externe IP-adres weten. Firefly III heeft geprobeerd dit in te vullen met behulp van de ipify-dienst. Zorg dat je zeker weet dat dit IP-adres klopt, want anders zal de import niet werken.', - 'bunq_do_import' => 'Ja, importeer van deze rekening', - 'bunq_accounts_title' => 'Bunq rekeningen', - 'bunq_accounts_text' => 'Dit zijn de rekeningen uit je bunq-account. Selecteer de rekeningen waaruit je wilt importeren, en welke betaalrekeningen deze transacties op terecht moeten komen.', - - // Spectre - 'spectre_title' => 'Importeer via Spectre', - 'spectre_prerequisites_title' => 'Voorwaarden voor een import via Spectre', - 'spectre_prerequisites_text' => 'Als je gegevens wilt importeren via de Spectre API (v4), moet je een aantal geheime codes bezitten. Ze zijn te vinden op de secrets pagina.', - 'spectre_enter_pub_key' => 'Het importeren werkt alleen als je deze publieke sleutel op je secrets-pagina invoert.', - 'spectre_accounts_title' => 'Selecteer de accounts waaruit je wilt importeren', - 'spectre_accounts_text' => 'Links staan de rekeningen die zijn gevonden door Spectre. Ze kunnen worden geïmporteerd in Firefly III. Selecteer er de juiste betaalrekening bij. Verwijder het vinkje als je toch niet van een bepaalde rekening wilt importeren.', - 'spectre_do_import' => 'Ja, importeer van deze rekening', - 'spectre_no_supported_accounts' => 'Je kan helaas niet vanaf deze rekening importeren omdat de valuta niet overeenkomt.', - - // keys from "extra" array: - 'spectre_extra_key_iban' => 'IBAN', - 'spectre_extra_key_swift' => 'SWIFT', - 'spectre_extra_key_status' => 'Status', - 'spectre_extra_key_card_type' => 'Kaarttype', - 'spectre_extra_key_account_name' => 'Rekeningnaam', - 'spectre_extra_key_client_name' => 'Klantnaam', - 'spectre_extra_key_account_number' => 'Rekeningnummer', - 'spectre_extra_key_blocked_amount' => 'Gereserveerd bedrag', - 'spectre_extra_key_available_amount' => 'Beschikbaar bedrag', - 'spectre_extra_key_credit_limit' => 'Kredietlimiet', - 'spectre_extra_key_interest_rate' => 'Rente', - 'spectre_extra_key_expiry_date' => 'Vervaldatum', - 'spectre_extra_key_open_date' => 'Openingsdatum', - 'spectre_extra_key_current_time' => 'Huidige tijd', - 'spectre_extra_key_current_date' => 'Huidige datum', - 'spectre_extra_key_cards' => 'Kaarten', - 'spectre_extra_key_units' => 'Eenheden', - 'spectre_extra_key_unit_price' => 'Prijs per eenheid', - 'spectre_extra_key_transactions_count' => 'Transacties', - - // various other strings: - 'imported_from_account' => 'Geïmporteerd uit ":account"', ]; diff --git a/resources/lang/nl_NL/intro.php b/resources/lang/nl_NL/intro.php index 19344b11b0..777b8f8ad1 100644 --- a/resources/lang/nl_NL/intro.php +++ b/resources/lang/nl_NL/intro.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // index 'index_intro' => 'Welkom op de homepage van Firefly III. Neem even de tijd voor deze introductie zodat je Firefly III leert kennen.', diff --git a/resources/lang/nl_NL/list.php b/resources/lang/nl_NL/list.php index d33a4301c1..cd17c28646 100644 --- a/resources/lang/nl_NL/list.php +++ b/resources/lang/nl_NL/list.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'buttons' => 'Knoppen', 'icon' => 'Icoon', @@ -111,10 +112,15 @@ return [ 'sepa-cc' => 'SEPA vrijwaringscode', 'sepa-ep' => 'SEPA transactiedoeleinde', 'sepa-ci' => 'SEPA crediteuridentificatie', + 'external_id' => 'Externe ID', 'account_at_bunq' => 'Bunq-account', 'file_name' => 'Bestandsnaam', 'file_size' => 'Bestandsgrootte', 'file_type' => 'Bestandstype', 'attached_to' => 'Bijlage van', 'file_exists' => 'Bestand bestaat', + 'spectre_bank' => 'Bank', + 'spectre_last_use' => 'Laatst ingelogd', + 'spectre_status' => 'Status', + 'bunq_payment_id' => 'bunq betalings-ID', ]; diff --git a/resources/lang/nl_NL/pagination.php b/resources/lang/nl_NL/pagination.php index a1caed0187..5be4a5ad33 100644 --- a/resources/lang/nl_NL/pagination.php +++ b/resources/lang/nl_NL/pagination.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'previous' => '« Vorige', 'next' => 'Volgende »', diff --git a/resources/lang/nl_NL/passwords.php b/resources/lang/nl_NL/passwords.php index bb4c4358f6..71bea1d8ce 100644 --- a/resources/lang/nl_NL/passwords.php +++ b/resources/lang/nl_NL/passwords.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'password' => 'Wachtwoorden moeten zes karakters lang zijn, en natuurlijk 2x hetzelfde invoeren.', 'user' => 'Geen gebruiker met dat e-mailadres.', diff --git a/resources/lang/nl_NL/validation.php b/resources/lang/nl_NL/validation.php index d2d1cf9fc7..d5d0537e2b 100644 --- a/resources/lang/nl_NL/validation.php +++ b/resources/lang/nl_NL/validation.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'iban' => 'Dit is niet een geldige IBAN.', 'source_equals_destination' => 'De bronrekening is gelijk aan de doelrekening', @@ -109,7 +110,8 @@ return [ 'in_array' => 'Het :attribute veld bestaat niet in :other.', 'present' => 'Het :attribute veld moet aanwezig zijn.', 'amount_zero' => 'Het totaalbedrag kan niet nul zijn', - 'secure_password' => 'Dit is geen sterk wachtwoord. Probeer het nog een keer. Zie ook: https://goo.gl/NCh2tN', + 'unique_piggy_bank_for_user' => 'De naam van de spaarpot moet uniek zijn.', + 'secure_password' => 'Dit is geen sterk wachtwoord. Probeer het nog een keer. Zie ook: http://bit.ly/FF3-password-security', 'attributes' => [ 'email' => 'e-mailadres', 'description' => 'omschrijving', diff --git a/resources/lang/pl_PL/auth.php b/resources/lang/pl_PL/auth.php index 0ef5506167..cf2ad8e5f2 100644 --- a/resources/lang/pl_PL/auth.php +++ b/resources/lang/pl_PL/auth.php @@ -1,9 +1,8 @@ . */ -return [ - /* - |-------------------------------------------------------------------------- - | Authentication Language Lines - |-------------------------------------------------------------------------- - | - | The following language lines are used during authentication for various - | messages that we need to display to the user. You are free to modify - | these language lines according to your application's requirements. - | - */ +declare(strict_types=1); +return [ 'failed' => 'Te poÅ›wiadczenia nie zgadzajÄ… siÄ™ z naszymi danymi.', 'throttle' => 'Zbyt wiele prób logowania. Spróbuj ponownie za :seconds sekund.', ]; diff --git a/resources/lang/pl_PL/bank.php b/resources/lang/pl_PL/bank.php index 8826020cbf..5d00b1e685 100644 --- a/resources/lang/pl_PL/bank.php +++ b/resources/lang/pl_PL/bank.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ ]; diff --git a/resources/lang/pl_PL/breadcrumbs.php b/resources/lang/pl_PL/breadcrumbs.php index 3652e30e29..29b5e21884 100644 --- a/resources/lang/pl_PL/breadcrumbs.php +++ b/resources/lang/pl_PL/breadcrumbs.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'home' => 'Strona główna', 'edit_currency' => 'Modyfikuj walutÄ™ ":name"', diff --git a/resources/lang/pl_PL/components.php b/resources/lang/pl_PL/components.php index e34586abfd..e9a0269913 100644 --- a/resources/lang/pl_PL/components.php +++ b/resources/lang/pl_PL/components.php @@ -1,5 +1,4 @@ . */ +declare(strict_types=1); + return [ // profile 'personal_access_tokens' => 'Osobisty kod dostÄ™powy', diff --git a/resources/lang/pl_PL/config.php b/resources/lang/pl_PL/config.php index 209a790bfc..eedc86c9af 100644 --- a/resources/lang/pl_PL/config.php +++ b/resources/lang/pl_PL/config.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'html_language' => 'pl', 'locale' => 'pl, Polish, polski, pl_PL, pl_PL.utf8, pl_PL.UTF-8', diff --git a/resources/lang/pl_PL/csv.php b/resources/lang/pl_PL/csv.php index 622a49202a..aae109a40a 100644 --- a/resources/lang/pl_PL/csv.php +++ b/resources/lang/pl_PL/csv.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ ]; diff --git a/resources/lang/pl_PL/demo.php b/resources/lang/pl_PL/demo.php index c6deb76642..b4ca24333f 100644 --- a/resources/lang/pl_PL/demo.php +++ b/resources/lang/pl_PL/demo.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'no_demo_text' => 'Niestety, nie ma dodatkowego tekstu wyjaÅ›niajÄ…cego demo dla tej strony.', 'see_help_icon' => 'Jednakże ikona w prawym górnym rogu może powiedzieć Ci wiÄ™cej.', @@ -32,5 +33,5 @@ return [ 'currencies-index' => 'Firefly obsÅ‚uguje wiele walut. Chociaż domyÅ›lnie jest to euro, można go ustawić na dolara amerykaÅ„skiego i wiele innych walut. Jak widać niewielki wybór walut zostaÅ‚ uwzglÄ™dniony, ale możesz dodać wÅ‚asne, jeÅ›li chcesz. Zmiana domyÅ›lnej waluty nie zmieni waluty istniejÄ…cych transakcji, jednak: Firefly III obsÅ‚uguje korzystanie z wielu walut w tym samym czasie.', 'transactions-index' => 'Te wydatki, depozyty i transfery nie sÄ… szczególnie pomysÅ‚owe. ZostaÅ‚y wygenerowane automatycznie.', 'piggy-banks-index' => 'Jak widać, istniejÄ… trzy skarbonki. Użyj przycisków plus i minus, aby wpÅ‚ynąć na ilość pieniÄ™dzy w każdej skarbonce. Kliknij nazwÄ™ skarbonki, aby zobaczyć administracjÄ™ każdej skarbonki.', - 'import-index' => 'OczywiÅ›cie każdy plik CSV można zaimportować do Firefly III', + 'import-index' => 'Any CSV file can be imported into Firefly III. It also supports importing data from bunq and Spectre. Other banks and financial aggregators will be implemented in the future. As a demo-user however, you can only see the "fake"-provider in action. It will generate some random transactions to show you how the process works.', ]; diff --git a/resources/lang/pl_PL/firefly.php b/resources/lang/pl_PL/firefly.php index b6bb8ed4d9..c904d80cd6 100644 --- a/resources/lang/pl_PL/firefly.php +++ b/resources/lang/pl_PL/firefly.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // general stuff: 'close' => 'Zamknij', @@ -179,6 +180,7 @@ return [ 'authorization_request_intro' => ':client prosi o pozwolenie na dostÄ™p do Twojej administracji finansowej. Czy chcesz pozwolić :client na dostÄ™p do tych danych?', 'scopes_will_be_able' => 'Ta aplikacja bÄ™dzie mogÅ‚a:', 'button_authorize' => 'Autoryzuj', + 'none_in_select_list' => '(none)', // check for updates: 'update_check_title' => 'Sprawdź aktualizacje', @@ -666,6 +668,7 @@ return [ 'bill_will_automatch' => 'Rachunek bÄ™dzie automatycznie powiÄ…zany z pasujÄ…cymi transakcjami', 'skips_over' => 'pomija', 'bill_store_error' => 'WystÄ…piÅ‚ nieoczekiwany bÅ‚Ä…d podczas zapisywania nowego rachunku. Sprawdź pliki dziennika', + 'list_inactive_rule' => 'inactive rule', // accounts: 'details_for_asset' => 'Szczegóły konta aktywów ":name"', @@ -801,6 +804,7 @@ return [ 'opt_group_savingAsset' => 'Konta oszczÄ™dnoÅ›ciowe', 'opt_group_sharedAsset' => 'Współdzielone konta aktywów', 'opt_group_ccAsset' => 'Karty kredytowe', + 'opt_group_cashWalletAsset' => 'Cash wallets', 'notes' => 'Notatki', 'unknown_journal_error' => 'Nie można zapisać transakcji. Sprawdź pliki dziennika.', @@ -816,6 +820,7 @@ return [ 'language' => 'JÄ™zyk', 'new_savings_account' => 'Konto oszczÄ™dnoÅ›ciowe :bank_name', 'cash_wallet' => 'Portfel gotówkowy', + 'currency_not_present' => 'If the currency you normally use is not listed do not worry. You can create your own currencies under Options > Currencies.', // home page: 'yourAccounts' => 'Twoje konta', @@ -1013,6 +1018,7 @@ return [ 'remove_money_from_piggy_title' => 'UsuÅ„ pieniÄ…dze ze skarbonki ":name"', 'add' => 'Dodaj', 'no_money_for_piggy' => 'Nie masz pieniÄ™dzy, które mógÅ‚byÅ› umieÅ›cić w tej skarbonce.', + 'suggested_savings_per_month' => 'Suggested per month', 'remove' => 'UsuÅ„', 'max_amount_add' => 'MaksymalnÄ… kwotÄ…, którÄ… możesz dodać jest', @@ -1148,27 +1154,9 @@ return [ 'no_edit_multiple_left' => 'Nie wybraÅ‚eÅ› żadnych poprawnych transakcji do edycji.', 'cannot_convert_split_journal' => 'Nie można przekonwertować podzielonej transakcji', - // import bread crumbs and titles: - 'import' => 'Importuj', - 'import_data' => 'Importuj dane', - 'import_general_index_file' => 'Importuj plik', - 'import_from_bunq' => 'Importuj z bunq', - 'import_using_spectre' => 'Importuj za pomocÄ… Spectre', - 'import_using_plaid' => 'Importuj za pomocÄ… Plaid', - 'import_config_bread_crumb' => 'Skonfiguruj swój import', - - // import index page: + // Import page (general strings only) 'import_index_title' => 'Importuj dane do Firefly III', - 'import_index_sub_title' => 'Indeks', - 'import_general_index_intro' => 'Witamy w procedurze importu Firefly III. Istnieje kilka sposobów importowania danych do Firefly III.', - 'upload_error' => 'PrzesÅ‚any plik nie może zostać przetworzony. Prawdopodobnie typ pliku lub kodowanie jest bÅ‚Ä™dne. Pliki dziennika zawierajÄ… wiÄ™cej informacji.', - 'reset_import_settings_title' => 'Zresetuj konfiguracjÄ™ importu', - 'reset_import_settings_text' => 'Możesz użyć tych linków, aby zresetować ustawienia importu dla konkretnych dostawców. Jest to przydatne, gdy zÅ‚e ustawienia uniemożliwiajÄ… importowanie danych.', - 'reset_settings_bunq' => 'UsuÅ„ klucz API, lokalny zewnÄ™trzny adres IP oraz klucze RSA zwiÄ…zane z Bunq.', - 'reset_settings_spectre' => 'UsuÅ„ identyfikatory i sekrety Spectre. Spowoduje to również usuniÄ™cie Twojego klucza Spectre. PamiÄ™taj, aby zaktualizować nowy.', - 'settings_reset_for_bunq' => 'Resetowanie ustawieÅ„ Bunq.', - 'settings_reset_for_spectre' => 'Resetowanie ustawieÅ„ Spectre.', - + 'import_data' => 'Importuj dane', // sandstorm.io errors and messages: 'sandstorm_not_available' => 'Ta funkcja nie jest dostÄ™pna, gdy używasz Firefly III w Å›rodowisku Sandstorm.io.', diff --git a/resources/lang/pl_PL/form.php b/resources/lang/pl_PL/form.php index a776638882..e72c91843f 100644 --- a/resources/lang/pl_PL/form.php +++ b/resources/lang/pl_PL/form.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // new user: 'bank_name' => 'Nazwa banku', @@ -184,6 +185,13 @@ return [ 'blocked' => 'Jest zablokowany?', 'blocked_code' => 'Powód blokady', + // import + 'apply_rules' => 'Apply rules', + 'artist' => 'Artist', + 'album' => 'Album', + 'song' => 'Song', + + // admin 'domain' => 'Domena', 'single_user_mode' => 'WyÅ‚Ä…cz rejestracjÄ™ użytkowników', diff --git a/resources/lang/pl_PL/import.php b/resources/lang/pl_PL/import.php index d3d8583a4c..6b2aa6c068 100644 --- a/resources/lang/pl_PL/import.php +++ b/resources/lang/pl_PL/import.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ - // status of import: + // ALL breadcrumbs and subtitles: + 'index_breadcrumb' => 'Import data into Firefly III', + 'prerequisites_breadcrumb_fake' => 'Prerequisites for the fake import provider', + 'prerequisites_breadcrumb_spectre' => 'Prerequisites for Spectre', + 'prerequisites_breadcrumb_bunq' => 'Prerequisites for bunq', + 'job_configuration_breadcrumb' => 'Configuration for ":key"', + 'job_status_breadcrumb' => 'Import status for ":key"', + 'cannot_create_for_provider' => 'Firefly III cannot create a job for the ":provider"-provider.', + + // index page: + 'general_index_title' => 'Import a file', + 'general_index_intro' => 'Welcome to Firefly III\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.', + // import provider strings (index): + 'button_fake' => 'Fake an import', + 'button_file' => 'Import a file', + 'button_bunq' => 'Import from bunq', + 'button_spectre' => 'Import using Spectre', + 'button_plaid' => 'Import using Plaid', + 'button_yodlee' => 'Import using Yodlee', + 'button_quovo' => 'Import using Quovo', + // global config box (index) + 'global_config_title' => 'Global import configuration', + 'global_config_text' => 'In the future, this box will feature preferences that apply to ALL import providers above.', + // prerequisites box (index) + 'need_prereq_title' => 'Import prerequisites', + 'need_prereq_intro' => 'Some import methods need your attention before they can be used. For example, they might require special API keys or application secrets. You can configure them here. The icon indicates if these prerequisites have been met.', + 'do_prereq_fake' => 'Prerequisites for the fake provider', + 'do_prereq_file' => 'Prerequisites for file imports', + 'do_prereq_bunq' => 'Prerequisites for imports from bunq', + 'do_prereq_spectre' => 'Prerequisites for imports using Spectre', + 'do_prereq_plaid' => 'Prerequisites for imports using Plaid', + 'do_prereq_yodlee' => 'Prerequisites for imports using Yodlee', + 'do_prereq_quovo' => 'Prerequisites for imports using Quovo', + // provider config box (index) + 'can_config_title' => 'Import configuration', + 'can_config_intro' => 'Some import methods can be configured to your liking. They have extra settings you can tweak.', + 'do_config_fake' => 'Configuration for the fake provider', + 'do_config_file' => 'Configuration for file imports', + 'do_config_bunq' => 'Configuration for bunq imports', + 'do_config_spectre' => 'Configuration for imports from Spectre', + 'do_config_plaid' => 'Configuration for imports from Plaid', + 'do_config_yodlee' => 'Configuration for imports from Yodlee', + 'do_config_quovo' => 'Configuration for imports from Quovo', + + // prerequisites: + 'prereq_fake_title' => 'Prerequisites for an import from the fake import provider', + 'prereq_fake_text' => 'This fake provider requires a fake API key. It must be 32 characters long. You can use this one: 123456789012345678901234567890AA', + 'prereq_spectre_title' => 'Prerequisites for an import using the Spectre API', + 'prereq_spectre_text' => 'In order to import data using the Spectre API (v4), you must provide Firefly III with two secret values. They can be found on the secrets page.', + 'prereq_spectre_pub' => 'Likewise, the Spectre API needs to know the public key you see below. Without it, it will not recognize you. Please enter this public key on your secrets page.', + 'prereq_bunq_title' => 'Prerequisites for an import from bunq', + 'prereq_bunq_text' => 'In order to import from bunq, you need to obtain an API key. You can do this through the app. Please note that the import function for bunq is in BETA. It has only been tested against the sandbox API.', + 'prereq_bunq_ip' => 'bunq requires your externally facing IP address. Firefly III has tried to fill this in using the ipify service. Make sure this IP address is correct, or the import will fail.', + // prerequisites success messages: + 'prerequisites_saved_for_fake' => 'Fake API key stored successfully!', + 'prerequisites_saved_for_spectre' => 'App ID and secret stored!', + 'prerequisites_saved_for_bunq' => 'API key and IP stored!', + + // job configuration: + 'job_config_apply_rules_title' => 'Job configuration - apply your rules?', + 'job_config_apply_rules_text' => 'Once the fake provider has run, your rules can be applied to the transactions. This adds time to the import.', + 'job_config_input' => 'Your input', + // job configuration for the fake provider: + 'job_config_fake_artist_title' => 'Enter album name', + 'job_config_fake_artist_text' => 'Many import routines have a few configuration steps you must go through. In the case of the fake import provider, you must answer some weird questions. In this case, enter "David Bowie" to continue.', + 'job_config_fake_song_title' => 'Enter song name', + 'job_config_fake_song_text' => 'Mention the song "Golden years" to continue with the fake import.', + 'job_config_fake_album_title' => 'Enter album name', + 'job_config_fake_album_text' => 'Some import routines require extra data halfway through the import. In the case of the fake import provider, you must answer some weird questions. Enter "Station to station" to continue.', + // job configuration form the file provider + 'job_config_file_upload_title' => 'Import setup (1/4) - Upload your file', + 'job_config_file_upload_text' => 'This routine will help you import files from your bank into Firefly III. ', + 'job_config_file_upload_help' => 'Select your file. Please make sure the file is UTF-8 encoded.', + 'job_config_file_upload_config_help' => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their configuration file', + 'job_config_file_upload_type_help' => 'Select the type of file you will upload', + 'job_config_file_upload_submit' => 'Upload files', + 'import_file_type_csv' => 'CSV (wartoÅ›ci oddzielone przecinkami)', + 'file_not_utf8' => 'The file you have uploaded is not encoded as UTF-8 or ASCII. Firefly III cannot handle such files. Please use Notepad++ or Sublime to convert your file to UTF-8.', + 'job_config_uc_title' => 'Import setup (2/4) - Basic file setup', + 'job_config_uc_text' => 'To be able to import your file correctly, please validate the options below.', + 'job_config_uc_header_help' => 'Check this box if the first row of your CSV file are the column titles.', + 'job_config_uc_date_help' => 'Date time format in your file. Follow the format as this page indicates. The default value will parse dates that look like this: :dateExample.', + 'job_config_uc_delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.', + 'job_config_uc_account_help' => 'If your file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the file belong to.', + 'job_config_uc_apply_rules_title' => 'Apply rules', + 'job_config_uc_apply_rules_text' => 'Applies your rules to every imported transaction. Note that this slows the import significantly.', + 'job_config_uc_specifics_title' => 'Bank-specific options', + 'job_config_uc_specifics_txt' => 'Some banks deliver badly formatted files. Firefly III can fix those automatically. If your bank delivers such files but it\'s not listed here, please open an issue on GitHub.', + 'job_config_uc_submit' => 'Continue', + 'invalid_import_account' => 'You have selected an invalid account to import into.', + // job configuration for Spectre: + 'job_config_spectre_login_title' => 'Choose your login', + 'job_config_spectre_login_text' => 'Firefly III has found :count existing login(s) in your Spectre account. Which one would you like to use to import from?', + 'spectre_login_status_active' => 'Active', + 'spectre_login_status_inactive' => 'Inactive', + 'spectre_login_status_disabled' => 'Disabled', + 'spectre_login_new_login' => 'Login with another bank, or one of these banks with different credentials.', + 'job_config_spectre_accounts_title' => 'Select accounts to import from', + 'job_config_spectre_accounts_text' => 'You have selected ":name" (:country). You have :count account(s) available from this provider. Please select the Firefly III asset account(s) where the transactions from these accounts should be stored. Remember, in order to import data both the Firefly III account and the ":name"-account must have the same currency.', + 'spectre_no_supported_accounts' => 'You cannot import from this account due to a currency mismatch.', + 'spectre_do_not_import' => '(do not import)', + 'spectre_no_mapping' => 'It seems you have not selected any accounts to import from.', + 'imported_from_account' => 'Imported from ":account"', + 'spectre_account_with_number' => 'Account :number', + // job configuration for bunq: + 'job_config_bunq_accounts_title' => 'bunq accounts', + 'job_config_bunq_accounts_text' => 'These are the accounts associated with your bunq account. Please select the accounts from which you want to import, and in which account the transactions must be imported.', + 'bunq_no_mapping' => 'It seems you have not selected any accounts.', + 'should_download_config' => 'You should download the configuration file for this job. This will make future imports way easier.', + 'share_config_file' => 'If you have imported data from a public bank, you should share your configuration file so it will be easy for other users to import their data. Sharing your configuration file will not expose your financial details.', + + // keys from "extra" array: + 'spectre_extra_key_iban' => 'IBAN', + 'spectre_extra_key_swift' => 'SWIFT', + 'spectre_extra_key_status' => 'Status', + 'spectre_extra_key_card_type' => 'Card type', + 'spectre_extra_key_account_name' => 'Account name', + 'spectre_extra_key_client_name' => 'Client name', + 'spectre_extra_key_account_number' => 'Account number', + 'spectre_extra_key_blocked_amount' => 'Blocked amount', + 'spectre_extra_key_available_amount' => 'Available amount', + 'spectre_extra_key_credit_limit' => 'Credit limit', + 'spectre_extra_key_interest_rate' => 'Interest rate', + 'spectre_extra_key_expiry_date' => 'Expiry date', + 'spectre_extra_key_open_date' => 'Open date', + 'spectre_extra_key_current_time' => 'Current time', + 'spectre_extra_key_current_date' => 'Current date', + 'spectre_extra_key_cards' => 'Cards', + 'spectre_extra_key_units' => 'Units', + 'spectre_extra_key_unit_price' => 'Unit price', + 'spectre_extra_key_transactions_count' => 'Transaction count', + + // specifics: + 'specific_ing_name' => 'ING NL', + 'specific_ing_descr' => 'Create better descriptions in ING exports', + 'specific_sns_name' => 'SNS / Volksbank NL', + 'specific_sns_descr' => 'Trim quotes from SNS / Volksbank export files', + 'specific_abn_name' => 'ABN AMRO NL', + 'specific_abn_descr' => 'Fixes potential problems with ABN AMRO files', + 'specific_rabo_name' => 'Rabobank NL', + 'specific_rabo_descr' => 'Fixes potential problems with Rabobank files', + 'specific_pres_name' => 'President\'s Choice Financial CA', + 'specific_pres_descr' => 'Fixes potential problems with PC files', + // job configuration for file provider (stage: roles) + 'job_config_roles_title' => 'Import setup (3/4) - Define each column\'s role', + 'job_config_roles_text' => 'Each column in your CSV file contains certain data. Please indicate what kind of data the importer should expect. The option to "map" data means that you will link each entry found in the column to a value in your database. An often mapped column is the column that contains the IBAN of the opposing account. That can be easily matched to IBAN\'s present in your database already.', + 'job_config_roles_submit' => 'Continue', + 'job_config_roles_column_name' => 'Name of column', + 'job_config_roles_column_example' => 'Column example data', + 'job_config_roles_column_role' => 'Column data meaning', + 'job_config_roles_do_map_value' => 'Map these values', + 'job_config_roles_no_example' => 'No example data available', + 'job_config_roles_fa_warning' => 'If you mark a column as containing an amount in a foreign currency, you must also set the column that contains which currency it is.', + 'job_config_roles_rwarning' => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.', + 'job_config_roles_colum_count' => 'Column', + // job config for the file provider (stage: mapping): + 'job_config_map_title' => 'Import setup (4/4) - Connect import data to Firefly III data', + 'job_config_map_text' => 'In the following tables, the left value shows you information found in your uploaded file. It is your task to map this value, if possible, to a value already present in your database. Firefly will stick to this mapping. If there is no value to map to, or you do not wish to map the specific value, select nothing.', + 'job_config_map_nothing' => 'There is no data present in your file that you can map to existing values. Please press "Start the import" to continue.', + 'job_config_field_value' => 'Field value', + 'job_config_field_mapped' => 'Mapped to', + 'map_do_not_map' => '(nie mapuj)', + 'job_config_map_submit' => 'Start the import', + + + // import status page: + 'import_with_key' => 'Import z kluczem \':key\'', 'status_wait_title' => 'ProszÄ™ czekać...', 'status_wait_text' => 'To pole za chwilÄ™ zniknie.', - 'status_fatal_title' => 'WystÄ…piÅ‚ bÅ‚Ä…d krytyczny', - 'status_fatal_text' => 'WystÄ…piÅ‚ bÅ‚Ä…d krytyczny, którego procedura importu nie może naprawić. Zobacz wyjaÅ›nienie na czerwono poniżej.', - 'status_fatal_more' => 'JeÅ›li przekroczono limit czasu, import zostanie zatrzymany w poÅ‚owie. W przypadku niektórych konfiguracji serwerów, jedynie serwer przestaÅ‚ odpowiadać podczas gdy importowanie nadal dziaÅ‚a w tle. Aby to zweryfikować, należy sprawdzić pliki dziennika. JeÅ›li problem bÄ™dzie siÄ™ powtarzaÅ‚, należy rozważyć Importowanie poprzez konsolÄ™.', - 'status_ready_title' => 'Import jest gotowy do uruchomienia', - 'status_ready_text' => 'Import jest gotowy do uruchomienia. CaÅ‚a konfiguracja, którÄ… musisz wykonać, zostaÅ‚a wykonana. ProszÄ™ pobierz plik konfiguracyjny. Pomoże Ci w imporcie, jeÅ›li nie pójdzie zgodnie z planem. Aby faktycznie uruchomić import, możesz wykonać nastÄ™pujÄ…ce polecenie w konsoli lub uruchomić importowanie przez przeglÄ…darkÄ™ www. W zależnoÅ›ci od konfiguracji import przez konsolÄ™ daje wiÄ™cej informacji zwrotnych.', - 'status_ready_noconfig_text' => 'Import jest gotowy do uruchomienia. CaÅ‚a konfiguracja, którÄ… musisz wykonać, zostaÅ‚a wykonana. Aby faktycznie uruchomić import, możesz wykonać nastÄ™pujÄ…ce polecenie w konsoli lub uruchomić importowanie przez przeglÄ…darkÄ™ www. W zależnoÅ›ci od konfiguracji import przez konsolÄ™ daje wiÄ™cej informacji zwrotnych.', - 'status_ready_config' => 'Pobierz konfiguracjÄ™', - 'status_ready_start' => 'Rozpocznij Importowanie', - 'status_ready_share' => 'Rozważ pobranie konfiguracji i udostÄ™pnienie jej w centrum konfiguracyjnym portali. Umożliwi to innym użytkownikom Firefly III Å‚atwiejsze importowanie plików.', - 'status_job_new' => 'Zadanie jest zupeÅ‚nie nowe.', - 'status_job_configuring' => 'Import jest konfigurowany.', - 'status_job_configured' => 'Import jest skonfigurowany.', - 'status_job_running' => 'Import w toku... ProszÄ™ czekać..', - 'status_job_error' => 'Zadanie wygenerowaÅ‚o bÅ‚Ä…d.', - 'status_job_finished' => 'Importowanie zostaÅ‚o zakoÅ„czone!', 'status_running_title' => 'Trwa importowanie', - 'status_running_placeholder' => 'ProszÄ™ czekać na aktualizacjÄ™...', - 'status_finished_title' => 'ZakoÅ„czono procedurÄ™ importu', - 'status_finished_text' => 'Twoje dane zostaÅ‚y zaimportowane.', - 'status_errors_title' => 'BÅ‚Ä™dy podczas importowania', - 'status_errors_single' => 'WystÄ…piÅ‚ bÅ‚Ä…d podczas importowania. Nie wydaje siÄ™ być krytyczny.', - 'status_errors_multi' => 'WystÄ…piÅ‚y bÅ‚Ä™dy podczas importowania. Nie wydajÄ… siÄ™ być krytyczne.', - 'status_bread_crumb' => 'Status importu', - 'status_sub_title' => 'Status importu', - 'config_sub_title' => 'Skonfiguruj import', - 'status_finished_job' => 'Zaimportowane transakcje (:count) znajdujÄ… siÄ™ w tagu :tag.', - 'status_finished_no_tag' => 'Firefly III nie zaimportowaÅ‚ żadnych transakcji z twojego pliku.', - 'import_with_key' => 'Import z kluczem \':key\'', + 'status_job_running' => 'Please wait, running the import...', + 'status_job_storing' => 'Please wait, storing data...', + 'status_job_rules' => 'Please wait, running rules...', + 'status_fatal_title' => 'Fatal error', + 'status_fatal_text' => 'The import has suffered from an error it could not recover from. Apologies!', + 'status_fatal_more' => 'This (possibly very cryptic) error message is complemented by log files, which you can find on your hard drive, or in the Docker container where you run Firefly III from.', + 'status_finished_title' => 'Import finished', + 'status_finished_text' => 'The import has finished.', + 'finished_with_errors' => 'There were some errors during the import. Please review them carefully.', + 'unknown_import_result' => 'Unknown import result', + 'result_no_transactions' => 'No transactions have been imported. Perhaps they were all duplicates is simply no transactions where present to be imported. Perhaps the log files can tell you what happened. If you import data regularly, this is normal.', + 'result_one_transaction' => 'Exactly one transaction has been imported. It is stored under tag :tag where you can inspect it further.', + 'result_many_transactions' => 'Firefly III has imported :count transactions. They are stored under tag :tag where you can inspect them further.', - // file, upload something - 'file_upload_title' => 'Konfiguracja importu (1/4) - PrzeÅ›lij swój plik', - 'file_upload_text' => 'Ta procedura pomoże Ci importować pliki z twojego banku do Firefly III. Sprawdź stronÄ™ pomocy w prawym górnym rogu.', - 'file_upload_fields' => 'Pola', - 'file_upload_help' => 'Wybierz swój plik', - 'file_upload_config_help' => 'JeÅ›li wczeÅ›niej importowaÅ‚eÅ› dane do Firefly III, możesz posiadać plik konfiguracji, który wstÄ™pnie ustawi wartoÅ›ci parametrów konfiguracyjnych za Ciebie. Dla niektórych banków, inni użytkownicy uprzejmie dostarczyli swoje pliki konfiguracji', - 'file_upload_type_help' => 'Wybierz typ pliku, który bÄ™dziesz przesyÅ‚ać', - 'file_upload_submit' => 'PrzeÅ›lij pliki', - // file, upload types - 'import_file_type_csv' => 'CSV (wartoÅ›ci oddzielone przecinkami)', + // general errors and warnings: + 'bad_job_status' => 'To access this page, your import job cannot have status ":status".', - // file, initial config for CSV - 'csv_initial_title' => 'Konfiguracja importu (2/4) - Podstawowa konfiguracja importu CSV', - 'csv_initial_text' => 'Aby móc poprawnie zaimportować plik, sprawdź poprawność poniższych opcji.', - 'csv_initial_box' => 'Podstawowa konfiguracja importu CSV', - 'csv_initial_box_title' => 'Podstawowe opcje konfiguracji importu CSV', - 'csv_initial_header_help' => 'Zaznacz to pole, jeÅ›li pierwszy wiersz w pliku CSV to nazwy kolumn.', - 'csv_initial_date_help' => 'Format daty i czasu w pliku CSV. Format powinien być zgodny z opisem na tej stronie. Wartość domyÅ›lna bÄ™dzie analizować daty, które wyglÄ…dajÄ… nastÄ™pujÄ…co: :dateExample.', - 'csv_initial_delimiter_help' => 'Wybierz separator pola, który jest używany w pliku wejÅ›ciowym. JeÅ›li nie jesteÅ› pewien, przecinek jest najbezpieczniejszym rozwiÄ…zaniem.', - 'csv_initial_import_account_help' => 'JeÅ›li Twój plik CSV NIE zawiera informacji o Twoich kontach aktywów, użyj tego menu, aby wybrać, do którego konta należą transakcje w pliku CSV.', - 'csv_initial_submit' => 'Przejdź do kroku 3/4', - - // file, new options: - 'file_apply_rules_title' => 'Zastosuj reguÅ‚y', - 'file_apply_rules_description' => 'Zastosuj swoje reguÅ‚y. Zwróć uwagÄ™, że to znacznie spowalnia importowanie.', - 'file_match_bills_title' => 'Dopasuj rachunki', - 'file_match_bills_description' => 'Dopasuj swoje rachunki do nowo utworzonych wypÅ‚at. Zwróć uwagÄ™, że to znacznie spowalnia importowanie.', - - // file, roles config - 'csv_roles_title' => 'Konfiguracja importu (3/4) - Zdefiniuj rolÄ™ każdej kolumny', - 'csv_roles_text' => 'Każda kolumna w pliku CSV zawiera okreÅ›lone dane. ProszÄ™ wskazać, jakiego rodzaju danych importer powinien oczekiwać. Opcja "mapowania" danych oznacza, że każdy wpis znaleziony w kolumnie zostanie poÅ‚Ä…czony z wartoÅ›ciÄ… w bazie danych. CzÄ™sto odwzorowywana kolumna to kolumna zawierajÄ…ca numer IBAN konta przeciwnego. Można go Å‚atwo dopasować do obecnego numeru IBAN w bazie danych.', - 'csv_roles_table' => 'Tabela', - 'csv_roles_column_name' => 'Nazwa kolumny', - 'csv_roles_column_example' => 'PrzykÅ‚adowe dane kolumny', - 'csv_roles_column_role' => 'Znaczenie danych w kolumnie', - 'csv_roles_do_map_value' => 'Zmapuj te wartoÅ›ci', - 'csv_roles_column' => 'Kolumna', - 'csv_roles_no_example_data' => 'Brak przykÅ‚adowych danych', - 'csv_roles_submit' => 'Przejdź do kroku 4/4', - - // not csv, but normal warning - 'roles_warning' => 'Zaznacz jednÄ… z kolumn jako kolumnÄ™ z kwotami. Wskazane jest również wybranie kolumny dla opisu, daty oraz konta przeciwnego.', - 'foreign_amount_warning' => 'JeÅ›li zaznaczysz kolumnÄ™ jako zawierajÄ…cÄ… kwotÄ™ w obcej walucie, musisz także ustawić kolumnÄ™, która zawiera kod tej waluty.', - - // file, map data - 'file_map_title' => 'Ustawienia importu (4/4) - PoÅ‚Ä…cz dane importu z danymi Firefly III', - 'file_map_text' => 'W poniższych tabelach lewa wartość pokazuje informacje znalezione w przesÅ‚anym pliku. Twoim zadaniem jest zamapowanie tej wartoÅ›ci, jeÅ›li to możliwe, na wartość już obecnÄ… w bazie danych. Firefly bÄ™dzie trzymać siÄ™ tego mapowania. JeÅ›li nie ma wartoÅ›ci do odwzorowania lub nie chcesz mapować okreÅ›lonej wartoÅ›ci, nie wybieraj niczego.', - 'file_map_field_value' => 'Wartość pola', - 'file_map_field_mapped_to' => 'Zmapowane do', - 'map_do_not_map' => '(nie mapuj)', - 'file_map_submit' => 'Rozpocznij import', - 'file_nothing_to_map' => 'W twoim pliku nie ma danych, które można by odwzorować na istniejÄ…ce wartoÅ›ci. NaciÅ›nij "Rozpocznij import", aby kontynuować.', - - // map things. + // column roles for CSV import: 'column__ignore' => '(zignoruj tÄ™ kolumnÄ™)', 'column_account-iban' => 'Konto aktywów (IBAN)', 'column_account-id' => 'ID konta aktywów (z bazy FF3)', @@ -158,48 +261,4 @@ return [ 'column_note' => 'Notatki', 'column_internal-reference' => 'Internal reference', - // prerequisites - 'prerequisites' => 'Wymagania', - - // bunq - 'bunq_prerequisites_title' => 'Wymagania wstÄ™pne dla importu z bunq', - 'bunq_prerequisites_text' => 'Aby importować z Bunq, musisz uzyskać klucz API. Możesz to zrobić za pomocÄ… aplikacji. Zwróć uwagÄ™, że funkcja importu z Bunq jest w wersji BETA. ZostaÅ‚a przetestowana tylko przy użyciu testowej wersji API.', - 'bunq_prerequisites_text_ip' => 'Bunq musi znać zewnÄ™trzny adres IP Twojego serwera. Firefly III próbowaÅ‚ ustalić go używajÄ…c usÅ‚ugi ipify. Upewnij siÄ™, że ten adres IP jest poprawny albo import siÄ™ nie powiedzie.', - 'bunq_do_import' => 'Tak, importuj z tego konta', - 'bunq_accounts_title' => 'Konta Bunq', - 'bunq_accounts_text' => 'Te konta sÄ… powiÄ…zane z Twoim kontem Bunq. Wybierz konta, z których chcesz importować transakcje i na które konto majÄ… trafić.', - - // Spectre - 'spectre_title' => 'Importuj za pomocÄ… Spectre', - 'spectre_prerequisites_title' => 'Wymagania wstÄ™pne do importowania za pomocÄ… Spectre', - 'spectre_prerequisites_text' => 'Aby importować dane za pomocÄ… interfejsu Spectre API (v4), musisz dostarczyć Firefly III dwie sekretne wartoÅ›ci. Można je znaleźć na stronie sekretów.', - 'spectre_enter_pub_key' => 'Importowanie bÄ™dzie dziaÅ‚ać tylko po wpisaniu tego klucza publicznego na stronie zabezpieczeÅ„.', - 'spectre_accounts_title' => 'Wybierz konta do zaimportowania z', - 'spectre_accounts_text' => 'Każde konto po lewej stronie zostaÅ‚o znalezione przez Spectre i może zostać zaimportowane do Firefly III. Wybierz konto aktywów, które powinno zawierać dane transakcje. JeÅ›li nie chcesz importować z żadnego konkretnego konta, usuÅ„ zaznaczenie z pola wyboru.', - 'spectre_do_import' => 'Tak, importuj z tego konta', - 'spectre_no_supported_accounts' => 'Nie można importować z tego konta z powodu niedopasowania waluty.', - - // keys from "extra" array: - 'spectre_extra_key_iban' => 'IBAN', - 'spectre_extra_key_swift' => 'Kod SWIFT', - 'spectre_extra_key_status' => 'Status', - 'spectre_extra_key_card_type' => 'Typ karty', - 'spectre_extra_key_account_name' => 'Nazwa konta', - 'spectre_extra_key_client_name' => 'Nazwa klienta', - 'spectre_extra_key_account_number' => 'Numer konta', - 'spectre_extra_key_blocked_amount' => 'Zablokowana kwota', - 'spectre_extra_key_available_amount' => 'DostÄ™pna kwota', - 'spectre_extra_key_credit_limit' => 'Limit kredytowy', - 'spectre_extra_key_interest_rate' => 'Oprocentowanie', - 'spectre_extra_key_expiry_date' => 'Data wygaÅ›niÄ™cia', - 'spectre_extra_key_open_date' => 'Data otwarcia', - 'spectre_extra_key_current_time' => 'Aktualny czas', - 'spectre_extra_key_current_date' => 'Aktualna data', - 'spectre_extra_key_cards' => 'Karty', - 'spectre_extra_key_units' => 'Jednostki', - 'spectre_extra_key_unit_price' => 'Cena jednostkowa', - 'spectre_extra_key_transactions_count' => 'Liczba transakcji', - - // various other strings: - 'imported_from_account' => 'Zaimportowane z ":account"', ]; diff --git a/resources/lang/pl_PL/intro.php b/resources/lang/pl_PL/intro.php index 678cae900d..4691ce970d 100644 --- a/resources/lang/pl_PL/intro.php +++ b/resources/lang/pl_PL/intro.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // index 'index_intro' => 'Witamy na stronie domowej Firefly III. ProszÄ™ poÅ›więć trochÄ™ czasu, aby przejść przez to wprowadzenie, aby poznać sposób dziaÅ‚ania Firefly III.', diff --git a/resources/lang/pl_PL/list.php b/resources/lang/pl_PL/list.php index f1c0f0df46..a18fe7286e 100644 --- a/resources/lang/pl_PL/list.php +++ b/resources/lang/pl_PL/list.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'buttons' => 'Przyciski', 'icon' => 'Ikona', @@ -111,10 +112,15 @@ return [ 'sepa-cc' => 'SEPA Clearing Code', 'sepa-ep' => 'SEPA External Purpose', 'sepa-ci' => 'SEPA Creditor Identifier', + 'external_id' => 'External ID', 'account_at_bunq' => 'Konto bunq', 'file_name' => 'Nazwa pliku', 'file_size' => 'Rozmiar pliku', 'file_type' => 'Typ pliku', 'attached_to' => 'DoÅ‚Ä…czony do', 'file_exists' => 'Plik istnieje', + 'spectre_bank' => 'Bank', + 'spectre_last_use' => 'Last login', + 'spectre_status' => 'Status', + 'bunq_payment_id' => 'bunq payment ID', ]; diff --git a/resources/lang/pl_PL/pagination.php b/resources/lang/pl_PL/pagination.php index af92d3252f..a05d28de8a 100644 --- a/resources/lang/pl_PL/pagination.php +++ b/resources/lang/pl_PL/pagination.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'previous' => '« Poprzednia', 'next' => 'NastÄ™pna »', diff --git a/resources/lang/pl_PL/passwords.php b/resources/lang/pl_PL/passwords.php index 0d9391ebfb..56dbe0f1e0 100644 --- a/resources/lang/pl_PL/passwords.php +++ b/resources/lang/pl_PL/passwords.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'password' => 'HasÅ‚o musi zawierać przynajmniej 6 znaków i musi siÄ™ zgadzać z potwierdzeniem.', 'user' => 'Nie możemy znaleźć użytkownika o podanym adresie email.', diff --git a/resources/lang/pl_PL/validation.php b/resources/lang/pl_PL/validation.php index d73aa32b3e..0ae9b71c19 100644 --- a/resources/lang/pl_PL/validation.php +++ b/resources/lang/pl_PL/validation.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'iban' => 'To nie jest prawidÅ‚owy IBAN.', 'source_equals_destination' => 'Konto źródÅ‚owe jest równe kontu docelowemu', @@ -109,7 +110,8 @@ return [ 'in_array' => 'Pole :attribute nie istnieje w :other.', 'present' => 'Pole :attribute musi być obecne.', 'amount_zero' => 'CaÅ‚kowita kwota nie może być zerem', - 'secure_password' => 'To nie jest bezpieczne hasÅ‚o. ProszÄ™ spróbować ponownie. Aby uzyskać wiÄ™cej informacji odwiedź https://goo.gl/NCh2tN', + 'unique_piggy_bank_for_user' => 'The name of the piggy bank must be unique.', + 'secure_password' => 'This is not a secure password. Please try again. For more information, visit http://bit.ly/FF3-password-security', 'attributes' => [ 'email' => 'adres e-mail', 'description' => 'opis', diff --git a/resources/lang/pt_BR/auth.php b/resources/lang/pt_BR/auth.php index ee4a1c829d..dc7186514c 100644 --- a/resources/lang/pt_BR/auth.php +++ b/resources/lang/pt_BR/auth.php @@ -1,9 +1,8 @@ . */ -return [ - /* - |-------------------------------------------------------------------------- - | Authentication Language Lines - |-------------------------------------------------------------------------- - | - | The following language lines are used during authentication for various - | messages that we need to display to the user. You are free to modify - | these language lines according to your application's requirements. - | - */ +declare(strict_types=1); +return [ 'failed' => 'Essas credenciais não correspondem aos nossos registros.', 'throttle' => 'Muitas tentativas de login. Por favor, tente novamente em :seconds segundos.', ]; diff --git a/resources/lang/pt_BR/bank.php b/resources/lang/pt_BR/bank.php index 8826020cbf..5d00b1e685 100644 --- a/resources/lang/pt_BR/bank.php +++ b/resources/lang/pt_BR/bank.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ ]; diff --git a/resources/lang/pt_BR/breadcrumbs.php b/resources/lang/pt_BR/breadcrumbs.php index 4f2f721059..793571ed1c 100644 --- a/resources/lang/pt_BR/breadcrumbs.php +++ b/resources/lang/pt_BR/breadcrumbs.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'home' => 'Início', 'edit_currency' => 'Editar moeda ":name"', @@ -41,7 +42,7 @@ return [ 'deposit_list' => 'Receitas, renda e depósitos', 'transfer_list' => 'Transferências', 'transfers_list' => 'Transferências', - 'reconciliation_list' => 'Reconciliação', + 'reconciliation_list' => 'Reconciliações', 'create_withdrawal' => 'Criar uma nova retirada', 'create_deposit' => 'Criar um novo depósito', 'create_transfer' => 'Criar nova transferência', diff --git a/resources/lang/pt_BR/components.php b/resources/lang/pt_BR/components.php index ec68877f92..2e02694ebe 100644 --- a/resources/lang/pt_BR/components.php +++ b/resources/lang/pt_BR/components.php @@ -1,5 +1,4 @@ . */ +declare(strict_types=1); + return [ // profile 'personal_access_tokens' => 'Tokens de acesso pessoal', diff --git a/resources/lang/pt_BR/config.php b/resources/lang/pt_BR/config.php index 10ca3f6f95..ce507e8a05 100644 --- a/resources/lang/pt_BR/config.php +++ b/resources/lang/pt_BR/config.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'html_language' => 'pt-br', 'locale' => 'pt-br, pt_BR, pt_BR.utf8, pt_BR.UTF-8', diff --git a/resources/lang/pt_BR/csv.php b/resources/lang/pt_BR/csv.php index 622a49202a..aae109a40a 100644 --- a/resources/lang/pt_BR/csv.php +++ b/resources/lang/pt_BR/csv.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ ]; diff --git a/resources/lang/pt_BR/demo.php b/resources/lang/pt_BR/demo.php index 9d53564571..b6960bda12 100644 --- a/resources/lang/pt_BR/demo.php +++ b/resources/lang/pt_BR/demo.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'no_demo_text' => 'Desculpe, não há nenhum texto extra de explicação para esta página.', 'see_help_icon' => 'No entanto, o -ícone no canto superior direito pode lhe dizer mais.', @@ -32,5 +33,5 @@ return [ 'currencies-index' => 'Firefly III oferece suporte a várias moedas. Embora o padrão seja o Euro, ela pode ser definida para o dólar americano e muitas outras moedas. Como você pode ver uma pequena seleção de moedas foi incluída, mas você pode adicionar suas próprias se desejar. No entanto, alterar a moeda padrão não vai mudar a moeda de transações existentes: Firefly III suporta o uso de várias moedas ao mesmo tempo.', 'transactions-index' => 'Estas despesas, depósitos e transferências não são fantasiosas. Elas foram geradas automaticamente.', 'piggy-banks-index' => 'Como você pode ver, existem três cofrinhos. Use o sinal de mais e menos botões para influenciar a quantidade de dinheiro em cada cofrinho. Clique no nome do cofrinho para ver a administração de cada cofrinho.', - 'import-index' => 'Sim, qualquer arquivo CSV pode ser importado para Firefly III', + 'import-index' => 'Qualquer arquivo CSV pode ser importado para o Firefly III. Importações de dados de bunq e Specter também são suportadas. Outros bancos e agregadores financeiros serão implementados futuramente. Como usuário de demonstração, no entanto, você só pode ver o provedor "falso" em ação. Ele irá gerar transações aleatórias para lhe mostrar como funciona o processo.', ]; diff --git a/resources/lang/pt_BR/firefly.php b/resources/lang/pt_BR/firefly.php index 39de222884..988bf0b85a 100644 --- a/resources/lang/pt_BR/firefly.php +++ b/resources/lang/pt_BR/firefly.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // general stuff: 'close' => 'Fechar', @@ -179,6 +180,7 @@ return [ 'authorization_request_intro' => ':client está pedindo permissão para acessar sua administração financeira. Gostaria de autorizar :client para acessar esses registros?', 'scopes_will_be_able' => 'Esta aplicação será capaz de:', 'button_authorize' => 'Autorizar', + 'none_in_select_list' => '(none)', // check for updates: 'update_check_title' => 'Verificar Atualizações', @@ -541,7 +543,7 @@ return [ 'attachment_deleted' => 'Anexo apagado ":name"', 'attachment_updated' => 'Anexo atualizado ":name"', 'upload_max_file_size' => 'Tamanho máximo do arquivo: :size', - 'list_all_attachments' => 'List of all attachments', + 'list_all_attachments' => 'Lista de todos os anexos', // transaction index 'title_expenses' => 'Despesas', @@ -666,6 +668,7 @@ return [ 'bill_will_automatch' => 'A fatura será automaticamente vinculada a transações correspondentes', 'skips_over' => 'ignorar', 'bill_store_error' => 'Um erro inesperado ocorreu ao armazenar sua nova fatura. Por favor, verifique os arquivos de log', + 'list_inactive_rule' => 'inactive rule', // accounts: 'details_for_asset' => 'Detalhes para a conta de ativo ":name"', @@ -801,6 +804,7 @@ return [ 'opt_group_savingAsset' => 'Contas de poupança', 'opt_group_sharedAsset' => 'Contas de ativos compartilhadas', 'opt_group_ccAsset' => 'Cartões de crédito', + 'opt_group_cashWalletAsset' => 'Cash wallets', 'notes' => 'Notas', 'unknown_journal_error' => 'A transação não pôde ser armazenada. Por favor, verifique os arquivos de log.', @@ -816,6 +820,7 @@ return [ 'language' => 'Idioma', 'new_savings_account' => 'Conta de poupança :bank_name', 'cash_wallet' => 'Carteira de dinheiro', + 'currency_not_present' => 'If the currency you normally use is not listed do not worry. You can create your own currencies under Options > Currencies.', // home page: 'yourAccounts' => 'Suas contas', @@ -1013,6 +1018,7 @@ return [ 'remove_money_from_piggy_title' => 'Retire o dinheiro do cofrinho ":name"', 'add' => 'Adicionar', 'no_money_for_piggy' => 'Você não tem dinheiro para colocar nessa poupança.', + 'suggested_savings_per_month' => 'Suggested per month', 'remove' => 'Remover', 'max_amount_add' => 'É a quantidade máxima que você pode adicionar é', @@ -1148,27 +1154,9 @@ return [ 'no_edit_multiple_left' => 'Você não selecionou nenhuma transação válida para editar.', 'cannot_convert_split_journal' => 'Não é possível converter uma transação dividida', - // import bread crumbs and titles: - 'import' => 'Importar', - 'import_data' => 'Importar dados', - 'import_general_index_file' => 'Importar um arquivo', - 'import_from_bunq' => 'Importar de bunq', - 'import_using_spectre' => 'Importar usando Spectre', - 'import_using_plaid' => 'Importar usando Plaid', - 'import_config_bread_crumb' => 'Configurar a sua importação', - - // import index page: + // Import page (general strings only) 'import_index_title' => 'Importar dados para o Firefly III', - 'import_index_sub_title' => 'Ãndice', - 'import_general_index_intro' => 'Bem-vindo à rotina de importação do Firefly III. Existem algumas maneiras de importar dados no Firefly III, exibidos aqui como botões.', - 'upload_error' => 'O arquivo que você enviou não pôde ser processado. Possivelmente trata-se de tipo ou codificação inválidos de arquivo. Os arquivos de log terão mais informações.', - 'reset_import_settings_title' => 'Redefinir configuração de importação', - 'reset_import_settings_text' => 'You can use these links to reset your import settings for specific providers. This is useful when bad settings stop you from importing data.', - 'reset_settings_bunq' => 'Remove bunq API key, local external IP address and bunq related RSA keys.', - 'reset_settings_spectre' => 'Remove Spectre secrets and ID\'s. This will also remove your Spectre keypair. Remember to update the new one.', - 'settings_reset_for_bunq' => 'Bunq settings reset.', - 'settings_reset_for_spectre' => 'Spectre settings reset.', - + 'import_data' => 'Importar dados', // sandstorm.io errors and messages: 'sandstorm_not_available' => 'Esta função não está disponível quando você está usando o Firefly III dentro de um ambiente Sandstorm.io.', diff --git a/resources/lang/pt_BR/form.php b/resources/lang/pt_BR/form.php index aaed0019ec..f31a9d819a 100644 --- a/resources/lang/pt_BR/form.php +++ b/resources/lang/pt_BR/form.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // new user: 'bank_name' => 'Nome do banco', @@ -184,6 +185,13 @@ return [ 'blocked' => 'Está bloqueado?', 'blocked_code' => 'Razão para ser reportado', + // import + 'apply_rules' => 'Apply rules', + 'artist' => 'Artist', + 'album' => 'Album', + 'song' => 'Song', + + // admin 'domain' => 'Domínio', 'single_user_mode' => 'Desabilitar registro de usuários', @@ -203,7 +211,7 @@ return [ 'service_secret' => 'Service secret', 'app_secret' => 'App secret', 'app_id' => 'App ID', - 'secret' => 'Secret', + 'secret' => 'Segredo', 'public_key' => 'Chave pública', 'country_code' => 'Código do país', 'provider_code' => 'Banco ou provedor de dados', diff --git a/resources/lang/pt_BR/import.php b/resources/lang/pt_BR/import.php index 1c8b8af545..377665273f 100644 --- a/resources/lang/pt_BR/import.php +++ b/resources/lang/pt_BR/import.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ - // status of import: + // ALL breadcrumbs and subtitles: + 'index_breadcrumb' => 'Import data into Firefly III', + 'prerequisites_breadcrumb_fake' => 'Prerequisites for the fake import provider', + 'prerequisites_breadcrumb_spectre' => 'Prerequisites for Spectre', + 'prerequisites_breadcrumb_bunq' => 'Prerequisites for bunq', + 'job_configuration_breadcrumb' => 'Configuration for ":key"', + 'job_status_breadcrumb' => 'Import status for ":key"', + 'cannot_create_for_provider' => 'Firefly III cannot create a job for the ":provider"-provider.', + + // index page: + 'general_index_title' => 'Import a file', + 'general_index_intro' => 'Welcome to Firefly III\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.', + // import provider strings (index): + 'button_fake' => 'Fake an import', + 'button_file' => 'Import a file', + 'button_bunq' => 'Import from bunq', + 'button_spectre' => 'Import using Spectre', + 'button_plaid' => 'Import using Plaid', + 'button_yodlee' => 'Import using Yodlee', + 'button_quovo' => 'Import using Quovo', + // global config box (index) + 'global_config_title' => 'Global import configuration', + 'global_config_text' => 'In the future, this box will feature preferences that apply to ALL import providers above.', + // prerequisites box (index) + 'need_prereq_title' => 'Import prerequisites', + 'need_prereq_intro' => 'Some import methods need your attention before they can be used. For example, they might require special API keys or application secrets. You can configure them here. The icon indicates if these prerequisites have been met.', + 'do_prereq_fake' => 'Prerequisites for the fake provider', + 'do_prereq_file' => 'Prerequisites for file imports', + 'do_prereq_bunq' => 'Prerequisites for imports from bunq', + 'do_prereq_spectre' => 'Prerequisites for imports using Spectre', + 'do_prereq_plaid' => 'Prerequisites for imports using Plaid', + 'do_prereq_yodlee' => 'Prerequisites for imports using Yodlee', + 'do_prereq_quovo' => 'Prerequisites for imports using Quovo', + // provider config box (index) + 'can_config_title' => 'Import configuration', + 'can_config_intro' => 'Some import methods can be configured to your liking. They have extra settings you can tweak.', + 'do_config_fake' => 'Configuration for the fake provider', + 'do_config_file' => 'Configuration for file imports', + 'do_config_bunq' => 'Configuration for bunq imports', + 'do_config_spectre' => 'Configuration for imports from Spectre', + 'do_config_plaid' => 'Configuration for imports from Plaid', + 'do_config_yodlee' => 'Configuration for imports from Yodlee', + 'do_config_quovo' => 'Configuration for imports from Quovo', + + // prerequisites: + 'prereq_fake_title' => 'Prerequisites for an import from the fake import provider', + 'prereq_fake_text' => 'This fake provider requires a fake API key. It must be 32 characters long. You can use this one: 123456789012345678901234567890AA', + 'prereq_spectre_title' => 'Prerequisites for an import using the Spectre API', + 'prereq_spectre_text' => 'In order to import data using the Spectre API (v4), you must provide Firefly III with two secret values. They can be found on the secrets page.', + 'prereq_spectre_pub' => 'Likewise, the Spectre API needs to know the public key you see below. Without it, it will not recognize you. Please enter this public key on your secrets page.', + 'prereq_bunq_title' => 'Prerequisites for an import from bunq', + 'prereq_bunq_text' => 'In order to import from bunq, you need to obtain an API key. You can do this through the app. Please note that the import function for bunq is in BETA. It has only been tested against the sandbox API.', + 'prereq_bunq_ip' => 'bunq requires your externally facing IP address. Firefly III has tried to fill this in using the ipify service. Make sure this IP address is correct, or the import will fail.', + // prerequisites success messages: + 'prerequisites_saved_for_fake' => 'Fake API key stored successfully!', + 'prerequisites_saved_for_spectre' => 'App ID and secret stored!', + 'prerequisites_saved_for_bunq' => 'API key and IP stored!', + + // job configuration: + 'job_config_apply_rules_title' => 'Job configuration - apply your rules?', + 'job_config_apply_rules_text' => 'Once the fake provider has run, your rules can be applied to the transactions. This adds time to the import.', + 'job_config_input' => 'Your input', + // job configuration for the fake provider: + 'job_config_fake_artist_title' => 'Enter album name', + 'job_config_fake_artist_text' => 'Many import routines have a few configuration steps you must go through. In the case of the fake import provider, you must answer some weird questions. In this case, enter "David Bowie" to continue.', + 'job_config_fake_song_title' => 'Enter song name', + 'job_config_fake_song_text' => 'Mention the song "Golden years" to continue with the fake import.', + 'job_config_fake_album_title' => 'Enter album name', + 'job_config_fake_album_text' => 'Some import routines require extra data halfway through the import. In the case of the fake import provider, you must answer some weird questions. Enter "Station to station" to continue.', + // job configuration form the file provider + 'job_config_file_upload_title' => 'Import setup (1/4) - Upload your file', + 'job_config_file_upload_text' => 'This routine will help you import files from your bank into Firefly III. ', + 'job_config_file_upload_help' => 'Select your file. Please make sure the file is UTF-8 encoded.', + 'job_config_file_upload_config_help' => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their configuration file', + 'job_config_file_upload_type_help' => 'Select the type of file you will upload', + 'job_config_file_upload_submit' => 'Upload files', + 'import_file_type_csv' => 'CSV (valores separados por vírgula)', + 'file_not_utf8' => 'The file you have uploaded is not encoded as UTF-8 or ASCII. Firefly III cannot handle such files. Please use Notepad++ or Sublime to convert your file to UTF-8.', + 'job_config_uc_title' => 'Import setup (2/4) - Basic file setup', + 'job_config_uc_text' => 'To be able to import your file correctly, please validate the options below.', + 'job_config_uc_header_help' => 'Check this box if the first row of your CSV file are the column titles.', + 'job_config_uc_date_help' => 'Date time format in your file. Follow the format as this page indicates. The default value will parse dates that look like this: :dateExample.', + 'job_config_uc_delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.', + 'job_config_uc_account_help' => 'If your file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the file belong to.', + 'job_config_uc_apply_rules_title' => 'Apply rules', + 'job_config_uc_apply_rules_text' => 'Applies your rules to every imported transaction. Note that this slows the import significantly.', + 'job_config_uc_specifics_title' => 'Bank-specific options', + 'job_config_uc_specifics_txt' => 'Some banks deliver badly formatted files. Firefly III can fix those automatically. If your bank delivers such files but it\'s not listed here, please open an issue on GitHub.', + 'job_config_uc_submit' => 'Continue', + 'invalid_import_account' => 'You have selected an invalid account to import into.', + // job configuration for Spectre: + 'job_config_spectre_login_title' => 'Choose your login', + 'job_config_spectre_login_text' => 'Firefly III has found :count existing login(s) in your Spectre account. Which one would you like to use to import from?', + 'spectre_login_status_active' => 'Active', + 'spectre_login_status_inactive' => 'Inactive', + 'spectre_login_status_disabled' => 'Disabled', + 'spectre_login_new_login' => 'Login with another bank, or one of these banks with different credentials.', + 'job_config_spectre_accounts_title' => 'Select accounts to import from', + 'job_config_spectre_accounts_text' => 'You have selected ":name" (:country). You have :count account(s) available from this provider. Please select the Firefly III asset account(s) where the transactions from these accounts should be stored. Remember, in order to import data both the Firefly III account and the ":name"-account must have the same currency.', + 'spectre_no_supported_accounts' => 'You cannot import from this account due to a currency mismatch.', + 'spectre_do_not_import' => '(do not import)', + 'spectre_no_mapping' => 'It seems you have not selected any accounts to import from.', + 'imported_from_account' => 'Imported from ":account"', + 'spectre_account_with_number' => 'Account :number', + // job configuration for bunq: + 'job_config_bunq_accounts_title' => 'bunq accounts', + 'job_config_bunq_accounts_text' => 'These are the accounts associated with your bunq account. Please select the accounts from which you want to import, and in which account the transactions must be imported.', + 'bunq_no_mapping' => 'It seems you have not selected any accounts.', + 'should_download_config' => 'You should download the configuration file for this job. This will make future imports way easier.', + 'share_config_file' => 'If you have imported data from a public bank, you should share your configuration file so it will be easy for other users to import their data. Sharing your configuration file will not expose your financial details.', + + // keys from "extra" array: + 'spectre_extra_key_iban' => 'IBAN', + 'spectre_extra_key_swift' => 'SWIFT', + 'spectre_extra_key_status' => 'Status', + 'spectre_extra_key_card_type' => 'Card type', + 'spectre_extra_key_account_name' => 'Account name', + 'spectre_extra_key_client_name' => 'Client name', + 'spectre_extra_key_account_number' => 'Account number', + 'spectre_extra_key_blocked_amount' => 'Blocked amount', + 'spectre_extra_key_available_amount' => 'Available amount', + 'spectre_extra_key_credit_limit' => 'Credit limit', + 'spectre_extra_key_interest_rate' => 'Interest rate', + 'spectre_extra_key_expiry_date' => 'Expiry date', + 'spectre_extra_key_open_date' => 'Open date', + 'spectre_extra_key_current_time' => 'Current time', + 'spectre_extra_key_current_date' => 'Current date', + 'spectre_extra_key_cards' => 'Cards', + 'spectre_extra_key_units' => 'Units', + 'spectre_extra_key_unit_price' => 'Unit price', + 'spectre_extra_key_transactions_count' => 'Transaction count', + + // specifics: + 'specific_ing_name' => 'ING NL', + 'specific_ing_descr' => 'Create better descriptions in ING exports', + 'specific_sns_name' => 'SNS / Volksbank NL', + 'specific_sns_descr' => 'Trim quotes from SNS / Volksbank export files', + 'specific_abn_name' => 'ABN AMRO NL', + 'specific_abn_descr' => 'Fixes potential problems with ABN AMRO files', + 'specific_rabo_name' => 'Rabobank NL', + 'specific_rabo_descr' => 'Fixes potential problems with Rabobank files', + 'specific_pres_name' => 'President\'s Choice Financial CA', + 'specific_pres_descr' => 'Fixes potential problems with PC files', + // job configuration for file provider (stage: roles) + 'job_config_roles_title' => 'Import setup (3/4) - Define each column\'s role', + 'job_config_roles_text' => 'Each column in your CSV file contains certain data. Please indicate what kind of data the importer should expect. The option to "map" data means that you will link each entry found in the column to a value in your database. An often mapped column is the column that contains the IBAN of the opposing account. That can be easily matched to IBAN\'s present in your database already.', + 'job_config_roles_submit' => 'Continue', + 'job_config_roles_column_name' => 'Name of column', + 'job_config_roles_column_example' => 'Column example data', + 'job_config_roles_column_role' => 'Column data meaning', + 'job_config_roles_do_map_value' => 'Map these values', + 'job_config_roles_no_example' => 'No example data available', + 'job_config_roles_fa_warning' => 'If you mark a column as containing an amount in a foreign currency, you must also set the column that contains which currency it is.', + 'job_config_roles_rwarning' => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.', + 'job_config_roles_colum_count' => 'Column', + // job config for the file provider (stage: mapping): + 'job_config_map_title' => 'Import setup (4/4) - Connect import data to Firefly III data', + 'job_config_map_text' => 'In the following tables, the left value shows you information found in your uploaded file. It is your task to map this value, if possible, to a value already present in your database. Firefly will stick to this mapping. If there is no value to map to, or you do not wish to map the specific value, select nothing.', + 'job_config_map_nothing' => 'There is no data present in your file that you can map to existing values. Please press "Start the import" to continue.', + 'job_config_field_value' => 'Field value', + 'job_config_field_mapped' => 'Mapped to', + 'map_do_not_map' => '(não mapear)', + 'job_config_map_submit' => 'Start the import', + + + // import status page: + 'import_with_key' => 'Importar com a chave \':key\'', 'status_wait_title' => 'Por favor espere...', 'status_wait_text' => 'Esta caixa desaparecerá em um instante.', - 'status_fatal_title' => 'Ocorreu um erro fatal', - 'status_fatal_text' => 'Ocorreu um erro fatal, cuja rotina de importação não pode se recuperar. Veja a explicação em vermelho abaixo.', - 'status_fatal_more' => 'Se o erro for um tempo limite, a importação terá parado a meio caminho. Para algumas configurações do servidor, é apenas o servidor que parou enquanto a importação continua em execução em segundo plano. Para verificar isso, confira os arquivos de log. Se o problema persistir, considere importação na linha de comando em vez disso.', - 'status_ready_title' => 'A importação está pronta para começar', - 'status_ready_text' => 'A importação está pronta para começar. Toda a configuração que você precisava fazer foi feita. Faça o download do arquivo de configuração. Isso irá ajudá-lo com a importação se não for como planejado. Para realmente executar a importação, você pode executar o seguinte comando no seu console ou executar a importação baseada na web. Dependendo da sua configuração, a importação do console lhe dará mais comentários.', - 'status_ready_noconfig_text' => 'A importação está pronta para começar. Toda a configuração que você precisava fazer foi feita. Para realmente executar a importação, você pode executar o seguinte comando no seu console ou executar a importação baseada na web. Dependendo da sua configuração, a importação do console lhe dará mais comentários.', - 'status_ready_config' => 'Download da configuração', - 'status_ready_start' => 'Iniciar a importação', - 'status_ready_share' => 'Por favor, considere baixar sua configuração e compartilhá-la no centro de configuração de importação. Isso permitirá que outros usuários do Firefly III importem seus arquivos mais facilmente.', - 'status_job_new' => 'O trabalho é novo.', - 'status_job_configuring' => 'A importação está sendo configurada.', - 'status_job_configured' => 'A importação está configurada.', - 'status_job_running' => 'A importação está em execução.. Aguarde..', - 'status_job_error' => 'O trabalho gerou um erro.', - 'status_job_finished' => 'A importação terminou!', 'status_running_title' => 'A importação está em execução', - 'status_running_placeholder' => 'Por favor, aguarde uma atualização...', - 'status_finished_title' => 'Rotina de importação concluída', - 'status_finished_text' => 'A rotina de importação importou seus dados.', - 'status_errors_title' => 'Erros durante a importação', - 'status_errors_single' => 'Ocorreu um erro durante a importação. Não parece ser fatal.', - 'status_errors_multi' => 'Alguns erros ocorreram durante a importação. Estes não parecem ser fatais.', - 'status_bread_crumb' => 'Status de importação', - 'status_sub_title' => 'Status de importação', - 'config_sub_title' => 'Configurar a sua importação', - 'status_finished_job' => 'As transações de :count importadas podem ser encontradas na tag :tag.', - 'status_finished_no_tag' => 'Firefly III não coletou nenhuma transação de seu arquivo de importação.', - 'import_with_key' => 'Importar com a chave \':key\'', + 'status_job_running' => 'Please wait, running the import...', + 'status_job_storing' => 'Please wait, storing data...', + 'status_job_rules' => 'Please wait, running rules...', + 'status_fatal_title' => 'Fatal error', + 'status_fatal_text' => 'The import has suffered from an error it could not recover from. Apologies!', + 'status_fatal_more' => 'This (possibly very cryptic) error message is complemented by log files, which you can find on your hard drive, or in the Docker container where you run Firefly III from.', + 'status_finished_title' => 'Import finished', + 'status_finished_text' => 'The import has finished.', + 'finished_with_errors' => 'There were some errors during the import. Please review them carefully.', + 'unknown_import_result' => 'Unknown import result', + 'result_no_transactions' => 'No transactions have been imported. Perhaps they were all duplicates is simply no transactions where present to be imported. Perhaps the log files can tell you what happened. If you import data regularly, this is normal.', + 'result_one_transaction' => 'Exactly one transaction has been imported. It is stored under tag :tag where you can inspect it further.', + 'result_many_transactions' => 'Firefly III has imported :count transactions. They are stored under tag :tag where you can inspect them further.', - // file, upload something - 'file_upload_title' => 'Configuração de importação (1/4) - Carregar seu arquivo', - 'file_upload_text' => 'Esta rotina irá ajudá-lo a importar arquivos do seu banco para o Firefly III. Por favor, confira as páginas de ajuda no canto superior direito.', - 'file_upload_fields' => 'Campos', - 'file_upload_help' => 'Selecione seu arquivo', - 'file_upload_config_help' => 'Se você já importou dados no Firefly III, você pode ter um arquivo de configuração, que irá predefinir os valores de configuração para você. Para alguns bancos, outros usuários forneceram gentilmente o arquivo arquivo de configuração', - 'file_upload_type_help' => 'Selecione o tipo de arquivo que você fará o upload', - 'file_upload_submit' => 'Upload de arquivos', - // file, upload types - 'import_file_type_csv' => 'CSV (valores separados por vírgula)', + // general errors and warnings: + 'bad_job_status' => 'To access this page, your import job cannot have status ":status".', - // file, initial config for CSV - 'csv_initial_title' => 'Configuração de importação (2/4) - Configuração de importação CSV básica', - 'csv_initial_text' => 'Para ser capaz de importar o arquivo corretamente, por favor valide as opções abaixo.', - 'csv_initial_box' => 'Configuração básica de importação CSV', - 'csv_initial_box_title' => 'Opções básicas de configuração de importação CSV', - 'csv_initial_header_help' => 'Marque esta caixa se a primeira linha do seu arquivo CSV for os títulos das colunas.', - 'csv_initial_date_help' => 'Formato de data e hora em seu CSV. Siga o formato como indica esta página. O valor padrão analisará datas que se parecem com isso: :dateExample.', - 'csv_initial_delimiter_help' => 'Escolha o delimitador de campo que é usado em seu arquivo de entrada. Se não tiver certeza, a vírgula é a opção mais segura.', - 'csv_initial_import_account_help' => 'Se o seu arquivo CSV NÃO contém informações sobre sua(s) conta(s) de ativo(s), use este combobox para selecionar para qual conta pertencem as transações no CSV.', - 'csv_initial_submit' => 'Continue com o passo 3/4', - - // file, new options: - 'file_apply_rules_title' => 'Aplicar regras', - 'file_apply_rules_description' => 'Aplique suas regras. Observe que isso reduz significativamente a velocidade da importação.', - 'file_match_bills_title' => 'Correspondência de contas', - 'file_match_bills_description' => 'Combine suas contas para retiradas recém-criadas. Observe que isso diminui significativamente a velocidade de importação.', - - // file, roles config - 'csv_roles_title' => 'Configuração de importação (3/4) - Definir o papel de cada coluna', - 'csv_roles_text' => 'Cada coluna no seu arquivo CSV contém certos dados. Por favor, indique que tipo de dados, o importador deve esperar. A opção "mapear" dados significa que você vai ligar cada entrada encontrada na coluna para um valor em seu banco de dados. Uma coluna mapeada muitas vezes é a coluna que contém o IBAN da conta oposta. Isso pode ser facilmente combinado para o IBAN já presente em seu banco de dados.', - 'csv_roles_table' => 'Tabela', - 'csv_roles_column_name' => 'Nome da coluna', - 'csv_roles_column_example' => 'Dados de exemplo da coluna', - 'csv_roles_column_role' => 'Significado dos dados da coluna', - 'csv_roles_do_map_value' => 'Mapear estes valores', - 'csv_roles_column' => 'Coluna', - 'csv_roles_no_example_data' => 'Não há dados de exemplo disponíveis', - 'csv_roles_submit' => 'Continue com o passo 4/4', - - // not csv, but normal warning - 'roles_warning' => 'No mínimo, marque uma coluna como a coluna de quantidade. É aconselhável também selecionar uma coluna para a descrição, data e a conta oposta.', - 'foreign_amount_warning' => 'Se você marcar uma coluna como contendo um valor em uma moeda estrangeira, você também deve definir a coluna que contém qual moeda é.', - - // file, map data - 'file_map_title' => 'Configuração de importação (4/4) - Conecte dados de importação aos dados do Firefly III', - 'file_map_text' => 'Nas tabelas a seguir, o valor à esquerda mostra informações encontradas no seu arquivo carregado. É sua tarefa mapear esse valor, se possível, para um valor já presente em seu banco de dados. O Firefly vai se ater a esse mapeamento. Se não há nenhum valor para mapear, ou não quer mapear o valor específico, não selecione nada.', - 'file_map_field_value' => 'Valor do campo', - 'file_map_field_mapped_to' => 'Mapeado para', - 'map_do_not_map' => '(não mapear)', - 'file_map_submit' => 'Iniciar a importação', - 'file_nothing_to_map' => 'Não há dados presentes no seu arquivo que você possa mapear para os valores existentes. Pressione "Iniciar a importação" para continuar.', - - // map things. + // column roles for CSV import: 'column__ignore' => '(ignorar esta coluna)', 'column_account-iban' => 'Conta de Ativo (IBAN)', 'column_account-id' => 'ID da Conta de Ativo (correspondente FF3)', @@ -158,48 +261,4 @@ return [ 'column_note' => 'Nota(s)', 'column_internal-reference' => 'Referência interna', - // prerequisites - 'prerequisites' => 'Pré-requisitos', - - // bunq - 'bunq_prerequisites_title' => 'Pré-requisitos para uma importação de bunq', - 'bunq_prerequisites_text' => 'Para importar do bunq, você precisa obter uma chave de API. Você pode fazer isso através do aplicativo. Por favor, note que a função de importação para bunq está em BETA. Só foi testado em relação à API do sandbox.', - 'bunq_prerequisites_text_ip' => 'Bunq requer seu endereço IP externo. O Firefly III tentou preencher isso usando o serviço ipify. Certifique-se de que esse endereço IP esteja correto ou a importação falhará.', - 'bunq_do_import' => 'Sim, importe desta conta', - 'bunq_accounts_title' => 'Contas Bunq', - 'bunq_accounts_text' => 'Estas são as contas associadas à sua conta bunq. Por favor, selecione as contas das quais você deseja importar e em qual conta as transações devem ser importadas.', - - // Spectre - 'spectre_title' => 'Importar usando Spectre', - 'spectre_prerequisites_title' => 'Pré-requisitos para uma importação usando Spectre', - 'spectre_prerequisites_text' => 'In order to import data using the Spectre API (v4), you must provide Firefly III with two secret values. They can be found on the secrets page.', - 'spectre_enter_pub_key' => 'The import will only work when you enter this public key on your secrets page.', - 'spectre_accounts_title' => 'Selecione as contas a serem importadas', - 'spectre_accounts_text' => 'Cada conta à esquerda abaixo foi encontrada pela Spectre e pode ser importada para Firefly III. Por favor selecione a conta de ativo que deve armazenar as transações. Se você não deseja importar de qualquer conta específica, desmarque a caixa de seleção.', - 'spectre_do_import' => 'Sim, importe a partir desta conta', - 'spectre_no_supported_accounts' => 'You cannot import from this account due to a currency mismatch.', - - // keys from "extra" array: - 'spectre_extra_key_iban' => 'IBAN', - 'spectre_extra_key_swift' => 'SWIFT', - 'spectre_extra_key_status' => 'Status', - 'spectre_extra_key_card_type' => 'Tipo de Cartão', - 'spectre_extra_key_account_name' => 'Nome da Conta', - 'spectre_extra_key_client_name' => 'Nome do cliente', - 'spectre_extra_key_account_number' => 'Número da conta', - 'spectre_extra_key_blocked_amount' => 'Montante bloqueado', - 'spectre_extra_key_available_amount' => 'Montante disponível', - 'spectre_extra_key_credit_limit' => 'Limite de crédito', - 'spectre_extra_key_interest_rate' => 'Taxa de juros', - 'spectre_extra_key_expiry_date' => 'Data de vencimento', - 'spectre_extra_key_open_date' => 'Data de abertura', - 'spectre_extra_key_current_time' => 'Hora atual', - 'spectre_extra_key_current_date' => 'Data atual', - 'spectre_extra_key_cards' => 'Cartões', - 'spectre_extra_key_units' => 'Unidades', - 'spectre_extra_key_unit_price' => 'Preço unitário', - 'spectre_extra_key_transactions_count' => 'Contagem de transações', - - // various other strings: - 'imported_from_account' => 'Importado de ":account"', ]; diff --git a/resources/lang/pt_BR/intro.php b/resources/lang/pt_BR/intro.php index 3881118023..48b99c3d4d 100644 --- a/resources/lang/pt_BR/intro.php +++ b/resources/lang/pt_BR/intro.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // index 'index_intro' => 'Bem-vindo à página de inicial do Firefly III. Por favor, aproveite esta introdução para verificar como funciona o Firefly III.', diff --git a/resources/lang/pt_BR/list.php b/resources/lang/pt_BR/list.php index a6f816549b..f65a5eee64 100644 --- a/resources/lang/pt_BR/list.php +++ b/resources/lang/pt_BR/list.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'buttons' => 'Botões', 'icon' => 'Ãcone', @@ -104,17 +105,22 @@ return [ 'reconcile' => 'Pago', 'account_on_spectre' => 'Conta (Spectre)', 'do_import' => 'Importar desta conta', - 'sepa-ct-id' => 'SEPA End to End Identifier', - 'sepa-ct-op' => 'SEPA Opposing Account Identifier', - 'sepa-db' => 'SEPA Mandate Identifier', - 'sepa-country' => 'SEPA Country', - 'sepa-cc' => 'SEPA Clearing Code', - 'sepa-ep' => 'SEPA External Purpose', - 'sepa-ci' => 'SEPA Creditor Identifier', - 'account_at_bunq' => 'Account with bunq', - 'file_name' => 'File name', - 'file_size' => 'File size', - 'file_type' => 'File type', - 'attached_to' => 'Attached to', - 'file_exists' => 'File exists', + 'sepa-ct-id' => 'SEPA Identificador end-to-end', + 'sepa-ct-op' => 'SEPA Identificador de conta de contrária', + 'sepa-db' => 'SEPA Identificador de Mandato', + 'sepa-country' => 'SEPA País', + 'sepa-cc' => 'SEPA Código de Compensação', + 'sepa-ep' => 'SEPA Finalidade Externa', + 'sepa-ci' => 'SEPA Identificador do Credor', + 'external_id' => 'External ID', + 'account_at_bunq' => 'Loja com bunq', + 'file_name' => 'Nome do arquivo', + 'file_size' => 'Tamanho do Arquivo', + 'file_type' => 'Tipo do arquivo', + 'attached_to' => 'Anexado a', + 'file_exists' => 'Arquivo já existe', + 'spectre_bank' => 'Bank', + 'spectre_last_use' => 'Last login', + 'spectre_status' => 'Status', + 'bunq_payment_id' => 'bunq payment ID', ]; diff --git a/resources/lang/pt_BR/pagination.php b/resources/lang/pt_BR/pagination.php index 4a6ef00749..af96c3851f 100644 --- a/resources/lang/pt_BR/pagination.php +++ b/resources/lang/pt_BR/pagination.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'previous' => '« Anterior', 'next' => 'Próximo »', diff --git a/resources/lang/pt_BR/passwords.php b/resources/lang/pt_BR/passwords.php index 9bc624014f..d5e1ac0558 100644 --- a/resources/lang/pt_BR/passwords.php +++ b/resources/lang/pt_BR/passwords.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'password' => 'A senha precisa ter no mínimo seis caracteres e tem que ser igual à confirmação de senha.', 'user' => 'Não foi possível encontrar o usuário com este e-mail.', diff --git a/resources/lang/pt_BR/validation.php b/resources/lang/pt_BR/validation.php index 3f019d5122..841f7c2d55 100644 --- a/resources/lang/pt_BR/validation.php +++ b/resources/lang/pt_BR/validation.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'iban' => 'Este não é um válido IBAN.', - 'source_equals_destination' => 'The source account equals the destination account', + 'source_equals_destination' => 'A conta de origem é igual à conta de destino', 'unique_account_number_for_user' => 'Parece que este número de conta já está em uso.', - 'unique_iban_for_user' => 'It looks like this IBAN is already in use.', + 'unique_iban_for_user' => 'Parece que este IBAN já está em uso.', 'deleted_user' => 'Devido a restrições de segurança, você não pode registrar usando este endereço de e-mail.', 'rule_trigger_value' => 'Este valor é inválido para o disparo selecionado.', 'rule_action_value' => 'Este valor é inválido para a ação selecionada.', @@ -109,7 +110,8 @@ return [ 'in_array' => 'O campo :attribute não existe em :other.', 'present' => 'O campo :attribute deve estar presente.', 'amount_zero' => 'A quantidade total não pode ser zero', - 'secure_password' => 'Esta não é uma senha segura. Por favor, tente novamente. Para mais informações, visite https://goo.gl/NCh2tN', + 'unique_piggy_bank_for_user' => 'The name of the piggy bank must be unique.', + 'secure_password' => 'This is not a secure password. Please try again. For more information, visit http://bit.ly/FF3-password-security', 'attributes' => [ 'email' => 'endereço de e-mail', 'description' => 'descrição', diff --git a/resources/lang/ru_RU/auth.php b/resources/lang/ru_RU/auth.php index 1d79c2f2d3..9dbede848c 100644 --- a/resources/lang/ru_RU/auth.php +++ b/resources/lang/ru_RU/auth.php @@ -1,9 +1,8 @@ . */ -return [ - /* - |-------------------------------------------------------------------------- - | Authentication Language Lines - |-------------------------------------------------------------------------- - | - | The following language lines are used during authentication for various - | messages that we need to display to the user. You are free to modify - | these language lines according to your application's requirements. - | - */ +declare(strict_types=1); +return [ 'failed' => 'Ðеправильный Ð°Ð´Ñ€ÐµÑ Ñлектронной почты или пароль.', 'throttle' => 'Слишком много попыток входа. ПожалуйÑта, попробуйте Ñнова через :seconds Ñекунд.', ]; diff --git a/resources/lang/ru_RU/bank.php b/resources/lang/ru_RU/bank.php index 8826020cbf..5d00b1e685 100644 --- a/resources/lang/ru_RU/bank.php +++ b/resources/lang/ru_RU/bank.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ ]; diff --git a/resources/lang/ru_RU/breadcrumbs.php b/resources/lang/ru_RU/breadcrumbs.php index 0ef4f707f2..41a0facb3a 100644 --- a/resources/lang/ru_RU/breadcrumbs.php +++ b/resources/lang/ru_RU/breadcrumbs.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'home' => 'ГлавнаÑ', 'edit_currency' => 'Редактирование валюты ":name"', diff --git a/resources/lang/ru_RU/components.php b/resources/lang/ru_RU/components.php index 2bf8a35763..8f542b54d8 100644 --- a/resources/lang/ru_RU/components.php +++ b/resources/lang/ru_RU/components.php @@ -1,5 +1,4 @@ . */ +declare(strict_types=1); + return [ // profile 'personal_access_tokens' => 'ПерÑональный токен Ð´Ð»Ñ Ð´Ð¾Ñтупа', diff --git a/resources/lang/ru_RU/config.php b/resources/lang/ru_RU/config.php index 65d4328335..a524e3644c 100644 --- a/resources/lang/ru_RU/config.php +++ b/resources/lang/ru_RU/config.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'html_language' => 'ru', 'locale' => 'ru, Russian, ru_RU, ru_RU.utf8, ru_RU.UTF-8', diff --git a/resources/lang/ru_RU/csv.php b/resources/lang/ru_RU/csv.php index 622a49202a..aae109a40a 100644 --- a/resources/lang/ru_RU/csv.php +++ b/resources/lang/ru_RU/csv.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ ]; diff --git a/resources/lang/ru_RU/demo.php b/resources/lang/ru_RU/demo.php index 45ef6068bf..293ba441f0 100644 --- a/resources/lang/ru_RU/demo.php +++ b/resources/lang/ru_RU/demo.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'no_demo_text' => 'Извините, но Ð´Ð»Ñ Ñтой Ñтраницы нет дополнительного поÑÑнениÑ.', 'see_help_icon' => 'ВоÑпользуйтеÑÑŒ значком в правом верхнем углу, чтобы узнать больше.', @@ -32,5 +33,5 @@ return [ 'currencies-index' => 'Firefly III поддерживает неÑколько валют. Ð¥Ð¾Ñ‚Ñ Ð¿Ð¾ умолчанию иÑпользуетÑÑ Ð•Ð²Ñ€Ð¾, вы можете Ñделать оÑновной валютой доллары СШРили любую другую валюту. Как вы видите, неÑколько валют уже еÑÑ‚ÑŒ в ÑпиÑке, но вы можете добавить любую другую, еÑли Ñто требуетÑÑ. Обратите внимание, что выбор новой валюты по умолчанию не повлиÑет на уже ÑущеÑтвующие транзакции: Firefly III поддерживает одновременное иÑпользование неÑкольких валют.', 'transactions-index' => 'Эти раÑходы, доходы и переводы не очень интереÑны. Они были Ñозданы автоматичеÑки.', 'piggy-banks-index' => 'Как вы можете видеть, здеÑÑŒ еÑÑ‚ÑŒ три копилки. ИÑпользуйте кнопки «плюÑ» и «минуÑ», чтобы влиÑÑ‚ÑŒ на количеÑтво денег в каждой копилке. Ðажмите название копилки, чтобы увидеть её наÑтройки.', - 'import-index' => 'Конечно, любой CSV-файл может быть импортирован в Firefly III', + 'import-index' => 'Ð’ Firefly III можно импортировать любой CSV-файл. Также поддерживаетÑÑ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚ данных из bunq и Spectre. Другие банки и финанÑовые агрегаторы будут реализованы в будущем. Однако, как демо-пользователь, вы можете видеть только как работает «поддельный»-провайдер. Он будет генерировать некоторые Ñлучайные транзакции, чтобы показать вам, как работает Ñтот процеÑÑ.', ]; diff --git a/resources/lang/ru_RU/firefly.php b/resources/lang/ru_RU/firefly.php index 0d0352cf61..382410ca5c 100644 --- a/resources/lang/ru_RU/firefly.php +++ b/resources/lang/ru_RU/firefly.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // general stuff: 'close' => 'Закрыть', @@ -179,6 +180,7 @@ return [ 'authorization_request_intro' => ':client запрашивает доÑтуп к управлению вашими финанÑами. Ð’Ñ‹ хотите разрешить :client доÑтуп к Ñтой информации?', 'scopes_will_be_able' => 'Это приложение будет иметь возможноÑÑ‚ÑŒ:', 'button_authorize' => 'ÐвторизациÑ', + 'none_in_select_list' => '(нет)', // check for updates: 'update_check_title' => 'Проверить обновлениÑ', @@ -666,6 +668,7 @@ return [ 'bill_will_automatch' => 'Счёт будет автоматичеÑки ÑвÑзан Ñ Ð¿Ð¾Ð´Ñ…Ð¾Ð´Ñщими транзакциÑми', 'skips_over' => 'пропуÑтить', 'bill_store_error' => 'При Ñоздании вашего нового Ñчёта на оплату произошла Ð½ÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°. ПожалуйÑта, проверьте log-файлы', + 'list_inactive_rule' => 'неактивное правило', // accounts: 'details_for_asset' => 'Детали по оÑновному Ñчёту ":name"', @@ -801,6 +804,7 @@ return [ 'opt_group_savingAsset' => 'Сберегательные Ñчета', 'opt_group_sharedAsset' => 'Общие оÑновные Ñчета', 'opt_group_ccAsset' => 'Кредитные карты', + 'opt_group_cashWalletAsset' => 'Кошельки Ñ Ð½Ð°Ð»Ð¸Ñ‡Ð½Ñ‹Ð¼Ð¸', 'notes' => 'Заметки', 'unknown_journal_error' => 'Ðе удалоÑÑŒ Ñохранить транзакцию. ПожалуйÑта, проверьте log-файлы.', @@ -816,6 +820,7 @@ return [ 'language' => 'Язык', 'new_savings_account' => 'Ñберегательный Ñчёт в :bank_name', 'cash_wallet' => 'Кошелёк Ñ Ð½Ð°Ð»Ð¸Ñ‡Ð½Ñ‹Ð¼Ð¸', + 'currency_not_present' => 'If the currency you normally use is not listed do not worry. You can create your own currencies under Options > Currencies.', // home page: 'yourAccounts' => 'Ваши Ñчета', @@ -1013,6 +1018,7 @@ return [ 'remove_money_from_piggy_title' => 'Удалить деньги из копилки ":name"', 'add' => 'Добавить', 'no_money_for_piggy' => 'У Ð²Ð°Ñ Ð½ÐµÑ‚ денег, чтобы положить в Ñтот копилку.', + 'suggested_savings_per_month' => 'Suggested per month', 'remove' => 'Удалить', 'max_amount_add' => 'МакÑÐ¸Ð¼Ð°Ð»ÑŒÐ½Ð°Ñ Ñумма, которую вы можете добавить:', @@ -1148,27 +1154,9 @@ return [ 'no_edit_multiple_left' => 'Ð’Ñ‹ выбрали Ð´Ð»Ñ Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½ÐµÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½ÑƒÑŽ транзакцию.', 'cannot_convert_split_journal' => 'Ðевозможно преобразовать раздельную транзакцию', - // import bread crumbs and titles: - 'import' => 'Импорт', - 'import_data' => 'Импорт данных', - 'import_general_index_file' => 'Импортировать файл', - 'import_from_bunq' => 'Импорт из bunq', - 'import_using_spectre' => 'Импорт Ñ Ð¸Ñпользованием Spectre', - 'import_using_plaid' => 'Импорт Ñ Ð¸Ñпользованием Plaid', - 'import_config_bread_crumb' => 'ÐаÑтройте Ñвой импорт', - - // import index page: + // Import page (general strings only) 'import_index_title' => 'Импорт данных в Firefly III', - 'import_index_sub_title' => 'Ð“Ð»Ð°Ð²Ð½Ð°Ñ Ñтраница', - 'import_general_index_intro' => 'Добро пожаловать в инÑтрумент импорта Firefly III. СущеÑтвует неÑколько ÑпоÑобов импорта данных в Firefly III, отображаемых здеÑÑŒ в виде кнопок.', - 'upload_error' => 'Ðевозможно обработать загруженный вами файл. Возможно, Ñто неправильный тип файла или кодировка. Ð”Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ ÑодержитÑÑ Ð² log-файлах.', - 'reset_import_settings_title' => 'СброÑить наÑтройки импорта', - 'reset_import_settings_text' => 'Ð’Ñ‹ можете иÑпользовать Ñти ÑÑылки Ð´Ð»Ñ ÑброÑа наÑтроек импорта Ð´Ð»Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð½Ñ‹Ñ… поÑтавщиков. Это полезно, когда плохие наÑтройки не позволÑÑŽÑ‚ вам импортировать данные.', - 'reset_settings_bunq' => 'Удалите ключ API bunq, локальный внешний IP-Ð°Ð´Ñ€ÐµÑ Ð¸ ключи RSA, ÑвÑзанные Ñ bunq.', - 'reset_settings_spectre' => 'Удалить ID клиента Spectre и Ñекретные ключи. Также будет удалён ваш Spectre keypair. Ðе забудьте обновить его.', - 'settings_reset_for_bunq' => 'Ð¡Ð±Ñ€Ð¾Ñ Ð½Ð°Ñтроек Bunq.', - 'settings_reset_for_spectre' => 'Ð¡Ð±Ñ€Ð¾Ñ Ð½Ð°Ñтроек Spectre.', - + 'import_data' => 'Импорт данных', // sandstorm.io errors and messages: 'sandstorm_not_available' => 'Эта Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ Ð½ÐµÐ´Ð¾Ñтупна, еÑли вы иÑпользуете Firefly III в Ñреде Sandstorm.io.', diff --git a/resources/lang/ru_RU/form.php b/resources/lang/ru_RU/form.php index 5c9646a382..a4b4ef54cf 100644 --- a/resources/lang/ru_RU/form.php +++ b/resources/lang/ru_RU/form.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // new user: 'bank_name' => 'Ðазвание банка', @@ -184,6 +185,13 @@ return [ 'blocked' => 'Заблокирован?', 'blocked_code' => 'Причина блокировки', + // import + 'apply_rules' => 'Применить правила', + 'artist' => 'ИÑполнитель', + 'album' => 'Ðльбом', + 'song' => 'КомпозициÑ', + + // admin 'domain' => 'Домен', 'single_user_mode' => 'Отключить региÑтрацию пользователей', diff --git a/resources/lang/ru_RU/import.php b/resources/lang/ru_RU/import.php index bf6e0fe5ca..457e18aed2 100644 --- a/resources/lang/ru_RU/import.php +++ b/resources/lang/ru_RU/import.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ - // status of import: + // ALL breadcrumbs and subtitles: + 'index_breadcrumb' => 'Импорт данных в Firefly III', + 'prerequisites_breadcrumb_fake' => 'Prerequisites for the fake import provider', + 'prerequisites_breadcrumb_spectre' => 'Prerequisites for Spectre', + 'prerequisites_breadcrumb_bunq' => 'Prerequisites for bunq', + 'job_configuration_breadcrumb' => 'ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð´Ð»Ñ ":key"', + 'job_status_breadcrumb' => 'Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð° Ð´Ð»Ñ ":key"', + 'cannot_create_for_provider' => 'Firefly III не может Ñоздать задачу Ð´Ð»Ñ ":provider"-провайдера.', + + // index page: + 'general_index_title' => 'Импортировать файл', + 'general_index_intro' => 'Добро пожаловать в инÑтрумент импорта Firefly III. СущеÑтвует неÑколько ÑпоÑобов импорта данных в Firefly III, отображаемых здеÑÑŒ в виде кнопок.', + // import provider strings (index): + 'button_fake' => 'Поддельный (демо) импорт', + 'button_file' => 'Импортировать файл', + 'button_bunq' => 'Импорт из bunq', + 'button_spectre' => 'Импорт Ñ Ð¸Ñпользованием Spectre', + 'button_plaid' => 'Импорт Ñ Ð¸Ñпользованием Plaid', + 'button_yodlee' => 'Импорт Ñ Ð¸Ñпользованием Yodlee', + 'button_quovo' => 'Импорт Ñ Ð¸Ñпользованием Quovo', + // global config box (index) + 'global_config_title' => 'Глобальные наÑтройки импорта', + 'global_config_text' => 'In the future, this box will feature preferences that apply to ALL import providers above.', + // prerequisites box (index) + 'need_prereq_title' => 'Import prerequisites', + 'need_prereq_intro' => 'Some import methods need your attention before they can be used. For example, they might require special API keys or application secrets. You can configure them here. The icon indicates if these prerequisites have been met.', + 'do_prereq_fake' => 'Prerequisites for the fake provider', + 'do_prereq_file' => 'Prerequisites for file imports', + 'do_prereq_bunq' => 'Prerequisites for imports from bunq', + 'do_prereq_spectre' => 'Prerequisites for imports using Spectre', + 'do_prereq_plaid' => 'Prerequisites for imports using Plaid', + 'do_prereq_yodlee' => 'Prerequisites for imports using Yodlee', + 'do_prereq_quovo' => 'Prerequisites for imports using Quovo', + // provider config box (index) + 'can_config_title' => 'Импорт конфигурации', + 'can_config_intro' => 'Some import methods can be configured to your liking. They have extra settings you can tweak.', + 'do_config_fake' => 'Configuration for the fake provider', + 'do_config_file' => 'Configuration for file imports', + 'do_config_bunq' => 'Configuration for bunq imports', + 'do_config_spectre' => 'ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð° из Spectre', + 'do_config_plaid' => 'ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð° из Plaid', + 'do_config_yodlee' => 'ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð° из Yodlee', + 'do_config_quovo' => 'ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð° из Quovo', + + // prerequisites: + 'prereq_fake_title' => 'Prerequisites for an import from the fake import provider', + 'prereq_fake_text' => 'This fake provider requires a fake API key. It must be 32 characters long. You can use this one: 123456789012345678901234567890AA', + 'prereq_spectre_title' => 'Prerequisites for an import using the Spectre API', + 'prereq_spectre_text' => 'In order to import data using the Spectre API (v4), you must provide Firefly III with two secret values. They can be found on the secrets page.', + 'prereq_spectre_pub' => 'Likewise, the Spectre API needs to know the public key you see below. Without it, it will not recognize you. Please enter this public key on your secrets page.', + 'prereq_bunq_title' => 'Prerequisites for an import from bunq', + 'prereq_bunq_text' => 'In order to import from bunq, you need to obtain an API key. You can do this through the app. Please note that the import function for bunq is in BETA. It has only been tested against the sandbox API.', + 'prereq_bunq_ip' => 'bunq requires your externally facing IP address. Firefly III has tried to fill this in using the ipify service. Make sure this IP address is correct, or the import will fail.', + // prerequisites success messages: + 'prerequisites_saved_for_fake' => 'Ключ Fake API уÑпешно Ñохранен!', + 'prerequisites_saved_for_spectre' => 'App ID and secret stored!', + 'prerequisites_saved_for_bunq' => 'API key and IP stored!', + + // job configuration: + 'job_config_apply_rules_title' => 'Job configuration - apply your rules?', + 'job_config_apply_rules_text' => 'Once the fake provider has run, your rules can be applied to the transactions. This adds time to the import.', + 'job_config_input' => 'Your input', + // job configuration for the fake provider: + 'job_config_fake_artist_title' => 'Enter album name', + 'job_config_fake_artist_text' => 'Many import routines have a few configuration steps you must go through. In the case of the fake import provider, you must answer some weird questions. In this case, enter "David Bowie" to continue.', + 'job_config_fake_song_title' => 'Enter song name', + 'job_config_fake_song_text' => 'Mention the song "Golden years" to continue with the fake import.', + 'job_config_fake_album_title' => 'Enter album name', + 'job_config_fake_album_text' => 'Some import routines require extra data halfway through the import. In the case of the fake import provider, you must answer some weird questions. Enter "Station to station" to continue.', + // job configuration form the file provider + 'job_config_file_upload_title' => 'Import setup (1/4) - Upload your file', + 'job_config_file_upload_text' => 'This routine will help you import files from your bank into Firefly III. ', + 'job_config_file_upload_help' => 'Select your file. Please make sure the file is UTF-8 encoded.', + 'job_config_file_upload_config_help' => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their configuration file', + 'job_config_file_upload_type_help' => 'Select the type of file you will upload', + 'job_config_file_upload_submit' => 'Загрузить файлы', + 'import_file_type_csv' => 'CSV (значениÑ, разделенные запÑтыми)', + 'file_not_utf8' => 'The file you have uploaded is not encoded as UTF-8 or ASCII. Firefly III cannot handle such files. Please use Notepad++ or Sublime to convert your file to UTF-8.', + 'job_config_uc_title' => 'Import setup (2/4) - Basic file setup', + 'job_config_uc_text' => 'To be able to import your file correctly, please validate the options below.', + 'job_config_uc_header_help' => 'Check this box if the first row of your CSV file are the column titles.', + 'job_config_uc_date_help' => 'Date time format in your file. Follow the format as this page indicates. The default value will parse dates that look like this: :dateExample.', + 'job_config_uc_delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.', + 'job_config_uc_account_help' => 'If your file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the file belong to.', + 'job_config_uc_apply_rules_title' => 'Apply rules', + 'job_config_uc_apply_rules_text' => 'Applies your rules to every imported transaction. Note that this slows the import significantly.', + 'job_config_uc_specifics_title' => 'Bank-specific options', + 'job_config_uc_specifics_txt' => 'Some banks deliver badly formatted files. Firefly III can fix those automatically. If your bank delivers such files but it\'s not listed here, please open an issue on GitHub.', + 'job_config_uc_submit' => 'Продолжить', + 'invalid_import_account' => 'You have selected an invalid account to import into.', + // job configuration for Spectre: + 'job_config_spectre_login_title' => 'Choose your login', + 'job_config_spectre_login_text' => 'Firefly III has found :count existing login(s) in your Spectre account. Which one would you like to use to import from?', + 'spectre_login_status_active' => 'Active', + 'spectre_login_status_inactive' => 'Inactive', + 'spectre_login_status_disabled' => 'Disabled', + 'spectre_login_new_login' => 'Login with another bank, or one of these banks with different credentials.', + 'job_config_spectre_accounts_title' => 'Select accounts to import from', + 'job_config_spectre_accounts_text' => 'You have selected ":name" (:country). You have :count account(s) available from this provider. Please select the Firefly III asset account(s) where the transactions from these accounts should be stored. Remember, in order to import data both the Firefly III account and the ":name"-account must have the same currency.', + 'spectre_no_supported_accounts' => 'You cannot import from this account due to a currency mismatch.', + 'spectre_do_not_import' => '(do not import)', + 'spectre_no_mapping' => 'It seems you have not selected any accounts to import from.', + 'imported_from_account' => 'Imported from ":account"', + 'spectre_account_with_number' => 'Account :number', + // job configuration for bunq: + 'job_config_bunq_accounts_title' => 'bunq accounts', + 'job_config_bunq_accounts_text' => 'These are the accounts associated with your bunq account. Please select the accounts from which you want to import, and in which account the transactions must be imported.', + 'bunq_no_mapping' => 'It seems you have not selected any accounts.', + 'should_download_config' => 'You should download the configuration file for this job. This will make future imports way easier.', + 'share_config_file' => 'If you have imported data from a public bank, you should share your configuration file so it will be easy for other users to import their data. Sharing your configuration file will not expose your financial details.', + + // keys from "extra" array: + 'spectre_extra_key_iban' => 'IBAN', + 'spectre_extra_key_swift' => 'SWIFT', + 'spectre_extra_key_status' => 'Status', + 'spectre_extra_key_card_type' => 'Card type', + 'spectre_extra_key_account_name' => 'Account name', + 'spectre_extra_key_client_name' => 'Client name', + 'spectre_extra_key_account_number' => 'Account number', + 'spectre_extra_key_blocked_amount' => 'Blocked amount', + 'spectre_extra_key_available_amount' => 'Available amount', + 'spectre_extra_key_credit_limit' => 'Credit limit', + 'spectre_extra_key_interest_rate' => 'Interest rate', + 'spectre_extra_key_expiry_date' => 'Expiry date', + 'spectre_extra_key_open_date' => 'Open date', + 'spectre_extra_key_current_time' => 'Current time', + 'spectre_extra_key_current_date' => 'Current date', + 'spectre_extra_key_cards' => 'Cards', + 'spectre_extra_key_units' => 'Units', + 'spectre_extra_key_unit_price' => 'Unit price', + 'spectre_extra_key_transactions_count' => 'Transaction count', + + // specifics: + 'specific_ing_name' => 'ING NL', + 'specific_ing_descr' => 'Create better descriptions in ING exports', + 'specific_sns_name' => 'SNS / Volksbank NL', + 'specific_sns_descr' => 'Trim quotes from SNS / Volksbank export files', + 'specific_abn_name' => 'ABN AMRO NL', + 'specific_abn_descr' => 'Fixes potential problems with ABN AMRO files', + 'specific_rabo_name' => 'Rabobank NL', + 'specific_rabo_descr' => 'Fixes potential problems with Rabobank files', + 'specific_pres_name' => 'President\'s Choice Financial CA', + 'specific_pres_descr' => 'Fixes potential problems with PC files', + // job configuration for file provider (stage: roles) + 'job_config_roles_title' => 'Import setup (3/4) - Define each column\'s role', + 'job_config_roles_text' => 'Each column in your CSV file contains certain data. Please indicate what kind of data the importer should expect. The option to "map" data means that you will link each entry found in the column to a value in your database. An often mapped column is the column that contains the IBAN of the opposing account. That can be easily matched to IBAN\'s present in your database already.', + 'job_config_roles_submit' => 'Continue', + 'job_config_roles_column_name' => 'Name of column', + 'job_config_roles_column_example' => 'Column example data', + 'job_config_roles_column_role' => 'Column data meaning', + 'job_config_roles_do_map_value' => 'Map these values', + 'job_config_roles_no_example' => 'No example data available', + 'job_config_roles_fa_warning' => 'If you mark a column as containing an amount in a foreign currency, you must also set the column that contains which currency it is.', + 'job_config_roles_rwarning' => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.', + 'job_config_roles_colum_count' => 'Column', + // job config for the file provider (stage: mapping): + 'job_config_map_title' => 'Import setup (4/4) - Connect import data to Firefly III data', + 'job_config_map_text' => 'In the following tables, the left value shows you information found in your uploaded file. It is your task to map this value, if possible, to a value already present in your database. Firefly will stick to this mapping. If there is no value to map to, or you do not wish to map the specific value, select nothing.', + 'job_config_map_nothing' => 'There is no data present in your file that you can map to existing values. Please press "Start the import" to continue.', + 'job_config_field_value' => 'Field value', + 'job_config_field_mapped' => 'Mapped to', + 'map_do_not_map' => '(не ÑопоÑтавлено)', + 'job_config_map_submit' => 'Start the import', + + + // import status page: + 'import_with_key' => 'Импорт Ñ ÐºÐ»ÑŽÑ‡ÐµÐ¼ \':key\'', 'status_wait_title' => 'ПожалуйÑта, подождите...', 'status_wait_text' => 'Это Ñообщение иÑчезнет через мгновение.', - 'status_fatal_title' => 'Произошла критичеÑÐºÐ°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°', - 'status_fatal_text' => 'Произошла Ñ„Ð°Ñ‚Ð°Ð»ÑŒÐ½Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°, из-за которой невозможно воÑÑтановить процедуру импорта. ПожалуйÑта, ознакомьтеÑÑŒ Ñ Ð¿Ð¾ÑÑнением в краÑном блоке ниже.', - 'status_fatal_more' => 'ЕÑли ошибка вызывает тайм-аут, импорт оÑтановитÑÑ Ð½Ð° полпути. Ð”Ð»Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… конфигураций Ñерверов Ñто означает, что Ñервер оÑтановилÑÑ, Ñ…Ð¾Ñ‚Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚ продолжает работать в фоновом режиме. Чтобы проверить, так ли Ñто, проверьте лог-файл. ЕÑли проблема не уÑтранена, попробуйте запуÑтить импорт из командной Ñтроки.', - 'status_ready_title' => 'Импорт готов к запуÑку', - 'status_ready_text' => 'Импорт готов к запуÑку. Ð’Ñе необходимые наÑтройки были Ñделаны. ПожалуйÑта, загрузите файл конфигурации. Это поможет повторно запуÑтить импорт, еÑли что-то пойдет не так, как планировалоÑÑŒ. Чтобы непоÑредÑтвенно запуÑтить импорт, вы можете либо выполнить Ñледующую команду в конÑоли, либо запуÑтить веб-импорт. Ð’ завиÑимоÑти от вашей конфигурации импорт Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ конÑоли может быть более информативен.', - 'status_ready_noconfig_text' => 'Импорт готов к запуÑку. Ð’Ñе необходимые наÑтройки были Ñделаны. Чтобы непоÑредÑтвенно запуÑтить импорт, вы можете либо выполнить Ñледующую команду в конÑоли, либо запуÑтить веб-импорт. Ð’ завиÑимоÑти от вашей конфигурации импорт Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ конÑоли может быть более информативен.', - 'status_ready_config' => 'Загрузить конфигурацию', - 'status_ready_start' => 'Ðачать импорт', - 'status_ready_share' => 'ПожалуйÑта, раÑÑмотрите возможноÑÑ‚ÑŒ загрузки вашей конфигурации в центр импорта конфигураций. Это позволит другим пользователÑм Firefly III проще импортировать Ñвои файлы.', - 'status_job_new' => 'ÐÐ¾Ð²Ð°Ñ Ð·Ð°Ð´Ð°Ñ‡Ð°.', - 'status_job_configuring' => 'Импорт наÑтроен.', - 'status_job_configured' => 'Импорт наÑтроен.', - 'status_job_running' => 'Импорт запущен. ПожалуйÑта, подождите...', - 'status_job_error' => 'Это задание вызвало ошибку.', - 'status_job_finished' => 'Импорт завершен!', 'status_running_title' => 'ВыполнÑетÑÑ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚', - 'status_running_placeholder' => 'ПожалуйÑта, дождитеÑÑŒ, пока Ñтраница обновитÑÑ...', - 'status_finished_title' => 'Процедура импорта завершена', - 'status_finished_text' => 'Ваши данные были импортированы.', - 'status_errors_title' => 'Ошибки во Ð²Ñ€ÐµÐ¼Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð°', - 'status_errors_single' => 'Во Ð²Ñ€ÐµÐ¼Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð° произошла ошибка. Однако, она не привела к фатальным поÑледÑтвиÑм.', - 'status_errors_multi' => 'Во Ð²Ñ€ÐµÐ¼Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð° произошли ошибки. Однако, они не привели к фатальным поÑледÑтвиÑм.', - 'status_bread_crumb' => 'Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð°', - 'status_sub_title' => 'Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð°', - 'config_sub_title' => 'ÐаÑтройте Ñвой импорт', - 'status_finished_job' => 'Ð’Ñего :count транзакций было импортировано. Они могу быть найдены по метке :tag.', - 'status_finished_no_tag' => 'Firefly III не Ñобрал никаких транзакций из вашего файла импорта.', - 'import_with_key' => 'Импорт Ñ ÐºÐ»ÑŽÑ‡ÐµÐ¼ \':key\'', + 'status_job_running' => 'Please wait, running the import...', + 'status_job_storing' => 'Please wait, storing data...', + 'status_job_rules' => 'Please wait, running rules...', + 'status_fatal_title' => 'Fatal error', + 'status_fatal_text' => 'The import has suffered from an error it could not recover from. Apologies!', + 'status_fatal_more' => 'This (possibly very cryptic) error message is complemented by log files, which you can find on your hard drive, or in the Docker container where you run Firefly III from.', + 'status_finished_title' => 'Import finished', + 'status_finished_text' => 'The import has finished.', + 'finished_with_errors' => 'There were some errors during the import. Please review them carefully.', + 'unknown_import_result' => 'Unknown import result', + 'result_no_transactions' => 'No transactions have been imported. Perhaps they were all duplicates is simply no transactions where present to be imported. Perhaps the log files can tell you what happened. If you import data regularly, this is normal.', + 'result_one_transaction' => 'Exactly one transaction has been imported. It is stored under tag :tag where you can inspect it further.', + 'result_many_transactions' => 'Firefly III has imported :count transactions. They are stored under tag :tag where you can inspect them further.', - // file, upload something - 'file_upload_title' => 'ÐаÑтройка импорта (1/4) - Загрузите ваш файл', - 'file_upload_text' => 'Эта процедура поможет вам импортировать файлы из вашего банка в Firefly III. ПожалуйÑта, прочитайте Ñправку, доÑтупную в правом верхнем углу Ñтой Ñтраницы.', - 'file_upload_fields' => 'ПолÑ', - 'file_upload_help' => 'Выберите файл', - 'file_upload_config_help' => 'ЕÑли вы ранее импортировали данные в Firefly III, у Ð²Ð°Ñ Ð¼Ð¾Ð¶ÐµÑ‚ быть файл конфигурации, который позволит вам загрузить готовые наÑтойки. Ð”Ð»Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… банков другие пользователи любезно предоÑтавили Ñвои файлы конфигурации', - 'file_upload_type_help' => 'Выберите тип загружаемого файла', - 'file_upload_submit' => 'Загрузить файлы', - // file, upload types - 'import_file_type_csv' => 'CSV (значениÑ, разделенные запÑтыми)', + // general errors and warnings: + 'bad_job_status' => 'To access this page, your import job cannot have status ":status".', - // file, initial config for CSV - 'csv_initial_title' => 'ÐаÑтройка импорта (2/4) - ОÑновные наÑтройки CSV-импорта', - 'csv_initial_text' => 'Чтобы импорт данных прошёл уÑпешно, пожалуйÑта проверьте неÑколько параметров.', - 'csv_initial_box' => 'ОÑновные параметры импорта CSV', - 'csv_initial_box_title' => 'ОÑновные параметры импорта CSV', - 'csv_initial_header_help' => 'УÑтановите Ñтот флажок, еÑли Ð¿ÐµÑ€Ð²Ð°Ñ Ñтрока CSV-файла Ñодержит заголовки Ñтолбцов.', - 'csv_initial_date_help' => 'Формат даты и времени в вашем CSV-файле. ПридерживайтеÑÑŒ формата, опиÑанного на Ñтой Ñтранице. По умолчанию дату будут анализироватьÑÑ Ð½Ð° ÑоответÑтвие такому формату: :dateExample.', - 'csv_initial_delimiter_help' => 'Выберите разделитель полей, который иÑпользуетÑÑ Ð² вашем файле. ЕÑли вы не уверены, помните, что запÑÑ‚Ð°Ñ - Ñто Ñамый безопаÑный вариант.', - 'csv_initial_import_account_help' => 'ЕÑли ваш CSV-файл ÐЕ СОДЕРЖИТ информацию о ваших Ñчетах, иÑпользуйте Ñтот выпадающий ÑпиÑок, чтобы выбрать, к какому Ñчёту отноÑÑÑ‚ÑÑ Ñ‚Ñ€Ð°Ð½Ð·Ð°ÐºÑ†Ð¸Ð¸ в CVS-файле.', - 'csv_initial_submit' => 'Перейти к шагу 3/4', - - // file, new options: - 'file_apply_rules_title' => 'Применить правила', - 'file_apply_rules_description' => 'Применить ваши правила. Обратите внимание, что Ñто значительно замедлÑет импорт.', - 'file_match_bills_title' => 'СоответÑтвующие Ñчета к оплате', - 'file_match_bills_description' => 'СопоÑтавление Ñвои Ñчета к оплате Ñ Ð²Ð½Ð¾Ð²ÑŒ Ñозданными раÑходами. Помните, что Ñто может ÑущеÑтвенно замедлить импорт.', - - // file, roles config - 'csv_roles_title' => 'ÐаÑтройка импорта (3/4). Определите роль каждого Ñтолбца', - 'csv_roles_text' => 'Каждый Ñтолбец в файле CSV Ñодержит определённые данные. Укажите, какие данные должен ожидать импортер. ÐžÐ¿Ñ†Ð¸Ñ Â«ÑопоÑтавить» данные привÑжет каждую запиÑÑŒ, найденную в Ñтолбце, к значению в вашей базе данных. ЧаÑто отображаемый Ñтолбец - Ñто Ñтолбец, Ñодержащий IBAN ÑпонÑорÑкого Ñчёта. Его можно легко ÑопоÑтавить Ñ ÑущеÑтвующим в вашей базе данных IBAN.', - 'csv_roles_table' => 'Таблица', - 'csv_roles_column_name' => 'Ðазвание Ñтолбца', - 'csv_roles_column_example' => 'Пример данных в Ñтолбце', - 'csv_roles_column_role' => 'Значение в Ñтолбце', - 'csv_roles_do_map_value' => 'СопоÑтавьте Ñти значениÑ', - 'csv_roles_column' => 'Столбец', - 'csv_roles_no_example_data' => 'Ðет доÑтупных данных Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð¼ÐµÑ€Ð°', - 'csv_roles_submit' => 'Перейти к шагу 4/4', - - // not csv, but normal warning - 'roles_warning' => 'ПожалуйÑта, отметьте Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹ один Ñтолбец как Ñтолбец Ñ Ñуммой. Также целеÑообразно выбрать Ñтолбец Ð´Ð»Ñ Ð¾Ð¿Ð¸ÑаниÑ, даты и ÑпонÑорÑкого Ñчёта.', - 'foreign_amount_warning' => 'ЕÑли вы пометите Ñтот Ñтолбец, как Ñодержащий Ñумму в иноÑтранной валюте, вы также должны указать Ñтолбец, который указывает, ÐºÐ°ÐºÐ°Ñ Ð¸Ð¼ÐµÐ½Ð½Ð¾ Ñто валюта.', - - // file, map data - 'file_map_title' => 'ÐаÑтройки импорта (4/4) - СопоÑтавление данных импорта Ñ Ð´Ð°Ð½Ð½Ñ‹Ð¼Ð¸ Firefly III', - 'file_map_text' => 'Ð’ Ñледующих таблицах значение Ñлева отображает информацию, найденную в загруженном файле. Ваша задача - ÑопоÑтавить Ñто значение (еÑли Ñто возможно) Ñо значением, уже имеющимÑÑ Ð² вашей базе данных. Firefly будет придерживатьÑÑ Ñтого ÑопоÑтавлениÑ. ЕÑли Ð´Ð»Ñ ÑопоÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð½ÐµÑ‚ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ вы не хотите отображать определённое значение, ничего не выбирайте.', - 'file_map_field_value' => 'Значение полÑ', - 'file_map_field_mapped_to' => 'СопоÑтавлено Ñ', - 'map_do_not_map' => '(не ÑопоÑтавлено)', - 'file_map_submit' => 'Ðачать импорт', - 'file_nothing_to_map' => 'Ð’ вашем файле нет данных, которые можно ÑопоÑтавить Ñ ÑущеÑтвующими значениÑми. Ðажмите «Ðачать импорт», чтобы продолжить.', - - // map things. + // column roles for CSV import: 'column__ignore' => '(игнорировать Ñтот Ñтолбец)', 'column_account-iban' => 'Счет актива (IBAN)', 'column_account-id' => 'ID оÑновного Ñчёта (ÑоответÑтвующий FF3)', @@ -158,48 +261,4 @@ return [ 'column_note' => 'ПримечаниÑ', 'column_internal-reference' => 'ВнутреннÑÑ ÑÑылка', - // prerequisites - 'prerequisites' => 'ТребованиÑ', - - // bunq - 'bunq_prerequisites_title' => 'Ð¢Ñ€ÐµÐ±Ð¾Ð²Ð°Ð½Ð¸Ñ Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð° из bunq', - 'bunq_prerequisites_text' => 'Чтобы импортировать из bunq, вам нужно получить ключ API. Ð’Ñ‹ можете Ñделать Ñто через приложение. Обратите внимание, что Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð° Ð´Ð»Ñ bunq находитÑÑ Ð² бета-теÑтированиÑ. Было протеÑтировано только API пеÑочницы (sandbox).', - 'bunq_prerequisites_text_ip' => 'Ð”Ð»Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ Ñ Bunq необходимо указать ваш внешний IP-адреÑ. Firefly III попыталÑÑ ÑƒÐ·Ð½Ð°Ñ‚ÑŒ ваш Ð°Ð´Ñ€ÐµÑ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Ñлужбы ipify. УбедитеÑÑŒ, что Ñтот IP-Ð°Ð´Ñ€ÐµÑ Ð²ÐµÑ€ÐµÐ½, иначе импорт не будет выполнен.', - 'bunq_do_import' => 'Да, импортировать Ñ Ñтого Ñчёта', - 'bunq_accounts_title' => 'Счета Bunq', - 'bunq_accounts_text' => 'Эти Ñчета ÑвÑзаны Ñ Ð²Ð°ÑˆÐµÐ¹ учётной запиÑью bunq. Выберите Ñчета, данные о о которых вы хотите импортировать, и Ñчёт, на который будут импортированы транзакции.', - - // Spectre - 'spectre_title' => 'Импорт Ñ Ð¸Ñпользованием Spectre', - 'spectre_prerequisites_title' => 'Ð¢Ñ€ÐµÐ±Ð¾Ð²Ð°Ð½Ð¸Ñ Ð´Ð»Ñ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚Ð° Ñ Ð¸Ñпользованием Spectre', - 'spectre_prerequisites_text' => 'Чтобы импортировать данные Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ Spectre API (v4), вы должны предоÑтавить Firefly III два Ñекретных значениÑ. Их можно найти на Ñтранице secrets page.', - 'spectre_enter_pub_key' => 'Импорт будет работать только еÑли вы введёте Ñтот ключ безопаÑноÑти на Ñтранице Ñ ÐºÐ»ÑŽÑ‡Ð°Ð¼Ð¸ в Ñвоём аккаунте.', - 'spectre_accounts_title' => 'Выберите Ñчёта, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ñ… будет производитьÑÑ Ð¸Ð¼Ð¿Ð¾Ñ€Ñ‚', - 'spectre_accounts_text' => 'Каждый Ñчёт в ÑпиÑке Ñлева был найден в в Spectre и может быть импортирован в Firefly III. Выберите оÑновной Ñчёт, на котором нужно Ñохранить импортируемые транзакции. ЕÑли вы не хотите импортировать данные Ñ ÐºÐ°ÐºÐ¾Ð³Ð¾-либо конкретного Ñчёта, Ñнимите ÑоответÑтвующий флажок.', - 'spectre_do_import' => 'Да, импортировать Ñ Ñтого Ñчёта', - 'spectre_no_supported_accounts' => 'Ð’Ñ‹ не можете импортировать Ñ Ñтого Ñчёта из-за неÑоответÑÑ‚Ð²Ð¸Ñ Ð²Ð°Ð»ÑŽÑ‚Ñ‹.', - - // keys from "extra" array: - 'spectre_extra_key_iban' => 'IBAN', - 'spectre_extra_key_swift' => 'SWIFT', - 'spectre_extra_key_status' => 'СтатуÑ', - 'spectre_extra_key_card_type' => 'Тип карты', - 'spectre_extra_key_account_name' => 'Ðазвание Ñчёта', - 'spectre_extra_key_client_name' => 'Ð˜Ð¼Ñ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð°', - 'spectre_extra_key_account_number' => 'Ðомер Ñчёта', - 'spectre_extra_key_blocked_amount' => 'Ð—Ð°Ð±Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ñумма', - 'spectre_extra_key_available_amount' => 'ДоÑÑ‚ÑƒÐ¿Ð½Ð°Ñ Ñумма', - 'spectre_extra_key_credit_limit' => 'Кредитный лимит', - 'spectre_extra_key_interest_rate' => 'ÐŸÑ€Ð¾Ñ†ÐµÐ½Ñ‚Ð½Ð°Ñ Ñтавка', - 'spectre_extra_key_expiry_date' => 'Дата окончаниÑ', - 'spectre_extra_key_open_date' => 'Дата открытиÑ', - 'spectre_extra_key_current_time' => 'Текущее времÑ', - 'spectre_extra_key_current_date' => 'Ð¢ÐµÐºÑƒÑ‰Ð°Ñ Ð´Ð°Ñ‚Ð°', - 'spectre_extra_key_cards' => 'Карты', - 'spectre_extra_key_units' => 'Единицы', - 'spectre_extra_key_unit_price' => 'Цена за единицу', - 'spectre_extra_key_transactions_count' => 'КоличеÑтво транзакций', - - // various other strings: - 'imported_from_account' => 'Импортировано Ñо Ñчёта ":account"', ]; diff --git a/resources/lang/ru_RU/intro.php b/resources/lang/ru_RU/intro.php index 40f7a5dd48..8f21f6457e 100644 --- a/resources/lang/ru_RU/intro.php +++ b/resources/lang/ru_RU/intro.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // index 'index_intro' => 'Добро пожаловать на Ñтартовую Ñтраницу Firefly III. ПожалуйÑта, найдите времÑ, чтобы ознакомитьÑÑ Ñ Ñтим кратким введением в возможноÑти Firefly III.', diff --git a/resources/lang/ru_RU/list.php b/resources/lang/ru_RU/list.php index effe3f6184..ad3e77cc87 100644 --- a/resources/lang/ru_RU/list.php +++ b/resources/lang/ru_RU/list.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'buttons' => 'Кнопки', 'icon' => 'Значок', @@ -111,10 +112,15 @@ return [ 'sepa-cc' => 'Код очиÑтки SEPA', 'sepa-ep' => 'ВнешнÑÑ Ñ†ÐµÐ»ÑŒ SEPA', 'sepa-ci' => 'Идентификатор кредитора SEPA', + 'external_id' => 'Внешний ID', 'account_at_bunq' => 'Счёт Ñ bunq', 'file_name' => 'Ð˜Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð°', 'file_size' => 'Размер файла', 'file_type' => 'Тип файла', 'attached_to' => 'Прикреплено к', 'file_exists' => 'Файл ÑущеÑтвует', + 'spectre_bank' => 'Bank', + 'spectre_last_use' => 'Last login', + 'spectre_status' => 'Status', + 'bunq_payment_id' => 'bunq payment ID', ]; diff --git a/resources/lang/ru_RU/pagination.php b/resources/lang/ru_RU/pagination.php index 686f3d513f..55ea0144e6 100644 --- a/resources/lang/ru_RU/pagination.php +++ b/resources/lang/ru_RU/pagination.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'previous' => '« Предыдущие', 'next' => 'Следующие »', diff --git a/resources/lang/ru_RU/passwords.php b/resources/lang/ru_RU/passwords.php index 331c788036..b54116eda5 100644 --- a/resources/lang/ru_RU/passwords.php +++ b/resources/lang/ru_RU/passwords.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'password' => 'Пароль должен Ñодержать не менее 6 Ñимволов. Пароль и его подтверждение должны Ñовпадать.', 'user' => 'Мы не можем найти Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ñ Ñ‚Ð°ÐºÐ¸Ð¼ e-mail.', diff --git a/resources/lang/ru_RU/validation.php b/resources/lang/ru_RU/validation.php index 0aa6c7686d..9d551d5344 100644 --- a/resources/lang/ru_RU/validation.php +++ b/resources/lang/ru_RU/validation.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'iban' => 'Это некорректный IBAN.', 'source_equals_destination' => 'Счёт иÑточник и Ñчёт Ð½Ð°Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ñовпадают', @@ -109,7 +110,8 @@ return [ 'in_array' => 'Поле :attribute не ÑущеÑтвует в :other.', 'present' => 'Поле :attribute должно быть заполнено.', 'amount_zero' => 'Общее количеÑтво не может быть равно нулю', - 'secure_password' => 'Это не безопаÑный пароль. Попробуйте еще раз. Ð”Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ñправки поÑетите https://goo.gl/NCh2tN', + 'unique_piggy_bank_for_user' => 'The name of the piggy bank must be unique.', + 'secure_password' => 'This is not a secure password. Please try again. For more information, visit http://bit.ly/FF3-password-security', 'attributes' => [ 'email' => '"ÐÐ´Ñ€ÐµÑ Ñлектронной почты"', 'description' => '"ОпиÑание"', diff --git a/resources/lang/tr_TR/auth.php b/resources/lang/tr_TR/auth.php index e51cdeef23..a000fd4e5f 100644 --- a/resources/lang/tr_TR/auth.php +++ b/resources/lang/tr_TR/auth.php @@ -1,9 +1,8 @@ . */ -return [ - /* - |-------------------------------------------------------------------------- - | Authentication Language Lines - |-------------------------------------------------------------------------- - | - | The following language lines are used during authentication for various - | messages that we need to display to the user. You are free to modify - | these language lines according to your application's requirements. - | - */ +declare(strict_types=1); +return [ 'failed' => 'Bu kimlik bilgileri kayıtlarımızla uyuÅŸmuyor.', 'throttle' => 'Fazla sayıda oturum açma giriÅŸimi. Lütfen :seconds saniye sonra tekrar deneyiniz.', ]; diff --git a/resources/lang/tr_TR/bank.php b/resources/lang/tr_TR/bank.php index 8826020cbf..5d00b1e685 100644 --- a/resources/lang/tr_TR/bank.php +++ b/resources/lang/tr_TR/bank.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ ]; diff --git a/resources/lang/tr_TR/breadcrumbs.php b/resources/lang/tr_TR/breadcrumbs.php index 17bc230d6a..82d66d4c65 100644 --- a/resources/lang/tr_TR/breadcrumbs.php +++ b/resources/lang/tr_TR/breadcrumbs.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'home' => 'Anasayfa', 'edit_currency' => '":name" para birimini düzenle', diff --git a/resources/lang/tr_TR/components.php b/resources/lang/tr_TR/components.php index 50092e06fd..6299088f8e 100644 --- a/resources/lang/tr_TR/components.php +++ b/resources/lang/tr_TR/components.php @@ -1,5 +1,4 @@ . */ +declare(strict_types=1); + return [ // profile 'personal_access_tokens' => 'Personal access tokens', diff --git a/resources/lang/tr_TR/config.php b/resources/lang/tr_TR/config.php index 7c3694a155..4bc8b0175d 100644 --- a/resources/lang/tr_TR/config.php +++ b/resources/lang/tr_TR/config.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'html_language' => 'tr', 'locale' => 'tr, Turkish, tr_TR, tr_TR.utf8, tr_TR.S.UTF-8', diff --git a/resources/lang/tr_TR/csv.php b/resources/lang/tr_TR/csv.php index 622a49202a..aae109a40a 100644 --- a/resources/lang/tr_TR/csv.php +++ b/resources/lang/tr_TR/csv.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ ]; diff --git a/resources/lang/tr_TR/demo.php b/resources/lang/tr_TR/demo.php index 5c4ee00a0d..f60723c7a3 100644 --- a/resources/lang/tr_TR/demo.php +++ b/resources/lang/tr_TR/demo.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'no_demo_text' => 'Maalesef, bu sayfa için daha fazla demo açıklama metni yok.', 'see_help_icon' => 'Ancak, saÄŸ üst köşedeki simge size daha fazla bilgi verebilir.', @@ -32,5 +33,5 @@ return [ 'currencies-index' => 'Firefly III, birden fazla para birimini destekliyor. Euro varsayılan olmasına raÄŸmen, ABD Doları ve diÄŸer birçok para birimine ayarlanabilir. Gördüğünüz gibi küçük bir para birimi seçeneÄŸi dedahil edilmiÅŸtir ancak isterseniz kendi para biriminizi ekleyebilirsiniz. Varsayılan para birimi deÄŸiÅŸtirilebilir ancak mevcut iÅŸlemlerin para birimi deÄŸiÅŸtirilemez: Firefly III, aynı anda birden çok para biriminin kullanılmasını destekler.', 'transactions-index' => 'Bu masraflar, mevduatlar ve transferler için özellikle yaratıcı deÄŸildir. Bunlar otomatik olarak oluÅŸturuldu.', 'piggy-banks-index' => 'Gördüğünüz gibi, üç tane banka var. Her domuzcuk bankasındaki para miktarını deÄŸiÅŸtirmek için artı ve eksi düğmelerini kullanın. Her domuzcuk bankasının yönetimini görmek için domuzcuk\'un üzerine tıklayın.', - 'import-index' => 'Elbette, herhangi bir CVS dosyası Firefly III\'e aktarılabilir', + 'import-index' => 'Any CSV file can be imported into Firefly III. It also supports importing data from bunq and Spectre. Other banks and financial aggregators will be implemented in the future. As a demo-user however, you can only see the "fake"-provider in action. It will generate some random transactions to show you how the process works.', ]; diff --git a/resources/lang/tr_TR/firefly.php b/resources/lang/tr_TR/firefly.php index 43138bb0b3..32747c7c17 100644 --- a/resources/lang/tr_TR/firefly.php +++ b/resources/lang/tr_TR/firefly.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // general stuff: 'close' => 'Kapat', @@ -179,6 +180,7 @@ return [ 'authorization_request_intro' => ':client is requesting permission to access your financial administration. Would you like to authorize :client to access these records?', 'scopes_will_be_able' => 'This application will be able to:', 'button_authorize' => 'Authorize', + 'none_in_select_list' => '(none)', // check for updates: 'update_check_title' => 'Check for updates', @@ -667,6 +669,7 @@ iÅŸlemlerin kontrol edildiÄŸini lütfen unutmayın.', 'bill_will_automatch' => 'Fatura uygun iÅŸlemlere otomatik olarak baÄŸlandı', 'skips_over' => 'atla', 'bill_store_error' => 'An unexpected error occurred while storing your new bill. Please check the log files', + 'list_inactive_rule' => 'inactive rule', // accounts: 'details_for_asset' => '":name" Varlık hesabı ayrıntıları', @@ -802,6 +805,7 @@ iÅŸlemlerin kontrol edildiÄŸini lütfen unutmayın.', 'opt_group_savingAsset' => 'Tasarruf Hesapları', 'opt_group_sharedAsset' => 'Paylaşılan varlık hesapları', 'opt_group_ccAsset' => 'Kredi Kartı', + 'opt_group_cashWalletAsset' => 'Cash wallets', 'notes' => 'Notes', 'unknown_journal_error' => 'Could not store the transaction. Please check the log files.', @@ -817,6 +821,7 @@ iÅŸlemlerin kontrol edildiÄŸini lütfen unutmayın.', 'language' => 'Language', 'new_savings_account' => ':bank_name savings account', 'cash_wallet' => 'Cash wallet', + 'currency_not_present' => 'If the currency you normally use is not listed do not worry. You can create your own currencies under Options > Currencies.', // home page: 'yourAccounts' => 'Hesaplarınız', @@ -1014,6 +1019,7 @@ iÅŸlemlerin kontrol edildiÄŸini lütfen unutmayın.', 'remove_money_from_piggy_title' => '":name" kumbarasından para çek', 'add' => 'Ekle', 'no_money_for_piggy' => 'Bu kumbaraya koyacak paran yok.', + 'suggested_savings_per_month' => 'Suggested per month', 'remove' => 'Kaldır', 'max_amount_add' => 'EkleyebileceÄŸiniz azami tutar', @@ -1149,27 +1155,9 @@ iÅŸlemlerin kontrol edildiÄŸini lütfen unutmayın.', 'no_edit_multiple_left' => 'Düzenlemek için geçerli Ä°ÅŸlemler seçmediniz.', 'cannot_convert_split_journal' => 'Bölünmüş bir Ä°ÅŸlemi dönüştüremezsiniz', - // import bread crumbs and titles: - 'import' => 'İçe aktar', - 'import_data' => 'Veriyi içe aktar', - 'import_general_index_file' => 'Bir Dosyayı içe aktar', - 'import_from_bunq' => 'Bunq\'dan aktar', - 'import_using_spectre' => 'Spectre kullanarak içe aktar', - 'import_using_plaid' => 'Palid kullanarak içe aktar', - 'import_config_bread_crumb' => 'Aktarımınızı oluÅŸturunuz', - - // import index page: + // Import page (general strings only) 'import_index_title' => 'Firefly III\'e veri aktarma', - 'import_index_sub_title' => 'Ä°ndeks', - 'import_general_index_intro' => 'Welcome to Firefly III\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.', - 'upload_error' => 'The file you have uploaded could not be processed. Possibly it is of an invalid file type or encoding. The log files will have more information.', - 'reset_import_settings_title' => 'Reset import configuration', - 'reset_import_settings_text' => 'You can use these links to reset your import settings for specific providers. This is useful when bad settings stop you from importing data.', - 'reset_settings_bunq' => 'Remove bunq API key, local external IP address and bunq related RSA keys.', - 'reset_settings_spectre' => 'Remove Spectre secrets and ID\'s. This will also remove your Spectre keypair. Remember to update the new one.', - 'settings_reset_for_bunq' => 'Bunq settings reset.', - 'settings_reset_for_spectre' => 'Spectre settings reset.', - + 'import_data' => 'Veriyi içe aktar', // sandstorm.io errors and messages: 'sandstorm_not_available' => 'Bir Sandstorm.io ortamında Firefly III kullanıyorsanız, bu iÅŸlev kullanılamaz.', diff --git a/resources/lang/tr_TR/form.php b/resources/lang/tr_TR/form.php index 0304b33981..ac3f7c5de7 100644 --- a/resources/lang/tr_TR/form.php +++ b/resources/lang/tr_TR/form.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // new user: 'bank_name' => 'Banka adı', @@ -184,6 +185,13 @@ return [ 'blocked' => 'Engellendi mi?', 'blocked_code' => 'Blok nedeni', + // import + 'apply_rules' => 'Apply rules', + 'artist' => 'Artist', + 'album' => 'Album', + 'song' => 'Song', + + // admin 'domain' => 'Alan adı', 'single_user_mode' => 'Kullanıcı kaydını devre dışı bırak', diff --git a/resources/lang/tr_TR/import.php b/resources/lang/tr_TR/import.php index 1d7658750c..dd1ecba61d 100644 --- a/resources/lang/tr_TR/import.php +++ b/resources/lang/tr_TR/import.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ - // status of import: + // ALL breadcrumbs and subtitles: + 'index_breadcrumb' => 'Import data into Firefly III', + 'prerequisites_breadcrumb_fake' => 'Prerequisites for the fake import provider', + 'prerequisites_breadcrumb_spectre' => 'Prerequisites for Spectre', + 'prerequisites_breadcrumb_bunq' => 'Prerequisites for bunq', + 'job_configuration_breadcrumb' => 'Configuration for ":key"', + 'job_status_breadcrumb' => 'Import status for ":key"', + 'cannot_create_for_provider' => 'Firefly III cannot create a job for the ":provider"-provider.', + + // index page: + 'general_index_title' => 'Import a file', + 'general_index_intro' => 'Welcome to Firefly III\'s import routine. There are a few ways of importing data into Firefly III, displayed here as buttons.', + // import provider strings (index): + 'button_fake' => 'Fake an import', + 'button_file' => 'Import a file', + 'button_bunq' => 'Import from bunq', + 'button_spectre' => 'Import using Spectre', + 'button_plaid' => 'Import using Plaid', + 'button_yodlee' => 'Import using Yodlee', + 'button_quovo' => 'Import using Quovo', + // global config box (index) + 'global_config_title' => 'Global import configuration', + 'global_config_text' => 'In the future, this box will feature preferences that apply to ALL import providers above.', + // prerequisites box (index) + 'need_prereq_title' => 'Import prerequisites', + 'need_prereq_intro' => 'Some import methods need your attention before they can be used. For example, they might require special API keys or application secrets. You can configure them here. The icon indicates if these prerequisites have been met.', + 'do_prereq_fake' => 'Prerequisites for the fake provider', + 'do_prereq_file' => 'Prerequisites for file imports', + 'do_prereq_bunq' => 'Prerequisites for imports from bunq', + 'do_prereq_spectre' => 'Prerequisites for imports using Spectre', + 'do_prereq_plaid' => 'Prerequisites for imports using Plaid', + 'do_prereq_yodlee' => 'Prerequisites for imports using Yodlee', + 'do_prereq_quovo' => 'Prerequisites for imports using Quovo', + // provider config box (index) + 'can_config_title' => 'Import configuration', + 'can_config_intro' => 'Some import methods can be configured to your liking. They have extra settings you can tweak.', + 'do_config_fake' => 'Configuration for the fake provider', + 'do_config_file' => 'Configuration for file imports', + 'do_config_bunq' => 'Configuration for bunq imports', + 'do_config_spectre' => 'Configuration for imports from Spectre', + 'do_config_plaid' => 'Configuration for imports from Plaid', + 'do_config_yodlee' => 'Configuration for imports from Yodlee', + 'do_config_quovo' => 'Configuration for imports from Quovo', + + // prerequisites: + 'prereq_fake_title' => 'Prerequisites for an import from the fake import provider', + 'prereq_fake_text' => 'This fake provider requires a fake API key. It must be 32 characters long. You can use this one: 123456789012345678901234567890AA', + 'prereq_spectre_title' => 'Prerequisites for an import using the Spectre API', + 'prereq_spectre_text' => 'In order to import data using the Spectre API (v4), you must provide Firefly III with two secret values. They can be found on the secrets page.', + 'prereq_spectre_pub' => 'Likewise, the Spectre API needs to know the public key you see below. Without it, it will not recognize you. Please enter this public key on your secrets page.', + 'prereq_bunq_title' => 'Prerequisites for an import from bunq', + 'prereq_bunq_text' => 'In order to import from bunq, you need to obtain an API key. You can do this through the app. Please note that the import function for bunq is in BETA. It has only been tested against the sandbox API.', + 'prereq_bunq_ip' => 'bunq requires your externally facing IP address. Firefly III has tried to fill this in using the ipify service. Make sure this IP address is correct, or the import will fail.', + // prerequisites success messages: + 'prerequisites_saved_for_fake' => 'Fake API key stored successfully!', + 'prerequisites_saved_for_spectre' => 'App ID and secret stored!', + 'prerequisites_saved_for_bunq' => 'API key and IP stored!', + + // job configuration: + 'job_config_apply_rules_title' => 'Job configuration - apply your rules?', + 'job_config_apply_rules_text' => 'Once the fake provider has run, your rules can be applied to the transactions. This adds time to the import.', + 'job_config_input' => 'Your input', + // job configuration for the fake provider: + 'job_config_fake_artist_title' => 'Enter album name', + 'job_config_fake_artist_text' => 'Many import routines have a few configuration steps you must go through. In the case of the fake import provider, you must answer some weird questions. In this case, enter "David Bowie" to continue.', + 'job_config_fake_song_title' => 'Enter song name', + 'job_config_fake_song_text' => 'Mention the song "Golden years" to continue with the fake import.', + 'job_config_fake_album_title' => 'Enter album name', + 'job_config_fake_album_text' => 'Some import routines require extra data halfway through the import. In the case of the fake import provider, you must answer some weird questions. Enter "Station to station" to continue.', + // job configuration form the file provider + 'job_config_file_upload_title' => 'Import setup (1/4) - Upload your file', + 'job_config_file_upload_text' => 'This routine will help you import files from your bank into Firefly III. ', + 'job_config_file_upload_help' => 'Select your file. Please make sure the file is UTF-8 encoded.', + 'job_config_file_upload_config_help' => 'If you have previously imported data into Firefly III, you may have a configuration file, which will pre-set configuration values for you. For some banks, other users have kindly provided their configuration file', + 'job_config_file_upload_type_help' => 'Select the type of file you will upload', + 'job_config_file_upload_submit' => 'Upload files', + 'import_file_type_csv' => 'CSV (virgülle ayrılmış deÄŸerler)', + 'file_not_utf8' => 'The file you have uploaded is not encoded as UTF-8 or ASCII. Firefly III cannot handle such files. Please use Notepad++ or Sublime to convert your file to UTF-8.', + 'job_config_uc_title' => 'Import setup (2/4) - Basic file setup', + 'job_config_uc_text' => 'To be able to import your file correctly, please validate the options below.', + 'job_config_uc_header_help' => 'Check this box if the first row of your CSV file are the column titles.', + 'job_config_uc_date_help' => 'Date time format in your file. Follow the format as this page indicates. The default value will parse dates that look like this: :dateExample.', + 'job_config_uc_delimiter_help' => 'Choose the field delimiter that is used in your input file. If not sure, comma is the safest option.', + 'job_config_uc_account_help' => 'If your file does NOT contain information about your asset account(s), use this dropdown to select to which account the transactions in the file belong to.', + 'job_config_uc_apply_rules_title' => 'Apply rules', + 'job_config_uc_apply_rules_text' => 'Applies your rules to every imported transaction. Note that this slows the import significantly.', + 'job_config_uc_specifics_title' => 'Bank-specific options', + 'job_config_uc_specifics_txt' => 'Some banks deliver badly formatted files. Firefly III can fix those automatically. If your bank delivers such files but it\'s not listed here, please open an issue on GitHub.', + 'job_config_uc_submit' => 'Continue', + 'invalid_import_account' => 'You have selected an invalid account to import into.', + // job configuration for Spectre: + 'job_config_spectre_login_title' => 'Choose your login', + 'job_config_spectre_login_text' => 'Firefly III has found :count existing login(s) in your Spectre account. Which one would you like to use to import from?', + 'spectre_login_status_active' => 'Active', + 'spectre_login_status_inactive' => 'Inactive', + 'spectre_login_status_disabled' => 'Disabled', + 'spectre_login_new_login' => 'Login with another bank, or one of these banks with different credentials.', + 'job_config_spectre_accounts_title' => 'Select accounts to import from', + 'job_config_spectre_accounts_text' => 'You have selected ":name" (:country). You have :count account(s) available from this provider. Please select the Firefly III asset account(s) where the transactions from these accounts should be stored. Remember, in order to import data both the Firefly III account and the ":name"-account must have the same currency.', + 'spectre_no_supported_accounts' => 'You cannot import from this account due to a currency mismatch.', + 'spectre_do_not_import' => '(do not import)', + 'spectre_no_mapping' => 'It seems you have not selected any accounts to import from.', + 'imported_from_account' => 'Imported from ":account"', + 'spectre_account_with_number' => 'Account :number', + // job configuration for bunq: + 'job_config_bunq_accounts_title' => 'bunq accounts', + 'job_config_bunq_accounts_text' => 'These are the accounts associated with your bunq account. Please select the accounts from which you want to import, and in which account the transactions must be imported.', + 'bunq_no_mapping' => 'It seems you have not selected any accounts.', + 'should_download_config' => 'You should download the configuration file for this job. This will make future imports way easier.', + 'share_config_file' => 'If you have imported data from a public bank, you should share your configuration file so it will be easy for other users to import their data. Sharing your configuration file will not expose your financial details.', + + // keys from "extra" array: + 'spectre_extra_key_iban' => 'IBAN', + 'spectre_extra_key_swift' => 'SWIFT', + 'spectre_extra_key_status' => 'Status', + 'spectre_extra_key_card_type' => 'Card type', + 'spectre_extra_key_account_name' => 'Account name', + 'spectre_extra_key_client_name' => 'Client name', + 'spectre_extra_key_account_number' => 'Account number', + 'spectre_extra_key_blocked_amount' => 'Blocked amount', + 'spectre_extra_key_available_amount' => 'Available amount', + 'spectre_extra_key_credit_limit' => 'Credit limit', + 'spectre_extra_key_interest_rate' => 'Interest rate', + 'spectre_extra_key_expiry_date' => 'Expiry date', + 'spectre_extra_key_open_date' => 'Open date', + 'spectre_extra_key_current_time' => 'Current time', + 'spectre_extra_key_current_date' => 'Current date', + 'spectre_extra_key_cards' => 'Cards', + 'spectre_extra_key_units' => 'Units', + 'spectre_extra_key_unit_price' => 'Unit price', + 'spectre_extra_key_transactions_count' => 'Transaction count', + + // specifics: + 'specific_ing_name' => 'ING NL', + 'specific_ing_descr' => 'Create better descriptions in ING exports', + 'specific_sns_name' => 'SNS / Volksbank NL', + 'specific_sns_descr' => 'Trim quotes from SNS / Volksbank export files', + 'specific_abn_name' => 'ABN AMRO NL', + 'specific_abn_descr' => 'Fixes potential problems with ABN AMRO files', + 'specific_rabo_name' => 'Rabobank NL', + 'specific_rabo_descr' => 'Fixes potential problems with Rabobank files', + 'specific_pres_name' => 'President\'s Choice Financial CA', + 'specific_pres_descr' => 'Fixes potential problems with PC files', + // job configuration for file provider (stage: roles) + 'job_config_roles_title' => 'Import setup (3/4) - Define each column\'s role', + 'job_config_roles_text' => 'Each column in your CSV file contains certain data. Please indicate what kind of data the importer should expect. The option to "map" data means that you will link each entry found in the column to a value in your database. An often mapped column is the column that contains the IBAN of the opposing account. That can be easily matched to IBAN\'s present in your database already.', + 'job_config_roles_submit' => 'Continue', + 'job_config_roles_column_name' => 'Name of column', + 'job_config_roles_column_example' => 'Column example data', + 'job_config_roles_column_role' => 'Column data meaning', + 'job_config_roles_do_map_value' => 'Map these values', + 'job_config_roles_no_example' => 'No example data available', + 'job_config_roles_fa_warning' => 'If you mark a column as containing an amount in a foreign currency, you must also set the column that contains which currency it is.', + 'job_config_roles_rwarning' => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.', + 'job_config_roles_colum_count' => 'Column', + // job config for the file provider (stage: mapping): + 'job_config_map_title' => 'Import setup (4/4) - Connect import data to Firefly III data', + 'job_config_map_text' => 'In the following tables, the left value shows you information found in your uploaded file. It is your task to map this value, if possible, to a value already present in your database. Firefly will stick to this mapping. If there is no value to map to, or you do not wish to map the specific value, select nothing.', + 'job_config_map_nothing' => 'There is no data present in your file that you can map to existing values. Please press "Start the import" to continue.', + 'job_config_field_value' => 'Field value', + 'job_config_field_mapped' => 'Mapped to', + 'map_do_not_map' => '(eÅŸleÅŸtirme)', + 'job_config_map_submit' => 'Start the import', + + + // import status page: + 'import_with_key' => '\':key\' ile içe aktarın', 'status_wait_title' => 'Lütfen bekleyin...', 'status_wait_text' => 'Bu kutu bir dakika içinde kaybolacak.', - 'status_fatal_title' => 'Önemli bir hata oluÅŸtu', - 'status_fatal_text' => 'İçe aktarma rutininin kurtaramadığı önemli bir hata oluÅŸtu. Lütfen aÅŸağıdaki kırmızı renkli açıklamaları okuyun.', - 'status_fatal_more' => 'EÄŸer hata zaman aşımı ise, içe aktarma yarısında durdurulur. Bazı sunucu ayarlarında sadece sunucu durdurulurken içe aktarım arka planda devam eder. Bunu saÄŸlamak için kayıt dosyalarını kontrol edin. EÄŸer sorun devam ederse komut satırı üzerinden içe aktarımı deneyin.', - 'status_ready_title' => 'İçe aktarım baÅŸlamaya hazır', - 'status_ready_text' => 'İçe aktarım baÅŸlamaya hazır. Yapmanız gereken tüm ayarlar yapıldı. Lütfen ayar dosyasını indirin. İçe aktarım planlandığı gibi gitmezse size yardım edecektir. İçe aktarımı baÅŸlatmak için takip eden komutu konsolunuza girebilir ya da web tabanlı içe aktarımı kullanabilirsiniz. Ayarlarınıza baÄŸlı olarak göre konsol içe aktarımı size daha fazla geri bildirim verecektir.', - 'status_ready_noconfig_text' => 'İçe aktarım baÅŸlamaya hazır. Yapmanız gereken tüm ayarlar yapıldı. İçe aktarımı baÅŸlatmak için takip eden komutu konsolunuza girebilir ya da web tabanlı içe aktarımı kullanabilirsiniz. Ayarlarınıza baÄŸlı olarak göre konsol içe aktarımı size daha fazla geri bildirim verecektir.', - 'status_ready_config' => 'Yapılandırmayı indir', - 'status_ready_start' => 'İçe aktarmayı baÅŸlat', - 'status_ready_share' => 'Lütfen ayarlarınızı indirmeyi ve onu içe aktarım ayarları merkezinde paylaÅŸmayı düşünün. Bu diÄŸer kullanıcılarının Firefly III\'ün dosyalarını daha kolay içe aktarmasına olanak tanır.', - 'status_job_new' => 'Yeni iÅŸ.', - 'status_job_configuring' => 'İçe aktarım ayarlanıyor.', - 'status_job_configured' => 'İçe aktarım ayarlandı.', - 'status_job_running' => 'Alma iÅŸlemi çalışıyor... Lütfen bekleyin..', - 'status_job_error' => 'Ä°ÅŸ bir hata üretti.', - 'status_job_finished' => 'Alma iÅŸlemi tamamlandı!', 'status_running_title' => 'İçe aktarma iÅŸlemi sürüyor', - 'status_running_placeholder' => 'Güncelleme için lütfen bekleyin...', - 'status_finished_title' => 'İçe aktarma rutini tamamlandı', - 'status_finished_text' => 'İçe aktarma rutini verilerinizi içe aktardı.', - 'status_errors_title' => 'İçe aktarım sırasında hata', - 'status_errors_single' => 'İçe aktarım sırasında bir hata oluÅŸtu. Önemli gibi görünmüyor.', - 'status_errors_multi' => 'İçe aktarım sırasında hatalar oluÅŸtu. Önemli gibi görünmüyorlar.', - 'status_bread_crumb' => 'Aktarma durumu', - 'status_sub_title' => 'Aktarma durumu', - 'config_sub_title' => 'Hesabınızı oluÅŸturunuz', - 'status_finished_job' => 'The :count transactions imported can be found in tag :tag.', - 'status_finished_no_tag' => 'Firefly III has not collected any transactions from your import file.', - 'import_with_key' => '\':key\' ile içe aktarın', + 'status_job_running' => 'Please wait, running the import...', + 'status_job_storing' => 'Please wait, storing data...', + 'status_job_rules' => 'Please wait, running rules...', + 'status_fatal_title' => 'Fatal error', + 'status_fatal_text' => 'The import has suffered from an error it could not recover from. Apologies!', + 'status_fatal_more' => 'This (possibly very cryptic) error message is complemented by log files, which you can find on your hard drive, or in the Docker container where you run Firefly III from.', + 'status_finished_title' => 'Import finished', + 'status_finished_text' => 'The import has finished.', + 'finished_with_errors' => 'There were some errors during the import. Please review them carefully.', + 'unknown_import_result' => 'Unknown import result', + 'result_no_transactions' => 'No transactions have been imported. Perhaps they were all duplicates is simply no transactions where present to be imported. Perhaps the log files can tell you what happened. If you import data regularly, this is normal.', + 'result_one_transaction' => 'Exactly one transaction has been imported. It is stored under tag :tag where you can inspect it further.', + 'result_many_transactions' => 'Firefly III has imported :count transactions. They are stored under tag :tag where you can inspect them further.', - // file, upload something - 'file_upload_title' => 'Ayarları aktar (1/4) - Dosyalarınızı yükelyin', - 'file_upload_text' => 'Bu yöntem dosyalarınızı bankanızdan Firefly III\'e aktarmanıza yardımcı olur. Lütfen saÄŸ üst köşedeki yardımı kontrol edin.', - 'file_upload_fields' => 'Alanlar', - 'file_upload_help' => 'Dosyanızı seçin', - 'file_upload_config_help' => 'EÄŸer Firefly III\'e daha önce veri aktardıysanız, ayarları sizin için önceden ayarlayacak bir ayar dosyasına sahip olabilirsiniz. DiÄŸer kullanıcılar baı bankalar için kendi ayar dosyalarını saÄŸlayabilirler', - 'file_upload_type_help' => 'YükleyeceÄŸiniz dosya türünü seçin', - 'file_upload_submit' => 'Dosyaları yükle', - // file, upload types - 'import_file_type_csv' => 'CSV (virgülle ayrılmış deÄŸerler)', + // general errors and warnings: + 'bad_job_status' => 'To access this page, your import job cannot have status ":status".', - // file, initial config for CSV - 'csv_initial_title' => 'Ayarları aktar (2/4) - Temel CSV aktarım ayarları', - 'csv_initial_text' => 'Dosyanızı doÄŸru bir ÅŸekilde içe aktarabilmek için lütfen aÅŸağıdaki seçenekleri doÄŸrulayın.', - 'csv_initial_box' => 'Temel CSV aktarım ayarları', - 'csv_initial_box_title' => 'Temel CSV aktarım ayarları seçenekleri', - 'csv_initial_header_help' => 'CSV dosyanızın ilk satırları sütun baÅŸlıklarıysa bu kutuyu iÅŸaretleyin.', - 'csv_initial_date_help' => 'CSV dosyanızda ki zaman biçimi. Bu sayfanın gösterdiÄŸi biçimi kontrol takip edin. Varsayılan deÄŸer ÅŸu ÅŸekilde görülen tarihleri ayrıştırır: :dateExample.', - 'csv_initial_delimiter_help' => 'Gir dosyanızda kullanılan alan sınırlayıcıyı seçin. Emin deÄŸilseniz, virgül en güvenli seçenektir.', - 'csv_initial_import_account_help' => 'EÄŸer CSV dosyanız aktif hesabınızla ilgili bilgi içermiyorsa, CSV\'de bulunan iÅŸlemlerin hangi hesaba ait olduÄŸunu bu açılan kutudan seçiniz.', - 'csv_initial_submit' => '3/4 adım ile devam et', - - // file, new options: - 'file_apply_rules_title' => 'Kuralları uygula', - 'file_apply_rules_description' => 'Kurallarınızı kabul ediniz. Bunun önemli ölçüde içe aktarmayı yavaÅŸlattığını unutmayın.', - 'file_match_bills_title' => 'Faturaları eÅŸleÅŸtirin', - 'file_match_bills_description' => 'Faturalarınızı yeni oluÅŸturulan çekimlerle eÅŸleÅŸtirin. Bunun önemli ölçüde içe aktarmayı yavaÅŸlatacağını unutmayın.', - - // file, roles config - 'csv_roles_title' => 'Ayarları aktar (3/4) - Her sütunun görevini belirleyin', - 'csv_roles_text' => 'CSV dosyanızdaki her sütun belirli verileri içerir. Lütfen aktarıcının ne tür bir veri beklemesi gerektiÄŸini belirtin. Verileri "planla" seçeneÄŸi sütunda bulunan her girdinin veri tabanınınızdaki bir deÄŸer ile baÄŸlantılanması anlamına gelir. Genellikle planlanan sütun karşı hesabın IBAN numarasının olduÄŸu sütundur. Bu veri tabanınızda bulunan IBAN\'larla kolayca eÅŸleÅŸtirilebilir.', - 'csv_roles_table' => 'Tablo', - 'csv_roles_column_name' => 'Sütun adı', - 'csv_roles_column_example' => 'Sütun örneÄŸi verileri', - 'csv_roles_column_role' => 'Sütun veri ortalaması', - 'csv_roles_do_map_value' => 'DeÄŸerlerin haritası', - 'csv_roles_column' => 'Sütun', - 'csv_roles_no_example_data' => 'Örnek veri yok', - 'csv_roles_submit' => '4/4 adım ile devam et', - - // not csv, but normal warning - 'roles_warning' => 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.', - 'foreign_amount_warning' => 'If you mark a column as containing an amount in a foreign currency, you must also set the column that contains which currency it is.', - - // file, map data - 'file_map_title' => 'Ayarları aktar (4/4) - İçe aktarım verilerini Firefly III verilerine baÄŸlayın', - 'file_map_text' => 'Takip eden tabloda, sol deÄŸer yüklediÄŸiniz dosyada bulunan bilgileri gösterir. Bu deÄŸeri eÅŸlemek sizin göreviniz, eÄŸer mümkünse veritabanınızda bulunan bir deÄŸerle. Firefly bu eÅŸlemeye baÄŸlı kalacak. EÄŸer eÅŸleÅŸtirilecek deÄŸer yoksa ya da belirli bir deÄŸer ile eÅŸleÅŸtirmek istemiyorsanız hiçbir ÅŸey seçmeyin.', - 'file_map_field_value' => 'Alan deÄŸeri', - 'file_map_field_mapped_to' => 'EÅŸleÅŸti', - 'map_do_not_map' => '(eÅŸleÅŸtirme)', - 'file_map_submit' => 'İçe aktarmaya baÅŸla', - 'file_nothing_to_map' => 'There is no data present in your file that you can map to existing values. Please press "Start the import" to continue.', - - // map things. + // column roles for CSV import: 'column__ignore' => '(bu sütünu yok say)', 'column_account-iban' => 'Öğe hesabı (IBAN)', 'column_account-id' => 'Asset account ID (matching FF3)', @@ -158,48 +261,4 @@ return [ 'column_note' => 'Not(lar)', 'column_internal-reference' => 'Internal reference', - // prerequisites - 'prerequisites' => 'Prerequisites', - - // bunq - 'bunq_prerequisites_title' => 'Bunq\'dan içeri aktarım için ÅŸartlar', - 'bunq_prerequisites_text' => 'In order to import from bunq, you need to obtain an API key. You can do this through the app. Please note that the import function for bunq is in BETA. It has only been tested against the sandbox API.', - 'bunq_prerequisites_text_ip' => 'Bunq requires your externally facing IP address. Firefly III has tried to fill this in using the ipify service. Make sure this IP address is correct, or the import will fail.', - 'bunq_do_import' => 'Yes, import from this account', - 'bunq_accounts_title' => 'Bunq accounts', - 'bunq_accounts_text' => 'These are the accounts associated with your bunq account. Please select the accounts from which you want to import, and in which account the transactions must be imported.', - - // Spectre - 'spectre_title' => 'Spectre kullanarak içe aktar', - 'spectre_prerequisites_title' => 'Spectre kullanarak içe aktarma için ön koÅŸullar', - 'spectre_prerequisites_text' => 'In order to import data using the Spectre API (v4), you must provide Firefly III with two secret values. They can be found on the secrets page.', - 'spectre_enter_pub_key' => 'The import will only work when you enter this public key on your secrets page.', - 'spectre_accounts_title' => 'Select accounts to import from', - 'spectre_accounts_text' => 'Each account on the left below has been found by Spectre and can be imported into Firefly III. Please select the asset account that should hold any given transactions. If you do not wish to import from any particular account, remove the check from the checkbox.', - 'spectre_do_import' => 'Yes, import from this account', - 'spectre_no_supported_accounts' => 'You cannot import from this account due to a currency mismatch.', - - // keys from "extra" array: - 'spectre_extra_key_iban' => 'IBAN', - 'spectre_extra_key_swift' => 'SWIFT', - 'spectre_extra_key_status' => 'Status', - 'spectre_extra_key_card_type' => 'Card type', - 'spectre_extra_key_account_name' => 'Account name', - 'spectre_extra_key_client_name' => 'Client name', - 'spectre_extra_key_account_number' => 'Account number', - 'spectre_extra_key_blocked_amount' => 'Blocked amount', - 'spectre_extra_key_available_amount' => 'Available amount', - 'spectre_extra_key_credit_limit' => 'Credit limit', - 'spectre_extra_key_interest_rate' => 'Interest rate', - 'spectre_extra_key_expiry_date' => 'Expiry date', - 'spectre_extra_key_open_date' => 'Open date', - 'spectre_extra_key_current_time' => 'Current time', - 'spectre_extra_key_current_date' => 'Current date', - 'spectre_extra_key_cards' => 'Cards', - 'spectre_extra_key_units' => 'Units', - 'spectre_extra_key_unit_price' => 'Unit price', - 'spectre_extra_key_transactions_count' => 'Transaction count', - - // various other strings: - 'imported_from_account' => 'Imported from ":account"', ]; diff --git a/resources/lang/tr_TR/intro.php b/resources/lang/tr_TR/intro.php index ed21bd0c27..6e4291b465 100644 --- a/resources/lang/tr_TR/intro.php +++ b/resources/lang/tr_TR/intro.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ // index 'index_intro' => 'Firefly III indeks sayfasına hoÅŸgeldiniz. Firefly III\'nin nasıl çalıştığını öğrenmek için lütfen bu tanıtımı izleyin.', diff --git a/resources/lang/tr_TR/list.php b/resources/lang/tr_TR/list.php index 016da06ac2..4b2516e5f6 100644 --- a/resources/lang/tr_TR/list.php +++ b/resources/lang/tr_TR/list.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'buttons' => 'TuÅŸlar', 'icon' => 'Simge', @@ -111,10 +112,15 @@ return [ 'sepa-cc' => 'SEPA Clearing Code', 'sepa-ep' => 'SEPA External Purpose', 'sepa-ci' => 'SEPA Creditor Identifier', + 'external_id' => 'External ID', 'account_at_bunq' => 'Account with bunq', 'file_name' => 'File name', 'file_size' => 'File size', 'file_type' => 'File type', 'attached_to' => 'Attached to', 'file_exists' => 'File exists', + 'spectre_bank' => 'Bank', + 'spectre_last_use' => 'Last login', + 'spectre_status' => 'Status', + 'bunq_payment_id' => 'bunq payment ID', ]; diff --git a/resources/lang/tr_TR/pagination.php b/resources/lang/tr_TR/pagination.php index 4b82910d66..5022bed68c 100644 --- a/resources/lang/tr_TR/pagination.php +++ b/resources/lang/tr_TR/pagination.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'previous' => '« Önceki', 'next' => 'Sonraki »', diff --git a/resources/lang/tr_TR/passwords.php b/resources/lang/tr_TR/passwords.php index a013bf7294..3a312f2358 100644 --- a/resources/lang/tr_TR/passwords.php +++ b/resources/lang/tr_TR/passwords.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'password' => 'Åžifreniz en az altı karakter olmalıdır ve onayla eÅŸleÅŸmelidir.', 'user' => 'Bu e-posta adresine sahip bir kullanıcı bulunamadı.', diff --git a/resources/lang/tr_TR/validation.php b/resources/lang/tr_TR/validation.php index 00adb5581e..7a4374c4d5 100644 --- a/resources/lang/tr_TR/validation.php +++ b/resources/lang/tr_TR/validation.php @@ -1,9 +1,8 @@ . */ +declare(strict_types=1); + return [ 'iban' => 'Bu IBAN geçerli deÄŸilrdir.', 'source_equals_destination' => 'The source account equals the destination account', @@ -109,7 +110,8 @@ return [ 'in_array' => ':attribute alanı :other içinde olamaz.', 'present' => ':attribute alanı mevcut olmalıdır.', 'amount_zero' => 'Toplam tutar sıfır olamaz', - 'secure_password' => 'Güvenli bir ÅŸifre deÄŸildir. Lütfen tekrar deneyin. Daha fazla bilgi için https://goo.gl/NCh2tN adresini ziyaret edin', + 'unique_piggy_bank_for_user' => 'The name of the piggy bank must be unique.', + 'secure_password' => 'This is not a secure password. Please try again. For more information, visit http://bit.ly/FF3-password-security', 'attributes' => [ 'email' => 'email address', 'description' => 'description', diff --git a/resources/views/bills/create.twig b/resources/views/bills/create.twig index a2663bff18..9bfde12466 100644 --- a/resources/views/bills/create.twig +++ b/resources/views/bills/create.twig @@ -17,7 +17,7 @@
    {{ ExpandedForm.text('name') }} - {{ ExpandedForm.select('transaction_currency_id',currencies, defaultCurrency.id) }} + {{ ExpandedForm.currencyList('transaction_currency_id', defaultCurrency.id) }} {{ ExpandedForm.amountNoCurrency('amount_min') }} {{ ExpandedForm.amountNoCurrency('amount_max') }} {{ ExpandedForm.date('date',phpdate('Y-m-d')) }} diff --git a/resources/views/bills/edit.twig b/resources/views/bills/edit.twig index e64d063905..6302b36198 100644 --- a/resources/views/bills/edit.twig +++ b/resources/views/bills/edit.twig @@ -18,7 +18,7 @@
    {{ ExpandedForm.text('name') }} - {{ ExpandedForm.select('transaction_currency_id',currencies) }} + {{ ExpandedForm.currencyList('transaction_currency_id') }} {{ ExpandedForm.amountNoCurrency('amount_min') }} {{ ExpandedForm.amountNoCurrency('amount_max') }} {{ ExpandedForm.date('date',bill.date.format('Y-m-d')) }} diff --git a/resources/views/bills/show.twig b/resources/views/bills/show.twig index 7f61c3d402..c912bc5583 100644 --- a/resources/views/bills/show.twig +++ b/resources/views/bills/show.twig @@ -32,8 +32,9 @@ {{ trans('firefly.repeat_freq_' ~object.data.repeat_freq) }}. + - {{ 'bill_is_active'|_ }} + {{ 'bill_is_active'|_ }} {% if object.data.active %} {{ 'yes'|_ }} @@ -62,6 +63,12 @@
    +
    +
    + {{ 'edit'|_ }} + {{ 'delete'|_ }} +
    +
    @@ -73,7 +80,9 @@ {% if rules.count > 0 %} {% endif %} @@ -82,6 +91,17 @@ {{ 'rescan_old'|_ }}
    + {% if object.data.notes != '' %} +
    +
    +

    {{ 'notes'|_ }}

    +
    +
    + {{ object.data.notes }} +
    +
    + {% endif %} + {% if object.data.attachments_count > 0 %}
    diff --git a/resources/views/budgets/index.twig b/resources/views/budgets/index.twig index 71dad53b7e..476199250a 100644 --- a/resources/views/budgets/index.twig +++ b/resources/views/budgets/index.twig @@ -188,7 +188,7 @@ {{ budgetInformation[budget.id]['spent']|formatAmount }} - ({{ (budgetInformation[budget.id]['spent'] / days)|formatAmount }}) + ({{ (budgetInformation[budget.id]['spent'] / daysInMonth)|formatAmount }}) diff --git a/resources/views/debug.twig b/resources/views/debug.twig index 7b8c0a26cb..7d57662635 100644 --- a/resources/views/debug.twig +++ b/resources/views/debug.twig @@ -38,6 +38,7 @@ Debug information generated at {{ now }} for Firefly III version **{{ FF_VERSION {% if SANDSTORM == true %}| Sandstorm anon? | {% if SANDSTORM_ANON == true %}yes{% else %}no{% endif %} |{% endif %} | Is Sandstorm (.env) | {{ isSandstorm }} | | Is Docker (.env) | {{ isDocker }} | +| bunq uses sandbox | {{ toSandbox }} | | Trusted proxies (.env) | {{ trustedProxies }} | | User agent | {{ userAgent }} | | Loaded extensions | {{ extensions }} | diff --git a/resources/views/emails/access-token-created-html.twig b/resources/views/emails/access-token-created-html.twig new file mode 100644 index 0000000000..1c88099a1d --- /dev/null +++ b/resources/views/emails/access-token-created-html.twig @@ -0,0 +1,13 @@ +{% include 'emails.header-html' %} +

    + Somebody (hopefully you) just created a new Firefly III API Access Token for your user account. +

    + +

    + With this token, they can access all of your financial records through the Firefly III API. +

    + +

    + If this wasn't you, please revoke this token as soon as possible at {{ route('profile.index') }}. +

    +{% include 'emails.footer-html' %} diff --git a/resources/views/emails/access-token-created-text.twig b/resources/views/emails/access-token-created-text.twig new file mode 100644 index 0000000000..5ea41eb0fe --- /dev/null +++ b/resources/views/emails/access-token-created-text.twig @@ -0,0 +1,7 @@ +{% include 'emails.header-text' %} +Somebody (hopefully you) just created a new Firefly III API Access Token for your user account. + +With this token, they can access all of your financial records through the Firefly III API. + +If this wasn't you, please revoke this token as soon as possible at {{ route('profile.index') }}. +{% include 'emails.footer-text' %} diff --git a/resources/views/emails/error-html.twig b/resources/views/emails/error-html.twig index f3126c63e5..0e0f2004f0 100644 --- a/resources/views/emails/error-html.twig +++ b/resources/views/emails/error-html.twig @@ -24,7 +24,9 @@

    - The IP address related to this error is: {{ ip }} + The IP address related to this error is: {{ ip }}
    + URL is: {{ url }}
    + User agent: {{ userAgent }}

    diff --git a/resources/views/emails/error-text.twig b/resources/views/emails/error-text.twig index 56d4ea7a39..6cc100d81a 100644 --- a/resources/views/emails/error-text.twig +++ b/resources/views/emails/error-text.twig @@ -14,6 +14,8 @@ This error occured in file "{{ file }}" on line {{ line }} with code {{ code }}. {% endif %} The IP address related to this error is: {{ ip }} +URL is: {{ url }} +User agent: {{ userAgent }} The full stacktrace is below. If you think this is a bug in Firefly III, you can forward this message to thegrumpydictator@gmail.com. This can help fix diff --git a/resources/views/emails/oauth-client-created-html.twig b/resources/views/emails/oauth-client-created-html.twig new file mode 100644 index 0000000000..f49cd54b34 --- /dev/null +++ b/resources/views/emails/oauth-client-created-html.twig @@ -0,0 +1,14 @@ +{% include 'emails.header-html' %} +

    + Somebody (hopefully you) just created a new Firefly III API OAuth Client for your user account. It's labeled "{{ client.name }}" + and has callback URL {{ client.redirect }}. +

    + +

    + With this client, they can access all of your financial records through the Firefly III API. +

    + +

    + If this wasn't you, please revoke this client as soon as possible at {{ route('profile.index') }}. +

    +{% include 'emails.footer-html' %} diff --git a/resources/views/emails/oauth-client-created-text.twig b/resources/views/emails/oauth-client-created-text.twig new file mode 100644 index 0000000000..d74222d0f4 --- /dev/null +++ b/resources/views/emails/oauth-client-created-text.twig @@ -0,0 +1,9 @@ +{% include 'emails.header-text' %} +Somebody (hopefully you) just created a new Firefly III API OAuth Client for your user account. It's labeled "{{ client.name }}" and has callback URL: + +{{ client.redirect }} + +With this client, they can access all of your financial records through the Firefly III API. + +If this wasn't you, please revoke this client as soon as possible at {{ route('profile.index') }}. +{% include 'emails.footer-text' %} diff --git a/resources/views/export/index.twig b/resources/views/export/index.twig index a772feb710..57851bf641 100644 --- a/resources/views/export/index.twig +++ b/resources/views/export/index.twig @@ -74,7 +74,7 @@ {# ACCOUNTS #} - {{ ExpandedForm.multiCheckbox('accounts',accountList, checked, {' class': 'account-checkbox'}) }} + {{ ExpandedForm.assetAccountCheckList('accounts', {' class': 'account-checkbox','select_all': true}) }} {{ ExpandedForm.checkbox('include_attachments','1', true) }} diff --git a/resources/views/form/assetAccountCheckList.twig b/resources/views/form/assetAccountCheckList.twig new file mode 100644 index 0000000000..129dc11356 --- /dev/null +++ b/resources/views/form/assetAccountCheckList.twig @@ -0,0 +1,24 @@ +
    + + +
    + {% for groupName, accounts in grouped %} + {{ groupName }}
    + {% for id, account in accounts %} +
    + +
    + {% endfor %} + {% endfor %} + {% include 'form/help' %} + {% include 'form/feedback' %} + +
    +
    diff --git a/resources/views/form/multiCheckbox.twig b/resources/views/form/multiCheckbox.twig deleted file mode 100644 index 39776e2be0..0000000000 --- a/resources/views/form/multiCheckbox.twig +++ /dev/null @@ -1,22 +0,0 @@ -
    - - -
    - {% for value,description in list %} - {% set options = options|merge({'id': 'ffInput_'~name~'_'~value}) %} -
    - -
    - {% endfor %} - {% include 'form/help' %} - {% include 'form/feedback' %} - -
    -
    diff --git a/resources/views/import/bunq/accounts.twig b/resources/views/import/bunq/choose-accounts.twig similarity index 65% rename from resources/views/import/bunq/accounts.twig rename to resources/views/import/bunq/choose-accounts.twig index 734de2893b..f5b4afba79 100644 --- a/resources/views/import/bunq/accounts.twig +++ b/resources/views/import/bunq/choose-accounts.twig @@ -5,18 +5,18 @@ {% endblock %} {% block content %}
    -
    +
    -

    {{ trans('import.bunq_accounts_title') }}

    +

    {{ trans('import.job_config_bunq_accounts_title') }}

    - {{ trans('import.bunq_accounts_text')|raw }} + {{ trans('import.job_config_bunq_accounts_text') }}

    @@ -28,38 +28,36 @@   {{ trans('list.account_at_bunq') }} {{ trans('list.account') }} - {{ trans('list.do_import') }} - {% for account in data.config.accounts %} + {% for account in data.accounts %} + {% set currentIban = 'not-iban' %} - + - {{ account.description }}
    {% for alias in account.aliases %} {% if alias.type == 'IBAN' %} {{ alias.name }}: {{ alias.value }} + {% set currentIban = alias.value %} {% endif %} {% endfor %} - + + {% for localId, localAccount in data.local_accounts %} + {% if localAccount.code == account.currency_code %} + + {% endif %} {% endfor %} - -
    - -
    - - {% endfor %} diff --git a/resources/views/import/bunq/prerequisites.twig b/resources/views/import/bunq/prerequisites.twig index 0e45d3223f..c6bc3f38a3 100644 --- a/resources/views/import/bunq/prerequisites.twig +++ b/resources/views/import/bunq/prerequisites.twig @@ -5,39 +5,39 @@ {% endblock %} {% block content %}
    - +
    -

    {{ trans('import.bunq_prerequisites_title') }}

    +

    {{ trans('import.prereq_bunq_title') }}

    - {{ trans('import.bunq_prerequisites_text') }} + {{ trans('import.prereq_bunq_text') }}

    - {{ ExpandedForm.text('api_key', key) }} + {{ ExpandedForm.text('api_key', api_key) }}

    - {{ trans('import.bunq_prerequisites_text_ip')|raw }} + {{ trans('import.prereq_bunq_ip')|raw }}

    - {{ ExpandedForm.text('external_ip', ip) }} + {{ ExpandedForm.text('external_ip', external_ip) }}
    diff --git a/resources/views/import/fake/apply-rules.twig b/resources/views/import/fake/apply-rules.twig new file mode 100644 index 0000000000..922ce43bd0 --- /dev/null +++ b/resources/views/import/fake/apply-rules.twig @@ -0,0 +1,56 @@ +{% extends "./layout/default" %} + +{% block breadcrumbs %} + {{ Breadcrumbs.render }} +{% endblock %} +{% block content %} +
    +
    +
    +
    +

    {{ trans('import.job_config_apply_rules_title') }}

    +
    +
    +

    + {{ trans('import.job_config_apply_rules_text') }} +

    +
    +
    + +
    +
    + + + +
    +
    +
    +
    +

    + {{ trans('import.job_config_input') }} +

    +
    +
    + {{ ExpandedForm.select('apply_rules', data.rulesOptions) }} +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    + +{% endblock %} +{% block scripts %} +{% endblock %} +{% block styles %} +{% endblock %} diff --git a/resources/views/import/fake/enter-album.twig b/resources/views/import/fake/enter-album.twig new file mode 100644 index 0000000000..01ee24a3b3 --- /dev/null +++ b/resources/views/import/fake/enter-album.twig @@ -0,0 +1,53 @@ +{% extends "./layout/default" %} + +{% block breadcrumbs %} + {{ Breadcrumbs.render }} +{% endblock %} +{% block content %} +
    +
    +
    +
    +

    {{ trans('import.job_config_fake_album_title') }}

    +
    +
    +

    + {{ trans('import.job_config_fake_album_text') }} +

    +
    +
    + +
    +
    + +
    + +
    +
    +
    +
    +

    {{ trans('import.job_config_input') }}

    +
    +
    + {{ ExpandedForm.text('album') }} +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +{% endblock %} +{% block scripts %} +{% endblock %} +{% block styles %} +{% endblock %} diff --git a/resources/views/import/fake/enter-artist.twig b/resources/views/import/fake/enter-artist.twig new file mode 100644 index 0000000000..a422a31552 --- /dev/null +++ b/resources/views/import/fake/enter-artist.twig @@ -0,0 +1,53 @@ +{% extends "./layout/default" %} + +{% block breadcrumbs %} + {{ Breadcrumbs.render }} +{% endblock %} +{% block content %} +
    +
    +
    +
    +

    {{ trans('import.job_config_fake_artist_title') }}

    +
    +
    +

    + {{ trans('import.job_config_fake_artist_text') }} +

    +
    +
    + +
    +
    + +
    + +
    +
    +
    +
    +

    {{ trans('import.job_config_input') }}

    +
    +
    + {{ ExpandedForm.text('artist') }} +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +{% endblock %} +{% block scripts %} +{% endblock %} +{% block styles %} +{% endblock %} diff --git a/resources/views/import/fake/enter-song.twig b/resources/views/import/fake/enter-song.twig new file mode 100644 index 0000000000..dc1de31a2b --- /dev/null +++ b/resources/views/import/fake/enter-song.twig @@ -0,0 +1,53 @@ +{% extends "./layout/default" %} + +{% block breadcrumbs %} + {{ Breadcrumbs.render }} +{% endblock %} +{% block content %} +
    +
    +
    +
    +

    {{ trans('import.job_config_fake_song_title') }}

    +
    +
    +

    + {{ trans('import.job_config_fake_song_text') }} +

    +
    +
    + +
    +
    + +
    + +
    +
    +
    +
    +

    {{ trans('import.job_config_input') }}

    +
    +
    + {{ ExpandedForm.text('song') }} +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +{% endblock %} +{% block scripts %} +{% endblock %} +{% block styles %} +{% endblock %} diff --git a/resources/views/import/fake/prerequisites.twig b/resources/views/import/fake/prerequisites.twig new file mode 100644 index 0000000000..39af64e195 --- /dev/null +++ b/resources/views/import/fake/prerequisites.twig @@ -0,0 +1,43 @@ +{% extends "./layout/default" %} + +{% block breadcrumbs %} + {{ Breadcrumbs.render }} +{% endblock %} +{% block content %} +
    +
    + +
    +
    +
    +

    {{ trans('import.prereq_fake_title') }}

    +
    +
    +
    +
    +

    + {{ trans('import.prereq_fake_text') }} +

    +
    +
    + +
    +
    + {{ ExpandedForm.text('api_key', api_key) }} +
    +
    +
    +
    + +
    +
    +
    +
    +
    +{% endblock %} +{% block scripts %} +{% endblock %} +{% block styles %} +{% endblock %} diff --git a/resources/views/import/file/configure-upload.twig b/resources/views/import/file/configure-upload.twig new file mode 100644 index 0000000000..59de0c8a74 --- /dev/null +++ b/resources/views/import/file/configure-upload.twig @@ -0,0 +1,115 @@ +{% extends "./layout/default" %} + +{% block breadcrumbs %} + {{ Breadcrumbs.render(Route.getCurrentRoute.getName, importJob) }} +{% endblock %} + +{% block content %} + +
    +
    +
    +
    +

    {{ trans('import.job_config_uc_title') }}

    +
    +
    +

    + {{ trans('import.job_config_uc_text') }} +

    +
    +
    + +
    +
    + +
    + + +
    +
    +
    +
    +

    {{ trans('import.job_config_input') }}

    +
    +
    +
    +
    +

    {{ 'mandatoryFields'|_ }}

    + {{ ExpandedForm.checkbox('has_headers',1,importJob.configuration['has-headers'],{helpText: trans('import.job_config_uc_header_help')}) }} + {{ ExpandedForm.text('date_format',importJob.configuration['date-format'],{helpText: trans('import.job_config_uc_date_help', {dateExample: phpdate('Ymd')}) }) }} + {{ ExpandedForm.select('csv_delimiter', data.delimiters, importJob.configuration['delimiter'], {helpText: trans('import.job_config_uc_delimiter_help') } ) }} + {{ ExpandedForm.assetAccountList('csv_import_account', importJob.configuration['import-account'], {helpText: trans('import.job_config_uc_account_help')}) }} + +

    {{ 'optionalFields'|_ }}

    +
    + + +
    +
    +
    +
    +
    +
    + + +
    +

    + {{ trans('import.job_config_uc_specifics_txt') }} +

    + + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    + +

    +
     
     
     
     
     
     
    +

    + + + +{% endblock %} +{% block styles %} + +{% endblock %} +{% block scripts %} + + + +{% endblock %} diff --git a/resources/views/import/file/map.twig b/resources/views/import/file/map.twig index 5ae646b42c..3f2035d263 100644 --- a/resources/views/import/file/map.twig +++ b/resources/views/import/file/map.twig @@ -1,7 +1,7 @@ {% extends "./layout/default" %} {% block breadcrumbs %} - {{ Breadcrumbs.render(Route.getCurrentRoute.getName, job) }} + {{ Breadcrumbs.render(Route.getCurrentRoute.getName, importJob) }} {% endblock %} {% block content %} @@ -11,15 +11,15 @@
    -

    {{ trans('import.file_map_title') }}

    +

    {{ trans('import.job_config_map_title') }}

    - {{ trans('import.file_map_text') }} + {{ trans('import.job_config_map_text') }}

    {% if data|length == 0 %}

    - {{ trans('import.file_nothing_to_map') }} + {{ trans('import.job_config_map_nothing') }}

    {% endif %}
    @@ -27,12 +27,11 @@
    -
    + - - {% for field in data %} + {% for index, field in data %}
    @@ -43,8 +42,8 @@ - - + + @@ -54,9 +53,9 @@ {{ option }} {% endfor %} @@ -74,7 +73,7 @@
    diff --git a/resources/views/import/file/initial.twig b/resources/views/import/file/new.twig similarity index 68% rename from resources/views/import/file/initial.twig rename to resources/views/import/file/new.twig index 8f07bfe1d1..9d49ff470a 100644 --- a/resources/views/import/file/initial.twig +++ b/resources/views/import/file/new.twig @@ -8,11 +8,11 @@
    -

    {{ trans('import.file_upload_title') }}

    +

    {{ trans('import.job_config_file_upload_title') }}

    - {{ trans('import.file_upload_text') }} + {{ trans('import.job_config_file_upload_text') }}

    @@ -20,7 +20,7 @@
    - + @@ -28,12 +28,12 @@
    -

    {{ trans('import.file_upload_fields') }}

    +

    {{ trans('import.job_config_input') }}

    - {{ ExpandedForm.file('import_file', {helpText: trans('import.file_upload_help')}) }} - {{ ExpandedForm.file('configuration_file', {helpText: trans('import.file_upload_config_help')|raw}) }} - {{ ExpandedForm.select('import_file_type', data.file_types, data.default_type, {'helpText' : trans('import.file_upload_type_help')}) }} + {{ ExpandedForm.file('import_file', {helpText: trans('import.job_config_file_upload_help')}) }} + {{ ExpandedForm.file('configuration_file', {helpText: trans('import.job_config_file_upload_config_help')|raw}) }} + {{ ExpandedForm.select('import_file_type', data.file_types, data.default_type, {'helpText' : trans('import.job_config_file_upload_type_help')}) }}
    @@ -43,7 +43,7 @@
    diff --git a/resources/views/import/file/roles.twig b/resources/views/import/file/roles.twig index 8730ccaf0f..a983dc1b35 100644 --- a/resources/views/import/file/roles.twig +++ b/resources/views/import/file/roles.twig @@ -1,7 +1,7 @@ {% extends "./layout/default" %} {% block breadcrumbs %} - {{ Breadcrumbs.render(Route.getCurrentRoute.getName, job) }} + {{ Breadcrumbs.render(Route.getCurrentRoute.getName, importJob) }} {% endblock %} {% block content %} @@ -10,36 +10,34 @@
    -

    {{ trans('import.csv_roles_title') }}

    +

    {{ trans('import.job_config_roles_title') }}

    - {{ trans('import.csv_roles_text') }} + {{ trans('import.job_config_roles_text') }}

    - + -
    -

    {{ trans('import.csv_roles_table') }}

    +

    {{ trans('import.job_config_input') }}

    -
    {{ trans('import.file_map_field_value') }}{{ trans('import.file_map_field_mapped_to') }}{{ trans('import.job_config_field_value') }}{{ trans('import.job_config_field_mapped') }}
    - {{ Form.select('mapping['~field.index~']['~option~']', + {{ Form.select('mapping['~index~']['~option~']', field.options, - job.configuration['column-mapping-config'][field.index][option], {class: 'form-control'}) }} + importJob.configuration['column-mapping-config'][index][option], {class: 'form-control'}) }}
    - - - - + + + + {% for i in 0..(data.total -1) %} @@ -47,14 +45,14 @@ @@ -80,7 +78,6 @@
    {{ trans('import.csv_roles_column_name') }}{{ trans('import.csv_roles_column_example') }}{{ trans('import.csv_roles_column_role') }}{{ trans('import.csv_roles_do_map_value') }}{{ trans('import.job_config_roles_column_name') }}{{ trans('import.job_config_roles_column_example') }}{{ trans('import.job_config_roles_column_role') }}{{ trans('import.job_config_roles_do_map_value') }}
    {% if data.headers[i] == '' %} - {{ trans('import.csv_roles_column') }} #{{ loop.index }} + {{ trans('import.job_config_roles_colum_count') }} #{{ loop.index }} {% else %} {{ data.headers[i] }} {% endif %} {% if data.examples[i]|length == 0 %} - {{ trans('import.csv_roles_no_example_data') }} + {{ trans('import.job_config_roles_no_example') }} {% else %} {% for example in data.examples[i] %} {{ example }}
    @@ -64,12 +62,12 @@     		{{ Form.select(('role['~loop.index0~']'), data.roles, - job.configuration['column-roles'][loop.index0], + importJob.configuration['column-roles'][loop.index0], {class: 'form-control'}) }} {{ Form.checkbox(('map['~loop.index0~']'),1, - job.configuration['column-do-mapping'][loop.index0] + importJob.configuration['column-do-mapping'][loop.index0] ) }}
    -
    @@ -91,7 +88,7 @@
    diff --git a/resources/views/import/file/upload-config.twig b/resources/views/import/file/upload-config.twig deleted file mode 100644 index c7bf64435d..0000000000 --- a/resources/views/import/file/upload-config.twig +++ /dev/null @@ -1,96 +0,0 @@ -{% extends "./layout/default" %} - -{% block breadcrumbs %} - {{ Breadcrumbs.render(Route.getCurrentRoute.getName, job) }} -{% endblock %} - -{% block content %} - -
    -
    -
    -
    -

    {{ trans('import.csv_initial_title') }}

    -
    -
    -

    - {{ trans('import.csv_initial_text') }} -

    -
    -
    - -
    -
    - - - - -
    -
    -
    -
    -

    {{ trans('import.csv_initial_box_title') }}

    -
    -
    -
    -
    -

    {{ 'mandatoryFields'|_ }}

    - {{ ExpandedForm.checkbox('has_headers',1,job.configuration['has-headers'],{helpText: trans('import.csv_initial_header_help')}) }} - {{ ExpandedForm.text('date_format',job.configuration['date-format'],{helpText: trans('import.csv_initial_date_help', {dateExample: phpdate('Ymd')}) }) }} - {{ ExpandedForm.select('csv_delimiter', data.delimiters, job.configuration['delimiter'], {helpText: trans('import.csv_initial_delimiter_help') } ) }} - {{ ExpandedForm.select('csv_import_account', data.accounts, job.configuration['import-account'], {helpText: trans('import.csv_initial_import_account_help')} ) }} - -

    {{ 'optionalFields'|_ }}

    -
    - - -
    -
    -
    -
    -
    - {% for type, specific in data.specifics %} -
    - - -
    -
    -
    -
    -
    - {% endfor %} -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    -
    - - - - -{% endblock %} diff --git a/resources/views/import/index.twig b/resources/views/import/index.twig index 02fa364a94..e1d542d513 100644 --- a/resources/views/import/index.twig +++ b/resources/views/import/index.twig @@ -5,65 +5,95 @@ {% endblock %} {% block content %}
    -
    +
    -

    {{ 'import_index_title'|_ }}

    +

    {{ trans('firefly.import_index_title') }}

    +

    + {{ trans('import.general_index_intro') }} +

    -
    -

    - {{ 'import_general_index_intro'|_ }} -

    -
    -
    - -
    - {# file import #} - {% if routines.file == true %} -
    - - {{ 'import_general_index_file'|_ }}
    - {{ 'import_general_index_file'|_ }} + {% for name, provider in providers %} + {# button for each import thing: #} +
    + + {{ trans(('import.button_'~name)) }}
    + {{ trans(('import.button_'~name)) }}
    - {% endif %} - - {# bunq import #} - {% if routines.bunq == true %} -
    - - {{ 'import_from_bunq'|_ }}
    - {{ 'import_from_bunq'|_ }} -     -
    - {% endif %} - - {# import from Spectre #} - {% if routines.spectre == true %} -
    - - {{ 'import_using_spectre'|_ }}
    - {{ 'import_using_spectre'|_ }} -     -
    - {% endif %} - - {# import from Plaid #} - {% if routines.plaid == true %} -
    - - {{ 'import_using_plaid'|_ }}
    - {{ 'import_using_plaid'|_ }} -     -
    - {% endif %} + {% endfor %}
    + +
    + {# +
    +
    +
    +

    {{ trans('import.global_config_title') }}

    +
    +
    +

    + {{ trans('import.global_config_text') }} +

    +
    +
    +
    + #} +
    +
    +
    +

    {{ trans('import.need_prereq_title') }}

    +
    +
    +

    + {{ trans('import.need_prereq_intro') }} +

    +
      + {% for name, provider in providers %} + {% if provider.has_prereq %} +
    • + {% if provider.prereq_complete %} + + {% else %} + + {% endif %} + {{ trans('import.do_prereq_'~name) }} +
      • + {% endif %} + {% endfor %} +
    +
    +
    +
    + {# +
    +
    +
    +

    {{ trans('import.can_config_title') }}

    +
    +
    +

    + {{ trans('import.can_config_title') }} +

    + +
    +
    +
    + #} +
    + {% endblock %} {% block scripts %} {% endblock %} diff --git a/resources/views/import/spectre/accounts.twig b/resources/views/import/spectre/accounts.twig index a9179c4241..c6c0eedf82 100644 --- a/resources/views/import/spectre/accounts.twig +++ b/resources/views/import/spectre/accounts.twig @@ -5,22 +5,21 @@ {% endblock %} {% block content %}
    -
    +
    -

    {{ trans('import.spectre_accounts_title') }}

    +

    {{ trans('import.job_config_spectre_accounts_title') }}

    - {{ trans('import.spectre_accounts_text')|raw }} + {{ trans('import.job_config_spectre_accounts_text', {count: data.accounts|length,country: data.login.getCountryCode(),name: data.login.getProviderName()}) }}

    -
    @@ -28,46 +27,40 @@ - - {% for account in data.config.accounts %} + {% for account in data.accounts %} - @@ -76,7 +69,6 @@
    {{ trans('list.account_on_spectre') }} {{ trans('list.account') }}{{ trans('list.do_import') }}
    - - {{ account.nature|capitalize }} "{{ account.name }}" ({{ formatAmountBySymbol(account.balance, account.currency_code~' ') }})
    - {% for name, value in account.extra %} + {{ account.getNature()|capitalize }} "{{ account.getName() }}" + ({{ formatAmountBySymbol(account.getBalance(), account.getCurrencyCode()~' ') }})
    + {% set currentIban = '' %} + {% for name, value in account.getExtra() %} {% if not value is iterable and name != 'sort_code' and name !='current_date' and name != 'available_amount' and name !='current_time' and name != 'last_posted_transaction_id' %} - {{ trans('import.spectre_extra_key_'~name) }}: {{ value }}
    + {{ trans('import.spectre_extra_key_'~name) }}: {{ value }}
    {% endif %} {% if name == 'available_amount' %} - {{ trans('import.spectre_extra_key_'~name) }}: {{ formatAmountBySymbol(value, account.currency_code~' ') }} + {{ trans('import.spectre_extra_key_'~name) }}: {{ formatAmountBySymbol(value, account.getCurrencyCode()~' ') }} + {% endif %} + {% if name == 'iban' %} + {% set currentIban = value %} {% endif %} {% endfor %}     		- {% if account.options|length > 0 %} - + + {% for ffId, ffAccount in data.ff_accounts %} + {% if ffAccount.code == account.getCurrencyCode() %} + + {% endif %} {% endfor %} - {% else %} - - {{ trans('import.spectre_no_supported_accounts') }} - - {% endif %} - - {% if account.options|length > 0 %} -
    - -
    - {% endif %}
    -
    diff --git a/resources/views/import/spectre/choose-login.twig b/resources/views/import/spectre/choose-login.twig new file mode 100644 index 0000000000..61394d0402 --- /dev/null +++ b/resources/views/import/spectre/choose-login.twig @@ -0,0 +1,87 @@ +{% extends "./layout/default" %} + +{% block breadcrumbs %} + {{ Breadcrumbs.render }} +{% endblock %} +{% block content %} +
    + + +
    +
    +
    +

    {{ trans('import.job_config_spectre_login_title') }}

    +
    +
    +
    +
    +

    + {{ trans('import.job_config_spectre_login_text', {count: data.logins|length}) }} +

    +
    +
    + +
    +
    + + + + + + + + + + + {% for login in data.logins %} + + + + + + + + {% endfor %} + + + + + +
     {{ trans('list.spectre_bank') }}{{ trans('list.spectre_last_use') }}{{ trans('list.spectre_status') }}
    + + + + + {{ login.getLastSuccessAt().formatLocalized(monthAndDayFormat) }}
    + {{ login.getUpdatedAt().format("Y-m-d H:i:s") }}
    +     		+ {{ trans('import.spectre_login_status_'~login.getStatus()) }} +
    + + + +
    +
    +
    +
    + +
    +
    +
    + +
    +{% endblock %} +{% block scripts %} +{% endblock %} +{% block styles %} +{% endblock %} diff --git a/resources/views/import/spectre/prerequisites.twig b/resources/views/import/spectre/prerequisites.twig index b93dfe60ea..1a1909bc0a 100644 --- a/resources/views/import/spectre/prerequisites.twig +++ b/resources/views/import/spectre/prerequisites.twig @@ -5,38 +5,38 @@ {% endblock %} {% block content %}
    -
    +
    -

    {{ trans('import.spectre_prerequisites_title') }}

    +

    {{ trans('import.prereq_spectre_title') }}

    - {{ trans('import.spectre_prerequisites_text')|raw }} + {{ trans('import.prereq_spectre_text')|raw }}

    - {{ ExpandedForm.text('app_id') }} - {{ ExpandedForm.text('secret') }} + {{ ExpandedForm.text('app_id', app_id) }} + {{ ExpandedForm.text('secret', secret) }}
    -

    {{ trans('import.spectre_enter_pub_key')|raw }}

    +

    {{ trans('import.prereq_spectre_pub')|raw }}

    + id="ffInput_pub_key_holder" name="pub_key_holder" contenteditable="false">{{ public_key }}
    diff --git a/resources/views/import/status.twig b/resources/views/import/status.twig index 26a543b61d..900c3a9de1 100644 --- a/resources/views/import/status.twig +++ b/resources/views/import/status.twig @@ -42,8 +42,28 @@
    + {# box to show when job is running ... #} + - {# Box for when the job is ready to start #} + {# Box for when the job is ready to start + #} - {# Box for when the job is running! #} + {# Box for when the job is running! - - {# displays the finished status of the import #} + #} + {# displays the finished status of the import #} - {# box to show error information. #} + {# + #} {% endblock %} {% block scripts %} - + {% endblock %} {% block styles %} {% endblock %} diff --git a/resources/views/list/bills.twig b/resources/views/list/bills.twig index f56763283d..33ab891135 100644 --- a/resources/views/list/bills.twig +++ b/resources/views/list/bills.twig @@ -46,7 +46,12 @@ {% if entry.rules|length > 0 %} {% endif %} diff --git a/resources/views/list/piggy-banks.twig b/resources/views/list/piggy-banks.twig index 24387cf7b8..19a57d9ea7 100644 --- a/resources/views/list/piggy-banks.twig +++ b/resources/views/list/piggy-banks.twig @@ -10,11 +10,12 @@   {{ 'target_amount'|_ }} {{ 'left_to_save'|_ }} + {{ 'suggested_savings_per_month'|_ }} {% for piggy in piggyBanks %} - +   @@ -79,6 +80,11 @@ {{ formatAmountBySymbol(piggy.left_to_save,piggy.currency_symbol,piggy.currency_dp) }} {% endif %} + + {% if piggy.targetdate %} + {{ formatAmountBySymbol(piggy.save_per_month, piggy.currency_symbol, piggy.currency_dp) }} + {% endif %} + {% endfor %} diff --git a/resources/views/new-user/index.twig b/resources/views/new-user/index.twig index 3f7022e34a..9b5dbbcd6d 100644 --- a/resources/views/new-user/index.twig +++ b/resources/views/new-user/index.twig @@ -26,6 +26,9 @@ {{ ExpandedForm.text('bank_name') }} {{ ExpandedForm.balance('bank_balance') }} +

    + {{ 'currency_not_present'|_ }} +

    {{ 'savings_balance_text'|_ }} diff --git a/resources/views/partials/boxes.twig b/resources/views/partials/boxes.twig index 583e00f2a2..68708cbc25 100644 --- a/resources/views/partials/boxes.twig +++ b/resources/views/partials/boxes.twig @@ -6,7 +6,8 @@

    - {{ 'balance'|_ }} + + {{ 'balance'|_ }}
    @@ -14,7 +15,6 @@
    -
    @@ -26,7 +26,7 @@
    - {{ 'bills_to_pay'|_ }} + {{ 'bills_to_pay'|_ }}
    @@ -45,7 +45,7 @@
    - {{ 'left_to_spend'|_ }} + {{ 'left_to_spend'|_ }}
    @@ -65,7 +65,8 @@
    - {{ 'net_worth'|_ }} + + {{ 'net_worth'|_ }}
    diff --git a/resources/views/partials/menu-sidebar.twig b/resources/views/partials/menu-sidebar.twig index a489fc7a53..4772d605d5 100644 --- a/resources/views/partials/menu-sidebar.twig +++ b/resources/views/partials/menu-sidebar.twig @@ -55,7 +55,7 @@
  • - + {{ 'transactions'|_ }} diff --git a/resources/views/piggy-banks/show.twig b/resources/views/piggy-banks/show.twig index 5aa3e4e5a1..6dc2addc62 100644 --- a/resources/views/piggy-banks/show.twig +++ b/resources/views/piggy-banks/show.twig @@ -26,8 +26,8 @@
    @@ -40,15 +40,21 @@ {{ 'target_amount'|_ }} - {{ piggyBank.targetamount|formatAmount }} + + {{ formatAmountBySymbol(piggy.target_amount, piggy.currency_symbol, piggy.currency_dp) }} + {{ 'saved_so_far'|_ }} - {{ currentRelevantRepAmount(piggyBank)|formatAmount }} + + {{ formatAmountBySymbol(piggy.current_amount, piggy.currency_symbol, piggy.currency_dp) }} + {{ 'left_to_save'|_ }} - {{ (piggyBank.targetamount - currentRelevantRepAmount(piggyBank))|formatAmount }} + + {{ formatAmountBySymbol(piggy.left_to_save, piggy.currency_symbol, piggy.currency_dp) }} + {{ 'start_date'|_ }} @@ -74,7 +80,8 @@ {{ 'suggested_amount'|_ }} - {{ suggestedMonthlyAmount(piggyBank)|formatAmount }} + {{ formatAmountBySymbol(piggy.save_per_month, piggy.currency_symbol, piggy.currency_dp) }} + {% endif %} diff --git a/resources/views/rules/rule-group/delete.twig b/resources/views/rules/rule-group/delete.twig index 0d5474343d..4b5618bc9e 100644 --- a/resources/views/rules/rule-group/delete.twig +++ b/resources/views/rules/rule-group/delete.twig @@ -35,7 +35,7 @@

    - {{ Form.select('move_rules_before_delete', ruleGroupList, null, {class: 'form-control'}) }} + {{ ExpandedForm.ruleGroupListWithEmpty('move_rules_before_delete',null, {'hidden': ruleGroup.id}) }}

    {% else %} diff --git a/resources/views/rules/rule-group/select-transactions.twig b/resources/views/rules/rule-group/select-transactions.twig index 6ae7769f03..5f13406cc7 100644 --- a/resources/views/rules/rule-group/select-transactions.twig +++ b/resources/views/rules/rule-group/select-transactions.twig @@ -28,7 +28,7 @@
    {{ ExpandedForm.date('start_date', first) }} {{ ExpandedForm.date('end_date', today) }} - {{ ExpandedForm.multiCheckbox('accounts',accountList, checkedAccounts, {' class': 'account-checkbox', 'label': trans('firefly.include_transactions_from_accounts') }) }} + {{ ExpandedForm.assetAccountCheckList('accounts', {'select_all': true,'class': 'account-checkbox', 'label': trans('firefly.include_transactions_from_accounts') }) }}
    diff --git a/resources/views/rules/rule/create.twig b/resources/views/rules/rule/create.twig index 5c04e33608..569789fadb 100644 --- a/resources/views/rules/rule/create.twig +++ b/resources/views/rules/rule/create.twig @@ -38,7 +38,7 @@
    {{ ExpandedForm.text('title') }} {{ ExpandedForm.select('trigger',allJournalTriggers()) }} - {{ ExpandedForm.select('rule_group_id',groups, ruleGroup.id) }} + {{ ExpandedForm.ruleGroupList('rule_group_id', ruleGroup.id) }} {{ ExpandedForm.checkbox('stop_processing',1,null, {helpText: trans('firefly.rule_help_stop_processing')}) }} {{ ExpandedForm.checkbox('strict',1, null,{helpText: trans('firefly.rule_help_strict')}) }}
    diff --git a/resources/views/rules/rule/edit.twig b/resources/views/rules/rule/edit.twig index 61226548b3..dad8d5871c 100644 --- a/resources/views/rules/rule/edit.twig +++ b/resources/views/rules/rule/edit.twig @@ -15,7 +15,7 @@
    {{ ExpandedForm.text('title') }} - {{ ExpandedForm.select('rule_group_id', ruleGroups) }} + {{ ExpandedForm.ruleGroupList('rule_group_id', ruleGroup.id) }} {{ ExpandedForm.select('trigger',allJournalTriggers(), primaryTrigger) }} {{ ExpandedForm.checkbox('active',1,rule.active, {helpText: trans('firefly.rule_help_active')}) }} {{ ExpandedForm.checkbox('stop_processing',1,rule.stop_processing, {helpText: trans('firefly.rule_help_stop_processing')}) }} diff --git a/resources/views/rules/rule/select-transactions.twig b/resources/views/rules/rule/select-transactions.twig index 39fe00f7de..65df2aabff 100644 --- a/resources/views/rules/rule/select-transactions.twig +++ b/resources/views/rules/rule/select-transactions.twig @@ -28,7 +28,7 @@
    {{ ExpandedForm.date('start_date', first) }} {{ ExpandedForm.date('end_date', today) }} - {{ ExpandedForm.multiCheckbox('accounts',accountList, checkedAccounts, {' class': 'account-checkbox', 'label': trans('firefly.include_transactions_from_accounts') }) }} + {{ ExpandedForm.assetAccountCheckList('accounts', {'select_all': true, 'class': 'account-checkbox', 'label': trans('firefly.include_transactions_from_accounts') }) }}
    diff --git a/resources/views/transactions/mass/edit.twig b/resources/views/transactions/mass/edit.twig index 1da5e566db..d6fcaff658 100644 --- a/resources/views/transactions/mass/edit.twig +++ b/resources/views/transactions/mass/edit.twig @@ -1,7 +1,7 @@ {% extends "./layout/default" %} {% block breadcrumbs %} - {{ Breadcrumbs.render(Route.getCurrentRoute.getName, journals) }} + {{ Breadcrumbs.render(Route.getCurrentRoute.getName, transactions) }} {% endblock %} {% block content %} @@ -29,90 +29,91 @@ {{ trans('list.category') }} {{ trans('list.budget') }} - {% for journal in journals %} + {% for transaction in transactions %} {# LINK TO EDIT FORM #} - - + {# DESCRIPTION #} + placeholder="{{ transaction.description }}" name="description[{{ transaction.journal_id }}]" + type="text" value="{{ transaction.description }}"> {# AMOUNT #}
    - {{ journal.currency_symbol }} - - + {{ transaction.currency_symbol }} + +
    - {% if journal.foreign_amount %} + {% if transaction.foreign_amount %} {# insert foreign data #}
    - {{ journal.foreign_currency.symbol }} - - + {{ transaction.foreign_currency_symbol }} + +
    {% endif %} {# DATE #} + name="date[{{ transaction.journal_id }}]" type="date" value="{{ transaction.date }}"> {# SOURCE ACCOUNT ID FOR TRANSFER OR WITHDRAWAL #} - {% if journal.transaction_type_type == 'Transfer' or journal.transaction_type_type == 'Withdrawal' %} - {% for account in accounts %} - + + {% endfor %} {% else %} {# SOURCE ACCOUNT NAME FOR DEPOSIT #} - + {% endif %} - {% if journal.transaction_type_type == 'Transfer' or journal.transaction_type_type == 'Deposit' %} + {% if transaction.type == 'Transfer' or transaction.type == 'Deposit' %} {# DESTINATION ACCOUNT NAME FOR TRANSFER AND DEPOSIT #} - {% for account in accounts %} - {% endfor %} {% else %} + {# DESTINATION ACCOUNT NAME FOR EXPENSE #} - + {% endif %} {# category #} - + {# budget #} - {% if journal.transaction_type_type == 'Withdrawal' %} - {% for budget in budgets %} - {% endfor %} diff --git a/resources/views/transactions/show.twig b/resources/views/transactions/show.twig index e1627928e6..439c29f036 100644 --- a/resources/views/transactions/show.twig +++ b/resources/views/transactions/show.twig @@ -210,7 +210,7 @@ {% endif %} {% endfor %} {# all other meta values #} - {% for metaField in ['internal_reference','sepa-ct-id','sepa-ct-op','sepa-db','sepa-country','sepa-cc','sepa-ep','sepa-ci'] %} + {% for metaField in ['external_id','bunq_payment_id','internal_reference','sepa-ct-id','sepa-ct-op','sepa-db','sepa-country','sepa-cc','sepa-ep','sepa-ci'] %} {% if journalHasMeta(journal, metaField) %} {{ trans('list.'~metaField) }} diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php index 78a2be3167..cba44bd866 100644 --- a/routes/breadcrumbs.php +++ b/routes/breadcrumbs.php @@ -22,6 +22,7 @@ declare(strict_types=1); use Carbon\Carbon; use DaveJamesMiller\Breadcrumbs\BreadcrumbsGenerator; +use DaveJamesMiller\Breadcrumbs\Exceptions\DuplicateBreadcrumbException; use FireflyIII\Exceptions\FireflyException; use FireflyIII\Models\Account; use FireflyIII\Models\Attachment; @@ -42,991 +43,993 @@ use FireflyIII\Models\TransactionType; use FireflyIII\User; use Illuminate\Support\Collection; -// HOME -Breadcrumbs::register( - 'home', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->push(trans('breadcrumbs.home'), route('index')); - } -); +try { + // HOME + Breadcrumbs::register( + 'home', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->push(trans('breadcrumbs.home'), route('index')); + } + ); -Breadcrumbs::register( - 'index', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->push(trans('breadcrumbs.home'), route('index')); - } -); + Breadcrumbs::register( + 'index', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->push(trans('breadcrumbs.home'), route('index')); + } + ); -// ACCOUNTS -Breadcrumbs::register( - 'accounts.index', - function (BreadCrumbsGenerator $breadcrumbs, string $what) { - $breadcrumbs->parent('home'); - $breadcrumbs->push(trans('firefly.' . strtolower(e($what)) . '_accounts'), route('accounts.index', [$what])); - } -); + // ACCOUNTS + Breadcrumbs::register( + 'accounts.index', + function (BreadCrumbsGenerator $breadcrumbs, string $what) { + $breadcrumbs->parent('home'); + $breadcrumbs->push(trans('firefly.' . strtolower(e($what)) . '_accounts'), route('accounts.index', [$what])); + } + ); -Breadcrumbs::register( - 'accounts.create', - function (BreadCrumbsGenerator $breadcrumbs, string $what) { - $breadcrumbs->parent('accounts.index', $what); - $breadcrumbs->push(trans('firefly.new_' . strtolower(e($what)) . '_account'), route('accounts.create', [$what])); - } -); + Breadcrumbs::register( + 'accounts.create', + function (BreadCrumbsGenerator $breadcrumbs, string $what) { + $breadcrumbs->parent('accounts.index', $what); + $breadcrumbs->push(trans('firefly.new_' . strtolower(e($what)) . '_account'), route('accounts.create', [$what])); + } + ); -Breadcrumbs::register( - 'accounts.show', - function (BreadCrumbsGenerator $breadcrumbs, Account $account, Carbon $start = null, Carbon $end = null) { - $what = config('firefly.shortNamesByFullName.' . $account->accountType->type); + Breadcrumbs::register( + 'accounts.show', + function (BreadCrumbsGenerator $breadcrumbs, Account $account, Carbon $start = null, Carbon $end = null) { + $what = config('firefly.shortNamesByFullName.' . $account->accountType->type); + + $breadcrumbs->parent('accounts.index', $what); + $breadcrumbs->push($account->name, route('accounts.show', [$account->id])); + if (null !== $start && null !== $end) { + $title = trans( + 'firefly.between_dates_breadcrumb', + ['start' => $start ? $start->formatLocalized((string)trans('config.month_and_day')) : '', + 'end' => $end ? $end->formatLocalized((string)trans('config.month_and_day')) : '',] + ); + $breadcrumbs->push($title, route('accounts.show', $account)); + } + } + ); + + Breadcrumbs::register( + 'accounts.show.all', + function (BreadCrumbsGenerator $breadcrumbs, Account $account, Carbon $start = null, Carbon $end = null) { + $what = config('firefly.shortNamesByFullName.' . $account->accountType->type); + + $breadcrumbs->parent('accounts.index', $what); + $breadcrumbs->push($account->name, route('accounts.show', [$account->id])); + } + ); + + Breadcrumbs::register( + 'accounts.reconcile', + function (BreadCrumbsGenerator $breadcrumbs, Account $account) { + $breadcrumbs->parent('accounts.show', $account); + $breadcrumbs->push(trans('firefly.reconcile_account', ['account' => $account->name]), route('accounts.reconcile', [$account->id])); + } + ); + + Breadcrumbs::register( + 'accounts.reconcile.show', + function (BreadCrumbsGenerator $breadcrumbs, Account $account, TransactionJournal $journal) { + $breadcrumbs->parent('accounts.show', $account); + $title = trans('firefly.reconciliation') . ' "' . $journal->description . '"'; + $breadcrumbs->push($title, route('accounts.reconcile.show', [$journal->id])); + } + ); + + Breadcrumbs::register( + 'accounts.delete', + function (BreadCrumbsGenerator $breadcrumbs, Account $account) { + $breadcrumbs->parent('accounts.show', $account); + $breadcrumbs->push(trans('firefly.delete_account', ['name' => $account->name]), route('accounts.delete', [$account->id])); + } + ); + + Breadcrumbs::register( + 'accounts.edit', + function (BreadCrumbsGenerator $breadcrumbs, Account $account) { + $breadcrumbs->parent('accounts.show', $account); + $what = config('firefly.shortNamesByFullName.' . $account->accountType->type); + + $breadcrumbs->push(trans('firefly.edit_' . $what . '_account', ['name' => $account->name]), route('accounts.edit', [$account->id])); + } + ); + + // ADMIN + Breadcrumbs::register( + 'admin.index', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('home'); + $breadcrumbs->push(trans('firefly.administration'), route('admin.index')); + } + ); + + Breadcrumbs::register( + 'admin.users', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('admin.index'); + $breadcrumbs->push(trans('firefly.list_all_users'), route('admin.users')); + } + ); + + Breadcrumbs::register( + 'admin.users.show', + function (BreadCrumbsGenerator $breadcrumbs, User $user) { + $breadcrumbs->parent('admin.users'); + $breadcrumbs->push(trans('firefly.single_user_administration', ['email' => $user->email]), route('admin.users.show', [$user->id])); + } + ); + Breadcrumbs::register( + 'admin.users.edit', + function (BreadCrumbsGenerator $breadcrumbs, User $user) { + $breadcrumbs->parent('admin.users'); + $breadcrumbs->push(trans('firefly.edit_user', ['email' => $user->email]), route('admin.users.edit', [$user->id])); + } + ); + Breadcrumbs::register( + 'admin.users.delete', + function (BreadCrumbsGenerator $breadcrumbs, User $user) { + $breadcrumbs->parent('admin.users'); + $breadcrumbs->push(trans('firefly.delete_user', ['email' => $user->email]), route('admin.users.delete', [$user->id])); + } + ); + + Breadcrumbs::register( + 'admin.users.domains', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('admin.index'); + $breadcrumbs->push(trans('firefly.blocked_domains'), route('admin.users.domains')); + } + ); + + Breadcrumbs::register( + 'admin.configuration.index', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('admin.index'); + $breadcrumbs->push(trans('firefly.instance_configuration'), route('admin.configuration.index')); + } + ); + Breadcrumbs::register( + 'admin.update-check', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('admin.index'); + $breadcrumbs->push(trans('firefly.update_check_title'), route('admin.update-check')); + } + ); + + Breadcrumbs::register( + 'admin.links.index', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('admin.index'); + $breadcrumbs->push(trans('firefly.journal_link_configuration'), route('admin.links.index')); + } + ); + + Breadcrumbs::register( + 'admin.links.create', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('admin.links.index'); + $breadcrumbs->push(trans('firefly.create_new_link_type'), route('admin.links.create')); + } + ); + + Breadcrumbs::register( + 'admin.links.show', + function (BreadCrumbsGenerator $breadcrumbs, LinkType $linkType) { + $breadcrumbs->parent('admin.links.index'); + $breadcrumbs->push(trans('firefly.overview_for_link', ['name' => $linkType->name]), route('admin.links.show', [$linkType->id])); + } + ); + + Breadcrumbs::register( + 'admin.links.edit', + function (BreadCrumbsGenerator $breadcrumbs, LinkType $linkType) { + $breadcrumbs->parent('admin.links.index'); + $breadcrumbs->push(trans('firefly.edit_link_type', ['name' => $linkType->name]), route('admin.links.edit', [$linkType->id])); + } + ); + + Breadcrumbs::register( + 'admin.links.delete', + function (BreadCrumbsGenerator $breadcrumbs, LinkType $linkType) { + $breadcrumbs->parent('admin.links.index'); + $breadcrumbs->push(trans('firefly.delete_link_type', ['name' => $linkType->name]), route('admin.links.delete', [$linkType->id])); + } + ); + + Breadcrumbs::register( + 'transactions.link.delete', + function (BreadCrumbsGenerator $breadcrumbs, TransactionJournalLink $link) { + $breadcrumbs->parent('home'); + $breadcrumbs->push(trans('breadcrumbs.delete_journal_link'), route('transactions.link.delete', $link->id)); + } + ); + + // ATTACHMENTS + Breadcrumbs::register( + 'attachments.index', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('home'); + $breadcrumbs->push(trans('firefly.attachments'), route('attachments.index')); + } + ); + + Breadcrumbs::register( + 'attachments.edit', + function (BreadCrumbsGenerator $breadcrumbs, Attachment $attachment) { + $object = $attachment->attachable; + if ($object instanceof TransactionJournal) { + $breadcrumbs->parent('transactions.show', $object); + $breadcrumbs->push($attachment->filename, route('attachments.edit', [$attachment])); + } else { + throw new FireflyException('Cannot make breadcrumb for attachment connected to object of type ' . get_class($object)); + } + } + ); + Breadcrumbs::register( + 'attachments.delete', + function (BreadCrumbsGenerator $breadcrumbs, Attachment $attachment) { + $object = $attachment->attachable; + if ($object instanceof TransactionJournal) { + $breadcrumbs->parent('transactions.show', $object); + $breadcrumbs->push(trans('firefly.delete_attachment', ['name' => $attachment->filename]), route('attachments.edit', [$attachment])); + } else { + throw new FireflyException('Cannot make breadcrumb for attachment connected to object of type ' . get_class($object)); + } + } + ); + + // BILLS + Breadcrumbs::register( + 'bills.index', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('home'); + $breadcrumbs->push(trans('breadcrumbs.bills'), route('bills.index')); + } + ); + Breadcrumbs::register( + 'bills.create', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('bills.index'); + $breadcrumbs->push(trans('breadcrumbs.newBill'), route('bills.create')); + } + ); + + Breadcrumbs::register( + 'bills.edit', + function (BreadCrumbsGenerator $breadcrumbs, Bill $bill) { + $breadcrumbs->parent('bills.show', $bill); + $breadcrumbs->push(trans('breadcrumbs.edit_bill', ['name' => $bill->name]), route('bills.edit', [$bill->id])); + } + ); + Breadcrumbs::register( + 'bills.delete', + function (BreadCrumbsGenerator $breadcrumbs, Bill $bill) { + $breadcrumbs->parent('bills.show', $bill); + $breadcrumbs->push(trans('breadcrumbs.delete_bill', ['name' => $bill->name]), route('bills.delete', [$bill->id])); + } + ); + + Breadcrumbs::register( + 'bills.show', + function (BreadCrumbsGenerator $breadcrumbs, Bill $bill) { + $breadcrumbs->parent('bills.index'); + $breadcrumbs->push($bill->name, route('bills.show', [$bill->id])); + } + ); + + // BUDGETS + Breadcrumbs::register( + 'budgets.index', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('home'); + $breadcrumbs->push(trans('firefly.budgets'), route('budgets.index')); + } + ); + Breadcrumbs::register( + 'budgets.create', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('budgets.index'); + $breadcrumbs->push(trans('firefly.create_new_budget'), route('budgets.create')); + } + ); + + Breadcrumbs::register( + 'budgets.edit', + function (BreadCrumbsGenerator $breadcrumbs, Budget $budget) { + $breadcrumbs->parent('budgets.show', $budget); + $breadcrumbs->push(trans('firefly.edit_budget', ['name' => $budget->name]), route('budgets.edit', [$budget->id])); + } + ); + Breadcrumbs::register( + 'budgets.delete', + function (BreadCrumbsGenerator $breadcrumbs, Budget $budget) { + $breadcrumbs->parent('budgets.show', $budget); + $breadcrumbs->push(trans('firefly.delete_budget', ['name' => $budget->name]), route('budgets.delete', [$budget->id])); + } + ); + + Breadcrumbs::register( + 'budgets.no-budget', + function (BreadCrumbsGenerator $breadcrumbs, string $moment, Carbon $start, Carbon $end) { + $breadcrumbs->parent('budgets.index'); + $breadcrumbs->push(trans('firefly.journals_without_budget'), route('budgets.no-budget')); + + // push when is all: + if ('all' === $moment) { + $breadcrumbs->push(trans('firefly.everything'), route('budgets.no-budget', ['all'])); + } + // when is specific period or when empty: + if ('all' !== $moment && '(nothing)' !== $moment) { + $title = trans( + 'firefly.between_dates_breadcrumb', + ['start' => $start->formatLocalized((string)trans('config.month_and_day')), + 'end' => $end->formatLocalized((string)trans('config.month_and_day')),] + ); + $breadcrumbs->push($title, route('budgets.no-budget', [$moment])); + } + } + ); + + Breadcrumbs::register( + 'budgets.show', + function (BreadCrumbsGenerator $breadcrumbs, Budget $budget) { + $breadcrumbs->parent('budgets.index'); + $breadcrumbs->push($budget->name, route('budgets.show', [$budget->id])); + $breadcrumbs->push(trans('firefly.everything'), route('budgets.show', [$budget->id])); + } + ); + + Breadcrumbs::register( + 'budgets.show.limit', + function (BreadCrumbsGenerator $breadcrumbs, Budget $budget, BudgetLimit $budgetLimit) { + $breadcrumbs->parent('budgets.index'); + $breadcrumbs->push($budget->name, route('budgets.show', [$budget->id])); - $breadcrumbs->parent('accounts.index', $what); - $breadcrumbs->push($account->name, route('accounts.show', [$account->id])); - if (null !== $start && null !== $end) { $title = trans( 'firefly.between_dates_breadcrumb', - ['start' => $start ? $start->formatLocalized((string)trans('config.month_and_day')) : '', - 'end' => $end ? $end->formatLocalized((string)trans('config.month_and_day')) : '',] + ['start' => $budgetLimit->start_date->formatLocalized((string)trans('config.month_and_day')), + 'end' => $budgetLimit->end_date->formatLocalized((string)trans('config.month_and_day')),] ); - $breadcrumbs->push($title, route('accounts.show', $account)); - } - } -); -Breadcrumbs::register( - 'accounts.show.all', - function (BreadCrumbsGenerator $breadcrumbs, Account $account, Carbon $start = null, Carbon $end = null) { - $what = config('firefly.shortNamesByFullName.' . $account->accountType->type); - - $breadcrumbs->parent('accounts.index', $what); - $breadcrumbs->push($account->name, route('accounts.show', [$account->id])); - } -); - -Breadcrumbs::register( - 'accounts.reconcile', - function (BreadCrumbsGenerator $breadcrumbs, Account $account) { - $breadcrumbs->parent('accounts.show', $account); - $breadcrumbs->push(trans('firefly.reconcile_account', ['account' => $account->name]), route('accounts.reconcile', [$account->id])); - } -); - -Breadcrumbs::register( - 'accounts.reconcile.show', - function (BreadCrumbsGenerator $breadcrumbs, Account $account, TransactionJournal $journal) { - $breadcrumbs->parent('accounts.show', $account); - $title = trans('firefly.reconciliation') . ' "' . $journal->description . '"'; - $breadcrumbs->push($title, route('accounts.reconcile.show', [$journal->id])); - } -); - -Breadcrumbs::register( - 'accounts.delete', - function (BreadCrumbsGenerator $breadcrumbs, Account $account) { - $breadcrumbs->parent('accounts.show', $account); - $breadcrumbs->push(trans('firefly.delete_account', ['name' => $account->name]), route('accounts.delete', [$account->id])); - } -); - -Breadcrumbs::register( - 'accounts.edit', - function (BreadCrumbsGenerator $breadcrumbs, Account $account) { - $breadcrumbs->parent('accounts.show', $account); - $what = config('firefly.shortNamesByFullName.' . $account->accountType->type); - - $breadcrumbs->push(trans('firefly.edit_' . $what . '_account', ['name' => $account->name]), route('accounts.edit', [$account->id])); - } -); - -// ADMIN -Breadcrumbs::register( - 'admin.index', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('home'); - $breadcrumbs->push(trans('firefly.administration'), route('admin.index')); - } -); - -Breadcrumbs::register( - 'admin.users', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('admin.index'); - $breadcrumbs->push(trans('firefly.list_all_users'), route('admin.users')); - } -); - -Breadcrumbs::register( - 'admin.users.show', - function (BreadCrumbsGenerator $breadcrumbs, User $user) { - $breadcrumbs->parent('admin.users'); - $breadcrumbs->push(trans('firefly.single_user_administration', ['email' => $user->email]), route('admin.users.show', [$user->id])); - } -); -Breadcrumbs::register( - 'admin.users.edit', - function (BreadCrumbsGenerator $breadcrumbs, User $user) { - $breadcrumbs->parent('admin.users'); - $breadcrumbs->push(trans('firefly.edit_user', ['email' => $user->email]), route('admin.users.edit', [$user->id])); - } -); -Breadcrumbs::register( - 'admin.users.delete', - function (BreadCrumbsGenerator $breadcrumbs, User $user) { - $breadcrumbs->parent('admin.users'); - $breadcrumbs->push(trans('firefly.delete_user', ['email' => $user->email]), route('admin.users.delete', [$user->id])); - } -); - -Breadcrumbs::register( - 'admin.users.domains', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('admin.index'); - $breadcrumbs->push(trans('firefly.blocked_domains'), route('admin.users.domains')); - } -); - -Breadcrumbs::register( - 'admin.configuration.index', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('admin.index'); - $breadcrumbs->push(trans('firefly.instance_configuration'), route('admin.configuration.index')); - } -); -Breadcrumbs::register( - 'admin.update-check', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('admin.index'); - $breadcrumbs->push(trans('firefly.update_check_title'), route('admin.update-check')); - } -); - -Breadcrumbs::register( - 'admin.links.index', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('admin.index'); - $breadcrumbs->push(trans('firefly.journal_link_configuration'), route('admin.links.index')); - } -); - -Breadcrumbs::register( - 'admin.links.create', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('admin.links.index'); - $breadcrumbs->push(trans('firefly.create_new_link_type'), route('admin.links.create')); - } -); - -Breadcrumbs::register( - 'admin.links.show', - function (BreadCrumbsGenerator $breadcrumbs, LinkType $linkType) { - $breadcrumbs->parent('admin.links.index'); - $breadcrumbs->push(trans('firefly.overview_for_link', ['name' => $linkType->name]), route('admin.links.show', [$linkType->id])); - } -); - -Breadcrumbs::register( - 'admin.links.edit', - function (BreadCrumbsGenerator $breadcrumbs, LinkType $linkType) { - $breadcrumbs->parent('admin.links.index'); - $breadcrumbs->push(trans('firefly.edit_link_type', ['name' => $linkType->name]), route('admin.links.edit', [$linkType->id])); - } -); - -Breadcrumbs::register( - 'admin.links.delete', - function (BreadCrumbsGenerator $breadcrumbs, LinkType $linkType) { - $breadcrumbs->parent('admin.links.index'); - $breadcrumbs->push(trans('firefly.delete_link_type', ['name' => $linkType->name]), route('admin.links.delete', [$linkType->id])); - } -); - -Breadcrumbs::register( - 'transactions.link.delete', - function (BreadCrumbsGenerator $breadcrumbs, TransactionJournalLink $link) { - $breadcrumbs->parent('home'); - $breadcrumbs->push(trans('breadcrumbs.delete_journal_link'), route('transactions.link.delete', $link->id)); - } -); - -// ATTACHMENTS -Breadcrumbs::register( - 'attachments.index', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('home'); - $breadcrumbs->push(trans('firefly.attachments'), route('attachments.index')); - } -); - -Breadcrumbs::register( - 'attachments.edit', - function (BreadCrumbsGenerator $breadcrumbs, Attachment $attachment) { - $object = $attachment->attachable; - if ($object instanceof TransactionJournal) { - $breadcrumbs->parent('transactions.show', $object); - $breadcrumbs->push($attachment->filename, route('attachments.edit', [$attachment])); - } else { - throw new FireflyException('Cannot make breadcrumb for attachment connected to object of type ' . get_class($object)); - } - } -); -Breadcrumbs::register( - 'attachments.delete', - function (BreadCrumbsGenerator $breadcrumbs, Attachment $attachment) { - $object = $attachment->attachable; - if ($object instanceof TransactionJournal) { - $breadcrumbs->parent('transactions.show', $object); - $breadcrumbs->push(trans('firefly.delete_attachment', ['name' => $attachment->filename]), route('attachments.edit', [$attachment])); - } else { - throw new FireflyException('Cannot make breadcrumb for attachment connected to object of type ' . get_class($object)); - } - } -); - -// BILLS -Breadcrumbs::register( - 'bills.index', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('home'); - $breadcrumbs->push(trans('breadcrumbs.bills'), route('bills.index')); - } -); -Breadcrumbs::register( - 'bills.create', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('bills.index'); - $breadcrumbs->push(trans('breadcrumbs.newBill'), route('bills.create')); - } -); - -Breadcrumbs::register( - 'bills.edit', - function (BreadCrumbsGenerator $breadcrumbs, Bill $bill) { - $breadcrumbs->parent('bills.show', $bill); - $breadcrumbs->push(trans('breadcrumbs.edit_bill', ['name' => $bill->name]), route('bills.edit', [$bill->id])); - } -); -Breadcrumbs::register( - 'bills.delete', - function (BreadCrumbsGenerator $breadcrumbs, Bill $bill) { - $breadcrumbs->parent('bills.show', $bill); - $breadcrumbs->push(trans('breadcrumbs.delete_bill', ['name' => $bill->name]), route('bills.delete', [$bill->id])); - } -); - -Breadcrumbs::register( - 'bills.show', - function (BreadCrumbsGenerator $breadcrumbs, Bill $bill) { - $breadcrumbs->parent('bills.index'); - $breadcrumbs->push($bill->name, route('bills.show', [$bill->id])); - } -); - -// BUDGETS -Breadcrumbs::register( - 'budgets.index', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('home'); - $breadcrumbs->push(trans('firefly.budgets'), route('budgets.index')); - } -); -Breadcrumbs::register( - 'budgets.create', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('budgets.index'); - $breadcrumbs->push(trans('firefly.create_new_budget'), route('budgets.create')); - } -); - -Breadcrumbs::register( - 'budgets.edit', - function (BreadCrumbsGenerator $breadcrumbs, Budget $budget) { - $breadcrumbs->parent('budgets.show', $budget); - $breadcrumbs->push(trans('firefly.edit_budget', ['name' => $budget->name]), route('budgets.edit', [$budget->id])); - } -); -Breadcrumbs::register( - 'budgets.delete', - function (BreadCrumbsGenerator $breadcrumbs, Budget $budget) { - $breadcrumbs->parent('budgets.show', $budget); - $breadcrumbs->push(trans('firefly.delete_budget', ['name' => $budget->name]), route('budgets.delete', [$budget->id])); - } -); - -Breadcrumbs::register( - 'budgets.no-budget', - function (BreadCrumbsGenerator $breadcrumbs, string $moment, Carbon $start, Carbon $end) { - $breadcrumbs->parent('budgets.index'); - $breadcrumbs->push(trans('firefly.journals_without_budget'), route('budgets.no-budget')); - - // push when is all: - if ('all' === $moment) { - $breadcrumbs->push(trans('firefly.everything'), route('budgets.no-budget', ['all'])); - } - // when is specific period or when empty: - if ('all' !== $moment && '(nothing)' !== $moment) { - $title = trans( - 'firefly.between_dates_breadcrumb', - ['start' => $start->formatLocalized((string)trans('config.month_and_day')), - 'end' => $end->formatLocalized((string)trans('config.month_and_day')),] + $breadcrumbs->push( + $title, + route('budgets.show.limit', [$budget->id, $budgetLimit->id]) ); - $breadcrumbs->push($title, route('budgets.no-budget', [$moment])); } - } -); + ); -Breadcrumbs::register( - 'budgets.show', - function (BreadCrumbsGenerator $breadcrumbs, Budget $budget) { - $breadcrumbs->parent('budgets.index'); - $breadcrumbs->push($budget->name, route('budgets.show', [$budget->id])); - $breadcrumbs->push(trans('firefly.everything'), route('budgets.show', [$budget->id])); - } -); - -Breadcrumbs::register( - 'budgets.show.limit', - function (BreadCrumbsGenerator $breadcrumbs, Budget $budget, BudgetLimit $budgetLimit) { - $breadcrumbs->parent('budgets.index'); - $breadcrumbs->push($budget->name, route('budgets.show', [$budget->id])); - - $title = trans( - 'firefly.between_dates_breadcrumb', - ['start' => $budgetLimit->start_date->formatLocalized((string)trans('config.month_and_day')), - 'end' => $budgetLimit->end_date->formatLocalized((string)trans('config.month_and_day')),] - ); - - $breadcrumbs->push( - $title, - route('budgets.show.limit', [$budget->id, $budgetLimit->id]) - ); - } -); - -// CATEGORIES -Breadcrumbs::register( - 'categories.index', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('home'); - $breadcrumbs->push(trans('firefly.categories'), route('categories.index')); - } -); -Breadcrumbs::register( - 'categories.create', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('categories.index'); - $breadcrumbs->push(trans('firefly.new_category'), route('categories.create')); - } -); - -Breadcrumbs::register( - 'categories.edit', - function (BreadCrumbsGenerator $breadcrumbs, Category $category) { - $breadcrumbs->parent('categories.show', $category, '(nothing)', new Carbon, new Carbon); - $breadcrumbs->push(trans('firefly.edit_category', ['name' => $category->name]), route('categories.edit', [$category->id])); - } -); -Breadcrumbs::register( - 'categories.delete', - function (BreadCrumbsGenerator $breadcrumbs, Category $category) { - $breadcrumbs->parent('categories.show', $category, '(nothing)', new Carbon, new Carbon); - $breadcrumbs->push(trans('firefly.delete_category', ['name' => $category->name]), route('categories.delete', [$category->id])); - } -); - -Breadcrumbs::register( - 'categories.show', - function (BreadCrumbsGenerator $breadcrumbs, Category $category, string $moment, Carbon $start, Carbon $end) { - $breadcrumbs->parent('categories.index'); - $breadcrumbs->push($category->name, route('categories.show', [$category->id])); - - // push when is all: - if ('all' === $moment) { - $breadcrumbs->push(trans('firefly.everything'), route('categories.show', [$category->id, 'all'])); + // CATEGORIES + Breadcrumbs::register( + 'categories.index', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('home'); + $breadcrumbs->push(trans('firefly.categories'), route('categories.index')); } - // when is specific period or when empty: - if ('all' !== $moment && '(nothing)' !== $moment) { - $title = trans( - 'firefly.between_dates_breadcrumb', - ['start' => $start->formatLocalized((string)trans('config.month_and_day')), - 'end' => $end->formatLocalized((string)trans('config.month_and_day')),] + ); + Breadcrumbs::register( + 'categories.create', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('categories.index'); + $breadcrumbs->push(trans('firefly.new_category'), route('categories.create')); + } + ); + + Breadcrumbs::register( + 'categories.edit', + function (BreadCrumbsGenerator $breadcrumbs, Category $category) { + $breadcrumbs->parent('categories.show', $category, '(nothing)', new Carbon, new Carbon); + $breadcrumbs->push(trans('firefly.edit_category', ['name' => $category->name]), route('categories.edit', [$category->id])); + } + ); + Breadcrumbs::register( + 'categories.delete', + function (BreadCrumbsGenerator $breadcrumbs, Category $category) { + $breadcrumbs->parent('categories.show', $category, '(nothing)', new Carbon, new Carbon); + $breadcrumbs->push(trans('firefly.delete_category', ['name' => $category->name]), route('categories.delete', [$category->id])); + } + ); + + Breadcrumbs::register( + 'categories.show', + function (BreadCrumbsGenerator $breadcrumbs, Category $category, string $moment, Carbon $start, Carbon $end) { + $breadcrumbs->parent('categories.index'); + $breadcrumbs->push($category->name, route('categories.show', [$category->id])); + + // push when is all: + if ('all' === $moment) { + $breadcrumbs->push(trans('firefly.everything'), route('categories.show', [$category->id, 'all'])); + } + // when is specific period or when empty: + if ('all' !== $moment && '(nothing)' !== $moment) { + $title = trans( + 'firefly.between_dates_breadcrumb', + ['start' => $start->formatLocalized((string)trans('config.month_and_day')), + 'end' => $end->formatLocalized((string)trans('config.month_and_day')),] + ); + $breadcrumbs->push($title, route('categories.show', [$category->id, $moment])); + } + } + ); + + Breadcrumbs::register( + 'categories.no-category', + function (BreadCrumbsGenerator $breadcrumbs, string $moment, Carbon $start, Carbon $end) { + $breadcrumbs->parent('categories.index'); + $breadcrumbs->push(trans('firefly.journals_without_category'), route('categories.no-category')); + + // push when is all: + if ('all' === $moment) { + $breadcrumbs->push(trans('firefly.everything'), route('categories.no-category', ['all'])); + } + // when is specific period or when empty: + if ('all' !== $moment && '(nothing)' !== $moment) { + $title = trans( + 'firefly.between_dates_breadcrumb', + ['start' => $start->formatLocalized((string)trans('config.month_and_day')), + 'end' => $end->formatLocalized((string)trans('config.month_and_day')),] + ); + $breadcrumbs->push($title, route('categories.no-category', [$moment])); + } + } + ); + + // CURRENCIES + Breadcrumbs::register( + 'currencies.index', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('home'); + $breadcrumbs->push(trans('firefly.currencies'), route('currencies.index')); + } + ); + + Breadcrumbs::register( + 'currencies.create', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('currencies.index'); + $breadcrumbs->push(trans('firefly.create_currency'), route('currencies.create')); + } + ); + + Breadcrumbs::register( + 'currencies.edit', + function (BreadCrumbsGenerator $breadcrumbs, TransactionCurrency $currency) { + $breadcrumbs->parent('currencies.index'); + $breadcrumbs->push(trans('breadcrumbs.edit_currency', ['name' => $currency->name]), route('currencies.edit', [$currency->id])); + } + ); + Breadcrumbs::register( + 'currencies.delete', + function (BreadCrumbsGenerator $breadcrumbs, TransactionCurrency $currency) { + $breadcrumbs->parent('currencies.index'); + $breadcrumbs->push(trans('breadcrumbs.delete_currency', ['name' => $currency->name]), route('currencies.delete', [$currency->id])); + } + ); + + // EXPORT + Breadcrumbs::register( + 'export.index', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('home'); + $breadcrumbs->push(trans('firefly.export_data'), route('export.index')); + } + ); + + // PIGGY BANKS + Breadcrumbs::register( + 'piggy-banks.index', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('home'); + $breadcrumbs->push(trans('firefly.piggyBanks'), route('piggy-banks.index')); + } + ); + Breadcrumbs::register( + 'piggy-banks.create', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('piggy-banks.index'); + $breadcrumbs->push(trans('breadcrumbs.newPiggyBank'), route('piggy-banks.create')); + } + ); + + Breadcrumbs::register( + 'piggy-banks.edit', + function (BreadCrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) { + $breadcrumbs->parent('piggy-banks.show', $piggyBank); + $breadcrumbs->push(trans('breadcrumbs.edit_piggyBank', ['name' => $piggyBank->name]), route('piggy-banks.edit', [$piggyBank->id])); + } + ); + Breadcrumbs::register( + 'piggy-banks.delete', + function (BreadCrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) { + $breadcrumbs->parent('piggy-banks.show', $piggyBank); + $breadcrumbs->push(trans('firefly.delete_piggy_bank', ['name' => $piggyBank->name]), route('piggy-banks.delete', [$piggyBank->id])); + } + ); + + Breadcrumbs::register( + 'piggy-banks.show', + function (BreadCrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) { + $breadcrumbs->parent('piggy-banks.index'); + $breadcrumbs->push($piggyBank->name, route('piggy-banks.show', [$piggyBank->id])); + } + ); + + Breadcrumbs::register( + 'piggy-banks.add-money-mobile', + function (BreadCrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) { + $breadcrumbs->parent('piggy-banks.show', $piggyBank); + $breadcrumbs->push(trans('firefly.add_money_to_piggy', ['name' => $piggyBank->name]), route('piggy-banks.add-money-mobile', [$piggyBank->id])); + } + ); + + Breadcrumbs::register( + 'piggy-banks.remove-money-mobile', + function (BreadCrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) { + $breadcrumbs->parent('piggy-banks.show', $piggyBank); + $breadcrumbs->push( + trans('firefly.remove_money_from_piggy_title', ['name' => $piggyBank->name]), + route('piggy-banks.remove-money-mobile', [$piggyBank->id]) ); - $breadcrumbs->push($title, route('categories.show', [$category->id, $moment])); } - } -); + ); -Breadcrumbs::register( - 'categories.no-category', - function (BreadCrumbsGenerator $breadcrumbs, string $moment, Carbon $start, Carbon $end) { - $breadcrumbs->parent('categories.index'); - $breadcrumbs->push(trans('firefly.journals_without_category'), route('categories.no-category')); - - // push when is all: - if ('all' === $moment) { - $breadcrumbs->push(trans('firefly.everything'), route('categories.no-category', ['all'])); + // IMPORT + Breadcrumbs::register( + 'import.index', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('home'); + $breadcrumbs->push(trans('firefly.import_index_title'), route('import.index')); } - // when is specific period or when empty: - if ('all' !== $moment && '(nothing)' !== $moment) { - $title = trans( - 'firefly.between_dates_breadcrumb', - ['start' => $start->formatLocalized((string)trans('config.month_and_day')), - 'end' => $end->formatLocalized((string)trans('config.month_and_day')),] + ); + + Breadcrumbs::register( + 'import.prerequisites.index', + function (BreadCrumbsGenerator $breadcrumbs, string $importProvider) { + $breadcrumbs->parent('import.index'); + $breadcrumbs->push(trans('import.prerequisites_breadcrumb_' . $importProvider), route('import.prerequisites.index', [$importProvider])); + } + ); + + Breadcrumbs::register( + 'import.job.configuration.index', + function (BreadCrumbsGenerator $breadcrumbs, ImportJob $job) { + $breadcrumbs->parent('import.index'); + $breadcrumbs->push(trans('import.job_configuration_breadcrumb', ['key' => $job->key]), route('import.job.configuration.index', [$job->key])); + } + ); + + Breadcrumbs::register( + 'import.job.status.index', + function (BreadCrumbsGenerator $breadcrumbs, ImportJob $job) { + $breadcrumbs->parent('import.index'); + $breadcrumbs->push(trans('import.job_status_breadcrumb', ['key' => $job->key]), route('import.job.status.index', [$job->key])); + } + ); + + + // PREFERENCES + Breadcrumbs::register( + 'preferences.index', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('home'); + $breadcrumbs->push(trans('breadcrumbs.preferences'), route('preferences.index')); + } + ); + + Breadcrumbs::register( + 'profile.code', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('home'); + $breadcrumbs->push(trans('breadcrumbs.profile'), route('profile.index')); + } + ); + + // PROFILE + Breadcrumbs::register( + 'profile.index', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('home'); + $breadcrumbs->push(trans('breadcrumbs.profile'), route('profile.index')); + } + ); + Breadcrumbs::register( + 'profile.change-password', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('profile.index'); + $breadcrumbs->push(trans('breadcrumbs.changePassword'), route('profile.change-password')); + } + ); + + Breadcrumbs::register( + 'profile.change-email', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('profile.index'); + $breadcrumbs->push(trans('breadcrumbs.change_email'), route('profile.change-email')); + } + ); + + Breadcrumbs::register( + 'profile.delete-account', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('profile.index'); + $breadcrumbs->push(trans('firefly.delete_account'), route('profile.delete-account')); + } + ); + + // REPORTS + Breadcrumbs::register( + 'reports.index', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('home'); + $breadcrumbs->push(trans('breadcrumbs.reports'), route('reports.index')); + } + ); + + Breadcrumbs::register( + 'reports.report.audit', + function (BreadCrumbsGenerator $breadcrumbs, string $accountIds, Carbon $start, Carbon $end) { + $breadcrumbs->parent('reports.index'); + + $monthFormat = (string)trans('config.month_and_day'); + $startString = $start->formatLocalized($monthFormat); + $endString = $end->formatLocalized($monthFormat); + $title = (string)trans('firefly.report_audit', ['start' => $startString, 'end' => $endString]); + + $breadcrumbs->push($title, route('reports.report.audit', [$accountIds, $start->format('Ymd'), $end->format('Ymd')])); + } + ); + Breadcrumbs::register( + 'reports.report.budget', + function (BreadCrumbsGenerator $breadcrumbs, string $accountIds, string $budgetIds, Carbon $start, Carbon $end) { + $breadcrumbs->parent('reports.index'); + + $monthFormat = (string)trans('config.month_and_day'); + $startString = $start->formatLocalized($monthFormat); + $endString = $end->formatLocalized($monthFormat); + $title = (string)trans('firefly.report_budget', ['start' => $startString, 'end' => $endString]); + + $breadcrumbs->push($title, route('reports.report.budget', [$accountIds, $budgetIds, $start->format('Ymd'), $end->format('Ymd')])); + } + ); + + Breadcrumbs::register( + 'reports.report.tag', + function (BreadCrumbsGenerator $breadcrumbs, string $accountIds, string $tagTags, Carbon $start, Carbon $end) { + $breadcrumbs->parent('reports.index'); + + $monthFormat = (string)trans('config.month_and_day'); + $startString = $start->formatLocalized($monthFormat); + $endString = $end->formatLocalized($monthFormat); + $title = (string)trans('firefly.report_tag', ['start' => $startString, 'end' => $endString]); + + $breadcrumbs->push($title, route('reports.report.tag', [$accountIds, $tagTags, $start->format('Ymd'), $end->format('Ymd')])); + } + ); + + Breadcrumbs::register( + 'reports.report.category', + function (BreadCrumbsGenerator $breadcrumbs, string $accountIds, string $categoryIds, Carbon $start, Carbon $end) { + $breadcrumbs->parent('reports.index'); + + $monthFormat = (string)trans('config.month_and_day'); + $startString = $start->formatLocalized($monthFormat); + $endString = $end->formatLocalized($monthFormat); + $title = (string)trans('firefly.report_category', ['start' => $startString, 'end' => $endString]); + + $breadcrumbs->push($title, route('reports.report.category', [$accountIds, $categoryIds, $start->format('Ymd'), $end->format('Ymd')])); + } + ); + + Breadcrumbs::register( + 'reports.report.account', + function (BreadCrumbsGenerator $breadcrumbs, string $accountIds, string $expenseIds, Carbon $start, Carbon $end) { + $breadcrumbs->parent('reports.index'); + + $monthFormat = (string)trans('config.month_and_day'); + $startString = $start->formatLocalized($monthFormat); + $endString = $end->formatLocalized($monthFormat); + $title = (string)trans('firefly.report_account', ['start' => $startString, 'end' => $endString]); + + $breadcrumbs->push($title, route('reports.report.account', [$accountIds, $expenseIds, $start->format('Ymd'), $end->format('Ymd')])); + } + ); + + Breadcrumbs::register( + 'reports.report.default', + function (BreadCrumbsGenerator $breadcrumbs, string $accountIds, Carbon $start, Carbon $end) { + $breadcrumbs->parent('reports.index'); + + $monthFormat = (string)trans('config.month_and_day'); + $startString = $start->formatLocalized($monthFormat); + $endString = $end->formatLocalized($monthFormat); + $title = (string)trans('firefly.report_default', ['start' => $startString, 'end' => $endString]); + + $breadcrumbs->push($title, route('reports.report.default', [$accountIds, $start->format('Ymd'), $end->format('Ymd')])); + } + ); + + // New user Controller + Breadcrumbs::register( + 'new-user.index', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('home'); + $breadcrumbs->push(trans('firefly.getting_started'), route('new-user.index')); + } + ); + + // Rules + Breadcrumbs::register( + 'rules.index', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('home'); + $breadcrumbs->push(trans('firefly.rules'), route('rules.index')); + } + ); + + Breadcrumbs::register( + 'rules.create', + function (BreadCrumbsGenerator $breadcrumbs, RuleGroup $ruleGroup) { + $breadcrumbs->parent('rules.index'); + $breadcrumbs->push(trans('firefly.make_new_rule', ['title' => $ruleGroup->title]), route('rules.create', [$ruleGroup])); + } + ); + Breadcrumbs::register( + 'rules.edit', + function (BreadCrumbsGenerator $breadcrumbs, Rule $rule) { + $breadcrumbs->parent('rules.index'); + $breadcrumbs->push(trans('firefly.edit_rule', ['title' => $rule->title]), route('rules.edit', [$rule])); + } + ); + Breadcrumbs::register( + 'rules.delete', + function (BreadCrumbsGenerator $breadcrumbs, Rule $rule) { + $breadcrumbs->parent('rules.index'); + $breadcrumbs->push(trans('firefly.delete_rule', ['title' => $rule->title]), route('rules.delete', [$rule])); + } + ); + Breadcrumbs::register( + 'rule-groups.create', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('rules.index'); + $breadcrumbs->push(trans('firefly.make_new_rule_group'), route('rule-groups.create')); + } + ); + Breadcrumbs::register( + 'rule-groups.edit', + function (BreadCrumbsGenerator $breadcrumbs, RuleGroup $ruleGroup) { + $breadcrumbs->parent('rules.index'); + $breadcrumbs->push(trans('firefly.edit_rule_group', ['title' => $ruleGroup->title]), route('rule-groups.edit', [$ruleGroup])); + } + ); + Breadcrumbs::register( + 'rule-groups.delete', + function (BreadCrumbsGenerator $breadcrumbs, RuleGroup $ruleGroup) { + $breadcrumbs->parent('rules.index'); + $breadcrumbs->push(trans('firefly.delete_rule_group', ['title' => $ruleGroup->title]), route('rule-groups.delete', [$ruleGroup])); + } + ); + + Breadcrumbs::register( + 'rules.select-transactions', + function (BreadCrumbsGenerator $breadcrumbs, Rule $rule) { + $breadcrumbs->parent('rules.index'); + $breadcrumbs->push( + trans('firefly.rule_select_transactions', ['title' => $rule->title]), route('rules.select-transactions', [$rule]) ); - $breadcrumbs->push($title, route('categories.no-category', [$moment])); } - } -); + ); -// CURRENCIES -Breadcrumbs::register( - 'currencies.index', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('home'); - $breadcrumbs->push(trans('firefly.currencies'), route('currencies.index')); - } -); - -Breadcrumbs::register( - 'currencies.create', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('currencies.index'); - $breadcrumbs->push(trans('firefly.create_currency'), route('currencies.create')); - } -); - -Breadcrumbs::register( - 'currencies.edit', - function (BreadCrumbsGenerator $breadcrumbs, TransactionCurrency $currency) { - $breadcrumbs->parent('currencies.index'); - $breadcrumbs->push(trans('breadcrumbs.edit_currency', ['name' => $currency->name]), route('currencies.edit', [$currency->id])); - } -); -Breadcrumbs::register( - 'currencies.delete', - function (BreadCrumbsGenerator $breadcrumbs, TransactionCurrency $currency) { - $breadcrumbs->parent('currencies.index'); - $breadcrumbs->push(trans('breadcrumbs.delete_currency', ['name' => $currency->name]), route('currencies.delete', [$currency->id])); - } -); - -// EXPORT -Breadcrumbs::register( - 'export.index', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('home'); - $breadcrumbs->push(trans('firefly.export_data'), route('export.index')); - } -); - -// PIGGY BANKS -Breadcrumbs::register( - 'piggy-banks.index', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('home'); - $breadcrumbs->push(trans('firefly.piggyBanks'), route('piggy-banks.index')); - } -); -Breadcrumbs::register( - 'piggy-banks.create', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('piggy-banks.index'); - $breadcrumbs->push(trans('breadcrumbs.newPiggyBank'), route('piggy-banks.create')); - } -); - -Breadcrumbs::register( - 'piggy-banks.edit', - function (BreadCrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) { - $breadcrumbs->parent('piggy-banks.show', $piggyBank); - $breadcrumbs->push(trans('breadcrumbs.edit_piggyBank', ['name' => $piggyBank->name]), route('piggy-banks.edit', [$piggyBank->id])); - } -); -Breadcrumbs::register( - 'piggy-banks.delete', - function (BreadCrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) { - $breadcrumbs->parent('piggy-banks.show', $piggyBank); - $breadcrumbs->push(trans('firefly.delete_piggy_bank', ['name' => $piggyBank->name]), route('piggy-banks.delete', [$piggyBank->id])); - } -); - -Breadcrumbs::register( - 'piggy-banks.show', - function (BreadCrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) { - $breadcrumbs->parent('piggy-banks.index'); - $breadcrumbs->push($piggyBank->name, route('piggy-banks.show', [$piggyBank->id])); - } -); - -Breadcrumbs::register( - 'piggy-banks.add-money-mobile', - function (BreadCrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) { - $breadcrumbs->parent('piggy-banks.show', $piggyBank); - $breadcrumbs->push(trans('firefly.add_money_to_piggy', ['name' => $piggyBank->name]), route('piggy-banks.add-money-mobile', [$piggyBank->id])); - } -); - -Breadcrumbs::register( - 'piggy-banks.remove-money-mobile', - function (BreadCrumbsGenerator $breadcrumbs, PiggyBank $piggyBank) { - $breadcrumbs->parent('piggy-banks.show', $piggyBank); - $breadcrumbs->push( - trans('firefly.remove_money_from_piggy_title', ['name' => $piggyBank->name]), - route('piggy-banks.remove-money-mobile', [$piggyBank->id]) - ); - } -); - -// IMPORT -Breadcrumbs::register( - 'import.index', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('home'); - $breadcrumbs->push(trans('firefly.import'), route('import.index')); - } -); - -Breadcrumbs::register( - 'import.configure', - function (BreadCrumbsGenerator $breadcrumbs, ImportJob $job) { - $breadcrumbs->parent('import.index'); - $breadcrumbs->push(trans('import.config_sub_title', ['key' => $job->key]), route('import.configure', [$job->key])); - } -); - -Breadcrumbs::register( - 'import.prerequisites', - function (BreadCrumbsGenerator $breadcrumbs, string $bank) { - $breadcrumbs->parent('import.index'); - $breadcrumbs->push(trans('import.prerequisites'), route('import.prerequisites', [$bank])); - } -); - - -Breadcrumbs::register( - 'import.status', - function (BreadCrumbsGenerator $breadcrumbs, ImportJob $job) { - $breadcrumbs->parent('import.index'); - $breadcrumbs->push(trans('import.status_bread_crumb', ['key' => $job->key]), route('import.status', [$job->key])); - } -); - - -// PREFERENCES -Breadcrumbs::register( - 'preferences.index', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('home'); - $breadcrumbs->push(trans('breadcrumbs.preferences'), route('preferences.index')); - } -); - -Breadcrumbs::register( - 'profile.code', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('home'); - $breadcrumbs->push(trans('breadcrumbs.profile'), route('profile.index')); - } -); - -// PROFILE -Breadcrumbs::register( - 'profile.index', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('home'); - $breadcrumbs->push(trans('breadcrumbs.profile'), route('profile.index')); - } -); -Breadcrumbs::register( - 'profile.change-password', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('profile.index'); - $breadcrumbs->push(trans('breadcrumbs.changePassword'), route('profile.change-password')); - } -); - -Breadcrumbs::register( - 'profile.change-email', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('profile.index'); - $breadcrumbs->push(trans('breadcrumbs.change_email'), route('profile.change-email')); - } -); - -Breadcrumbs::register( - 'profile.delete-account', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('profile.index'); - $breadcrumbs->push(trans('firefly.delete_account'), route('profile.delete-account')); - } -); - -// REPORTS -Breadcrumbs::register( - 'reports.index', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('home'); - $breadcrumbs->push(trans('breadcrumbs.reports'), route('reports.index')); - } -); - -Breadcrumbs::register( - 'reports.report.audit', - function (BreadCrumbsGenerator $breadcrumbs, string $accountIds, Carbon $start, Carbon $end) { - $breadcrumbs->parent('reports.index'); - - $monthFormat = (string)trans('config.month_and_day'); - $startString = $start->formatLocalized($monthFormat); - $endString = $end->formatLocalized($monthFormat); - $title = (string)trans('firefly.report_audit', ['start' => $startString, 'end' => $endString]); - - $breadcrumbs->push($title, route('reports.report.audit', [$accountIds, $start->format('Ymd'), $end->format('Ymd')])); - } -); -Breadcrumbs::register( - 'reports.report.budget', - function (BreadCrumbsGenerator $breadcrumbs, string $accountIds, string $budgetIds, Carbon $start, Carbon $end) { - $breadcrumbs->parent('reports.index'); - - $monthFormat = (string)trans('config.month_and_day'); - $startString = $start->formatLocalized($monthFormat); - $endString = $end->formatLocalized($monthFormat); - $title = (string)trans('firefly.report_budget', ['start' => $startString, 'end' => $endString]); - - $breadcrumbs->push($title, route('reports.report.budget', [$accountIds, $budgetIds, $start->format('Ymd'), $end->format('Ymd')])); - } -); - -Breadcrumbs::register( - 'reports.report.tag', - function (BreadCrumbsGenerator $breadcrumbs, string $accountIds, string $tagTags, Carbon $start, Carbon $end) { - $breadcrumbs->parent('reports.index'); - - $monthFormat = (string)trans('config.month_and_day'); - $startString = $start->formatLocalized($monthFormat); - $endString = $end->formatLocalized($monthFormat); - $title = (string)trans('firefly.report_tag', ['start' => $startString, 'end' => $endString]); - - $breadcrumbs->push($title, route('reports.report.tag', [$accountIds, $tagTags, $start->format('Ymd'), $end->format('Ymd')])); - } -); - -Breadcrumbs::register( - 'reports.report.category', - function (BreadCrumbsGenerator $breadcrumbs, string $accountIds, string $categoryIds, Carbon $start, Carbon $end) { - $breadcrumbs->parent('reports.index'); - - $monthFormat = (string)trans('config.month_and_day'); - $startString = $start->formatLocalized($monthFormat); - $endString = $end->formatLocalized($monthFormat); - $title = (string)trans('firefly.report_category', ['start' => $startString, 'end' => $endString]); - - $breadcrumbs->push($title, route('reports.report.category', [$accountIds, $categoryIds, $start->format('Ymd'), $end->format('Ymd')])); - } -); - -Breadcrumbs::register( - 'reports.report.account', - function (BreadCrumbsGenerator $breadcrumbs, string $accountIds, string $expenseIds, Carbon $start, Carbon $end) { - $breadcrumbs->parent('reports.index'); - - $monthFormat = (string)trans('config.month_and_day'); - $startString = $start->formatLocalized($monthFormat); - $endString = $end->formatLocalized($monthFormat); - $title = (string)trans('firefly.report_account', ['start' => $startString, 'end' => $endString]); - - $breadcrumbs->push($title, route('reports.report.account', [$accountIds, $expenseIds, $start->format('Ymd'), $end->format('Ymd')])); - } -); - -Breadcrumbs::register( - 'reports.report.default', - function (BreadCrumbsGenerator $breadcrumbs, string $accountIds, Carbon $start, Carbon $end) { - $breadcrumbs->parent('reports.index'); - - $monthFormat = (string)trans('config.month_and_day'); - $startString = $start->formatLocalized($monthFormat); - $endString = $end->formatLocalized($monthFormat); - $title = (string)trans('firefly.report_default', ['start' => $startString, 'end' => $endString]); - - $breadcrumbs->push($title, route('reports.report.default', [$accountIds, $start->format('Ymd'), $end->format('Ymd')])); - } -); - -// New user Controller -Breadcrumbs::register( - 'new-user.index', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('home'); - $breadcrumbs->push(trans('firefly.getting_started'), route('new-user.index')); - } -); - -// Rules -Breadcrumbs::register( - 'rules.index', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('home'); - $breadcrumbs->push(trans('firefly.rules'), route('rules.index')); - } -); - -Breadcrumbs::register( - 'rules.create', - function (BreadCrumbsGenerator $breadcrumbs, RuleGroup $ruleGroup) { - $breadcrumbs->parent('rules.index'); - $breadcrumbs->push(trans('firefly.make_new_rule', ['title' => $ruleGroup->title]), route('rules.create', [$ruleGroup])); - } -); -Breadcrumbs::register( - 'rules.edit', - function (BreadCrumbsGenerator $breadcrumbs, Rule $rule) { - $breadcrumbs->parent('rules.index'); - $breadcrumbs->push(trans('firefly.edit_rule', ['title' => $rule->title]), route('rules.edit', [$rule])); - } -); -Breadcrumbs::register( - 'rules.delete', - function (BreadCrumbsGenerator $breadcrumbs, Rule $rule) { - $breadcrumbs->parent('rules.index'); - $breadcrumbs->push(trans('firefly.delete_rule', ['title' => $rule->title]), route('rules.delete', [$rule])); - } -); -Breadcrumbs::register( - 'rule-groups.create', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('rules.index'); - $breadcrumbs->push(trans('firefly.make_new_rule_group'), route('rule-groups.create')); - } -); -Breadcrumbs::register( - 'rule-groups.edit', - function (BreadCrumbsGenerator $breadcrumbs, RuleGroup $ruleGroup) { - $breadcrumbs->parent('rules.index'); - $breadcrumbs->push(trans('firefly.edit_rule_group', ['title' => $ruleGroup->title]), route('rule-groups.edit', [$ruleGroup])); - } -); -Breadcrumbs::register( - 'rule-groups.delete', - function (BreadCrumbsGenerator $breadcrumbs, RuleGroup $ruleGroup) { - $breadcrumbs->parent('rules.index'); - $breadcrumbs->push(trans('firefly.delete_rule_group', ['title' => $ruleGroup->title]), route('rule-groups.delete', [$ruleGroup])); - } -); - -Breadcrumbs::register( - 'rules.select-transactions', - function (BreadCrumbsGenerator $breadcrumbs, Rule $rule) { - $breadcrumbs->parent('rules.index'); - $breadcrumbs->push( - trans('firefly.rule_select_transactions', ['title' => $rule->title]), route('rules.select-transactions', [$rule]) - ); - } -); - -Breadcrumbs::register( - 'rule-groups.select-transactions', - function (BreadCrumbsGenerator $breadcrumbs, RuleGroup $ruleGroup) { - $breadcrumbs->parent('rules.index'); - $breadcrumbs->push( - trans('firefly.rule_group_select_transactions', ['title' => $ruleGroup->title]), route('rule-groups.select-transactions', [$ruleGroup]) - ); - } -); - -// SEARCH -Breadcrumbs::register( - 'search.index', - function (BreadCrumbsGenerator $breadcrumbs, $query) { - $breadcrumbs->parent('home'); - $breadcrumbs->push(trans('breadcrumbs.search_result', ['query' => $query]), route('search.index')); - } -); - -// TAGS -Breadcrumbs::register( - 'tags.index', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('home'); - $breadcrumbs->push(trans('breadcrumbs.tags'), route('tags.index')); - } -); - -Breadcrumbs::register( - 'tags.create', - function (BreadCrumbsGenerator $breadcrumbs) { - $breadcrumbs->parent('tags.index'); - $breadcrumbs->push(trans('breadcrumbs.createTag'), route('tags.create')); - } -); - -Breadcrumbs::register( - 'tags.edit', - function (BreadCrumbsGenerator $breadcrumbs, Tag $tag) { - $breadcrumbs->parent('tags.show', $tag, '(nothing)', new Carbon, new Carbon); - $breadcrumbs->push(trans('breadcrumbs.edit_tag', ['tag' => $tag->tag]), route('tags.edit', [$tag->id])); - } -); - -Breadcrumbs::register( - 'tags.delete', - function (BreadCrumbsGenerator $breadcrumbs, Tag $tag) { - $breadcrumbs->parent('tags.show', $tag, '(nothing)', new Carbon, new Carbon); - $breadcrumbs->push(trans('breadcrumbs.delete_tag', ['tag' => $tag->tag]), route('tags.delete', [$tag->id])); - } -); - -Breadcrumbs::register( - 'tags.show', - function (BreadCrumbsGenerator $breadcrumbs, Tag $tag, string $moment, Carbon $start, Carbon $end) { - $breadcrumbs->parent('tags.index'); - $breadcrumbs->push($tag->tag, route('tags.show', [$tag->id, $moment])); - if ('all' === $moment) { - $breadcrumbs->push(trans('firefly.everything'), route('tags.show', [$tag->id, $moment])); - } - // when is specific period or when empty: - if ('all' !== $moment && '(nothing)' !== $moment) { - $title = trans( - 'firefly.between_dates_breadcrumb', - ['start' => $start->formatLocalized((string)trans('config.month_and_day')), - 'end' => $end->formatLocalized((string)trans('config.month_and_day')),] + Breadcrumbs::register( + 'rule-groups.select-transactions', + function (BreadCrumbsGenerator $breadcrumbs, RuleGroup $ruleGroup) { + $breadcrumbs->parent('rules.index'); + $breadcrumbs->push( + trans('firefly.rule_group_select_transactions', ['title' => $ruleGroup->title]), route('rule-groups.select-transactions', [$ruleGroup]) ); - $breadcrumbs->push($title, route('tags.show', [$tag->id, $moment])); } - } -); + ); -// TRANSACTIONS - -Breadcrumbs::register( - 'transactions.index', - function (BreadCrumbsGenerator $breadcrumbs, string $what, Carbon $start = null, Carbon $end = null) { - $breadcrumbs->parent('home'); - $breadcrumbs->push(trans('breadcrumbs.' . $what . '_list'), route('transactions.index', [$what])); - - if (null !== $start && null !== $end) { - // add date range: - $title = trans( - 'firefly.between_dates_breadcrumb', - ['start' => $start->formatLocalized((string)trans('config.month_and_day')), - 'end' => $end->formatLocalized((string)trans('config.month_and_day')),] - ); - $breadcrumbs->push($title, route('transactions.index', [$what, $start, $end])); + // SEARCH + Breadcrumbs::register( + 'search.index', + function (BreadCrumbsGenerator $breadcrumbs, $query) { + $breadcrumbs->parent('home'); + $breadcrumbs->push(trans('breadcrumbs.search_result', ['query' => $query]), route('search.index')); } - } -); + ); -Breadcrumbs::register( - 'transactions.index.all', - function (BreadCrumbsGenerator $breadcrumbs, string $what, Carbon $start = null, Carbon $end = null) { - $breadcrumbs->parent('home'); - $breadcrumbs->push(trans('breadcrumbs.' . $what . '_list'), route('transactions.index', [$what])); - } -); + // TAGS + Breadcrumbs::register( + 'tags.index', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('home'); + $breadcrumbs->push(trans('breadcrumbs.tags'), route('tags.index')); + } + ); -Breadcrumbs::register( - 'transactions.create', - function (BreadCrumbsGenerator $breadcrumbs, string $what) { - $breadcrumbs->parent('transactions.index', $what); - $breadcrumbs->push(trans('breadcrumbs.create_' . e($what)), route('transactions.create', [$what])); - } -); + Breadcrumbs::register( + 'tags.create', + function (BreadCrumbsGenerator $breadcrumbs) { + $breadcrumbs->parent('tags.index'); + $breadcrumbs->push(trans('breadcrumbs.createTag'), route('tags.create')); + } + ); -Breadcrumbs::register( - 'transactions.edit', - function (BreadCrumbsGenerator $breadcrumbs, TransactionJournal $journal) { - $breadcrumbs->parent('transactions.show', $journal); - $breadcrumbs->push(trans('breadcrumbs.edit_journal', ['description' => $journal->description]), route('transactions.edit', [$journal->id])); - } -); + Breadcrumbs::register( + 'tags.edit', + function (BreadCrumbsGenerator $breadcrumbs, Tag $tag) { + $breadcrumbs->parent('tags.show', $tag, '(nothing)', new Carbon, new Carbon); + $breadcrumbs->push(trans('breadcrumbs.edit_tag', ['tag' => $tag->tag]), route('tags.edit', [$tag->id])); + } + ); -// also edit reconciliations: -Breadcrumbs::register( - 'accounts.reconcile.edit', - function (BreadCrumbsGenerator $breadcrumbs, TransactionJournal $journal) { - $breadcrumbs->parent('transactions.show', $journal); - $breadcrumbs->push( - trans('breadcrumbs.edit_reconciliation', ['description' => $journal->description]), route('accounts.reconcile.edit', [$journal->id]) - ); - } -); + Breadcrumbs::register( + 'tags.delete', + function (BreadCrumbsGenerator $breadcrumbs, Tag $tag) { + $breadcrumbs->parent('tags.show', $tag, '(nothing)', new Carbon, new Carbon); + $breadcrumbs->push(trans('breadcrumbs.delete_tag', ['tag' => $tag->tag]), route('tags.delete', [$tag->id])); + } + ); -Breadcrumbs::register( - 'transactions.delete', - function (BreadCrumbsGenerator $breadcrumbs, TransactionJournal $journal) { - $breadcrumbs->parent('transactions.show', $journal); - $breadcrumbs->push(trans('breadcrumbs.delete_journal', ['description' => $journal->description]), route('transactions.delete', [$journal->id])); - } -); + Breadcrumbs::register( + 'tags.show', + function (BreadCrumbsGenerator $breadcrumbs, Tag $tag, string $moment, Carbon $start, Carbon $end) { + $breadcrumbs->parent('tags.index'); + $breadcrumbs->push($tag->tag, route('tags.show', [$tag->id, $moment])); + if ('all' === $moment) { + $breadcrumbs->push(trans('firefly.everything'), route('tags.show', [$tag->id, $moment])); + } + // when is specific period or when empty: + if ('all' !== $moment && '(nothing)' !== $moment) { + $title = trans( + 'firefly.between_dates_breadcrumb', + ['start' => $start->formatLocalized((string)trans('config.month_and_day')), + 'end' => $end->formatLocalized((string)trans('config.month_and_day')),] + ); + $breadcrumbs->push($title, route('tags.show', [$tag->id, $moment])); + } + } + ); -Breadcrumbs::register( - 'transactions.show', - function (BreadCrumbsGenerator $breadcrumbs, TransactionJournal $journal) { - $what = strtolower($journal->transactionType->type); - $breadcrumbs->parent('transactions.index', $what); - $breadcrumbs->push($journal->description, route('transactions.show', [$journal->id])); - } -); + // TRANSACTIONS -Breadcrumbs::register( - 'transactions.convert.index', - function (BreadCrumbsGenerator $breadcrumbs, TransactionType $destinationType, TransactionJournal $journal) { - $breadcrumbs->parent('transactions.show', $journal); - $breadcrumbs->push( - trans('firefly.convert_to_' . $destinationType->type, ['description' => $journal->description]), - route('transactions.convert.index', [strtolower($destinationType->type), $journal->id]) - ); - } -); + Breadcrumbs::register( + 'transactions.index', + function (BreadCrumbsGenerator $breadcrumbs, string $what, Carbon $start = null, Carbon $end = null) { + $breadcrumbs->parent('home'); + $breadcrumbs->push(trans('breadcrumbs.' . $what . '_list'), route('transactions.index', [$what])); -// MASS TRANSACTION EDIT / DELETE -Breadcrumbs::register( - 'transactions.mass.edit', - function (BreadCrumbsGenerator $breadcrumbs, Collection $journals): void { - if (\count($journals) > 0) { - $journalIds = $journals->pluck('id')->toArray(); - $what = strtolower($journals->first()['type']); + if (null !== $start && null !== $end) { + // add date range: + $title = trans( + 'firefly.between_dates_breadcrumb', + ['start' => $start->formatLocalized((string)trans('config.month_and_day')), + 'end' => $end->formatLocalized((string)trans('config.month_and_day')),] + ); + $breadcrumbs->push($title, route('transactions.index', [$what, $start, $end])); + } + } + ); + + Breadcrumbs::register( + 'transactions.index.all', + function (BreadCrumbsGenerator $breadcrumbs, string $what, Carbon $start = null, Carbon $end = null) { + $breadcrumbs->parent('home'); + $breadcrumbs->push(trans('breadcrumbs.' . $what . '_list'), route('transactions.index', [$what])); + } + ); + + Breadcrumbs::register( + 'transactions.create', + function (BreadCrumbsGenerator $breadcrumbs, string $what) { $breadcrumbs->parent('transactions.index', $what); - $breadcrumbs->push(trans('firefly.mass_edit_journals'), route('transactions.mass.edit', $journalIds)); - - return; + $breadcrumbs->push(trans('breadcrumbs.create_' . e($what)), route('transactions.create', [$what])); } - $breadcrumbs->parent('index'); - } -); + ); -Breadcrumbs::register( - 'transactions.mass.delete', - function (BreadCrumbsGenerator $breadcrumbs, Collection $journals) { - $journalIds = $journals->pluck('id')->toArray(); - $what = strtolower($journals->first()->transactionType->type); - $breadcrumbs->parent('transactions.index', $what); - $breadcrumbs->push(trans('firefly.mass_edit_journals'), route('transactions.mass.delete', $journalIds)); - } -); + Breadcrumbs::register( + 'transactions.edit', + function (BreadCrumbsGenerator $breadcrumbs, TransactionJournal $journal) { + $breadcrumbs->parent('transactions.show', $journal); + $breadcrumbs->push(trans('breadcrumbs.edit_journal', ['description' => $journal->description]), route('transactions.edit', [$journal->id])); + } + ); -// BULK EDIT -Breadcrumbs::register( - 'transactions.bulk.edit', - function (BreadCrumbsGenerator $breadcrumbs, Collection $journals): void { - if ($journals->count() > 0) { + // also edit reconciliations: + Breadcrumbs::register( + 'accounts.reconcile.edit', + function (BreadCrumbsGenerator $breadcrumbs, TransactionJournal $journal) { + $breadcrumbs->parent('transactions.show', $journal); + $breadcrumbs->push( + trans('breadcrumbs.edit_reconciliation', ['description' => $journal->description]), route('accounts.reconcile.edit', [$journal->id]) + ); + } + ); + + Breadcrumbs::register( + 'transactions.delete', + function (BreadCrumbsGenerator $breadcrumbs, TransactionJournal $journal) { + $breadcrumbs->parent('transactions.show', $journal); + $breadcrumbs->push(trans('breadcrumbs.delete_journal', ['description' => $journal->description]), route('transactions.delete', [$journal->id])); + } + ); + + Breadcrumbs::register( + 'transactions.show', + function (BreadCrumbsGenerator $breadcrumbs, TransactionJournal $journal) { + $what = strtolower($journal->transactionType->type); + $breadcrumbs->parent('transactions.index', $what); + $breadcrumbs->push($journal->description, route('transactions.show', [$journal->id])); + } + ); + + Breadcrumbs::register( + 'transactions.convert.index', + function (BreadCrumbsGenerator $breadcrumbs, TransactionType $destinationType, TransactionJournal $journal) { + $breadcrumbs->parent('transactions.show', $journal); + $breadcrumbs->push( + trans('firefly.convert_to_' . $destinationType->type, ['description' => $journal->description]), + route('transactions.convert.index', [strtolower($destinationType->type), $journal->id]) + ); + } + ); + + // MASS TRANSACTION EDIT / DELETE + Breadcrumbs::register( + 'transactions.mass.edit', + function (BreadCrumbsGenerator $breadcrumbs, Collection $journals): void { + if (\count($journals) > 0) { + $journalIds = $journals->pluck('id')->toArray(); + $what = strtolower($journals->first()['type']); + $breadcrumbs->parent('transactions.index', $what); + $breadcrumbs->push(trans('firefly.mass_edit_journals'), route('transactions.mass.edit', $journalIds)); + + return; + } + $breadcrumbs->parent('index'); + } + ); + + Breadcrumbs::register( + 'transactions.mass.delete', + function (BreadCrumbsGenerator $breadcrumbs, Collection $journals) { $journalIds = $journals->pluck('id')->toArray(); $what = strtolower($journals->first()->transactionType->type); $breadcrumbs->parent('transactions.index', $what); - $breadcrumbs->push(trans('firefly.mass_bulk_journals'), route('transactions.bulk.edit', $journalIds)); + $breadcrumbs->push(trans('firefly.mass_edit_journals'), route('transactions.mass.delete', $journalIds)); + } + ); + + // BULK EDIT + Breadcrumbs::register( + 'transactions.bulk.edit', + function (BreadCrumbsGenerator $breadcrumbs, Collection $journals): void { + if ($journals->count() > 0) { + $journalIds = $journals->pluck('id')->toArray(); + $what = strtolower($journals->first()->transactionType->type); + $breadcrumbs->parent('transactions.index', $what); + $breadcrumbs->push(trans('firefly.mass_bulk_journals'), route('transactions.bulk.edit', $journalIds)); + + return; + } + + $breadcrumbs->parent('index'); return; } + ); - $breadcrumbs->parent('index'); - - return; - } -); - -// SPLIT -Breadcrumbs::register( - 'transactions.split.edit', - function (BreadCrumbsGenerator $breadcrumbs, TransactionJournal $journal) { - $breadcrumbs->parent('transactions.show', $journal); - $breadcrumbs->push(trans('breadcrumbs.edit_journal', ['description' => $journal->description]), route('transactions.split.edit', [$journal->id])); - } -); + // SPLIT + Breadcrumbs::register( + 'transactions.split.edit', + function (BreadCrumbsGenerator $breadcrumbs, TransactionJournal $journal) { + $breadcrumbs->parent('transactions.show', $journal); + $breadcrumbs->push(trans('breadcrumbs.edit_journal', ['description' => $journal->description]), route('transactions.split.edit', [$journal->id])); + } + ); +} catch (DuplicateBreadcrumbException $e) { +} \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 53d0f5054e..7c98292c2a 100755 --- a/routes/web.php +++ b/routes/web.php @@ -442,29 +442,52 @@ Route::group( Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'import', 'as' => 'import.'], function () { + // index Route::get('', ['uses' => 'Import\IndexController@index', 'as' => 'index']); + // create new job + Route::get('create/{import_provider}', ['uses' => 'Import\IndexController@create', 'as' => 'create']); + + // set global prerequisites for an import source, possible with a job already attached. + Route::get('prerequisites/{import_provider}/{importJob?}', ['uses' => 'Import\PrerequisitesController@index', 'as' => 'prerequisites.index']); + Route::post('prerequisites/{import_provider}/{importJob?}', ['uses' => 'Import\PrerequisitesController@post', 'as' => 'prerequisites.post']); + + // configure a job: + Route::get('job/configuration/{importJob}', ['uses' => 'Import\JobConfigurationController@index', 'as' => 'job.configuration.index']); + Route::post('job/configuration/{importJob}', ['uses' => 'Import\JobConfigurationController@post', 'as' => 'job.configuration.post']); + + // get status of a job. This is also the landing page of a job after job config is complete. + Route::get('job/status/{importJob}', ['uses' => 'Import\JobStatusController@index', 'as' => 'job.status.index']); + Route::get('job/json/{importJob}', ['uses' => 'Import\JobStatusController@json', 'as' => 'job.status.json']); + + // start the job! + Route::any('job/start/{importJob}', ['uses' => 'Import\JobStatusController@start', 'as' => 'job.start']); + Route::any('job/store/{importJob}', ['uses' => 'Import\JobStatusController@store', 'as' => 'job.store']); + + // download config: + Route::get('download/{importJob}', ['uses' => 'Import\IndexController@download', 'as' => 'job.download']); + // import method prerequisites: - Route::get('prerequisites/{bank}', ['uses' => 'Import\PrerequisitesController@index', 'as' => 'prerequisites']); - Route::post('prerequisites/{bank}', ['uses' => 'Import\PrerequisitesController@post', 'as' => 'prerequisites.post']); - Route::get('reset/{bank}', ['uses' => 'Import\IndexController@reset', 'as' => 'reset']); + # + # + #Route::get('reset/{bank}', ['uses' => 'Import\IndexController@reset', 'as' => 'reset']); // create the job: - Route::get('create/{bank}', ['uses' => 'Import\IndexController@create', 'as' => 'create-job']); + #Route::get('create/{bank}', ['uses' => 'Import\IndexController@create', 'as' => 'create-job']); // configure the job: - Route::get('configure/{importJob}', ['uses' => 'Import\ConfigurationController@index', 'as' => 'configure']); - Route::post('configure/{importJob}', ['uses' => 'Import\ConfigurationController@post', 'as' => 'configure.post']); + + #Route::post('configure/{importJob}', ['uses' => 'Import\ConfigurationController@post', 'as' => 'configure.post']); // get status of any job: - Route::get('status/{importJob}', ['uses' => 'Import\StatusController@index', 'as' => 'status']); - Route::get('json/{importJob}', ['uses' => 'Import\StatusController@json', 'as' => 'status.json']); + #Route::get('status/{importJob}', ['uses' => 'Import\StatusController@index', 'as' => 'status']); + #Route::get('json/{importJob}', ['uses' => 'Import\StatusController@json', 'as' => 'status.json']); // start a job - Route::any('start/{importJob}', ['uses' => 'Import\IndexController@start', 'as' => 'start']); + #Route::any('start/{importJob}', ['uses' => 'Import\IndexController@start', 'as' => 'start']); // download config - Route::get('download/{importJob}', ['uses' => 'Import\IndexController@download', 'as' => 'download']); + #Route::get('download/{importJob}', ['uses' => 'Import\IndexController@download', 'as' => 'download']); } ); @@ -495,7 +518,7 @@ Route::group( Route::group( ['middleware' => 'user-full-auth', 'namespace' => 'FireflyIII\Http\Controllers', 'prefix' => 'json', 'as' => 'json.'], function () { - // for auto complete + // for auto complete Route::get('expense-accounts', ['uses' => 'Json\AutoCompleteController@expenseAccounts', 'as' => 'expense-accounts']); Route::get('all-accounts', ['uses' => 'Json\AutoCompleteController@allAccounts', 'as' => 'all-accounts']); Route::get('revenue-accounts', ['uses' => 'Json\AutoCompleteController@revenueAccounts', 'as' => 'revenue-accounts']); @@ -564,7 +587,8 @@ Route::group( Route::post('destroy/{piggyBank}', ['uses' => 'PiggyBankController@destroy', 'as' => 'destroy']); Route::post('add/{piggyBank}', ['uses' => 'PiggyBankController@postAdd', 'as' => 'add']); Route::post('remove/{piggyBank}', ['uses' => 'PiggyBankController@postRemove', 'as' => 'remove']); - Route::post('sort', ['uses' => 'PiggyBankController@order', 'as' => 'order']); + + Route::post('set-order/{piggyBank}', ['uses' => 'PiggyBankController@setOrder', 'as' => 'set-order']); } diff --git a/storage/build/ebcdic.txt b/storage/build/ebcdic.txt new file mode 100644 index 0000000000..e35172592b --- /dev/null +++ b/storage/build/ebcdic.txt @@ -0,0 +1 @@ +㈉¢@‰¢@@†‰“…@…•ƒ–„…„@¢@ÅÂÃÄÉÃK \ No newline at end of file diff --git a/tests/Api/V1/Controllers/AboutControllerTest.php b/tests/Api/V1/Controllers/AboutControllerTest.php index 68740c65fb..d3ffcb88e0 100644 --- a/tests/Api/V1/Controllers/AboutControllerTest.php +++ b/tests/Api/V1/Controllers/AboutControllerTest.php @@ -48,7 +48,7 @@ class AboutControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\AboutController::__construct * @covers \FireflyIII\Api\V1\Controllers\AboutController::about */ - public function testAbout() + public function testAbout(): void { // test API $response = $this->get('/api/v1/about'); @@ -67,7 +67,7 @@ class AboutControllerTest extends TestCase * * @covers \FireflyIII\Api\V1\Controllers\AboutController::user */ - public function testUser() + public function testUser(): void { // test API $response = $this->get('/api/v1/about/user'); diff --git a/tests/Api/V1/Controllers/AccountControllerTest.php b/tests/Api/V1/Controllers/AccountControllerTest.php index e6c024b7dc..77586a0008 100644 --- a/tests/Api/V1/Controllers/AccountControllerTest.php +++ b/tests/Api/V1/Controllers/AccountControllerTest.php @@ -52,7 +52,7 @@ class AccountControllerTest extends TestCase * * @covers \FireflyIII\Api\V1\Controllers\AccountController::delete */ - public function testDelete() + public function testDelete(): void { // mock stuff: $repository = $this->mock(AccountRepositoryInterface::class); @@ -76,7 +76,7 @@ class AccountControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\AccountController::index * @covers \FireflyIII\Api\V1\Controllers\AccountController::mapTypes */ - public function testIndex() + public function testIndex(): void { // create stuff $accounts = factory(Account::class, 10)->create(); @@ -115,7 +115,7 @@ class AccountControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Requests\AccountRequest::rules * @covers \FireflyIII\Api\V1\Requests\AccountRequest::getAll */ - public function testInvalidBalance() + public function testInvalidBalance(): void { // mock repositories $repository = $this->mock(AccountRepositoryInterface::class); @@ -157,7 +157,7 @@ class AccountControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Requests\AccountRequest::rules * @covers \FireflyIII\Api\V1\Requests\AccountRequest::getAll */ - public function testNoCreditCardData() + public function testNoCreditCardData(): void { // mock repositories $repository = $this->mock(AccountRepositoryInterface::class); @@ -199,7 +199,7 @@ class AccountControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Requests\AccountRequest::rules * @covers \FireflyIII\Api\V1\Requests\AccountRequest::getAll */ - public function testNoCurrencyInfo() + public function testNoCurrencyInfo(): void { // mock repositories $repository = $this->mock(AccountRepositoryInterface::class); @@ -236,7 +236,7 @@ class AccountControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\AccountController::show */ - public function testShow() + public function testShow(): void { // create stuff $account = $this->user()->accounts()->first(); @@ -273,7 +273,7 @@ class AccountControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Requests\AccountRequest::rules * @covers \FireflyIII\Api\V1\Requests\AccountRequest::getAll */ - public function testStoreNotUnique() + public function testStoreNotUnique(): void { // mock repositories $repository = $this->mock(AccountRepositoryInterface::class); @@ -315,7 +315,7 @@ class AccountControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Requests\AccountRequest::rules * @covers \FireflyIII\Api\V1\Requests\AccountRequest::getAll */ - public function testStoreValid() + public function testStoreValid(): void { // mock repositories $repository = $this->mock(AccountRepositoryInterface::class); @@ -359,7 +359,7 @@ class AccountControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Requests\AccountRequest::rules * @covers \FireflyIII\Api\V1\Requests\AccountRequest::getAll */ - public function testStoreWithCurrencyCode() + public function testStoreWithCurrencyCode(): void { // mock repositories $repository = $this->mock(AccountRepositoryInterface::class); @@ -405,7 +405,7 @@ class AccountControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\AccountController::update * @covers \FireflyIII\Api\V1\Requests\AccountRequest::rules */ - public function testUpdate() + public function testUpdate(): void { // mock repositories $repository = $this->mock(AccountRepositoryInterface::class); @@ -448,7 +448,7 @@ class AccountControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\AccountController::update * @covers \FireflyIII\Api\V1\Requests\AccountRequest::rules */ - public function testUpdateCurrencyCode() + public function testUpdateCurrencyCode(): void { // mock repositories $repository = $this->mock(AccountRepositoryInterface::class); diff --git a/tests/Api/V1/Controllers/BillControllerTest.php b/tests/Api/V1/Controllers/BillControllerTest.php index 7ea81bfc1a..76ab361ee3 100644 --- a/tests/Api/V1/Controllers/BillControllerTest.php +++ b/tests/Api/V1/Controllers/BillControllerTest.php @@ -52,7 +52,7 @@ class BillControllerTest extends TestCase * * @covers \FireflyIII\Api\V1\Controllers\BillController */ - public function testDelete() + public function testDelete(): void { // mock stuff: $repository = $this->mock(BillRepositoryInterface::class); @@ -73,7 +73,7 @@ class BillControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\BillController::__construct * @covers \FireflyIII\Api\V1\Controllers\BillController::index */ - public function testIndex() + public function testIndex(): void { // create stuff $bills = factory(Bill::class, 10)->create(); @@ -99,7 +99,7 @@ class BillControllerTest extends TestCase /** * @covers \FireflyIII\Api\V1\Controllers\BillController::show */ - public function testShow() + public function testShow(): void { // create stuff $bill = $this->user()->bills()->first(); @@ -127,7 +127,7 @@ class BillControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Requests\BillRequest::getAll * @covers \FireflyIII\Api\V1\Requests\BillRequest::withValidator */ - public function testStoreMinOverMax() + public function testStoreMinOverMax(): void { // create stuff $bill = $this->user()->bills()->first(); @@ -172,7 +172,7 @@ class BillControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Requests\BillRequest::authorize * @covers \FireflyIII\Api\V1\Requests\BillRequest::getAll */ - public function testStoreValid() + public function testStoreValid(): void { // create stuff $bill = $this->user()->bills()->first(); @@ -211,7 +211,7 @@ class BillControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Requests\BillRequest::authorize * @covers \FireflyIII\Api\V1\Requests\BillRequest::getAll */ - public function testUpdateValid() + public function testUpdateValid(): void { // create stuff $bill = $this->user()->bills()->first(); diff --git a/tests/Api/V1/Controllers/CurrencyControllerTest.php b/tests/Api/V1/Controllers/CurrencyControllerTest.php index 6e6fc5b27f..48c3c47610 100644 --- a/tests/Api/V1/Controllers/CurrencyControllerTest.php +++ b/tests/Api/V1/Controllers/CurrencyControllerTest.php @@ -272,4 +272,4 @@ class CurrencyControllerTest extends TestCase $response->assertHeader('Content-Type', 'application/vnd.api+json'); $response->assertSee($currency->name); } -} \ No newline at end of file +} diff --git a/tests/Api/V1/Controllers/TransactionControllerTest.php b/tests/Api/V1/Controllers/TransactionControllerTest.php index db4174b1b2..a17d46a389 100644 --- a/tests/Api/V1/Controllers/TransactionControllerTest.php +++ b/tests/Api/V1/Controllers/TransactionControllerTest.php @@ -24,9 +24,11 @@ declare(strict_types=1); namespace Tests\Api\V1\Controllers; +use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collector\JournalCollector; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Helpers\Filter\NegativeAmountFilter; +use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; @@ -57,7 +59,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::__construct * @covers \FireflyIII\Api\V1\Controllers\TransactionController::delete */ - public function testDelete() + public function testDelete(): void { // mock stuff: $repository = $this->mock(JournalRepositoryInterface::class); @@ -81,7 +83,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testFailCurrencyCode() + public function testFailCurrencyCode(): void { // mock stuff: $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -128,7 +130,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testFailCurrencyId() + public function testFailCurrencyId(): void { // mock stuff: $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -174,7 +176,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testFailEmptyDescriptions() + public function testFailEmptyDescriptions(): void { // mock stuff: $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -226,7 +228,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testFailEmptySplitDescriptions() + public function testFailEmptySplitDescriptions(): void { // mock stuff: $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -284,7 +286,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Requests\TransactionRequest * @covers \FireflyIII\Rules\BelongsUser */ - public function testFailExpenseID() + public function testFailExpenseID(): void { // mock stuff: $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -332,7 +334,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testFailExpenseName() + public function testFailExpenseName(): void { // mock stuff: $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -379,7 +381,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testFailNoAsset() + public function testFailNoAsset(): void { // mock stuff: $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -423,7 +425,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testFailNoData() + public function testFailNoData(): void { // mock stuff: $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -460,7 +462,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testFailNoForeignCurrencyInfo() + public function testFailNoForeignCurrencyInfo(): void { // mock stuff: $account = $this->user()->accounts()->where('account_type_id', 3)->first(); @@ -508,7 +510,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testFailOpposingRevenueID() + public function testFailOpposingRevenueID(): void { $account = $this->user()->accounts()->where('account_type_id', 3)->first(); $opposing = $this->user()->accounts()->where('account_type_id', 5)->first(); @@ -561,7 +563,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Requests\TransactionRequest * @covers \FireflyiII\Rules\BelongsUser */ - public function testFailOwnershipBillId() + public function testFailOwnershipBillId(): void { $account = $this->user()->accounts()->where('account_type_id', 3)->first(); $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -620,7 +622,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Requests\TransactionRequest * @covers \FireflyiII\Rules\BelongsUser */ - public function testFailOwnershipBillName() + public function testFailOwnershipBillName(): void { $account = $this->user()->accounts()->where('account_type_id', 3)->first(); $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -678,7 +680,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Requests\TransactionRequest * @covers \FireflyiII\Rules\BelongsUser */ - public function testFailOwnershipBudgetId() + public function testFailOwnershipBudgetId(): void { $account = $this->user()->accounts()->where('account_type_id', 3)->first(); $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -736,7 +738,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Requests\TransactionRequest * @covers \FireflyiII\Rules\BelongsUser */ - public function testFailOwnershipBudgetName() + public function testFailOwnershipBudgetName(): void { $account = $this->user()->accounts()->where('account_type_id', 3)->first(); $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -794,7 +796,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Requests\TransactionRequest * @covers \FireflyiII\Rules\BelongsUser */ - public function testFailOwnershipCategoryId() + public function testFailOwnershipCategoryId(): void { $account = $this->user()->accounts()->where('account_type_id', 3)->first(); $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -852,7 +854,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Requests\TransactionRequest * @covers \FireflyiII\Rules\BelongsUser */ - public function testFailOwnershipPiggyBankID() + public function testFailOwnershipPiggyBankID(): void { // move account to other user $move = $this->user()->accounts()->where('account_type_id', 3)->first(); @@ -918,7 +920,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Requests\TransactionRequest * @covers \FireflyiII\Rules\BelongsUser */ - public function testFailOwnershipPiggyBankName() + public function testFailOwnershipPiggyBankName(): void { // move account to other user $move = $this->user()->accounts()->where('account_type_id', 3)->first(); @@ -984,7 +986,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Requests\TransactionRequest * @covers \FireflyIII\Rules\BelongsUser */ - public function testFailRevenueID() + public function testFailRevenueID(): void { $account = $this->user()->accounts()->where('account_type_id', 4)->first(); $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -1030,7 +1032,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testFailSplitDeposit() + public function testFailSplitDeposit(): void { $account = $this->user()->accounts()->where('account_type_id', 3)->first(); $second = $this->user()->accounts()->where('account_type_id', 3)->where('id', '!=', $account->id)->first(); @@ -1087,7 +1089,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testFailSplitTransfer() + public function testFailSplitTransfer(): void { $account = $this->user()->accounts()->where('account_type_id', 3)->first(); $second = $this->user()->accounts()->where('account_type_id', 3)->where('id', '!=', $account->id)->first(); @@ -1151,7 +1153,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testFailSplitWithdrawal() + public function testFailSplitWithdrawal(): void { $account = $this->user()->accounts()->where('account_type_id', 3)->first(); $second = $this->user()->accounts()->where('account_type_id', 3)->where('id', '!=', $account->id)->first(); @@ -1210,7 +1212,7 @@ class TransactionControllerTest extends TestCase * * throws \FireflyIII\Exceptions\FireflyException */ - public function testIndex() + public function testIndex(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos->shouldReceive('setUser'); @@ -1223,7 +1225,11 @@ class TransactionControllerTest extends TestCase $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation(); $collector->setAllAssetAccounts(); $collector->setLimit(5)->setPage(1); - $paginator = $collector->getPaginatedJournals(); + try { + $paginator = $collector->getPaginatedJournals(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } // mock stuff: $repository = $this->mock(JournalRepositoryInterface::class); @@ -1260,7 +1266,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::mapTypes * throws \FireflyIII\Exceptions\FireflyException */ - public function testIndexWithRange() + public function testIndexWithRange(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos->shouldReceive('setUser'); @@ -1273,7 +1279,11 @@ class TransactionControllerTest extends TestCase $collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation(); $collector->setAllAssetAccounts(); $collector->setLimit(5)->setPage(1); + try { $paginator = $collector->getPaginatedJournals(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } // mock stuff: $repository = $this->mock(JournalRepositoryInterface::class); @@ -1321,7 +1331,7 @@ class TransactionControllerTest extends TestCase /** * @covers \FireflyIII\Api\V1\Controllers\TransactionController::show */ - public function testShowDeposit() + public function testShowDeposit(): void { do { // this is kind of cheating but OK. @@ -1382,7 +1392,7 @@ class TransactionControllerTest extends TestCase /** * @covers \FireflyIII\Api\V1\Controllers\TransactionController::show */ - public function testShowWithdrawal() + public function testShowWithdrawal(): void { do { // this is kind of cheating but OK. @@ -1390,7 +1400,10 @@ class TransactionControllerTest extends TestCase $journal = $this->user()->transactionJournals()->inRandomOrder()->where('transaction_type_id', 1)->whereNull('deleted_at')->first(); $count = $journal->transactions()->count(); } while ($count !== 2); + /** @var Transaction $transaction */ $transaction = $journal->transactions()->first(); + $transaction->description = null; + $transaction->save(); $accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos->shouldReceive('setUser'); @@ -1450,7 +1463,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testSuccessBillId() + public function testSuccessBillId(): void { // default journal: $journal = $this->user()->transactionJournals()->first(); @@ -1491,7 +1504,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testSuccessBillName() + public function testSuccessBillName(): void { // default journal: $journal = $this->user()->transactionJournals()->first(); @@ -1532,7 +1545,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testSuccessNewStoreOpposingName() + public function testSuccessNewStoreOpposingName(): void { $journal = $this->user()->transactionJournals()->where('transaction_type_id', 1)->first(); $account = $this->user()->accounts()->where('account_type_id', 3)->first(); @@ -1572,7 +1585,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testSuccessStoreAccountName() + public function testSuccessStoreAccountName(): void { // default journal: $journal = $this->user()->transactionJournals()->first(); @@ -1611,7 +1624,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testSuccessStoreBasic() + public function testSuccessStoreBasic(): void { // default journal: $journal = $this->user()->transactionJournals()->where('transaction_type_id', 1)->first(); @@ -1650,7 +1663,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testSuccessStoreBasicByName() + public function testSuccessStoreBasicByName(): void { // default journal: $journal = $this->user()->transactionJournals()->where('transaction_type_id', 1)->first(); @@ -1691,7 +1704,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testSuccessStoreBasicDeposit() + public function testSuccessStoreBasicDeposit(): void { // default journal: $journal = $this->user()->transactionJournals()->where('transaction_type_id', 2)->first(); @@ -1730,7 +1743,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testSuccessStoreBudgetId() + public function testSuccessStoreBudgetId(): void { $budget = $this->user()->budgets()->first(); $journal = $this->user()->transactionJournals()->first(); @@ -1769,7 +1782,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testSuccessStoreBudgetName() + public function testSuccessStoreBudgetName(): void { $budget = $this->user()->budgets()->first(); $journal = $this->user()->transactionJournals()->first(); @@ -1809,7 +1822,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testSuccessStoreCategoryID() + public function testSuccessStoreCategoryID(): void { $category = $this->user()->categories()->first(); $journal = $this->user()->transactionJournals()->first(); @@ -1848,7 +1861,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testSuccessStoreCategoryName() + public function testSuccessStoreCategoryName(): void { $category = $this->user()->categories()->first(); $journal = $this->user()->transactionJournals()->first(); @@ -1887,7 +1900,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testSuccessStoreForeignAmount() + public function testSuccessStoreForeignAmount(): void { $currency = TransactionCurrency::first(); $foreign = TransactionCurrency::where('id', '!=', $currency->id)->first(); @@ -1928,7 +1941,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testSuccessStoreMetaData() + public function testSuccessStoreMetaData(): void { $journal = $this->user()->transactionJournals()->first(); $account = $this->user()->accounts()->where('account_type_id', 3)->first(); @@ -1973,7 +1986,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testSuccessStoreNewCategoryName() + public function testSuccessStoreNewCategoryName(): void { $journal = $this->user()->transactionJournals()->first(); $account = $this->user()->accounts()->where('account_type_id', 3)->first(); @@ -2013,7 +2026,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testSuccessStoreNewOpposingName() + public function testSuccessStoreNewOpposingName(): void { $journal = $this->user()->transactionJournals()->first(); $account = $this->user()->accounts()->where('account_type_id', 3)->first(); @@ -2053,7 +2066,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testSuccessStoreNotes() + public function testSuccessStoreNotes(): void { $journal = $this->user()->transactionJournals()->first(); $account = $this->user()->accounts()->where('account_type_id', 3)->first(); @@ -2092,7 +2105,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testSuccessStoreOpposingID() + public function testSuccessStoreOpposingID(): void { $opposing = $this->user()->accounts()->where('account_type_id', 4)->first(); $journal = $this->user()->transactionJournals()->first(); @@ -2131,7 +2144,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testSuccessStoreOpposingName() + public function testSuccessStoreOpposingName(): void { $opposing = $this->user()->accounts()->where('account_type_id', 4)->first(); $journal = $this->user()->transactionJournals()->first(); @@ -2172,7 +2185,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testSuccessStorePiggyDeposit() + public function testSuccessStorePiggyDeposit(): void { $journal = $this->user()->transactionJournals()->first(); $account = $this->user()->accounts()->where('account_type_id', 3)->first(); @@ -2211,7 +2224,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testSuccessStorePiggyId() + public function testSuccessStorePiggyId(): void { $source = $this->user()->accounts()->where('account_type_id', 3)->first(); $dest = $this->user()->accounts()->where('account_type_id', 3)->where('id', '!=', $source->id)->first(); @@ -2251,7 +2264,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testSuccessStorePiggyName() + public function testSuccessStorePiggyName(): void { $source = $this->user()->accounts()->where('account_type_id', 3)->first(); $dest = $this->user()->accounts()->where('account_type_id', 3)->where('id', '!=', $source->id)->first(); @@ -2290,7 +2303,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testSuccessStoreReconciled() + public function testSuccessStoreReconciled(): void { $journal = $this->user()->transactionJournals()->first(); $account = $this->user()->accounts()->where('account_type_id', 3)->first(); @@ -2328,7 +2341,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testSuccessStoreSplit() + public function testSuccessStoreSplit(): void { $journal = $this->user()->transactionJournals()->first(); $account = $this->user()->accounts()->where('account_type_id', 3)->first(); @@ -2375,7 +2388,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::store * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testSuccessStoreTags() + public function testSuccessStoreTags(): void { $tags = [ 'TagOne' . random_int(1, 1000), @@ -2419,7 +2432,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::update * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testUpdateBasicDeposit() + public function testUpdateBasicDeposit(): void { $account = $this->user()->accounts()->where('account_type_id', 3)->first(); $repository = $this->mock(JournalRepositoryInterface::class); @@ -2460,7 +2473,7 @@ class TransactionControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\TransactionController::update * @covers \FireflyIII\Api\V1\Requests\TransactionRequest */ - public function testUpdateBasicWithdrawal() + public function testUpdateBasicWithdrawal(): void { $account = $this->user()->accounts()->where('account_type_id', 3)->first(); $repository = $this->mock(JournalRepositoryInterface::class); diff --git a/tests/Api/V1/Controllers/UserControllerTest.php b/tests/Api/V1/Controllers/UserControllerTest.php index 3fd0e2a69d..7db9ea3925 100644 --- a/tests/Api/V1/Controllers/UserControllerTest.php +++ b/tests/Api/V1/Controllers/UserControllerTest.php @@ -54,7 +54,7 @@ class UserControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\UserController::delete * @covers \FireflyIII\Api\V1\Requests\UserRequest */ - public function testDelete() + public function testDelete(): void { // create a user first: $user = User::create(['email' => 'some@newu' . random_int(1, 1000) . 'ser.nl', 'password' => 'hello', 'blocked' => 0]); @@ -72,7 +72,7 @@ class UserControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\UserController::delete * @covers \FireflyIII\Api\V1\Requests\UserRequest */ - public function testDeleteNoAdmin() + public function testDeleteNoAdmin(): void { Passport::actingAs($this->emptyUser()); @@ -89,7 +89,7 @@ class UserControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\UserController::__construct * @covers \FireflyIII\Api\V1\Controllers\UserController::index */ - public function testIndex() + public function testIndex(): void { // create stuff $users = factory(User::class, 10)->create(); @@ -113,7 +113,7 @@ class UserControllerTest extends TestCase /** * @covers \FireflyIII\Api\V1\Controllers\UserController::show */ - public function testShow() + public function testShow(): void { $user = User::first(); @@ -127,7 +127,7 @@ class UserControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\UserController::store * @covers \FireflyIII\Api\V1\Requests\UserRequest */ - public function testStoreBasic() + public function testStoreBasic(): void { $data = [ 'email' => 'some_new@user' . random_int(1, 1000) . '.com', @@ -148,7 +148,7 @@ class UserControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\UserController::store * @covers \FireflyIII\Api\V1\Requests\UserRequest */ - public function testStoreNotUnique() + public function testStoreNotUnique(): void { $data = [ 'email' => $this->user()->email, @@ -177,7 +177,7 @@ class UserControllerTest extends TestCase * @covers \FireflyIII\Api\V1\Controllers\UserController::update * @covers \FireflyIII\Api\V1\Requests\UserRequest */ - public function testUpdate() + public function testUpdate(): void { // create a user first: $user = User::create(['email' => 'some@newu' . random_int(1, 1000) . 'ser.nl', 'password' => 'hello', 'blocked' => 0]); diff --git a/tests/CreatesApplication.php b/tests/CreatesApplication.php index ee73d4b36a..a463ed26b2 100644 --- a/tests/CreatesApplication.php +++ b/tests/CreatesApplication.php @@ -27,7 +27,6 @@ use Illuminate\Contracts\Console\Kernel; /** * Trait CreatesApplication * - * @package Tests */ trait CreatesApplication { diff --git a/tests/Feature/Controllers/Account/ReconcileControllerTest.php b/tests/Feature/Controllers/Account/ReconcileControllerTest.php index ccdfe0bd25..f549fb9a2e 100644 --- a/tests/Feature/Controllers/Account/ReconcileControllerTest.php +++ b/tests/Feature/Controllers/Account/ReconcileControllerTest.php @@ -56,7 +56,7 @@ class ReconcileControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Account\ReconcileController::edit */ - public function testEdit() + public function testEdit(): void { $repository = $this->mock(JournalRepositoryInterface::class); $journal = $this->user()->transactionJournals()->where('transaction_type_id', 5)->first(); @@ -78,7 +78,7 @@ class ReconcileControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Account\ReconcileController::edit */ - public function testEditRedirect() + public function testEditRedirect(): void { $journal = $this->user()->transactionJournals()->where('transaction_type_id', '!=', 5)->first(); $this->be($this->user()); @@ -90,7 +90,7 @@ class ReconcileControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Account\ReconcileController::overview() */ - public function testOverview() + public function testOverview(): void { $transactions = $this->user()->transactions()->inRandomOrder()->take(3)->get(); $repository = $this->mock(JournalRepositoryInterface::class); @@ -112,7 +112,7 @@ class ReconcileControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Account\ReconcileController::overview() * @expectedExceptionMessage is not an asset account */ - public function testOverviewNotAsset() + public function testOverviewNotAsset(): void { $account = $this->user()->accounts()->where('account_type_id', '!=', 3)->first(); $parameters = [ @@ -131,7 +131,7 @@ class ReconcileControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Account\ReconcileController::reconcile() * @covers \FireflyIII\Http\Controllers\Account\ReconcileController::redirectToOriginalAccount() */ - public function testReconcile() + public function testReconcile(): void { $repository = $this->mock(CurrencyRepositoryInterface::class); $repository->shouldReceive('findNull')->once()->andReturn(TransactionCurrency::find(1)); @@ -148,7 +148,7 @@ class ReconcileControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Account\ReconcileController::reconcile() * @covers \FireflyIII\Http\Controllers\Account\ReconcileController::redirectToOriginalAccount() */ - public function testReconcileInitialBalance() + public function testReconcileInitialBalance(): void { $transaction = Transaction::leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id') ->where('accounts.user_id', $this->user()->id)->where('accounts.account_type_id', 6)->first(['account_id']); @@ -162,7 +162,7 @@ class ReconcileControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Account\ReconcileController::reconcile() * @covers \FireflyIII\Http\Controllers\Account\ReconcileController::redirectToOriginalAccount() */ - public function testReconcileNoDates() + public function testReconcileNoDates(): void { $repository = $this->mock(CurrencyRepositoryInterface::class); $repository->shouldReceive('findNull')->once()->andReturn(TransactionCurrency::find(1)); @@ -180,7 +180,7 @@ class ReconcileControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Account\ReconcileController::reconcile() * @covers \FireflyIII\Http\Controllers\Account\ReconcileController::redirectToOriginalAccount() */ - public function testReconcileNoEndDate() + public function testReconcileNoEndDate(): void { $repository = $this->mock(CurrencyRepositoryInterface::class); $repository->shouldReceive('findNull')->once()->andReturn(TransactionCurrency::find(1)); @@ -198,7 +198,7 @@ class ReconcileControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Account\ReconcileController::reconcile() * @covers \FireflyIII\Http\Controllers\Account\ReconcileController::redirectToOriginalAccount() */ - public function testReconcileNotAsset() + public function testReconcileNotAsset(): void { $account = $this->user()->accounts()->where('account_type_id', '!=', 6)->where('account_type_id', '!=', 3)->first(); $this->be($this->user()); @@ -209,7 +209,7 @@ class ReconcileControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Account\ReconcileController::show() */ - public function testShow() + public function testShow(): void { $journal = $this->user()->transactionJournals()->where('transaction_type_id', 5)->first(); $repository = $this->mock(JournalRepositoryInterface::class); @@ -227,7 +227,7 @@ class ReconcileControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Account\ReconcileController::show() */ - public function testShowSomethingElse() + public function testShowSomethingElse(): void { $journal = $this->user()->transactionJournals()->where('transaction_type_id', '!=', 5)->first(); $this->be($this->user()); @@ -240,7 +240,7 @@ class ReconcileControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Account\ReconcileController::submit() * @covers \FireflyIII\Http\Requests\ReconciliationStoreRequest */ - public function testSubmit() + public function testSubmit(): void { $repository = $this->mock(AccountRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -268,7 +268,7 @@ class ReconcileControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Account\ReconcileController::transactions() */ - public function testTransactions() + public function testTransactions(): void { $repository = $this->mock(CurrencyRepositoryInterface::class); $repository->shouldReceive('findNull')->once()->andReturn(TransactionCurrency::find(1)); @@ -281,7 +281,7 @@ class ReconcileControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Account\ReconcileController::transactions() */ - public function testTransactionsInitialBalance() + public function testTransactionsInitialBalance(): void { $transaction = Transaction::leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id') ->where('accounts.user_id', $this->user()->id)->where('accounts.account_type_id', 6)->first(['account_id']); @@ -294,7 +294,7 @@ class ReconcileControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Account\ReconcileController::update * @covers \FireflyIII\Http\Requests\ReconciliationUpdateRequest */ - public function testUpdate() + public function testUpdate(): void { $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); @@ -317,7 +317,7 @@ class ReconcileControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Account\ReconcileController::update * @covers \FireflyIII\Http\Requests\ReconciliationUpdateRequest */ - public function testUpdateNotReconcile() + public function testUpdateNotReconcile(): void { $journal = $this->user()->transactionJournals()->where('transaction_type_id', '!=', 5)->first(); $data = [ @@ -334,7 +334,7 @@ class ReconcileControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Account\ReconcileController::update * @covers \FireflyIII\Http\Requests\ReconciliationUpdateRequest */ - public function testUpdateZero() + public function testUpdateZero(): void { $journal = $this->user()->transactionJournals()->where('transaction_type_id', 5)->first(); $data = [ diff --git a/tests/Feature/Controllers/AccountControllerTest.php b/tests/Feature/Controllers/AccountControllerTest.php index 4357050385..290b47e3b9 100644 --- a/tests/Feature/Controllers/AccountControllerTest.php +++ b/tests/Feature/Controllers/AccountControllerTest.php @@ -22,6 +22,7 @@ declare(strict_types=1); namespace Tests\Feature\Controllers; +use Amount; use Carbon\Carbon; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Models\Account; @@ -64,7 +65,7 @@ class AccountControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\AccountController::create */ - public function testCreate() + public function testCreate(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -84,7 +85,7 @@ class AccountControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\AccountController::delete * @covers \FireflyIII\Http\Controllers\Controller::rememberPreviousUri */ - public function testDelete() + public function testDelete(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -106,7 +107,7 @@ class AccountControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Controller::__construct * @covers \FireflyIII\Http\Controllers\Controller::getPreviousUri */ - public function testDestroy() + public function testDestroy(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -128,7 +129,7 @@ class AccountControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\AccountController::edit */ - public function testEdit() + public function testEdit(): void { $note = new Note(); $note->text = 'This is a test'; @@ -159,6 +160,41 @@ class AccountControllerTest extends TestCase $response->assertSee($note->text); } + /** + * @covers \FireflyIII\Http\Controllers\AccountController + */ + public function testEditNull(): void + { + $note = new Note(); + $note->text = 'This is a test'; + // mock stuff + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(CurrencyRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + + Amount::shouldReceive('getDefaultCurrency')->andReturn(TransactionCurrency::find(2)); + $repository->shouldReceive('findNull')->once()->andReturn(null); + $repository->shouldReceive('get')->andReturn(new Collection); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $accountRepos->shouldReceive('getNote')->andReturn($note)->once(); + $accountRepos->shouldReceive('getOpeningBalanceAmount')->andReturnNull(); + $accountRepos->shouldReceive('getOpeningBalanceDate')->andReturnNull(); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1'); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountNumber'])->andReturn('123'); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountRole'])->andReturn('defaultAsset'); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'ccType'])->andReturn(''); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'ccMonthlyPaymentDate'])->andReturn(''); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'BIC'])->andReturn('BIC'); + + $this->be($this->user()); + $account = $this->user()->accounts()->where('account_type_id', 3)->whereNull('deleted_at')->first(); + $response = $this->get(route('accounts.edit', [$account->id])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
      '); + $response->assertSee($note->text); + } + /** * @covers \FireflyIII\Http\Controllers\AccountController::index * @covers \FireflyIII\Http\Controllers\AccountController::__construct @@ -168,7 +204,7 @@ class AccountControllerTest extends TestCase * @param string $range * */ - public function testIndex(string $range) + public function testIndex(string $range): void { // mock stuff $account = factory(Account::class)->make(); @@ -182,7 +218,7 @@ class AccountControllerTest extends TestCase Steam::shouldReceive('balancesByAccounts')->andReturn([$account->id => '100']); Steam::shouldReceive('getLastActivities')->andReturn([]); - $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(),'accountNumber'])->andReturn('123'); + $repository->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountNumber'])->andReturn('123'); $this->be($this->user()); $this->changeDateRange($this->user(), $range); @@ -199,7 +235,7 @@ class AccountControllerTest extends TestCase * * @param string $range */ - public function testShow(string $range) + public function testShow(string $range): void { $date = new Carbon; $this->session(['start' => $date, 'end' => clone $date]); @@ -239,11 +275,59 @@ class AccountControllerTest extends TestCase $response->assertSee('
        '); } + + /** + * @covers \FireflyIII\Http\Controllers\AccountController + * @covers \FireflyIII\Http\Controllers\AccountController + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testShowAll(string $range): void + { + $date = new Carbon; + $this->session(['start' => $date, 'end' => clone $date]); + + // mock stuff: + $tasker = $this->mock(AccountTaskerInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + + $currencyRepos->shouldReceive('findNull')->andReturn(TransactionCurrency::find(1)); + + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $tasker->shouldReceive('amountOutInPeriod')->withAnyArgs()->andReturn('-1'); + $tasker->shouldReceive('amountInInPeriod')->withAnyArgs()->andReturn('1'); + + $repository = $this->mock(AccountRepositoryInterface::class); + $repository->shouldReceive('oldestJournalDate')->andReturn(clone $date)->once(); + $repository->shouldReceive('getMetaValue')->andReturn(''); + + + $transaction = factory(Transaction::class)->make(); + $collector = $this->mock(JournalCollectorInterface::class); + $collector->shouldReceive('setAccounts')->andReturnSelf(); + $collector->shouldReceive('setRange')->andReturnSelf(); + $collector->shouldReceive('setLimit')->andReturnSelf(); + $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); + $collector->shouldReceive('setPage')->andReturnSelf(); + $collector->shouldReceive('setTypes')->andReturnSelf(); + $collector->shouldReceive('getJournals')->andReturn(new Collection([$transaction])); + $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([$transaction], 0, 10)); + + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('accounts.show.all', [1])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
          '); + } + /** * @covers \FireflyIII\Http\Controllers\AccountController::show * @expectedExceptionMessage End is after start! */ - public function testShowBrokenBadDates() + public function testShowBrokenBadDates(): void { // mock $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -262,7 +346,7 @@ class AccountControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\AccountController::redirectToOriginalAccount * @expectedExceptionMessage Expected a transaction */ - public function testShowBrokenInitial() + public function testShowBrokenInitial(): void { // mock $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -283,7 +367,7 @@ class AccountControllerTest extends TestCase * * @param string $range */ - public function testShowByDateEmpty(string $range) + public function testShowByDateEmpty(string $range): void { // mock stuff $collector = $this->mock(JournalCollectorInterface::class); @@ -318,7 +402,7 @@ class AccountControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\AccountController::show * @covers \FireflyIII\Http\Controllers\AccountController::redirectToOriginalAccount */ - public function testShowInitial() + public function testShowInitial(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -339,7 +423,7 @@ class AccountControllerTest extends TestCase * @covers \FireflyIII\Http\Requests\AccountFormRequest * @covers \FireflyIII\Http\Controllers\Controller::getPreviousUri */ - public function testStore() + public function testStore(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -368,7 +452,7 @@ class AccountControllerTest extends TestCase * @covers \FireflyIII\Http\Requests\AccountFormRequest * @covers \FireflyIII\Http\Controllers\Controller::getPreviousUri */ - public function testStoreAnother() + public function testStoreAnother(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -395,7 +479,7 @@ class AccountControllerTest extends TestCase * @covers \FireflyIII\Http\Requests\AccountFormRequest * @covers \FireflyIII\Http\Controllers\Controller::getPreviousUri */ - public function testUpdate() + public function testUpdate(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -422,7 +506,7 @@ class AccountControllerTest extends TestCase * @covers \FireflyIII\Http\Requests\AccountFormRequest * @covers \FireflyIII\Http\Controllers\Controller::getPreviousUri */ - public function testUpdateAgain() + public function testUpdateAgain(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); diff --git a/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php b/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php index ad63174d66..0c2364dc6a 100644 --- a/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php +++ b/tests/Feature/Controllers/Admin/ConfigurationControllerTest.php @@ -49,7 +49,7 @@ class ConfigurationControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Admin\ConfigurationController::index * @covers \FireflyIII\Http\Controllers\Admin\ConfigurationController::__construct */ - public function testIndex() + public function testIndex(): void { $this->be($this->user()); @@ -72,7 +72,7 @@ class ConfigurationControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Admin\ConfigurationController::postIndex */ - public function testPostIndex() + public function testPostIndex(): void { $falseConfig = new Configuration; $falseConfig->data = false; diff --git a/tests/Feature/Controllers/Admin/HomeControllerTest.php b/tests/Feature/Controllers/Admin/HomeControllerTest.php index 74f94d125b..9d02ab892e 100644 --- a/tests/Feature/Controllers/Admin/HomeControllerTest.php +++ b/tests/Feature/Controllers/Admin/HomeControllerTest.php @@ -49,7 +49,7 @@ class HomeControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Admin\HomeController::index * @covers \FireflyIII\Http\Controllers\Admin\HomeController::__construct */ - public function testIndex() + public function testIndex(): void { $this->be($this->user()); $response = $this->get(route('admin.index')); @@ -58,7 +58,7 @@ class HomeControllerTest extends TestCase $response->assertSee('
            '); } - public function testTestMessage() + public function testTestMessage(): void { Event::fake(); diff --git a/tests/Feature/Controllers/Admin/LinkControllerTest.php b/tests/Feature/Controllers/Admin/LinkControllerTest.php index 7cb7a1d2ee..045cf02340 100644 --- a/tests/Feature/Controllers/Admin/LinkControllerTest.php +++ b/tests/Feature/Controllers/Admin/LinkControllerTest.php @@ -50,7 +50,7 @@ class LinkControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Admin\LinkController::__construct * @covers \FireflyIII\Http\Controllers\Admin\LinkController::create */ - public function testCreate() + public function testCreate(): void { $this->be($this->user()); @@ -61,7 +61,7 @@ class LinkControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Admin\LinkController::delete */ - public function testDeleteEditable() + public function testDeleteEditable(): void { $repository = $this->mock(LinkTypeRepositoryInterface::class); // create editable link type just in case: @@ -78,7 +78,7 @@ class LinkControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Admin\LinkController::delete */ - public function testDeleteNonEditable() + public function testDeleteNonEditable(): void { $repository = $this->mock(LinkTypeRepositoryInterface::class); $linkType = LinkType::where('editable', 0)->first(); @@ -91,7 +91,7 @@ class LinkControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Admin\LinkController::destroy */ - public function testDestroy() + public function testDestroy(): void { $repository = $this->mock(LinkTypeRepositoryInterface::class); @@ -111,7 +111,7 @@ class LinkControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Admin\LinkController::edit */ - public function testEditEditable() + public function testEditEditable(): void { // create editable link type just in case: LinkType::create(['editable' => 1, 'inward' => 'hello Y', 'outward' => 'bye Y', 'name' => 'Test type Y']); @@ -125,7 +125,7 @@ class LinkControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Admin\LinkController::edit */ - public function testEditNonEditable() + public function testEditNonEditable(): void { $linkType = LinkType::where('editable', 0)->first(); $this->be($this->user()); @@ -137,7 +137,7 @@ class LinkControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Admin\LinkController::index */ - public function testIndex() + public function testIndex(): void { $linkTypes = LinkType::inRandomOrder()->take(3)->get(); $repository = $this->mock(LinkTypeRepositoryInterface::class); @@ -151,7 +151,7 @@ class LinkControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Admin\LinkController::show */ - public function testShow() + public function testShow(): void { $linkType = LinkType::first(); $this->be($this->user()); @@ -163,7 +163,7 @@ class LinkControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Admin\LinkController::store * @covers \FireflyIII\Http\Requests\LinkTypeFormRequest */ - public function testStore() + public function testStore(): void { $repository = $this->mock(LinkTypeRepositoryInterface::class); $data = [ @@ -185,7 +185,7 @@ class LinkControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Admin\LinkController::store * @covers \FireflyIII\Http\Requests\LinkTypeFormRequest */ - public function testStoreRedirect() + public function testStoreRedirect(): void { $repository = $this->mock(LinkTypeRepositoryInterface::class); $data = [ @@ -206,7 +206,7 @@ class LinkControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Admin\LinkController::update * @covers \FireflyIII\Http\Requests\LinkTypeFormRequest */ - public function testUpdate() + public function testUpdate(): void { $repository = $this->mock(LinkTypeRepositoryInterface::class); @@ -230,7 +230,7 @@ class LinkControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Admin\LinkController::update * @covers \FireflyIII\Http\Requests\LinkTypeFormRequest */ - public function testUpdateNonEditable() + public function testUpdateNonEditable(): void { $repository = $this->mock(LinkTypeRepositoryInterface::class); $linkType = LinkType::where('editable', 0)->first(); @@ -252,7 +252,7 @@ class LinkControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Admin\LinkController::update * @covers \FireflyIII\Http\Requests\LinkTypeFormRequest */ - public function testUpdateRedirect() + public function testUpdateRedirect(): void { $repository = $this->mock(LinkTypeRepositoryInterface::class); // create editable link type just in case: diff --git a/tests/Feature/Controllers/Admin/UpdateControllerTest.php b/tests/Feature/Controllers/Admin/UpdateControllerTest.php index 0f91b2f1bf..4bc08784c2 100644 --- a/tests/Feature/Controllers/Admin/UpdateControllerTest.php +++ b/tests/Feature/Controllers/Admin/UpdateControllerTest.php @@ -54,7 +54,7 @@ class UpdateControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Admin\UpdateController::index * @covers \FireflyIII\Http\Controllers\Admin\UpdateController::__construct */ - public function testIndex() + public function testIndex(): void { $this->be($this->user()); @@ -77,7 +77,7 @@ class UpdateControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Admin\UpdateController::post */ - public function testPost() + public function testPost(): void { $falseConfig = new Configuration; $falseConfig->data = false; @@ -95,7 +95,7 @@ class UpdateControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Admin\UpdateController::updateCheck */ - public function testUpdateCheck() + public function testUpdateCheck(): void { $falseConfig = new Configuration; $falseConfig->data = false; @@ -124,7 +124,7 @@ class UpdateControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Admin\UpdateController::updateCheck */ - public function testUpdateCheckCurrent() + public function testUpdateCheckCurrent(): void { $falseConfig = new Configuration; $falseConfig->data = false; @@ -151,7 +151,7 @@ class UpdateControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Admin\UpdateController::updateCheck */ - public function testUpdateCheckError() + public function testUpdateCheckError(): void { $falseConfig = new Configuration; $falseConfig->data = false; @@ -174,7 +174,7 @@ class UpdateControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Admin\UpdateController::updateCheck */ - public function testUpdateCheckNewer() + public function testUpdateCheckNewer(): void { $falseConfig = new Configuration; $falseConfig->data = false; diff --git a/tests/Feature/Controllers/Admin/UserControllerTest.php b/tests/Feature/Controllers/Admin/UserControllerTest.php index 9a26fb2e64..36c1bb35d2 100644 --- a/tests/Feature/Controllers/Admin/UserControllerTest.php +++ b/tests/Feature/Controllers/Admin/UserControllerTest.php @@ -48,7 +48,7 @@ class UserControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Admin\UserController::delete */ - public function testDelete() + public function testDelete(): void { $this->be($this->user()); $response = $this->get(route('admin.users.delete', [1])); @@ -60,7 +60,7 @@ class UserControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Admin\UserController::destroy */ - public function testDestroy() + public function testDestroy(): void { $repository = $this->mock(UserRepositoryInterface::class); $repository->shouldReceive('destroy')->once(); @@ -73,7 +73,7 @@ class UserControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Admin\UserController::edit */ - public function testEdit() + public function testEdit(): void { $this->be($this->user()); $response = $this->get(route('admin.users.edit', [1])); @@ -86,7 +86,7 @@ class UserControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Admin\UserController::index * @covers \FireflyIII\Http\Controllers\Admin\UserController::__construct */ - public function testIndex() + public function testIndex(): void { $repository = $this->mock(UserRepositoryInterface::class); $user = $this->user(); @@ -102,7 +102,7 @@ class UserControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Admin\UserController::show */ - public function testShow() + public function testShow(): void { $repository = $this->mock(UserRepositoryInterface::class); $repository->shouldReceive('getUserData')->andReturn( @@ -123,7 +123,7 @@ class UserControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Admin\UserController::update */ - public function testUpdate() + public function testUpdate(): void { $repository = $this->mock(UserRepositoryInterface::class); $repository->shouldReceive('changePassword')->once(); diff --git a/tests/Feature/Controllers/AttachmentControllerTest.php b/tests/Feature/Controllers/AttachmentControllerTest.php index 117f0d6e2d..8b96a9ab78 100644 --- a/tests/Feature/Controllers/AttachmentControllerTest.php +++ b/tests/Feature/Controllers/AttachmentControllerTest.php @@ -22,9 +22,11 @@ declare(strict_types=1); namespace Tests\Feature\Controllers; +use FireflyIII\Models\Attachment; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Attachment\AttachmentRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use Illuminate\Support\Collection; use Log; use Tests\TestCase; @@ -46,11 +48,10 @@ class AttachmentControllerTest extends TestCase Log::debug(sprintf('Now in %s.', \get_class($this))); } - /** * @covers \FireflyIII\Http\Controllers\AttachmentController::delete */ - public function testDelete() + public function testDelete(): void { // mock stuff $attachRepository = $this->mock(AttachmentRepositoryInterface::class); @@ -66,7 +67,7 @@ class AttachmentControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\AttachmentController::destroy */ - public function testDestroy() + public function testDestroy(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -84,7 +85,7 @@ class AttachmentControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\AttachmentController::download */ - public function testDownload() + public function testDownload(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -104,7 +105,7 @@ class AttachmentControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\AttachmentController::download * @expectedExceptionMessage Could not find the indicated attachment */ - public function testDownloadFail() + public function testDownloadFail(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -120,7 +121,7 @@ class AttachmentControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\AttachmentController::edit */ - public function testEdit() + public function testEdit(): void { $attachRepository = $this->mock(AttachmentRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -133,10 +134,27 @@ class AttachmentControllerTest extends TestCase $response->assertSee('
              '); } + /** + * @covers \FireflyIII\Http\Controllers\AttachmentController + */ + public function testIndex() + { + $repository = $this->mock(AttachmentRepositoryInterface::class); + $repository->shouldReceive('get')->andReturn(new Collection([Attachment::first()]))->once(); + $repository->shouldReceive('exists')->andReturn(true)->once(); + + $this->be($this->user()); + $response = $this->get(route('attachments.index')); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                '); + + } + /** * @covers \FireflyIII\Http\Controllers\AttachmentController::update */ - public function testUpdate() + public function testUpdate(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -161,7 +179,7 @@ class AttachmentControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\AttachmentController::view * @covers \FireflyIII\Http\Controllers\AttachmentController::__construct */ - public function testView() + public function testView(): void { $repository = $this->mock(AttachmentRepositoryInterface::class); $repository->shouldReceive('exists')->once()->andReturn(true); @@ -178,7 +196,7 @@ class AttachmentControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\AttachmentController::view * @covers \FireflyIII\Http\Controllers\AttachmentController::__construct */ - public function testViewFail() + public function testViewFail(): void { $repository = $this->mock(AttachmentRepositoryInterface::class); $repository->shouldReceive('exists')->once()->andReturn(false); diff --git a/tests/Feature/Controllers/Auth/ForgotPasswordControllerTest.php b/tests/Feature/Controllers/Auth/ForgotPasswordControllerTest.php index d4b03348ad..c12dc98fbc 100644 --- a/tests/Feature/Controllers/Auth/ForgotPasswordControllerTest.php +++ b/tests/Feature/Controllers/Auth/ForgotPasswordControllerTest.php @@ -48,7 +48,7 @@ class ForgotPasswordControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Auth\ForgotPasswordController::__construct * @covers \FireflyIII\Http\Controllers\Auth\ForgotPasswordController::sendResetLinkEmail */ - public function testSendResetLinkEmail() + public function testSendResetLinkEmail(): void { $repository = $this->mock(UserRepositoryInterface::class); @@ -65,7 +65,7 @@ class ForgotPasswordControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Auth\ForgotPasswordController::__construct * @covers \FireflyIII\Http\Controllers\Auth\ForgotPasswordController::sendResetLinkEmail */ - public function testSendResetLinkEmailDemo() + public function testSendResetLinkEmailDemo(): void { $repository = $this->mock(UserRepositoryInterface::class); $repository->shouldReceive('hasRole')->andReturn(true)->once(); diff --git a/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php b/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php index 32863de11f..3caa680ce0 100644 --- a/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php +++ b/tests/Feature/Controllers/Auth/TwoFactorControllerTest.php @@ -49,7 +49,7 @@ class TwoFactorControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Auth\TwoFactorController::index */ - public function testIndex() + public function testIndex(): void { $this->be($this->user()); @@ -72,7 +72,7 @@ class TwoFactorControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Auth\TwoFactorController::index */ - public function testIndexNo2FA() + public function testIndexNo2FA(): void { $this->be($this->user()); @@ -95,7 +95,7 @@ class TwoFactorControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Auth\TwoFactorController::index * @expectedExceptionMessage Your two factor authentication secret is empty */ - public function testIndexNoSecret() + public function testIndexNoSecret(): void { $this->be($this->user()); @@ -118,7 +118,7 @@ class TwoFactorControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Auth\TwoFactorController::lostTwoFactor */ - public function testLostTwoFactor() + public function testLostTwoFactor(): void { $this->be($this->user()); @@ -141,7 +141,7 @@ class TwoFactorControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Auth\TwoFactorController::postIndex */ - public function testPostIndex() + public function testPostIndex(): void { $data = ['code' => '123456']; Google2FA::shouldReceive('verifyKey')->andReturn(true)->once(); diff --git a/tests/Feature/Controllers/BillControllerTest.php b/tests/Feature/Controllers/BillControllerTest.php index 3fe1dc4562..5892a60dfc 100644 --- a/tests/Feature/Controllers/BillControllerTest.php +++ b/tests/Feature/Controllers/BillControllerTest.php @@ -26,13 +26,18 @@ use Carbon\Carbon; use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Models\Bill; +use FireflyIII\Models\Rule; +use FireflyIII\Models\RuleGroup; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Bill\BillRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; +use FireflyIII\TransactionRules\TransactionMatcher; use Illuminate\Pagination\LengthAwarePaginator; use Illuminate\Support\Collection; use Illuminate\Support\MessageBag; use Log; +use Mockery; use Tests\TestCase; /** @@ -57,11 +62,12 @@ class BillControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\BillController::create */ - public function testCreate() + public function testCreate(): void { // mock stuff $attachHelper = $this->mock(AttachmentHelperInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $ruleGroupRepos =$this->mock(RuleGroupRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $this->be($this->user()); @@ -74,11 +80,12 @@ class BillControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\BillController::delete */ - public function testDelete() + public function testDelete(): void { // mock stuff $attachHelper = $this->mock(AttachmentHelperInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $ruleGroupRepos =$this->mock(RuleGroupRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $this->be($this->user()); @@ -91,12 +98,13 @@ class BillControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\BillController::destroy */ - public function testDestroy() + public function testDestroy(): void { // mock stuff $attachHelper = $this->mock(AttachmentHelperInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $repository = $this->mock(BillRepositoryInterface::class); + $ruleGroupRepos =$this->mock(RuleGroupRepositoryInterface::class); $repository->shouldReceive('destroy')->andReturn(true); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); @@ -110,11 +118,12 @@ class BillControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\BillController::edit */ - public function testEdit() + public function testEdit(): void { // mock stuff $attachHelper = $this->mock(AttachmentHelperInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $ruleGroupRepos =$this->mock(RuleGroupRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $this->be($this->user()); @@ -128,13 +137,14 @@ class BillControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\BillController::index * @covers \FireflyIII\Http\Controllers\BillController::__construct */ - public function testIndex() + public function testIndex(): void { // mock stuff $attachHelper = $this->mock(AttachmentHelperInterface::class); $bill = factory(Bill::class)->make(); $journalRepos = $this->mock(JournalRepositoryInterface::class); $repository = $this->mock(BillRepositoryInterface::class); + $ruleGroupRepos =$this->mock(RuleGroupRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $collection = new Collection([$bill]); $repository->shouldReceive('getPaginator')->andReturn(new LengthAwarePaginator($collection, 1, 50))->once(); @@ -153,15 +163,27 @@ class BillControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\BillController::rescan */ - public function testRescan() + public function testRescan(): void { // mock stuff + $rule = Rule::first(); $attachHelper = $this->mock(AttachmentHelperInterface::class); $journal = factory(TransactionJournal::class)->make(); $journalRepos = $this->mock(JournalRepositoryInterface::class); $repository = $this->mock(BillRepositoryInterface::class); + $ruleGroupRepos =$this->mock(RuleGroupRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $repository->shouldReceive('getRulesForBill')->andReturn(new Collection); + $repository->shouldReceive('getRulesForBill')->andReturn(new Collection([$rule])); + + //calls for transaction matcher: + $matcher = $this->mock(TransactionMatcher::class); + $matcher->shouldReceive('setLimit')->once()->withArgs([100000]); + $matcher->shouldReceive('setRange')->once()->withArgs([100000]); + $matcher->shouldReceive('setRule')->once()->withArgs([Mockery::any()]); + $matcher->shouldReceive('findTransactionsByRule')->once()->andReturn(new Collection); + + $repository->shouldReceive('linkCollectionToBill')->once(); + $this->be($this->user()); $response = $this->get(route('bills.rescan', [1])); $response->assertStatus(302); @@ -171,12 +193,13 @@ class BillControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\BillController::rescan */ - public function testRescanInactive() + public function testRescanInactive(): void { // mock stuff $attachHelper = $this->mock(AttachmentHelperInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $repository = $this->mock(BillRepositoryInterface::class); + $ruleGroupRepos =$this->mock(RuleGroupRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $this->be($this->user()); @@ -188,13 +211,14 @@ class BillControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\BillController::show */ - public function testShow() + public function testShow(): void { // mock stuff $attachHelper = $this->mock(AttachmentHelperInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $collector = $this->mock(JournalCollectorInterface::class); $repository = $this->mock(BillRepositoryInterface::class); + $ruleGroupRepos =$this->mock(RuleGroupRepositoryInterface::class); $repository->shouldReceive('getYearAverage')->andReturn('0'); $repository->shouldReceive('getOverallAverage')->andReturn('0'); $repository->shouldReceive('nextExpectedMatch')->andReturn(new Carbon); @@ -223,17 +247,19 @@ class BillControllerTest extends TestCase * @covers \FireflyIII\Http\Requests\BillFormRequest * @covers \FireflyIII\Http\Requests\Request */ - public function testStore() + public function testStore(): void { // mock stuff $attachHelper = $this->mock(AttachmentHelperInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $repository = $this->mock(BillRepositoryInterface::class); + $ruleGroupRepos =$this->mock(RuleGroupRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('store')->andReturn(new Bill); $attachHelper->shouldReceive('saveAttachmentsForModel'); $attachHelper->shouldReceive('getMessages')->andReturn(new MessageBag); - + $ruleGroupRepos->shouldReceive('count')->andReturn(1); + $ruleGroupRepos->shouldReceive('getActiveGroups')->andReturn(new Collection([RuleGroup::first()]))->once(); $data = [ 'name' => 'New Bill ' . random_int(1000, 9999), 'amount_min' => '100', @@ -252,30 +278,137 @@ class BillControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\BillController::update + * @covers \FireflyIII\Http\Controllers\BillController::store * @covers \FireflyIII\Http\Requests\BillFormRequest * @covers \FireflyIII\Http\Requests\Request */ - public function testUpdate() + public function testStoreCreateAnother(): void { // mock stuff $attachHelper = $this->mock(AttachmentHelperInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $repository = $this->mock(BillRepositoryInterface::class); + $ruleGroupRepos =$this->mock(RuleGroupRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $repository->shouldReceive('store')->andReturn(new Bill); + $attachHelper->shouldReceive('saveAttachmentsForModel'); + $attachHelper->shouldReceive('getMessages')->andReturn(new MessageBag); + $ruleGroupRepos->shouldReceive('count')->andReturn(1); + $ruleGroupRepos->shouldReceive('getActiveGroups')->andReturn(new Collection([RuleGroup::first()]))->once(); + + $data = [ + 'name' => 'New Bill ' . random_int(1000, 9999), + 'amount_min' => '100', + 'transaction_currency_id' => 1, + 'skip' => 0, + 'create_another' => '1', + 'strict' => 1, + 'amount_max' => '100', + 'date' => '2016-01-01', + 'repeat_freq' => 'monthly', + ]; + $this->session(['bills.create.uri' => 'http://localhost']); + $this->be($this->user()); + $response = $this->post(route('bills.store'), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + + /** + * @covers \FireflyIII\Http\Controllers\BillController::store + * @covers \FireflyIII\Http\Requests\BillFormRequest + * @covers \FireflyIII\Http\Requests\Request + */ + public function testStoreNoGroup(): void + { + // mock stuff + $attachHelper = $this->mock(AttachmentHelperInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(BillRepositoryInterface::class); + $ruleGroupRepos =$this->mock(RuleGroupRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $repository->shouldReceive('store')->andReturn(new Bill); + $attachHelper->shouldReceive('saveAttachmentsForModel'); + $attachHelper->shouldReceive('getMessages')->andReturn(new MessageBag); + $ruleGroupRepos->shouldReceive('count')->andReturn(0); + $ruleGroupRepos->shouldReceive('store')->once()->withArgs([['title' => 'Rule group for bills','description'=> 'A special rule group for all the rules that involve bills.']])->andReturn(RuleGroup::first()); + + $data = [ + 'name' => 'New Bill ' . random_int(1000, 9999), + 'amount_min' => '100', + 'transaction_currency_id' => 1, + 'skip' => 0, + 'create_another' => '1', + 'strict' => 1, + 'amount_max' => '100', + 'date' => '2016-01-01', + 'repeat_freq' => 'monthly', + ]; + $this->session(['bills.create.uri' => 'http://localhost']); + $this->be($this->user()); + $response = $this->post(route('bills.store'), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + + /** + * @covers \FireflyIII\Http\Controllers\BillController::store + * @covers \FireflyIII\Http\Requests\BillFormRequest + * @covers \FireflyIII\Http\Requests\Request + */ + public function testStoreError(): void + { + // mock stuff + $attachHelper = $this->mock(AttachmentHelperInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(BillRepositoryInterface::class); + $ruleGroupRepos =$this->mock(RuleGroupRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $repository->shouldReceive('store')->andReturn(null); + + $data = [ + 'name' => 'New Bill ' . random_int(1000, 9999), + 'amount_min' => '100', + 'transaction_currency_id' => 1, + 'skip' => 0, + 'strict' => 1, + 'amount_max' => '100', + 'date' => '2016-01-01', + 'repeat_freq' => 'monthly', + ]; + $this->be($this->user()); + $response = $this->post(route('bills.store'), $data); + $response->assertStatus(302); + $response->assertSessionHas('error'); + $response->assertRedirect(route('bills.create')); + } + + /** + * @covers \FireflyIII\Http\Controllers\BillController::update + * @covers \FireflyIII\Http\Requests\BillFormRequest + * @covers \FireflyIII\Http\Requests\Request + */ + public function testUpdate(): void + { + // mock stuff + $attachHelper = $this->mock(AttachmentHelperInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository = $this->mock(BillRepositoryInterface::class); + $ruleGroupRepos =$this->mock(RuleGroupRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('update')->andReturn(new Bill); $attachHelper->shouldReceive('saveAttachmentsForModel'); $attachHelper->shouldReceive('getMessages')->andReturn(new MessageBag); $data = [ - 'id' => 1, - 'name' => 'Updated Bill ' . random_int(1000, 9999), - 'amount_min' => '100', + 'id' => 1, + 'name' => 'Updated Bill ' . random_int(1000, 9999), + 'amount_min' => '100', 'transaction_currency_id' => 1, - 'skip' => 0, - 'amount_max' => '100', - 'date' => '2016-01-01', - 'repeat_freq' => 'monthly', + 'skip' => 0, + 'amount_max' => '100', + 'date' => '2016-01-01', + 'repeat_freq' => 'monthly', ]; $this->session(['bills.edit.uri' => 'http://localhost']); $this->be($this->user()); diff --git a/tests/Feature/Controllers/BudgetControllerTest.php b/tests/Feature/Controllers/BudgetControllerTest.php index b509ac69bb..555ce40fdd 100644 --- a/tests/Feature/Controllers/BudgetControllerTest.php +++ b/tests/Feature/Controllers/BudgetControllerTest.php @@ -57,8 +57,9 @@ class BudgetControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\BudgetController::amount */ - public function testAmount() + public function testAmount(): void { + Log::debug('Now in testAmount()'); // mock stuff $repository = $this->mock(BudgetRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -77,8 +78,31 @@ class BudgetControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\BudgetController::amount */ - public function testAmountZero() + public function testAmountLargeDiff(): void { + Log::debug('Now in testAmount()'); + // mock stuff + $repository = $this->mock(BudgetRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $repository->shouldReceive('updateLimitAmount')->andReturn(new BudgetLimit); + $repository->shouldReceive('spentInPeriod')->andReturn('0'); + $repository->shouldReceive('budgetedPerDay')->andReturn('10'); + + + $data = ['amount' => 20000, 'start' => '2017-01-01', 'end' => '2017-01-31']; + $this->be($this->user()); + $response = $this->post(route('budgets.amount', [1]), $data); + $response->assertStatus(200); + $response->assertSee('Normally you budget about \u20ac10.00 per day.'); + } + + /** + * @covers \FireflyIII\Http\Controllers\BudgetController::amount + */ + public function testAmountZero(): void + { + Log::debug('Now in testAmountZero()'); // mock stuff $repository = $this->mock(BudgetRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -93,11 +117,35 @@ class BudgetControllerTest extends TestCase $response->assertStatus(200); } + /** + * @covers \FireflyIII\Http\Controllers\BudgetController::amount + */ + public function testAmountOutOfRange(): void + { + Log::debug('Now in testAmountOutOfRange()'); + // mock stuff + $repository = $this->mock(BudgetRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $repository->shouldReceive('updateLimitAmount')->andReturn(new BudgetLimit); + $repository->shouldReceive('spentInPeriod')->andReturn('0'); + $repository->shouldReceive('budgetedPerDay')->andReturn('10'); + + $today = new Carbon; + $start = $today->startOfMonth()->format('Y-m-d'); + $end = $today->endOfMonth()->format('Y-m-d'); + $data = ['amount' => 200, 'start' => $start, 'end' => $end]; + $this->be($this->user()); + $response = $this->post(route('budgets.amount', [1]), $data); + $response->assertStatus(200); + } + /** * @covers \FireflyIII\Http\Controllers\BudgetController::create */ - public function testCreate() + public function testCreate(): void { + Log::debug('Now in testCreate()'); // mock stuff $repository = $this->mock(BudgetRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -113,8 +161,9 @@ class BudgetControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\BudgetController::delete */ - public function testDelete() + public function testDelete(): void { + Log::debug('Now in testDelete()'); // mock stuff $repository = $this->mock(BudgetRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -130,8 +179,9 @@ class BudgetControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\BudgetController::destroy */ - public function testDestroy() + public function testDestroy(): void { + Log::debug('Now in testDestroy()'); // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); $repository = $this->mock(BudgetRepositoryInterface::class); @@ -149,8 +199,9 @@ class BudgetControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\BudgetController::edit */ - public function testEdit() + public function testEdit(): void { + Log::debug('Now in testEdit()'); // mock stuff $repository = $this->mock(BudgetRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -170,8 +221,9 @@ class BudgetControllerTest extends TestCase * * @param string $range */ - public function testIndex(string $range) + public function testIndex(string $range): void { + Log::debug(sprintf('Now in testIndex(%s)', $range)); // mock stuff $budget = factory(Budget::class)->make(); $budgetLimit = factory(BudgetLimit::class)->make(); @@ -209,6 +261,7 @@ class BudgetControllerTest extends TestCase $response->assertSee('
                  '); } + /** * @covers \FireflyIII\Http\Controllers\BudgetController::index * @covers \FireflyIII\Http\Controllers\BudgetController::__construct @@ -216,8 +269,9 @@ class BudgetControllerTest extends TestCase * * @param string $range */ - public function testIndexWithDate(string $range) + public function testIndexWithDate(string $range): void { + Log::debug(sprintf('Now in testIndexWithDate(%s)', $range)); // mock stuff $budget = factory(Budget::class)->make(); $budgetLimit = factory(BudgetLimit::class)->make(); @@ -255,6 +309,8 @@ class BudgetControllerTest extends TestCase $response->assertSee('
                    '); } + + /** * @covers \FireflyIII\Http\Controllers\BudgetController::index * @covers \FireflyIII\Http\Controllers\BudgetController::__construct @@ -262,8 +318,58 @@ class BudgetControllerTest extends TestCase * * @param string $range */ - public function testIndexWithInvalidDate(string $range) + public function testIndexOutOfRange(string $range): void { + Log::debug(sprintf('Now in testIndexOutOfRange(%s)', $range)); + // mock stuff + $budget = factory(Budget::class)->make(); + $budgetLimit = factory(BudgetLimit::class)->make(); + $budgetInfo = [ + $budget->id => [ + 'spent' => '0', + 'budgeted' => '0', + 'currentRep' => false, + ], + ]; + + // set budget limit to current month: + $budgetLimit->start_date = Carbon::now()->startOfMonth(); + $budgetLimit->end_date = Carbon::now()->endOfMonth(); + + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $repository = $this->mock(BudgetRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection); + + $repository->shouldReceive('cleanupBudgets'); + $repository->shouldReceive('getActiveBudgets')->andReturn(new Collection([$budget])); + $repository->shouldReceive('getInactiveBudgets')->andReturn(new Collection); + $repository->shouldReceive('getAvailableBudget')->andReturn('100.123'); + $repository->shouldReceive('spentInPeriod')->andReturn('-1'); + $repository->shouldReceive('getBudgetLimits')->andReturn(new Collection([$budgetLimit])); + $repository->shouldReceive('collectBudgetInformation')->andReturn($budgetInfo); + + $this->be($this->user()); + $today = new Carbon; + $today->startOfMonth(); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('budgets.index', [$today->format('Y-m-d')])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                      '); + } + + /** + * @covers \FireflyIII\Http\Controllers\BudgetController::index + * @covers \FireflyIII\Http\Controllers\BudgetController::__construct + * @dataProvider dateRangeProvider + * + * @param string $range + */ + public function testIndexWithInvalidDate(string $range): void + { + Log::debug(sprintf('Now in testIndexWithInvalidDate(%s)', $range)); // mock stuff $budget = factory(Budget::class)->make(); $budgetLimit = factory(BudgetLimit::class)->make(); @@ -304,8 +410,9 @@ class BudgetControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\BudgetController::infoIncome */ - public function testInfoIncome() + public function testInfoIncome(): void { + Log::debug('Now in testInfoIncome()'); // mock stuff $accountRepos = $this->mock(AccountRepositoryInterface::class); $repository = $this->mock(BudgetRepositoryInterface::class); @@ -325,8 +432,9 @@ class BudgetControllerTest extends TestCase * * @param string $range */ - public function testInfoIncomeExpanded(string $range) + public function testInfoIncomeExpanded(string $range): void { + Log::debug(sprintf('Now in testInfoIncomeExpanded(%s)', $range)); // mock stuff $accountRepos = $this->mock(AccountRepositoryInterface::class); $repository = $this->mock(BudgetRepositoryInterface::class); @@ -348,13 +456,15 @@ class BudgetControllerTest extends TestCase * @param string $range * */ - public function testNoBudget(string $range) + public function testNoBudget(string $range): void { + Log::debug(sprintf('Now in testNoBudget(%s)', $range)); + // mock stuff $repository = $this->mock(BudgetRepositoryInterface::class); $collector = $this->mock(JournalCollectorInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->andReturn(TransactionJournal::first()); + $journalRepos->shouldReceive('firstNull')->andReturn(null); $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf(); @@ -383,13 +493,14 @@ class BudgetControllerTest extends TestCase * * @param string $range */ - public function testNoBudgetAll(string $range) + public function testNoBudgetAll(string $range): void { + Log::debug(sprintf('Now in testNoBudgetAll(%s)', $range)); // mock stuff $repository = $this->mock(BudgetRepositoryInterface::class); $collector = $this->mock(JournalCollectorInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->andReturn(TransactionJournal::first()); + $journalRepos->shouldReceive('firstNull')->andReturn(null); $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf(); @@ -420,13 +531,14 @@ class BudgetControllerTest extends TestCase * * @param string $range */ - public function testNoBudgetDate(string $range) + public function testNoBudgetDate(string $range): void { + Log::debug(sprintf('Now in testNoBudgetDate(%s)', $range)); // mock stuff $repository = $this->mock(BudgetRepositoryInterface::class); $collector = $this->mock(JournalCollectorInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->andReturn(TransactionJournal::first()); + $journalRepos->shouldReceive('firstNull')->andReturn(null); $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); $collector->shouldReceive('setRange')->andReturnSelf(); @@ -452,8 +564,9 @@ class BudgetControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\BudgetController::postUpdateIncome */ - public function testPostUpdateIncome() + public function testPostUpdateIncome(): void { + Log::debug('Now in testPostUpdateIncome()'); // mock stuff $repository = $this->mock(BudgetRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -474,8 +587,9 @@ class BudgetControllerTest extends TestCase * * @param string $range */ - public function testShow(string $range) + public function testShow(string $range): void { + Log::debug(sprintf('Now in testShow(%s)', $range)); // mock stuff $budgetLimit = factory(BudgetLimit::class)->make(); @@ -514,8 +628,9 @@ class BudgetControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\BudgetController::showByBudgetLimit * @expectedExceptionMessage This budget limit is not part of */ - public function testShowByBadBudgetLimit() + public function testShowByBadBudgetLimit(): void { + Log::debug('Now in testShowByBadBudgetLimit()'); // mock stuff $repository = $this->mock(BudgetRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -532,8 +647,9 @@ class BudgetControllerTest extends TestCase * * @param string $range */ - public function testShowByBudgetLimit(string $range) + public function testShowByBudgetLimit(string $range): void { + Log::debug(sprintf('Now in testShowByBudgetLimit(%s)', $range)); // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); @@ -568,8 +684,9 @@ class BudgetControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\BudgetController::store */ - public function testStore() + public function testStore(): void { + Log::debug('Now in testStore()'); // mock stuff $budget = factory(Budget::class)->make(); $repository = $this->mock(BudgetRepositoryInterface::class); @@ -593,8 +710,9 @@ class BudgetControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\BudgetController::update */ - public function testUpdate() + public function testUpdate(): void { + Log::debug('Now in testUpdate()'); // mock stuff $budget = factory(Budget::class)->make(); $repository = $this->mock(BudgetRepositoryInterface::class); @@ -619,8 +737,9 @@ class BudgetControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\BudgetController::updateIncome */ - public function testUpdateIncome() + public function testUpdateIncome(): void { + Log::debug('Now in testUpdateIncome()'); // must be in list $this->be($this->user()); diff --git a/tests/Feature/Controllers/CategoryControllerTest.php b/tests/Feature/Controllers/CategoryControllerTest.php index 11f2218bbb..cbd8229807 100644 --- a/tests/Feature/Controllers/CategoryControllerTest.php +++ b/tests/Feature/Controllers/CategoryControllerTest.php @@ -58,7 +58,7 @@ class CategoryControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\CategoryController::create */ - public function testCreate() + public function testCreate(): void { // mock stuff $categoryRepos = $this->mock(CategoryRepositoryInterface::class); @@ -76,7 +76,7 @@ class CategoryControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\CategoryController::delete */ - public function testDelete() + public function testDelete(): void { // mock stuff $categoryRepos = $this->mock(CategoryRepositoryInterface::class); @@ -94,7 +94,7 @@ class CategoryControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\CategoryController::destroy */ - public function testDestroy() + public function testDestroy(): void { // mock stuff $categoryRepos = $this->mock(CategoryRepositoryInterface::class); @@ -114,7 +114,7 @@ class CategoryControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\CategoryController::edit */ - public function testEdit() + public function testEdit(): void { // mock stuff $categoryRepos = $this->mock(CategoryRepositoryInterface::class); @@ -133,7 +133,7 @@ class CategoryControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\CategoryController::index * @covers \FireflyIII\Http\Controllers\CategoryController::__construct */ - public function testIndex() + public function testIndex(): void { // mock stuff $category = factory(Category::class)->make(); @@ -158,7 +158,7 @@ class CategoryControllerTest extends TestCase * * @param string $range */ - public function testNoCategory(string $range) + public function testNoCategory(string $range): void { // mock stuff $collector = $this->mock(JournalCollectorInterface::class); @@ -195,7 +195,7 @@ class CategoryControllerTest extends TestCase * @param string $range * */ - public function testNoCategoryAll(string $range) + public function testNoCategoryAll(string $range): void { // mock stuff $collector = $this->mock(JournalCollectorInterface::class); @@ -231,7 +231,7 @@ class CategoryControllerTest extends TestCase * * @param string $range */ - public function testNoCategoryDate(string $range) + public function testNoCategoryDate(string $range): void { // mock stuff $collector = $this->mock(JournalCollectorInterface::class); @@ -275,7 +275,7 @@ class CategoryControllerTest extends TestCase * * @param string $range */ - public function testShow(string $range) + public function testShow(string $range): void { $transaction = factory(Transaction::class)->make(); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); @@ -324,7 +324,7 @@ class CategoryControllerTest extends TestCase * * @param string $range */ - public function testShowAll(string $range) + public function testShowAll(string $range): void { // mock stuff $transaction = factory(Transaction::class)->make(); @@ -362,7 +362,7 @@ class CategoryControllerTest extends TestCase * * @param string $range */ - public function testShowByDate(string $range) + public function testShowByDate(string $range): void { // mock stuff $transaction = factory(Transaction::class)->make(); @@ -370,7 +370,10 @@ class CategoryControllerTest extends TestCase $accountRepos = $this->mock(AccountRepositoryInterface::class); $collector = $this->mock(JournalCollectorInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->twice()->andReturn(TransactionJournal::first()); + $month = new Carbon(); + $month->startOfMonth(); + $journal = TransactionJournal::where('date', '>=', $month->format('Y-m-d') . ' 00:00:00')->first(); + $journalRepos->shouldReceive('firstNull')->twice()->andReturn($journal); $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection); @@ -407,7 +410,7 @@ class CategoryControllerTest extends TestCase * * @param string $range */ - public function testShowEmpty(string $range) + public function testShowEmpty(string $range): void { $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->twice()->andReturn(TransactionJournal::first()); @@ -446,7 +449,7 @@ class CategoryControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\CategoryController::store * @covers \FireflyIII\Http\Requests\CategoryFormRequest */ - public function testStore() + public function testStore(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $repository = $this->mock(CategoryRepositoryInterface::class); @@ -470,7 +473,7 @@ class CategoryControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\CategoryController::update * @covers \FireflyIII\Http\Requests\CategoryFormRequest */ - public function testUpdate() + public function testUpdate(): void { $category = Category::first(); $repository = $this->mock(CategoryRepositoryInterface::class); diff --git a/tests/Feature/Controllers/Chart/AccountControllerTest.php b/tests/Feature/Controllers/Chart/AccountControllerTest.php index 0a199b7e47..a06bbad564 100644 --- a/tests/Feature/Controllers/Chart/AccountControllerTest.php +++ b/tests/Feature/Controllers/Chart/AccountControllerTest.php @@ -66,7 +66,7 @@ class AccountControllerTest extends TestCase * * @param string $range */ - public function testExpenseAccounts(string $range) + public function testExpenseAccounts(string $range): void { $account = factory(Account::class)->make(); $generator = $this->mock(GeneratorInterface::class); @@ -90,7 +90,7 @@ class AccountControllerTest extends TestCase * * @param string $range */ - public function testExpenseBudget(string $range) + public function testExpenseBudget(string $range): void { $generator = $this->mock(GeneratorInterface::class); $collector = $this->mock(JournalCollectorInterface::class); @@ -118,7 +118,7 @@ class AccountControllerTest extends TestCase * * @param string $range */ - public function testExpenseBudgetAll(string $range) + public function testExpenseBudgetAll(string $range): void { $generator = $this->mock(GeneratorInterface::class); $collector = $this->mock(JournalCollectorInterface::class); @@ -148,7 +148,7 @@ class AccountControllerTest extends TestCase * * @param string $range */ - public function testExpenseCategory(string $range) + public function testExpenseCategory(string $range): void { $transaction = factory(Transaction::class)->make(); $category = factory(Category::class)->make(); @@ -177,7 +177,7 @@ class AccountControllerTest extends TestCase * * @param string $range */ - public function testExpenseCategoryAll(string $range) + public function testExpenseCategoryAll(string $range): void { $transaction = factory(Transaction::class)->make(); $category = factory(Category::class)->make(); @@ -210,7 +210,7 @@ class AccountControllerTest extends TestCase * * @param string $range */ - public function testFrontpage(string $range) + public function testFrontpage(string $range): void { $generator = $this->mock(GeneratorInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -237,7 +237,7 @@ class AccountControllerTest extends TestCase * * @param string $range */ - public function testIncomeCategory(string $range) + public function testIncomeCategory(string $range): void { $transaction = factory(Transaction::class)->make(); $account = factory(Account::class)->make(); @@ -265,7 +265,7 @@ class AccountControllerTest extends TestCase * * @param string $range */ - public function testIncomeCategoryAll(string $range) + public function testIncomeCategoryAll(string $range): void { $transaction = factory(Transaction::class)->make(); $account = factory(Account::class)->make(); @@ -295,7 +295,7 @@ class AccountControllerTest extends TestCase * * @param string $range */ - public function testPeriod(string $range) + public function testPeriod(string $range): void { $generator = $this->mock(GeneratorInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -314,16 +314,16 @@ class AccountControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Chart\AccountController::report * @covers \FireflyIII\Http\Controllers\Chart\AccountController::accountBalanceChart */ - public function testReport() + public function testReport(): void { $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); - $currencyRepos->shouldReceive('findNull')->andReturn(TransactionCurrency::find(1)); + $currencyRepos->shouldReceive('findNull')->andReturn(TransactionCurrency::find(1), null); $generator = $this->mock(GeneratorInterface::class); $generator->shouldReceive('multiSet')->andReturn([]); Steam::shouldReceive('balanceInRange')->andReturn(['2012-01-01' => '0']); $this->be($this->user()); - $response = $this->get(route('chart.account.report', ['1', '20120101', '20120131'])); + $response = $this->get(route('chart.account.report', ['1,2', '20120101', '20120131'])); $response->assertStatus(200); } @@ -333,7 +333,7 @@ class AccountControllerTest extends TestCase * * @param string $range */ - public function testRevenueAccounts(string $range) + public function testRevenueAccounts(string $range): void { $account = factory(Account::class)->make(); $generator = $this->mock(GeneratorInterface::class); diff --git a/tests/Feature/Controllers/Chart/BillControllerTest.php b/tests/Feature/Controllers/Chart/BillControllerTest.php index bc36781b77..af5cd40359 100644 --- a/tests/Feature/Controllers/Chart/BillControllerTest.php +++ b/tests/Feature/Controllers/Chart/BillControllerTest.php @@ -55,7 +55,7 @@ class BillControllerTest extends TestCase * * @param string $range */ - public function testFrontpage(string $range) + public function testFrontpage(string $range): void { $generator = $this->mock(GeneratorInterface::class); $repository = $this->mock(BillRepositoryInterface::class); @@ -73,7 +73,7 @@ class BillControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Chart\BillController::single */ - public function testSingle() + public function testSingle(): void { $transaction = factory(Transaction::class)->make(); $generator = $this->mock(GeneratorInterface::class); diff --git a/tests/Feature/Controllers/Chart/BudgetControllerTest.php b/tests/Feature/Controllers/Chart/BudgetControllerTest.php index 99bb3c15fa..876a2bdeee 100644 --- a/tests/Feature/Controllers/Chart/BudgetControllerTest.php +++ b/tests/Feature/Controllers/Chart/BudgetControllerTest.php @@ -63,7 +63,7 @@ class BudgetControllerTest extends TestCase * * @param string $range */ - public function testBudget(string $range) + public function testBudget(string $range): void { $repository = $this->mock(BudgetRepositoryInterface::class); $generator = $this->mock(GeneratorInterface::class); @@ -84,7 +84,7 @@ class BudgetControllerTest extends TestCase * * @param string $range */ - public function testBudgetLimit(string $range) + public function testBudgetLimit(string $range): void { $repository = $this->mock(BudgetRepositoryInterface::class); $generator = $this->mock(GeneratorInterface::class); @@ -102,7 +102,7 @@ class BudgetControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Chart\BudgetController::budgetLimit * @expectedExceptionMessage This budget limit is not part of this budget. */ - public function testBudgetLimitWrongLimit() + public function testBudgetLimitWrongLimit(): void { $repository = $this->mock(BudgetRepositoryInterface::class); $generator = $this->mock(GeneratorInterface::class); @@ -119,7 +119,7 @@ class BudgetControllerTest extends TestCase * * @param string $range */ - public function testExpenseAsset(string $range) + public function testExpenseAsset(string $range): void { $budgetRepository = $this->mock(BudgetRepositoryInterface::class); $generator = $this->mock(GeneratorInterface::class); @@ -148,7 +148,7 @@ class BudgetControllerTest extends TestCase * * @param string $range */ - public function testExpenseCategory(string $range) + public function testExpenseCategory(string $range): void { $generator = $this->mock(GeneratorInterface::class); $collector = $this->mock(JournalCollectorInterface::class); @@ -182,7 +182,7 @@ class BudgetControllerTest extends TestCase * * @param string $range */ - public function testExpenseExpense(string $range) + public function testExpenseExpense(string $range): void { $generator = $this->mock(GeneratorInterface::class); $collector = $this->mock(JournalCollectorInterface::class); @@ -218,7 +218,7 @@ class BudgetControllerTest extends TestCase * * @param string $range */ - public function testFrontpage(string $range) + public function testFrontpage(string $range): void { $repository = $this->mock(BudgetRepositoryInterface::class); $generator = $this->mock(GeneratorInterface::class); @@ -255,7 +255,7 @@ class BudgetControllerTest extends TestCase * * @param string $range */ - public function testFrontpageMultiLimit(string $range) + public function testFrontpageMultiLimit(string $range): void { $repository = $this->mock(BudgetRepositoryInterface::class); $generator = $this->mock(GeneratorInterface::class); @@ -294,7 +294,7 @@ class BudgetControllerTest extends TestCase * * @param string $range */ - public function testFrontpageNoLimits(string $range) + public function testFrontpageNoLimits(string $range): void { $repository = $this->mock(BudgetRepositoryInterface::class); $generator = $this->mock(GeneratorInterface::class); @@ -324,7 +324,7 @@ class BudgetControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Chart\BudgetController::period * @covers \FireflyIII\Http\Controllers\Chart\BudgetController::getBudgetedInPeriod */ - public function testPeriod() + public function testPeriod(): void { $repository = $this->mock(BudgetRepositoryInterface::class); $generator = $this->mock(GeneratorInterface::class); @@ -344,7 +344,7 @@ class BudgetControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Chart\BudgetController::periodNoBudget */ - public function testPeriodNoBudget() + public function testPeriodNoBudget(): void { $repository = $this->mock(BudgetRepositoryInterface::class); $generator = $this->mock(GeneratorInterface::class); diff --git a/tests/Feature/Controllers/Chart/BudgetReportControllerTest.php b/tests/Feature/Controllers/Chart/BudgetReportControllerTest.php index bc49db303c..7d21d2f3b1 100644 --- a/tests/Feature/Controllers/Chart/BudgetReportControllerTest.php +++ b/tests/Feature/Controllers/Chart/BudgetReportControllerTest.php @@ -59,7 +59,7 @@ class BudgetReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Chart\BudgetReportController::accountExpense * @covers \FireflyIII\Http\Controllers\Chart\BudgetReportController::__construct */ - public function testAccountExpense() + public function testAccountExpense(): void { $budgetRepos = $this->mock(BudgetRepositoryInterface::class); $generator = $this->mock(GeneratorInterface::class); @@ -82,7 +82,7 @@ class BudgetReportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Chart\BudgetReportController::budgetExpense */ - public function testBudgetExpense() + public function testBudgetExpense(): void { $budgetRepos = $this->mock(BudgetRepositoryInterface::class); $generator = $this->mock(GeneratorInterface::class); @@ -107,7 +107,7 @@ class BudgetReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Chart\BudgetReportController::getExpenses * @covers \FireflyIII\Http\Controllers\Chart\BudgetReportController::groupByBudget */ - public function testMainChart() + public function testMainChart(): void { $generator = $this->mock(GeneratorInterface::class); $collector = $this->mock(JournalCollectorInterface::class); diff --git a/tests/Feature/Controllers/Chart/CategoryControllerTest.php b/tests/Feature/Controllers/Chart/CategoryControllerTest.php index 21423e1488..e21fe2e7a4 100644 --- a/tests/Feature/Controllers/Chart/CategoryControllerTest.php +++ b/tests/Feature/Controllers/Chart/CategoryControllerTest.php @@ -58,7 +58,7 @@ class CategoryControllerTest extends TestCase * * @param string $range */ - public function testAll(string $range) + public function testAll(string $range): void { $repository = $this->mock(CategoryRepositoryInterface::class); @@ -85,7 +85,7 @@ class CategoryControllerTest extends TestCase * * @param string $range */ - public function testFrontpage(string $range) + public function testFrontpage(string $range): void { $repository = $this->mock(CategoryRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -108,7 +108,7 @@ class CategoryControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::reportPeriod */ - public function testReportPeriod() + public function testReportPeriod(): void { $repository = $this->mock(CategoryRepositoryInterface::class); $generator = $this->mock(GeneratorInterface::class); @@ -125,7 +125,7 @@ class CategoryControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Chart\CategoryController::reportPeriodNoCategory */ - public function testReportPeriodNoCategory() + public function testReportPeriodNoCategory(): void { $repository = $this->mock(CategoryRepositoryInterface::class); $generator = $this->mock(GeneratorInterface::class); @@ -146,7 +146,7 @@ class CategoryControllerTest extends TestCase * * @param string $range */ - public function testSpecificPeriod(string $range) + public function testSpecificPeriod(string $range): void { $repository = $this->mock(CategoryRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); diff --git a/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php b/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php index 84ffe289dd..dbe80eb377 100644 --- a/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php +++ b/tests/Feature/Controllers/Chart/CategoryReportControllerTest.php @@ -56,7 +56,7 @@ class CategoryReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Chart\CategoryReportController::accountExpense * @covers \FireflyIII\Http\Controllers\Chart\CategoryReportController::__construct */ - public function testAccountExpense() + public function testAccountExpense(): void { $generator = $this->mock(GeneratorInterface::class); $pieChart = $this->mock(MetaPieChartInterface::class); @@ -77,7 +77,7 @@ class CategoryReportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Chart\CategoryReportController::accountIncome */ - public function testAccountIncome() + public function testAccountIncome(): void { $generator = $this->mock(GeneratorInterface::class); $pieChart = $this->mock(MetaPieChartInterface::class); @@ -98,7 +98,7 @@ class CategoryReportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Chart\CategoryReportController::categoryExpense */ - public function testCategoryExpense() + public function testCategoryExpense(): void { $generator = $this->mock(GeneratorInterface::class); $pieChart = $this->mock(MetaPieChartInterface::class); @@ -119,7 +119,7 @@ class CategoryReportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Chart\CategoryReportController::categoryIncome */ - public function testCategoryIncome() + public function testCategoryIncome(): void { $generator = $this->mock(GeneratorInterface::class); $pieChart = $this->mock(MetaPieChartInterface::class); @@ -143,7 +143,7 @@ class CategoryReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Chart\CategoryReportController::getExpenses * @covers \FireflyIII\Http\Controllers\Chart\CategoryReportController::getIncome */ - public function testMainChart() + public function testMainChart(): void { $generator = $this->mock(GeneratorInterface::class); $collector = $this->mock(JournalCollectorInterface::class); diff --git a/tests/Feature/Controllers/Chart/ExpenseReportControllerTest.php b/tests/Feature/Controllers/Chart/ExpenseReportControllerTest.php index 5a681b64ee..ede81ec9fd 100644 --- a/tests/Feature/Controllers/Chart/ExpenseReportControllerTest.php +++ b/tests/Feature/Controllers/Chart/ExpenseReportControllerTest.php @@ -58,7 +58,7 @@ class ExpenseReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Chart\ExpenseReportController::getIncome * @covers \FireflyIII\Http\Controllers\Chart\ExpenseReportController::combineAccounts */ - public function testMainChart() + public function testMainChart(): void { $expense = $this->user()->accounts()->where('account_type_id', 4)->first(); $generator = $this->mock(GeneratorInterface::class); diff --git a/tests/Feature/Controllers/Chart/PiggyBankControllerTest.php b/tests/Feature/Controllers/Chart/PiggyBankControllerTest.php index c9f4439ad9..e11d5b66c8 100644 --- a/tests/Feature/Controllers/Chart/PiggyBankControllerTest.php +++ b/tests/Feature/Controllers/Chart/PiggyBankControllerTest.php @@ -51,7 +51,7 @@ class PiggyBankControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Chart\PiggyBankController::history * @covers \FireflyIII\Http\Controllers\Chart\PiggyBankController::__construct */ - public function testHistory() + public function testHistory(): void { $generator = $this->mock(GeneratorInterface::class); $repository = $this->mock(PiggyBankRepositoryInterface::class); diff --git a/tests/Feature/Controllers/Chart/ReportControllerTest.php b/tests/Feature/Controllers/Chart/ReportControllerTest.php index 9b0c91444d..c13b21cced 100644 --- a/tests/Feature/Controllers/Chart/ReportControllerTest.php +++ b/tests/Feature/Controllers/Chart/ReportControllerTest.php @@ -51,7 +51,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Chart\ReportController::arraySum * @covers \FireflyIII\Http\Controllers\Chart\ReportController::__construct */ - public function testNetWorth() + public function testNetWorth(): void { $generator = $this->mock(GeneratorInterface::class); @@ -67,7 +67,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Chart\ReportController::operations * @covers \FireflyIII\Http\Controllers\Chart\ReportController::getChartData */ - public function testOperations() + public function testOperations(): void { $generator = $this->mock(GeneratorInterface::class); $tasker = $this->mock(AccountTaskerInterface::class); @@ -86,7 +86,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Chart\ReportController::sum * @covers \FireflyIII\Http\Controllers\Chart\ReportController::getChartData */ - public function testSum() + public function testSum(): void { $generator = $this->mock(GeneratorInterface::class); $tasker = $this->mock(AccountTaskerInterface::class); diff --git a/tests/Feature/Controllers/Chart/TagReportControllerTest.php b/tests/Feature/Controllers/Chart/TagReportControllerTest.php index 375ad01c6b..8b016cc1a5 100644 --- a/tests/Feature/Controllers/Chart/TagReportControllerTest.php +++ b/tests/Feature/Controllers/Chart/TagReportControllerTest.php @@ -60,7 +60,7 @@ class TagReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Chart\TagReportController::accountExpense * @covers \FireflyIII\Http\Controllers\Chart\TagReportController::__construct */ - public function testAccountExpense() + public function testAccountExpense(): void { $generator = $this->mock(GeneratorInterface::class); $pieChart = $this->mock(MetaPieChartInterface::class); @@ -88,7 +88,7 @@ class TagReportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Chart\TagReportController::accountIncome */ - public function testAccountIncome() + public function testAccountIncome(): void { $generator = $this->mock(GeneratorInterface::class); $pieChart = $this->mock(MetaPieChartInterface::class); @@ -115,7 +115,7 @@ class TagReportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Chart\TagReportController::budgetExpense() */ - public function testBudgetExpense() + public function testBudgetExpense(): void { $generator = $this->mock(GeneratorInterface::class); $pieChart = $this->mock(MetaPieChartInterface::class); @@ -141,7 +141,7 @@ class TagReportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Chart\TagReportController::categoryExpense() */ - public function testCategoryExpense() + public function testCategoryExpense(): void { $generator = $this->mock(GeneratorInterface::class); $pieChart = $this->mock(MetaPieChartInterface::class); @@ -170,7 +170,7 @@ class TagReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Chart\TagReportController::getIncome * @covers \FireflyIII\Http\Controllers\Chart\TagReportController::groupByTag */ - public function testMainChart() + public function testMainChart(): void { $generator = $this->mock(GeneratorInterface::class); $collector = $this->mock(JournalCollectorInterface::class); @@ -209,7 +209,7 @@ class TagReportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Chart\TagReportController::tagExpense() */ - public function testTagExpense() + public function testTagExpense(): void { $generator = $this->mock(GeneratorInterface::class); $pieChart = $this->mock(MetaPieChartInterface::class); @@ -235,7 +235,7 @@ class TagReportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Chart\TagReportController::tagIncome */ - public function testTagIncome() + public function testTagIncome(): void { $generator = $this->mock(GeneratorInterface::class); $pieChart = $this->mock(MetaPieChartInterface::class); diff --git a/tests/Feature/Controllers/CurrencyControllerTest.php b/tests/Feature/Controllers/CurrencyControllerTest.php index f1a56b1b73..04c11c88bf 100644 --- a/tests/Feature/Controllers/CurrencyControllerTest.php +++ b/tests/Feature/Controllers/CurrencyControllerTest.php @@ -53,7 +53,7 @@ class CurrencyControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\CurrencyController::create */ - public function testCannotCreate() + public function testCannotCreate(): void { // mock stuff $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); @@ -72,7 +72,7 @@ class CurrencyControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\CurrencyController::delete */ - public function testCannotDelete() + public function testCannotDelete(): void { // mock stuff $repository = $this->mock(CurrencyRepositoryInterface::class); @@ -92,7 +92,7 @@ class CurrencyControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\CurrencyController::destroy */ - public function testCannotDestroy() + public function testCannotDestroy(): void { // mock stuff $repository = $this->mock(CurrencyRepositoryInterface::class); @@ -113,7 +113,7 @@ class CurrencyControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\CurrencyController::create */ - public function testCreate() + public function testCreate(): void { // mock stuff $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); @@ -133,7 +133,7 @@ class CurrencyControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\CurrencyController::defaultCurrency */ - public function testDefaultCurrency() + public function testDefaultCurrency(): void { // mock stuff $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); @@ -151,7 +151,7 @@ class CurrencyControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\CurrencyController::delete */ - public function testDelete() + public function testDelete(): void { // mock stuff $repository = $this->mock(CurrencyRepositoryInterface::class); @@ -172,7 +172,7 @@ class CurrencyControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\CurrencyController::destroy */ - public function testDestroy() + public function testDestroy(): void { // mock stuff $repository = $this->mock(CurrencyRepositoryInterface::class); @@ -194,7 +194,7 @@ class CurrencyControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\CurrencyController::edit */ - public function testEdit() + public function testEdit(): void { // mock stuff $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); @@ -215,7 +215,7 @@ class CurrencyControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\CurrencyController::index * @covers \FireflyIII\Http\Controllers\CurrencyController::__construct */ - public function testIndex() + public function testIndex(): void { // mock stuff $repository = $this->mock(CurrencyRepositoryInterface::class); @@ -240,7 +240,7 @@ class CurrencyControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\CurrencyController::index * @covers \FireflyIII\Http\Controllers\CurrencyController::__construct */ - public function testIndexNoRights() + public function testIndexNoRights(): void { // mock stuff $repository = $this->mock(CurrencyRepositoryInterface::class); @@ -264,7 +264,7 @@ class CurrencyControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\CurrencyController::store * @covers \FireflyIII\Http\Requests\CurrencyFormRequest */ - public function testStore() + public function testStore(): void { // mock stuff $repository = $this->mock(CurrencyRepositoryInterface::class); @@ -292,7 +292,7 @@ class CurrencyControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\CurrencyController::store * @covers \FireflyIII\Http\Requests\CurrencyFormRequest */ - public function testStoreNoRights() + public function testStoreNoRights(): void { // mock stuff $repository = $this->mock(CurrencyRepositoryInterface::class); @@ -320,7 +320,7 @@ class CurrencyControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\CurrencyController::update * @covers \FireflyIII\Http\Requests\CurrencyFormRequest */ - public function testUpdate() + public function testUpdate(): void { // mock stuff $repository = $this->mock(CurrencyRepositoryInterface::class); diff --git a/tests/Feature/Controllers/DebugControllerTest.php b/tests/Feature/Controllers/DebugControllerTest.php index 29aa116253..960b9dabed 100644 --- a/tests/Feature/Controllers/DebugControllerTest.php +++ b/tests/Feature/Controllers/DebugControllerTest.php @@ -49,7 +49,7 @@ class DebugControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\DebugController::errorReporting * @covers \FireflyIII\Http\Controllers\DebugController::collectPackages */ - public function testIndex() + public function testIndex(): void { $this->be($this->user()); $response = $this->get(route('debug')); diff --git a/tests/Feature/Controllers/ExportControllerTest.php b/tests/Feature/Controllers/ExportControllerTest.php index 8d44b7f70c..74792cbc04 100644 --- a/tests/Feature/Controllers/ExportControllerTest.php +++ b/tests/Feature/Controllers/ExportControllerTest.php @@ -55,7 +55,7 @@ class ExportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\ExportController::download */ - public function testDownload() + public function testDownload(): void { // mock stuff $repository = $this->mock(ExportJobRepositoryInterface::class); @@ -74,7 +74,7 @@ class ExportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\ExportController::download * @expectedExceptionMessage Against all expectations */ - public function testDownloadFailed() + public function testDownloadFailed(): void { // mock stuff $repository = $this->mock(ExportJobRepositoryInterface::class); @@ -91,7 +91,7 @@ class ExportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\ExportController::getStatus */ - public function testGetStatus() + public function testGetStatus(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -106,7 +106,7 @@ class ExportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\ExportController::index * @covers \FireflyIII\Http\Controllers\ExportController::__construct */ - public function testIndex() + public function testIndex(): void { // mock stuff $repository = $this->mock(ExportJobRepositoryInterface::class); @@ -116,7 +116,7 @@ class ExportControllerTest extends TestCase $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('create')->andReturn($job); $repository->shouldReceive('cleanup'); - $accountRepos->shouldReceive('getAccountsByType')->withArgs([[AccountType::DEFAULT, AccountType::ASSET]])->andReturn(new Collection); + $accountRepos->shouldReceive('getAccountsByType')->withArgs([[AccountType::ASSET, AccountType::DEFAULT]])->andReturn(new Collection); $this->be($this->user()); $response = $this->get(route('export.index')); @@ -130,7 +130,7 @@ class ExportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\ExportController::postIndex * @covers \FireflyIII\Http\Requests\ExportFormRequest */ - public function testPostIndex() + public function testPostIndex(): void { // mock stuff $repository = $this->mock(ExportJobRepositoryInterface::class); diff --git a/tests/Feature/Controllers/HelpControllerTest.php b/tests/Feature/Controllers/HelpControllerTest.php index a0373b3a81..10689dc8e2 100644 --- a/tests/Feature/Controllers/HelpControllerTest.php +++ b/tests/Feature/Controllers/HelpControllerTest.php @@ -50,7 +50,7 @@ class HelpControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\HelpController::getHelpText * @covers \FireflyIII\Http\Controllers\HelpController::__construct */ - public function testShow() + public function testShow(): void { $help = $this->mock(HelpInterface::class); $help->shouldReceive('hasRoute')->andReturn(true)->once(); @@ -68,7 +68,7 @@ class HelpControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\HelpController::show * @covers \FireflyIII\Http\Controllers\HelpController::getHelpText */ - public function testShowBackupFromCache() + public function testShowBackupFromCache(): void { // force pref in dutch for test Preference::where('user_id', $this->user()->id)->where('name', 'language')->delete(); @@ -97,7 +97,7 @@ class HelpControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\HelpController::show * @covers \FireflyIII\Http\Controllers\HelpController::getHelpText */ - public function testShowBackupFromGithub() + public function testShowBackupFromGithub(): void { // force pref in dutch for test Preference::where('user_id', $this->user()->id)->where('name', 'language')->delete(); @@ -126,7 +126,7 @@ class HelpControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\HelpController::show * @covers \FireflyIII\Http\Controllers\HelpController::getHelpText */ - public function testShowCached() + public function testShowCached(): void { $help = $this->mock(HelpInterface::class); $help->shouldReceive('hasRoute')->andReturn(true)->once(); @@ -143,7 +143,7 @@ class HelpControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\HelpController::show * @covers \FireflyIII\Http\Controllers\HelpController::getHelpText */ - public function testShowNoRoute() + public function testShowNoRoute(): void { $help = $this->mock(HelpInterface::class); $help->shouldReceive('hasRoute')->andReturn(false)->once(); diff --git a/tests/Feature/Controllers/HomeControllerTest.php b/tests/Feature/Controllers/HomeControllerTest.php index fd5845358f..807c9d0dd2 100644 --- a/tests/Feature/Controllers/HomeControllerTest.php +++ b/tests/Feature/Controllers/HomeControllerTest.php @@ -59,7 +59,7 @@ class HomeControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\HomeController::dateRange * @covers \FireflyIII\Http\Controllers\HomeController::__construct */ - public function testDateRange() + public function testDateRange(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -81,7 +81,7 @@ class HomeControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\HomeController::dateRange * @covers \FireflyIII\Http\Controllers\HomeController::__construct */ - public function testDateRangeCustom() + public function testDateRangeCustom(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -103,7 +103,7 @@ class HomeControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\HomeController::displayError */ - public function testDisplayError() + public function testDisplayError(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -117,7 +117,7 @@ class HomeControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\HomeController::flush */ - public function testFlush() + public function testFlush(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -136,7 +136,7 @@ class HomeControllerTest extends TestCase * * @param $range */ - public function testIndex(string $range) + public function testIndex(string $range): void { // mock stuff $account = factory(Account::class)->make(); @@ -173,7 +173,7 @@ class HomeControllerTest extends TestCase * * @param $range */ - public function testIndexEmpty(string $range) + public function testIndexEmpty(string $range): void { // mock stuff $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -190,7 +190,7 @@ class HomeControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\HomeController::routes() */ - public function testRoutes() + public function testRoutes(): void { $this->be($this->user()); $response = $this->get(route('routes')); @@ -200,7 +200,7 @@ class HomeControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\HomeController::testFlash */ - public function testTestFlash() + public function testTestFlash(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); diff --git a/tests/Feature/Controllers/Import/ConfigurationControllerTest.php b/tests/Feature/Controllers/Import/ConfigurationControllerTest.php deleted file mode 100644 index a8f7a9b78a..0000000000 --- a/tests/Feature/Controllers/Import/ConfigurationControllerTest.php +++ /dev/null @@ -1,131 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace Tests\Feature\Controllers\Import; - -use FireflyIII\Import\Configuration\FileConfigurator; -use FireflyIII\Models\ImportJob; -use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; -use Log; -use Tests\TestCase; - -/** - * Class AccountControllerTest - * - * @SuppressWarnings(PHPMD.TooManyPublicMethods) - * @SuppressWarnings(PHPMD.ExcessiveMethodLength) - * @SuppressWarnings(PHPMD.CouplingBetweenObjects) - */ -class ConfigurationControllerTest extends TestCase -{ - /** - * - */ - public function setUp() - { - parent::setUp(); - Log::debug(sprintf('Now in %s.', \get_class($this))); - } - - /** - * @covers \FireflyIII\Http\Controllers\Import\ConfigurationController::__construct - * @covers \FireflyIII\Http\Controllers\Import\ConfigurationController::index - * @covers \FireflyIII\Http\Controllers\Import\ConfigurationController::makeConfigurator - */ - public function testIndex() - { - /** @var ImportJob $job */ - $job = $this->user()->importJobs()->where('key', 'configuring')->first(); - $configurator = $this->mock(FileConfigurator::class); - $repository = $this->mock(ImportJobRepositoryInterface::class); - $configurator->shouldReceive('setJob')->once(); - $configurator->shouldReceive('isJobConfigured')->once()->andReturn(false); - $configurator->shouldReceive('getNextView')->once()->andReturn('error'); // does not matter which view is returned. - $configurator->shouldReceive('getNextData')->once()->andReturn([]); - $repository->shouldReceive('updateStatus')->once(); - - $this->be($this->user()); - $response = $this->get(route('import.configure', [$job->key])); - $response->assertStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Import\ConfigurationController::__construct - * @covers \FireflyIII\Http\Controllers\Import\ConfigurationController::index - * @covers \FireflyIII\Http\Controllers\Import\ConfigurationController::makeConfigurator - */ - public function testIndexConfigured() - { - /** @var ImportJob $job */ - $job = $this->user()->importJobs()->where('key', 'configured')->first(); - $configurator = $this->mock(FileConfigurator::class); - $repository = $this->mock(ImportJobRepositoryInterface::class); - $configurator->shouldReceive('setJob')->once(); - $configurator->shouldReceive('isJobConfigured')->once()->andReturn(true); - $repository->shouldReceive('updateStatus')->once(); - - $this->be($this->user()); - $response = $this->get(route('import.configure', [$job->key])); - $response->assertStatus(302); - $response->assertRedirect(route('import.status', [$job->key])); - } - - /** - * @covers \FireflyIII\Http\Controllers\Import\ConfigurationController::post - */ - public function testPost() - { - /** @var ImportJob $job */ - $job = $this->user()->importJobs()->where('key', 'configuring')->first(); - $data = ['some' => 'config']; - $configurator = $this->mock(FileConfigurator::class); - $repository = $this->mock(ImportJobRepositoryInterface::class); - $configurator->shouldReceive('setJob')->once(); - $configurator->shouldReceive('isJobConfigured')->once()->andReturn(false); - $configurator->shouldReceive('configureJob')->once()->withArgs([$data]); - $configurator->shouldReceive('getWarningMessage')->once()->andReturn('Some warning'); - - $this->be($this->user()); - $response = $this->post(route('import.configure.post', [$job->key]), $data); - $response->assertStatus(302); - $response->assertRedirect(route('import.configure', [$job->key])); - } - - /** - * @covers \FireflyIII\Http\Controllers\Import\ConfigurationController::post - */ - public function testPostConfigured() - { - /** @var ImportJob $job */ - $job = $this->user()->importJobs()->where('key', 'configuring')->first(); - $data = ['some' => 'config']; - $configurator = $this->mock(FileConfigurator::class); - $repository = $this->mock(ImportJobRepositoryInterface::class); - $configurator->shouldReceive('setJob')->once(); - $configurator->shouldReceive('isJobConfigured')->once()->andReturn(true); - - $this->be($this->user()); - $response = $this->post(route('import.configure.post', [$job->key]), $data); - $response->assertStatus(302); - $response->assertRedirect(route('import.status', [$job->key])); - } -} diff --git a/tests/Feature/Controllers/Import/IndexControllerTest.php b/tests/Feature/Controllers/Import/IndexControllerTest.php index 9b24a5d9b3..76026e0227 100644 --- a/tests/Feature/Controllers/Import/IndexControllerTest.php +++ b/tests/Feature/Controllers/Import/IndexControllerTest.php @@ -22,13 +22,19 @@ declare(strict_types=1); namespace Tests\Feature\Controllers\Import; -use FireflyIII\Import\Routine\FileRoutine; +use FireflyIII\Import\Prerequisites\BunqPrerequisites; +use FireflyIII\Import\Prerequisites\FakePrerequisites; +use FireflyIII\Import\Prerequisites\FilePrerequisites; +use FireflyIII\Import\Prerequisites\SpectrePrerequisites; +use FireflyIII\Models\ImportJob; use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Repositories\User\UserRepositoryInterface; use Log; +use Mockery; use Tests\TestCase; /** - * Class AccountControllerTest + * Class IndexControllerTest * * @SuppressWarnings(PHPMD.TooManyPublicMethods) * @SuppressWarnings(PHPMD.ExcessiveMethodLength) @@ -46,73 +52,234 @@ class IndexControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\Import\IndexController::create + * @covers \FireflyIII\Http\Controllers\Import\IndexController */ - public function testCreate() + public function testCreateBadJob(): void { - $job = $this->user()->importJobs()->where('key', 'new')->first(); - $repository = $this->mock(ImportJobRepositoryInterface::class); - $repository->shouldReceive('create')->withArgs(['file'])->andReturn($job); + // mock stuff: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $userRepository = $this->mock(UserRepositoryInterface::class); + $fakePrerequisites = $this->mock(FakePrerequisites::class); + $bunqPrerequisites = $this->mock(BunqPrerequisites::class); + $spectrePrerequisites = $this->mock(SpectrePrerequisites::class); + + // fake job: + $importJob = new ImportJob; + $importJob->provider = 'fake'; + $importJob->key = 'fake_job_1'; + + // mock calls: + $fakePrerequisites->shouldReceive('setUser')->once(); + $bunqPrerequisites->shouldReceive('setUser')->once(); + $spectrePrerequisites->shouldReceive('setUser')->once(); + $fakePrerequisites->shouldReceive('isComplete')->once()->andReturn(true); + $bunqPrerequisites->shouldReceive('isComplete')->once()->andReturn(true); + $spectrePrerequisites->shouldReceive('isComplete')->once()->andReturn(true); + + $userRepository->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->andReturn(false)->once(); + $this->be($this->user()); - $response = $this->get(route('import.create-job', ['file'])); + $response = $this->get(route('import.create', ['bad'])); $response->assertStatus(302); - $response->assertRedirect(route('import.configure', ['new'])); - + // expect a redirect to index + $response->assertSessionHas('warning', 'Firefly III cannot create a job for the "bad"-provider.'); + $response->assertRedirect(route('import.index')); } /** - * @covers \FireflyIII\Http\Controllers\Import\IndexController::download + * @covers \FireflyIII\Http\Controllers\Import\IndexController */ - public function testDownload() + public function testCreateFake(): void { - $repository = $this->mock(ImportJobRepositoryInterface::class); - //$job = $this->user()->importJobs()->where('key', 'testImport')->first(); + // mock stuff: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $userRepository = $this->mock(UserRepositoryInterface::class); + $fakePrerequisites = $this->mock(FakePrerequisites::class); + $bunqPrerequisites = $this->mock(BunqPrerequisites::class); + $spectrePrerequisites = $this->mock(SpectrePrerequisites::class); + $filePrerequisites = $this->mock(FilePrerequisites::class); + + // fake job: + $importJob = new ImportJob; + $importJob->provider = 'fake'; + $importJob->key = 'fake_job_1'; + + // mock calls + $userRepository->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->andReturn(true)->once(); + $repository->shouldReceive('create')->withArgs(['fake'])->andReturn($importJob); + $fakePrerequisites->shouldReceive('isComplete')->twice()->andReturn(false); + $fakePrerequisites->shouldReceive('setUser')->twice(); + + $this->be($this->user()); - $response = $this->get(route('import.download', ['testImport'])); + $response = $this->get(route('import.create', ['fake'])); + $response->assertStatus(302); + // expect a redirect to prerequisites + $response->assertRedirect(route('import.prerequisites.index', ['fake', 'fake_job_1'])); + } + + /** + * @covers \FireflyIII\Http\Controllers\Import\IndexController + */ + public function testCreateFakeNoPrereq(): void + { + // mock stuff: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $userRepository = $this->mock(UserRepositoryInterface::class); + $fakePrerequisites = $this->mock(FakePrerequisites::class); + $bunqPrerequisites = $this->mock(BunqPrerequisites::class); + $spectrePrerequisites = $this->mock(SpectrePrerequisites::class); + $filePrerequisites = $this->mock(FilePrerequisites::class); + + // fake job: + $importJob = new ImportJob; + $importJob->provider = 'fake'; + $importJob->key = 'fake_job_2'; + + // mock call: + $userRepository->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->andReturn(true)->once(); + $repository->shouldReceive('create')->withArgs(['fake'])->andReturn($importJob); + $fakePrerequisites->shouldReceive('isComplete')->twice()->andReturn(true); + $fakePrerequisites->shouldReceive('setUser')->twice(); + $repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'has_prereq'])->andReturn($importJob)->once(); + + + $this->be($this->user()); + $response = $this->get(route('import.create', ['fake'])); + $response->assertStatus(302); + // expect a redirect to prerequisites + $response->assertRedirect(route('import.job.configuration.index', ['fake_job_2'])); + } + + /** + * @covers \FireflyIII\Http\Controllers\Import\IndexController + */ + public function testCreateFileHasNoPrereq(): void + { + // mock stuff: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $userRepository = $this->mock(UserRepositoryInterface::class); + $fakePrerequisites = $this->mock(FakePrerequisites::class); + $bunqPrerequisites = $this->mock(BunqPrerequisites::class); + $spectrePrerequisites = $this->mock(SpectrePrerequisites::class); + $filePrerequisites = $this->mock(FilePrerequisites::class); + + // fake job: + $importJob = new ImportJob; + $importJob->provider = 'file'; + $importJob->key = 'file_job_1'; + + // mock calls + $fakePrerequisites->shouldReceive('setUser')->once(); + $bunqPrerequisites->shouldReceive('setUser')->once(); + $spectrePrerequisites->shouldReceive('setUser')->once(); + + $fakePrerequisites->shouldReceive('isComplete')->once()->andReturn(true); + $bunqPrerequisites->shouldReceive('isComplete')->once()->andReturn(true); + $spectrePrerequisites->shouldReceive('isComplete')->once()->andReturn(true); + + $userRepository->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->andReturn(false)->once(); + $repository->shouldReceive('create')->withArgs(['file'])->andReturn($importJob); + + $repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'has_prereq'])->andReturn($importJob)->once(); + + + $this->be($this->user()); + $response = $this->get(route('import.create', ['file'])); + $response->assertStatus(302); + // expect a redirect to prerequisites + $response->assertRedirect(route('import.job.configuration.index', ['file_job_1'])); + } + + /** + * @covers \FireflyIII\Http\Controllers\Import\IndexController + */ + public function testDownload(): void + { + // mock stuff: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $userRepository = $this->mock(UserRepositoryInterface::class); + $fakePrerequisites = $this->mock(FakePrerequisites::class); + $bunqPrerequisites = $this->mock(BunqPrerequisites::class); + $spectrePrerequisites = $this->mock(SpectrePrerequisites::class); + $filePrerequisites = $this->mock(FilePrerequisites::class); + + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'dc_' . random_int(1, 1000); + $job->status = 'ready_to_run'; + $job->stage = 'go-for-import'; + $job->provider = 'file'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + $fakeConfig = [ + 'hi' => 'there', + 1 => true, + 'column-mapping-config' => ['a', 'b', 'c'], + ]; + + $repository->shouldReceive('getConfiguration')->andReturn($fakeConfig)->once(); + + $this->be($this->user()); + $response = $this->get(route('import.job.download', [$job->key])); $response->assertStatus(200); + $response->assertExactJson(['column-mapping-config' => [], 'delimiter' => ',', 'hi' => 'there', 1 => true]); } /** - * @covers \FireflyIII\Http\Controllers\Import\IndexController::__construct - * @covers \FireflyIII\Http\Controllers\Import\IndexController::index + * @covers \FireflyIII\Http\Controllers\Import\IndexController */ - public function testIndex() + public function testIndex(): void { - $repository = $this->mock(ImportJobRepositoryInterface::class); $this->be($this->user()); + + // fake stuff: + $userRepository = $this->mock(UserRepositoryInterface::class); + $fakePrerequisites = $this->mock(FakePrerequisites::class); + $bunqPrerequisites = $this->mock(BunqPrerequisites::class); + $spectrePrerequisites = $this->mock(SpectrePrerequisites::class); + $filePrerequisites = $this->mock(FilePrerequisites::class); + + // call methods: + $userRepository->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->andReturn(false); + + $fakePrerequisites->shouldReceive('setUser')->once(); + $bunqPrerequisites->shouldReceive('setUser')->once(); + $spectrePrerequisites->shouldReceive('setUser')->once(); + $fakePrerequisites->shouldReceive('isComplete')->once()->andReturn(true); + $bunqPrerequisites->shouldReceive('isComplete')->once()->andReturn(true); + $spectrePrerequisites->shouldReceive('isComplete')->once()->andReturn(true); + $response = $this->get(route('import.index')); $response->assertStatus(200); - + $response->assertSee('
                        '); } /** - * @covers \FireflyIII\Http\Controllers\Import\IndexController::start + * @covers \FireflyIII\Http\Controllers\Import\IndexController */ - public function testStart() + public function testIndexDemo(): void { - $repository = $this->mock(ImportJobRepositoryInterface::class); - $routine = $this->mock(FileRoutine::class); - $routine->shouldReceive('setJob')->once(); - $routine->shouldReceive('run')->once()->andReturn(true); - $this->be($this->user()); - $response = $this->post(route('import.start', ['configured'])); + + // fake stuff: + $fakePrerequisites = $this->mock(FakePrerequisites::class); + $bunqPrerequisites = $this->mock(BunqPrerequisites::class); + $spectrePrerequisites = $this->mock(SpectrePrerequisites::class); + $filePrerequisites = $this->mock(FilePrerequisites::class); + $userRepository = $this->mock(UserRepositoryInterface::class); + + + // call methods: + $fakePrerequisites->shouldReceive('setUser')->once(); + $fakePrerequisites->shouldReceive('isComplete')->once()->andReturn(true); + $userRepository->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->andReturn(true); + + + $response = $this->get(route('import.index')); $response->assertStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Import\IndexController::start - * @expectedExceptionMessage Job did not complete successfully. - */ - public function testStartFailed() - { - $repository = $this->mock(ImportJobRepositoryInterface::class); - $routine = $this->mock(FileRoutine::class); - $routine->shouldReceive('setJob')->once(); - $routine->shouldReceive('run')->once()->andReturn(false); - - $this->be($this->user()); - $response = $this->post(route('import.start', ['configured'])); - $response->assertStatus(500); + $response->assertSee('
                          '); } } diff --git a/tests/Feature/Controllers/Import/JobConfigurationControllerTest.php b/tests/Feature/Controllers/Import/JobConfigurationControllerTest.php new file mode 100644 index 0000000000..07e9769075 --- /dev/null +++ b/tests/Feature/Controllers/Import/JobConfigurationControllerTest.php @@ -0,0 +1,264 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Feature\Controllers\Import; + +use FireflyIII\Import\JobConfiguration\FakeJobConfiguration; +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use Illuminate\Http\UploadedFile; +use Illuminate\Support\MessageBag; +use Log; +use Mockery; +use Tests\TestCase; + +/** + * Class JobConfigurationControllerTest + */ +class JobConfigurationControllerTest extends TestCase +{ + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', \get_class($this))); + } + + /** + * @covers \FireflyIII\Http\Controllers\Import\JobConfigurationController + */ + public function testIndex(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'Afake_job_' . random_int(1, 1000); + $job->status = 'has_prereq'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->save(); + + // mock repositories and configuration handling classes: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $configurator = $this->mock(FakeJobConfiguration::class); + + // mock calls: + $configurator->shouldReceive('setImportJob')->once(); + $configurator->shouldReceive('configurationComplete')->once()->andReturn(false); + $configurator->shouldReceive('getNextView')->once()->andReturn('import.fake.apply-rules'); + $configurator->shouldReceive('getNextData')->once() + ->andReturn(['rulesOptions' => [1 => 'Y', 0 => 'N',],]); + + + $this->be($this->user()); + $response = $this->get(route('import.job.configuration.index', [$job->key])); + $response->assertStatus(200); + // expect a redirect to prerequisites + $response->assertSee('
                            '); + } + + /** + * @covers \FireflyIII\Http\Controllers\Import\JobConfigurationController + */ + public function testIndexBadState(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'Bfake_job_' . random_int(1, 1000); + $job->status = 'some_bad_state'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->save(); + + // mock repositories and configuration handling classes: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $configurator = $this->mock(FakeJobConfiguration::class); + + // mock calls: + + $this->be($this->user()); + $response = $this->get(route('import.job.configuration.index', [$job->key])); + $response->assertStatus(302); + $response->assertRedirect(route('import.index')); + $response->assertSessionHas('error', 'To access this page, your import job cannot have status "some_bad_state".'); + } + + /** + * @covers \FireflyIII\Http\Controllers\Import\JobConfigurationController + */ + public function testIndexComplete(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'Cfake_job_' . random_int(1, 1000); + $job->status = 'has_prereq'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->save(); + + // mock repositories and configuration handling classes: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $configurator = $this->mock(FakeJobConfiguration::class); + + // mock calls: + $configurator->shouldReceive('setImportJob')->once(); + $configurator->shouldReceive('configurationComplete')->once()->andReturn(true); + $repository->shouldReceive('updateStatus')->withArgs([Mockery::any(), 'ready_to_run']); + + $this->be($this->user()); + $response = $this->get(route('import.job.configuration.index', [$job->key])); + $response->assertStatus(302); + $response->assertRedirect(route('import.job.status.index', [$job->key])); + } + + /** + * @covers \FireflyIII\Http\Controllers\Import\JobConfigurationController + */ + public function testPost(): void + { + + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'Dfake_job_' . random_int(1, 1000); + $job->status = 'has_prereq'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->save(); + + $messages = new MessageBag; + $messages->add('some', 'srrange message'); + + // mock repositories and configuration handling classes: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $configurator = $this->mock(FakeJobConfiguration::class); + + // mock calls: + $configurator->shouldReceive('setImportJob')->once(); + $configurator->shouldReceive('configurationComplete')->once()->andReturn(false); + $configurator->shouldReceive('configureJob')->withArgs([[]])->once()->andReturn($messages); + + // call thing. + $this->be($this->user()); + $response = $this->post(route('import.job.configuration.post', [$job->key])); + $response->assertStatus(302); + $response->assertRedirect(route('import.job.configuration.index', [$job->key])); + $response->assertSessionHas('warning', $messages->first()); + } + + /** + * @covers \FireflyIII\Http\Controllers\Import\JobConfigurationController + */ + public function testPostBadState(): void + { + + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'Ffake_job_' . random_int(1, 1000); + $job->status = 'some_bad_state'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->save(); + + $messages = new MessageBag; + $messages->add('some', 'srrange message'); + + // mock repositories and configuration handling classes: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $configurator = $this->mock(FakeJobConfiguration::class); + + // call thing. + $this->be($this->user()); + $response = $this->post(route('import.job.configuration.post', [$job->key])); + $response->assertStatus(302); + $response->assertRedirect(route('import.index')); + $response->assertSessionHas('error', 'To access this page, your import job cannot have status "some_bad_state".'); + } + + /** + * @covers \FireflyIII\Http\Controllers\Import\JobConfigurationController + */ + public function testPostComplete(): void + { + + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'Efake_job_' . random_int(1, 1000); + $job->status = 'has_prereq'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->save(); + + // mock repositories and configuration handling classes: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $configurator = $this->mock(FakeJobConfiguration::class); + + // mock calls: + $configurator->shouldReceive('setImportJob')->once(); + $configurator->shouldReceive('configurationComplete')->once()->andReturn(true); + $repository->shouldReceive('updateStatus')->withArgs([Mockery::any(), 'ready_to_run']); + + // call thing. + $this->be($this->user()); + $response = $this->post(route('import.job.configuration.post', [$job->key])); + $response->assertStatus(302); + $response->assertRedirect(route('import.job.status.index', [$job->key])); + } + + /** + * @covers \FireflyIII\Http\Controllers\Import\JobConfigurationController + */ + public function testPostWithUpload(): void + { + $file = UploadedFile::fake()->image('avatar.jpg'); + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'Dfake_job_' . random_int(1, 1000); + $job->status = 'has_prereq'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->save(); + + $messages = new MessageBag; + $messages->add('some', 'srrange message'); + + // mock repositories and configuration handling classes: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $configurator = $this->mock(FakeJobConfiguration::class); + + // mock calls: + $configurator->shouldReceive('setImportJob')->once(); + $configurator->shouldReceive('configurationComplete')->once()->andReturn(false); + $configurator->shouldReceive('configureJob')->once()->andReturn($messages); + $repository->shouldReceive('storeFileUpload')->once()->andReturn(new MessageBag); + + // call thing. + $this->be($this->user()); + $response = $this->post(route('import.job.configuration.post', [$job->key]), ['import_file' => $file]); + $response->assertStatus(302); + $response->assertRedirect(route('import.job.configuration.index', [$job->key])); + $response->assertSessionHas('warning', $messages->first()); + } + + +} diff --git a/tests/Feature/Controllers/Import/JobStatusControllerTest.php b/tests/Feature/Controllers/Import/JobStatusControllerTest.php new file mode 100644 index 0000000000..a966948dd2 --- /dev/null +++ b/tests/Feature/Controllers/Import/JobStatusControllerTest.php @@ -0,0 +1,374 @@ +. + */ +declare(strict_types=1); + +namespace Tests\Feature\Controllers\Import; + +use Exception; +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Import\Routine\FakeRoutine; +use FireflyIII\Import\Storage\ImportArrayStorage; +use FireflyIII\Models\ImportJob; +use FireflyIII\Models\Tag; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use Log; +use Mockery; +use Tests\TestCase; + +/** + * Class JobStatusControllerTest + * + * @SuppressWarnings(PHPMD.TooManyPublicMethods) + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @SuppressWarnings(PHPMD.CouplingBetweenObjects) + */ +class JobStatusControllerTest extends TestCase +{ + /** + * + */ + public function setUp() + { + parent::setUp(); + Log::debug(sprintf('Now in %s.', \get_class($this))); + } + + /** + * @covers \FireflyIII\Http\Controllers\Import\JobStatusController + */ + public function testIndex(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'Afake_job_' . random_int(1, 1000); + $job->status = 'ready_to_run'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->save(); + + // call thing. + $this->be($this->user()); + $response = $this->get(route('import.job.status.index', [$job->key])); + $response->assertStatus(200); + $response->assertSee('
                              '); + } + + /** + * @covers \FireflyIII\Http\Controllers\Import\JobStatusController + */ + public function testJson(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'Bfake_job_' . random_int(1, 1000); + $job->status = 'ready_to_run'; + $job->provider = 'file'; + $job->transactions = []; + $job->file_type = ''; + $job->save(); + + // call thing. + $this->be($this->user()); + $response = $this->get(route('import.job.status.json', [$job->key])); + $response->assertStatus(200); + $response->assertSee( + 'No transactions have been imported. Perhaps they were all duplicates is simply no transactions where present to be imported. Perhaps the log files can tell you what happened. If you import data regularly, this is normal.' + ); + } + + /** + * @covers \FireflyIII\Http\Controllers\Import\JobStatusController + */ + public function testJsonWithTag(): void + { + $tag = $this->user()->tags()->first(); + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'Cfake_job_' . random_int(1, 1000); + $job->status = 'ready_to_run'; + $job->provider = 'fake'; + $job->transactions = []; + $job->file_type = ''; + $job->tag()->associate($tag); + $job->save(); + + // call thing. + $this->be($this->user()); + $response = $this->get(route('import.job.status.json', [$job->key])); + $response->assertStatus(200); + $response->assertSee( + 'No transactions have been imported. Perhaps they were all duplicates is simply no transactions where present to be imported. Perhaps the log files can tell you what happened. If you import data regularly, this is normal.' + ); + } + + /** + * @covers \FireflyIII\Http\Controllers\Import\JobStatusController + */ + public function testJsonWithTagManyJournals(): void + { + /** @var Tag $tag */ + $tag = $this->user()->tags()->first(); + $journal = $this->user()->transactionJournals()->first(); + $second = $this->user()->transactionJournals()->where('id', '!=', $journal->id)->first(); + $tag->transactionJournals()->sync([$journal->id, $second->id]); + + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'Dfake_job_' . random_int(1, 1000); + $job->status = 'ready_to_run'; + $job->provider = 'fake'; + $job->transactions = []; + $job->file_type = ''; + $job->tag()->associate($tag); + $job->save(); + + // call thing. + $this->be($this->user()); + $response = $this->get(route('import.job.status.json', [$job->key])); + $response->assertStatus(200); + $response->assertSee( + 'Firefly III has imported 2 transactions. They are stored under tag id + ); + } + + /** + * @covers \FireflyIII\Http\Controllers\Import\JobStatusController + */ + public function testJsonWithTagOneJournal(): void + { + /** @var Tag $tag */ + $tag = $this->user()->tags()->first(); + $journal = $this->user()->transactionJournals()->first(); + $tag->transactionJournals()->sync([$journal->id]); + + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'Efake_job_' . random_int(1, 1000); + $job->status = 'ready_to_run'; + $job->provider = 'fake'; + $job->transactions = []; + $job->file_type = ''; + $job->tag()->associate($tag); + $job->save(); + + // call thing. + $this->be($this->user()); + $response = $this->get(route('import.job.status.json', [$job->key])); + $response->assertStatus(200); + $response->assertSee( + 'Exactly one transaction has been imported. It is stored under tag id + ); + } + + /** + * @covers \FireflyIII\Http\Controllers\Import\JobStatusController + */ + public function testStart(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'Ffake_job_' . random_int(1, 1000); + $job->status = 'ready_to_run'; + $job->provider = 'fake'; + $job->transactions = []; + $job->file_type = ''; + $job->save(); + + // mock stuff + $repository = $this->mock(ImportJobRepositoryInterface::class); + $routine = $this->mock(FakeRoutine::class); + + // mock calls: + $routine->shouldReceive('setImportJob')->once(); + $routine->shouldReceive('run')->once(); + + // call thing. + $this->be($this->user()); + $response = $this->post(route('import.job.start', [$job->key])); + $response->assertStatus(200); + $response->assertExactJson(['status' => 'OK', 'message' => 'stage_finished']); + } + + /** + * @covers \FireflyIII\Http\Controllers\Import\JobStatusController + */ + public function testStartException(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'Gfake_job_' . random_int(1, 1000); + $job->status = 'ready_to_run'; + $job->provider = 'fake'; + $job->transactions = []; + $job->file_type = ''; + $job->save(); + + // mock stuff + $repository = $this->mock(ImportJobRepositoryInterface::class); + $routine = $this->mock(FakeRoutine::class); + + // mock calls: + $repository->shouldReceive('setStatus')->once()->withArgs([Mockery::any(), 'error']); + $routine->shouldReceive('setImportJob')->once(); + $routine->shouldReceive('run')->andThrow(new Exception('Unknown exception')); + + // call thing. + $this->be($this->user()); + $response = $this->post(route('import.job.start', [$job->key])); + $response->assertStatus(200); + $response->assertExactJson(['status' => 'NOK', 'message' => 'The import routine crashed: Unknown exception']); + } + + /** + * @covers \FireflyIII\Http\Controllers\Import\JobStatusController + */ + public function testStartFireflyException(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'Hfake_job_' . random_int(1, 1000); + $job->status = 'ready_to_run'; + $job->provider = 'fake'; + $job->transactions = []; + $job->file_type = ''; + $job->save(); + + // mock stuff + $repository = $this->mock(ImportJobRepositoryInterface::class); + $routine = $this->mock(FakeRoutine::class); + + // mock calls: + $repository->shouldReceive('setStatus')->once()->withArgs([Mockery::any(), 'error']); + $routine->shouldReceive('setImportJob')->once(); + $routine->shouldReceive('run')->andThrow(new FireflyException('Unknown exception')); + + // call thing. + $this->be($this->user()); + $response = $this->post(route('import.job.start', [$job->key])); + $response->assertStatus(200); + $response->assertExactJson(['status' => 'NOK', 'message' => 'The import routine crashed: Unknown exception']); + } + + /** + * @covers \FireflyIII\Http\Controllers\Import\JobStatusController + */ + public function testStartInvalidState(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'Ifake_job_' . random_int(1, 1000); + $job->status = 'bad_state'; + $job->provider = 'fake'; + $job->transactions = []; + $job->file_type = ''; + $job->save(); + + // call thing. + $this->be($this->user()); + $response = $this->post(route('import.job.start', [$job->key])); + $response->assertStatus(200); + $response->assertExactJson(['status' => 'NOK', 'message' => 'JobStatusController::start expects status "ready_to_run" instead of "error".']); + } + + /** + * @covers \FireflyIII\Http\Controllers\Import\JobStatusController + */ + public function testStore(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'Jfake_job_' . random_int(1, 1000); + $job->status = 'provider_finished'; + $job->provider = 'fake'; + $job->transactions = []; + $job->file_type = ''; + $job->save(); + + // mock stuff + $repository = $this->mock(ImportJobRepositoryInterface::class); + $storage = $this->mock(ImportArrayStorage::class); + + // mock calls: + $repository->shouldReceive('setStatus')->once()->withArgs([Mockery::any(), 'storing_data']); + $repository->shouldReceive('setStatus')->once()->withArgs([Mockery::any(), 'storage_finished']); + $storage->shouldReceive('setImportJob')->once(); + $storage->shouldReceive('store')->once(); + + + $this->be($this->user()); + $response = $this->post(route('import.job.store', [$job->key])); + $response->assertStatus(200); + $response->assertExactJson(['status' => 'OK', 'message' => 'storage_finished']); + } + + /** + * @covers \FireflyIII\Http\Controllers\Import\JobStatusController + */ + public function testStoreException(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'Lfake_job_' . random_int(1, 1000); + $job->status = 'provider_finished'; + $job->provider = 'fake'; + $job->transactions = []; + $job->file_type = ''; + $job->save(); + + // mock stuff + $repository = $this->mock(ImportJobRepositoryInterface::class); + $storage = $this->mock(ImportArrayStorage::class); + + // mock calls: + $repository->shouldReceive('setStatus')->once()->withArgs([Mockery::any(), 'storing_data']); + $repository->shouldReceive('setStatus')->once()->withArgs([Mockery::any(), 'error']); + $storage->shouldReceive('setImportJob')->once(); + $storage->shouldReceive('store')->once()->andThrow(new FireflyException('Some storage exception.')); + + + $this->be($this->user()); + $response = $this->post(route('import.job.store', [$job->key])); + $response->assertStatus(200); + $response->assertExactJson(['status' => 'NOK', 'message' => 'The import storage routine crashed: Some storage exception.']); + } + + /** + * @covers \FireflyIII\Http\Controllers\Import\JobStatusController + */ + public function testStoreInvalidState(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'Kfake_job_' . random_int(1, 1000); + $job->status = 'some_bad_state'; + $job->provider = 'fake'; + $job->transactions = []; + $job->file_type = ''; + $job->save(); + + $this->be($this->user()); + $response = $this->post(route('import.job.store', [$job->key])); + $response->assertStatus(200); + $response->assertExactJson( + ['status' => 'NOK', 'message' => 'JobStatusController::start expects status "provider_finished" instead of "' . $job->status . '".'] + ); + } +} diff --git a/tests/Feature/Controllers/Import/PrerequisitesControllerTest.php b/tests/Feature/Controllers/Import/PrerequisitesControllerTest.php index d772bb6265..579d614f58 100644 --- a/tests/Feature/Controllers/Import/PrerequisitesControllerTest.php +++ b/tests/Feature/Controllers/Import/PrerequisitesControllerTest.php @@ -22,9 +22,12 @@ declare(strict_types=1); namespace Tests\Feature\Controllers\Import; -use FireflyIII\Import\Prerequisites\FilePrerequisites; +use FireflyIII\Import\Prerequisites\FakePrerequisites; +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; use Illuminate\Support\MessageBag; use Log; +use Mockery; use Tests\TestCase; /** @@ -46,74 +49,191 @@ class PrerequisitesControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\Import\PrerequisitesController::__construct - * @covers \FireflyIII\Http\Controllers\Import\PrerequisitesController::index + * @covers \FireflyIII\Http\Controllers\Import\PrerequisitesController */ - public function testIndex() + public function testIndex(): void { - $object = $this->mock(FilePrerequisites::class); - $object->shouldReceive('setUser'); - $object->shouldReceive('hasPrerequisites')->andReturn(true); - $object->shouldReceive('getView')->andReturn('error'); // does not matter which view is returned - $object->shouldReceive('getViewParameters')->andReturn([]); - $this->be($this->user()); + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'A_pre_job_' . random_int(1, 1000); + $job->status = 'new'; + $job->provider = 'fake'; + $job->transactions = []; + $job->file_type = ''; + $job->save(); - $response = $this->get(route('import.prerequisites', ['file'])); + // mock stuff + $prereq = $this->mock(FakePrerequisites::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + + $prereq->shouldReceive('setUser')->once(); + $prereq->shouldReceive('isComplete')->once()->andReturn(false); + $prereq->shouldReceive('getView')->once()->andReturn('import.fake.prerequisites'); + $prereq->shouldReceive('getViewParameters')->once()->andReturn(['api_key' => '']); + + + $this->be($this->user()); + $response = $this->get(route('import.prerequisites.index', ['fake', $job->key])); $response->assertStatus(200); } /** - * @covers \FireflyIII\Http\Controllers\Import\PrerequisitesController::index + * @covers \FireflyIII\Http\Controllers\Import\PrerequisitesController */ - public function testIndexRedirect() + public function testIndexBadState(): void { - $object = $this->mock(FilePrerequisites::class); - $object->shouldReceive('setUser'); - $object->shouldReceive('hasPrerequisites')->andReturn(false); - $this->be($this->user()); + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'B_pre_job_' . random_int(1, 1000); + $job->status = 'some_Bad_state'; + $job->provider = 'fake'; + $job->transactions = []; + $job->file_type = ''; + $job->save(); - $response = $this->get(route('import.prerequisites', ['file'])); + $this->be($this->user()); + $response = $this->get(route('import.prerequisites.index', ['fake', $job->key])); $response->assertStatus(302); - $response->assertRedirect(route('import.create-job', ['file'])); + $response->assertRedirect(route('import.index')); + } + + /** + * @covers \FireflyIII\Http\Controllers\Import\PrerequisitesController + */ + public function testIndexComplete(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'C_pre_job_' . random_int(1, 1000); + $job->status = 'new'; + $job->provider = 'fake'; + $job->transactions = []; + $job->file_type = ''; + $job->save(); + + // mock stuff + $prereq = $this->mock(FakePrerequisites::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + + $repository->shouldReceive('setStatus')->once()->withArgs([Mockery::any(), 'has_prereq']); + $prereq->shouldReceive('setUser')->once(); + $prereq->shouldReceive('isComplete')->once()->andReturn(true); + + $this->be($this->user()); + $response = $this->get(route('import.prerequisites.index', ['fake', $job->key])); + $response->assertStatus(302); + $response->assertRedirect(route('import.job.configuration.index', [$job->key])); } /** - * @covers \FireflyIII\Http\Controllers\Import\PrerequisitesController::post + * Redirects to configuration. + * + * @covers \FireflyIII\Http\Controllers\Import\PrerequisitesController */ - public function testPost() + public function testPost(): void { - $messageBag = new MessageBag; - $messageBag->add('nomessage', 'nothing'); - $object = $this->mock(FilePrerequisites::class); - $object->shouldReceive('setUser'); - $object->shouldReceive('hasPrerequisites')->andReturn(true); - $object->shouldReceive('storePrerequisites')->andReturn($messageBag); + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'D_pre_job_' . random_int(1, 1000); + $job->status = 'new'; + $job->provider = 'fake'; + $job->transactions = []; + $job->file_type = ''; + $job->save(); + + // mock stuff + $prereq = $this->mock(FakePrerequisites::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + + $prereq->shouldReceive('setUser')->once(); + $prereq->shouldReceive('storePrerequisites')->once()->andReturn(new MessageBag); + $repository->shouldReceive('setStatus')->once()->withArgs([Mockery::any(), 'has_prereq']); + $this->be($this->user()); - - $response = $this->post(route('import.prerequisites.post', ['file']), []); + $response = $this->post(route('import.prerequisites.post', ['fake', $job->key])); $response->assertStatus(302); - $response->assertSessionHas('error'); - $response->assertRedirect(route('import.prerequisites', ['file'])); - + $response->assertRedirect(route('import.job.configuration.index', [$job->key])); } /** - * @covers \FireflyIII\Http\Controllers\Import\PrerequisitesController::post + * Bad state gives errors. + * + * @covers \FireflyIII\Http\Controllers\Import\PrerequisitesController */ - public function testPostDone() + public function testPostBadState(): void { - $messageBag = new MessageBag; - $messageBag->add('nomessage', 'nothing'); - $object = $this->mock(FilePrerequisites::class); - $object->shouldReceive('setUser'); - $object->shouldReceive('hasPrerequisites')->andReturn(false); + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'D_pre_job_' . random_int(1, 1000); + $job->status = 'badstate'; + $job->provider = 'fake'; + $job->transactions = []; + $job->file_type = ''; + $job->save(); + + // mock stuff + $prereq = $this->mock(FakePrerequisites::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + $this->be($this->user()); - - $response = $this->post(route('import.prerequisites.post', ['file']), []); + $response = $this->post(route('import.prerequisites.post', ['fake', $job->key])); $response->assertStatus(302); - $response->assertRedirect(route('import.create-job', ['file'])); + $response->assertRedirect(route('import.index')); + $response->assertSessionHas('error', 'To access this page, your import job cannot have status "badstate".'); + } + /** + * Redirects to index. + * + * @covers \FireflyIII\Http\Controllers\Import\PrerequisitesController + */ + public function testPostNoJob(): void + { + // mock stuff + $prereq = $this->mock(FakePrerequisites::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + + $prereq->shouldReceive('setUser')->once(); + $prereq->shouldReceive('storePrerequisites')->once()->andReturn(new MessageBag); + + $this->be($this->user()); + $response = $this->post(route('import.prerequisites.post', ['fake'])); + $response->assertStatus(302); + $response->assertRedirect(route('import.index')); + } + + /** + * Error messages? Redirect back + * + * @covers \FireflyIII\Http\Controllers\Import\PrerequisitesController + */ + public function testPostWithMessages(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'D_pre_job_' . random_int(1, 1000); + $job->status = 'new'; + $job->provider = 'fake'; + $job->transactions = []; + $job->file_type = ''; + $job->save(); + + $messages = new MessageBag; + $messages->add('some', 'message'); + + // mock stuff + $prereq = $this->mock(FakePrerequisites::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + + $prereq->shouldReceive('setUser')->once(); + $prereq->shouldReceive('storePrerequisites')->once()->andReturn($messages); + + $this->be($this->user()); + $response = $this->post(route('import.prerequisites.post', ['fake', $job->key])); + $response->assertStatus(302); + $response->assertRedirect(route('import.prerequisites.index', ['fake', $job->key])); + $response->assertSessionHas('error', 'message'); } } diff --git a/tests/Feature/Controllers/Import/StatusControllerTest.php b/tests/Feature/Controllers/Import/StatusControllerTest.php deleted file mode 100644 index f8e469a4b1..0000000000 --- a/tests/Feature/Controllers/Import/StatusControllerTest.php +++ /dev/null @@ -1,96 +0,0 @@ -. - */ -declare(strict_types=1); - -namespace Tests\Feature\Controllers\Import; - -use FireflyIII\Repositories\Tag\TagRepositoryInterface; -use Log; -use Tests\TestCase; - -/** - * Class AccountControllerTest - * - * @SuppressWarnings(PHPMD.TooManyPublicMethods) - * @SuppressWarnings(PHPMD.ExcessiveMethodLength) - * @SuppressWarnings(PHPMD.CouplingBetweenObjects) - */ -class StatusControllerTest extends TestCase -{ - /** - * - */ - public function setUp() - { - parent::setUp(); - Log::debug(sprintf('Now in %s.', \get_class($this))); - } - - /** - * @covers \FireflyIII\Http\Controllers\Import\StatusController::__construct - * @covers \FireflyIII\Http\Controllers\Import\StatusController::index - */ - public function testIndex() - { - $this->be($this->user()); - $response = $this->get(route('import.status', ['configured'])); - $response->assertStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Import\StatusController::__construct - * @covers \FireflyIII\Http\Controllers\Import\StatusController::index - */ - public function testIndexRedirect() - { - $this->be($this->user()); - $response = $this->get(route('import.status', ['new'])); - $response->assertStatus(302); - $response->assertRedirect(route('import.configure', ['new'])); - - } - - /** - * @covers \FireflyIII\Http\Controllers\Import\StatusController::__construct - * @covers \FireflyIII\Http\Controllers\Import\StatusController::json - */ - public function testStatusFinished() - { - $tag = $this->user()->tags()->first(); - $repository = $this->mock(TagRepositoryInterface::class); - $repository->shouldReceive('find')->andReturn($tag); - $this->be($this->user()); - $response = $this->get(route('import.status.json', ['finished'])); - $response->assertStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\Import\StatusController::__construct - * @covers \FireflyIII\Http\Controllers\Import\StatusController::json - */ - public function testStatusRunning() - { - $this->be($this->user()); - $response = $this->get(route('import.status.json', ['running'])); - $response->assertStatus(200); - } - -} diff --git a/tests/Feature/Controllers/JavascriptControllerTest.php b/tests/Feature/Controllers/JavascriptControllerTest.php index 6a4584da05..b4f0b30905 100644 --- a/tests/Feature/Controllers/JavascriptControllerTest.php +++ b/tests/Feature/Controllers/JavascriptControllerTest.php @@ -22,6 +22,7 @@ declare(strict_types=1); namespace Tests\Feature\Controllers; +use Amount; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; use FireflyIII\Models\TransactionCurrency; @@ -29,8 +30,8 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use Illuminate\Support\Collection; use Log; -use Tests\TestCase; use Mockery; +use Tests\TestCase; /** * Class JavascriptControllerTest @@ -54,7 +55,7 @@ class JavascriptControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\JavascriptController::accounts */ - public function testAccounts() + public function testAccounts(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); @@ -63,7 +64,7 @@ class JavascriptControllerTest extends TestCase $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection([$account])) ->withArgs([[AccountType::DEFAULT, AccountType::ASSET]])->once(); $currencyRepos->shouldReceive('findByCodeNull')->withArgs(['EUR'])->andReturn(new TransactionCurrency); - $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(),'currency_id'])->andReturn('1'); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1'); $this->be($this->user()); $response = $this->get(route('javascript.accounts')); @@ -73,14 +74,13 @@ class JavascriptControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\JavascriptController::currencies */ - public function testCurrencies() + public function testCurrencies(): void { $repository = $this->mock(CurrencyRepositoryInterface::class); $currency = factory(TransactionCurrency::class)->make(); $repository->shouldReceive('get')->andReturn(new Collection([$currency])); - $this->be($this->user()); $response = $this->get(route('javascript.currencies')); $response->assertStatus(200); @@ -94,13 +94,39 @@ class JavascriptControllerTest extends TestCase * * @dataProvider dateRangeProvider */ - public function testVariables(string $range) + public function testVariables(string $range): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $accountRepos->shouldReceive('findNull')->andReturn(new Account); $currencyRepos->shouldReceive('findNull')->andReturn(TransactionCurrency::find(1)); - $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(),'currency_id'])->andReturn('1'); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1'); + $this->be($this->user()); + $this->changeDateRange($this->user(), $range); + $response = $this->get(route('javascript.variables')); + $response->assertStatus(200); + } + + + /** + * @covers \FireflyIII\Http\Controllers\JavascriptController::variables + * @covers \FireflyIII\Http\Controllers\JavascriptController::getDateRangeConfig + * + * @param string $range + * + * @dataProvider dateRangeProvider + */ + public function testVariablesNull(string $range): void + { + Amount::shouldReceive('getDefaultCurrency')->andReturn(TransactionCurrency::find(1))->times(2); + Amount::shouldReceive('getJsConfig')->andReturn([])->once(); + + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $accountRepos->shouldReceive('findNull')->andReturn(new Account); + $currencyRepos->shouldReceive('findNull')->andReturn(null); + + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1'); $this->be($this->user()); $this->changeDateRange($this->user(), $range); $response = $this->get(route('javascript.variables')); @@ -115,13 +141,13 @@ class JavascriptControllerTest extends TestCase * * @dataProvider dateRangeProvider */ - public function testVariablesCustom(string $range) + public function testVariablesCustom(string $range): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $accountRepos->shouldReceive('findNull')->andReturn(new Account); $currencyRepos->shouldReceive('findNull')->andReturn(TransactionCurrency::find(1)); - $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(),'currency_id'])->andReturn('1'); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1'); $this->be($this->user()); $this->changeDateRange($this->user(), $range); diff --git a/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php b/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php index ca04c1f617..d35cbe837c 100644 --- a/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php +++ b/tests/Feature/Controllers/Json/AutoCompleteControllerTest.php @@ -25,13 +25,17 @@ namespace Tests\Feature\Controllers\Json; use FireflyIII\Helpers\Collector\JournalCollectorInterface; use FireflyIII\Models\Account; use FireflyIII\Models\AccountType; +use FireflyIII\Models\Bill; use FireflyIII\Models\Budget; use FireflyIII\Models\Category; use FireflyIII\Models\Tag; +use FireflyIII\Models\TransactionCurrency; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Bill\BillRepositoryInterface; use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; use FireflyIII\Repositories\Category\CategoryRepositoryInterface; +use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\Tag\TagRepositoryInterface; use Illuminate\Support\Collection; @@ -57,7 +61,7 @@ class AutoCompleteControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController::allAccounts */ - public function testAllAccounts() + public function testAllAccounts(): void { // mock stuff $accountA = factory(Account::class)->make(); @@ -75,9 +79,9 @@ class AutoCompleteControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController::allTransactionJournals + * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController */ - public function testAllTransactionJournals() + public function testAllTransactionJournals(): void { $collector = $this->mock(JournalCollectorInterface::class); $collector->shouldReceive('setLimit')->withArgs([250])->andReturnSelf(); @@ -90,9 +94,41 @@ class AutoCompleteControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController::budgets + * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController */ - public function testBudgets() + public function testBills(): void + { + $repository = $this->mock(BillRepositoryInterface::class); + $bills = factory(Bill::class, 10)->make(); + + $repository->shouldReceive('getActiveBills')->andReturn($bills); + + $this->be($this->user()); + $response = $this->get(route('json.bills')); + $response->assertStatus(200); + } + + + /** + * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController + */ + public function testCurrencyNames(): void + { + $repository = $this->mock(CurrencyRepositoryInterface::class); + + $currency = TransactionCurrency::find(1); + $repository->shouldReceive('get')->andReturn(new Collection([$currency]))->once(); + + $this->be($this->user()); + $response = $this->get(route('json.currency-names')); + $response->assertStatus(200); + $response->assertExactJson(['Euro']); + } + + /** + * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController + */ + public function testBudgets(): void { // mock stuff $budget = factory(Budget::class)->make(); @@ -107,9 +143,9 @@ class AutoCompleteControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController::categories + * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController */ - public function testCategories() + public function testCategories(): void { // mock stuff $category = factory(Category::class)->make(); @@ -124,9 +160,9 @@ class AutoCompleteControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController::expenseAccounts + * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController */ - public function testExpenseAccounts() + public function testExpenseAccounts(): void { // mock stuff $accountA = factory(Account::class)->make(); @@ -148,7 +184,7 @@ class AutoCompleteControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController::journalsWithId */ - public function testJournalsWithId() + public function testJournalsWithId(): void { $journal = $this->user()->transactionJournals()->where('id', '!=', 1)->first(); $journal->journal_id = $journal->id; @@ -167,7 +203,7 @@ class AutoCompleteControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController::revenueAccounts */ - public function testRevenueAccounts() + public function testRevenueAccounts(): void { // mock stuff $accountA = factory(Account::class)->make(); @@ -189,7 +225,7 @@ class AutoCompleteControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController::tags */ - public function testTags() + public function testTags(): void { // mock stuff $tag = factory(Tag::class)->make(); @@ -207,7 +243,7 @@ class AutoCompleteControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Json\AutoCompleteController::transactionJournals */ - public function testTransactionJournals() + public function testTransactionJournals(): void { // mock stuff $collector = $this->mock(JournalCollectorInterface::class); diff --git a/tests/Feature/Controllers/Json/BoxControllerTest.php b/tests/Feature/Controllers/Json/BoxControllerTest.php index d256af6183..377d139d50 100644 --- a/tests/Feature/Controllers/Json/BoxControllerTest.php +++ b/tests/Feature/Controllers/Json/BoxControllerTest.php @@ -24,6 +24,7 @@ namespace Tests\Feature\Controllers\Json; use Carbon\Carbon; use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionCurrency; use FireflyIII\Repositories\Account\AccountRepositoryInterface; use FireflyIII\Repositories\Bill\BillRepositoryInterface; @@ -49,9 +50,9 @@ class BoxControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\Json\BoxController::available + * @covers \FireflyIII\Http\Controllers\Json\BoxController */ - public function testAvailable() + public function testAvailable(): void { $return = [ 0 => [ @@ -69,10 +70,31 @@ class BoxControllerTest extends TestCase } + /** + * @covers \FireflyIII\Http\Controllers\Json\BoxController + */ + public function testAvailableDays(): void + { + $return = [ + 0 => [ + 'spent' => '-800', // more than budgeted. + ], + ]; + $repository = $this->mock(BudgetRepositoryInterface::class); + $repository->shouldReceive('getAvailableBudget')->andReturn('1000'); + $repository->shouldReceive('getActiveBudgets')->andReturn(new Collection); + $repository->shouldReceive('collectBudgetInformation')->andReturn($return); + + $this->be($this->user()); + $response = $this->get(route('json.box.available')); + $response->assertStatus(200); + + } + /** * @covers \FireflyIII\Http\Controllers\Json\BoxController::balance */ - public function testBalance() + public function testBalance(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $collector = $this->mock(JournalCollectorInterface::class); @@ -90,10 +112,35 @@ class BoxControllerTest extends TestCase $response->assertStatus(200); } + /** + * @covers \FireflyIII\Http\Controllers\Json\BoxController::balance + */ + public function testBalanceTransactions(): void + { + $transaction = new Transaction; + $transaction->transaction_currency_id = 1; + $transaction->transaction_amount ='5'; + + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $collector = $this->mock(JournalCollectorInterface::class); + + // try a collector for income: + /** @var JournalCollectorInterface $collector */ + $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); + $collector->shouldReceive('setRange')->andReturnSelf(); + $collector->shouldReceive('setTypes')->andReturnSelf(); + $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); + $collector->shouldReceive('getJournals')->andReturn(new Collection([$transaction])); + + $this->be($this->user()); + $response = $this->get(route('json.box.balance')); + $response->assertStatus(200); + } + /** * @covers \FireflyIII\Http\Controllers\Json\BoxController::bills */ - public function testBills() + public function testBills(): void { $billRepos = $this->mock(BillRepositoryInterface::class); $billRepos->shouldReceive('getBillsPaidInRange')->andReturn('0'); @@ -107,7 +154,7 @@ class BoxControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Json\BoxController::netWorth() */ - public function testNetWorth() + public function testNetWorth(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); @@ -124,7 +171,43 @@ class BoxControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Json\BoxController::netWorth() */ - public function testNetWorthFuture() + public function testNetWorthVirtual(): void + { + $account = $this->user()->accounts()->first(); + $account->virtual_balance = '1000'; + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $accountRepos->shouldReceive('getActiveAccountsByType')->andReturn(new Collection([$account])); + $currencyRepos->shouldReceive('findNull')->andReturn(TransactionCurrency::find(1)); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1'); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountRole'])->andReturn('ccAsset'); + + $this->be($this->user()); + $response = $this->get(route('json.box.net-worth')); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Json\BoxController::netWorth() + */ + public function testNetWorthNoCurrency(): void + { + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $accountRepos->shouldReceive('getActiveAccountsByType')->andReturn(new Collection([$this->user()->accounts()->first()])); + $currencyRepos->shouldReceive('findNull')->andReturn(null); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1'); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'accountRole'])->andReturn('ccAsset'); + + $this->be($this->user()); + $response = $this->get(route('json.box.net-worth')); + $response->assertStatus(200); + } + + /** + * @covers \FireflyIII\Http\Controllers\Json\BoxController::netWorth() + */ + public function testNetWorthFuture(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); diff --git a/tests/Feature/Controllers/Json/ExchangeControllerTest.php b/tests/Feature/Controllers/Json/ExchangeControllerTest.php index 2a988029d0..b14ef260be 100644 --- a/tests/Feature/Controllers/Json/ExchangeControllerTest.php +++ b/tests/Feature/Controllers/Json/ExchangeControllerTest.php @@ -48,7 +48,7 @@ class ExchangeControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Json\ExchangeController::getRate */ - public function testGetRate() + public function testGetRate(): void { $repository = $this->mock(CurrencyRepositoryInterface::class); @@ -63,7 +63,7 @@ class ExchangeControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Json\ExchangeController::getRate */ - public function testGetRateAmount() + public function testGetRateAmount(): void { $repository = $this->mock(CurrencyRepositoryInterface::class); $rate = factory(CurrencyExchangeRate::class)->make(); diff --git a/tests/Feature/Controllers/Json/FrontpageControllerTest.php b/tests/Feature/Controllers/Json/FrontpageControllerTest.php index 4aa8a2cc8e..1b55763e05 100644 --- a/tests/Feature/Controllers/Json/FrontpageControllerTest.php +++ b/tests/Feature/Controllers/Json/FrontpageControllerTest.php @@ -48,7 +48,7 @@ class FrontpageControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Json\FrontpageController::piggyBanks */ - public function testPiggyBanks() + public function testPiggyBanks(): void { $piggy = $this->user()->piggyBanks()->first(); $repository = $this->mock(PiggyBankRepositoryInterface::class); diff --git a/tests/Feature/Controllers/Json/IntroControllerTest.php b/tests/Feature/Controllers/Json/IntroControllerTest.php index ea69192574..924c3ca86f 100644 --- a/tests/Feature/Controllers/Json/IntroControllerTest.php +++ b/tests/Feature/Controllers/Json/IntroControllerTest.php @@ -49,7 +49,7 @@ class IntroControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Json\IntroController::getSpecificSteps * @covers \FireflyIII\Http\Controllers\Json\IntroController::hasOutroStep */ - public function testGetIntroSteps() + public function testGetIntroSteps(): void { $this->be($this->user()); $response = $this->get(route('json.intro', ['index'])); @@ -62,7 +62,7 @@ class IntroControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Json\IntroController::getSpecificSteps * @covers \FireflyIII\Http\Controllers\Json\IntroController::hasOutroStep */ - public function testGetIntroStepsAsset() + public function testGetIntroStepsAsset(): void { $this->be($this->user()); $response = $this->get(route('json.intro', ['accounts_create', 'asset'])); @@ -75,7 +75,7 @@ class IntroControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Json\IntroController::getSpecificSteps * @covers \FireflyIII\Http\Controllers\Json\IntroController::hasOutroStep */ - public function testGetIntroStepsOutro() + public function testGetIntroStepsOutro(): void { $this->be($this->user()); $response = $this->get(route('json.intro', ['reports_report', 'category'])); @@ -85,7 +85,7 @@ class IntroControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Json\IntroController::postEnable */ - public function testPostEnable() + public function testPostEnable(): void { $this->be($this->user()); $response = $this->post(route('json.intro.enable', ['accounts_create', 'asset'])); @@ -95,7 +95,7 @@ class IntroControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Json\IntroController::postFinished */ - public function testPostFinished() + public function testPostFinished(): void { $this->be($this->user()); $response = $this->post(route('json.intro.finished', ['accounts_create', 'asset'])); diff --git a/tests/Feature/Controllers/JsonControllerTest.php b/tests/Feature/Controllers/JsonControllerTest.php index acaf571179..a163c15f56 100644 --- a/tests/Feature/Controllers/JsonControllerTest.php +++ b/tests/Feature/Controllers/JsonControllerTest.php @@ -49,7 +49,7 @@ class JsonControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\JsonController::action * @covers \FireflyIII\Http\Controllers\JsonController::__construct */ - public function testAction() + public function testAction(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -63,7 +63,7 @@ class JsonControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\JsonController::trigger */ - public function testTrigger() + public function testTrigger(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); diff --git a/tests/Feature/Controllers/NewUserControllerTest.php b/tests/Feature/Controllers/NewUserControllerTest.php index 933821bc49..103b04b4cf 100644 --- a/tests/Feature/Controllers/NewUserControllerTest.php +++ b/tests/Feature/Controllers/NewUserControllerTest.php @@ -50,10 +50,9 @@ class NewUserControllerTest extends TestCase /** - * @covers \FireflyIII\Http\Controllers\NewUserController::index - * @covers \FireflyIII\Http\Controllers\NewUserController::__construct + * @covers \FireflyIII\Http\Controllers\NewUserController */ - public function testIndex() + public function testIndex(): void { // mock stuff $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -68,10 +67,9 @@ class NewUserControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\NewUserController::index - * @covers \FireflyIII\Http\Controllers\NewUserController::__construct + * @covers \FireflyIII\Http\Controllers\NewUserController */ - public function testIndexExisting() + public function testIndexExisting(): void { // mock stuff $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -86,11 +84,9 @@ class NewUserControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\NewUserController::submit - * @covers \FireflyIII\Http\Controllers\NewUserController::createAssetAccount - * @covers \FireflyIII\Http\Controllers\NewUserController::createSavingsAccount + * @covers \FireflyIII\Http\Controllers\NewUserController */ - public function testSubmit() + public function testSubmit(): void { // mock stuff $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); @@ -114,9 +110,36 @@ class NewUserControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\NewUserController::submit + * @covers \FireflyIII\Http\Controllers\NewUserController */ - public function testSubmitSingle() + public function testSubmitNull(): void + { + // mock stuff + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $accountRepos->shouldReceive('store')->times(3); + $currencyRepos->shouldReceive('findNull')->andReturn(null); + $currencyRepos->shouldReceive('findByCodeNull')->withArgs(['EUR'])->andReturn(TransactionCurrency::find(2))->once(); + + $data = [ + 'bank_name' => 'New bank', + 'savings_balance' => '1000', + 'bank_balance' => '100', + 'language' => 'en_US', + 'amount_currency_id_bank_balance' => 1, + ]; + $this->be($this->emptyUser()); + $response = $this->post(route('new-user.submit'), $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + + /** + * @covers \FireflyIII\Http\Controllers\NewUserController + */ + public function testSubmitSingle(): void { // mock stuff $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); diff --git a/tests/Feature/Controllers/PiggyBankControllerTest.php b/tests/Feature/Controllers/PiggyBankControllerTest.php index 57a4fd3471..5361a41471 100644 --- a/tests/Feature/Controllers/PiggyBankControllerTest.php +++ b/tests/Feature/Controllers/PiggyBankControllerTest.php @@ -34,6 +34,7 @@ use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\PiggyBank\PiggyBankRepositoryInterface; use Illuminate\Support\Collection; use Log; +use Mockery; use Steam; use Tests\TestCase; @@ -57,9 +58,9 @@ class PiggyBankControllerTest extends TestCase /** - * @covers \FireflyIII\Http\Controllers\PiggyBankController::add + * @covers \FireflyIII\Http\Controllers\PiggyBankController */ - public function testAdd() + public function testAdd(): void { // mock stuff $piggyRepos = $this->mock(PiggyBankRepositoryInterface::class); @@ -74,9 +75,9 @@ class PiggyBankControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\PiggyBankController::addMobile + * @covers \FireflyIII\Http\Controllers\PiggyBankController */ - public function testAddMobile() + public function testAddMobile(): void { // mock stuff $piggyRepos = $this->mock(PiggyBankRepositoryInterface::class); @@ -92,9 +93,9 @@ class PiggyBankControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\PiggyBankController::create + * @covers \FireflyIII\Http\Controllers\PiggyBankController */ - public function testCreate() + public function testCreate(): void { // mock stuff @@ -124,9 +125,9 @@ class PiggyBankControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\PiggyBankController::delete + * @covers \FireflyIII\Http\Controllers\PiggyBankController */ - public function testDelete() + public function testDelete(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -139,9 +140,9 @@ class PiggyBankControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\PiggyBankController::destroy + * @covers \FireflyIII\Http\Controllers\PiggyBankController */ - public function testDestroy() + public function testDestroy(): void { // mock stuff $repository = $this->mock(PiggyBankRepositoryInterface::class); @@ -159,9 +160,9 @@ class PiggyBankControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\PiggyBankController::edit + * @covers \FireflyIII\Http\Controllers\PiggyBankController */ - public function testEdit() + public function testEdit(): void { // mock stuff $account = factory(Account::class)->make(); @@ -189,10 +190,10 @@ class PiggyBankControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\PiggyBankController::index - * @covers \FireflyIII\Http\Controllers\PiggyBankController::__construct + * @covers \FireflyIII\Http\Controllers\PiggyBankController + * @covers \FireflyIII\Http\Controllers\PiggyBankController */ - public function testIndex() + public function testIndex(): void { // mock stuff $repository = $this->mock(PiggyBankRepositoryInterface::class); @@ -204,6 +205,9 @@ class PiggyBankControllerTest extends TestCase $repository->shouldReceive('getPiggyBanks')->andReturn(new Collection([$one, $two])); $repository->shouldReceive('getCurrentAmount')->andReturn('10'); $repository->shouldReceive('setUser'); + $repository->shouldReceive('correctOrder'); + $repository->shouldReceive('getSuggestedMonthlyAmount')->andReturn('1'); + Steam::shouldReceive('balance')->twice()->andReturn('1'); @@ -214,26 +218,9 @@ class PiggyBankControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\PiggyBankController::order + * @covers \FireflyIII\Http\Controllers\PiggyBankController */ - public function testOrder() - { - // mock stuff - $repository = $this->mock(PiggyBankRepositoryInterface::class); - $journalRepos = $this->mock(JournalRepositoryInterface::class); - $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $repository->shouldReceive('reset'); - $repository->shouldReceive('setOrder')->times(2); - - $this->be($this->user()); - $response = $this->post(route('piggy-banks.order'), ['order' => [1, 2]]); - $response->assertStatus(200); - } - - /** - * @covers \FireflyIII\Http\Controllers\PiggyBankController::postAdd - */ - public function testPostAdd() + public function testPostAdd(): void { // mock stuff $repository = $this->mock(PiggyBankRepositoryInterface::class); @@ -253,9 +240,9 @@ class PiggyBankControllerTest extends TestCase /** * Add way too much * - * @covers \FireflyIII\Http\Controllers\PiggyBankController::postAdd + * @covers \FireflyIII\Http\Controllers\PiggyBankController */ - public function testPostAddTooMuch() + public function testPostAddTooMuch(): void { // mock stuff $repository = $this->mock(PiggyBankRepositoryInterface::class); @@ -272,9 +259,9 @@ class PiggyBankControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\PiggyBankController::postRemove + * @covers \FireflyIII\Http\Controllers\PiggyBankController */ - public function testPostRemove() + public function testPostRemove(): void { // mock stuff $repository = $this->mock(PiggyBankRepositoryInterface::class); @@ -292,9 +279,9 @@ class PiggyBankControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\PiggyBankController::postRemove + * @covers \FireflyIII\Http\Controllers\PiggyBankController */ - public function testPostRemoveTooMuch() + public function testPostRemoveTooMuch(): void { // mock stuff $repository = $this->mock(PiggyBankRepositoryInterface::class); @@ -311,9 +298,9 @@ class PiggyBankControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\PiggyBankController::remove + * @covers \FireflyIII\Http\Controllers\PiggyBankController */ - public function testRemove() + public function testRemove(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -325,9 +312,9 @@ class PiggyBankControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\PiggyBankController::removeMobile + * @covers \FireflyIII\Http\Controllers\PiggyBankController */ - public function testRemoveMobile() + public function testRemoveMobile(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -340,15 +327,37 @@ class PiggyBankControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\PiggyBankController::show + * Test setting of order/ + * + * @covers \FireflyIII\Http\Controllers\PiggyBankController */ - public function testShow() + public function testSetOrder(): void + { + // mock stuff + $repository = $this->mock(PiggyBankRepositoryInterface::class); + $repository->shouldReceive('setOrder')->once()->withArgs([Mockery::any(), 3])->andReturn(false); + + $data = ['order' => '3']; + $this->be($this->user()); + $response = $this->post(route('piggy-banks.set-order', [1]), $data); + $response->assertStatus(200); + $response->assertExactJson(['data' => 'OK']); + } + + /** + * @covers \FireflyIII\Http\Controllers\PiggyBankController + */ + public function testShow(): void { // mock stuff $repository = $this->mock(PiggyBankRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $repository->shouldReceive('getEvents')->andReturn(new Collection); + $repository->shouldReceive('getSuggestedMonthlyAmount')->andReturn('1'); + $repository->shouldReceive('getCurrentAmount')->andReturn('1'); + $this->be($this->user()); $response = $this->get(route('piggy-banks.show', [1])); @@ -357,10 +366,10 @@ class PiggyBankControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\PiggyBankController::store + * @covers \FireflyIII\Http\Controllers\PiggyBankController * @covers \FireflyIII\Http\Requests\PiggyBankFormRequest */ - public function testStore() + public function testStore(): void { // mock stuff $repository = $this->mock(PiggyBankRepositoryInterface::class); @@ -383,10 +392,10 @@ class PiggyBankControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\PiggyBankController::update + * @covers \FireflyIII\Http\Controllers\PiggyBankController * @covers \FireflyIII\Http\Requests\PiggyBankFormRequest */ - public function testUpdate() + public function testUpdate(): void { // mock stuff $repository = $this->mock(PiggyBankRepositoryInterface::class); diff --git a/tests/Feature/Controllers/Popup/ReportControllerTest.php b/tests/Feature/Controllers/Popup/ReportControllerTest.php index e384c20533..ae78a63c6b 100644 --- a/tests/Feature/Controllers/Popup/ReportControllerTest.php +++ b/tests/Feature/Controllers/Popup/ReportControllerTest.php @@ -58,7 +58,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Popup\ReportController::parseAttributes * @expectedExceptionMessage Could not parse end date */ - public function testBadEndDate() + public function testBadEndDate(): void { $this->be($this->user()); $arguments = [ @@ -82,7 +82,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Popup\ReportController::parseAttributes * @expectedExceptionMessage Could not parse start date */ - public function testBadStartDate() + public function testBadStartDate(): void { $this->be($this->user()); $arguments = [ @@ -106,7 +106,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Popup\ReportController::parseAttributes * @covers \FireflyIII\Http\Controllers\Popup\ReportController::balanceAmount */ - public function testBalanceAmountDefaultNoBudget() + public function testBalanceAmountDefaultNoBudget(): void { $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -142,7 +142,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Popup\ReportController::parseAttributes * @covers \FireflyIII\Http\Controllers\Popup\ReportController::balanceAmount */ - public function testBalanceAmountDefaultRole() + public function testBalanceAmountDefaultRole(): void { $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -178,7 +178,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Popup\ReportController::parseAttributes * @covers \FireflyIII\Http\Controllers\Popup\ReportController::balanceAmount */ - public function testBalanceAmountDiffRole() + public function testBalanceAmountDiffRole(): void { $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -216,7 +216,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Popup\ReportController::balanceAmount * @expectedExceptionMessage Firefly cannot handle this type of info-button */ - public function testBalanceAmountTagRole() + public function testBalanceAmountTagRole(): void { $categoryRepos = $this->mock(CategoryRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -251,7 +251,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Popup\ReportController::parseAttributes * @covers \FireflyIII\Http\Controllers\Popup\ReportController::budgetSpentAmount() */ - public function testBudgetSpentAmount() + public function testBudgetSpentAmount(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $categoryRepos = $this->mock(CategoryRepositoryInterface::class); @@ -284,7 +284,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Popup\ReportController::parseAttributes * @covers \FireflyIII\Http\Controllers\Popup\ReportController::categoryEntry() */ - public function testCategoryEntry() + public function testCategoryEntry(): void { $budgetRepos = $this->mock(BudgetRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -317,7 +317,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Popup\ReportController::parseAttributes * @covers \FireflyIII\Http\Controllers\Popup\ReportController::expenseEntry() */ - public function testExpenseEntry() + public function testExpenseEntry(): void { $budgetRepos = $this->mock(BudgetRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -351,7 +351,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Popup\ReportController::parseAttributes * @covers \FireflyIII\Http\Controllers\Popup\ReportController::incomeEntry() */ - public function testIncomeEntry() + public function testIncomeEntry(): void { $budgetRepos = $this->mock(BudgetRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -385,7 +385,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Popup\ReportController::parseAttributes * @expectedExceptionMessage Firefly cannot handle */ - public function testWrongLocation() + public function testWrongLocation(): void { $this->be($this->user()); $arguments = [ diff --git a/tests/Feature/Controllers/PreferencesControllerTest.php b/tests/Feature/Controllers/PreferencesControllerTest.php index b0843e8e1e..949166092e 100644 --- a/tests/Feature/Controllers/PreferencesControllerTest.php +++ b/tests/Feature/Controllers/PreferencesControllerTest.php @@ -30,7 +30,7 @@ use FireflyIII\Repositories\User\UserRepositoryInterface; use Illuminate\Support\Collection; use Log; use Tests\TestCase; -use Preferences; + /** * Class PreferencesControllerTest * @@ -54,7 +54,7 @@ class PreferencesControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\PreferencesController::index * @covers \FireflyIII\Http\Controllers\PreferencesController::__construct */ - public function testIndex() + public function testIndex(): void { // mock stuff $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -71,7 +71,7 @@ class PreferencesControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\PreferencesController::postIndex */ - public function testPostIndex() + public function testPostIndex(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); diff --git a/tests/Feature/Controllers/ProfileControllerTest.php b/tests/Feature/Controllers/ProfileControllerTest.php index d2abd0004e..d1d433b4aa 100644 --- a/tests/Feature/Controllers/ProfileControllerTest.php +++ b/tests/Feature/Controllers/ProfileControllerTest.php @@ -30,6 +30,7 @@ use FireflyIII\User; use Google2FA; use Illuminate\Support\Collection; use Log; +use Mockery; use Preferences; use Tests\TestCase; @@ -54,7 +55,7 @@ class ProfileControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\ProfileController::changeEmail() */ - public function testChangeEmail() + public function testChangeEmail(): void { $this->be($this->user()); $response = $this->get(route('profile.change-email')); @@ -65,7 +66,7 @@ class ProfileControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\ProfileController::changePassword */ - public function testChangePassword() + public function testChangePassword(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -81,7 +82,7 @@ class ProfileControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\ProfileController::code * @covers \FireflyIII\Http\Controllers\ProfileController::getDomain */ - public function testCode() + public function testCode(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -99,7 +100,7 @@ class ProfileControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\ProfileController::confirmEmailChange() * @expectedExceptionMessage Invalid token */ - public function testConfirmEmailChangeNoToken() + public function testConfirmEmailChangeNoToken(): void { Preferences::shouldReceive('findByName')->withArgs(['email_change_confirm_token'])->andReturn(new Collection()); // email_change_confirm_token @@ -108,9 +109,9 @@ class ProfileControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\ProfileController::confirmEmailChange() + * @covers \FireflyIII\Http\Controllers\ProfileController::confirmEmailChange() */ - public function testConfirmEmailWithToken() + public function testConfirmEmailWithToken(): void { $repository = $this->mock(UserRepositoryInterface::class); $repository->shouldReceive('unblockUser'); @@ -128,7 +129,7 @@ class ProfileControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\ProfileController::deleteAccount */ - public function testDeleteAccount() + public function testDeleteAccount(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -143,7 +144,7 @@ class ProfileControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\ProfileController::deleteCode */ - public function testDeleteCode() + public function testDeleteCode(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -158,10 +159,114 @@ class ProfileControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\ProfileController::index - * @covers \FireflyIII\Http\Controllers\ProfileController::__construct + * @covers \FireflyIII\Http\Controllers\ProfileController */ - public function testIndex() + public function testEnable2FADemo(): void + { + $repository = $this->mock(UserRepositoryInterface::class); + $repository->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->once()->andReturn(true); + + $this->be($this->user()); + $response = $this->post(route('profile.enable2FA')); + $response->assertStatus(302); + $response->assertRedirect(route('profile.index')); + } + + /** + * @covers \FireflyIII\Http\Controllers\ProfileController + */ + public function testEnable2FANoSecret(): void + { + $repository = $this->mock(UserRepositoryInterface::class); + $repository->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->once()->andReturn(false); + + // ask about language: + $langPreference = new Preference; + $langPreference->data = 'en_US'; + Preferences::shouldReceive('get')->withArgs(['language', 'en_US'])->andReturn($langPreference)->times(2); + + // ask about twoFactorAuthEnabled + $truePref = new Preference; + $truePref->data = true; + Preferences::shouldReceive('get')->withArgs(['twoFactorAuthEnabled', false])->andReturn($truePref)->times(1); + + // ask about range + $rangePref = new Preference; + $rangePref->data = '1M'; + Preferences::shouldReceive('get')->withArgs(['viewRange', '1M'])->andReturn($rangePref)->once(); + + // ask about list length: + $listPref = new Preference; + $listPref->data = '50'; + Preferences::shouldReceive('get')->withArgs(['list-length', '10'])->andReturn($listPref)->once(); + + + // ask about currency + $currencyPref = new Preference; + $currencyPref->data = 'EUR'; + Preferences::shouldReceive('getForUser')->once()->withArgs([Mockery::any(), 'currencyPreference', 'EUR'])->andReturn($currencyPref); + Preferences::shouldReceive('lastActivity')->once(); + Preferences::shouldReceive('get')->withArgs(['twoFactorAuthSecret'])->twice()->andReturnNull(); + + $this->be($this->user()); + $response = $this->post(route('profile.enable2FA')); + $response->assertStatus(302); + $response->assertRedirect(route('profile.code')); + } + + /** + * @covers \FireflyIII\Http\Controllers\ProfileController + */ + public function testEnable2FASecret(): void + { + $repository = $this->mock(UserRepositoryInterface::class); + $repository->shouldReceive('hasRole')->withArgs([Mockery::any(), 'demo'])->once()->andReturn(false); + + // ask about language: + $langPreference = new Preference; + $langPreference->data = 'en_US'; + Preferences::shouldReceive('get')->withArgs(['language', 'en_US'])->andReturn($langPreference)->times(2); + + // ask about twoFactorAuthEnabled + $truePref = new Preference; + $truePref->data = true; + Preferences::shouldReceive('get')->withArgs(['twoFactorAuthEnabled', false])->andReturn($truePref)->times(1); + + // ask about range + $rangePref = new Preference; + $rangePref->data = '1M'; + Preferences::shouldReceive('get')->withArgs(['viewRange', '1M'])->andReturn($rangePref)->once(); + + // ask about list length: + $listPref = new Preference; + $listPref->data = '50'; + Preferences::shouldReceive('get')->withArgs(['list-length', '10'])->andReturn($listPref)->once(); + + $secretPref= new Preference; + $secretPref->data = 'X'; + Preferences::shouldReceive('get')->withArgs(['twoFactorAuthSecret'])->twice()->andReturn(null,$secretPref); + + // set pref + Preferences::shouldReceive('set')->once()->withArgs(['twoFactorAuthEnabled', 1]); + + + // ask about currency + $currencyPref = new Preference; + $currencyPref->data = 'EUR'; + Preferences::shouldReceive('getForUser')->once()->withArgs([Mockery::any(), 'currencyPreference', 'EUR'])->andReturn($currencyPref); + Preferences::shouldReceive('lastActivity')->once(); + + + $this->be($this->user()); + $response = $this->post(route('profile.enable2FA')); + $response->assertStatus(302); + $response->assertRedirect(route('profile.index')); + } + + /** + * @covers \FireflyIII\Http\Controllers\ProfileController + */ + public function testIndex(): void { // delete access token. Preference::where('user_id', $this->user()->id)->where('name', 'access_token')->delete(); @@ -178,7 +283,7 @@ class ProfileControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\ProfileController::postChangeEmail */ - public function testPostChangeEmail() + public function testPostChangeEmail(): void { $data = [ 'email' => 'new@example.com', @@ -197,7 +302,7 @@ class ProfileControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\ProfileController::postChangeEmail */ - public function testPostChangeEmailExisting() + public function testPostChangeEmailExisting(): void { $data = [ @@ -216,7 +321,7 @@ class ProfileControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\ProfileController::postChangeEmail */ - public function testPostChangeEmailSame() + public function testPostChangeEmailSame(): void { $repository = $this->mock(UserRepositoryInterface::class); $data = [ @@ -233,7 +338,7 @@ class ProfileControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\ProfileController::postChangePassword * @covers \FireflyIII\Http\Controllers\ProfileController::validatePassword */ - public function testPostChangePassword() + public function testPostChangePassword(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -256,7 +361,7 @@ class ProfileControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\ProfileController::postChangePassword * @covers \FireflyIII\Http\Controllers\ProfileController::validatePassword */ - public function testPostChangePasswordNotCorrect() + public function testPostChangePasswordNotCorrect(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -279,7 +384,7 @@ class ProfileControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\ProfileController::postChangePassword * @covers \FireflyIII\Http\Controllers\ProfileController::validatePassword */ - public function testPostChangePasswordSameNew() + public function testPostChangePasswordSameNew(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -301,7 +406,7 @@ class ProfileControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\ProfileController::postCode */ - public function testPostCode() + public function testPostCode(): void { $secret = '0123456789abcde'; $key = '123456'; @@ -328,7 +433,7 @@ class ProfileControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\ProfileController::postDeleteAccount */ - public function testPostDeleteAccount() + public function testPostDeleteAccount(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -347,7 +452,7 @@ class ProfileControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\ProfileController::postDeleteAccount */ - public function testPostDeleteAccountWrong() + public function testPostDeleteAccountWrong(): void { // mock stuff $repository = $this->mock(UserRepositoryInterface::class); @@ -366,7 +471,7 @@ class ProfileControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\ProfileController::regenerate() */ - public function testRegenerate() + public function testRegenerate(): void { $token = ''; $currentToken = Preference::where('user_id', $this->user()->id)->where('name', 'access_token')->first(); @@ -391,7 +496,7 @@ class ProfileControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\ProfileController::undoEmailChange() */ - public function testUndoEmailChange() + public function testUndoEmailChange(): void { $hash = hash('sha256', 'previous@example.com'); $tokenPreference = new Preference; @@ -421,7 +526,7 @@ class ProfileControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\ProfileController::undoEmailChange() * @expectedExceptionMessage Invalid token */ - public function testUndoEmailChangeBadHash() + public function testUndoEmailChangeBadHash(): void { $repository = $this->mock(UserRepositoryInterface::class); $hash = hash('sha256', 'previous@example.comX'); @@ -446,7 +551,7 @@ class ProfileControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\ProfileController::undoEmailChange() * @expectedExceptionMessage Invalid token */ - public function testUndoEmailChangeBadToken() + public function testUndoEmailChangeBadToken(): void { $repository = $this->mock(UserRepositoryInterface::class); Preferences::shouldReceive('findByName')->once()->andReturn(new Collection); diff --git a/tests/Feature/Controllers/Report/AccountControllerTest.php b/tests/Feature/Controllers/Report/AccountControllerTest.php index 986988fd4e..05257e1d05 100644 --- a/tests/Feature/Controllers/Report/AccountControllerTest.php +++ b/tests/Feature/Controllers/Report/AccountControllerTest.php @@ -47,7 +47,7 @@ class AccountControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Report\AccountController::general */ - public function testGeneral() + public function testGeneral(): void { $return = [ 'accounts' => [], diff --git a/tests/Feature/Controllers/Report/BalanceControllerTest.php b/tests/Feature/Controllers/Report/BalanceControllerTest.php index 22a9fc0d8d..48dfed96c8 100644 --- a/tests/Feature/Controllers/Report/BalanceControllerTest.php +++ b/tests/Feature/Controllers/Report/BalanceControllerTest.php @@ -49,7 +49,7 @@ class BalanceControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Report\BalanceController::general */ - public function testGeneral() + public function testGeneral(): void { $balance = $this->mock(BalanceReportHelperInterface::class); $balance->shouldReceive('getBalanceReport')->andReturn(new Balance); diff --git a/tests/Feature/Controllers/Report/BudgetControllerTest.php b/tests/Feature/Controllers/Report/BudgetControllerTest.php index 0fd062528c..d82bd24270 100644 --- a/tests/Feature/Controllers/Report/BudgetControllerTest.php +++ b/tests/Feature/Controllers/Report/BudgetControllerTest.php @@ -50,7 +50,7 @@ class BudgetControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Report\BudgetController::general */ - public function testGeneral() + public function testGeneral(): void { $return = []; $helper = $this->mock(BudgetReportHelperInterface::class); @@ -65,7 +65,7 @@ class BudgetControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Report\BudgetController::period * @covers \FireflyIII\Http\Controllers\Report\BudgetController::filterBudgetPeriodReport */ - public function testPeriod() + public function testPeriod(): void { $first = [1 => ['entries' => ['1', '1']]]; $second = ['entries' => ['1', '1']]; diff --git a/tests/Feature/Controllers/Report/CategoryControllerTest.php b/tests/Feature/Controllers/Report/CategoryControllerTest.php index 5c5a25ece5..8d95399c20 100644 --- a/tests/Feature/Controllers/Report/CategoryControllerTest.php +++ b/tests/Feature/Controllers/Report/CategoryControllerTest.php @@ -51,7 +51,7 @@ class CategoryControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Report\CategoryController::expenses * @covers \FireflyIII\Http\Controllers\Report\CategoryController::filterReport */ - public function testExpenses() + public function testExpenses(): void { $first = [1 => ['entries' => ['1', '1']]]; $second = ['entries' => ['1', '1']]; @@ -69,7 +69,7 @@ class CategoryControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Report\CategoryController::income * @covers \FireflyIII\Http\Controllers\Report\CategoryController::filterReport */ - public function testIncome() + public function testIncome(): void { $first = [1 => ['entries' => ['1', '1']]]; $second = ['entries' => ['1', '1']]; @@ -86,7 +86,7 @@ class CategoryControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Report\CategoryController::operations */ - public function testOperations() + public function testOperations(): void { $repository = $this->mock(CategoryRepositoryInterface::class); $category = factory(Category::class)->make(); diff --git a/tests/Feature/Controllers/Report/ExpenseControllerTest.php b/tests/Feature/Controllers/Report/ExpenseControllerTest.php index dcec1cb901..c2b25ff12a 100644 --- a/tests/Feature/Controllers/Report/ExpenseControllerTest.php +++ b/tests/Feature/Controllers/Report/ExpenseControllerTest.php @@ -55,7 +55,7 @@ class ExpenseControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Report\ExpenseController::combineAccounts * @covers \FireflyIII\Http\Controllers\Report\ExpenseController::spentByBudget */ - public function testBudget() + public function testBudget(): void { $expense = $this->user()->accounts()->where('account_type_id', 4)->first(); $revenue = $this->user()->accounts()->where('account_type_id', 5)->first(); @@ -103,7 +103,7 @@ class ExpenseControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Report\ExpenseController::spentByCategory * @covers \FireflyIII\Http\Controllers\Report\ExpenseController::earnedByCategory */ - public function testCategory() + public function testCategory(): void { $expense = $this->user()->accounts()->where('account_type_id', 4)->first(); $revenue = $this->user()->accounts()->where('account_type_id', 5)->first(); @@ -160,7 +160,7 @@ class ExpenseControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Report\ExpenseController::spentInPeriod * @covers \FireflyIII\Http\Controllers\Report\ExpenseController::earnedInPeriod */ - public function testSpent() + public function testSpent(): void { $expense = $this->user()->accounts()->where('account_type_id', 4)->first(); $revenue = $this->user()->accounts()->where('account_type_id', 5)->first(); @@ -204,7 +204,7 @@ class ExpenseControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Report\ExpenseController::topExpense */ - public function testTopExpense() + public function testTopExpense(): void { $expense = $this->user()->accounts()->where('account_type_id', 4)->first(); $revenue = $this->user()->accounts()->where('account_type_id', 5)->first(); @@ -250,7 +250,7 @@ class ExpenseControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Report\ExpenseController::topIncome */ - public function testTopIncome() + public function testTopIncome(): void { $expense = $this->user()->accounts()->where('account_type_id', 4)->first(); $revenue = $this->user()->accounts()->where('account_type_id', 5)->first(); diff --git a/tests/Feature/Controllers/Report/OperationsControllerTest.php b/tests/Feature/Controllers/Report/OperationsControllerTest.php index a6c7c959fc..dbb4eba103 100644 --- a/tests/Feature/Controllers/Report/OperationsControllerTest.php +++ b/tests/Feature/Controllers/Report/OperationsControllerTest.php @@ -48,7 +48,7 @@ class OperationsControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Report\OperationsController::expenses */ - public function testExpenses() + public function testExpenses(): void { $return = [ 1 => [ @@ -70,7 +70,7 @@ class OperationsControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Report\OperationsController::income */ - public function testIncome() + public function testIncome(): void { $tasker = $this->mock(AccountTaskerInterface::class); $tasker->shouldReceive('getIncomeReport')->andReturn([]); @@ -83,7 +83,7 @@ class OperationsControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Report\OperationsController::operations */ - public function testOperations() + public function testOperations(): void { $return = [ 1 => [ diff --git a/tests/Feature/Controllers/ReportControllerTest.php b/tests/Feature/Controllers/ReportControllerTest.php index 2aa4bbebf1..45b98ac2a1 100644 --- a/tests/Feature/Controllers/ReportControllerTest.php +++ b/tests/Feature/Controllers/ReportControllerTest.php @@ -66,7 +66,7 @@ class ReportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\ReportController::accountReport() */ - public function testAccountReport() + public function testAccountReport(): void { $budgetRepository = $this->mock(BudgetRepositoryInterface::class); $budgetRepository->shouldReceive('cleanupBudgets'); @@ -90,7 +90,7 @@ class ReportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\ReportController::auditReport */ - public function testAuditReport() + public function testAuditReport(): void { $budgetRepository = $this->mock(BudgetRepositoryInterface::class); $budgetRepository->shouldReceive('cleanupBudgets'); @@ -112,7 +112,7 @@ class ReportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\ReportController::budgetReport */ - public function testBudgetReport() + public function testBudgetReport(): void { $budgetRepository = $this->mock(BudgetRepositoryInterface::class); $budgetRepository->shouldReceive('cleanupBudgets'); @@ -134,7 +134,7 @@ class ReportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\ReportController::categoryReport */ - public function testCategoryReport() + public function testCategoryReport(): void { $budgetRepository = $this->mock(BudgetRepositoryInterface::class); $budgetRepository->shouldReceive('cleanupBudgets'); @@ -156,7 +156,7 @@ class ReportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\ReportController::defaultReport */ - public function testDefaultReport() + public function testDefaultReport(): void { $budgetRepository = $this->mock(BudgetRepositoryInterface::class); $budgetRepository->shouldReceive('cleanupBudgets'); @@ -177,7 +177,7 @@ class ReportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\ReportController::defaultReport */ - public function testDefaultReportBadDate() + public function testDefaultReportBadDate(): void { $budgetRepository = $this->mock(BudgetRepositoryInterface::class); $budgetRepository->shouldReceive('cleanupBudgets'); @@ -195,7 +195,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\ReportController::index * @covers \FireflyIII\Http\Controllers\ReportController::__construct */ - public function testIndex() + public function testIndex(): void { $budgetRepository = $this->mock(BudgetRepositoryInterface::class); $budgetRepository->shouldReceive('cleanupBudgets'); @@ -217,7 +217,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\ReportController::options * @covers \FireflyIII\Http\Controllers\ReportController::noReportOptions */ - public function testOptions() + public function testOptions(): void { $budgetRepository = $this->mock(BudgetRepositoryInterface::class); @@ -233,7 +233,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\ReportController::options * @covers \FireflyIII\Http\Controllers\ReportController::accountReportOptions() */ - public function testOptionsAccount() + public function testOptionsAccount(): void { $budgetRepository = $this->mock(BudgetRepositoryInterface::class); @@ -257,7 +257,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\ReportController::options * @covers \FireflyIII\Http\Controllers\ReportController::budgetReportOptions */ - public function testOptionsBudget() + public function testOptionsBudget(): void { $budgetRepository = $this->mock(BudgetRepositoryInterface::class); @@ -277,7 +277,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\ReportController::options * @covers \FireflyIII\Http\Controllers\ReportController::categoryReportOptions */ - public function testOptionsCategory() + public function testOptionsCategory(): void { $budgetRepository = $this->mock(BudgetRepositoryInterface::class); @@ -296,7 +296,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\ReportController::options * @covers \FireflyIII\Http\Controllers\ReportController::tagReportOptions */ - public function testOptionsTag() + public function testOptionsTag(): void { $budgetRepository = $this->mock(BudgetRepositoryInterface::class); @@ -315,7 +315,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\ReportController::postIndex * @covers \FireflyIII\Http\Requests\ReportFormRequest */ - public function testPostIndexAccountOK() + public function testPostIndexAccountOK(): void { $budgetRepository = $this->mock(BudgetRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -342,7 +342,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\ReportController::postIndex * @covers \FireflyIII\Http\Requests\ReportFormRequest */ - public function testPostIndexAuditOK() + public function testPostIndexAuditOK(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $budgetRepository = $this->mock(BudgetRepositoryInterface::class); @@ -368,7 +368,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\ReportController::postIndex * @covers \FireflyIII\Http\Requests\ReportFormRequest */ - public function testPostIndexBudgetError() + public function testPostIndexBudgetError(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $budgetRepository = $this->mock(BudgetRepositoryInterface::class); @@ -397,7 +397,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\ReportController::postIndex * @covers \FireflyIII\Http\Requests\ReportFormRequest */ - public function testPostIndexBudgetOK() + public function testPostIndexBudgetOK(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $budgetRepository = $this->mock(BudgetRepositoryInterface::class); @@ -426,7 +426,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\ReportController::postIndex * @covers \FireflyIII\Http\Requests\ReportFormRequest */ - public function testPostIndexCategoryError() + public function testPostIndexCategoryError(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $budgetRepository = $this->mock(BudgetRepositoryInterface::class); @@ -455,7 +455,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\ReportController::postIndex * @covers \FireflyIII\Http\Requests\ReportFormRequest */ - public function testPostIndexCategoryOK() + public function testPostIndexCategoryOK(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $budgetRepository = $this->mock(BudgetRepositoryInterface::class); @@ -483,7 +483,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\ReportController::postIndex * @covers \FireflyIII\Http\Requests\ReportFormRequest */ - public function testPostIndexDefaultOK() + public function testPostIndexDefaultOK(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $budgetRepository = $this->mock(BudgetRepositoryInterface::class); @@ -509,7 +509,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\ReportController::postIndex * @covers \FireflyIII\Http\Requests\ReportFormRequest */ - public function testPostIndexDefaultStartEnd() + public function testPostIndexDefaultStartEnd(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $budgetRepository = $this->mock(BudgetRepositoryInterface::class); @@ -535,7 +535,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\ReportController::postIndex * @covers \FireflyIII\Http\Requests\ReportFormRequest */ - public function testPostIndexTagError() + public function testPostIndexTagError(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $budgetRepository = $this->mock(BudgetRepositoryInterface::class); @@ -563,7 +563,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\ReportController::postIndex * @covers \FireflyIII\Http\Requests\ReportFormRequest */ - public function testPostIndexTagOK() + public function testPostIndexTagOK(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $budgetRepository = $this->mock(BudgetRepositoryInterface::class); @@ -592,7 +592,7 @@ class ReportControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\ReportController::postIndex * @covers \FireflyIII\Http\Requests\ReportFormRequest */ - public function testPostIndexZeroAccounts() + public function testPostIndexZeroAccounts(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $budgetRepository = $this->mock(BudgetRepositoryInterface::class); @@ -617,7 +617,7 @@ class ReportControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\ReportController::tagReport */ - public function testTagReport() + public function testTagReport(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $budgetRepository = $this->mock(BudgetRepositoryInterface::class); diff --git a/tests/Feature/Controllers/RuleControllerTest.php b/tests/Feature/Controllers/RuleControllerTest.php index f47903bd3a..7446ac9d5a 100644 --- a/tests/Feature/Controllers/RuleControllerTest.php +++ b/tests/Feature/Controllers/RuleControllerTest.php @@ -25,19 +25,22 @@ namespace Tests\Feature\Controllers; use Carbon\Carbon; use FireflyIII\Jobs\ExecuteRuleOnExistingTransactions; use FireflyIII\Jobs\Job; +use FireflyIII\Models\Bill; use FireflyIII\Models\Rule; use FireflyIII\Models\RuleGroup; use FireflyIII\Models\Transaction; use FireflyIII\Models\TransactionJournal; use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Bill\BillRepositoryInterface; use FireflyIII\Repositories\Journal\JournalRepositoryInterface; use FireflyIII\Repositories\Rule\RuleRepositoryInterface; use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface; use FireflyIII\TransactionRules\TransactionMatcher; use Illuminate\Support\Collection; +use Log; use Queue; use Tests\TestCase; -use Log; + /** * Class RuleControllerTest * @@ -58,26 +61,47 @@ class RuleControllerTest extends TestCase /** - * @covers \FireflyIII\Http\Controllers\RuleController::create + * @covers \FireflyIII\Http\Controllers\RuleController */ - public function testCreate() + public function testCreate(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); + $billRepos = $this->mock(BillRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); $this->be($this->user()); $response = $this->get(route('rules.create', [1])); $response->assertStatus(200); $response->assertSee('
                                '); + $response->assertViewHas('returnToBill', false); + $response->assertViewHas('bill', null); } /** - * @covers \FireflyIII\Http\Controllers\RuleController::create - * @covers \FireflyIII\Http\Controllers\RuleController::getPreviousTriggers - * @covers \FireflyIII\Http\Controllers\RuleController::getPreviousActions + * @covers \FireflyIII\Http\Controllers\RuleController */ - public function testCreatePreviousInput() + public function testCreateBill(): void + { + // mock stuff + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $billRepos = $this->mock(BillRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $billRepos->shouldReceive('find')->withArgs([1])->andReturn(Bill::find(1))->once(); + + $this->be($this->user()); + $response = $this->get(route('rules.create', [1]) . '?return=true&fromBill=1'); + $response->assertStatus(200); + $response->assertSee('
                                  '); + $response->assertViewHas('returnToBill', true); + } + + /** + * @covers \FireflyIII\Http\Controllers\RuleController + * @covers \FireflyIII\Http\Controllers\RuleController + * @covers \FireflyIII\Http\Controllers\RuleController + */ + public function testCreatePreviousInput(): void { $old = [ 'rule-trigger' => ['description_is'], @@ -100,9 +124,26 @@ class RuleControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\RuleController::delete + * @covers \FireflyIII\Http\Controllers\RuleController */ - public function testDelete() + public function testCreateReturn(): void + { + // mock stuff + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $billRepos = $this->mock(BillRepositoryInterface::class); + $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + + $this->be($this->user()); + $response = $this->get(route('rules.create', [1]) . '?return=true'); + $response->assertStatus(200); + $response->assertSee('
                                    '); + $response->assertViewHas('returnToBill', true); + } + + /** + * @covers \FireflyIII\Http\Controllers\RuleController + */ + public function testDelete(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -115,9 +156,9 @@ class RuleControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\RuleController::destroy + * @covers \FireflyIII\Http\Controllers\RuleController */ - public function testDestroy() + public function testDestroy(): void { // mock stuff $repository = $this->mock(RuleRepositoryInterface::class); @@ -134,9 +175,9 @@ class RuleControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\RuleController::down + * @covers \FireflyIII\Http\Controllers\RuleController */ - public function testDown() + public function testDown(): void { // mock stuff $repository = $this->mock(RuleRepositoryInterface::class); @@ -151,11 +192,11 @@ class RuleControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\RuleController::edit - * @covers \FireflyIII\Http\Controllers\RuleController::getCurrentActions - * @covers \FireflyIII\Http\Controllers\RuleController::getCurrentTriggers + * @covers \FireflyIII\Http\Controllers\RuleController + * @covers \FireflyIII\Http\Controllers\RuleController + * @covers \FireflyIII\Http\Controllers\RuleController */ - public function testEdit() + public function testEdit(): void { // mock stuff $groupRepos = $this->mock(RuleGroupRepositoryInterface::class); @@ -172,11 +213,11 @@ class RuleControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\RuleController::edit - * @covers \FireflyIII\Http\Controllers\RuleController::getPreviousActions - * @covers \FireflyIII\Http\Controllers\RuleController::getPreviousTriggers + * @covers \FireflyIII\Http\Controllers\RuleController + * @covers \FireflyIII\Http\Controllers\RuleController + * @covers \FireflyIII\Http\Controllers\RuleController */ - public function testEditPreviousInput() + public function testEditPreviousInput(): void { $old = [ 'rule-trigger' => ['description_is'], @@ -203,9 +244,9 @@ class RuleControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\RuleController::execute + * @covers \FireflyIII\Http\Controllers\RuleController */ - public function testExecute() + public function testExecute(): void { $account = $this->user()->accounts()->find(1); $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -233,12 +274,12 @@ class RuleControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\RuleController::index - * @covers \FireflyIII\Http\Controllers\RuleController::__construct - * @covers \FireflyIII\Http\Controllers\RuleController::createDefaultRule - * @covers \FireflyIII\Http\Controllers\RuleController::createDefaultRuleGroup + * @covers \FireflyIII\Http\Controllers\RuleController + * @covers \FireflyIII\Http\Controllers\RuleController + * @covers \FireflyIII\Http\Controllers\RuleController + * @covers \FireflyIII\Http\Controllers\RuleController */ - public function testIndex() + public function testIndex(): void { // mock stuff $repository = $this->mock(RuleRepositoryInterface::class); @@ -259,9 +300,9 @@ class RuleControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\RuleController::reorderRuleActions + * @covers \FireflyIII\Http\Controllers\RuleController */ - public function testReorderRuleActions() + public function testReorderRuleActions(): void { // mock stuff $repository = $this->mock(RuleRepositoryInterface::class); @@ -277,9 +318,9 @@ class RuleControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\RuleController::reorderRuleTriggers + * @covers \FireflyIII\Http\Controllers\RuleController */ - public function testReorderRuleTriggers() + public function testReorderRuleTriggers(): void { // mock stuff $repository = $this->mock(RuleRepositoryInterface::class); @@ -295,9 +336,9 @@ class RuleControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\RuleController::selectTransactions() + * @covers \FireflyIII\Http\Controllers\RuleController */ - public function testSelectTransactions() + public function testSelectTransactions(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos->shouldReceive('getAccountsByType')->andReturn(new Collection); @@ -309,10 +350,10 @@ class RuleControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\RuleController::store + * @covers \FireflyIII\Http\Controllers\RuleController * @covers \FireflyIII\Http\Requests\RuleFormRequest */ - public function testStore() + public function testStore(): void { // mock stuff $repository = $this->mock(RuleRepositoryInterface::class); @@ -349,10 +390,10 @@ class RuleControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\RuleController::testTriggers - * @covers \FireflyIII\Http\Controllers\RuleController::getValidTriggerList + * @covers \FireflyIII\Http\Controllers\RuleController + * @covers \FireflyIII\Http\Controllers\RuleController */ - public function testTestTriggers() + public function testTestTriggers(): void { $data = [ 'rule-trigger' => ['description_is'], @@ -377,9 +418,9 @@ class RuleControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\RuleController::testTriggersByRule() + * @covers \FireflyIII\Http\Controllers\RuleController */ - public function testTestTriggersByRule() + public function testTestTriggersByRule(): void { $matcher = $this->mock(TransactionMatcher::class); @@ -398,10 +439,10 @@ class RuleControllerTest extends TestCase /** * This actually hits an error and not the actually code but OK. * - * @covers \FireflyIII\Http\Controllers\RuleController::testTriggers - * @covers \FireflyIII\Http\Controllers\RuleController::getValidTriggerList + * @covers \FireflyIII\Http\Controllers\RuleController + * @covers \FireflyIII\Http\Controllers\RuleController */ - public function testTestTriggersError() + public function testTestTriggersError(): void { $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); @@ -413,10 +454,10 @@ class RuleControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\RuleController::testTriggers - * @covers \FireflyIII\Http\Controllers\RuleController::getValidTriggerList + * @covers \FireflyIII\Http\Controllers\RuleController + * @covers \FireflyIII\Http\Controllers\RuleController */ - public function testTestTriggersMax() + public function testTestTriggersMax(): void { $data = [ 'rule-trigger' => ['description_is'], @@ -442,9 +483,9 @@ class RuleControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\RuleController::up + * @covers \FireflyIII\Http\Controllers\RuleController */ - public function testUp() + public function testUp(): void { // mock stuff $repository = $this->mock(RuleRepositoryInterface::class); @@ -459,10 +500,10 @@ class RuleControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\RuleController::update + * @covers \FireflyIII\Http\Controllers\RuleController * @covers \FireflyIII\Http\Requests\RuleFormRequest */ - public function testUpdate() + public function testUpdate(): void { // mock stuff $repository = $this->mock(RuleRepositoryInterface::class); diff --git a/tests/Feature/Controllers/RuleGroupControllerTest.php b/tests/Feature/Controllers/RuleGroupControllerTest.php index 135b405f19..80f30a6531 100644 --- a/tests/Feature/Controllers/RuleGroupControllerTest.php +++ b/tests/Feature/Controllers/RuleGroupControllerTest.php @@ -56,7 +56,7 @@ class RuleGroupControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\RuleGroupController::create * @covers \FireflyIII\Http\Controllers\RuleGroupController::__construct */ - public function testCreate() + public function testCreate(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -71,7 +71,7 @@ class RuleGroupControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\RuleGroupController::delete */ - public function testDelete() + public function testDelete(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -88,7 +88,7 @@ class RuleGroupControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\RuleGroupController::destroy */ - public function testDestroy() + public function testDestroy(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -107,7 +107,7 @@ class RuleGroupControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\RuleGroupController::down */ - public function testDown() + public function testDown(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -124,7 +124,7 @@ class RuleGroupControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\RuleGroupController::edit */ - public function testEdit() + public function testEdit(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -139,7 +139,7 @@ class RuleGroupControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\RuleGroupController::execute */ - public function testExecute() + public function testExecute(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -166,7 +166,7 @@ class RuleGroupControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\RuleGroupController::selectTransactions * @covers \FireflyIII\Http\Controllers\RuleGroupController::__construct */ - public function testSelectTransactions() + public function testSelectTransactions(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -184,7 +184,7 @@ class RuleGroupControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\RuleGroupController::store * @covers \FireflyIII\Http\Requests\RuleGroupFormRequest */ - public function testStore() + public function testStore(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -208,7 +208,7 @@ class RuleGroupControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\RuleGroupController::up */ - public function testUp() + public function testUp(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -226,7 +226,7 @@ class RuleGroupControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\RuleGroupController::update * @covers \FireflyIII\Http\Requests\RuleGroupFormRequest */ - public function testUpdate() + public function testUpdate(): void { // mock stuff $journalRepos = $this->mock(JournalRepositoryInterface::class); diff --git a/tests/Feature/Controllers/SearchControllerTest.php b/tests/Feature/Controllers/SearchControllerTest.php index fac6dedc78..8d2a75b687 100644 --- a/tests/Feature/Controllers/SearchControllerTest.php +++ b/tests/Feature/Controllers/SearchControllerTest.php @@ -50,7 +50,7 @@ class SearchControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\SearchController::index * @covers \FireflyIII\Http\Controllers\SearchController::__construct */ - public function testIndex() + public function testIndex(): void { $search = $this->mock(SearchInterface::class); $search->shouldReceive('parseQuery')->once(); @@ -65,7 +65,7 @@ class SearchControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\SearchController::search * @covers \FireflyIII\Http\Controllers\SearchController::__construct */ - public function testSearch() + public function testSearch(): void { $search = $this->mock(SearchInterface::class); $search->shouldReceive('parseQuery')->once(); diff --git a/tests/Feature/Controllers/TagControllerTest.php b/tests/Feature/Controllers/TagControllerTest.php index 4b22d58a18..7152e7fd48 100644 --- a/tests/Feature/Controllers/TagControllerTest.php +++ b/tests/Feature/Controllers/TagControllerTest.php @@ -55,7 +55,7 @@ class TagControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\TagController::create */ - public function testCreate() + public function testCreate(): void { // mock stuff $tagRepos = $this->mock(TagRepositoryInterface::class); @@ -71,7 +71,7 @@ class TagControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\TagController::delete */ - public function testDelete() + public function testDelete(): void { // mock stuff $tagRepos = $this->mock(TagRepositoryInterface::class); @@ -87,7 +87,7 @@ class TagControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\TagController::destroy */ - public function testDestroy() + public function testDestroy(): void { // mock stuff $repository = $this->mock(TagRepositoryInterface::class); @@ -104,7 +104,7 @@ class TagControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\TagController::edit */ - public function testEdit() + public function testEdit(): void { // mock stuff $tagRepos = $this->mock(TagRepositoryInterface::class); @@ -121,7 +121,7 @@ class TagControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\TagController::index * @covers \FireflyIII\Http\Controllers\TagController::__construct */ - public function testIndex() + public function testIndex(): void { // mock stuff $repository = $this->mock(TagRepositoryInterface::class); @@ -130,6 +130,8 @@ class TagControllerTest extends TestCase $repository->shouldReceive('count')->andReturn(0); $repository->shouldReceive('tagCloud')->andReturn([]); $repository->shouldReceive('oldestTag')->andReturn(null)->once(); + $repository->shouldReceive('newestTag')->andReturn(null)->once(); + $this->be($this->user()); $response = $this->get(route('tags.index')); @@ -141,7 +143,7 @@ class TagControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\TagController::show * @covers \FireflyIII\Http\Controllers\TagController::getPeriodOverview */ - public function testShow() + public function testShow(): void { $amounts = [ TransactionType::WITHDRAWAL => '0', @@ -154,10 +156,10 @@ class TagControllerTest extends TestCase $collector = $this->mock(JournalCollectorInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $repository->shouldReceive('spentInPeriod')->andReturn('-1')->once(); + $repository->shouldReceive('spentInPeriod')->andReturn('-1')->times(1); $repository->shouldReceive('firstUseDate')->andReturn(new Carbon)->once(); $repository->shouldReceive('lastUseDate')->andReturn(new Carbon)->once(); - $repository->shouldReceive('earnedInPeriod')->andReturn('1')->once(); + $repository->shouldReceive('earnedInPeriod')->andReturn('1')->times(1); $repository->shouldReceive('sumsOfTag')->andReturn($amounts)->once(); $collector->shouldReceive('removeFilter')->andReturnSelf()->once(); @@ -180,7 +182,7 @@ class TagControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\TagController::show */ - public function testShowAll() + public function testShowAll(): void { // mock stuff $repository = $this->mock(TagRepositoryInterface::class); @@ -216,17 +218,17 @@ class TagControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\TagController::show */ - public function testShowDate() + public function testShowDate(): void { // mock stuff $repository = $this->mock(TagRepositoryInterface::class); $collector = $this->mock(JournalCollectorInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); - $repository->shouldReceive('spentInPeriod')->andReturn('-1')->once(); + $repository->shouldReceive('spentInPeriod')->andReturn('-1')->times(1); $repository->shouldReceive('firstUseDate')->andReturn(new Carbon)->once(); $repository->shouldReceive('lastUseDate')->andReturn(new Carbon)->once(); - $repository->shouldReceive('earnedInPeriod')->andReturn('1')->once(); + $repository->shouldReceive('earnedInPeriod')->andReturn('1')->times(1); $collector->shouldReceive('removeFilter')->andReturnSelf()->once(); $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf()->once(); @@ -256,7 +258,7 @@ class TagControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\TagController::store * @covers \FireflyIII\Http\Requests\TagFormRequest */ - public function testStore() + public function testStore(): void { // mock stuff $repository = $this->mock(TagRepositoryInterface::class); @@ -282,7 +284,7 @@ class TagControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\TagController::update * @covers \FireflyIII\Http\Requests\TagFormRequest */ - public function testUpdate() + public function testUpdate(): void { // mock stuff $repository = $this->mock(TagRepositoryInterface::class); diff --git a/tests/Feature/Controllers/Transaction/BulkControllerTest.php b/tests/Feature/Controllers/Transaction/BulkControllerTest.php index 700c55b57a..d8133c1b41 100644 --- a/tests/Feature/Controllers/Transaction/BulkControllerTest.php +++ b/tests/Feature/Controllers/Transaction/BulkControllerTest.php @@ -50,10 +50,10 @@ class BulkControllerTest extends TestCase /** - * @covers \FireflyIII\Http\Controllers\Transaction\BulkController::edit - * @covers \FireflyIII\Http\Controllers\Transaction\BulkController::__construct + * @covers \FireflyIII\Http\Controllers\Transaction\BulkController + * @covers \FireflyIII\Http\Controllers\Transaction\BulkController */ - public function testEdit() + public function testEdit(): void { // mock stuff: $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -75,10 +75,36 @@ class BulkControllerTest extends TestCase $response->assertSee('
                                      '); } + /** + * @covers \FireflyIII\Http\Controllers\Transaction\BulkController + * @covers \FireflyIII\Http\Controllers\Transaction\BulkController + */ + public function testEditNull(): void + { + // mock stuff: + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $budgetRepos = $this->mock(BudgetRepositoryInterface::class); + $budgetRepos->shouldReceive('getActiveBudgets')->andReturn(new Collection); + $journalRepos->shouldReceive('getJournalSourceAccounts')->andReturn(new Collection); + $journalRepos->shouldReceive('getJournalDestinationAccounts')->andReturn(new Collection); + $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal, null); + $journalRepos->shouldReceive('getTransactionType')->andReturn('Transfer'); + $journalRepos->shouldReceive('isJournalReconciled')->andReturn(false); + + $transfers = TransactionJournal::where('transaction_type_id', 3)->where('user_id', $this->user()->id)->take(4)->get()->pluck('id')->toArray(); + + $this->be($this->user()); + $response = $this->get(route('transactions.bulk.edit', $transfers)); + $response->assertStatus(200); + $response->assertSee('Bulk edit a number of transactions'); + // has bread crumb + $response->assertSee('
                                        '); + } + /** * @covers \FireflyIII\Http\Controllers\Transaction\BulkController::edit */ - public function testEditMultiple() + public function testEditMultiple(): void { // mock stuff: $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -114,7 +140,7 @@ class BulkControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\BulkController::update * @covers \FireflyIII\Http\Requests\BulkEditJournalRequest */ - public function testUpdate() + public function testUpdate(): void { $tags = ['a', 'b', 'c']; $collection = TransactionJournal::where('transaction_type_id', 1)->where('user_id', $this->user()->id)->take(4)->get(); @@ -141,6 +167,44 @@ class BulkControllerTest extends TestCase ->withArgs([Mockery::any(), ['tags' => $tags]]); + $route = route('transactions.bulk.update'); + $this->be($this->user()); + $response = $this->post($route, $data); + $response->assertStatus(302); + $response->assertSessionHas('success'); + } + + /** + * @covers \FireflyIII\Http\Controllers\Transaction\BulkController + * @covers \FireflyIII\Http\Requests\BulkEditJournalRequest + */ + public function testUpdateNull(): void + { + $tags = ['a', 'b', 'c']; + $collection = TransactionJournal::where('transaction_type_id', 1)->where('user_id', $this->user()->id)->take(4)->get(); + $allIds = $collection->pluck('id')->toArray(); + + $data = [ + 'category' => 'Some new category', + 'budget_id' => 1, + 'tags' => 'a,b,c', + 'journals' => $allIds, + ]; + + $repository = $this->mock(JournalRepositoryInterface::class); + $repository->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); + $repository->shouldReceive('findNull')->times(4)->andReturn(new TransactionJournal, null); + + $repository->shouldReceive('updateCategory')->times(1)->andReturn(new TransactionJournal()) + ->withArgs([Mockery::any(), $data['category']]); + + $repository->shouldReceive('updateBudget')->times(1)->andReturn(new TransactionJournal()) + ->withArgs([Mockery::any(), $data['budget_id']]); + + $repository->shouldReceive('updateTags')->times(1)->andReturn(new TransactionJournal()) + ->withArgs([Mockery::any(), ['tags' => $tags]]); + + $route = route('transactions.bulk.update'); $this->be($this->user()); $response = $this->post($route, $data); diff --git a/tests/Feature/Controllers/Transaction/ConvertControllerTest.php b/tests/Feature/Controllers/Transaction/ConvertControllerTest.php index c68d139478..98b31601a9 100644 --- a/tests/Feature/Controllers/Transaction/ConvertControllerTest.php +++ b/tests/Feature/Controllers/Transaction/ConvertControllerTest.php @@ -59,7 +59,7 @@ class ConvertControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::index * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::__construct */ - public function testIndexDepositTransfer() + public function testIndexDepositTransfer(): void { // mock stuff: $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -92,7 +92,7 @@ class ConvertControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::index */ - public function testIndexDepositWithdrawal() + public function testIndexDepositWithdrawal(): void { // mock stuff: $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -117,7 +117,7 @@ class ConvertControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::index */ - public function testIndexSameType() + public function testIndexSameType(): void { // mock stuff: $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -134,7 +134,7 @@ class ConvertControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::index */ - public function testIndexSplit() + public function testIndexSplit(): void { // mock stuff: $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -163,7 +163,7 @@ class ConvertControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::index */ - public function testIndexTransferDeposit() + public function testIndexTransferDeposit(): void { // mock stuff: $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -183,7 +183,7 @@ class ConvertControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::index */ - public function testIndexTransferWithdrawal() + public function testIndexTransferWithdrawal(): void { // mock stuff: $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -207,7 +207,7 @@ class ConvertControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::index */ - public function testIndexWithdrawalDeposit() + public function testIndexWithdrawalDeposit(): void { // mock stuff: $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -231,7 +231,7 @@ class ConvertControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::index */ - public function testIndexWithdrawalTransfer() + public function testIndexWithdrawalTransfer(): void { // mock stuff: $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -264,7 +264,7 @@ class ConvertControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::getSourceAccount * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::getDestinationAccount */ - public function testPostIndexDepositTransfer() + public function testPostIndexDepositTransfer(): void { // mock stuff @@ -293,7 +293,7 @@ class ConvertControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::getSourceAccount * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::getDestinationAccount */ - public function testPostIndexDepositWithdrawal() + public function testPostIndexDepositWithdrawal(): void { // mock stuff @@ -320,7 +320,7 @@ class ConvertControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::getSourceAccount * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::getDestinationAccount */ - public function testPostIndexDepositWithdrawalEmptyName() + public function testPostIndexDepositWithdrawalEmptyName(): void { // mock stuff $repository = $this->mock(JournalRepositoryInterface::class); @@ -348,7 +348,7 @@ class ConvertControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::getSourceAccount * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::getDestinationAccount */ - public function testPostIndexErrored() + public function testPostIndexErrored(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $account = $this->user()->accounts()->first(); @@ -381,7 +381,7 @@ class ConvertControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::getSourceAccount * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::getDestinationAccount */ - public function testPostIndexSameType() + public function testPostIndexSameType(): void { // mock stuff $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -404,7 +404,7 @@ class ConvertControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::getSourceAccount * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::getDestinationAccount */ - public function testPostIndexSplit() + public function testPostIndexSplit(): void { // mock stuff $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -432,7 +432,7 @@ class ConvertControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::getSourceAccount * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::getDestinationAccount */ - public function testPostIndexTransferDeposit() + public function testPostIndexTransferDeposit(): void { // mock stuff $repository = $this->mock(JournalRepositoryInterface::class); @@ -459,7 +459,7 @@ class ConvertControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::getSourceAccount * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::getDestinationAccount */ - public function testPostIndexWithdrawalDeposit() + public function testPostIndexWithdrawalDeposit(): void { // mock stuff $repository = $this->mock(JournalRepositoryInterface::class); @@ -486,7 +486,7 @@ class ConvertControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::getSourceAccount * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::getDestinationAccount */ - public function testPostIndexWithdrawalDepositEmptyName() + public function testPostIndexWithdrawalDepositEmptyName(): void { // mock stuff $repository = $this->mock(JournalRepositoryInterface::class); @@ -513,7 +513,7 @@ class ConvertControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::getSourceAccount * @covers \FireflyIII\Http\Controllers\Transaction\ConvertController::getDestinationAccount */ - public function testPostIndexWithdrawalTransfer() + public function testPostIndexWithdrawalTransfer(): void { // mock stuff $repository = $this->mock(JournalRepositoryInterface::class); diff --git a/tests/Feature/Controllers/Transaction/LinkControllerTest.php b/tests/Feature/Controllers/Transaction/LinkControllerTest.php index d9e08d550f..eb43e5e224 100644 --- a/tests/Feature/Controllers/Transaction/LinkControllerTest.php +++ b/tests/Feature/Controllers/Transaction/LinkControllerTest.php @@ -49,7 +49,7 @@ class LinkControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\LinkController::__construct * @covers \FireflyIII\Http\Controllers\Transaction\LinkController::delete */ - public function testDelete() + public function testDelete(): void { $journalRepos = $this->mock(JournalRepositoryInterface::class); $linkRepos = $this->mock(LinkTypeRepositoryInterface::class); @@ -63,7 +63,7 @@ class LinkControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Transaction\LinkController::destroy */ - public function testDestroy() + public function testDestroy(): void { $journalRepos = $this->mock(JournalRepositoryInterface::class); $repository = $this->mock(LinkTypeRepositoryInterface::class); @@ -85,7 +85,7 @@ class LinkControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\LinkController::store * @covers \FireflyIII\Http\Requests\JournalLinkRequest */ - public function testStore() + public function testStore(): void { $repository = $this->mock(LinkTypeRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -95,7 +95,7 @@ class LinkControllerTest extends TestCase ]; $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); - $journalRepos->shouldReceive('find')->andReturn(new TransactionJournal); + $journalRepos->shouldReceive('findNull')->andReturn(new TransactionJournal); $repository->shouldReceive('findLink')->andReturn(false); $repository->shouldReceive('storeLink')->andReturn(new TransactionJournalLink); @@ -107,11 +107,40 @@ class LinkControllerTest extends TestCase $response->assertRedirect(route('transactions.show', [1])); } + /** * @covers \FireflyIII\Http\Controllers\Transaction\LinkController::store * @covers \FireflyIII\Http\Requests\JournalLinkRequest */ - public function testStoreAlreadyLinked() + public function testStoreSame(): void + { + $repository = $this->mock(LinkTypeRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + $data = [ + 'link_other' => 8, + 'link_type' => '1_inward', + ]; + $journal = $this->user()->transactionJournals()->first(); + + $journalRepos->shouldReceive('firstNull')->andReturn($journal); + $journalRepos->shouldReceive('findNull')->andReturn($journal); + $repository->shouldReceive('findLink')->andReturn(false); + $repository->shouldReceive('storeLink')->andReturn(new TransactionJournalLink); + + $this->be($this->user()); + $response = $this->post(route('transactions.link.store', [$journal->id]), $data); + + $response->assertStatus(302); + $response->assertSessionHas('error'); + $response->assertRedirect(route('transactions.show', [1])); + } + + + /** + * @covers \FireflyIII\Http\Controllers\Transaction\LinkController::store + * @covers \FireflyIII\Http\Requests\JournalLinkRequest + */ + public function testStoreAlreadyLinked(): void { $repository = $this->mock(LinkTypeRepositoryInterface::class); $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -121,7 +150,7 @@ class LinkControllerTest extends TestCase ]; $journalRepos->shouldReceive('firstNull')->andReturn(new TransactionJournal); - $journalRepos->shouldReceive('find')->andReturn(new TransactionJournal); + $journalRepos->shouldReceive('findNull')->andReturn(new TransactionJournal); $repository->shouldReceive('findLink')->andReturn(true); $this->be($this->user()); @@ -136,7 +165,7 @@ class LinkControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\LinkController::store * @covers \FireflyIII\Http\Requests\JournalLinkRequest */ - public function testStoreInvalid() + public function testStoreInvalid(): void { $journalRepos = $this->mock(JournalRepositoryInterface::class); $linkRepos = $this->mock(LinkTypeRepositoryInterface::class); @@ -157,7 +186,7 @@ class LinkControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Transaction\LinkController::switchLink */ - public function testSwitchLink() + public function testSwitchLink(): void { $journalRepos = $this->mock(JournalRepositoryInterface::class); $repository = $this->mock(LinkTypeRepositoryInterface::class); diff --git a/tests/Feature/Controllers/Transaction/MassControllerTest.php b/tests/Feature/Controllers/Transaction/MassControllerTest.php index 826190672a..82ed6bb76d 100644 --- a/tests/Feature/Controllers/Transaction/MassControllerTest.php +++ b/tests/Feature/Controllers/Transaction/MassControllerTest.php @@ -54,7 +54,7 @@ class MassControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\MassController::delete * @covers \FireflyIII\Http\Controllers\Transaction\MassController::__construct */ - public function testDelete() + public function testDelete(): void { $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('firstNull')->once()->andReturn(new TransactionJournal); @@ -72,7 +72,7 @@ class MassControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Transaction\MassController::destroy */ - public function testDestroy() + public function testDestroy(): void { $deposits = TransactionJournal::where('transaction_type_id', 2)->where('user_id', $this->user()->id)->take(2)->get(); @@ -98,7 +98,7 @@ class MassControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Transaction\MassController::edit */ - public function testEdit() + public function testEdit(): void { $journalRepos = $this->mock(JournalRepositoryInterface::class); @@ -135,7 +135,7 @@ class MassControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Transaction\MassController::edit */ - public function testEditMultiple() + public function testEditMultiple(): void { $budgetRepos = $this->mock(BudgetRepositoryInterface::class); $budgetRepos->shouldReceive('getBudgets')->andReturn(new Collection); @@ -178,7 +178,7 @@ class MassControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Transaction\MassController::update */ - public function testUpdate() + public function testUpdate(): void { $deposit = TransactionJournal::where('transaction_type_id', 2)->where('user_id', $this->user()->id) ->whereNull('deleted_at') diff --git a/tests/Feature/Controllers/Transaction/SingleControllerTest.php b/tests/Feature/Controllers/Transaction/SingleControllerTest.php index 763e2ba9d6..ea2bafac0d 100644 --- a/tests/Feature/Controllers/Transaction/SingleControllerTest.php +++ b/tests/Feature/Controllers/Transaction/SingleControllerTest.php @@ -69,7 +69,7 @@ class SingleControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::cloneTransaction */ - public function testCloneTransaction() + public function testCloneTransaction(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class); @@ -102,7 +102,7 @@ class SingleControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::create * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::__construct */ - public function testCreate() + public function testCreate(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class); @@ -128,7 +128,7 @@ class SingleControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::create * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::__construct */ - public function testCreateDepositWithSource() + public function testCreateDepositWithSource(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class); @@ -153,7 +153,7 @@ class SingleControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::create * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::__construct */ - public function testCreateWithSource() + public function testCreateWithSource(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class); @@ -177,7 +177,7 @@ class SingleControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::delete */ - public function testDelete() + public function testDelete(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class); @@ -198,7 +198,7 @@ class SingleControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::destroy */ - public function testDestroy() + public function testDestroy(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class); @@ -224,7 +224,7 @@ class SingleControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::edit * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::isSplitJournal */ - public function testEdit() + public function testEdit(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class); @@ -266,7 +266,7 @@ class SingleControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::edit */ - public function testEditCashDeposit() + public function testEditCashDeposit(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class); @@ -312,7 +312,7 @@ class SingleControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::edit */ - public function testEditCashWithdrawal() + public function testEditCashWithdrawal(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class); @@ -358,7 +358,7 @@ class SingleControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::edit */ - public function testEditReconcile() + public function testEditReconcile(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class); @@ -384,7 +384,7 @@ class SingleControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::edit */ - public function testEditRedirect() + public function testEditRedirect(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class); @@ -413,7 +413,7 @@ class SingleControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::edit */ - public function testEditRedirectOpening() + public function testEditRedirectOpening(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class); @@ -433,7 +433,7 @@ class SingleControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::edit */ - public function testEditTransferWithForeignAmount() + public function testEditTransferWithForeignAmount(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class); @@ -481,7 +481,7 @@ class SingleControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::edit * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::isSplitJournal */ - public function testEditWithForeign() + public function testEditWithForeign(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class); @@ -522,7 +522,7 @@ class SingleControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::edit */ - public function testEditWithForeignAmount() + public function testEditWithForeignAmount(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class); @@ -570,7 +570,7 @@ class SingleControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::store * @covers \FireflyIII\Http\Requests\JournalFormRequest */ - public function testStoreError() + public function testStoreError(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -606,7 +606,7 @@ class SingleControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::store * @covers \FireflyIII\Http\Requests\JournalFormRequest */ - public function testStoreSuccess() + public function testStoreSuccess(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -622,8 +622,11 @@ class SingleControllerTest extends TestCase $journal->id = 1000; $journal->description = 'New journal'; $journalRepos->shouldReceive('store')->andReturn($journal); - $this->expectsEvents(StoredTransactionJournal::class); - + try { + $this->expectsEvents(StoredTransactionJournal::class); + } catch (Exception $e) { + $this->assertTrue(false, $e->getMessage()); + } $errors = new MessageBag; $errors->add('attachments', 'Fake error'); @@ -658,7 +661,7 @@ class SingleControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::store * @covers \FireflyIII\Http\Requests\JournalFormRequest */ - public function testStoreSuccessDeposit() + public function testStoreSuccessDeposit(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -674,8 +677,11 @@ class SingleControllerTest extends TestCase $journal->id = 1000; $journal->description = 'New deposit'; $journalRepos->shouldReceive('store')->andReturn($journal); - $this->expectsEvents(StoredTransactionJournal::class); - + try { + $this->expectsEvents(StoredTransactionJournal::class); + } catch (Exception $e) { + $this->assertTrue(false, $e->getMessage()); + } $errors = new MessageBag; $errors->add('attachments', 'Fake error'); @@ -710,7 +716,7 @@ class SingleControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::store * @covers \FireflyIII\Http\Requests\JournalFormRequest */ - public function testStoreSuccessTransfer() + public function testStoreSuccessTransfer(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -726,7 +732,11 @@ class SingleControllerTest extends TestCase $journal->id = 1000; $journal->description = 'New transfer'; $journalRepos->shouldReceive('store')->andReturn($journal); - $this->expectsEvents(StoredTransactionJournal::class); + try { + $this->expectsEvents(StoredTransactionJournal::class); + } catch (Exception $e) { + $this->assertTrue(false, $e->getMessage()); + } $errors = new MessageBag; $errors->add('attachments', 'Fake error'); @@ -762,7 +772,7 @@ class SingleControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::store * @covers \FireflyIII\Http\Requests\JournalFormRequest */ - public function testStoreSuccessTransferForeign() + public function testStoreSuccessTransferForeign(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -778,7 +788,11 @@ class SingleControllerTest extends TestCase $journal->id = 1000; $journal->description = 'New transfer'; $journalRepos->shouldReceive('store')->andReturn($journal); - $this->expectsEvents(StoredTransactionJournal::class); + try { + $this->expectsEvents(StoredTransactionJournal::class); + } catch (Exception $e) { + $this->assertTrue(false, $e->getMessage()); + } $errors = new MessageBag; $errors->add('attachments', 'Fake error'); @@ -816,7 +830,7 @@ class SingleControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\SingleController::update * @covers \FireflyIII\Http\Requests\JournalFormRequest */ - public function testUpdate() + public function testUpdate(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $budgetRepos = $this->mock(BudgetRepositoryInterface::class); @@ -841,7 +855,7 @@ class SingleControllerTest extends TestCase try { $this->expectsEvents(UpdatedTransactionJournal::class); } catch (Exception $e) { - $this->assertTrue(false, 'expectsEvents failed!'); + $this->assertTrue(false, $e->getMessage()); } $journal = new TransactionJournal(); diff --git a/tests/Feature/Controllers/Transaction/SplitControllerTest.php b/tests/Feature/Controllers/Transaction/SplitControllerTest.php index 1abc029112..37277fcbd0 100644 --- a/tests/Feature/Controllers/Transaction/SplitControllerTest.php +++ b/tests/Feature/Controllers/Transaction/SplitControllerTest.php @@ -65,7 +65,7 @@ class SplitControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\SplitController::updateWithPrevious * @covers \FireflyIII\Http\Controllers\Transaction\SplitController::getTransactionDataFromJournal */ - public function testEdit() + public function testEdit(): void { $currencyRepository = $this->mock(CurrencyRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -97,9 +97,6 @@ class SplitControllerTest extends TestCase $journalRepos->shouldReceive('getJournalTotal')->andReturn('0'); $journalRepos->shouldReceive('getJournalCategoryName')->andReturn('Some'); - // mock for new account list and for account array - $accountRepos->shouldReceive('getAccountsByType') - ->withArgs([[AccountType::ASSET, AccountType::DEFAULT]])->andReturn(new Collection([$account]))->twice(); $currencyRepository->shouldReceive('get')->once()->andReturn(new Collection); $budgetRepository->shouldReceive('getActiveBudgets')->andReturn(new Collection); @@ -118,7 +115,7 @@ class SplitControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\SplitController::updateWithPrevious * @covers \FireflyIII\Http\Controllers\Transaction\SplitController::getTransactionDataFromJournal */ - public function testEditOldInput() + public function testEditOldInput(): void { $currencyRepository = $this->mock(CurrencyRepositoryInterface::class); $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -138,10 +135,6 @@ class SplitControllerTest extends TestCase $currencyRepository->shouldReceive('get')->once()->andReturn(new Collection); $budgetRepository->shouldReceive('getActiveBudgets')->andReturn(new Collection); - // mock for new account list and for account array - $accountRepos->shouldReceive('getAccountsByType') - ->withArgs([[AccountType::ASSET, AccountType::DEFAULT]])->andReturn(new Collection([$account]))->twice(); - $journalRepos->shouldReceive('firstNull')->once()->andReturn($deposit); $journalRepos->shouldReceive('getJournalSourceAccounts')->andReturn(new Collection([$account])); @@ -218,7 +211,7 @@ class SplitControllerTest extends TestCase /** * @covers \FireflyIII\Http\Controllers\Transaction\SplitController::edit */ - public function testEditOpeningBalance() + public function testEditOpeningBalance(): void { $currencyRepository = $this->mock(CurrencyRepositoryInterface::class); $accountRepository = $this->mock(AccountRepositoryInterface::class); @@ -240,7 +233,7 @@ class SplitControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\SplitController::updateWithPrevious * @covers \FireflyIII\Http\Controllers\Transaction\SplitController::getTransactionDataFromJournal */ - public function testEditSingle() + public function testEditSingle(): void { $currencyRepository = $this->mock(CurrencyRepositoryInterface::class); $accountRepository = $this->mock(AccountRepositoryInterface::class); @@ -270,9 +263,6 @@ class SplitControllerTest extends TestCase $currencyRepository->shouldReceive('get')->once()->andReturn(new Collection); $budgetRepository->shouldReceive('getActiveBudgets')->andReturn(new Collection); - // mock for new account list and for account array - $accountRepository->shouldReceive('getAccountsByType') - ->withArgs([[AccountType::ASSET, AccountType::DEFAULT]])->andReturn(new Collection([$account]))->twice(); $this->be($this->user()); $response = $this->get(route('transactions.split.edit', [$deposit->id])); @@ -285,7 +275,7 @@ class SplitControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\SplitController::update * @covers \FireflyIII\Http\Requests\SplitJournalFormRequest */ - public function testUpdate() + public function testUpdate(): void { $currencyRepository = $this->mock(CurrencyRepositoryInterface::class); $accountRepository = $this->mock(AccountRepositoryInterface::class); @@ -341,7 +331,7 @@ class SplitControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\SplitController::isOpeningBalance * @covers \FireflyIII\Http\Requests\SplitJournalFormRequest */ - public function testUpdateOpeningBalance() + public function testUpdateOpeningBalance(): void { $currencyRepository = $this->mock(CurrencyRepositoryInterface::class); $accountRepository = $this->mock(AccountRepositoryInterface::class); @@ -383,7 +373,7 @@ class SplitControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\SplitController::update * @covers \FireflyIII\Http\Requests\SplitJournalFormRequest */ - public function testUpdateTransfer() + public function testUpdateTransfer(): void { $currencyRepository = $this->mock(CurrencyRepositoryInterface::class); $accountRepository = $this->mock(AccountRepositoryInterface::class); @@ -439,7 +429,7 @@ class SplitControllerTest extends TestCase * @covers \FireflyIII\Http\Controllers\Transaction\SplitController::update * @covers \FireflyIII\Http\Requests\SplitJournalFormRequest */ - public function testUpdateWithdrawal() + public function testUpdateWithdrawal(): void { $currencyRepository = $this->mock(CurrencyRepositoryInterface::class); $accountRepository = $this->mock(AccountRepositoryInterface::class); diff --git a/tests/Feature/Controllers/TransactionControllerTest.php b/tests/Feature/Controllers/TransactionControllerTest.php index e7a532e72a..db10f10d27 100644 --- a/tests/Feature/Controllers/TransactionControllerTest.php +++ b/tests/Feature/Controllers/TransactionControllerTest.php @@ -54,12 +54,12 @@ class TransactionControllerTest extends TestCase /** - * @covers \FireflyIII\Http\Controllers\TransactionController::index - * @covers \FireflyIII\Http\Controllers\TransactionController::__construct - * @covers \FireflyIII\Http\Controllers\TransactionController::getPeriodOverview - * @covers \FireflyIII\Http\Controllers\TransactionController::sumPerCurrency + * @covers \FireflyIII\Http\Controllers\TransactionController + * @covers \FireflyIII\Http\Controllers\TransactionController + * @covers \FireflyIII\Http\Controllers\TransactionController + * @covers \FireflyIII\Http\Controllers\TransactionController */ - public function testIndex() + public function testIndex(): void { $date = new Carbon; $this->session(['start' => $date, 'end' => clone $date]); @@ -91,9 +91,9 @@ class TransactionControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\TransactionController::index + * @covers \FireflyIII\Http\Controllers\TransactionController */ - public function testIndexAll() + public function testIndexAll(): void { $date = new Carbon; $this->session(['start' => $date, 'end' => clone $date]); @@ -125,11 +125,11 @@ class TransactionControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\TransactionController::index - * @covers \FireflyIII\Http\Controllers\TransactionController::getPeriodOverview - * @covers \FireflyIII\Http\Controllers\TransactionController::sumPerCurrency + * @covers \FireflyIII\Http\Controllers\TransactionController + * @covers \FireflyIII\Http\Controllers\TransactionController + * @covers \FireflyIII\Http\Controllers\TransactionController */ - public function testIndexByDate() + public function testIndexByDate(): void { $transaction = new Transaction; $transaction->transaction_currency_id = 1; @@ -168,12 +168,55 @@ class TransactionControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\TransactionController::index - * @covers \FireflyIII\Http\Controllers\TransactionController::__construct - * @covers \FireflyIII\Http\Controllers\TransactionController::getPeriodOverview - * @covers \FireflyIII\Http\Controllers\TransactionController::sumPerCurrency + * @covers \FireflyIII\Http\Controllers\TransactionController + * @covers \FireflyIII\Http\Controllers\TransactionController + * @covers \FireflyIII\Http\Controllers\TransactionController */ - public function testIndexDeposit() + public function testIndexByDateReversed(): void + { + $transaction = new Transaction; + $transaction->transaction_currency_id = 1; + $transaction->transaction_currency_symbol = 'x'; + $transaction->transaction_currency_code = 'ABC'; + $transaction->transaction_currency_dp = 2; + $transaction->transaction_amount = '5'; + $collection = new Collection([$transaction]); + + + // mock stuff + $repository = $this->mock(JournalRepositoryInterface::class); + $collector = $this->mock(JournalCollectorInterface::class); + $transfer = $this->user()->transactionJournals()->inRandomOrder()->where('transaction_type_id', 3)->first(); + $repository->shouldReceive('firstNull')->once()->andReturn($transfer); + $repository->shouldReceive('firstNull')->once()->andReturn($transfer); + + $collector->shouldReceive('setTypes')->andReturnSelf(); + $collector->shouldReceive('setLimit')->andReturnSelf(); + $collector->shouldReceive('setPage')->andReturnSelf(); + $collector->shouldReceive('setAllAssetAccounts')->andReturnSelf(); + $collector->shouldReceive('addFilter')->andReturnSelf(); + $collector->shouldReceive('setRange')->andReturnSelf(); + $collector->shouldReceive('withBudgetInformation')->andReturnSelf(); + $collector->shouldReceive('withCategoryInformation')->andReturnSelf(); + $collector->shouldReceive('withOpposingAccount')->andReturnSelf(); + $collector->shouldReceive('removeFilter')->withArgs([InternalTransferFilter::class])->andReturnSelf(); + $collector->shouldReceive('getPaginatedJournals')->andReturn(new LengthAwarePaginator([], 0, 10)); + $collector->shouldReceive('getJournals')->andReturn($collection); + + $this->be($this->user()); + $response = $this->get(route('transactions.index', ['transfer', '2016-01-01','2015-12-31'])); + $response->assertStatus(200); + // has bread crumb + $response->assertSee('
                                          '); + } + + /** + * @covers \FireflyIII\Http\Controllers\TransactionController + * @covers \FireflyIII\Http\Controllers\TransactionController + * @covers \FireflyIII\Http\Controllers\TransactionController + * @covers \FireflyIII\Http\Controllers\TransactionController + */ + public function testIndexDeposit(): void { $transaction = new Transaction; $transaction->transaction_currency_id = 1; @@ -211,12 +254,12 @@ class TransactionControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\TransactionController::index - * @covers \FireflyIII\Http\Controllers\TransactionController::__construct - * @covers \FireflyIII\Http\Controllers\TransactionController::getPeriodOverview - * @covers \FireflyIII\Http\Controllers\TransactionController::sumPerCurrency + * @covers \FireflyIII\Http\Controllers\TransactionController + * @covers \FireflyIII\Http\Controllers\TransactionController + * @covers \FireflyIII\Http\Controllers\TransactionController + * @covers \FireflyIII\Http\Controllers\TransactionController */ - public function testIndexWithdrawal() + public function testIndexWithdrawal(): void { $transaction = new Transaction; $transaction->transaction_currency_id = 1; @@ -254,9 +297,9 @@ class TransactionControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\TransactionController::reconcile + * @covers \FireflyIII\Http\Controllers\TransactionController */ - public function testReconcile() + public function testReconcile(): void { $data = ['transactions' => [1, 2]]; $repository = $this->mock(JournalRepositoryInterface::class); @@ -271,9 +314,9 @@ class TransactionControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\TransactionController::reorder + * @covers \FireflyIII\Http\Controllers\TransactionController */ - public function testReorder() + public function testReorder(): void { // mock stuff $journal = factory(TransactionJournal::class)->make(); @@ -293,10 +336,10 @@ class TransactionControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\TransactionController::show - * @covers \FireflyIII\Http\Controllers\Controller::isOpeningBalance + * @covers \FireflyIII\Http\Controllers\TransactionController + * @covers \FireflyIII\Http\Controllers\Controller */ - public function testShow() + public function testShow(): void { // mock stuff $linkRepos = $this->mock(LinkTypeRepositoryInterface::class); @@ -316,10 +359,10 @@ class TransactionControllerTest extends TestCase } /** - * @covers \FireflyIII\Http\Controllers\Controller::redirectToAccount - * @covers \FireflyIII\Http\Controllers\TransactionController::show + * @covers \FireflyIII\Http\Controllers\Controller + * @covers \FireflyIII\Http\Controllers\TransactionController */ - public function testShowOpeningBalance() + public function testShowOpeningBalance(): void { $linkRepos = $this->mock(LinkTypeRepositoryInterface::class); $linkRepos->shouldReceive('get')->andReturn(new Collection); diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php index 4e8871e86d..0088f7e6f4 100644 --- a/tests/Feature/ExampleTest.php +++ b/tests/Feature/ExampleTest.php @@ -32,7 +32,7 @@ class ExampleTest extends TestCase /** * A basic test example. */ - public function testBasicTest() + public function testBasicTest(): void { $response = $this->get('/login'); diff --git a/app/Services/Bunq/Object/BunqObject.php b/tests/Object/FakeApiContext.php similarity index 73% rename from app/Services/Bunq/Object/BunqObject.php rename to tests/Object/FakeApiContext.php index 41b1d4a855..cf5c585e85 100644 --- a/app/Services/Bunq/Object/BunqObject.php +++ b/tests/Object/FakeApiContext.php @@ -1,7 +1,7 @@ . */ + declare(strict_types=1); -namespace FireflyIII\Services\Bunq\Object; +namespace Tests\Object; /** - * Class BunqObject. + * Class FakeApiContext */ -abstract class BunqObject +class FakeApiContext { /** - * Convert this object to array. - * - * @return array + * @return string */ - abstract public function toArray(): array; -} + public function toJson(): string{ + return json_encode(['a' => 'b']); + } + +} \ No newline at end of file diff --git a/tests/TestCase.php b/tests/TestCase.php index 6d090c1c9c..8dcba3a554 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -47,7 +47,7 @@ abstract class TestCase extends BaseTestCase * @param User $user * @param string $range */ - public function changeDateRange(User $user, $range) + public function changeDateRange(User $user, $range): void { $valid = ['1D', '1W', '1M', '3M', '6M', '1Y', 'custom']; if (\in_array($range, $valid)) { @@ -55,6 +55,7 @@ abstract class TestCase extends BaseTestCase Preference::where('user_id', $user->id)->where('name', 'viewRange')->delete(); } catch (Exception $e) { // don't care. + $e->getMessage(); } Preference::create( @@ -81,7 +82,7 @@ abstract class TestCase extends BaseTestCase /** * @return array */ - public function dateRangeProvider() + public function dateRangeProvider(): array { return [ 'one day' => ['1D'], @@ -123,7 +124,7 @@ abstract class TestCase extends BaseTestCase * * @return \Mockery\MockInterface */ - protected function mock($class) + protected function mock($class): \Mockery\MockInterface { Log::debug(sprintf('Will now mock %s', $class)); $object = Mockery::mock($class); @@ -137,7 +138,7 @@ abstract class TestCase extends BaseTestCase * * @return Mockery\MockInterface */ - protected function overload(string $class) + protected function overload(string $class): \Mockery\MockInterface { //$this->app->instance($class, $externalMock); return Mockery::mock('overload:' . $class); diff --git a/tests/Unit/ExampleTest.php b/tests/Unit/ExampleTest.php index e3b7024ec6..885cf132c4 100644 --- a/tests/Unit/ExampleTest.php +++ b/tests/Unit/ExampleTest.php @@ -32,7 +32,7 @@ class ExampleTest extends TestCase /** * A basic test example. */ - public function testBasicTest() + public function testBasicTest(): void { $this->assertTrue(true); } diff --git a/tests/Unit/Factory/AccountFactoryTest.php b/tests/Unit/Factory/AccountFactoryTest.php index 51439d6b49..951ec2bb92 100644 --- a/tests/Unit/Factory/AccountFactoryTest.php +++ b/tests/Unit/Factory/AccountFactoryTest.php @@ -42,7 +42,7 @@ class AccountFactoryTest extends TestCase * @covers \FireflyIII\Factory\AccountMetaFactory * @covers \FireflyIII\Services\Internal\Support\AccountServiceTrait */ - public function testCreateBasic() + public function testCreateBasic(): void { $data = [ @@ -81,7 +81,7 @@ class AccountFactoryTest extends TestCase * @covers \FireflyIII\Factory\AccountMetaFactory * @covers \FireflyIII\Services\Internal\Support\AccountServiceTrait */ - public function testCreateBasicEmptyVb() + public function testCreateBasicEmptyVb(): void { $data = [ @@ -120,7 +120,7 @@ class AccountFactoryTest extends TestCase * @covers \FireflyIII\Factory\AccountMetaFactory * @covers \FireflyIII\Services\Internal\Support\AccountServiceTrait */ - public function testCreateBasicCC() + public function testCreateBasicCC(): void { $data = [ @@ -167,7 +167,7 @@ class AccountFactoryTest extends TestCase * @covers \FireflyIII\Factory\AccountMetaFactory * @covers \FireflyIII\Services\Internal\Support\AccountServiceTrait */ - public function testCreateBasicExpense() + public function testCreateBasicExpense(): void { $data = [ @@ -206,7 +206,7 @@ class AccountFactoryTest extends TestCase * @covers \FireflyIII\Factory\AccountMetaFactory * @covers \FireflyIII\Services\Internal\Support\AccountServiceTrait */ - public function testCreateBasicExpenseFullType() + public function testCreateBasicExpenseFullType(): void { $data = [ @@ -244,7 +244,7 @@ class AccountFactoryTest extends TestCase * @covers \FireflyIII\Factory\AccountMetaFactory * @covers \FireflyIII\Services\Internal\Support\AccountServiceTrait */ - public function testCreateBasicIB() + public function testCreateBasicIB(): void { $data = [ @@ -290,7 +290,7 @@ class AccountFactoryTest extends TestCase * @covers \FireflyIII\Factory\AccountMetaFactory * @covers \FireflyIII\Services\Internal\Support\AccountServiceTrait */ - public function testCreateBasicIBZero() + public function testCreateBasicIBZero(): void { $data = [ @@ -335,7 +335,7 @@ class AccountFactoryTest extends TestCase * @covers \FireflyIII\Factory\AccountMetaFactory * @covers \FireflyIII\Services\Internal\Support\AccountServiceTrait */ - public function testCreateBasicIban() + public function testCreateBasicIban(): void { $data = [ @@ -374,7 +374,7 @@ class AccountFactoryTest extends TestCase * @covers \FireflyIII\Factory\AccountMetaFactory * @covers \FireflyIII\Services\Internal\Support\AccountServiceTrait */ - public function testCreateBasicInvalidIban() + public function testCreateBasicInvalidIban(): void { $data = [ @@ -413,7 +413,7 @@ class AccountFactoryTest extends TestCase * @covers \FireflyIII\Factory\AccountMetaFactory * @covers \FireflyIII\Services\Internal\Support\AccountServiceTrait */ - public function testCreateBasicNegativeIB() + public function testCreateBasicNegativeIB(): void { $data = [ @@ -459,7 +459,7 @@ class AccountFactoryTest extends TestCase * @covers \FireflyIII\Factory\AccountMetaFactory * @covers \FireflyIII\Services\Internal\Support\AccountServiceTrait */ - public function testCreateBasicNotes() + public function testCreateBasicNotes(): void { $data = [ @@ -500,7 +500,7 @@ class AccountFactoryTest extends TestCase * * @covers \FireflyIII\Factory\AccountFactory */ - public function testCreateExisting() + public function testCreateExisting(): void { $existing = $this->user()->accounts()->where('account_type_id', 3)->first(); $data = [ diff --git a/tests/Unit/Factory/BillFactoryTest.php b/tests/Unit/Factory/BillFactoryTest.php index 7f4d83b1b3..74203bef86 100644 --- a/tests/Unit/Factory/BillFactoryTest.php +++ b/tests/Unit/Factory/BillFactoryTest.php @@ -39,7 +39,7 @@ class BillFactoryTest extends TestCase * @covers \FireflyIII\Factory\BillFactory * @covers \FireflyIII\Services\Internal\Support\BillServiceTrait */ - public function testCreateBasic() + public function testCreateBasic(): void { $data = [ 'name' => 'Some new bill #' . random_int(1, 1000), @@ -73,7 +73,7 @@ class BillFactoryTest extends TestCase * @covers \FireflyIII\Factory\BillFactory * @covers \FireflyIII\Services\Internal\Support\BillServiceTrait */ - public function testCreateEmptyNotes() + public function testCreateEmptyNotes(): void { $data = [ 'name' => 'Some new bill #' . random_int(1, 1000), @@ -106,7 +106,7 @@ class BillFactoryTest extends TestCase * @covers \FireflyIII\Factory\BillFactory * */ - public function testFindById() + public function testFindById(): void { $existing = $this->user()->piggyBanks()->first(); /** @var BillFactory $factory */ @@ -122,7 +122,7 @@ class BillFactoryTest extends TestCase * @covers \FireflyIII\Factory\BillFactory * */ - public function testFindByName() + public function testFindByName(): void { $existing = $this->user()->bills()->first(); /** @var BillFactory $factory */ @@ -139,7 +139,7 @@ class BillFactoryTest extends TestCase * @covers \FireflyIII\Factory\BillFactory * */ - public function testFindByUnknownName() + public function testFindByUnknownName(): void { /** @var BillFactory $factory */ $factory = app(BillFactory::class); @@ -155,7 +155,7 @@ class BillFactoryTest extends TestCase * @covers \FireflyIII\Factory\BillFactory * */ - public function testFindNull() + public function testFindNull(): void { /** @var BillFactory $factory */ $factory = app(BillFactory::class); diff --git a/tests/Unit/Factory/BudgetFactoryTest.php b/tests/Unit/Factory/BudgetFactoryTest.php index d5828fd31a..32397d5a4a 100644 --- a/tests/Unit/Factory/BudgetFactoryTest.php +++ b/tests/Unit/Factory/BudgetFactoryTest.php @@ -37,7 +37,7 @@ class BudgetFactoryTest extends TestCase * * @covers \FireflyIII\Factory\BudgetFactory */ - public function testFindById() + public function testFindById(): void { $existing = $this->user()->budgets()->first(); /** @var BudgetFactory $factory */ @@ -54,7 +54,7 @@ class BudgetFactoryTest extends TestCase * * @covers \FireflyIII\Factory\BudgetFactory */ - public function testFindByName() + public function testFindByName(): void { $existing = $this->user()->budgets()->first(); /** @var BudgetFactory $factory */ @@ -71,7 +71,7 @@ class BudgetFactoryTest extends TestCase * * @covers \FireflyIII\Factory\BudgetFactory */ - public function testFindNull() + public function testFindNull(): void { /** @var BudgetFactory $factory */ $factory = app(BudgetFactory::class); @@ -86,7 +86,7 @@ class BudgetFactoryTest extends TestCase * * @covers \FireflyIII\Factory\BudgetFactory */ - public function testFindUnknown() + public function testFindUnknown(): void { /** @var BudgetFactory $factory */ $factory = app(BudgetFactory::class); diff --git a/tests/Unit/Factory/CategoryFactoryTest.php b/tests/Unit/Factory/CategoryFactoryTest.php index 4bb8a6ddb1..706f6dced3 100644 --- a/tests/Unit/Factory/CategoryFactoryTest.php +++ b/tests/Unit/Factory/CategoryFactoryTest.php @@ -34,7 +34,7 @@ class CategoryFactoryTest extends TestCase /** * @covers \FireflyIII\Factory\CategoryFactory */ - public function testFindOrCreateExistingID() + public function testFindOrCreateExistingID(): void { $existing = $this->user()->categories()->first(); @@ -48,7 +48,7 @@ class CategoryFactoryTest extends TestCase /** * @covers \FireflyIII\Factory\CategoryFactory */ - public function testFindOrCreateExistingName() + public function testFindOrCreateExistingName(): void { $existing = $this->user()->categories()->first(); @@ -64,7 +64,7 @@ class CategoryFactoryTest extends TestCase * * @covers \FireflyIII\Factory\CategoryFactory */ - public function testFindOrCreateInvalidID() + public function testFindOrCreateInvalidID(): void { $existing = $this->user()->categories()->max('id'); $existing += 4; @@ -78,7 +78,7 @@ class CategoryFactoryTest extends TestCase /** * @covers \FireflyIII\Factory\CategoryFactory */ - public function testFindOrCreateNewName() + public function testFindOrCreateNewName(): void { $name = 'Some new category #' . random_int(1, 1000); @@ -92,7 +92,7 @@ class CategoryFactoryTest extends TestCase /** * @covers \FireflyIII\Factory\CategoryFactory */ - public function testFindOrCreateNull() + public function testFindOrCreateNull(): void { /** @var CategoryFactory $factory */ $factory = app(CategoryFactory::class); diff --git a/tests/Unit/Factory/PiggyBankEventFactoryTest.php b/tests/Unit/Factory/PiggyBankEventFactoryTest.php index 5e1fda97f2..c6079835bf 100644 --- a/tests/Unit/Factory/PiggyBankEventFactoryTest.php +++ b/tests/Unit/Factory/PiggyBankEventFactoryTest.php @@ -39,7 +39,7 @@ class PiggyBankEventFactoryTest extends TestCase /** * @covers \FireflyIII\Factory\PiggyBankEventFactory */ - public function testCreateAmountZero() + public function testCreateAmountZero(): void { /** @var TransactionJournal $transfer */ $transfer = $this->user()->transactionJournals()->where('transaction_type_id', 3)->first(); @@ -60,7 +60,7 @@ class PiggyBankEventFactoryTest extends TestCase /** * @covers \FireflyIII\Factory\PiggyBankEventFactory */ - public function testCreateNoPiggy() + public function testCreateNoPiggy(): void { /** @var TransactionJournal $transfer */ $transfer = $this->user()->transactionJournals()->where('transaction_type_id', 3)->first(); @@ -96,7 +96,7 @@ class PiggyBankEventFactoryTest extends TestCase /** * @covers \FireflyIII\Factory\PiggyBankEventFactory */ - public function testCreateNotTransfer() + public function testCreateNotTransfer(): void { /** @var TransactionJournal $deposit */ $deposit = $this->user()->transactionJournals()->where('transaction_type_id', 2)->first(); @@ -110,7 +110,7 @@ class PiggyBankEventFactoryTest extends TestCase /** * @covers \FireflyIII\Factory\PiggyBankEventFactory */ - public function testCreateSuccess() + public function testCreateSuccess(): void { /** @var TransactionJournal $transfer */ $transfer = $this->user()->transactionJournals()->where('transaction_type_id', 3)->first(); diff --git a/tests/Unit/Factory/PiggyBankFactoryTest.php b/tests/Unit/Factory/PiggyBankFactoryTest.php index 7905dd06dd..042e63856a 100644 --- a/tests/Unit/Factory/PiggyBankFactoryTest.php +++ b/tests/Unit/Factory/PiggyBankFactoryTest.php @@ -37,7 +37,7 @@ class PiggyBankFactoryTest extends TestCase * * @covers \FireflyIII\Factory\PiggyBankFactory */ - public function testFindById() + public function testFindById(): void { $existing = $this->user()->piggyBanks()->first(); /** @var PiggyBankFactory $factory */ @@ -54,7 +54,7 @@ class PiggyBankFactoryTest extends TestCase * * @covers \FireflyIII\Factory\PiggyBankFactory */ - public function testFindByName() + public function testFindByName(): void { $existing = $this->user()->piggyBanks()->first(); /** @var PiggyBankFactory $factory */ @@ -71,7 +71,7 @@ class PiggyBankFactoryTest extends TestCase * * @covers \FireflyIII\Factory\PiggyBankFactory */ - public function testFindNull() + public function testFindNull(): void { /** @var PiggyBankFactory $factory */ $factory = app(PiggyBankFactory::class); @@ -86,7 +86,7 @@ class PiggyBankFactoryTest extends TestCase * * @covers \FireflyIII\Factory\PiggyBankFactory */ - public function testFindUnknown() + public function testFindUnknown(): void { /** @var PiggyBankFactory $factory */ $factory = app(PiggyBankFactory::class); diff --git a/tests/Unit/Factory/TagFactoryTest.php b/tests/Unit/Factory/TagFactoryTest.php index 41e239e392..67c3c0093e 100644 --- a/tests/Unit/Factory/TagFactoryTest.php +++ b/tests/Unit/Factory/TagFactoryTest.php @@ -35,7 +35,7 @@ class TagFactoryTest extends TestCase /** * @covers \FireflyIII\Factory\TagFactory */ - public function testFindOrCreateExisting() + public function testFindOrCreateExisting(): void { $tag = $this->user()->tags()->first(); /** @var TagFactory $factory */ @@ -49,7 +49,7 @@ class TagFactoryTest extends TestCase /** * @covers \FireflyIII\Factory\TagFactory */ - public function testFindOrCreateNew() + public function testFindOrCreateNew(): void { $tag = 'Some new tag#' . random_int(1, 1000); /** @var TagFactory $factory */ diff --git a/tests/Unit/Factory/TransactionCurrencyFactoryTest.php b/tests/Unit/Factory/TransactionCurrencyFactoryTest.php index afc8d921a8..2805aba8cc 100644 --- a/tests/Unit/Factory/TransactionCurrencyFactoryTest.php +++ b/tests/Unit/Factory/TransactionCurrencyFactoryTest.php @@ -36,7 +36,7 @@ class TransactionCurrencyFactoryTest extends TestCase /** * @covers \FireflyIII\Factory\TransactionCurrencyFactory */ - public function testCreate() + public function testCreate(): void { /** @var TransactionCurrencyFactory $factory */ $factory = app(TransactionCurrencyFactory::class); @@ -48,7 +48,7 @@ class TransactionCurrencyFactoryTest extends TestCase /** * @covers \FireflyIII\Factory\TransactionCurrencyFactory */ - public function testCreateEmpty() + public function testCreateEmpty(): void { /** @var TransactionCurrencyFactory $factory */ $factory = app(TransactionCurrencyFactory::class); @@ -59,7 +59,7 @@ class TransactionCurrencyFactoryTest extends TestCase /** * @covers \FireflyIII\Factory\TransactionCurrencyFactory */ - public function testFindByBadCode() + public function testFindByBadCode(): void { /** @var TransactionCurrencyFactory $factory */ $factory = app(TransactionCurrencyFactory::class); @@ -70,7 +70,7 @@ class TransactionCurrencyFactoryTest extends TestCase /** * @covers \FireflyIII\Factory\TransactionCurrencyFactory */ - public function testFindByCode() + public function testFindByCode(): void { // ; $currency = TransactionCurrency::inRandomOrder()->whereNull('deleted_at')->first(); @@ -83,7 +83,7 @@ class TransactionCurrencyFactoryTest extends TestCase /** * @covers \FireflyIII\Factory\TransactionCurrencyFactory */ - public function testFindByID() + public function testFindByID(): void { $currency = TransactionCurrency::inRandomOrder()->whereNull('deleted_at')->first(); /** @var TransactionCurrencyFactory $factory */ @@ -93,9 +93,23 @@ class TransactionCurrencyFactoryTest extends TestCase } /** + * submit ID = 1000 + * * @covers \FireflyIII\Factory\TransactionCurrencyFactory */ - public function testFindNull() + public function testFindByBadID(): void + { + $currency = TransactionCurrency::inRandomOrder()->whereNull('deleted_at')->first(); + /** @var TransactionCurrencyFactory $factory */ + $factory = app(TransactionCurrencyFactory::class); + $result = $factory->find(1000, $currency->code); + $this->assertEquals($currency->id, $result->id); + } + + /** + * @covers \FireflyIII\Factory\TransactionCurrencyFactory + */ + public function testFindNull(): void { /** @var TransactionCurrencyFactory $factory */ $factory = app(TransactionCurrencyFactory::class); diff --git a/tests/Unit/Factory/TransactionFactoryTest.php b/tests/Unit/Factory/TransactionFactoryTest.php index 3a62eabb27..a2a3d7dac3 100644 --- a/tests/Unit/Factory/TransactionFactoryTest.php +++ b/tests/Unit/Factory/TransactionFactoryTest.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace Tests\Unit\Factory; +use FireflyIII\Exceptions\FireflyException; use FireflyIII\Factory\AccountFactory; use FireflyIII\Factory\BudgetFactory; use FireflyIII\Factory\CategoryFactory; @@ -45,7 +46,7 @@ class TransactionFactoryTest extends TestCase * @covers \FireflyIII\Factory\TransactionFactory * @covers \FireflyIII\Services\Internal\Support\TransactionServiceTrait */ - public function testCreatePairBasic() + public function testCreatePairBasic(): void { // objects: $asset = $this->user()->accounts()->where('account_type_id', 3)->first(); @@ -97,7 +98,11 @@ class TransactionFactoryTest extends TestCase /** @var TransactionFactory $factory */ $factory = app(TransactionFactory::class); $factory->setUser($this->user()); - $collection = $factory->createPair($withdrawal, $data); + try { + $collection = $factory->createPair($withdrawal, $data); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } $newCount = $withdrawal->transactions()->count(); @@ -119,7 +124,7 @@ class TransactionFactoryTest extends TestCase * @covers \FireflyIII\Factory\TransactionFactory * @covers \FireflyIII\Services\Internal\Support\TransactionServiceTrait */ - public function testCreatePairBasicByName() + public function testCreatePairBasicByName(): void { // objects: $asset = $this->user()->accounts()->where('account_type_id', 3)->first(); @@ -175,7 +180,11 @@ class TransactionFactoryTest extends TestCase /** @var TransactionFactory $factory */ $factory = app(TransactionFactory::class); $factory->setUser($this->user()); - $collection = $factory->createPair($withdrawal, $data); + try { + $collection = $factory->createPair($withdrawal, $data); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } $newCount = $withdrawal->transactions()->count(); @@ -197,7 +206,7 @@ class TransactionFactoryTest extends TestCase * @covers \FireflyIII\Factory\TransactionFactory * @covers \FireflyIII\Services\Internal\Support\TransactionServiceTrait */ - public function testCreatePairBasicIntoCash() + public function testCreatePairBasicIntoCash(): void { // objects: $asset = $this->user()->accounts()->where('account_type_id', 3)->first(); @@ -253,8 +262,11 @@ class TransactionFactoryTest extends TestCase /** @var TransactionFactory $factory */ $factory = app(TransactionFactory::class); $factory->setUser($this->user()); - $collection = $factory->createPair($withdrawal, $data); - + try { + $collection = $factory->createPair($withdrawal, $data); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } $newCount = $withdrawal->transactions()->count(); $this->assertCount(2, $collection); @@ -277,7 +289,7 @@ class TransactionFactoryTest extends TestCase * @covers \FireflyIII\Factory\TransactionFactory * @covers \FireflyIII\Services\Internal\Support\TransactionServiceTrait */ - public function testCreatePairBasicMeta() + public function testCreatePairBasicMeta(): void { // objects: $asset = $this->user()->accounts()->where('account_type_id', 3)->first(); @@ -331,8 +343,11 @@ class TransactionFactoryTest extends TestCase /** @var TransactionFactory $factory */ $factory = app(TransactionFactory::class); $factory->setUser($this->user()); - $collection = $factory->createPair($withdrawal, $data); - + try { + $collection = $factory->createPair($withdrawal, $data); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } $newCount = $withdrawal->transactions()->count(); $this->assertCount(2, $collection); @@ -357,7 +372,7 @@ class TransactionFactoryTest extends TestCase * @covers \FireflyIII\Factory\TransactionFactory * @covers \FireflyIII\Services\Internal\Support\TransactionServiceTrait */ - public function testCreatePairDeposit() + public function testCreatePairDeposit(): void { // objects: $asset = $this->user()->accounts()->where('account_type_id', 3)->first(); @@ -410,8 +425,11 @@ class TransactionFactoryTest extends TestCase /** @var TransactionFactory $factory */ $factory = app(TransactionFactory::class); $factory->setUser($this->user()); - $collection = $factory->createPair($deposit, $data); - + try { + $collection = $factory->createPair($deposit, $data); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } $newCount = $deposit->transactions()->count(); $this->assertCount(2, $collection); @@ -434,7 +452,7 @@ class TransactionFactoryTest extends TestCase * @covers \FireflyIII\Factory\TransactionFactory * @covers \FireflyIII\Services\Internal\Support\TransactionServiceTrait */ - public function testCreatePairDepositByName() + public function testCreatePairDepositByName(): void { // objects: $asset = $this->user()->accounts()->where('account_type_id', 3)->first(); @@ -491,7 +509,11 @@ class TransactionFactoryTest extends TestCase /** @var TransactionFactory $factory */ $factory = app(TransactionFactory::class); $factory->setUser($this->user()); - $collection = $factory->createPair($deposit, $data); + try { + $collection = $factory->createPair($deposit, $data); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } $newCount = $deposit->transactions()->count(); @@ -515,7 +537,7 @@ class TransactionFactoryTest extends TestCase * @covers \FireflyIII\Factory\TransactionFactory * @covers \FireflyIII\Services\Internal\Support\TransactionServiceTrait */ - public function testCreatePairDepositCash() + public function testCreatePairDepositCash(): void { // objects: $asset = $this->user()->accounts()->where('account_type_id', 3)->first(); @@ -573,7 +595,11 @@ class TransactionFactoryTest extends TestCase /** @var TransactionFactory $factory */ $factory = app(TransactionFactory::class); $factory->setUser($this->user()); - $collection = $factory->createPair($deposit, $data); + try { + $collection = $factory->createPair($deposit, $data); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } $newCount = $deposit->transactions()->count(); @@ -595,7 +621,7 @@ class TransactionFactoryTest extends TestCase * @covers \FireflyIII\Factory\TransactionFactory * @covers \FireflyIII\Services\Internal\Support\TransactionServiceTrait */ - public function testCreatePairForeign() + public function testCreatePairForeign(): void { // objects: $asset = $this->user()->accounts()->where('account_type_id', 3)->first(); @@ -648,8 +674,11 @@ class TransactionFactoryTest extends TestCase /** @var TransactionFactory $factory */ $factory = app(TransactionFactory::class); $factory->setUser($this->user()); - $collection = $factory->createPair($withdrawal, $data); - + try { + $collection = $factory->createPair($withdrawal, $data); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } $newCount = $withdrawal->transactions()->count(); $this->assertCount(2, $collection); @@ -672,7 +701,7 @@ class TransactionFactoryTest extends TestCase * @covers \FireflyIII\Factory\TransactionFactory * @covers \FireflyIII\Services\Internal\Support\TransactionServiceTrait */ - public function testCreatePairReconciliation() + public function testCreatePairReconciliation(): void { // objects: $asset = $this->user()->accounts()->where('account_type_id', 3)->first(); @@ -725,7 +754,11 @@ class TransactionFactoryTest extends TestCase /** @var TransactionFactory $factory */ $factory = app(TransactionFactory::class); $factory->setUser($this->user()); - $collection = $factory->createPair($recon, $data); + try { + $collection = $factory->createPair($recon, $data); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } $newCount = $recon->transactions()->count(); @@ -749,7 +782,7 @@ class TransactionFactoryTest extends TestCase * @covers \FireflyIII\Factory\TransactionFactory * @covers \FireflyIII\Services\Internal\Support\TransactionServiceTrait */ - public function testCreatePairTransfer() + public function testCreatePairTransfer(): void { // objects: $asset = $this->user()->accounts()->where('account_type_id', 3)->first(); @@ -802,7 +835,11 @@ class TransactionFactoryTest extends TestCase /** @var TransactionFactory $factory */ $factory = app(TransactionFactory::class); $factory->setUser($this->user()); - $collection = $factory->createPair($transfer, $data); + try { + $collection = $factory->createPair($transfer, $data); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } $newCount = $transfer->transactions()->count(); diff --git a/tests/Unit/Factory/TransactionJournalFactoryTest.php b/tests/Unit/Factory/TransactionJournalFactoryTest.php index 715d837476..2d9503f173 100644 --- a/tests/Unit/Factory/TransactionJournalFactoryTest.php +++ b/tests/Unit/Factory/TransactionJournalFactoryTest.php @@ -49,7 +49,7 @@ class TransactionJournalFactoryTest extends TestCase * @covers \FireflyIII\Factory\TransactionJournalFactory * @covers \FireflyIII\Services\Internal\Support\JournalServiceTrait */ - public function testCreateBasic() + public function testCreateBasic(): void { // mock used classes: $type = TransactionType::find(1); @@ -111,7 +111,7 @@ class TransactionJournalFactoryTest extends TestCase * @covers \FireflyIII\Factory\TransactionJournalFactory * @covers \FireflyIII\Services\Internal\Support\JournalServiceTrait */ - public function testCreateBasicMeta() + public function testCreateBasicMeta(): void { // mock used classes: $type = TransactionType::find(1); diff --git a/tests/Unit/Factory/TransactionJournalMetaFactoryTest.php b/tests/Unit/Factory/TransactionJournalMetaFactoryTest.php index f38b4fdd57..e17427694a 100644 --- a/tests/Unit/Factory/TransactionJournalMetaFactoryTest.php +++ b/tests/Unit/Factory/TransactionJournalMetaFactoryTest.php @@ -37,7 +37,7 @@ class TransactionJournalMetaFactoryTest extends TestCase /** * @covers \FireflyIII\Factory\TransactionJournalMetaFactory */ - public function testUpdateOrCreateBasic() + public function testUpdateOrCreateBasic(): void { /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->inRandomOrder()->first(); @@ -58,7 +58,7 @@ class TransactionJournalMetaFactoryTest extends TestCase /** * @covers \FireflyIII\Factory\TransactionJournalMetaFactory */ - public function testUpdateOrCreateDate() + public function testUpdateOrCreateDate(): void { /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->inRandomOrder()->first(); @@ -79,7 +79,7 @@ class TransactionJournalMetaFactoryTest extends TestCase /** * @covers \FireflyIII\Factory\TransactionJournalMetaFactory */ - public function testUpdateOrCreateDeleteExisting() + public function testUpdateOrCreateDeleteExisting(): void { /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->where('transaction_type_id', 3)->first(); @@ -90,6 +90,7 @@ class TransactionJournalMetaFactoryTest extends TestCase 'data' => 'bye!', ] ); + $count = $journal->transactionJournalMeta()->count(); $set = [ 'journal' => $journal, @@ -100,13 +101,13 @@ class TransactionJournalMetaFactoryTest extends TestCase $factory = app(TransactionJournalMetaFactory::class); $factory->updateOrCreate($set); - $this->assertEquals(0, $journal->transactionJournalMeta()->count()); + $this->assertEquals($count-1, $journal->transactionJournalMeta()->count()); } /** * @covers \FireflyIII\Factory\TransactionJournalMetaFactory */ - public function testUpdateOrCreateEmpty() + public function testUpdateOrCreateEmpty(): void { /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->inRandomOrder()->first(); @@ -127,7 +128,7 @@ class TransactionJournalMetaFactoryTest extends TestCase /** * @covers \FireflyIII\Factory\TransactionJournalMetaFactory */ - public function testUpdateOrCreateExistingEmpty() + public function testUpdateOrCreateExistingEmpty(): void { /** @var TransactionJournal $journal */ $journal = $this->user()->transactionJournals()->inRandomOrder()->first(); diff --git a/tests/Unit/Handlers/Events/AdminEventHandlerTest.php b/tests/Unit/Handlers/Events/AdminEventHandlerTest.php index f7d3f0cc0d..f765caf4ed 100644 --- a/tests/Unit/Handlers/Events/AdminEventHandlerTest.php +++ b/tests/Unit/Handlers/Events/AdminEventHandlerTest.php @@ -42,7 +42,7 @@ class AdminEventHandlerTest extends TestCase * @covers \FireflyIII\Handlers\Events\AdminEventHandler::sendTestMessage * @covers \FireflyIII\Events\AdminRequestedTestMessage */ - public function testSendNoMessage() + public function testSendNoMessage(): void { $repository = $this->mock(UserRepositoryInterface::class); $event = new AdminRequestedTestMessage($this->user(), '127.0.0.1'); @@ -58,7 +58,7 @@ class AdminEventHandlerTest extends TestCase * @covers \FireflyIII\Handlers\Events\AdminEventHandler::sendTestMessage * @covers \FireflyIII\Events\AdminRequestedTestMessage */ - public function testSendTestMessage() + public function testSendTestMessage(): void { Mail::fake(); $repository = $this->mock(UserRepositoryInterface::class); diff --git a/tests/Unit/Handlers/Events/UserEventHandlerTest.php b/tests/Unit/Handlers/Events/UserEventHandlerTest.php index 9cc3d59360..a74ac77800 100644 --- a/tests/Unit/Handlers/Events/UserEventHandlerTest.php +++ b/tests/Unit/Handlers/Events/UserEventHandlerTest.php @@ -50,7 +50,7 @@ class UserEventHandlerTest extends TestCase * @covers \FireflyIII\Handlers\Events\UserEventHandler::attachUserRole * @covers \FireflyIII\Events\RegisteredUser */ - public function testAttachUserRole() + public function testAttachUserRole(): void { $repository = $this->mock(UserRepositoryInterface::class); $user = $this->emptyUser(); @@ -66,7 +66,7 @@ class UserEventHandlerTest extends TestCase /** * @covers \FireflyIII\Handlers\Events\UserEventHandler::checkSingleUserIsAdmin */ - public function testCheckSingleUserIsAdminMulti() + public function testCheckSingleUserIsAdminMulti(): void { $repository = $this->mock(UserRepositoryInterface::class); $user = $this->user(); @@ -84,7 +84,7 @@ class UserEventHandlerTest extends TestCase /** * @covers \FireflyIII\Handlers\Events\UserEventHandler::checkSingleUserIsAdmin */ - public function testCheckSingleUserIsAdminNoRole() + public function testCheckSingleUserIsAdminNoRole(): void { $repository = $this->mock(UserRepositoryInterface::class); $user = $this->emptyUser(); @@ -104,7 +104,7 @@ class UserEventHandlerTest extends TestCase /** * @covers \FireflyIII\Handlers\Events\UserEventHandler::checkSingleUserIsAdmin */ - public function testCheckSingleUserIsAdminNotAdmin() + public function testCheckSingleUserIsAdminNotAdmin(): void { $repository = $this->mock(UserRepositoryInterface::class); $user = $this->emptyUser(); @@ -123,7 +123,7 @@ class UserEventHandlerTest extends TestCase /** * @covers \FireflyIII\Handlers\Events\UserEventHandler::checkSingleUserIsAdmin */ - public function testCheckSingleUserIsAdminSingle() + public function testCheckSingleUserIsAdminSingle(): void { $repository = $this->mock(UserRepositoryInterface::class); $user = $this->user(); @@ -141,7 +141,7 @@ class UserEventHandlerTest extends TestCase * @covers \FireflyIII\Handlers\Events\UserEventHandler::sendEmailChangeConfirmMail * @covers \FireflyIII\Events\UserChangedEmail */ - public function testSendEmailChangeConfirmMail() + public function testSendEmailChangeConfirmMail(): void { Mail::fake(); $user = $this->emptyUser(); @@ -164,7 +164,7 @@ class UserEventHandlerTest extends TestCase * @covers \FireflyIII\Handlers\Events\UserEventHandler::sendEmailChangeUndoMail * @covers \FireflyIII\Events\UserChangedEmail */ - public function testSendEmailChangeUndoMail() + public function testSendEmailChangeUndoMail(): void { Mail::fake(); $user = $this->emptyUser(); @@ -188,7 +188,7 @@ class UserEventHandlerTest extends TestCase * @covers \FireflyIII\Handlers\Events\UserEventHandler::sendNewPassword * @covers \FireflyIII\Events\RequestedNewPassword */ - public function testSendNewPassword() + public function testSendNewPassword(): void { Mail::fake(); $user = $this->emptyUser(); @@ -211,7 +211,7 @@ class UserEventHandlerTest extends TestCase * @covers \FireflyIII\Handlers\Events\UserEventHandler::sendRegistrationMail * @covers \FireflyIII\Events\RegisteredUser */ - public function testSendRegistrationMail() + public function testSendRegistrationMail(): void { Mail::fake(); $user = $this->emptyUser(); diff --git a/tests/Unit/Handlers/Events/VersionCheckEventHandlerTest.php b/tests/Unit/Handlers/Events/VersionCheckEventHandlerTest.php index cc00e06c22..41416cfe7b 100644 --- a/tests/Unit/Handlers/Events/VersionCheckEventHandlerTest.php +++ b/tests/Unit/Handlers/Events/VersionCheckEventHandlerTest.php @@ -43,7 +43,7 @@ class VersionCheckEventHandlerTest extends TestCase /** * */ - public function testCheckForUpdatesError() + public function testCheckForUpdatesError(): void { $updateConfig = new Configuration; $updateConfig->data = 1; @@ -73,7 +73,7 @@ class VersionCheckEventHandlerTest extends TestCase * @covers \FireflyIII\Events\RequestedVersionCheckStatus * @covers \FireflyIII\Handlers\Events\VersionCheckEventHandler */ - public function testCheckForUpdatesNewer() + public function testCheckForUpdatesNewer(): void { $updateConfig = new Configuration; $updateConfig->data = 1; @@ -106,7 +106,7 @@ class VersionCheckEventHandlerTest extends TestCase /** * */ - public function testCheckForUpdatesNoAdmin() + public function testCheckForUpdatesNoAdmin(): void { $updateConfig = new Configuration; $updateConfig->data = 1; @@ -125,7 +125,7 @@ class VersionCheckEventHandlerTest extends TestCase /** * */ - public function testCheckForUpdatesNoPermission() + public function testCheckForUpdatesNoPermission(): void { $updateConfig = new Configuration; $updateConfig->data = -1; @@ -148,7 +148,7 @@ class VersionCheckEventHandlerTest extends TestCase /** * */ - public function testCheckForUpdatesTooRecent() + public function testCheckForUpdatesTooRecent(): void { $updateConfig = new Configuration; $updateConfig->data = 1; @@ -169,4 +169,4 @@ class VersionCheckEventHandlerTest extends TestCase $handler->checkForUpdates($event); } -} \ No newline at end of file +} diff --git a/tests/Unit/Helpers/AttachmentHelperTest.php b/tests/Unit/Helpers/AttachmentHelperTest.php index bc9900e767..3e4cbc60e9 100644 --- a/tests/Unit/Helpers/AttachmentHelperTest.php +++ b/tests/Unit/Helpers/AttachmentHelperTest.php @@ -41,7 +41,7 @@ class AttachmentHelperTest extends TestCase /** * @covers \FireflyIII\Helpers\Attachments\AttachmentHelper::getAttachmentLocation */ - public function testGetAttachmentLocation() + public function testGetAttachmentLocation(): void { $attachment = Attachment::first(); $helper = new AttachmentHelper; @@ -61,7 +61,7 @@ class AttachmentHelperTest extends TestCase * @covers \FireflyIII\Helpers\Attachments\AttachmentHelper::getMessages * @covers \FireflyIII\Helpers\Attachments\AttachmentHelper::getErrors */ - public function testInvalidMime() + public function testInvalidMime(): void { $journal = TransactionJournal::first(); $helper = new AttachmentHelper; @@ -90,7 +90,7 @@ class AttachmentHelperTest extends TestCase * @covers \FireflyIII\Helpers\Attachments\AttachmentHelper::getErrors * @covers \FireflyIII\Helpers\Attachments\AttachmentHelper::getAttachments */ - public function testSave() + public function testSave(): void { Storage::fake('upload'); @@ -118,7 +118,7 @@ class AttachmentHelperTest extends TestCase * @covers \FireflyIII\Helpers\Attachments\AttachmentHelper::__construct * @covers \FireflyIII\Helpers\Attachments\AttachmentHelper::saveAttachmentsForModel */ - public function testSaveEmpty() + public function testSaveEmpty(): void { $journal = TransactionJournal::first(); $helper = new AttachmentHelper; @@ -141,7 +141,7 @@ class AttachmentHelperTest extends TestCase * @covers \FireflyIII\Helpers\Attachments\AttachmentHelper::getErrors * @covers \FireflyIII\Helpers\Attachments\AttachmentHelper::getAttachments */ - public function testSaveSecond() + public function testSaveSecond(): void { $journal = TransactionJournal::first(); $helper = new AttachmentHelper; diff --git a/tests/Unit/Helpers/MetaPieChartTest.php b/tests/Unit/Helpers/MetaPieChartTest.php index 726fa3d5fa..791e12406d 100644 --- a/tests/Unit/Helpers/MetaPieChartTest.php +++ b/tests/Unit/Helpers/MetaPieChartTest.php @@ -48,7 +48,7 @@ class MetaPieChartTest extends TestCase /** * @covers \FireflyIII\Helpers\Chart\MetaPieChart */ - public function testGenerateExpenseAccount() + public function testGenerateExpenseAccount(): void { $som = (new Carbon())->startOfMonth(); $eom = (new Carbon())->endOfMonth(); @@ -101,7 +101,7 @@ class MetaPieChartTest extends TestCase /** * @covers \FireflyIII\Helpers\Chart\MetaPieChart */ - public function testGenerateExpenseAccountWithOthers() + public function testGenerateExpenseAccountWithOthers(): void { $som = (new Carbon())->startOfMonth(); $eom = (new Carbon())->endOfMonth(); @@ -160,7 +160,7 @@ class MetaPieChartTest extends TestCase /** * @covers \FireflyIII\Helpers\Chart\MetaPieChart */ - public function testGenerateIncomeAccount() + public function testGenerateIncomeAccount(): void { $som = (new Carbon())->startOfMonth(); $eom = (new Carbon())->endOfMonth(); @@ -212,7 +212,7 @@ class MetaPieChartTest extends TestCase /** * @covers \FireflyIII\Helpers\Chart\MetaPieChart */ - public function testGenerateIncomeAccountWithOthers() + public function testGenerateIncomeAccountWithOthers(): void { $som = (new Carbon())->startOfMonth(); $eom = (new Carbon())->endOfMonth(); diff --git a/tests/Unit/Import/Configuration/FileConfiguratorTest.php b/tests/Unit/Import/Configuration/FileConfiguratorTest.php deleted file mode 100644 index a5bf52d6fd..0000000000 --- a/tests/Unit/Import/Configuration/FileConfiguratorTest.php +++ /dev/null @@ -1,688 +0,0 @@ -. - */ - -declare(strict_types=1); - -namespace Tests\Unit\Import\Configuration; - -use FireflyIII\Import\Configuration\FileConfigurator; -use FireflyIII\Models\ImportJob; -use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; -use FireflyIII\Support\Import\Configuration\File\Initial; -use FireflyIII\Support\Import\Configuration\File\Map; -use FireflyIII\Support\Import\Configuration\File\Roles; -use FireflyIII\Support\Import\Configuration\File\UploadConfig; -use Mockery; -use Tests\TestCase; - -/** - * Class FileConfiguratorTest - */ -class FileConfiguratorTest extends TestCase -{ - /** - * @covers \FireflyIII\Import\Configuration\FileConfigurator::configureJob - * @covers \FireflyIII\Import\Configuration\FileConfigurator::setJob - * @covers \FireflyIII\Import\Configuration\FileConfigurator::getConfig - * @covers \FireflyIII\Import\Configuration\FileConfigurator::getConfigurationClass - */ - public function testConfigureJobInitial() - { - // data - $config = ['stage' => 'initial']; - $data = ['some' => 'array']; - $extended = ['steps' => 0, 'done' => 0]; - $job = $this->getJob($config); - - // mock repository - $repository = $this->mock(ImportJobRepositoryInterface::class); - $repository->shouldReceive('setUser')->withArgs([Mockery::any()])->once(); - $repository->shouldReceive('getConfiguration')->andReturn($config)->twice(); - $repository->shouldReceive('setConfiguration')->once(); - $repository->shouldReceive('getExtendedStatus')->andReturn($extended)->once(); - $repository->shouldReceive('setExtendedStatus')->once(); - - - // assert that new initial is created: - $processor = $this->mock(Initial::class); - $processor->shouldReceive('setJob')->withArgs([$job])->once(); - $processor->shouldReceive('storeConfiguration')->withArgs([$data])->once()->andReturn(true); - $processor->shouldReceive('getWarningMessage')->andReturn('')->once(); - - // config - $configurator = new FileConfigurator(); - $configurator->setJob($job); - $configurator->configureJob($data); - } - - /** - * @covers \FireflyIII\Import\Configuration\FileConfigurator::configureJob - * @covers \FireflyIII\Import\Configuration\FileConfigurator::getConfigurationClass - */ - public function testConfigureJobMap() - { - // data - $config = ['stage' => 'map']; - $data = ['some' => 'array']; - $extended = ['steps' => 0, 'done' => 0]; - $job = $this->getJob($config); - - // mock repository - $repository = $this->mock(ImportJobRepositoryInterface::class); - $repository->shouldReceive('setUser')->withArgs([Mockery::any()])->once(); - $repository->shouldReceive('getConfiguration')->andReturn($config)->twice(); - $repository->shouldReceive('setConfiguration')->once(); - $repository->shouldReceive('getExtendedStatus')->andReturn($extended)->once(); - $repository->shouldReceive('setExtendedStatus')->once(); - - // assert that new Roles is created: - $processor = $this->mock(Map::class); - $processor->shouldReceive('setJob')->withArgs([$job])->once(); - $processor->shouldReceive('storeConfiguration')->withArgs([$data])->once()->andReturn(true); - $processor->shouldReceive('getWarningMessage')->andReturn('')->once(); - - // config - $configurator = new FileConfigurator(); - $configurator->setJob($job); - $configurator->configureJob($data); - } - - /** - * Should throw a FireflyException when $job is null. - * - * @covers \FireflyIII\Import\Configuration\FileConfigurator::__construct - * @covers \FireflyIII\Import\Configuration\FileConfigurator::configureJob - * @expectedException \FireflyIII\Exceptions\FireflyException - */ - public function testConfigureJobNoJob() - { - // config - $configurator = new FileConfigurator(); - $configurator->configureJob([]); - } - - /** - * @covers \FireflyIII\Import\Configuration\FileConfigurator::configureJob - * @covers \FireflyIII\Import\Configuration\FileConfigurator::getConfigurationClass - * @expectedException \FireflyIII\Exceptions\FireflyException - * @expectedExceptionMessage Cannot handle job stage "ready" in getConfigurationClass(). - */ - public function testConfigureJobReady() - { - // data - $config = ['stage' => 'ready']; - $data = ['some' => 'array']; - $extended = ['steps' => 0, 'done' => 0]; - $job = $this->getJob($config); - - // mock repos - $repository = $this->mock(ImportJobRepositoryInterface::class); - $repository->shouldReceive('setUser')->withArgs([Mockery::any()])->once(); - $repository->shouldReceive('getConfiguration')->andReturn($config)->twice(); - $repository->shouldReceive('setConfiguration')->once(); - $repository->shouldReceive('getExtendedStatus')->andReturn($extended)->once(); - $repository->shouldReceive('setExtendedStatus')->once(); - - // run config - $configurator = new FileConfigurator(); - $configurator->setJob($job); - $configurator->configureJob($data); - } - - /** - * @covers \FireflyIII\Import\Configuration\FileConfigurator::configureJob - * @covers \FireflyIII\Import\Configuration\FileConfigurator::getConfigurationClass - */ - public function testConfigureJobRoles() - { - $config = ['stage' => 'roles']; - $data = ['some' => 'array']; - $extended = ['steps' => 0, 'done' => 0]; - $job = $this->getJob($config); - - // mock repos - $repository = $this->mock(ImportJobRepositoryInterface::class); - $repository->shouldReceive('setUser')->withArgs([Mockery::any()])->once(); - $repository->shouldReceive('getConfiguration')->andReturn($config)->twice(); - $repository->shouldReceive('setConfiguration')->once(); - $repository->shouldReceive('getExtendedStatus')->andReturn($extended)->once(); - $repository->shouldReceive('setExtendedStatus')->once(); - - // assert that new Roles is created: - $processor = $this->mock(Roles::class); - $processor->shouldReceive('setJob')->withArgs([$job])->once(); - $processor->shouldReceive('storeConfiguration')->withArgs([$data])->once()->andReturn(true); - $processor->shouldReceive('getWarningMessage')->andReturn('')->once(); - - // run config - $configurator = new FileConfigurator(); - $configurator->setJob($job); - $configurator->configureJob($data); - } - - /** - * @covers \FireflyIII\Import\Configuration\FileConfigurator::configureJob - * @covers \FireflyIII\Import\Configuration\FileConfigurator::getConfigurationClass - */ - public function testConfigureJobUploadConfig() - { - // data - $config = ['stage' => 'upload-config']; - $data = ['some' => 'array']; - $extended = ['steps' => 0, 'done' => 0]; - $job = $this->getJob($config); - - // mock repos - $repository = $this->mock(ImportJobRepositoryInterface::class); - $repository->shouldReceive('setUser')->withArgs([Mockery::any()])->once(); - $repository->shouldReceive('getConfiguration')->andReturn($config)->twice(); - $repository->shouldReceive('setConfiguration')->once(); - $repository->shouldReceive('getExtendedStatus')->andReturn($extended)->once(); - $repository->shouldReceive('setExtendedStatus')->once(); - - // assert that new UploadConfig is created: - $processor = $this->mock(UploadConfig::class); - $processor->shouldReceive('setJob')->withArgs([$job])->once(); - $processor->shouldReceive('storeConfiguration')->withArgs([$data])->once()->andReturn(true); - $processor->shouldReceive('getWarningMessage')->andReturn('')->once(); - - // run config - $configurator = new FileConfigurator(); - $configurator->setJob($job); - $configurator->configureJob($data); - } - - /** - * @covers \FireflyIII\Import\Configuration\FileConfigurator::getNextData - */ - public function testGetNextDataInitial() - { - // data - $config = ['stage' => 'initial']; - $extended = ['steps' => 0, 'done' => 0]; - $job = $this->getJob($config); - - // mock repos - $repository = $this->mock(ImportJobRepositoryInterface::class); - $repository->shouldReceive('setUser')->withArgs([Mockery::any()])->once(); - $repository->shouldReceive('getConfiguration')->andReturn($config)->twice(); - $repository->shouldReceive('setConfiguration')->once(); - $repository->shouldReceive('getExtendedStatus')->andReturn($extended)->once(); - $repository->shouldReceive('setExtendedStatus')->once(); - - // assert that new Initial is created: - $processor = $this->mock(Initial::class); - $processor->shouldReceive('setJob')->withArgs([$job])->once(); - $processor->shouldReceive('getData')->once(); - - - $configurator = new FileConfigurator(); - $configurator->setJob($job); - $configurator->getNextData(); - } - - /** - * Should throw a FireflyException when $job is null. - * - * @covers \FireflyIII\Import\Configuration\FileConfigurator::getNextData - * @expectedException \FireflyIII\Exceptions\FireflyException - */ - public function testGetNextDataNoJob() - { - $repository = $this->mock(ImportJobRepositoryInterface::class); - $configurator = new FileConfigurator(); - $configurator->getNextData(); - } - - /** - * @covers \FireflyIII\Import\Configuration\FileConfigurator::getNextData - */ - public function testGetNextDataUploadConfig() - { - // data - $config = ['stage' => 'upload-config']; - $extended = ['steps' => 0, 'done' => 0]; - $job = $this->getJob($config); - - // mock repos - $repository = $this->mock(ImportJobRepositoryInterface::class); - $repository->shouldReceive('setUser')->withArgs([Mockery::any()])->once(); - $repository->shouldReceive('getConfiguration')->andReturn($config)->twice(); - $repository->shouldReceive('setConfiguration')->once(); - $repository->shouldReceive('getExtendedStatus')->andReturn($extended)->once(); - $repository->shouldReceive('setExtendedStatus')->once(); - - // assert that new Initial is created: - $processor = $this->mock(UploadConfig::class); - $processor->shouldReceive('setJob')->withArgs([$job])->once(); - $processor->shouldReceive('getData')->once(); - - // run config - $configurator = new FileConfigurator(); - $configurator->setJob($job); - $configurator->getNextData(); - } - - /** - * @covers \FireflyIII\Import\Configuration\FileConfigurator::getNextData - * @expectedException \FireflyIII\Exceptions\FireflyException - * @expectedExceptionMessage Cannot handle job stage "ksksjje" in getConfigurationClass(). - */ - public function testGetNextDataUploadInvalid() - { - // data - $config = ['stage' => 'ksksjje']; - $extended = ['steps' => 0, 'done' => 0]; - $job = $this->getJob($config); - - // mock repos - $repository = $this->mock(ImportJobRepositoryInterface::class); - $repository->shouldReceive('setUser')->withArgs([Mockery::any()])->once(); - $repository->shouldReceive('getConfiguration')->andReturn($config)->twice(); - $repository->shouldReceive('setConfiguration')->once(); - $repository->shouldReceive('getExtendedStatus')->andReturn($extended)->once(); - $repository->shouldReceive('setExtendedStatus')->once(); - - // should throw error - $configurator = new FileConfigurator(); - $configurator->setJob($job); - $configurator->getNextData(); - } - - /** - * @covers \FireflyIII\Import\Configuration\FileConfigurator::getNextData - */ - public function testGetNextDataUploadMap() - { - // data: - $config = ['stage' => 'map']; - $extended = ['steps' => 0, 'done' => 0]; - $job = $this->getJob($config); - - // mock repos - $repository = $this->mock(ImportJobRepositoryInterface::class); - $repository->shouldReceive('setUser')->withArgs([Mockery::any()])->once(); - $repository->shouldReceive('getConfiguration')->andReturn($config)->twice(); - $repository->shouldReceive('setConfiguration')->once(); - $repository->shouldReceive('getExtendedStatus')->andReturn($extended)->once(); - $repository->shouldReceive('setExtendedStatus')->once(); - - // assert that new Initial is created: - $processor = $this->mock(Map::class); - $processor->shouldReceive('setJob')->withArgs([$job])->once(); - $processor->shouldReceive('getData')->once(); - - // run config - $configurator = new FileConfigurator(); - $configurator->setJob($job); - $configurator->getNextData(); - } - - /** - * @covers \FireflyIII\Import\Configuration\FileConfigurator::getNextData - * @expectedException \FireflyIII\Exceptions\FireflyException - * @expectedExceptionMessage Cannot handle job stage "ready" in getConfigurationClass(). - */ - public function testGetNextDataUploadReady() - { - // data - $config = ['stage' => 'ready']; - $extended = ['steps' => 0, 'done' => 0]; - $job = $this->getJob($config); - - // mock repos - $repository = $this->mock(ImportJobRepositoryInterface::class); - $repository->shouldReceive('setUser')->withArgs([Mockery::any()])->once(); - $repository->shouldReceive('getConfiguration')->andReturn($config)->twice(); - $repository->shouldReceive('setConfiguration')->once(); - $repository->shouldReceive('getExtendedStatus')->andReturn($extended)->once(); - $repository->shouldReceive('setExtendedStatus')->once(); - - // run config - $configurator = new FileConfigurator(); - $configurator->setJob($job); - $configurator->getNextData(); - } - - /** - * @covers \FireflyIII\Import\Configuration\FileConfigurator::getNextData - */ - public function testGetNextDataUploadRoles() - { - // data - $config = ['stage' => 'roles']; - $extended = ['steps' => 0, 'done' => 0]; - $job = $this->getJob($config); - - // mock repos - $repository = $this->mock(ImportJobRepositoryInterface::class); - $repository->shouldReceive('setUser')->withArgs([Mockery::any()])->once(); - $repository->shouldReceive('getConfiguration')->andReturn($config)->twice(); - $repository->shouldReceive('setConfiguration')->once(); - $repository->shouldReceive('getExtendedStatus')->andReturn($extended)->once(); - $repository->shouldReceive('setExtendedStatus')->once(); - - // assert that new Initial is created: - $processor = $this->mock(Roles::class); - $processor->shouldReceive('setJob')->withArgs([$job])->once(); - $processor->shouldReceive('getData')->once(); - - // run config - $configurator = new FileConfigurator(); - $configurator->setJob($job); - $configurator->getNextData(); - } - - /** - * @covers \FireflyIII\Import\Configuration\FileConfigurator::getNextView - */ - public function testGetNextViewInitial() - { - // data - $config = ['stage' => 'initial']; - $extended = ['steps' => 0, 'done' => 0]; - $job = $this->getJob($config); - - // mock repos - $repository = $this->mock(ImportJobRepositoryInterface::class); - $repository->shouldReceive('setUser')->withArgs([Mockery::any()])->once(); - $repository->shouldReceive('getConfiguration')->andReturn($config)->twice(); - $repository->shouldReceive('setConfiguration')->once(); - $repository->shouldReceive('getExtendedStatus')->andReturn($extended)->once(); - $repository->shouldReceive('setExtendedStatus')->once(); - - // run - $configurator = new FileConfigurator(); - $configurator->setJob($job); - $view = $configurator->getNextView(); - - // test - $this->assertEquals('import.file.initial', $view); - } - - /** - * @covers \FireflyIII\Import\Configuration\FileConfigurator::getNextView - * @expectedException \FireflyIII\Exceptions\FireflyException - * @expectedExceptionMessage No view for stage "slkds903ms90k" - */ - public function testGetNextViewInvalid() - { - // data - $config = ['stage' => 'slkds903ms90k']; - $extended = ['steps' => 0, 'done' => 0]; - $job = $this->getJob($config); - - // mock repos - $repository = $this->mock(ImportJobRepositoryInterface::class); - $repository->shouldReceive('setUser')->withArgs([Mockery::any()])->once(); - $repository->shouldReceive('getConfiguration')->andReturn($config)->twice(); - $repository->shouldReceive('setConfiguration')->once(); - $repository->shouldReceive('getExtendedStatus')->andReturn($extended)->once(); - $repository->shouldReceive('setExtendedStatus')->once(); - - // run config - $configurator = new FileConfigurator(); - $configurator->setJob($job); - $configurator->getNextView(); - } - - /** - * @covers \FireflyIII\Import\Configuration\FileConfigurator::getNextView - */ - public function testGetNextViewMap() - { - // data - $config = ['stage' => 'map']; - $extended = ['steps' => 0, 'done' => 0]; - $job = $this->getJob($config); - - // mock repos - $repository = $this->mock(ImportJobRepositoryInterface::class); - $repository->shouldReceive('setUser')->withArgs([Mockery::any()])->once(); - $repository->shouldReceive('getConfiguration')->andReturn($config)->twice(); - $repository->shouldReceive('setConfiguration')->once(); - $repository->shouldReceive('getExtendedStatus')->andReturn($extended)->once(); - $repository->shouldReceive('setExtendedStatus')->once(); - - // run config - $configurator = new FileConfigurator(); - $configurator->setJob($job); - $view = $configurator->getNextView(); - - // test - $this->assertEquals('import.file.map', $view); - } - - /** - * Should throw a FireflyException when $job is null. - * - * @covers \FireflyIII\Import\Configuration\FileConfigurator::getNextView - * @expectedException \FireflyIII\Exceptions\FireflyException - */ - public function testGetNextViewNoJob() - { - $configurator = new FileConfigurator(); - $configurator->getNextView(); - } - - /** - * @covers \FireflyIII\Import\Configuration\FileConfigurator::getNextView - * @expectedException \FireflyIII\Exceptions\FireflyException - * @expectedExceptionMessage No view for stage "ready" - */ - public function testGetNextViewReady() - { - // data - $config = ['stage' => 'ready']; - $extended = ['steps' => 0, 'done' => 0]; - $job = $this->getJob($config); - - // mock repos - $repository = $this->mock(ImportJobRepositoryInterface::class); - $repository->shouldReceive('setUser')->withArgs([Mockery::any()])->once(); - $repository->shouldReceive('getConfiguration')->andReturn($config)->twice(); - $repository->shouldReceive('setConfiguration')->once(); - $repository->shouldReceive('getExtendedStatus')->andReturn($extended)->once(); - $repository->shouldReceive('setExtendedStatus')->once(); - - // run configx§ - $configurator = new FileConfigurator(); - $configurator->setJob($job); - $configurator->getNextView(); - } - - /** - * @covers \FireflyIII\Import\Configuration\FileConfigurator::getNextView - */ - public function testGetNextViewRoles() - { - // data - $config = ['stage' => 'roles']; - $extended = ['steps' => 0, 'done' => 0]; - $job = $this->getJob($config); - - // mock repos - $repository = $this->mock(ImportJobRepositoryInterface::class); - $repository->shouldReceive('setUser')->withArgs([Mockery::any()])->once(); - $repository->shouldReceive('getConfiguration')->andReturn($config)->twice(); - $repository->shouldReceive('setConfiguration')->once(); - $repository->shouldReceive('getExtendedStatus')->andReturn($extended)->once(); - $repository->shouldReceive('setExtendedStatus')->once(); - - // run config - $configurator = new FileConfigurator(); - $configurator->setJob($job); - $view = $configurator->getNextView(); - - // test - $this->assertEquals('import.file.roles', $view); - } - - /** - * @covers \FireflyIII\Import\Configuration\FileConfigurator::getNextView - */ - public function testGetNextViewUploadConfig() - { - // data - $config = ['stage' => 'upload-config']; - $extended = ['steps' => 0, 'done' => 0]; - $job = $this->getJob($config); - - // mock repos - $repository = $this->mock(ImportJobRepositoryInterface::class); - $repository->shouldReceive('setUser')->withArgs([Mockery::any()])->once(); - $repository->shouldReceive('getConfiguration')->andReturn($config)->twice(); - $repository->shouldReceive('setConfiguration')->once(); - $repository->shouldReceive('getExtendedStatus')->andReturn($extended)->once(); - $repository->shouldReceive('setExtendedStatus')->once(); - - // run config - $configurator = new FileConfigurator(); - $configurator->setJob($job); - $view = $configurator->getNextView(); - - // test - $this->assertEquals('import.file.upload-config', $view); - } - - /** - * @covers \FireflyIII\Import\Configuration\FileConfigurator::getWarningMessage - */ - public function testGetWarningMessage() - { - // data - $config = ['stage' => 'upload-config']; - $extended = ['steps' => 0, 'done' => 0]; - $job = $this->getJob($config); - - // mock repos - $repository = $this->mock(ImportJobRepositoryInterface::class); - $repository->shouldReceive('setUser')->withArgs([Mockery::any()])->once(); - $repository->shouldReceive('getConfiguration')->andReturn($config)->once(); - $repository->shouldReceive('setConfiguration')->once(); - $repository->shouldReceive('getExtendedStatus')->andReturn($extended)->once(); - $repository->shouldReceive('setExtendedStatus')->once(); - - // run config - $configurator = new FileConfigurator(); - $configurator->setJob($job); - $warning = $configurator->getWarningMessage(); - - // test - $this->assertEquals('', $warning); - - } - - /** - * Should throw a FireflyException when $job is null. - * - * @covers \FireflyIII\Import\Configuration\FileConfigurator::getWarningMessage - * @expectedException \FireflyIII\Exceptions\FireflyException - */ - public function testGetWarningMessageNoJob() - { - $configurator = new FileConfigurator(); - $configurator->getWarningMessage(); - } - - /** - * @covers \FireflyIII\Import\Configuration\FileConfigurator::isJobConfigured - */ - public function testIsJobConfiguredFalse() - { - // data - $config = ['stage' => 'upload-config']; - $extended = ['steps' => 0, 'done' => 0]; - $job = $this->getJob($config); - - // mock repos - $repository = $this->mock(ImportJobRepositoryInterface::class); - $repository->shouldReceive('setUser')->withArgs([Mockery::any()])->once(); - $repository->shouldReceive('getConfiguration')->andReturn($config)->twice(); - $repository->shouldReceive('setConfiguration')->once(); - $repository->shouldReceive('getExtendedStatus')->andReturn($extended)->once(); - $repository->shouldReceive('setExtendedStatus')->once(); - - // run config - $configurator = new FileConfigurator(); - $configurator->setJob($job); - $result = $configurator->isJobConfigured(); - - // test - $this->assertFalse($result); - } - - /** - * Should throw a FireflyException when $job is null. - * - * @covers \FireflyIII\Import\Configuration\FileConfigurator::isJobConfigured - * @expectedException \FireflyIII\Exceptions\FireflyException - */ - public function testIsJobConfiguredNoJob() - { - $configurator = new FileConfigurator(); - $configurator->isJobConfigured(); - } - - /** - * @covers \FireflyIII\Import\Configuration\FileConfigurator::isJobConfigured - */ - public function testIsJobConfiguredTrue() - { - // data - $config = ['stage' => 'ready']; - $extended = ['steps' => 0, 'done' => 0]; - $job = $this->getJob($config); - - // mock repos - $repository = $this->mock(ImportJobRepositoryInterface::class); - $repository->shouldReceive('setUser')->withArgs([Mockery::any()])->once(); - $repository->shouldReceive('getConfiguration')->andReturn($config)->twice(); - $repository->shouldReceive('setConfiguration')->once(); - $repository->shouldReceive('getExtendedStatus')->andReturn($extended)->once(); - $repository->shouldReceive('setExtendedStatus')->once(); - - // run config - $configurator = new FileConfigurator(); - $configurator->setJob($job); - $result = $configurator->isJobConfigured(); - - // test - $this->assertTrue($result); - } - - /** - * @param array $config - * - * @return ImportJob - */ - protected function getJob(array $config): ImportJob - { - $job = new ImportJob; - $job->file_type = 'file'; - $job->status = 'new'; - $job->key = 'x' . random_int(1, 100000); - $job->user()->associate($this->user()); - $job->configuration = $config; - - return $job; - } -} diff --git a/tests/Unit/Import/Converter/AmountCreditTest.php b/tests/Unit/Import/Converter/AmountCreditTest.php index 2e4bbd888f..351662c164 100644 --- a/tests/Unit/Import/Converter/AmountCreditTest.php +++ b/tests/Unit/Import/Converter/AmountCreditTest.php @@ -33,7 +33,7 @@ class AmountCreditTest extends TestCase /** * @covers \FireflyIII\Import\Converter\AmountCredit::convert() */ - public function testConvert() + public function testConvert(): void { $values = [ '0' => '0', @@ -161,7 +161,7 @@ class AmountCreditTest extends TestCase /** * @covers \FireflyIII\Import\Converter\AmountCredit::convert() */ - public function testConvertNull() + public function testConvertNull(): void { $converter = new AmountCredit; $result = $converter->convert(null); diff --git a/tests/Unit/Import/Converter/AmountDebitTest.php b/tests/Unit/Import/Converter/AmountDebitTest.php index 702b9f0992..f6a030c0bb 100644 --- a/tests/Unit/Import/Converter/AmountDebitTest.php +++ b/tests/Unit/Import/Converter/AmountDebitTest.php @@ -33,7 +33,7 @@ class AmountDebitTest extends TestCase /** * @covers \FireflyIII\Import\Converter\AmountDebit::convert() */ - public function testConvert() + public function testConvert(): void { $values = [ '0' => '0', @@ -161,7 +161,7 @@ class AmountDebitTest extends TestCase /** * @covers \FireflyIII\Import\Converter\AmountDebit::convert() */ - public function testConvertNull() + public function testConvertNull(): void { $converter = new AmountDebit; $result = $converter->convert(null); diff --git a/tests/Unit/Import/Converter/AmountTest.php b/tests/Unit/Import/Converter/AmountTest.php index 8545718f42..40ca358b7a 100644 --- a/tests/Unit/Import/Converter/AmountTest.php +++ b/tests/Unit/Import/Converter/AmountTest.php @@ -34,7 +34,7 @@ class AmountTest extends TestCase * @covers \FireflyIII\Import\Converter\Amount::convert() * @covers \FireflyIII\Import\Converter\Amount::stripAmount() */ - public function testConvert() + public function testConvert(): void { $values = [ '0' => '0', @@ -167,7 +167,7 @@ class AmountTest extends TestCase /** * @covers \FireflyIII\Import\Converter\Amount::convert() */ - public function testConvertNull() + public function testConvertNull(): void { $converter = new Amount; $result = $converter->convert(null); diff --git a/tests/Unit/Import/Converter/INGDebitCreditTest.php b/tests/Unit/Import/Converter/INGDebitCreditTest.php index c947e5e82b..5fe484396a 100644 --- a/tests/Unit/Import/Converter/INGDebitCreditTest.php +++ b/tests/Unit/Import/Converter/INGDebitCreditTest.php @@ -34,7 +34,7 @@ class INGDebitCreditTest extends TestCase /** * @covers \FireflyIII\Import\Converter\INGDebitCredit::convert() */ - public function testConvertAf() + public function testConvertAf(): void { $converter = new INGDebitCredit; $result = $converter->convert('Af'); @@ -44,7 +44,7 @@ class INGDebitCreditTest extends TestCase /** * @covers \FireflyIII\Import\Converter\INGDebitCredit::convert() */ - public function testConvertAnything() + public function testConvertAnything(): void { $converter = new INGDebitCredit; $result = $converter->convert('9083jkdkj'); @@ -54,7 +54,7 @@ class INGDebitCreditTest extends TestCase /** * @covers \FireflyIII\Import\Converter\INGDebitCredit::convert() */ - public function testConvertBij() + public function testConvertBij(): void { $converter = new INGDebitCredit; $result = $converter->convert('Bij'); diff --git a/tests/Unit/Import/Converter/RabobankDebitCreditTest.php b/tests/Unit/Import/Converter/RabobankDebitCreditTest.php index fd330b1041..5961b46318 100644 --- a/tests/Unit/Import/Converter/RabobankDebitCreditTest.php +++ b/tests/Unit/Import/Converter/RabobankDebitCreditTest.php @@ -34,17 +34,7 @@ class RabobankDebitCreditTest extends TestCase /** * @covers \FireflyIII\Import\Converter\RabobankDebitCredit::convert() */ - public function testConvertAf() - { - $converter = new RabobankDebitCredit; - $result = $converter->convert('D'); - $this->assertEquals(-1, $result); - } - - /** - * @covers \FireflyIII\Import\Converter\RabobankDebitCredit::convert() - */ - public function testConvertAnything() + public function testConvertAnything(): void { $converter = new RabobankDebitCredit; $result = $converter->convert('9083jkdkj'); @@ -54,10 +44,40 @@ class RabobankDebitCreditTest extends TestCase /** * @covers \FireflyIII\Import\Converter\RabobankDebitCredit::convert() */ - public function testConvertBij() + public function testConvertCredit(): void { $converter = new RabobankDebitCredit; $result = $converter->convert('C'); $this->assertEquals(1, $result); } + + /** + * @covers \FireflyIII\Import\Converter\RabobankDebitCredit::convert() + */ + public function testConvertCreditOld(): void + { + $converter = new RabobankDebitCredit; + $result = $converter->convert('B'); + $this->assertEquals(1, $result); + } + + /** + * @covers \FireflyIII\Import\Converter\RabobankDebitCredit::convert() + */ + public function testConvertDebit(): void + { + $converter = new RabobankDebitCredit; + $result = $converter->convert('D'); + $this->assertEquals(-1, $result); + } + + /** + * @covers \FireflyIII\Import\Converter\RabobankDebitCredit::convert() + */ + public function testConvertDebitOld(): void + { + $converter = new RabobankDebitCredit; + $result = $converter->convert('A'); + $this->assertEquals(-1, $result); + } } diff --git a/tests/Unit/Import/FileProcessor/CsvProcessorTest.php b/tests/Unit/Import/FileProcessor/CsvProcessorTest.php deleted file mode 100644 index f98d0b7692..0000000000 --- a/tests/Unit/Import/FileProcessor/CsvProcessorTest.php +++ /dev/null @@ -1,346 +0,0 @@ -. - */ - -declare(strict_types=1); - -namespace Tests\Unit\Import\FileProcessor; - -use FireflyIII\Import\FileProcessor\CsvProcessor; -use FireflyIII\Import\Specifics\AbnAmroDescription; -use FireflyIII\Models\ImportJob; -use FireflyIII\Repositories\Account\AccountRepositoryInterface; -use FireflyIII\Repositories\Bill\BillRepositoryInterface; -use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; -use FireflyIII\Repositories\Category\CategoryRepositoryInterface; -use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; -use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; -use Mockery; -use Tests\TestCase; - -/** - * Class CsvProcessorTest - */ -class CsvProcessorTest extends TestCase -{ - /** - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::__construct - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::getObjects - * @expectedException \FireflyIII\Exceptions\FireflyException - * @expectedExceptionMessage Cannot call getObjects() without a job. - */ - public function testGetObjectsNoJob() - { - $processor = new CsvProcessor(); - $processor->getObjects(); - } - - /** - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::run - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::getImportArray - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::getObjects - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::setJob - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::importRow - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::specifics - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::getRowHash - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::annotateValue - * @expectedException \FireflyIII\Exceptions\FireflyException - * @expectedExceptionMessage "bad-role" is not a valid role. - */ - public function testRunBadRole() - { - $accountRepos = $this->mock(AccountRepositoryInterface::class); - $budRepos = $this->mock(BudgetRepositoryInterface::class); - $jobRepos = $this->mock(ImportJobRepositoryInterface::class); - $catRepos = $this->mock(CategoryRepositoryInterface::class); - $billRepos = $this->mock(BillRepositoryInterface::class); - $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); - - $accountRepos->shouldReceive('setUser'); - $budRepos->shouldReceive('setUser'); - $catRepos->shouldReceive('setUser'); - $billRepos->shouldReceive('setUser'); - - // data - $config = [ - 'column-roles' => [ - 0 => 'bad-role', - ], - ]; - $extended = ['steps' => 0, 'done' => 0]; - $job = $this->getJob($config); - $csvFile = '20170101,-12.34,"Some description"'; - - // mock stuff - - $jobRepos->shouldReceive('setUser')->withArgs([Mockery::any()])->once(); - $jobRepos->shouldReceive('getConfiguration')->andReturn($config); - $jobRepos->shouldReceive('uploadFileContents')->withArgs([Mockery::any()])->andReturn($csvFile)->once(); - $jobRepos->shouldReceive('addStepsDone')->twice(); - - // mock stuff for this single row: - $jobRepos->shouldReceive('countByHash')->once()->withArgs([Mockery::any()])->andReturn(0); - - $processor = new CsvProcessor(); - $processor->setJob($job); - $processor->run(); - } - - /** - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::run - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::getImportArray - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::getObjects - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::setJob - */ - public function testRunBasic() - { - // data - $config = []; - $job = $this->getJob($config); - $csvFile = ''; - $extended = ['steps' => 0, 'done' => 0]; - - // mock stuff - $repository = $this->mock(ImportJobRepositoryInterface::class); - $repository->shouldReceive('setUser')->withArgs([Mockery::any()])->once(); - $repository->shouldReceive('getConfiguration')->andReturn($config); - $repository->shouldReceive('uploadFileContents')->withArgs([Mockery::any()])->andReturn($csvFile)->once(); - // $repository->shouldReceive('getExtendedStatus')->once()->andReturn([]); - // $repository->shouldReceive('setExtendedStatus')->once()->andReturn($job); - $repository->shouldReceive('addStepsDone')->times(3); - - $processor = new CsvProcessor(); - $processor->setJob($job); - $processor->run(); - - $objects = $processor->getObjects(); - $this->assertCount(0, $objects); - } - - /** - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::run - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::getImportArray - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::getObjects - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::setJob - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::importRow - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::specifics - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::getRowHash - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::annotateValue - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::rowAlreadyImported - */ - public function testRunExisting() - { - // data - $config = []; - $job = $this->getJob($config); - $csvFile = '20170101,-12.34,"Some description"'; - $extended = ['steps' => 0, 'done' => 0]; - - // mock stuff - $repository = $this->mock(ImportJobRepositoryInterface::class); - $repository->shouldReceive('setUser')->withArgs([Mockery::any()])->once(); - $repository->shouldReceive('getConfiguration')->andReturn($config); - $repository->shouldReceive('uploadFileContents')->withArgs([Mockery::any()])->andReturn($csvFile)->once(); - // $repository->shouldReceive('getExtendedStatus')->once()->andReturn([]); // twice for update errors. - // $repository->shouldReceive('setExtendedStatus')->once()->andReturn($job); - //$repository->shouldReceive('addStepsDone')->times(3); - - // mock stuff for this single row: - $repository->shouldReceive('countByHash')->once()->withArgs([Mockery::any()])->andReturn(1); - $repository->shouldReceive('addStepsDone')->times(3)->withArgs([Mockery::any(), 1]); - $repository->shouldReceive('addError')->once()->withArgs([Mockery::any(), 0, 'Row #0 has already been imported.']); - $processor = new CsvProcessor(); - $processor->setJob($job); - $processor->run(); - - $objects = $processor->getObjects(); - $this->assertCount(0, $objects); - } - - /** - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::run - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::getImportArray - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::getObjects - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::setJob - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::importRow - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::specifics - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::getRowHash - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::annotateValue - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::rowAlreadyImported - * @expectedException \FireflyIII\Exceptions\FireflyException - * @expectedExceptionMessage "GoodBankDescription" is not a valid class name - */ - public function testRunInvalidSpecific() - { - // data - $config = [ - 'specifics' => ['GoodBankDescription' => 1], - ]; - $job = $this->getJob($config); - $csvFile = '20170101,-12.34,descr'; - $extended = ['steps' => 0, 'done' => 0]; - - // mock stuff - $repository = $this->mock(ImportJobRepositoryInterface::class); - $repository->shouldReceive('setUser')->withArgs([Mockery::any()])->once(); - $repository->shouldReceive('getConfiguration')->andReturn($config); - $repository->shouldReceive('uploadFileContents')->withArgs([Mockery::any()])->andReturn($csvFile)->once(); - // $repository->shouldReceive('getExtendedStatus')->once()->andReturn([]); - // $repository->shouldReceive('setExtendedStatus')->once()->andReturn($job); - // mock stuff for this single row: - $repository->shouldReceive('countByHash')->once()->withArgs([Mockery::any()])->andReturn(0); - $repository->shouldReceive('addStepsDone')->times(2)->withArgs([Mockery::any(), 1]); - - // mock specific: - $processor = new CsvProcessor(); - $processor->setJob($job); - $processor->run(); - } - - /** - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::run - * @expectedException \FireflyIII\Exceptions\FireflyException - * @expectedExceptionMessage Cannot call run() without a job. - */ - public function testRunNoJob() - { - - $processor = new CsvProcessor(); - $processor->run(); - } - - /** - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::run - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::getImportArray - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::getObjects - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::setJob - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::importRow - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::specifics - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::getRowHash - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::annotateValue - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::rowAlreadyImported - */ - public function testRunSingle() - { - $accountRepos = $this->mock(AccountRepositoryInterface::class); - $budRepos = $this->mock(BudgetRepositoryInterface::class); - $jobRepos = $this->mock(ImportJobRepositoryInterface::class); - $catRepos = $this->mock(CategoryRepositoryInterface::class); - $billRepos = $this->mock(BillRepositoryInterface::class); - $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); - - $accountRepos->shouldReceive('setUser'); - $budRepos->shouldReceive('setUser'); - $catRepos->shouldReceive('setUser'); - $billRepos->shouldReceive('setUser'); - - // data - $config = []; - $job = $this->getJob($config); - $csvFile = '20170101,-12.34,"Some description"'; - $extended = ['steps' => 0, 'done' => 0]; - - // mock stuff - $jobRepos->shouldReceive('setUser')->withArgs([Mockery::any()])->once(); - $jobRepos->shouldReceive('getConfiguration')->andReturn($config); - $jobRepos->shouldReceive('uploadFileContents')->withArgs([Mockery::any()])->andReturn($csvFile)->once(); - - // mock stuff for this single row: - $jobRepos->shouldReceive('countByHash')->once()->withArgs([Mockery::any()])->andReturn(0); - $jobRepos->shouldReceive('addStepsDone')->times(3)->withArgs([Mockery::any(), 1]); - $processor = new CsvProcessor(); - $processor->setJob($job); - $processor->run(); - - $objects = $processor->getObjects(); - $this->assertCount(1, $objects); - } - - /** - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::run - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::getImportArray - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::getObjects - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::setJob - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::importRow - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::specifics - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::getRowHash - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::annotateValue - * @covers \FireflyIII\Import\FileProcessor\CsvProcessor::rowAlreadyImported - */ - public function testRunSpecific() - { - $accountRepos = $this->mock(AccountRepositoryInterface::class); - $budRepos = $this->mock(BudgetRepositoryInterface::class); - $jobRepos = $this->mock(ImportJobRepositoryInterface::class); - $catRepos = $this->mock(CategoryRepositoryInterface::class); - $billRepos = $this->mock(BillRepositoryInterface::class); - $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); - - $accountRepos->shouldReceive('setUser'); - $budRepos->shouldReceive('setUser'); - $catRepos->shouldReceive('setUser'); - $billRepos->shouldReceive('setUser'); - - // data - $config = [ - 'specifics' => ['AbnAmroDescription' => 1], - ]; - $job = $this->getJob($config); - $csvFile = '20170101,-12.34,descr'; - $row = explode(',', $csvFile); - $extended = ['steps' => 0, 'done' => 0]; - - // mock stuff - $jobRepos->shouldReceive('setUser')->withArgs([Mockery::any()])->once(); - $jobRepos->shouldReceive('getConfiguration')->andReturn($config); - $jobRepos->shouldReceive('uploadFileContents')->withArgs([Mockery::any()])->andReturn($csvFile)->once(); - // mock stuff for this single row: - $jobRepos->shouldReceive('countByHash')->once()->withArgs([Mockery::any()])->andReturn(0); - $jobRepos->shouldReceive('addStepsDone')->times(3)->withArgs([Mockery::any(), 1]); - - // mock specific: - $specific = $this->mock(AbnAmroDescription::class); - $specific->shouldReceive('run')->once()->andReturn($row); - - $processor = new CsvProcessor(); - $processor->setJob($job); - $processor->run(); - - $objects = $processor->getObjects(); - $this->assertCount(1, $objects); - } - - /** - * @param array $config - * - * @return ImportJob - */ - protected function getJob(array $config): ImportJob - { - $job = new ImportJob; - $job->file_type = 'file'; - $job->status = 'new'; - $job->key = 'x' . random_int(1, 100000); - $job->user()->associate($this->user()); - $job->configuration = $config; - - return $job; - } -} diff --git a/tests/Unit/Import/JobConfiguration/FakeJobConfigurationTest.php b/tests/Unit/Import/JobConfiguration/FakeJobConfigurationTest.php new file mode 100644 index 0000000000..c0ed25f96c --- /dev/null +++ b/tests/Unit/Import/JobConfiguration/FakeJobConfigurationTest.php @@ -0,0 +1,593 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Import\JobConfiguration; + +use FireflyIII\Import\JobConfiguration\FakeJobConfiguration; +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use Mockery; +use Tests\TestCase; + +/** + * Class FakeJobConfigurationTest + */ +class FakeJobConfigurationTest extends TestCase +{ + /** + * No config, job is new. + * + * @covers \FireflyIII\Import\JobConfiguration\FakeJobConfiguration + */ + public function testCC(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'A_unit_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // should be false: + $configurator = new FakeJobConfiguration; + $configurator->setImportJob($job); + $this->assertFalse($configurator->configurationComplete()); + } + + /** + * No config, job is not new. + * + * @covers \FireflyIII\Import\JobConfiguration\FakeJobConfiguration + */ + public function testCCAlbumFalse(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'B_unit_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'needs_config'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // should be false: + $configurator = new FakeJobConfiguration; + $configurator->setImportJob($job); + $this->assertFalse($configurator->configurationComplete()); + } + + /** + * Job only says to apply rules. + * + * @covers \FireflyIII\Import\JobConfiguration\FakeJobConfiguration + */ + public function testCCApplyRules(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'C_unit_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = [ + 'apply-rules' => true, + ]; + $job->save(); + + // should be false: + $configurator = new FakeJobConfiguration; + $configurator->setImportJob($job); + $this->assertFalse($configurator->configurationComplete()); + } + + /** + * Job has album but wrong one. + * + * @covers \FireflyIII\Import\JobConfiguration\FakeJobConfiguration + */ + public function testCCBadAlbum(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'D_unit_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'config'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = [ + 'song' => 'golden years', + 'artist' => 'david bowie', + 'album' => 'some album', + 'apply-rules' => true, + ]; + $job->save(); + + // should be false: + $configurator = new FakeJobConfiguration; + $configurator->setImportJob($job); + $this->assertFalse($configurator->configurationComplete()); + } + + /** + * Job has album + song, but bad content. + * + * @covers \FireflyIII\Import\JobConfiguration\FakeJobConfiguration + */ + public function testCCBadInfo(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'E_unit_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = [ + 'song' => 'some song', + 'artist' => 'david bowie', + 'apply-rules' => true, + ]; + $job->save(); + + // should be false: + $configurator = new FakeJobConfiguration; + $configurator->setImportJob($job); + $this->assertFalse($configurator->configurationComplete()); + } + + /** + * Job has correct album + * + * @covers \FireflyIII\Import\JobConfiguration\FakeJobConfiguration + */ + public function testCCGoodAlbum(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'f_unit_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'config'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = [ + 'song' => 'golden years', + 'artist' => 'david bowie', + 'album' => 'station to station', + 'apply-rules' => true, + ]; + $job->save(); + + // should be false: + $configurator = new FakeJobConfiguration; + $configurator->setImportJob($job); + $this->assertTrue($configurator->configurationComplete()); + } + + /** + * Job has correct content for "new"! + * + * @covers \FireflyIII\Import\JobConfiguration\FakeJobConfiguration + */ + public function testCCGoodNewInfo(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'g_unit_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = [ + 'song' => 'golden years', + 'artist' => 'david bowie', + 'apply-rules' => true, + ]; + $job->save(); + + // should be false: + $configurator = new FakeJobConfiguration; + $configurator->setImportJob($job); + $this->assertTrue($configurator->configurationComplete()); + } + + /** + * Apply rules with submitted "false" + * + * @covers \FireflyIII\Import\JobConfiguration\FakeJobConfiguration + */ + public function testConfigureJobARFalse(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'h_unit_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // mock repository: + $repository = $this->mock(ImportJobRepositoryInterface::class); + + // data to submit: + $data = ['apply_rules' => 0]; + + // expect the config to update: + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setConfiguration') + ->withArgs([Mockery::any(), ['apply-rules' => false]])->once(); + + // call configuration + $configurator = new FakeJobConfiguration; + $configurator->setImportJob($job); + $messages = $configurator->configureJob($data); + $this->assertTrue($messages->has('some_key')); + } + + /** + * Apply rules with submitted "false" + * + * @covers \FireflyIII\Import\JobConfiguration\FakeJobConfiguration + */ + public function testConfigureJobARTrue(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'i_unit_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // mock repository: + $repository = $this->mock(ImportJobRepositoryInterface::class); + + // data to submit: + $data = ['apply_rules' => 1]; + + // expect the config to update: + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setConfiguration') + ->withArgs([Mockery::any(), ['apply-rules' => true]])->once(); + + // call configuration + $configurator = new FakeJobConfiguration; + $configurator->setImportJob($job); + $messages = $configurator->configureJob($data); + $this->assertTrue($messages->has('some_key')); + } + + /** + * Submit job with bad song. + * + * @covers \FireflyIII\Import\JobConfiguration\FakeJobConfiguration + */ + public function testConfigureJobBadAlbum(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'j_unit_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // mock repository: + $repository = $this->mock(ImportJobRepositoryInterface::class); + + // data to submit: + $data = ['album' => 'Station to Bowie']; + + // expect the config to update: + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setConfiguration') + ->withArgs([Mockery::any(), []])->once(); + + // call configuration + $configurator = new FakeJobConfiguration; + $configurator->setImportJob($job); + $messages = $configurator->configureJob($data); + $this->assertTrue($messages->has('some_key')); + } + + /** + * Submit job with bad artist. + * + * @covers \FireflyIII\Import\JobConfiguration\FakeJobConfiguration + */ + public function testConfigureJobBadArtist(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'k_unit_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // mock repository: + $repository = $this->mock(ImportJobRepositoryInterface::class); + + // data to submit: + $data = ['artist' => 'DaViD BoWXXXXXiE']; + + // expect the config to update: + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setConfiguration') + ->withArgs([Mockery::any(), []])->once(); + + // call configuration + $configurator = new FakeJobConfiguration; + $configurator->setImportJob($job); + $messages = $configurator->configureJob($data); + $this->assertTrue($messages->has('some_key')); + } + + /** + * Submit job with bad song. + * + * @covers \FireflyIII\Import\JobConfiguration\FakeJobConfiguration + */ + public function testConfigureJobBadSong(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'l_unit_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // mock repository: + $repository = $this->mock(ImportJobRepositoryInterface::class); + + // data to submit: + $data = ['song' => 'Golden Bowie']; + + // expect the config to update: + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setConfiguration') + ->withArgs([Mockery::any(), []])->once(); + + // call configuration + $configurator = new FakeJobConfiguration; + $configurator->setImportJob($job); + $messages = $configurator->configureJob($data); + $this->assertTrue($messages->has('some_key')); + } + + /** + * Submit job with good album. + * + * @covers \FireflyIII\Import\JobConfiguration\FakeJobConfiguration + */ + public function testConfigureJobGoodAlbum(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'm_unit_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // mock repository: + $repository = $this->mock(ImportJobRepositoryInterface::class); + + // data to submit: + $data = ['album' => 'Station to Station']; + + // expect the config to update: + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setConfiguration') + ->withArgs([Mockery::any(), ['album' => 'station to station']])->once(); + + // call configuration + $configurator = new FakeJobConfiguration; + $configurator->setImportJob($job); + $messages = $configurator->configureJob($data); + $this->assertTrue($messages->has('some_key')); + } + + /** + * Submit job with good artist. + * + * @covers \FireflyIII\Import\JobConfiguration\FakeJobConfiguration + */ + public function testConfigureJobGoodArtist(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'n_unit_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // mock repository: + $repository = $this->mock(ImportJobRepositoryInterface::class); + + // data to submit: + $data = ['artist' => 'DaViD BoWiE']; + + // expect the config to update: + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setConfiguration') + ->withArgs([Mockery::any(), ['artist' => 'david bowie']])->once(); + + // call configuration + $configurator = new FakeJobConfiguration; + $configurator->setImportJob($job); + $messages = $configurator->configureJob($data); + $this->assertTrue($messages->has('some_key')); + } + + /** + * Submit job with good song. + * + * @covers \FireflyIII\Import\JobConfiguration\FakeJobConfiguration + */ + public function testConfigureJobGoodSong(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'o_unit_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // mock repository: + $repository = $this->mock(ImportJobRepositoryInterface::class); + + // data to submit: + $data = ['song' => 'Golden Years']; + + // expect the config to update: + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setConfiguration') + ->withArgs([Mockery::any(), ['song' => 'golden years']])->once(); + + // call configuration + $configurator = new FakeJobConfiguration; + $configurator->setImportJob($job); + $messages = $configurator->configureJob($data); + $this->assertTrue($messages->has('some_key')); + } + + /** + * Have rules, have artist, have song, must ask album + * + * @covers \FireflyIII\Import\JobConfiguration\FakeJobConfiguration + */ + public function testGetNextViewAlbum(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'p_unit_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'not_new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = ['apply-rules' => false, 'artist' => 'david bowie', 'song' => 'golden years']; + $job->save(); + + // call configuration + $configurator = new FakeJobConfiguration; + $configurator->setImportJob($job); + $view = $configurator->getNextView(); + $this->assertEquals('import.fake.enter-album', $view); + } + + /** + * Have rules, must ask artist + * + * @covers \FireflyIII\Import\JobConfiguration\FakeJobConfiguration + */ + public function testGetNextViewArtist(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'p_unit_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = ['apply-rules' => false]; + $job->save(); + + // call configuration + $configurator = new FakeJobConfiguration; + $configurator->setImportJob($job); + $view = $configurator->getNextView(); + $this->assertEquals('import.fake.enter-artist', $view); + } + + /** + * With empty config, should return view for rules. + * + * @covers \FireflyIII\Import\JobConfiguration\FakeJobConfiguration + */ + public function testGetNextViewRules(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'p_unit_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // call configuration + $configurator = new FakeJobConfiguration; + $configurator->setImportJob($job); + $view = $configurator->getNextView(); + $this->assertEquals('import.fake.apply-rules', $view); + } + + /** + * Have rules, have artist, must ask song + * + * @covers \FireflyIII\Import\JobConfiguration\FakeJobConfiguration + */ + public function testGetNextViewSong(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'p_unit_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = ['apply-rules' => false, 'artist' => 'david bowie']; + $job->save(); + + // call configuration + $configurator = new FakeJobConfiguration; + $configurator->setImportJob($job); + $view = $configurator->getNextView(); + $this->assertEquals('import.fake.enter-song', $view); + } +} diff --git a/tests/Unit/Import/JobConfiguration/FileJobConfigurationTest.php b/tests/Unit/Import/JobConfiguration/FileJobConfigurationTest.php new file mode 100644 index 0000000000..8ee551a236 --- /dev/null +++ b/tests/Unit/Import/JobConfiguration/FileJobConfigurationTest.php @@ -0,0 +1,367 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Import\JobConfiguration; + + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Import\JobConfiguration\FileJobConfiguration; +use FireflyIII\Models\ImportJob; +use FireflyIII\Support\Import\JobConfiguration\File\ConfigureMappingHandler; +use FireflyIII\Support\Import\JobConfiguration\File\ConfigureRolesHandler; +use FireflyIII\Support\Import\JobConfiguration\File\ConfigureUploadHandler; +use FireflyIII\Support\Import\JobConfiguration\File\NewFileJobHandler; +use Illuminate\Support\MessageBag; +use Mockery; +use Tests\TestCase; + +/** + * Class FileJobConfigurationTest + */ +class FileJobConfigurationTest extends TestCase +{ + /** + * No config, job is new. + * + * @covers \FireflyIII\Import\JobConfiguration\FileJobConfiguration + */ + public function testCCFalse(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'File_A_unit_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // should be false: + $configurator = new FileJobConfiguration; + $configurator->setImportJob($job); + $this->assertFalse($configurator->configurationComplete()); + } + + /** + * Job is ready to run. + * + * @covers \FireflyIII\Import\JobConfiguration\FileJobConfiguration + */ + public function testCCTrue(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'File_B_unit_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'ready_to_run'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // should be false: + $configurator = new FileJobConfiguration; + $configurator->setImportJob($job); + $this->assertTrue($configurator->configurationComplete()); + } + + /** + * Configure the job when the stage is "map". Won't test other combo's because they're covered by other tests. + * + * @covers \FireflyIII\Import\JobConfiguration\FileJobConfiguration + */ + public function testConfigureJob(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'I-file_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'map'; + $job->provider = 'file'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + $bag = new MessageBag; + $result = null; + + $configurator = new FileJobConfiguration; + $configurator->setImportJob($job); + + $handler = $this->mock(ConfigureMappingHandler::class); + $handler->shouldReceive('setImportJob')->once()->withArgs([Mockery::any()]); + $handler->shouldReceive('configureJob')->withArgs([['c' => 'd']])->andReturn($bag)->once(); + + try { + $result = $configurator->configureJob(['c' => 'd']); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals($bag, $result); + } + + /** + * Get next data when stage is "configure-upload". Expect a certain class to be called. + * + * @covers \FireflyIII\Import\JobConfiguration\FileJobConfiguration + */ + public function testGetNextDataCU(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'G-file_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'configure-upload'; + $job->provider = 'file'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + $result = 'x'; + $configurator = new FileJobConfiguration; + $configurator->setImportJob($job); + + $handler = $this->mock(ConfigureUploadHandler::class); + $handler->shouldReceive('setImportJob')->once()->withArgs([Mockery::any()]); + $handler->shouldReceive('getNextData')->andReturn(['a' => 'b'])->withNoArgs()->once(); + + try { + $result = $configurator->getNextData(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals(['a' => 'b'], $result); + } + + /** + * Get next data when stage is "map". Expect a certain class to be called. + * + * @covers \FireflyIII\Import\JobConfiguration\FileJobConfiguration + */ + public function testGetNextDataMap(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'H-file_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'map'; + $job->provider = 'file'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + $result = 'x'; + $configurator = new FileJobConfiguration; + $configurator->setImportJob($job); + + $handler = $this->mock(ConfigureMappingHandler::class); + $handler->shouldReceive('setImportJob')->once()->withArgs([Mockery::any()]); + $handler->shouldReceive('getNextData')->andReturn(['a' => 'b'])->withNoArgs()->once(); + + try { + $result = $configurator->getNextData(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals(['a' => 'b'], $result); + } + + /** + * Get next data when stage is "new". Expect a certain class to be called. + * + * @covers \FireflyIII\Import\JobConfiguration\FileJobConfiguration + */ + public function testGetNextDataNew(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'F-file_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'file'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + $result = 'x'; + $configurator = new FileJobConfiguration; + $configurator->setImportJob($job); + + $handler = $this->mock(NewFileJobHandler::class); + $handler->shouldReceive('setImportJob')->once()->withArgs([Mockery::any()]); + $handler->shouldReceive('getNextData')->andReturn(['a' => 'b'])->withNoArgs()->once(); + + try { + $result = $configurator->getNextData(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals(['a' => 'b'], $result); + } + + /** + * Get next data when stage is "roles". Expect a certain class to be called. + * + * @covers \FireflyIII\Import\JobConfiguration\FileJobConfiguration + */ + public function testGetNextDataRoles(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'H-file_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'roles'; + $job->provider = 'file'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + $result = 'x'; + $configurator = new FileJobConfiguration; + $configurator->setImportJob($job); + + $handler = $this->mock(ConfigureRolesHandler::class); + $handler->shouldReceive('setImportJob')->once()->withArgs([Mockery::any()]); + $handler->shouldReceive('getNextData')->andReturn(['a' => 'b'])->withNoArgs()->once(); + + try { + $result = $configurator->getNextData(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals(['a' => 'b'], $result); + } + + /** + * Get view when stage is "configure-upload". + * + * @covers \FireflyIII\Import\JobConfiguration\FileJobConfiguration + */ + public function testGetNextViewCU(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'Dfile_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'configure-upload'; + $job->provider = 'file'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + $result = 'x'; + $configurator = new FileJobConfiguration; + $configurator->setImportJob($job); + try { + $result = $configurator->getNextView(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals('import.file.configure-upload', $result); + } + + /** + * Get view when stage is "map". + * + * @covers \FireflyIII\Import\JobConfiguration\FileJobConfiguration + */ + public function testGetNextViewMap(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'Ffile_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'map'; + $job->provider = 'file'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + $result = 'x'; + $configurator = new FileJobConfiguration; + $configurator->setImportJob($job); + try { + $result = $configurator->getNextView(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals('import.file.map', $result); + } + + /** + * Get view when stage is "new". + * + * @covers \FireflyIII\Import\JobConfiguration\FileJobConfiguration + */ + public function testGetNextViewNew(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'Cfile_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'file'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + $result = 'x'; + $configurator = new FileJobConfiguration; + $configurator->setImportJob($job); + try { + $result = $configurator->getNextView(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals('import.file.new', $result); + } + + /** + * Get view when stage is "roles". + * + * @covers \FireflyIII\Import\JobConfiguration\FileJobConfiguration + */ + public function testGetNextViewRoles(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'Efile_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'roles'; + $job->provider = 'file'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + $result = 'x'; + $configurator = new FileJobConfiguration; + $configurator->setImportJob($job); + try { + $result = $configurator->getNextView(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals('import.file.roles', $result); + } +} diff --git a/tests/Unit/Import/JobConfiguration/SpectreJobConfigurationTest.php b/tests/Unit/Import/JobConfiguration/SpectreJobConfigurationTest.php new file mode 100644 index 0000000000..226a6e5dce --- /dev/null +++ b/tests/Unit/Import/JobConfiguration/SpectreJobConfigurationTest.php @@ -0,0 +1,192 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Import\JobConfiguration; + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Import\JobConfiguration\SpectreJobConfiguration; +use FireflyIII\Models\ImportJob; +use FireflyIII\Support\Import\JobConfiguration\Spectre\AuthenticatedHandler; +use FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseAccountsHandler; +use FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseLoginHandler; +use FireflyIII\Support\Import\JobConfiguration\Spectre\DoAuthenticateHandler; +use FireflyIII\Support\Import\JobConfiguration\Spectre\NewSpectreJobHandler; +use Illuminate\Support\MessageBag; +use Tests\TestCase; + +/** + * Class SpectreJobConfigurationTest + */ +class SpectreJobConfigurationTest extends TestCase +{ + /** + * @covers \FireflyIII\Import\JobConfiguration\SpectreJobConfiguration + */ + public function testConfigurationComplete(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'spectre_jc_A' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // expect "NewSpectreJobHandler" to be created because job is new. + $handler = $this->mock(NewSpectreJobHandler::class); + $handler->shouldReceive('setImportJob')->once(); + $handler->shouldReceive('configurationComplete')->once()->andReturn(true); + + $config = new SpectreJobConfiguration; + try { + $config->setImportJob($job); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertTrue($config->configurationComplete()); + } + + /** + * @covers \FireflyIII\Import\JobConfiguration\SpectreJobConfiguration + */ + public function testConfigureJob(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'spectre_jc_B' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'do-authenticate'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + $configData = ['ssome' => 'values']; + $return = new MessageBag(); + $return->add('some', 'return message'); + + // expect "DoAuthenticateHandler" to be created because job is in "do-authenticate". + $handler = $this->mock(DoAuthenticateHandler::class); + $handler->shouldReceive('setImportJob')->once(); + $handler->shouldReceive('configureJob')->once()->withArgs([$configData])->andReturn($return); + + $config = new SpectreJobConfiguration; + try { + $config->setImportJob($job); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals($return, $config->configureJob($configData)); + } + + /** + * @covers \FireflyIII\Import\JobConfiguration\SpectreJobConfiguration + */ + public function testGetNextData(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'spectre_jc_C' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'choose-login'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + $data = ['ssome' => 'values']; + + // Expect choose-login handler because of state. + $handler = $this->mock(ChooseLoginHandler::class); + $handler->shouldReceive('setImportJob')->once(); + $handler->shouldReceive('getNextData')->once()->andReturn($data); + + $config = new SpectreJobConfiguration; + try { + $config->setImportJob($job); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals($data, $config->getNextData()); + } + + /** + * @covers \FireflyIII\Import\JobConfiguration\SpectreJobConfiguration + */ + public function testGetNextView(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'spectre_jc_D' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'authenticated'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // expect "AuthenticatedHandler" because of state. + $handler = $this->mock(AuthenticatedHandler::class); + $handler->shouldReceive('setImportJob')->once(); + $handler->shouldReceive('getNextView')->once()->andReturn('import.fake.view'); + + $config = new SpectreJobConfiguration; + try { + $config->setImportJob($job); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals('import.fake.view', $config->getNextView()); + } + + /** + * @covers \FireflyIII\Import\JobConfiguration\SpectreJobConfiguration + */ + public function testGetNextViewAccount(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'spectre_jc_E' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'choose-accounts'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // expect "ChooseAccountsHandler" because of state. + $handler = $this->mock(ChooseAccountsHandler::class); + $handler->shouldReceive('setImportJob')->once(); + $handler->shouldReceive('getNextView')->once()->andReturn('import.fake.view2'); + + $config = new SpectreJobConfiguration; + try { + $config->setImportJob($job); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals('import.fake.view2', $config->getNextView()); + } + + +} \ No newline at end of file diff --git a/tests/Unit/Import/Mapper/AssetAccountIbansTest.php b/tests/Unit/Import/Mapper/AssetAccountIbansTest.php index c5ccb40bb3..fa92297075 100644 --- a/tests/Unit/Import/Mapper/AssetAccountIbansTest.php +++ b/tests/Unit/Import/Mapper/AssetAccountIbansTest.php @@ -38,7 +38,7 @@ class AssetAccountIbansTest extends TestCase /** * @covers \FireflyIII\Import\Mapper\AssetAccountIbans::getMap() */ - public function testGetMapBasic() + public function testGetMapBasic(): void { $one = new Account; $one->id = 17; diff --git a/tests/Unit/Import/Mapper/AssetAccountsTest.php b/tests/Unit/Import/Mapper/AssetAccountsTest.php index 97d9741383..8f1ddbf480 100644 --- a/tests/Unit/Import/Mapper/AssetAccountsTest.php +++ b/tests/Unit/Import/Mapper/AssetAccountsTest.php @@ -38,7 +38,7 @@ class AssetAccountsTest extends TestCase /** * @covers \FireflyIII\Import\Mapper\AssetAccounts::getMap() */ - public function testGetMapBasic() + public function testGetMapBasic(): void { $one = new Account; $one->id = 23; diff --git a/tests/Unit/Import/Mapper/BillsTest.php b/tests/Unit/Import/Mapper/BillsTest.php index 355bc43a98..6daabd4c67 100644 --- a/tests/Unit/Import/Mapper/BillsTest.php +++ b/tests/Unit/Import/Mapper/BillsTest.php @@ -24,7 +24,6 @@ declare(strict_types=1); namespace Tests\Unit\Import\Mapper; use FireflyIII\Import\Mapper\Bills; -use FireflyIII\Models\Account; use FireflyIII\Models\Bill; use FireflyIII\Repositories\Bill\BillRepositoryInterface; use Illuminate\Support\Collection; @@ -38,13 +37,13 @@ class BillsTest extends TestCase /** * @covers \FireflyIII\Import\Mapper\Bills::getMap() */ - public function testGetMapBasic() + public function testGetMapBasic(): void { - $one = new Bill(); + $one = new Bill; $one->id = 5; $one->name = 'Something'; $one->match = 'hi,bye'; - $two = new Account; + $two = new Bill; $two->id = 9; $two->name = 'Else'; $two->match = 'match'; @@ -59,8 +58,8 @@ class BillsTest extends TestCase // assert this is what the result looks like: $result = [ 0 => (string)trans('import.map_do_not_map'), - 9 => 'Else [match]', - 5 => 'Something [hi,bye]', + 9 => 'Else', + 5 => 'Something', ]; $this->assertEquals($result, $mapping); } diff --git a/tests/Unit/Import/Mapper/BudgetsTest.php b/tests/Unit/Import/Mapper/BudgetsTest.php index 3c0b996ed6..00057df36a 100644 --- a/tests/Unit/Import/Mapper/BudgetsTest.php +++ b/tests/Unit/Import/Mapper/BudgetsTest.php @@ -37,7 +37,7 @@ class BudgetsTest extends TestCase /** * @covers \FireflyIII\Import\Mapper\Budgets::getMap() */ - public function testGetMapBasic() + public function testGetMapBasic(): void { $one = new Budget; $one->id = 8; diff --git a/tests/Unit/Import/Mapper/CategoriesTest.php b/tests/Unit/Import/Mapper/CategoriesTest.php index c2697fcd97..fc70fadd95 100644 --- a/tests/Unit/Import/Mapper/CategoriesTest.php +++ b/tests/Unit/Import/Mapper/CategoriesTest.php @@ -37,7 +37,7 @@ class CategoriesTest extends TestCase /** * @covers \FireflyIII\Import\Mapper\Categories::getMap() */ - public function testGetMapBasic() + public function testGetMapBasic(): void { $one = new Category; $one->id = 9; diff --git a/tests/Unit/Import/Mapper/OpposingAccountIbansTest.php b/tests/Unit/Import/Mapper/OpposingAccountIbansTest.php index 621c9432d5..97020d3e00 100644 --- a/tests/Unit/Import/Mapper/OpposingAccountIbansTest.php +++ b/tests/Unit/Import/Mapper/OpposingAccountIbansTest.php @@ -38,7 +38,7 @@ class OpposingAccountIbansTest extends TestCase /** * @covers \FireflyIII\Import\Mapper\OpposingAccountIbans::getMap() */ - public function testGetMapBasic() + public function testGetMapBasic(): void { $one = new Account; $one->id = 21; diff --git a/tests/Unit/Import/Mapper/OpposingAccountsTest.php b/tests/Unit/Import/Mapper/OpposingAccountsTest.php index 765108a471..381ab1426e 100644 --- a/tests/Unit/Import/Mapper/OpposingAccountsTest.php +++ b/tests/Unit/Import/Mapper/OpposingAccountsTest.php @@ -38,7 +38,7 @@ class OpposingAccountsTest extends TestCase /** * @covers \FireflyIII\Import\Mapper\OpposingAccounts::getMap() */ - public function testGetMapBasic() + public function testGetMapBasic(): void { $one = new Account; $one->id = 13; diff --git a/tests/Unit/Import/Mapper/TagsTest.php b/tests/Unit/Import/Mapper/TagsTest.php index ad03c5b59e..57a2641e83 100644 --- a/tests/Unit/Import/Mapper/TagsTest.php +++ b/tests/Unit/Import/Mapper/TagsTest.php @@ -37,7 +37,7 @@ class TagsTest extends TestCase /** * @covers \FireflyIII\Import\Mapper\Tags::getMap() */ - public function testGetMapBasic() + public function testGetMapBasic(): void { $one = new Tag; $one->id = 12; diff --git a/tests/Unit/Import/Mapper/TransactionCurrenciesTest.php b/tests/Unit/Import/Mapper/TransactionCurrenciesTest.php index 61a37a8207..0258897f79 100644 --- a/tests/Unit/Import/Mapper/TransactionCurrenciesTest.php +++ b/tests/Unit/Import/Mapper/TransactionCurrenciesTest.php @@ -37,7 +37,7 @@ class TransactionCurrenciesTest extends TestCase /** * @covers \FireflyIII\Import\Mapper\TransactionCurrencies::getMap() */ - public function testGetMapBasic() + public function testGetMapBasic(): void { $one = new TransactionCurrency; $one->id = 9; diff --git a/tests/Unit/Import/MapperPreProcess/TagsCommaTest.php b/tests/Unit/Import/MapperPreProcess/TagsCommaTest.php index 579031ba19..81a3a4eb42 100644 --- a/tests/Unit/Import/MapperPreProcess/TagsCommaTest.php +++ b/tests/Unit/Import/MapperPreProcess/TagsCommaTest.php @@ -35,7 +35,7 @@ class TagsCommaTest extends TestCase /** * \FireflyIII\Import\MapperPreProcess\TagsComma::run */ - public function testBasic() + public function testBasic(): void { $input = 'some,tags, with, spaces ,and,without,,'; $output = ['some', 'tags', 'with', 'spaces', 'and', 'without']; diff --git a/tests/Unit/Import/MapperPreProcess/TagsSpaceTest.php b/tests/Unit/Import/MapperPreProcess/TagsSpaceTest.php index 9c9b1e1627..a6508657be 100644 --- a/tests/Unit/Import/MapperPreProcess/TagsSpaceTest.php +++ b/tests/Unit/Import/MapperPreProcess/TagsSpaceTest.php @@ -35,7 +35,7 @@ class TagsSpaceTest extends TestCase /** * \FireflyIII\Import\MapperPreProcess\TagsSpace::run */ - public function testBasic() + public function testBasic(): void { $input = 'some tags with spaces,and without '; $output = ['some', 'tags', 'with', 'spaces,and', 'without']; diff --git a/tests/Unit/Import/Object/ImportAccountTest.php b/tests/Unit/Import/Object/ImportAccountTest.php deleted file mode 100644 index b527883ba7..0000000000 --- a/tests/Unit/Import/Object/ImportAccountTest.php +++ /dev/null @@ -1,127 +0,0 @@ -. - */ - -declare(strict_types=1); - -namespace Tests\Unit\Import\Object; - -use FireflyIII\Import\Object\ImportAccount; -use FireflyIII\Models\Account; -use FireflyIII\Models\AccountType; -use FireflyIII\Repositories\Account\AccountRepositoryInterface; - -use Mockery; -use Tests\TestCase; - -/** - * Class ImportAccountTest - */ -class ImportAccountTest extends TestCase -{ - - /** - * Should error because it requires a default asset account. - * - * @covers \FireflyIII\Import\Object\ImportAccount - */ - public function testBasic() - { - // mock stuff - $repository = $this->mock(AccountRepositoryInterface::class); - $accountType = AccountType::where('type', AccountType::ASSET)->first(); - $account = Account::find(1); - - // mock calls: - $repository->shouldReceive('setUser')->once()->withArgs([Mockery::any()]); - $repository->shouldReceive('getAccountType')->twice()->withArgs([AccountType::ASSET])->andReturn($accountType); - //$repository->shouldReceive('getAccountsByType')->twice()->withArgs([[AccountType::ASSET]])->andReturn(new Collection()); - $repository->shouldReceive('findNull')->once()->withArgs([1])->andReturn($account); - - // create import account. - $importAccount = new ImportAccount; - $importAccount->setUser($this->user()); - $importAccount->setDefaultAccountId(1); - $found = $importAccount->getAccount(); - $this->assertEquals(1, $found->id); - - } - - /** - * Should error because it requires a default asset account. - * - * @covers \FireflyIII\Import\Object\ImportAccount - */ - public function testEmptyMappingAccountId() - { - // mock stuff - $repository = $this->mock(AccountRepositoryInterface::class); - $accountType = AccountType::where('type', AccountType::ASSET)->first(); - $account = Account::find(1); - - // mock calls: - $repository->shouldReceive('setUser')->once()->withArgs([Mockery::any()]); - $repository->shouldReceive('getAccountType')->once()->withArgs([AccountType::ASSET])->andReturn($accountType); - - // create import account. - $importAccount = new ImportAccount; - $importAccount->setUser($this->user()); - $importAccount->setDefaultAccountId(1); - - // add an account id: - $accountId = [ - 'role' => 'account-id', - 'mapped' => null, - 'value' => 2, - ]; - $importAccount->setAccountId($accountId); - - - $found = $importAccount->getAccount(); - $this->assertEquals(2, $found->id); - - } - - /** - * @covers \FireflyIII\Import\Object\ImportAccount - * @expectedException \FireflyIII\Exceptions\FireflyException - * @expectedExceptionMessage ImportAccount cannot continue without a default account to fall back on. - */ - public function testNoAccount() - { - $repository = $this->mock(AccountRepositoryInterface::class); - $repository->shouldReceive('setUser')->once()->withArgs([Mockery::any()]); - $importAccount = new ImportAccount; - $importAccount->setUser($this->user()); - $importAccount->getAccount(); - } - - /** - * @covers \FireflyIII\Import\Object\ImportAccount - * @expectedException \FireflyIII\Exceptions\FireflyException - * @expectedExceptionMessage ImportAccount cannot continue without user. - */ - public function testNoUser() - { - $this->mock(AccountRepositoryInterface::class); - $importAccount = new ImportAccount; - $importAccount->getAccount(); - } -} diff --git a/tests/Unit/Import/Prerequisites/BunqPrerequisitesTest.php b/tests/Unit/Import/Prerequisites/BunqPrerequisitesTest.php new file mode 100644 index 0000000000..49fa193fce --- /dev/null +++ b/tests/Unit/Import/Prerequisites/BunqPrerequisitesTest.php @@ -0,0 +1,218 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Import\Prerequisites; + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Import\Prerequisites\BunqPrerequisites; +use FireflyIII\Models\Preference; +use FireflyIII\Services\Bunq\ApiContext; +use FireflyIII\Services\IP\IPRetrievalInterface; +use Mockery; +use Preferences; +use Tests\Object\FakeApiContext; +use Tests\TestCase; + +/** + * Class BunqPrerequisitesTest + */ +class BunqPrerequisitesTest extends TestCase +{ + /** + * Has no API key, has no external IP. + * + * @covers \FireflyIII\Import\Prerequisites\BunqPrerequisites + */ + public function testGetViewParameters(): void + { + Preferences::shouldReceive('getForUser')->withArgs([Mockery::any(), 'bunq_api_key', null])->andReturnNull()->once(); + Preferences::shouldReceive('getForUser')->withArgs([Mockery::any(), 'bunq_external_ip', null])->andReturnNull()->twice(); + + $service = $this->mock(IPRetrievalInterface::class); + $service->shouldReceive('getIP')->once()->andReturn('10.0.0.15'); + + $object = new BunqPrerequisites; + $object->setUser($this->user()); + $parameters = $object->getViewParameters(); + $this->assertEquals(['api_key' => '', 'external_ip' => '10.0.0.15'], $parameters); + } + + /** + * Has empty API key, has empty external IP. + * + * @covers \FireflyIII\Import\Prerequisites\BunqPrerequisites + */ + public function testGetViewParametersEmpty(): void + { + $pref = new Preference; + $pref->name = 'dontmatter'; + $pref->data = ''; + Preferences::shouldReceive('getForUser')->withArgs([Mockery::any(), 'bunq_api_key', null])->andReturn($pref)->once(); + Preferences::shouldReceive('getForUser')->withArgs([Mockery::any(), 'bunq_external_ip', null])->andReturn($pref)->twice(); + + $service = $this->mock(IPRetrievalInterface::class); + $service->shouldReceive('getIP')->once()->andReturn('10.0.0.15'); + + $object = new BunqPrerequisites; + $object->setUser($this->user()); + $parameters = $object->getViewParameters(); + $this->assertEquals(['api_key' => '', 'external_ip' => '10.0.0.15'], $parameters); + } + + /** + * Has API key, has external IP. + * + * @covers \FireflyIII\Import\Prerequisites\BunqPrerequisites + */ + public function testGetViewParametersFilled(): void + { + $pref = new Preference; + $pref->name = 'dontmatter'; + $pref->data = 'data'; + Preferences::shouldReceive('getForUser')->withArgs([Mockery::any(), 'bunq_api_key', null])->andReturn($pref)->times(2); + Preferences::shouldReceive('getForUser')->withArgs([Mockery::any(), 'bunq_external_ip', null])->andReturn($pref)->times(3); + + $object = new BunqPrerequisites; + $object->setUser($this->user()); + $parameters = $object->getViewParameters(); + $this->assertEquals(['api_key' => 'data', 'external_ip' => 'data'], $parameters); + } + + /** + * API context empty + * + * @covers \FireflyIII\Import\Prerequisites\BunqPrerequisites + */ + public function testIsCompleteEmpty(): void + { + $pref = new Preference; + $pref->name = 'dontmatter'; + $pref->data = 'data'; + + $empty = new Preference; + $empty->name = 'dontmatter'; + $empty->data = ''; + + Preferences::shouldReceive('getForUser')->withArgs([Mockery::any(), 'bunq_api_key', null])->andReturn($pref)->once(); + Preferences::shouldReceive('getForUser')->withArgs([Mockery::any(), 'bunq_external_ip', null])->andReturn($pref)->once(); + Preferences::shouldReceive('getForUser')->withArgs([Mockery::any(), 'bunq_api_context', null])->andReturn($empty)->once(); + $object = new BunqPrerequisites; + $object->setUser($this->user()); + $this->assertFalse($object->isComplete()); + } + + /** + * API context filled + * + * @covers \FireflyIII\Import\Prerequisites\BunqPrerequisites + */ + public function testIsCompleteFilled(): void + { + $pref = new Preference; + $pref->name = 'dontmatter'; + $pref->data = 'data'; + + Preferences::shouldReceive('getForUser')->withArgs([Mockery::any(), 'bunq_api_key', null])->andReturn($pref)->once(); + Preferences::shouldReceive('getForUser')->withArgs([Mockery::any(), 'bunq_external_ip', null])->andReturn($pref)->once(); + Preferences::shouldReceive('getForUser')->withArgs([Mockery::any(), 'bunq_api_context', null])->andReturn($pref)->once(); + $object = new BunqPrerequisites; + $object->setUser($this->user()); + $this->assertTrue($object->isComplete()); + } + + /** + * API context null. + * + * @covers \FireflyIII\Import\Prerequisites\BunqPrerequisites + */ + public function testIsCompleteNull(): void + { + $pref = new Preference; + $pref->name = 'dontmatter'; + $pref->data = 'data'; + + Preferences::shouldReceive('getForUser')->withArgs([Mockery::any(), 'bunq_api_key', null])->andReturn($pref)->once(); + Preferences::shouldReceive('getForUser')->withArgs([Mockery::any(), 'bunq_external_ip', null])->andReturn($pref)->once(); + Preferences::shouldReceive('getForUser')->withArgs([Mockery::any(), 'bunq_api_context', null])->andReturnNull()->once(); + $object = new BunqPrerequisites; + $object->setUser($this->user()); + $this->assertFalse($object->isComplete()); + } + + /** + * Test call to API. + * + * @covers \FireflyIII\Import\Prerequisites\BunqPrerequisites + */ + public function testStorePrerequisites(): void + { + $object = new BunqPrerequisites; + $object->setUser($this->user()); + + $data = [ + 'api_key' => 'Some API key', + 'external_ip' => '10.0.0.15', + ]; + + Preferences::shouldReceive('setForUser')->withArgs([Mockery::any(), 'bunq_api_key', $data['api_key']])->once(); + Preferences::shouldReceive('setForUser')->withArgs([Mockery::any(), 'bunq_external_ip', $data['external_ip']])->once(); + Preferences::shouldReceive('setForUser')->withArgs([Mockery::any(), 'bunq_api_context', '{"a":"b"}'])->once(); + + // create fake context + $context = $this->mock(ApiContext::class); + $context->shouldReceive('create') + ->withArgs([Mockery::any(), 'Some API key', 'Firefly III v' . config('firefly.version'), [$data['external_ip']]]) + ->once()->andReturn(new FakeApiContext()); + $messages = $object->storePrerequisites($data); + $this->assertEquals('', $messages->first()); + $this->assertCount(0, $messages); + } + + /** + * Test call that throws error. + * + * @covers \FireflyIII\Import\Prerequisites\BunqPrerequisites + */ + public function testStorePrerequisitesExp(): void + { + $object = new BunqPrerequisites; + $object->setUser($this->user()); + + $data = [ + 'api_key' => 'Some API key', + 'external_ip' => '10.0.0.15', + ]; + + Preferences::shouldReceive('setForUser')->withArgs([Mockery::any(), 'bunq_api_key', $data['api_key']])->once(); + Preferences::shouldReceive('setForUser')->withArgs([Mockery::any(), 'bunq_external_ip', $data['external_ip']])->once(); + + // create fake context + $context = $this->mock(ApiContext::class); + $context->shouldReceive('create') + ->withArgs([Mockery::any(), 'Some API key', 'Firefly III v' . config('firefly.version'), [$data['external_ip']]]) + ->once()->andThrow(new FireflyException('Some exception')); + $messages = $object->storePrerequisites($data); + $this->assertEquals('Some exception', $messages->first()); + $this->assertCount(1, $messages); + } +} \ No newline at end of file diff --git a/tests/Unit/Import/Prerequisites/FakePrerequisitesTest.php b/tests/Unit/Import/Prerequisites/FakePrerequisitesTest.php new file mode 100644 index 0000000000..7aa2d9d289 --- /dev/null +++ b/tests/Unit/Import/Prerequisites/FakePrerequisitesTest.php @@ -0,0 +1,174 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Import\Prerequisites; + + +use FireflyIII\Import\Prerequisites\FakePrerequisites; +use FireflyIII\Models\Preference; +use Mockery; +use Preferences; +use Tests\TestCase; + +/** + * Class FakePrerequisitesTest + */ +class FakePrerequisitesTest extends TestCase +{ + /** + * Bad API key length in preferences + * + * @covers \FireflyIII\Import\Prerequisites\FakePrerequisites + */ + public function testGetViewParametersBadLength(): void + { + // API key should be empty: + $apiPref = new Preference; + $apiPref->data = 'abc'; + + Preferences::shouldReceive('getForUser') + ->withArgs([Mockery::any(), 'fake_api_key', false])->once() + ->andReturn($apiPref); + + $object = new FakePrerequisites(); + $object->setUser($this->user()); + $result = $object->getViewParameters(); + $this->assertEquals(['api_key' => ''], $result); + } + + /** + * No API key in preference. + * + * @covers \FireflyIII\Import\Prerequisites\FakePrerequisites + */ + public function testGetViewParametersDataNull(): void + { + // API key should be empty: + $apiPref = new Preference; + $apiPref->data = null; + + Preferences::shouldReceive('getForUser') + ->withArgs([Mockery::any(), 'fake_api_key', false])->once() + ->andReturn($apiPref); + + $object = new FakePrerequisites(); + $object->setUser($this->user()); + $result = $object->getViewParameters(); + $this->assertEquals(['api_key' => ''], $result); + } + + /** + * Good API key length in preferences + * + * @covers \FireflyIII\Import\Prerequisites\FakePrerequisites + */ + public function testGetViewParametersGoodLength(): void + { + // API key should be empty: + $apiPref = new Preference; + $apiPref->data = '123456789012345678901234567890AA'; + + Preferences::shouldReceive('getForUser') + ->withArgs([Mockery::any(), 'fake_api_key', false])->twice() + ->andReturn($apiPref); + + $object = new FakePrerequisites(); + $object->setUser($this->user()); + $result = $object->getViewParameters(); + $this->assertEquals(['api_key' => '123456789012345678901234567890AA'], $result); + } + + /** + * No preference at all. + * + * @covers \FireflyIII\Import\Prerequisites\FakePrerequisites + */ + public function testGetViewParametersPrefNull(): void + { + Preferences::shouldReceive('getForUser') + ->withArgs([Mockery::any(), 'fake_api_key', false])->once() + ->andReturn(null); + + $object = new FakePrerequisites(); + $object->setUser($this->user()); + $result = $object->getViewParameters(); + $this->assertEquals(['api_key' => ''], $result); + } + + /** + * Also test hasApiKey but that one is covered. + * + * @covers \FireflyIII\Import\Prerequisites\FakePrerequisites + */ + public function testIsComplete(): void + { + // API key should be empty: + $apiPref = new Preference; + $apiPref->data = null; + + Preferences::shouldReceive('getForUser') + ->withArgs([Mockery::any(), 'fake_api_key', false])->once() + ->andReturn($apiPref); + + $object = new FakePrerequisites(); + $object->setUser($this->user()); + $this->assertFalse($object->isComplete()); + } + + /** + * Also test hasApiKey but that one is covered. + * + * @covers \FireflyIII\Import\Prerequisites\FakePrerequisites + */ + public function testStorePrerequisitesBad(): void + { + $data = [ + 'api_key' => 'Hallo', + ]; + $object = new FakePrerequisites(); + $object->setUser($this->user()); + $messages = $object->storePrerequisites($data); + $this->assertCount(1, $messages); + $this->assertEquals('API key must be 32 chars.', $messages->first()); + } + + /** + * Also test hasApiKey but that one is covered. + * + * @covers \FireflyIII\Import\Prerequisites\FakePrerequisites + */ + public function testStorePrerequisitesGood(): void + { + $data = [ + 'api_key' => '123456789012345678901234567890AA', + ]; + + Preferences::shouldReceive('setForUser')->withArgs([Mockery::any(), 'fake_api_key', '123456789012345678901234567890AA'])->once(); + + $object = new FakePrerequisites(); + $object->setUser($this->user()); + $messages = $object->storePrerequisites($data); + $this->assertCount(0, $messages); + } + +} diff --git a/tests/Unit/Import/Prerequisites/SpectrePrerequisitesTest.php b/tests/Unit/Import/Prerequisites/SpectrePrerequisitesTest.php new file mode 100644 index 0000000000..18dc8e2609 --- /dev/null +++ b/tests/Unit/Import/Prerequisites/SpectrePrerequisitesTest.php @@ -0,0 +1,245 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Import\Prerequisites; + + +use FireflyIII\Import\Prerequisites\SpectrePrerequisites; +use FireflyIII\Models\Preference; +use Mockery; +use Preferences; +use Tests\TestCase; + +/** + * Class SpectrePrerequisitesTest + */ +class SpectrePrerequisitesTest extends TestCase +{ + /** + * @covers \FireflyIII\Import\Prerequisites\SpectrePrerequisites + */ + public function testGetView(): void + { + + $object = new SpectrePrerequisites; + $object->setUser($this->user()); + $this->assertEquals('import.spectre.prerequisites', $object->getView()); + } + + /** + * Returns NULL as much as possible, forcing system to generate new keys. + * + * @covers \FireflyIII\Import\Prerequisites\SpectrePrerequisites + */ + public function testGetViewParameters(): void + { + $publicKey = new Preference; + $publicKey->name = 'spectre_public_key'; + $publicKey->data = '---PUBKEY---'; + + $privateKey = new Preference; + $privateKey->name = 'spectre_private_key'; + $privateKey->data = '---PRIVKEY---'; + + // get secret + Preferences::shouldReceive('getForUser')->once() + ->withArgs([Mockery::any(), 'spectre_secret', null]) + ->andReturnNull(); + + // get App ID + Preferences::shouldReceive('getForUser')->once() + ->withArgs([Mockery::any(), 'spectre_app_id', null]) + ->andReturnNull(); + + // get users public key + // second time it should exist. + Preferences::shouldReceive('getForUser')->twice() + ->withArgs([Mockery::any(), 'spectre_public_key', null]) + ->andReturn(null, $publicKey); + // SET users new pulic key + Preferences::shouldReceive('setForUser')->once() + ->withArgs([Mockery::any(), 'spectre_public_key', Mockery::any()]) + ->andReturn($publicKey); + // SET private key + Preferences::shouldReceive('setForUser')->once() + ->withArgs([Mockery::any(), 'spectre_private_key', Mockery::any()]) + ->andReturn($privateKey); + + + $object = new SpectrePrerequisites; + $object->setUser($this->user()); + $return = $object->getViewParameters(); + $this->assertEquals( + [ + 'app_id' => '', + 'secret' => '', + 'public_key' => '---PUBKEY---', + ], $return + ); + } + + /** + * App ID exists, secret is empty. + * + * @covers \FireflyIII\Import\Prerequisites\SpectrePrerequisites + */ + public function testIsComplete(): void + { + $appId = new Preference; + $appId->name = 'spectre_app_id'; + $appId->data = 'Some app id'; + + $secret = new Preference; + $secret->name = 'spectre_secret'; + $secret->data = 'Hello'; + // get App ID + Preferences::shouldReceive('getForUser')->once() + ->withArgs([Mockery::any(), 'spectre_app_id', null]) + ->andReturn($appId); + + // get secret + Preferences::shouldReceive('getForUser')->once() + ->withArgs([Mockery::any(), 'spectre_secret', null]) + ->andReturn($secret); + + $object = new SpectrePrerequisites; + $object->setUser($this->user()); + $this->assertTrue($object->isComplete()); + } + + /** + * App ID exists, secret is null. + * + * @covers \FireflyIII\Import\Prerequisites\SpectrePrerequisites + */ + public function testIsCompleteAppId(): void + { + $appId = new Preference; + $appId->name = 'spectre_app_id'; + $appId->data = 'Some app id'; + // get App ID + Preferences::shouldReceive('getForUser')->once() + ->withArgs([Mockery::any(), 'spectre_app_id', null]) + ->andReturn($appId); + + // get secret + Preferences::shouldReceive('getForUser')->once() + ->withArgs([Mockery::any(), 'spectre_secret', null]) + ->andReturnNull(); + + $object = new SpectrePrerequisites; + $object->setUser($this->user()); + $this->assertFalse($object->isComplete()); + } + + /** + * App ID is "" and Secret is NULL. Since App ID is "" secret won't be polled. + * + * @covers \FireflyIII\Import\Prerequisites\SpectrePrerequisites + */ + public function testIsCompleteEmpty(): void + { + $appId = new Preference; + $appId->name = 'spectre_app_id'; + $appId->data = ''; + + // get App ID + Preferences::shouldReceive('getForUser')->once() + ->withArgs([Mockery::any(), 'spectre_app_id', null]) + ->andReturn($appId); + + $object = new SpectrePrerequisites; + $object->setUser($this->user()); + $this->assertFalse($object->isComplete()); + } + + /** + * App ID and Secret are NULL. Since App ID is null secret won't be polled. + * + * @covers \FireflyIII\Import\Prerequisites\SpectrePrerequisites + */ + public function testIsCompleteNull(): void + { + // get App ID + Preferences::shouldReceive('getForUser')->once() + ->withArgs([Mockery::any(), 'spectre_app_id', null]) + ->andReturnNull(); + + $object = new SpectrePrerequisites; + $object->setUser($this->user()); + $this->assertFalse($object->isComplete()); + } + + /** + * App ID exists, secret is empty. + * + * @covers \FireflyIII\Import\Prerequisites\SpectrePrerequisites + */ + public function testIsCompleteSecretEmpty(): void + { + $appId = new Preference; + $appId->name = 'spectre_app_id'; + $appId->data = 'Some app id'; + + $secret = new Preference; + $secret->name = 'spectre_secret'; + $secret->data = ''; + // get App ID + Preferences::shouldReceive('getForUser')->once() + ->withArgs([Mockery::any(), 'spectre_app_id', null]) + ->andReturn($appId); + + // get secret + Preferences::shouldReceive('getForUser')->once() + ->withArgs([Mockery::any(), 'spectre_secret', null]) + ->andReturn($secret); + + $object = new SpectrePrerequisites; + $object->setUser($this->user()); + $this->assertFalse($object->isComplete()); + } + + /** + * + * @covers \FireflyIII\Import\Prerequisites\SpectrePrerequisites + */ + public function testStorePrerequisites(): void + { + $data = [ + 'app_id' => 'Some app ID', + 'secret' => 'Very secret!', + ]; + // set values + Preferences::shouldReceive('setForUser')->once() + ->withArgs([Mockery::any(), 'spectre_app_id', $data['app_id']]) + ->andReturn(new Preference()); + Preferences::shouldReceive('setForUser')->once() + ->withArgs([Mockery::any(), 'spectre_secret', $data['secret']]) + ->andReturn(new Preference()); + + $object = new SpectrePrerequisites; + $object->setUser($this->user()); + $this->assertEquals(0, $object->storePrerequisites($data)->count()); + } + +} \ No newline at end of file diff --git a/tests/Unit/Import/Routine/BunqRoutineTest.php b/tests/Unit/Import/Routine/BunqRoutineTest.php new file mode 100644 index 0000000000..eb53266989 --- /dev/null +++ b/tests/Unit/Import/Routine/BunqRoutineTest.php @@ -0,0 +1,117 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Import\Routine; + + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Import\Routine\BunqRoutine; +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Support\Import\Routine\Bunq\StageImportDataHandler; +use FireflyIII\Support\Import\Routine\Bunq\StageNewHandler; +use Mockery; +use Tests\TestCase; + +/** + * Class BunqRoutineTest + */ +class BunqRoutineTest extends TestCase +{ + /** + * @covers \FireflyIII\Import\Routine\BunqRoutine + */ + public function testRunImport(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'brY_' . random_int(1, 1000); + $job->status = 'ready_to_run'; + $job->stage = 'go-for-import'; + $job->provider = 'bunq'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // mock stuff: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $handler = $this->mock(StageImportDataHandler::class); + + + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'running']); + $handler->shouldReceive('setImportJob')->once(); + $handler->shouldReceive('run')->once(); + $handler->shouldReceive('getTransactions')->once()->andReturn(['a' => 'c']); + $repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'provider_finished'])->once(); + $repository->shouldReceive('setStage')->withArgs([Mockery::any(), 'final'])->once(); + $repository->shouldReceive('setTransactions')->withArgs([Mockery::any(), ['a' => 'c']])->once(); + + $routine = new BunqRoutine; + $routine->setImportJob($job); + try { + $routine->run(); + } catch (FireflyException $e) { + $this->assertFalse(true, $e->getMessage()); + } + + } + + /** + * @covers \FireflyIII\Import\Routine\BunqRoutine + */ + public function testRunNew(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'brX_' . random_int(1, 1000); + $job->status = 'ready_to_run'; + $job->stage = 'new'; + $job->provider = 'bunq'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // mock stuff: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $handler = $this->mock(StageNewHandler::class); + + + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'running']); + $handler->shouldReceive('setImportJob')->once(); + $handler->shouldReceive('run')->once(); + $repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'need_job_config'])->once(); + $repository->shouldReceive('setStage')->withArgs([Mockery::any(), 'choose-accounts'])->once(); + + $routine = new BunqRoutine; + $routine->setImportJob($job); + try { + $routine->run(); + } catch (FireflyException $e) { + $this->assertFalse(true, $e->getMessage()); + } + + } + +} \ No newline at end of file diff --git a/tests/Unit/Import/Routine/FakeRoutineTest.php b/tests/Unit/Import/Routine/FakeRoutineTest.php new file mode 100644 index 0000000000..d85c8d5392 --- /dev/null +++ b/tests/Unit/Import/Routine/FakeRoutineTest.php @@ -0,0 +1,150 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Import\Routine; + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Import\Routine\FakeRoutine; +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Support\Import\Routine\Fake\StageAhoyHandler; +use FireflyIII\Support\Import\Routine\Fake\StageFinalHandler; +use FireflyIII\Support\Import\Routine\Fake\StageNewHandler; +use Mockery; +use Tests\TestCase; + +/** + * Class FakeRoutineTest + */ +class FakeRoutineTest extends TestCase +{ + /** + * @covers \FireflyIII\Import\Routine\FakeRoutine + */ + public function testRunAhoy(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'a_route_' . random_int(1, 1000); + $job->status = 'ready_to_run'; + $job->stage = 'ahoy'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // mock + $handler = $this->mock(StageAhoyHandler::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + + // calls + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'running'])->once(); + $repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'need_job_config'])->once(); + $repository->shouldReceive('setStage')->withArgs([Mockery::any(), 'final'])->once(); + $handler->shouldReceive('run')->once(); + + + $routine = new FakeRoutine; + $routine->setImportJob($job); + try { + $routine->run(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + } + + /** + * @covers \FireflyIII\Import\Routine\FakeRoutine + */ + public function testRunFinal(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'a_route_' . random_int(1, 1000); + $job->status = 'ready_to_run'; + $job->stage = 'final'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // mock + $handler = $this->mock(StageFinalHandler::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + + // calls + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'provider_finished'])->once(); + $repository->shouldReceive('setStage')->withArgs([Mockery::any(), 'final'])->once(); + $repository->shouldReceive('setTransactions')->withArgs([Mockery::any(), []])->once(); + $handler->shouldReceive('getTransactions')->once()->andReturn([]); + $repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'running'])->once(); + $handler->shouldReceive('setImportJob')->once(); + + $routine = new FakeRoutine; + $routine->setImportJob($job); + try { + $routine->run(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + } + + /** + * @covers \FireflyIII\Import\Routine\FakeRoutine + */ + public function testRunNew(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'a_route_' . random_int(1, 1000); + $job->status = 'ready_to_run'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // mock + $handler = $this->mock(StageNewHandler::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + + // calls + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setStage')->withArgs([Mockery::any(), 'ahoy'])->once(); + $repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'ready_to_run'])->once(); + $repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'running'])->once(); + $handler->shouldReceive('run')->once(); + + + $routine = new FakeRoutine; + $routine->setImportJob($job); + try { + $routine->run(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + } + +} diff --git a/tests/Unit/Import/Routine/FileRoutineTest.php b/tests/Unit/Import/Routine/FileRoutineTest.php new file mode 100644 index 0000000000..48a109030f --- /dev/null +++ b/tests/Unit/Import/Routine/FileRoutineTest.php @@ -0,0 +1,79 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Import\Routine; + + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Import\Routine\FileRoutine; +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Support\Import\Routine\File\CSVProcessor; +use Mockery; +use Tests\TestCase; + +/** + * Class FileRoutineTest + */ +class FileRoutineTest extends TestCase +{ + + /** + * @covers \FireflyIII\Import\Routine\FileRoutine + */ + public function testRunDefault(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'a_fr_' . random_int(1, 1000); + $job->status = 'ready_to_run'; + $job->stage = 'ready_to_run'; + $job->provider = 'file'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // mock + $processor = $this->mock(CSVProcessor::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + + // calls + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'running'])->once(); + $repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'provider_finished'])->once(); + $repository->shouldReceive('setStage')->withArgs([Mockery::any(), 'final'])->once(); + $repository->shouldReceive('setTransactions')->withArgs([Mockery::any(), ['a' => 'b']])->once(); + $repository->shouldReceive('getConfiguration')->withArgs([Mockery::any()])->once()->andReturn([]); + $processor->shouldReceive('setImportJob')->once(); + $processor->shouldReceive('run')->once()->andReturn(['a' => 'b']); + + + $routine = new FileRoutine; + $routine->setImportJob($job); + try { + $routine->run(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + } +} diff --git a/tests/Unit/Import/Routine/SpectreRoutineTest.php b/tests/Unit/Import/Routine/SpectreRoutineTest.php new file mode 100644 index 0000000000..89d5947590 --- /dev/null +++ b/tests/Unit/Import/Routine/SpectreRoutineTest.php @@ -0,0 +1,229 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Import\Routine; + + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Import\Routine\SpectreRoutine; +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Support\Import\Routine\Spectre\StageImportDataHandler; +use FireflyIII\Support\Import\Routine\Spectre\StageAuthenticatedHandler; +use FireflyIII\Support\Import\Routine\Spectre\StageNewHandler; +use Mockery; +use Tests\TestCase; + +/** + * Class SpectreRoutineTest + */ +class SpectreRoutineTest extends TestCase +{ + /** + * @covers \FireflyIII\Import\Routine\SpectreRoutine + */ + public function testRunDoAuthenticate(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'SRA' . random_int(1, 1000); + $job->status = 'ready_to_run'; + $job->stage = 'do-authenticate'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // mock handler and repository + $repository = $this->mock(ImportJobRepositoryInterface::class); + + // mock calls for repository + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'need_job_config'])->once(); + + $routine = new SpectreRoutine; + $routine->setImportJob($job); + try { + $routine->run(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + } + + /** + * @covers \FireflyIII\Import\Routine\SpectreRoutine + */ + public function testRunAuthenticated(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'SRA' . random_int(1, 1000); + $job->status = 'ready_to_run'; + $job->stage = 'authenticated'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // mock handler and repository + $handler = $this->mock(StageAuthenticatedHandler::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + + // mock calls for repository + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'running'])->once(); + $repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'need_job_config'])->once(); + $repository->shouldReceive('setStage')->withArgs([Mockery::any(), 'choose-accounts'])->once(); + + // mock calls for handler + $handler->shouldReceive('setImportJob')->once(); + $handler->shouldReceive('run')->once(); + + $routine = new SpectreRoutine; + $routine->setImportJob($job); + try { + $routine->run(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + } + + /** + * @covers \FireflyIII\Import\Routine\SpectreRoutine + */ + public function testRunGoImport(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'SRA' . random_int(1, 1000); + $job->status = 'ready_to_run'; + $job->stage = 'go-for-import'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // mock handler and repository + $handler = $this->mock(StageImportDataHandler::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + + // mock calls for repository + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'running'])->once(); + $repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'provider_finished'])->once(); + $repository->shouldReceive('setStage')->withArgs([Mockery::any(), 'do_import'])->once(); + $repository->shouldReceive('setStage')->withArgs([Mockery::any(), 'final'])->once(); + + // mock calls for handler + $handler->shouldReceive('setImportJob')->once(); + $handler->shouldReceive('run')->once(); + + $routine = new SpectreRoutine; + $routine->setImportJob($job); + try { + $routine->run(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + } + + /** + * @covers \FireflyIII\Import\Routine\SpectreRoutine + */ + public function testRunNewOneLogin(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'SRA' . random_int(1, 1000); + $job->status = 'ready_to_run'; + $job->stage = 'new'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // mock handler and repository + $handler = $this->mock(StageNewHandler::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + + // mock calls for repository + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'running'])->once(); + $repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'need_job_config'])->once(); + $repository->shouldReceive('setStage')->withArgs([Mockery::any(), 'choose-login'])->once(); + + // mock calls for handler + $handler->shouldReceive('setImportJob')->once(); + $handler->shouldReceive('getCountLogins')->once()->andReturn(2); + $handler->shouldReceive('run')->once(); + + + $routine = new SpectreRoutine; + $routine->setImportJob($job); + try { + $routine->run(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + } + + /** + * @covers \FireflyIII\Import\Routine\SpectreRoutine + */ + public function testRunNewZeroLogins(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'SRA' . random_int(1, 1000); + $job->status = 'ready_to_run'; + $job->stage = 'new'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // mock handler and repository + $handler = $this->mock(StageNewHandler::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + + // mock calls for repository + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'running'])->once(); + $repository->shouldReceive('setStatus')->withArgs([Mockery::any(), 'ready_to_run'])->once(); + $repository->shouldReceive('setStage')->withArgs([Mockery::any(), 'do-authenticate'])->once(); + + // mock calls for handler + $handler->shouldReceive('setImportJob')->once(); + $handler->shouldReceive('getCountLogins')->once()->andReturn(0); + $handler->shouldReceive('run')->once(); + + + $routine = new SpectreRoutine; + $routine->setImportJob($job); + try { + $routine->run(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + } +} \ No newline at end of file diff --git a/tests/Unit/Import/Specifics/AbnAmroDescriptionTest.php b/tests/Unit/Import/Specifics/AbnAmroDescriptionTest.php new file mode 100644 index 0000000000..0e37954d12 --- /dev/null +++ b/tests/Unit/Import/Specifics/AbnAmroDescriptionTest.php @@ -0,0 +1,168 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Import\Specifics; + + +use FireflyIII\Import\Specifics\AbnAmroDescription; +use Tests\TestCase; + +/** + * Class AbnAmroDescriptionTest + */ +class AbnAmroDescriptionTest extends TestCase +{ + /** + * Should return the exact same array. + * + * @covers \FireflyIII\Import\Specifics\AbnAmroDescription + */ + public function testEmptyRow(): void + { + $row = [1, 2, 3, 4]; + + $parser = new AbnAmroDescription; + $result = $parser->run($row); + $this->assertEquals($row, $result); + } + + /** + * Data that cannot be parsed. + * + * @covers \FireflyIII\Import\Specifics\AbnAmroDescription + */ + public function testParseABN(): void + { + $row = [0, 1, 2, 3, 4, 5, 6, 'ABN AMRO 12345678901234567890ABC SomeOtherDescr', '']; + + $parser = new AbnAmroDescription; + $result = $parser->run($row); + $this->assertEquals('SomeOtherDescr', $result[7]); + $this->assertEquals('ABN AMRO', $result[8]); + } + + /** + * GEA + * + * @covers \FireflyIII\Import\Specifics\AbnAmroDescription + */ + public function testParseGea(): void + { + $row = [0, 1, 2, 3, 4, 5, 6, 'BEA: GEA NR:00AJ01 31.01.01/19.54 Van HarenSchoenen132 UDE,PAS333', '']; + + $parser = new AbnAmroDescription; + $result = $parser->run($row); + $this->assertEquals('Van HarenSchoenen132 UDE', $result[8]); + $this->assertEquals('GEA Van HarenSchoenen132 UDE', $result[7]); + } + + /** + * Gea bea + * + * @covers \FireflyIII\Import\Specifics\AbnAmroDescription + */ + public function testParseGeaBea(): void + { + $row = [0, 1, 2, 3, 4, 5, 6, 'BEA: BEA NR:00AJ01 31.01.01/19.54 Van HarenSchoenen132 UDE,PAS333', '']; + + $parser = new AbnAmroDescription; + $result = $parser->run($row); + $this->assertEquals('Van HarenSchoenen132 UDE', $result[8]); + $this->assertEquals('Van HarenSchoenen132 UDE', $result[7]); + } + + /** + * Data that cannot be parsed. + * + * @covers \FireflyIII\Import\Specifics\AbnAmroDescription + */ + public function testParseUnknown(): void + { + $row = [0, 1, 2, 3, 4, 5, 6, 'Blabla', '']; + + $parser = new AbnAmroDescription; + $result = $parser->run($row); + $this->assertEquals('Unknown', $result[8]); + } + + /** + * Basic SEPA data. + * + * @covers \FireflyIII\Import\Specifics\AbnAmroDescription + */ + public function testSepaBasic(): void + { + $row = [0, 1, 2, 3, 4, 5, 6, 'SEPA PLAIN: SEPA iDEAL IBAN: NL12RABO0121212212 BIC: RABONL2U Naam: Silver Ocean B.V. Omschrijving: 1232138 1232131233 412321 iBOOD.com iBOOD.com B.V. Kenmerk: 12-12-2014 21:03 002000 0213123238', '','']; + $parser = new AbnAmroDescription; + $result = $parser->run($row); + $this->assertEquals('1232138 1232131233 412321 iBOOD.com iBOOD.com B.V.', $result[7]); + $this->assertEquals('Silver Ocean B.V.', $result[8]); + $this->assertEquals('NL12RABO0121212212', $result[9]); + } + + /** + * Basic SEPA data. + * + * @covers \FireflyIII\Import\Specifics\AbnAmroDescription + */ + public function testSepaBasicNoDescription(): void + { + $row = [0, 1, 2, 3, 4, 5, 6, 'SEPA PLAIN: SEPA iDEAL IBAN: NL12RABO0121212212 BIC: RABONL2U Naam: Silver Ocean B.V. Omschrijving: Kenmerk: 12-12-2014 21:03 002000 0213123238', '','']; + $parser = new AbnAmroDescription; + $result = $parser->run($row); + $this->assertEquals(' PLAIN: SEPA iDEAL - Silver Ocean B.V. (12-12-2014)', $result[7]); + $this->assertEquals('Silver Ocean B.V.', $result[8]); + $this->assertEquals('NL12RABO0121212212', $result[9]); + } + + /** + * Basic TRTP data. + * + * @covers \FireflyIII\Import\Specifics\AbnAmroDescription + */ + public function testTRTPBasic(): void { + + $row = [0, 1, 2, 3, 4, 5, 6, '/TRTP/SEPA OVERBOEKING/IBAN/NL23ABNA0000000000/BIC/ABNANL2A/NAME/baasd dsdsT CJ/REMI/Nullijn/EREF/NOTPROVIDED', '','']; + $parser = new AbnAmroDescription; + $result = $parser->run($row); + $this->assertEquals('Nullijn', $result[7]); + $this->assertEquals('baasd dsdsT CJ', $result[8]); + $this->assertEquals('NL23ABNA0000000000', $result[9]); + } + /** + * Basic TRTP data with empty description + * + * @covers \FireflyIII\Import\Specifics\AbnAmroDescription + */ + public function testTRTPEmptyDescr(): void { + + $row = [0, 1, 2, 3, 4, 5, 6, '/TRTP/SEPA OVERBOEKING/IBAN/NL23ABNA0000000000/BIC/ABNANL2A/NAME/baasd dsdsT CJ/REMI//EREF/NOTPROVIDED', '','']; + $parser = new AbnAmroDescription; + $result = $parser->run($row); + $this->assertEquals('SEPA OVERBOEKING - (NOTPROVIDED)', $result[7]); + $this->assertEquals('baasd dsdsT CJ', $result[8]); + $this->assertEquals('NL23ABNA0000000000', $result[9]); + } + + +} diff --git a/tests/Unit/Import/Specifics/IngDescriptionTest.php b/tests/Unit/Import/Specifics/IngDescriptionTest.php new file mode 100644 index 0000000000..f9e142f773 --- /dev/null +++ b/tests/Unit/Import/Specifics/IngDescriptionTest.php @@ -0,0 +1,138 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Import\Specifics; + + +use FireflyIII\Import\Specifics\IngDescription; +use Tests\TestCase; + +/** + * Class IngDescriptionTest + */ +class IngDescriptionTest extends TestCase +{ + /** + * Try if the IBAN is removed in GT transactions + * + * @covers \FireflyIII\Import\Specifics\IngDescription + */ + public function testRunGTRemoveIban(): void + { + $iban = 'NL66INGB0665877351'; + $row = [0, 1, 2, $iban, 'GT', 5, 6, 7, 'Should be removed IBAN: ' . $iban, 9, 10]; + + $parser = new IngDescription; + $result = $parser->run($row); + $this->assertEquals('Should be removed', $result[8]); + } + + /** + * Try if the IBAN is removed in OV transactions + * + * @covers \FireflyIII\Import\Specifics\IngDescription + */ + public function testRunOVRemoveIban(): void + { + $iban = 'NL66INGB0665877351'; + $row = [0, 1, 2, $iban, 'OV', 5, 6, 7, 'Should be removed IBAN: ' . $iban, 9, 10]; + + $parser = new IngDescription; + $result = $parser->run($row); + $this->assertEquals('Should be removed', $result[8]); + } + + /** + * Try if the IBAN is removed in IC transactions + * + * @covers \FireflyIII\Import\Specifics\IngDescription + */ + public function testRunICRemoveIban(): void + { + $iban = 'NL66INGB0665877351'; + $row = [0, 1, 2, $iban, 'IC', 5, 6, 7, 'Should be removed IBAN: ' . $iban, 9, 10]; + + $parser = new IngDescription; + $result = $parser->run($row); + $this->assertEquals('Should be removed', $result[8]); + } + + /** + * Empty description? Use "tegenrekening". + * Remove specific fields. + * + * @covers \FireflyIII\Import\Specifics\IngDescription + */ + public function testRunEmptyDescr(): void + { + $row = [0, 1, 2, '', 'GT', 5, 6, 7, 'Naar Oranje Spaarrekening Bla bla', 9, 10]; + + $parser = new IngDescription; + $result = $parser->run($row); + $this->assertEquals('Bla bla', $result[3]); + } + + /** + * Test changes to BA row. + * + * Remove specific fields. + * + * @covers \FireflyIII\Import\Specifics\IngDescription + */ + public function testRunBABasic(): void + { + $row = [0, 'XX', 2, '', 'BA', 5, 6, 7, 'XX', 9, 10]; + + $parser = new IngDescription; + $result = $parser->run($row); + $this->assertEquals('XX XX', $result[8]); + } + + /** + * See if the description is removed + * @covers \FireflyIII\Import\Specifics\IngDescription + */ + public function testRunGTRemoveDescr(): void + { + $iban = 'NL66INGB0665877351'; + $row = [0, 1, 2, $iban, 'GT', 5, 6, 7, 'Bla bla bla Omschrijving: Should be removed IBAN: ' . $iban, 9, 10]; + + $parser = new IngDescription; + $result = $parser->run($row); + $this->assertEquals('Should be removed', $result[8]); + } + + /** + * @covers \FireflyIII\Import\Specifics\IngDescription + */ + public function testRunShortArray(): void + { + $row = [0, 1, 2, 3]; + + $parser = new IngDescription; + $result = $parser->run($row); + + $this->assertEquals($row, $result); + } + +} diff --git a/tests/Unit/Import/Specifics/PresidentsChoiceTest.php b/tests/Unit/Import/Specifics/PresidentsChoiceTest.php new file mode 100644 index 0000000000..e2ba5bd6e6 --- /dev/null +++ b/tests/Unit/Import/Specifics/PresidentsChoiceTest.php @@ -0,0 +1,61 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Import\Specifics; + + +use FireflyIII\Import\Specifics\PresidentsChoice; +use Tests\TestCase; + +/** + * Class PresidentsChoiceTest + */ +class PresidentsChoiceTest extends TestCase +{ + + /** + * @covers \FireflyIII\Import\Specifics\PresidentsChoice + */ + public function testRunBasic():void { + $row = ['']; + + $parser = new PresidentsChoice; + $result = $parser->run($row); + $this->assertEquals($row, $result); + + } + + /** + * @covers \FireflyIII\Import\Specifics\PresidentsChoice + */ + public function testRunAmount():void { + $row = ['','Descr','12.34','','']; + + $parser = new PresidentsChoice; + $result = $parser->run($row); + $this->assertEquals('-12.34', $result[3]); + $this->assertEquals('Descr', $result[2]); + + } + +} diff --git a/tests/Unit/Import/Specifics/RabobankDescriptionTest.php b/tests/Unit/Import/Specifics/RabobankDescriptionTest.php new file mode 100644 index 0000000000..f969cd5f66 --- /dev/null +++ b/tests/Unit/Import/Specifics/RabobankDescriptionTest.php @@ -0,0 +1,75 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Import\Specifics; + + +use FireflyIII\Import\Specifics\RabobankDescription; +use Tests\TestCase; + +/** + * Class RabobankDescriptionTest + */ +class RabobankDescriptionTest extends TestCase +{ + /** + * Default behaviour + * @covers \FireflyIII\Import\Specifics\RabobankDescription + */ + public function testRunBasic(): void + { + $row = ['','','','','','','','','','','']; + + $parser = new RabobankDescription; + $result = $parser->run($row); + $this->assertEquals($row, $result); + } + + /** + * No opposite name or iban + * @covers \FireflyIII\Import\Specifics\RabobankDescription + */ + public function testRunUseDescription(): void + { + $row = ['','','','','','','','','','','Hello']; + + $parser = new RabobankDescription; + $result = $parser->run($row); + $this->assertEquals('Hello', $result[6]); + $this->assertEquals('', $result[10]); + } + + /** + * Has opposite name or iban + * @covers \FireflyIII\Import\Specifics\RabobankDescription + */ + public function testRunUseFilledIn(): void + { + $row = ['','','','','','ABC','','','','','']; + + $parser = new RabobankDescription; + $result = $parser->run($row); + $this->assertEquals($row, $result); + } + +} diff --git a/tests/Unit/Import/Specifics/SnsDescriptionTest.php b/tests/Unit/Import/Specifics/SnsDescriptionTest.php new file mode 100644 index 0000000000..30b985a920 --- /dev/null +++ b/tests/Unit/Import/Specifics/SnsDescriptionTest.php @@ -0,0 +1,72 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Import\Specifics; + + +use FireflyIII\Import\Specifics\SnsDescription; +use Tests\TestCase; + +/** + * Class SnsDescriptionTest + */ +class SnsDescriptionTest extends TestCase +{ + /** + * @covers \FireflyIII\Import\Specifics\SnsDescription + */ + public function testRunBasic(): void + { + $row = ['a', 'b', 'c']; + + $parser = new SnsDescription; + $result = $parser->run($row); + $this->assertEquals($row, $result); + } + + /** + * @covers \FireflyIII\Import\Specifics\SnsDescription + */ + public function testRunNoQuotes(): void + { + $row = ['a', 'b', 'c', 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 'Some text']; + + $parser = new SnsDescription; + $result = $parser->run($row); + $this->assertEquals($row, $result); + $this->assertEquals('Some text', $result[17]); + } + + /** + * @covers \FireflyIII\Import\Specifics\SnsDescription + */ + public function testRunQuotes(): void + { + $row = ['a', 'b', 'c', 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, '\'Some text\'']; + + $parser = new SnsDescription; + $result = $parser->run($row); + $this->assertEquals('Some text', $result[17]); + } + +} diff --git a/tests/Unit/Import/Storage/ImportArrayStorageTest.php b/tests/Unit/Import/Storage/ImportArrayStorageTest.php new file mode 100644 index 0000000000..21b646e342 --- /dev/null +++ b/tests/Unit/Import/Storage/ImportArrayStorageTest.php @@ -0,0 +1,639 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Import\Storage; + +use Carbon\Carbon; +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Helpers\Collector\JournalCollector; +use FireflyIII\Helpers\Collector\JournalCollectorInterface; +use FireflyIII\Helpers\Filter\InternalTransferFilter; +use FireflyIII\Import\Storage\ImportArrayStorage; +use FireflyIII\Models\ImportJob; +use FireflyIII\Models\Rule; +use FireflyIII\Models\TransactionJournal; +use FireflyIII\Models\TransactionJournalMeta; +use FireflyIII\Models\TransactionType; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Repositories\Journal\JournalRepositoryInterface; +use FireflyIII\Repositories\Rule\RuleRepositoryInterface; +use FireflyIII\Repositories\Tag\TagRepositoryInterface; +use Illuminate\Support\Collection; +use Mockery; +use Tests\TestCase; + +/** + * Class ImportArrayStorageTest + */ +class ImportArrayStorageTest extends TestCase +{ + + /** + * Very basic storage routine. Doesn't call store() + * + * @covers \FireflyIII\Import\Storage\ImportArrayStorage + */ + public function testBasic(): void + { + // make fake job + $job = new ImportJob; + $job->user()->associate($this->user()); + $job->key = 'a_storage' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->transactions = []; + $job->save(); + + // mock stuff + $repository = $this->mock(ImportJobRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + + // mock calls: + $repository->shouldReceive('setUser')->once(); + $journalRepos->shouldReceive('setUser')->once(); + + $storage = new ImportArrayStorage; + $storage->setImportJob($job); + } + + /** + * @covers \FireflyIII\Import\Storage\ImportArrayStorage + */ + public function testBasicStoreDoubleTransferWithRules(): void + { + // get a transfer: + /** @var TransactionJournal $transfer */ + $transfer = $this->user()->transactionJournals() + ->inRandomOrder()->where('transaction_type_id', 3) + ->first(); + + // get transfer as a collection, so the compare routine works. + $journalCollector = new JournalCollector(); + $journalCollector->setUser($this->user()); + $journalCollector->setJournals(new Collection([$transfer])); + $transferCollection = $journalCollector->withOpposingAccount()->getJournals(); + + // make fake job + $job = new ImportJob; + $job->user()->associate($this->user()); + $job->key = 'h_storage' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = ['apply-rules' => true]; + $job->transactions = [$this->singleTransfer(), $this->singleWithdrawal(), $this->basedOnTransfer($transfer)]; + $job->save(); + + + // get some stuff: + $tag = $this->user()->tags()->inRandomOrder()->first(); + $journal = $this->user()->transactionJournals()->inRandomOrder()->first(); + $ruleOne = new Rule; + $ruleOne->stop_processing = false; + $ruleTwo = new Rule; + $ruleTwo->stop_processing = true; + + // mock stuff + $repository = $this->mock(ImportJobRepositoryInterface::class); + $collector = $this->mock(JournalCollectorInterface::class); + $tagRepos = $this->mock(TagRepositoryInterface::class); + $ruleRepos = $this->mock(RuleRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + + // mock calls: + $collector->shouldReceive('setUser')->once(); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setStatus')->withAnyArgs(); + $ruleRepos->shouldReceive('setUser')->once(); + $tagRepos->shouldReceive('setUser')->once(); + $tagRepos->shouldReceive('store')->once()->andReturn($tag); + $repository->shouldReceive('setTag')->once(); + $ruleRepos->shouldReceive('getForImport')->andReturn(new Collection([$ruleOne, $ruleTwo])); + $journalRepos->shouldReceive('setUser')->once(); + $journalRepos->shouldReceive('store')->twice()->andReturn($journal); + $journalRepos->shouldReceive('findByHash')->andReturn(null)->times(5); + $repository->shouldReceive('addErrorMessage')->withArgs( + [Mockery::any(), 'Row #2 ("' . $transfer->description . '") could not be imported. Such a transfer already exists.'] + )->once(); + + + // mock collector so it will return some transfers: + $collector->shouldReceive('setAllAssetAccounts')->once()->andReturnSelf(); + $collector->shouldReceive('setTypes')->withArgs([[TransactionType::TRANSFER]])->once()->andReturnSelf(); + $collector->shouldReceive('withOpposingAccount')->once()->andReturnSelf(); + $collector->shouldReceive('ignoreCache')->once()->andReturnSelf(); + $collector->shouldReceive('removeFilter')->withArgs([InternalTransferFilter::class])->once()->andReturnSelf(); + $collector->shouldReceive('getJournals')->andReturn($transferCollection); + + $storage = new ImportArrayStorage; + $storage->setImportJob($job); + $result = new Collection; + try { + $result = $storage->store(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertCount(2, $result); + } + + /** + * Two withdrawals, one of which is duplicated. + * + * @covers \FireflyIII\Import\Storage\ImportArrayStorage + */ + public function testBasicStoreIsDouble(): void + { + // make fake job + $transactions = [$this->singleWithdrawal(), $this->singleWithdrawal()]; + $job = new ImportJob; + $job->user()->associate($this->user()); + $job->key = 'b_storage' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = ['apply-rules' => true]; + $job->transactions = $transactions; + $job->save(); + + // get some stuff: + $tag = $this->user()->tags()->inRandomOrder()->first(); + $journal = $this->user()->transactionJournals()->inRandomOrder()->first(); + $ruleOne = new Rule; + $ruleOne->stop_processing = false; + $ruleTwo = new Rule; + $ruleTwo->stop_processing = true; + $meta = new TransactionJournalMeta; + $meta->transaction_journal_id = 3; + + // mock stuff + $repository = $this->mock(ImportJobRepositoryInterface::class); + $collector = $this->mock(JournalCollectorInterface::class); + $tagRepos = $this->mock(TagRepositoryInterface::class); + $ruleRepos = $this->mock(RuleRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + + // mock calls: + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setStatus')->withAnyArgs(); + $ruleRepos->shouldReceive('setUser')->once(); + $tagRepos->shouldReceive('setUser')->once(); + $tagRepos->shouldReceive('store')->once()->andReturn($tag); + $repository->shouldReceive('setTag')->once(); + $ruleRepos->shouldReceive('getForImport')->andReturn(new Collection([$ruleOne, $ruleTwo])); + $journalRepos->shouldReceive('setUser')->once(); + $journalRepos->shouldReceive('store')->once()->andReturn($journal); + $journalRepos->shouldReceive('findByHash')->andReturn(null, $meta, null)->times(3); + $repository->shouldReceive('addErrorMessage')->once() + ->withArgs([Mockery::any(), 'Row #1 ("' . $transactions[1]['description'] . '") could not be imported. It already exists.']); + + $storage = new ImportArrayStorage; + $storage->setImportJob($job); + $result = new Collection; + try { + $result = $storage->store(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertCount(1, $result); + } + + /** + * Very basic storage routine. Call store with no data. + * + * @covers \FireflyIII\Import\Storage\ImportArrayStorage + */ + public function testBasicStoreNothing(): void + { + // make fake job + $job = new ImportJob; + $job->user()->associate($this->user()); + $job->key = 'c_storage' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->transactions = []; + $job->save(); + + // mock stuff + $repository = $this->mock(ImportJobRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + + // mock calls: + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setStatus')->withAnyArgs(); + $journalRepos->shouldReceive('setUser')->once(); + + $storage = new ImportArrayStorage; + $storage->setImportJob($job); + $result = new Collection; + try { + $result = $storage->store(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertCount(0, $result); + } + + /** + * Call store with no data, also assume rules. + * + * @covers \FireflyIII\Import\Storage\ImportArrayStorage + */ + public function testBasicStoreNothingWithRules(): void + { + // make fake job + $job = new ImportJob; + $job->user()->associate($this->user()); + $job->key = 'd_storage' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = ['apply-rules' => true]; + $job->transactions = []; + $job->save(); + + // mock stuff + $repository = $this->mock(ImportJobRepositoryInterface::class); + $collector = $this->mock(JournalCollectorInterface::class); + $tagRepos = $this->mock(TagRepositoryInterface::class); + $ruleRepos = $this->mock(RuleRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + + // mock calls: + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setStatus')->withAnyArgs(); + $ruleRepos->shouldReceive('setUser')->once(); + $ruleRepos->shouldReceive('getForImport')->andReturn(new Collection); + $journalRepos->shouldReceive('setUser')->once(); + + $storage = new ImportArrayStorage; + $storage->setImportJob($job); + $result = new Collection; + try { + $result = $storage->store(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertCount(0, $result); + } + + /** + * @covers \FireflyIII\Import\Storage\ImportArrayStorage + */ + public function testBasicStoreSingleWithNoRules(): void + { + // make fake job + $job = new ImportJob; + $job->user()->associate($this->user()); + $job->key = 'e_storage' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = ['apply-rules' => true]; + $job->transactions = [$this->singleWithdrawal()]; + $job->save(); + + // get some stuff: + $tag = $this->user()->tags()->inRandomOrder()->first(); + $journal = $this->user()->transactionJournals()->inRandomOrder()->first(); + + // mock stuff + $repository = $this->mock(ImportJobRepositoryInterface::class); + $collector = $this->mock(JournalCollectorInterface::class); + $tagRepos = $this->mock(TagRepositoryInterface::class); + $ruleRepos = $this->mock(RuleRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + + // mock calls: + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setStatus')->withAnyArgs(); + $ruleRepos->shouldReceive('setUser')->once(); + $tagRepos->shouldReceive('setUser')->once(); + $tagRepos->shouldReceive('store')->once()->andReturn($tag); + $repository->shouldReceive('setTag')->once(); + $ruleRepos->shouldReceive('getForImport')->andReturn(new Collection); + $journalRepos->shouldReceive('setUser')->once(); + $journalRepos->shouldReceive('store')->once()->andReturn($journal); + $journalRepos->shouldReceive('findByHash')->andReturn(null)->times(2); + + $storage = new ImportArrayStorage; + $storage->setImportJob($job); + $result = new Collection; + try { + $result = $storage->store(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertCount(1, $result); + } + + /** + * @covers \FireflyIII\Import\Storage\ImportArrayStorage + */ + public function testBasicStoreSingleWithRules(): void + { + // make fake job + $job = new ImportJob; + $job->user()->associate($this->user()); + $job->key = 'f_storage' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = ['apply-rules' => true]; + $job->transactions = [$this->singleWithdrawal()]; + $job->save(); + + // get some stuff: + $tag = $this->user()->tags()->inRandomOrder()->first(); + $journal = $this->user()->transactionJournals()->inRandomOrder()->first(); + $ruleOne = new Rule; + $ruleOne->stop_processing = false; + $ruleTwo = new Rule; + $ruleTwo->stop_processing = true; + + // mock stuff + $repository = $this->mock(ImportJobRepositoryInterface::class); + $collector = $this->mock(JournalCollectorInterface::class); + $tagRepos = $this->mock(TagRepositoryInterface::class); + $ruleRepos = $this->mock(RuleRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + + // mock calls: + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setStatus')->withAnyArgs(); + $ruleRepos->shouldReceive('setUser')->once(); + $tagRepos->shouldReceive('setUser')->once(); + $tagRepos->shouldReceive('store')->once()->andReturn($tag); + $repository->shouldReceive('setTag')->once(); + $ruleRepos->shouldReceive('getForImport')->andReturn(new Collection([$ruleOne, $ruleTwo])); + $journalRepos->shouldReceive('setUser')->once(); + $journalRepos->shouldReceive('store')->once()->andReturn($journal); + $journalRepos->shouldReceive('findByHash')->andReturn(null)->times(2); + + $storage = new ImportArrayStorage; + $storage->setImportJob($job); + $result = new Collection; + try { + $result = $storage->store(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertCount(1, $result); + } + + /** + * @covers \FireflyIII\Import\Storage\ImportArrayStorage + */ + public function testBasicStoreTransferWithRules(): void + { + // make fake job + $job = new ImportJob; + $job->user()->associate($this->user()); + $job->key = 'g_storage' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = ['apply-rules' => true]; + $job->transactions = [$this->singleTransfer(), $this->singleWithdrawal()]; + $job->save(); + + // get a transfer: + $transfer = $this->user()->transactionJournals() + ->inRandomOrder()->where('transaction_type_id', 3) + ->first(); + + // get transfer as a collection, so the compare routine works. + $journalCollector = new JournalCollector(); + $journalCollector->setUser($this->user()); + $journalCollector->setJournals(new Collection([$transfer])); + $transferCollection = $journalCollector->withOpposingAccount()->getJournals(); + + // get some stuff: + $tag = $this->user()->tags()->inRandomOrder()->first(); + $journal = $this->user()->transactionJournals()->inRandomOrder()->first(); + $ruleOne = new Rule; + $ruleOne->stop_processing = false; + $ruleTwo = new Rule; + $ruleTwo->stop_processing = true; + + // mock stuff + $repository = $this->mock(ImportJobRepositoryInterface::class); + $collector = $this->mock(JournalCollectorInterface::class); + $tagRepos = $this->mock(TagRepositoryInterface::class); + $ruleRepos = $this->mock(RuleRepositoryInterface::class); + $journalRepos = $this->mock(JournalRepositoryInterface::class); + + // mock calls: + $collector->shouldReceive('setUser')->once(); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setStatus')->withAnyArgs(); + $ruleRepos->shouldReceive('setUser')->once(); + $tagRepos->shouldReceive('setUser')->once(); + $tagRepos->shouldReceive('store')->once()->andReturn($tag); + $repository->shouldReceive('setTag')->once(); + $ruleRepos->shouldReceive('getForImport')->andReturn(new Collection([$ruleOne, $ruleTwo])); + $journalRepos->shouldReceive('setUser')->once(); + $journalRepos->shouldReceive('store')->twice()->andReturn($journal); + $journalRepos->shouldReceive('findByHash')->andReturn(null)->times(4); + + // mock collector so it will return some transfers: + $collector->shouldReceive('setAllAssetAccounts')->once()->andReturnSelf(); + $collector->shouldReceive('setTypes')->withArgs([[TransactionType::TRANSFER]])->once()->andReturnSelf(); + $collector->shouldReceive('ignoreCache')->once()->andReturnSelf(); + $collector->shouldReceive('withOpposingAccount')->once()->andReturnSelf(); + $collector->shouldReceive('removeFilter')->withArgs([InternalTransferFilter::class])->once()->andReturnSelf(); + $collector->shouldReceive('getJournals')->andReturn($transferCollection); + + $storage = new ImportArrayStorage; + $storage->setImportJob($job); + $result = new Collection; + try { + $result = $storage->store(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertCount(2, $result); + } + + /** + * @param TransactionJournal $transfer + * + * @return array + */ + private function basedOnTransfer(TransactionJournal $transfer): array + { + $destination = $transfer->transactions()->where('amount', '>', 0)->first(); + $source = $transfer->transactions()->where('amount', '<', 0)->first(); + $amount = $destination->amount; + + return + [ + 'type' => 'transfer', + 'date' => $transfer->date->format('Y-m-d'), + 'tags' => '', + 'user' => $this->user()->id, + + // all custom fields: + 'internal_reference' => null, + 'notes' => null, + + // journal data: + 'description' => $transfer->description, + 'piggy_bank_id' => null, + 'piggy_bank_name' => null, + 'bill_id' => null, + 'bill_name' => null, + + // transaction data: + 'transactions' => [ + [ + 'currency_id' => null, + 'currency_code' => 'EUR', + 'description' => null, + 'amount' => $amount, + 'budget_id' => null, + 'budget_name' => null, + 'category_id' => null, + 'category_name' => null, + 'source_id' => $source->account_id, + 'source_name' => null, + 'destination_id' => $destination->account_id, + 'destination_name' => null, + 'foreign_currency_id' => null, + 'foreign_currency_code' => null, + 'foreign_amount' => null, + 'reconciled' => false, + 'identifier' => 0, + ], + ], + ]; + + } + + /** + * @return array + */ + private function singleTransfer(): array + { + return + [ + 'type' => 'transfer', + 'date' => Carbon::create()->format('Y-m-d'), + 'tags' => '', + 'user' => $this->user()->id, + + // all custom fields: + 'internal_reference' => null, + 'notes' => null, + + // journal data: + 'description' => 'Some TEST transfer #' . random_int(1, 10000), + 'piggy_bank_id' => null, + 'piggy_bank_name' => null, + 'bill_id' => null, + 'bill_name' => null, + + // transaction data: + 'transactions' => [ + [ + 'currency_id' => null, + 'currency_code' => 'EUR', + 'description' => null, + 'amount' => random_int(500, 5000) / 100, + 'budget_id' => null, + 'budget_name' => null, + 'category_id' => null, + 'category_name' => null, + 'source_id' => 1, + 'source_name' => null, + 'destination_id' => 2, + 'destination_name' => null, + 'foreign_currency_id' => null, + 'foreign_currency_code' => null, + 'foreign_amount' => null, + 'reconciled' => false, + 'identifier' => 0, + ], + ], + ]; + } + + /** + * @return array + */ + private function singleWithdrawal(): array + { + return + [ + 'type' => 'withdrawal', + 'date' => Carbon::create()->format('Y-m-d'), + 'tags' => '', + 'user' => $this->user()->id, + + // all custom fields: + 'internal_reference' => null, + 'notes' => null, + + // journal data: + 'description' => 'Some TEST withdrawal #' . random_int(1, 10000), + 'piggy_bank_id' => null, + 'piggy_bank_name' => null, + 'bill_id' => null, + 'bill_name' => null, + + // transaction data: + 'transactions' => [ + [ + 'currency_id' => null, + 'currency_code' => 'EUR', + 'description' => null, + 'amount' => random_int(500, 5000) / 100, + 'budget_id' => null, + 'budget_name' => null, + 'category_id' => null, + 'category_name' => null, + 'source_id' => null, + 'source_name' => 'Checking Account', + 'destination_id' => null, + 'destination_name' => 'Random TEST expense account #' . random_int(1, 10000), + 'foreign_currency_id' => null, + 'foreign_currency_code' => null, + 'foreign_amount' => null, + 'reconciled' => false, + 'identifier' => 0, + ], + ], + ]; + } +} diff --git a/tests/Unit/Middleware/AuthenticateTest.php b/tests/Unit/Middleware/AuthenticateTest.php index 6e6eacf55c..ad316d6194 100644 --- a/tests/Unit/Middleware/AuthenticateTest.php +++ b/tests/Unit/Middleware/AuthenticateTest.php @@ -35,7 +35,7 @@ class AuthenticateTest extends TestCase /** * @covers \FireflyIII\Http\Middleware\Authenticate */ - public function testMiddleware() + public function testMiddleware(): void { Log::debug('Now at testMiddleware'); $response = $this->get('/_test/authenticate'); @@ -46,7 +46,7 @@ class AuthenticateTest extends TestCase /** * @covers \FireflyIII\Http\Middleware\Authenticate */ - public function testMiddlewareAjax() + public function testMiddlewareAjax(): void { Log::debug('Now at testMiddlewareAjax'); $server = ['HTTP_X-Requested-With' => 'XMLHttpRequest']; @@ -57,7 +57,7 @@ class AuthenticateTest extends TestCase /** * @covers \FireflyIII\Http\Middleware\Authenticate */ - public function testMiddlewareAuth() + public function testMiddlewareAuth(): void { Log::debug('Now at testMiddlewareAuth'); $this->be($this->user()); @@ -68,7 +68,7 @@ class AuthenticateTest extends TestCase /** * @covers \FireflyIII\Http\Middleware\Authenticate */ - public function testMiddlewareBlockedUser() + public function testMiddlewareBlockedUser(): void { Log::debug('Now at testMiddlewareBlockedUser'); $user = $this->user(); @@ -85,7 +85,7 @@ class AuthenticateTest extends TestCase /** * @covers \FireflyIII\Http\Middleware\Authenticate */ - public function testMiddlewareEmail() + public function testMiddlewareEmail(): void { Log::debug('Now at testMiddlewareEmail'); $user = $this->user(); diff --git a/tests/Unit/Middleware/AuthenticateTwoFactorTest.php b/tests/Unit/Middleware/AuthenticateTwoFactorTest.php index 964ddf5dc1..2e67ebf634 100644 --- a/tests/Unit/Middleware/AuthenticateTwoFactorTest.php +++ b/tests/Unit/Middleware/AuthenticateTwoFactorTest.php @@ -38,7 +38,7 @@ class AuthenticateTwoFactorTest extends TestCase /** * @covers \FireflyIII\Http\Middleware\AuthenticateTwoFactor::handle */ - public function testMiddleware() + public function testMiddleware(): void { $this->withoutExceptionHandling(); $response = $this->get('/_test/authenticate'); @@ -56,7 +56,7 @@ class AuthenticateTwoFactorTest extends TestCase * * @covers \FireflyIII\Http\Middleware\AuthenticateTwoFactor::handle */ - public function testMiddlewareNoTwoFA() + public function testMiddlewareNoTwoFA(): void { $this->withoutExceptionHandling(); $user = $this->user(); @@ -87,7 +87,7 @@ class AuthenticateTwoFactorTest extends TestCase * * @covers \FireflyIII\Http\Middleware\AuthenticateTwoFactor::handle */ - public function testMiddlewareTwoFAAuthed() + public function testMiddlewareTwoFAAuthed(): void { $this->withoutExceptionHandling(); $user = $this->user(); @@ -120,7 +120,7 @@ class AuthenticateTwoFactorTest extends TestCase * * @covers \FireflyIII\Http\Middleware\AuthenticateTwoFactor::handle */ - public function testMiddlewareTwoFANoSecret() + public function testMiddlewareTwoFANoSecret(): void { $this->withoutExceptionHandling(); $user = $this->user(); @@ -151,7 +151,7 @@ class AuthenticateTwoFactorTest extends TestCase * * @covers \FireflyIII\Http\Middleware\AuthenticateTwoFactor::handle */ - public function testMiddlewareTwoFASecret() + public function testMiddlewareTwoFASecret(): void { $this->withoutExceptionHandling(); $user = $this->user(); diff --git a/tests/Unit/Middleware/BinderTest.php b/tests/Unit/Middleware/BinderTest.php index 10f6b780cf..9f4c796af8 100644 --- a/tests/Unit/Middleware/BinderTest.php +++ b/tests/Unit/Middleware/BinderTest.php @@ -41,12 +41,10 @@ class BinderTest extends TestCase { /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\Account::routeBinder */ - public function testAccount() + public function testAccount(): void { Route::middleware(Binder::class)->any( '/_test/binder/{account}', function () { @@ -60,12 +58,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Support\Binder\AccountList::routeBinder */ - public function testAccountList() + public function testAccountList(): void { Route::middleware(Binder::class)->any( '/_test/binder/{accountList}', function (Collection $accounts) { @@ -79,12 +75,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Support\Binder\AccountList::routeBinder */ - public function testAccountListEmpty() + public function testAccountListEmpty(): void { Route::middleware(Binder::class)->any( '/_test/binder/{accountList}', function (Collection $accounts) { @@ -97,12 +91,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Support\Binder\AccountList::routeBinder */ - public function testAccountListInvalid() + public function testAccountListInvalid(): void { Route::middleware(Binder::class)->any( '/_test/binder/{accountList}', function (Collection $accounts) { @@ -116,12 +108,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Support\Binder\AccountList::routeBinder */ - public function testAccountListNotLoggedIn() + public function testAccountListNotLoggedIn(): void { Route::middleware(Binder::class)->any( '/_test/binder/{accountList}', function (Collection $accounts) { @@ -133,12 +123,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\Account::routeBinder */ - public function testAccountNotFound() + public function testAccountNotFound(): void { Route::middleware(Binder::class)->any( '/_test/binder/{account}', function () { @@ -152,12 +140,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\Account::routeBinder */ - public function testAccountNotLoggedIn() + public function testAccountNotLoggedIn(): void { Route::middleware(Binder::class)->any( '/_test/binder/{account}', function () { @@ -170,12 +156,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\Attachment::routeBinder */ - public function testAttachment() + public function testAttachment(): void { Route::middleware(Binder::class)->any( '/_test/binder/{attachment}', function () { @@ -189,12 +173,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\Attachment::routeBinder */ - public function testAttachmentNotFound() + public function testAttachmentNotFound(): void { Route::middleware(Binder::class)->any( '/_test/binder/{attachment}', function () { @@ -208,12 +190,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\Attachment::routeBinder */ - public function testAttachmentNotLoggedIn() + public function testAttachmentNotLoggedIn(): void { Route::middleware(Binder::class)->any( '/_test/binder/{attachment}', function () { @@ -226,12 +206,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\Bill::routeBinder */ - public function testBill() + public function testBill(): void { Route::middleware(Binder::class)->any( '/_test/binder/{bill}', function () { @@ -245,12 +223,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\Bill::routeBinder */ - public function testBillNotFound() + public function testBillNotFound(): void { Route::middleware(Binder::class)->any( '/_test/binder/{bill}', function () { @@ -264,12 +240,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\Bill::routeBinder */ - public function testBillNotLoggedIn() + public function testBillNotLoggedIn(): void { Route::middleware(Binder::class)->any( '/_test/binder/{bill}', function () { @@ -282,12 +256,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\Budget::routeBinder */ - public function testBudget() + public function testBudget(): void { Route::middleware(Binder::class)->any( '/_test/binder/{budget}', function () { @@ -301,12 +273,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\BudgetLimit::routeBinder */ - public function testBudgetLimit() + public function testBudgetLimit(): void { Route::middleware(Binder::class)->any( '/_test/binder/{budgetLimit}', function () { @@ -320,12 +290,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\BudgetLimit::routeBinder */ - public function testBudgetLimitNotFound() + public function testBudgetLimitNotFound(): void { Route::middleware(Binder::class)->any( '/_test/binder/{budgetLimit}', function () { @@ -339,12 +307,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\BudgetLimit::routeBinder */ - public function testBudgetLimitNotLoggedIn() + public function testBudgetLimitNotLoggedIn(): void { Route::middleware(Binder::class)->any( '/_test/binder/{budgetLimit}', function () { @@ -357,12 +323,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Support\Binder\BudgetList::routeBinder */ - public function testBudgetList() + public function testBudgetList(): void { Route::middleware(Binder::class)->any( '/_test/binder/{budgetList}', function (Collection $budgets) { @@ -376,12 +340,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Support\Binder\BudgetList::routeBinder */ - public function testBudgetListInvalid() + public function testBudgetListInvalid(): void { Route::middleware(Binder::class)->any( '/_test/binder/{budgetList}', function (Collection $budgets) { @@ -394,12 +356,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\Budget::routeBinder */ - public function testBudgetNotFound() + public function testBudgetNotFound(): void { Route::middleware(Binder::class)->any( '/_test/binder/{budget}', function () { @@ -413,12 +373,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\Budget::routeBinder */ - public function testBudgetNotLoggedIn() + public function testBudgetNotLoggedIn(): void { Route::middleware(Binder::class)->any( '/_test/binder/{budget}', function () { @@ -431,12 +389,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\Category::routeBinder */ - public function testCategory() + public function testCategory(): void { Route::middleware(Binder::class)->any( '/_test/binder/{category}', function () { @@ -450,12 +406,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Support\Binder\CategoryList::routeBinder */ - public function testCategoryList() + public function testCategoryList(): void { Route::middleware(Binder::class)->any( '/_test/binder/{categoryList}', function (Collection $categories) { @@ -469,12 +423,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Support\Binder\CategoryList::routeBinder */ - public function testCategoryListInvalid() + public function testCategoryListInvalid(): void { Route::middleware(Binder::class)->any( '/_test/binder/{categoryList}', function (Collection $categories) { @@ -487,12 +439,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\Category::routeBinder */ - public function testCategoryNotFound() + public function testCategoryNotFound(): void { Route::middleware(Binder::class)->any( '/_test/binder/{category}', function () { @@ -506,12 +456,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\Category::routeBinder */ - public function testCategoryNotLoggedIn() + public function testCategoryNotLoggedIn(): void { Route::middleware(Binder::class)->any( '/_test/binder/{category}', function () { @@ -524,12 +472,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Support\Binder\CurrencyCode::routeBinder */ - public function testCurrencyCode() + public function testCurrencyCode(): void { Route::middleware(Binder::class)->any( '/_test/binder/{fromCurrencyCode}', function () { @@ -543,12 +489,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Support\Binder\CurrencyCode::routeBinder */ - public function testCurrencyCodeNotFound() + public function testCurrencyCodeNotFound(): void { Route::middleware(Binder::class)->any( '/_test/binder/{fromCurrencyCode}', function () { @@ -562,12 +506,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Support\Binder\CurrencyCode::routeBinder */ - public function testCurrencyCodeNotLoggedIn() + public function testCurrencyCodeNotLoggedIn(): void { Route::middleware(Binder::class)->any( '/_test/binder/{fromCurrencyCode}', function () { @@ -580,12 +522,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Support\Binder\Date::routeBinder */ - public function testDate() + public function testDate(): void { Route::middleware(Binder::class)->any( '/_test/binder/{date}', function (Carbon $date) { @@ -599,12 +539,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Support\Binder\Date::routeBinder */ - public function testDateCurrentMonthEnd() + public function testDateCurrentMonthEnd(): void { Route::middleware(Binder::class)->any( '/_test/binder/{date}', function (Carbon $date) { @@ -620,12 +558,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Support\Binder\Date::routeBinder */ - public function testDateCurrentMonthStart() + public function testDateCurrentMonthStart(): void { Route::middleware(Binder::class)->any( '/_test/binder/{date}', function (Carbon $date) { @@ -641,12 +577,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Support\Binder\Date::routeBinder */ - public function testDateCurrentYearEnd() + public function testDateCurrentYearEnd(): void { Route::middleware(Binder::class)->any( '/_test/binder/{date}', function (Carbon $date) { @@ -662,12 +596,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Support\Binder\Date::routeBinder */ - public function testDateCurrentYearStart() + public function testDateCurrentYearStart(): void { Route::middleware(Binder::class)->any( '/_test/binder/{date}', function (Carbon $date) { @@ -683,12 +615,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Support\Binder\Date::routeBinder */ - public function testDateFiscalYearEnd() + public function testDateFiscalYearEnd(): void { Route::middleware(Binder::class)->any( '/_test/binder/{date}', function (Carbon $date) { @@ -711,12 +641,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Support\Binder\Date::routeBinder */ - public function testDateFiscalYearStart() + public function testDateFiscalYearStart(): void { Route::middleware(Binder::class)->any( '/_test/binder/{date}', function (Carbon $date) { @@ -739,12 +667,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Support\Binder\Date::routeBinder */ - public function testDateInvalid() + public function testDateInvalid(): void { Route::middleware(Binder::class)->any( '/_test/binder/{date}', function (Carbon $date) { @@ -757,12 +683,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\ExportJob::routeBinder */ - public function testExportJob() + public function testExportJob(): void { Route::middleware(Binder::class)->any( '/_test/binder/{exportJob}', function () { @@ -776,12 +700,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\ExportJob::routeBinder */ - public function testExportJobNotFound() + public function testExportJobNotFound(): void { Route::middleware(Binder::class)->any( '/_test/binder/{exportJob}', function () { @@ -795,12 +717,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\ExportJob::routeBinder */ - public function testExportJobNotLoggedIn() + public function testExportJobNotLoggedIn(): void { Route::middleware(Binder::class)->any( '/_test/binder/{exportJob}', function () { @@ -813,12 +733,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\ImportJob::routeBinder */ - public function testImportJob() + public function testImportJob(): void { Route::middleware(Binder::class)->any( '/_test/binder/{importJob}', function () { @@ -832,30 +750,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\ImportJob::routeBinder */ - public function testImportJobBadStatus() - { - Route::middleware(Binder::class)->any( - '/_test/binder/{importJob}', function () { - return 'OK'; - } - ); - $this->be($this->user()); - $response = $this->get('/_test/binder/bad-status'); - $this->assertEquals(Response::HTTP_INTERNAL_SERVER_ERROR, $response->getStatusCode()); - } - - /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding - * @covers \FireflyIII\Models\ImportJob::routeBinder - */ - public function testImportJobNotFound() + public function testImportJobNotFound(): void { Route::middleware(Binder::class)->any( '/_test/binder/{importJob}', function () { @@ -869,12 +767,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\ImportJob::routeBinder */ - public function testImportJobNotLoggedIn() + public function testImportJobNotLoggedIn(): void { Route::middleware(Binder::class)->any( '/_test/binder/{importJob}', function () { @@ -887,12 +783,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Support\Binder\JournalList::routeBinder */ - public function testJournalList() + public function testJournalList(): void { Route::middleware(Binder::class)->any( '/_test/binder/{journalList}', function (Collection $journals) { @@ -906,12 +800,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Support\Binder\JournalList::routeBinder */ - public function testJournalListEmpty() + public function testJournalListEmpty(): void { Route::middleware(Binder::class)->any( '/_test/binder/{journalList}', function (Collection $journals) { @@ -924,12 +816,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\LinkType::routeBinder */ - public function testLinkType() + public function testLinkType(): void { Route::middleware(Binder::class)->any( '/_test/binder/{linkType}', function () { @@ -943,12 +833,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\LinkType::routeBinder */ - public function testLinkTypeNotFound() + public function testLinkTypeNotFound(): void { Route::middleware(Binder::class)->any( '/_test/binder/{linkType}', function () { @@ -962,12 +850,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\LinkType::routeBinder */ - public function testLinkTypeNotLoggedIn() + public function testLinkTypeNotLoggedIn(): void { Route::middleware(Binder::class)->any( '/_test/binder/{linkType}', function () { @@ -980,12 +866,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\PiggyBank::routeBinder */ - public function testPiggyBank() + public function testPiggyBank(): void { Route::middleware(Binder::class)->any( '/_test/binder/{piggyBank}', function () { @@ -999,12 +883,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\PiggyBank::routeBinder */ - public function testPiggyBankNotFound() + public function testPiggyBankNotFound(): void { Route::middleware(Binder::class)->any( '/_test/binder/{piggyBank}', function () { @@ -1018,12 +900,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\PiggyBank::routeBinder */ - public function testPiggyBankNotLoggedIn() + public function testPiggyBankNotLoggedIn(): void { Route::middleware(Binder::class)->any( '/_test/binder/{piggyBank}', function () { @@ -1036,12 +916,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\Rule::routeBinder */ - public function testRule() + public function testRule(): void { Route::middleware(Binder::class)->any( '/_test/binder/{rule}', function () { @@ -1055,12 +933,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\RuleGroup::routeBinder */ - public function testRuleGroup() + public function testRuleGroup(): void { Route::middleware(Binder::class)->any( '/_test/binder/{ruleGroup}', function () { @@ -1074,12 +950,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\RuleGroup::routeBinder */ - public function testRuleGroupNotFound() + public function testRuleGroupNotFound(): void { Route::middleware(Binder::class)->any( '/_test/binder/{ruleGroup}', function () { @@ -1093,12 +967,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\RuleGroup::routeBinder */ - public function testRuleGroupNotLoggedIn() + public function testRuleGroupNotLoggedIn(): void { Route::middleware(Binder::class)->any( '/_test/binder/{ruleGroup}', function () { @@ -1111,12 +983,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\Rule::routeBinder */ - public function testRuleNotFound() + public function testRuleNotFound(): void { Route::middleware(Binder::class)->any( '/_test/binder/{rule}', function () { @@ -1130,12 +1000,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\Rule::routeBinder */ - public function testRuleNotLoggedIn() + public function testRuleNotLoggedIn(): void { Route::middleware(Binder::class)->any( '/_test/binder/{rule}', function () { @@ -1148,12 +1016,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\TransactionJournal::routeBinder */ - public function testTJ() + public function testTJ(): void { Route::middleware(Binder::class)->any( '/_test/binder/{tj}', function () { @@ -1167,12 +1033,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\TransactionJournal::routeBinder */ - public function testTJNotFound() + public function testTJNotFound(): void { Route::middleware(Binder::class)->any( '/_test/binder/{tj}', function () { @@ -1186,12 +1050,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\TransactionJournal::routeBinder */ - public function testTJNotLoggedIn() + public function testTJNotLoggedIn(): void { Route::middleware(Binder::class)->any( '/_test/binder/{tj}', function () { @@ -1204,12 +1066,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\Tag::routeBinder */ - public function testTag() + public function testTag(): void { Route::middleware(Binder::class)->any( '/_test/binder/{tag}', function () { @@ -1223,12 +1083,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Support\Binder\TagList::routeBinder */ - public function testTagList() + public function testTagList(): void { $tagRepos = $this->mock(TagRepositoryInterface::class); $tagRepos->shouldReceive('setUser'); @@ -1251,12 +1109,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Support\Binder\TagList::routeBinder */ - public function testTagListEmpty() + public function testTagListEmpty(): void { $tagRepos = $this->mock(TagRepositoryInterface::class); $tagRepos->shouldReceive('setUser'); @@ -1273,12 +1129,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\Tag::routeBinder */ - public function testTagNotFound() + public function testTagNotFound(): void { Route::middleware(Binder::class)->any( '/_test/binder/{tag}', function () { @@ -1292,12 +1146,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\Tag::routeBinder */ - public function testTagNotLoggedIn() + public function testTagNotLoggedIn(): void { Route::middleware(Binder::class)->any( '/_test/binder/{tag}', function () { @@ -1310,12 +1162,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\TransactionCurrency::routeBinder */ - public function testTransactionCurrency() + public function testTransactionCurrency(): void { Route::middleware(Binder::class)->any( '/_test/binder/{currency}', function () { @@ -1329,12 +1179,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\TransactionCurrency::routeBinder */ - public function testTransactionCurrencyNotFound() + public function testTransactionCurrencyNotFound(): void { Route::middleware(Binder::class)->any( '/_test/binder/{currency}', function () { @@ -1348,12 +1196,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\TransactionCurrency::routeBinder */ - public function testTransactionCurrencyNotLoggedIn() + public function testTransactionCurrencyNotLoggedIn(): void { Route::middleware(Binder::class)->any( '/_test/binder/{currency}', function () { @@ -1366,12 +1212,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\TransactionJournalLink::routeBinder */ - public function testTransactionJournalLink() + public function testTransactionJournalLink(): void { Route::middleware(Binder::class)->any( '/_test/binder/{journalLink}', function () { @@ -1385,12 +1229,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\TransactionJournalLink::routeBinder */ - public function testTransactionJournalLinkNotFound() + public function testTransactionJournalLinkNotFound(): void { Route::middleware(Binder::class)->any( '/_test/binder/{journalLink}', function () { @@ -1404,12 +1246,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\TransactionJournalLink::routeBinder */ - public function testTransactionJournalLinkNotLoggedIn() + public function testTransactionJournalLinkNotLoggedIn(): void { Route::middleware(Binder::class)->any( '/_test/binder/{journalLink}', function () { @@ -1422,12 +1262,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\TransactionType::routeBinder */ - public function testTransactionType() + public function testTransactionType(): void { Route::middleware(Binder::class)->any( '/_test/binder/{transactionType}', function () { @@ -1441,12 +1279,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\TransactionType::routeBinder */ - public function testTransactionTypeNotFound() + public function testTransactionTypeNotFound(): void { Route::middleware(Binder::class)->any( '/_test/binder/{transactionType}', function () { @@ -1460,12 +1296,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Models\TransactionType::routeBinder */ - public function testTransactionTypeNotLoggedIn() + public function testTransactionTypeNotLoggedIn(): void { Route::middleware(Binder::class)->any( '/_test/binder/{transactionType}', function () { @@ -1478,12 +1312,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Support\Binder\UnfinishedJournal::routeBinder */ - public function testUnfinishedJournal() + public function testUnfinishedJournal(): void { $journal = $this->user()->transactionJournals()->where('completed', 0)->first(); Route::middleware(Binder::class)->any( @@ -1497,12 +1329,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Support\Binder\UnfinishedJournal::routeBinder */ - public function testUnfinishedJournalFinished() + public function testUnfinishedJournalFinished(): void { $journal = $this->user()->transactionJournals()->where('completed', 1)->first(); Route::middleware(Binder::class)->any( @@ -1515,12 +1345,10 @@ class BinderTest extends TestCase } /** - * @covers \FireflyIII\Http\Middleware\Binder::handle - * @covers \FireflyIII\Http\Middleware\Binder::__construct - * @covers \FireflyIII\Http\Middleware\Binder::performBinding + * @covers \FireflyIII\Http\Middleware\Binder * @covers \FireflyIII\Support\Binder\UnfinishedJournal::routeBinder */ - public function testUnfinishedJournalNotLoggedIn() + public function testUnfinishedJournalNotLoggedIn(): void { $journal = $this->user()->transactionJournals()->where('completed', 0)->first(); Route::middleware(Binder::class)->any( diff --git a/tests/Unit/Middleware/IsAdminTest.php b/tests/Unit/Middleware/IsAdminTest.php index 7d2726834a..7ac02d2ab4 100644 --- a/tests/Unit/Middleware/IsAdminTest.php +++ b/tests/Unit/Middleware/IsAdminTest.php @@ -36,7 +36,7 @@ class IsAdminTest extends TestCase /** * @covers \FireflyIII\Http\Middleware\IsAdmin::handle */ - public function testMiddleware() + public function testMiddleware(): void { $this->withoutExceptionHandling(); $response = $this->get('/_test/is-admin'); @@ -47,7 +47,7 @@ class IsAdminTest extends TestCase /** * @covers \FireflyIII\Http\Middleware\IsAdmin::handle */ - public function testMiddlewareAjax() + public function testMiddlewareAjax(): void { $server = ['HTTP_X-Requested-With' => 'XMLHttpRequest']; $this->withoutExceptionHandling(); @@ -58,7 +58,7 @@ class IsAdminTest extends TestCase /** * @covers \FireflyIII\Http\Middleware\IsAdmin::handle */ - public function testMiddlewareNotOwner() + public function testMiddlewareNotOwner(): void { $this->withoutExceptionHandling(); $this->be($this->emptyUser()); @@ -70,7 +70,7 @@ class IsAdminTest extends TestCase /** * @covers \FireflyIII\Http\Middleware\IsAdmin::handle */ - public function testMiddlewareOwner() + public function testMiddlewareOwner(): void { $this->be($this->user()); $this->withoutExceptionHandling(); diff --git a/tests/Unit/Middleware/IsDemoUserTest.php b/tests/Unit/Middleware/IsDemoUserTest.php index 6e695cdfd9..c2d0ad4f5f 100644 --- a/tests/Unit/Middleware/IsDemoUserTest.php +++ b/tests/Unit/Middleware/IsDemoUserTest.php @@ -37,7 +37,7 @@ class IsDemoUserTest extends TestCase /** * @covers \FireflyIII\Http\Middleware\IsDemoUser */ - public function testMiddlewareAuthenticated() + public function testMiddlewareAuthenticated(): void { $this->be($this->user()); $response = $this->get('/_test/is-demo'); @@ -47,7 +47,7 @@ class IsDemoUserTest extends TestCase /** * @covers \FireflyIII\Http\Middleware\IsDemoUser */ - public function testMiddlewareNotAuthenticated() + public function testMiddlewareNotAuthenticated(): void { $response = $this->get('/_test/is-demo'); $this->assertEquals(Response::HTTP_OK, $response->getStatusCode()); @@ -56,7 +56,7 @@ class IsDemoUserTest extends TestCase /** * @covers \FireflyIII\Http\Middleware\IsDemoUser */ - public function testMiddlewareIsDemoUser() + public function testMiddlewareIsDemoUser(): void { $this->be($this->demoUser()); $response = $this->get('/_test/is-demo'); diff --git a/tests/Unit/Middleware/IsSandstormUserTest.php b/tests/Unit/Middleware/IsSandstormUserTest.php index 60cf2b68ad..c53fbe484d 100644 --- a/tests/Unit/Middleware/IsSandstormUserTest.php +++ b/tests/Unit/Middleware/IsSandstormUserTest.php @@ -36,7 +36,7 @@ class IsSandstormUserTest extends TestCase /** * @covers \FireflyIII\Http\Middleware\IsSandStormUser::handle */ - public function testMiddlewareNotAuthenticated() + public function testMiddlewareNotAuthenticated(): void { $this->withoutExceptionHandling(); $response = $this->get('/_test/is-sandstorm'); @@ -46,7 +46,7 @@ class IsSandstormUserTest extends TestCase /** * @covers \FireflyIII\Http\Middleware\IsSandStormUser::handle */ - public function testMiddlewareNotSandStorm() + public function testMiddlewareNotSandStorm(): void { $this->withoutExceptionHandling(); $this->be($this->user()); @@ -57,7 +57,7 @@ class IsSandstormUserTest extends TestCase /** * @covers \FireflyIII\Http\Middleware\IsSandStormUser::handle */ - public function testMiddlewareSandstorm() + public function testMiddlewareSandstorm(): void { putenv('SANDSTORM=1'); $this->withoutExceptionHandling(); diff --git a/tests/Unit/Middleware/RangeTest.php b/tests/Unit/Middleware/RangeTest.php index 907fe19ace..82302099b4 100644 --- a/tests/Unit/Middleware/RangeTest.php +++ b/tests/Unit/Middleware/RangeTest.php @@ -38,7 +38,7 @@ class RangeTest extends TestCase /** * @covers \FireflyIII\Http\Middleware\Range */ - public function testMiddlewareAuthenticated() + public function testMiddlewareAuthenticated(): void { $repository = $this->mock(JournalRepositoryInterface::class); $repository->shouldReceive('firstNull')->andReturn(TransactionJournal::first()); @@ -56,7 +56,7 @@ class RangeTest extends TestCase /** * @covers \FireflyIII\Http\Middleware\Range */ - public function testMiddlewareNotAuthenticated() + public function testMiddlewareNotAuthenticated(): void { $this->withoutExceptionHandling(); $response = $this->get('/_test/range'); diff --git a/tests/Unit/Middleware/RedirectIf2FAAuthenticatedTest.php b/tests/Unit/Middleware/RedirectIf2FAAuthenticatedTest.php index 7a4075c7b8..cf5cfa2e89 100644 --- a/tests/Unit/Middleware/RedirectIf2FAAuthenticatedTest.php +++ b/tests/Unit/Middleware/RedirectIf2FAAuthenticatedTest.php @@ -38,7 +38,7 @@ class RedirectIf2FAAuthenticatedTest extends TestCase /** * @covers \FireflyIII\Http\Middleware\RedirectIfTwoFactorAuthenticated::handle */ - public function testMiddleware() + public function testMiddleware(): void { $response = $this->get('/_test/authenticate'); $this->assertEquals(Response::HTTP_OK, $response->getStatusCode()); @@ -47,7 +47,7 @@ class RedirectIf2FAAuthenticatedTest extends TestCase /** * @covers \FireflyIII\Http\Middleware\RedirectIfTwoFactorAuthenticated::handle */ - public function testMiddlewareAuthenticated() + public function testMiddlewareAuthenticated(): void { // pref for has 2fa is true $preference = new Preference; @@ -71,7 +71,7 @@ class RedirectIf2FAAuthenticatedTest extends TestCase /** * @covers \FireflyIII\Http\Middleware\RedirectIfTwoFactorAuthenticated::handle */ - public function testMiddlewareLightAuth() + public function testMiddlewareLightAuth(): void { $this->be($this->user()); $response = $this->get('/_test/authenticate'); diff --git a/tests/Unit/Middleware/RedirectIfAuthenticatedTest.php b/tests/Unit/Middleware/RedirectIfAuthenticatedTest.php index 3bbd7a4d00..bbfcc6e415 100644 --- a/tests/Unit/Middleware/RedirectIfAuthenticatedTest.php +++ b/tests/Unit/Middleware/RedirectIfAuthenticatedTest.php @@ -36,7 +36,7 @@ class RedirectIfAuthenticatedTest extends TestCase /** * @covers \FireflyIII\Http\Middleware\RedirectIfAuthenticated::handle */ - public function testMiddleware() + public function testMiddleware(): void { $response = $this->get('/_test/authenticate'); $this->assertEquals(Response::HTTP_OK, $response->getStatusCode()); @@ -45,7 +45,7 @@ class RedirectIfAuthenticatedTest extends TestCase /** * @covers \FireflyIII\Http\Middleware\RedirectIfAuthenticated::handle */ - public function testMiddlewareAuthenticated() + public function testMiddlewareAuthenticated(): void { $this->be($this->user()); $response = $this->get('/_test/authenticate'); diff --git a/tests/Unit/Services/Internal/Destroy/AccountDestroyServiceTest.php b/tests/Unit/Services/Internal/Destroy/AccountDestroyServiceTest.php index aaefb028fb..1777874cf8 100644 --- a/tests/Unit/Services/Internal/Destroy/AccountDestroyServiceTest.php +++ b/tests/Unit/Services/Internal/Destroy/AccountDestroyServiceTest.php @@ -37,7 +37,7 @@ class AccountDestroyServiceTest extends TestCase /** * @covers \FireflyIII\Services\Internal\Destroy\AccountDestroyService */ - public function testDestroyBasic() + public function testDestroyBasic(): void { $account = Account::create( ['user_id' => $this->user()->id, 'account_type_id' => 1, 'name' => 'Some name #' . random_int(1, 1000), @@ -53,7 +53,7 @@ class AccountDestroyServiceTest extends TestCase /** * @covers \FireflyIII\Services\Internal\Destroy\AccountDestroyService */ - public function testDestroyDontMove() + public function testDestroyDontMove(): void { // create objects: $account = Account::create( @@ -76,7 +76,7 @@ class AccountDestroyServiceTest extends TestCase /** * @covers \FireflyIII\Services\Internal\Destroy\AccountDestroyService */ - public function testDestroyMove() + public function testDestroyMove(): void { $account = Account::create( ['user_id' => $this->user()->id, 'account_type_id' => 1, 'name' => 'Some name #' . random_int(1, 1000), diff --git a/tests/Unit/Services/Internal/Update/AccountUpdateServiceTest.php b/tests/Unit/Services/Internal/Update/AccountUpdateServiceTest.php index 93f3a7d6b8..20eb24074f 100644 --- a/tests/Unit/Services/Internal/Update/AccountUpdateServiceTest.php +++ b/tests/Unit/Services/Internal/Update/AccountUpdateServiceTest.php @@ -42,7 +42,7 @@ class AccountUpdateServiceTest extends TestCase * @covers \FireflyIII\Services\Internal\Update\AccountUpdateService * @covers \FireflyIII\Services\Internal\Support\AccountServiceTrait */ - public function testDeleteExistingIB() + public function testDeleteExistingIB(): void { /** @var Account $account */ $account = Account::create( @@ -91,7 +91,7 @@ class AccountUpdateServiceTest extends TestCase * @covers \FireflyIII\Services\Internal\Update\AccountUpdateService * @covers \FireflyIII\Services\Internal\Support\AccountServiceTrait */ - public function testUpdateBasic() + public function testUpdateBasic(): void { /** @var Account $account */ $account = $this->user()->accounts()->first(); @@ -114,7 +114,7 @@ class AccountUpdateServiceTest extends TestCase * @covers \FireflyIII\Services\Internal\Update\AccountUpdateService * @covers \FireflyIII\Services\Internal\Support\AccountServiceTrait */ - public function testUpdateBasicEmptyNote() + public function testUpdateBasicEmptyNote(): void { /** @var Account $account */ $account = $this->user()->accounts()->first(); @@ -139,7 +139,7 @@ class AccountUpdateServiceTest extends TestCase * @covers \FireflyIII\Services\Internal\Update\AccountUpdateService * @covers \FireflyIII\Services\Internal\Support\AccountServiceTrait */ - public function testUpdateBasicExistingNote() + public function testUpdateBasicExistingNote(): void { /** @var Account $account */ $account = $this->user()->accounts()->first(); @@ -170,7 +170,7 @@ class AccountUpdateServiceTest extends TestCase * @covers \FireflyIII\Services\Internal\Update\AccountUpdateService * @covers \FireflyIII\Services\Internal\Support\AccountServiceTrait */ - public function testUpdateExistingIB() + public function testUpdateExistingIB(): void { /** @var Account $account */ $account = Account::create( @@ -222,7 +222,7 @@ class AccountUpdateServiceTest extends TestCase * @covers \FireflyIII\Services\Internal\Update\AccountUpdateService * @covers \FireflyIII\Services\Internal\Support\AccountServiceTrait */ - public function testUpdateExistingIBZero() + public function testUpdateExistingIBZero(): void { $deleteService = $this->mock(JournalDestroyService::class); $deleteService->shouldReceive('destroy')->once(); @@ -277,7 +277,7 @@ class AccountUpdateServiceTest extends TestCase * @covers \FireflyIII\Services\Internal\Update\AccountUpdateService * @covers \FireflyIII\Services\Internal\Support\AccountServiceTrait */ - public function testUpdateNewIB() + public function testUpdateNewIB(): void { /** @var Account $account */ $account = Account::create( diff --git a/tests/Unit/Services/Internal/Update/JournalUpdateServiceTest.php b/tests/Unit/Services/Internal/Update/JournalUpdateServiceTest.php index 80bdd4b213..170d960fdd 100644 --- a/tests/Unit/Services/Internal/Update/JournalUpdateServiceTest.php +++ b/tests/Unit/Services/Internal/Update/JournalUpdateServiceTest.php @@ -44,7 +44,7 @@ class JournalUpdateServiceTest extends TestCase * @covers \FireflyIII\Services\Internal\Update\JournalUpdateService * @covers \FireflyIII\Services\Internal\Support\JournalServiceTrait */ - public function testUpdateBasic() + public function testUpdateBasic(): void { // mock other stuff: $transactionFactory = $this->mock(TransactionFactory::class); @@ -86,7 +86,7 @@ class JournalUpdateServiceTest extends TestCase * @covers \FireflyIII\Services\Internal\Update\JournalUpdateService * @covers \FireflyIII\Services\Internal\Support\JournalServiceTrait */ - public function testUpdateBasicEmptyNote() + public function testUpdateBasicEmptyNote(): void { // mock other stuff: $transactionFactory = $this->mock(TransactionFactory::class); @@ -128,7 +128,7 @@ class JournalUpdateServiceTest extends TestCase /** * @covers \FireflyIII\Services\Internal\Update\JournalUpdateService */ - public function testUpdateBudget() + public function testUpdateBudget(): void { $budget = $this->user()->budgets()->first(); $service = $this->mock(TransactionUpdateService::class); @@ -151,7 +151,7 @@ class JournalUpdateServiceTest extends TestCase /** * @covers \FireflyIII\Services\Internal\Update\JournalUpdateService */ - public function testUpdateCategory() + public function testUpdateCategory(): void { $service = $this->mock(TransactionUpdateService::class); $service->shouldReceive('setUser'); @@ -175,7 +175,7 @@ class JournalUpdateServiceTest extends TestCase * @covers \FireflyIII\Services\Internal\Update\JournalUpdateService * @covers \FireflyIII\Services\Internal\Support\JournalServiceTrait */ - public function testUpdateLotsOfTransactions() + public function testUpdateLotsOfTransactions(): void { // mock other stuff: $transactionFactory = $this->mock(TransactionFactory::class); diff --git a/tests/Unit/Services/Internal/Update/TransactionUpdateServiceTest.php b/tests/Unit/Services/Internal/Update/TransactionUpdateServiceTest.php index 9396579f2c..1c9b88a109 100644 --- a/tests/Unit/Services/Internal/Update/TransactionUpdateServiceTest.php +++ b/tests/Unit/Services/Internal/Update/TransactionUpdateServiceTest.php @@ -39,7 +39,7 @@ class TransactionUpdateServiceTest extends TestCase /** * @covers \FireflyIII\Services\Internal\Update\TransactionUpdateService */ - public function testReconcile() + public function testReconcile(): void { $transaction = $this->user()->transactions()->inRandomOrder()->first(); @@ -55,7 +55,7 @@ class TransactionUpdateServiceTest extends TestCase * @covers \FireflyIII\Services\Internal\Update\TransactionUpdateService * @covers \FireflyIII\Services\Internal\Support\TransactionServiceTrait */ - public function testReconcileNull() + public function testReconcileNull(): void { /** @var TransactionUpdateService $service */ $service = app(TransactionUpdateService::class); @@ -68,7 +68,7 @@ class TransactionUpdateServiceTest extends TestCase * @covers \FireflyIII\Services\Internal\Update\TransactionUpdateService * @covers \FireflyIII\Services\Internal\Support\TransactionServiceTrait */ - public function testUpdateBudget() + public function testUpdateBudget(): void { /** @var Transaction $source */ @@ -92,7 +92,7 @@ class TransactionUpdateServiceTest extends TestCase * @covers \FireflyIII\Services\Internal\Update\TransactionUpdateService * @covers \FireflyIII\Services\Internal\Support\TransactionServiceTrait */ - public function testUpdateCategory() + public function testUpdateCategory(): void { /** @var Transaction $source */ @@ -116,7 +116,7 @@ class TransactionUpdateServiceTest extends TestCase * @covers \FireflyIII\Services\Internal\Update\TransactionUpdateService * @covers \FireflyIII\Services\Internal\Support\TransactionServiceTrait */ - public function testUpdateDestinationBasic() + public function testUpdateDestinationBasic(): void { /** @var Transaction $source */ $source = $this->user()->transactions()->where('amount', '>', 0)->inRandomOrder()->first(); @@ -155,7 +155,7 @@ class TransactionUpdateServiceTest extends TestCase * @covers \FireflyIII\Services\Internal\Update\TransactionUpdateService * @covers \FireflyIII\Services\Internal\Support\TransactionServiceTrait */ - public function testUpdateDestinationForeign() + public function testUpdateDestinationForeign(): void { /** @var Transaction $source */ $source = $this->user()->transactions()->where('amount', '>', 0)->inRandomOrder()->first(); @@ -198,7 +198,7 @@ class TransactionUpdateServiceTest extends TestCase * @covers \FireflyIII\Services\Internal\Update\TransactionUpdateService * @covers \FireflyIII\Services\Internal\Support\TransactionServiceTrait */ - public function testUpdateSourceBasic() + public function testUpdateSourceBasic(): void { /** @var Transaction $source */ $source = $this->user()->transactions()->where('amount', '<', 0)->inRandomOrder()->first(); diff --git a/tests/Unit/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandlerTest.php new file mode 100644 index 0000000000..a3e4548d48 --- /dev/null +++ b/tests/Unit/Support/Import/JobConfiguration/Bunq/ChooseAccountsHandlerTest.php @@ -0,0 +1,439 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Support\Import\JobConfiguration\Bunq; + + +use Amount; +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\Account; +use FireflyIII\Models\AccountType; +use FireflyIII\Models\ImportJob; +use FireflyIII\Models\TransactionCurrency; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Support\Import\JobConfiguration\Bunq\ChooseAccountsHandler; +use Illuminate\Support\Collection; +use Mockery; +use Tests\TestCase; + +/** + * Class ChooseAccountsHandlerTest + */ +class ChooseAccountsHandlerTest extends TestCase +{ + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\Bunq\ChooseAccountsHandler + */ + public function testCCFalse(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'caha' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'bunq'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // mock stuff + $repository = $this->mock(ImportJobRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + // mock calls + $repository->shouldReceive('setUser')->once(); + $accountRepos->shouldReceive('setUser')->once(); + $currencyRepos->shouldReceive('setUser')->once(); + + $repository->shouldReceive('getConfiguration')->andReturn([])->once(); + + $handler = new ChooseAccountsHandler; + $handler->setImportJob($job); + $this->assertFalse($handler->configurationComplete()); + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\Bunq\ChooseAccountsHandler + */ + public function testCCTrue(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'cahb' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'bunq'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // mock stuff + $repository = $this->mock(ImportJobRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + + // mock calls + $repository->shouldReceive('setUser')->once(); + $accountRepos->shouldReceive('setUser')->once(); + $currencyRepos->shouldReceive('setUser')->once(); + + $repository->shouldReceive('getConfiguration')->andReturn(['mapping' => [0 => 1, 1 => 2]])->once(); + $repository->shouldReceive('setStage')->withArgs([Mockery::any(), 'go-for-import'])->once(); + + $handler = new ChooseAccountsHandler; + $handler->setImportJob($job); + $this->assertTrue($handler->configurationComplete()); + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\Bunq\ChooseAccountsHandler + */ + public function testConfigureJob(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'cahc' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'bunq'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // data: + $data = [ + 'account_mapping' => [ + '1234' => '456', + ], + ]; + + $config = [ + 'accounts' => [ + 0 => ['id' => 1234, 'name' => 'bunq'], + ], + ]; + $expected = $config; + $expected['mapping'][1234] = 456; + + // mock stuff + $repository = $this->mock(ImportJobRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + + // mock calls + $repository->shouldReceive('setUser')->once(); + $accountRepos->shouldReceive('setUser')->once(); + $currencyRepos->shouldReceive('setUser')->once(); + $repository->shouldReceive('getConfiguration')->andReturn($config)->times(2); + $repository->shouldReceive('setConfiguration')->withArgs([Mockery::any(), $expected])->once(); + $accountRepos->shouldReceive('findNull')->withArgs([456])->andReturn(new Account)->once(); + + $handler = new ChooseAccountsHandler; + $handler->setImportJob($job); + try { + $this->assertCount(0, $handler->configureJob($data)); + } catch (FireflyException $e) { + $this->assertFalse(true, $e->getMessage()); + } + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\Bunq\ChooseAccountsHandler + */ + public function testConfigureJobInvalidBunq(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'cahd' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'bunq'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // data: + $data = [ + 'account_mapping' => [ + '1234' => '456', + ], + ]; + + $config = [ + 'accounts' => [ + 0 => ['id' => 1235, 'name' => 'bunq'], + ], + ]; + $expected = $config; + $expected['mapping'][0] = 456; + + // mock stuff + $repository = $this->mock(ImportJobRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + + // mock calls + $repository->shouldReceive('setUser')->once(); + $accountRepos->shouldReceive('setUser')->once(); + $currencyRepos->shouldReceive('setUser')->once(); + $repository->shouldReceive('getConfiguration')->andReturn($config)->times(2); + $repository->shouldReceive('setConfiguration')->withArgs([Mockery::any(), $expected])->once(); + $accountRepos->shouldReceive('findNull')->withArgs([456])->andReturn(new Account)->once(); + + $handler = new ChooseAccountsHandler; + $handler->setImportJob($job); + try { + $this->assertCount(0, $handler->configureJob($data)); + } catch (FireflyException $e) { + $this->assertFalse(true, $e->getMessage()); + } + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\Bunq\ChooseAccountsHandler + */ + public function testConfigureJobInvalidLocal(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'cahe' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'bunq'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // data: + $data = [ + 'account_mapping' => [ + '1234' => '456', + ], + ]; + + $config = [ + 'accounts' => [ + 0 => ['id' => 1234, 'name' => 'bunq'], + ], + ]; + $expected = $config; + $expected['mapping'][1234] = 0; + + // mock stuff + $repository = $this->mock(ImportJobRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + + // mock calls + $repository->shouldReceive('setUser')->once(); + $accountRepos->shouldReceive('setUser')->once(); + $currencyRepos->shouldReceive('setUser')->once(); + $repository->shouldReceive('getConfiguration')->andReturn($config)->times(2); + $repository->shouldReceive('setConfiguration')->withArgs([Mockery::any(), $expected])->once(); + $accountRepos->shouldReceive('findNull')->withArgs([456])->andReturnNull()->once(); + + $handler = new ChooseAccountsHandler; + $handler->setImportJob($job); + try { + $this->assertCount(0, $handler->configureJob($data)); + } catch (FireflyException $e) { + $this->assertFalse(true, $e->getMessage()); + } + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\Bunq\ChooseAccountsHandler + */ + public function testConfigureJobNoMapping(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'cahf' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'bunq'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // data: + $data = ['account_mapping' => []]; + $config = [ + 'accounts' => [ + 0 => ['id' => 1234, 'name' => 'bunq'], + ], + ]; + + // mock stuff + $repository = $this->mock(ImportJobRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + + // mock calls + $repository->shouldReceive('setUser')->once(); + $accountRepos->shouldReceive('setUser')->once(); + $currencyRepos->shouldReceive('setUser')->once(); + $repository->shouldReceive('getConfiguration')->andReturn($config)->times(1); + + $handler = new ChooseAccountsHandler; + $handler->setImportJob($job); + try { + $messages = $handler->configureJob($data); + $this->assertCount(1, $messages); + $this->assertEquals('It seems you have not selected any accounts.', $messages->first()); + } catch (FireflyException $e) { + $this->assertFalse(true, $e->getMessage()); + } + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\Bunq\ChooseAccountsHandler + */ + public function testGetNextData(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'cahg' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'bunq'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // data: + $config = [ + 'accounts' => [ + 0 => ['id' => 1234, 'name' => 'bunq'], + ], + ]; + + $collection = new Collection; + $account = $this->user()->accounts()->first(); + $euro = TransactionCurrency::first(); + $collection->push($account); + + + // mock stuff + $repository = $this->mock(ImportJobRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + + // mock calls + $repository->shouldReceive('setUser')->once(); + $accountRepos->shouldReceive('setUser')->once(); + $currencyRepos->shouldReceive('setUser')->once(); + $repository->shouldReceive('getConfiguration')->andReturn($config)->times(1); + $accountRepos->shouldReceive('getAccountsByType')->withArgs([[AccountType::ASSET]])->andReturn($collection)->once(); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1'); + $currencyRepos->shouldReceive('findNull')->withArgs([1])->andReturn($euro)->once(); + + $expected = [ + 'accounts' => $config['accounts'], + 'local_accounts' => [ + $account->id => [ + 'name' => $account->name, + 'iban' => $account->iban, + 'code' => $euro->code, + ], + ], + ]; + + $handler = new ChooseAccountsHandler; + $handler->setImportJob($job); + try { + $data = $handler->getNextData(); + $this->assertEquals($expected, $data); + } catch (FireflyException $e) { + $this->assertFalse(true, $e->getMessage()); + } + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\Bunq\ChooseAccountsHandler + */ + public function testGetNextDataNull(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'cahg' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'bunq'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // data: + $config = [ + 'accounts' => [ + 0 => ['id' => 1234, 'name' => 'bunq'], + ], + ]; + + $collection = new Collection; + $account = $this->user()->accounts()->first(); + $euro = TransactionCurrency::first(); + $collection->push($account); + + + // mock stuff + $repository = $this->mock(ImportJobRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + + // mock calls + $repository->shouldReceive('setUser')->once(); + $accountRepos->shouldReceive('setUser')->once(); + $currencyRepos->shouldReceive('setUser')->once(); + $repository->shouldReceive('getConfiguration')->andReturn($config)->times(1); + $accountRepos->shouldReceive('getAccountsByType')->withArgs([[AccountType::ASSET]])->andReturn($collection)->once(); + $accountRepos->shouldReceive('getMetaValue')->withArgs([Mockery::any(), 'currency_id'])->andReturn('1'); + $currencyRepos->shouldReceive('findNull')->withArgs([1])->andReturn(null)->once(); + Amount::shouldReceive('getDefaultCurrencyByUser')->once()->andReturn($euro); + + $expected = [ + 'accounts' => $config['accounts'], + 'local_accounts' => [ + $account->id => [ + 'name' => $account->name, + 'iban' => $account->iban, + 'code' => $euro->code, + ], + ], + ]; + + $handler = new ChooseAccountsHandler; + $handler->setImportJob($job); + try { + $data = $handler->getNextData(); + $this->assertEquals($expected, $data); + } catch (FireflyException $e) { + $this->assertFalse(true, $e->getMessage()); + } + } + + +} \ No newline at end of file diff --git a/tests/Unit/Support/Import/JobConfiguration/Bunq/NewBunqJobHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/Bunq/NewBunqJobHandlerTest.php new file mode 100644 index 0000000000..45f7fe62a9 --- /dev/null +++ b/tests/Unit/Support/Import/JobConfiguration/Bunq/NewBunqJobHandlerTest.php @@ -0,0 +1,67 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Support\Import\JobConfiguration\Bunq; + + +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Support\Import\JobConfiguration\Bunq\NewBunqJobHandler; +use Mockery; +use Tests\TestCase; + +class NewBunqJobHandlerTest extends TestCase +{ + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\Bunq\NewBunqJobHandler + */ + public function testCC(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'cXha' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'bunq'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // expected config: + $expected = [ + 'apply-rules' => true, + ]; + + // mock stuff + $repository = $this->mock(ImportJobRepositoryInterface::class); + // mock calls + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('getConfiguration')->andReturn([])->once(); + $repository->shouldReceive('setConfiguration')->withArgs([Mockery::any(), $expected])->once(); + + $handler = new NewBunqJobHandler(); + $handler->setImportJob($job); + $this->assertTrue($handler->configurationComplete()); + } + +} \ No newline at end of file diff --git a/tests/Unit/Support/Import/JobConfiguration/File/ConfigureMappingHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/File/ConfigureMappingHandlerTest.php new file mode 100644 index 0000000000..eabd82eafa --- /dev/null +++ b/tests/Unit/Support/Import/JobConfiguration/File/ConfigureMappingHandlerTest.php @@ -0,0 +1,488 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Support\Import\JobConfiguration\File; + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; +use FireflyIII\Import\Mapper\Budgets; +use FireflyIII\Import\MapperPreProcess\TagsSpace; +use FireflyIII\Import\Specifics\IngDescription; +use FireflyIII\Models\Attachment; +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Support\Import\JobConfiguration\File\ConfigureMappingHandler; +use Illuminate\Support\Collection; +use League\Csv\Exception; +use League\Csv\Reader; +use Mockery; +use Tests\TestCase; + +/** + * Class ConfigureMappingHandlerTest + * + */ +class ConfigureMappingHandlerTest extends TestCase +{ + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureMappingHandler + */ + public function testApplySpecifics(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'mapG' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + $expected = ['a' => 'ING']; + + // mock ING description (see below) + $ingDescr = $this->mock(IngDescription::class); + $ingDescr->shouldReceive('run')->once()->andReturn($expected); + + $config = [ + 'specifics' => [ + 'IngDescription' => 1, + 'bad-specific' => 1, + ], + ]; + + $handler = new ConfigureMappingHandler; + $handler->setImportJob($job); + $result = $handler->applySpecifics($config, []); + $this->assertEquals($expected, $result); + + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureMappingHandler + */ + public function testConfigureJob(): void + { + // create fake input for class method: + $input = [ + 'mapping' => [ + + 0 => [// column + 'fake-iban' => 1, + 'other-fake-value' => '2', // string + ], + 1 => [ + 3 => 2, // fake number + 'final-fake-value' => 3, + 'mapped-to-zero' => 0, + ], + + ], + ]; + $expectedResult = [ + 'column-mapping-config' => + [ + 0 => [ + 'fake-iban' => 1, + 'other-fake-value' => 2, + ], + 1 => [ + '3' => 2, + 'final-fake-value' => 3, + ], + ], + + ]; + + + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'mapA' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + + // mock repos + $repository = $this->mock(ImportJobRepositoryInterface::class); + + // run configure mapping handler. + // expect specific results: + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setStage')->once()->withArgs([Mockery::any(), 'ready_to_run']); + $repository->shouldReceive('setConfiguration')->once()->withArgs([Mockery::any(), $expectedResult]); + + + $handler = new ConfigureMappingHandler; + $handler->setImportJob($job); + $handler->configureJob($input); + + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureMappingHandler + */ + public function testDoColumnConfig(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'mapE' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + $fakeBudgets = [ + 0 => 'dont map', + 1 => 'Fake budget A', + 4 => 'Other fake budget', + ]; + + // fake budget mapper (see below) + $budgetMapper = $this->mock(Budgets::class); + $budgetMapper->shouldReceive('getMap')->once()->andReturn($fakeBudgets); + + // input array: + $input = [ + 'column-roles' => [ + 0 => 'description', // cannot be mapped + 1 => 'sepa-ct-id', // cannot be mapped + 2 => 'tags-space', // cannot be mapped, has a pre-processor. + 3 => 'account-id', // can be mapped + 4 => 'budget-id' // can be mapped. + ], + 'column-do-mapping' => [ + 0 => false, // don't try to map description + 1 => true, // try to map sepa (cannot) + 2 => true, // try to map tags (cannot) + 3 => false, // dont map mappable + 4 => true, // want to map, AND can map. + ], + ]; + + $expected = [ + 4 => [ + 'name' => 'budget-id', + 'options' => $fakeBudgets, + 'preProcessMap' => '', + 'values' => [], + ], + ]; + + $handler = new ConfigureMappingHandler; + $handler->setImportJob($job); + try { + $result = $handler->doColumnConfig($input); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + + $this->assertEquals($expected, $result); + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureMappingHandler + */ + public function testDoMapOfColumn(): void + { + + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'mapC' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + $combinations = [ + ['role' => 'description', 'expected' => false, 'requested' => false], // description cannot be mapped. Will always return false. + ['role' => 'description', 'expected' => false, 'requested' => true], // description cannot be mapped. Will always return false. + ['role' => 'currency-id', 'expected' => false, 'requested' => false], // if not requested, return false. + ['role' => 'currency-id', 'expected' => true, 'requested' => true], // if requested, return true. + ]; + + $handler = new ConfigureMappingHandler; + $handler->setImportJob($job); + foreach ($combinations as $info) { + $this->assertEquals($info['expected'], $handler->doMapOfColumn($info['role'], $info['requested'])); + } + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureMappingHandler + */ + public function testGetNextData(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'mapH' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = [ + 'column-roles' => [ + 0 => 'description', // cannot be mapped + 1 => 'sepa-ct-id', // cannot be mapped + 2 => 'tags-space', // cannot be mapped, has a pre-processor. + 3 => 'account-id', // can be mapped + 4 => 'budget-id' // can be mapped. + ], + 'column-do-mapping' => [ + 0 => false, // don't try to map description + 1 => true, // try to map sepa (cannot) + 2 => true, // try to map tags (cannot) + 3 => false, // dont map mappable + 4 => true, // want to map, AND can map. + ], + 'delimiter' => ',', + ]; + $job->save(); + + // make one attachment. + $att = new Attachment; + $att->filename = 'import_file'; + $att->user_id = $this->user()->id; + $att->attachable_id = $job->id; + $att->attachable_type = ImportJob::class; + $att->md5 = md5('hello'); + $att->mime = 'fake'; + $att->size = 3; + $att->save(); + + // fake some data. + $fileContent = "column1,column2,column3,column4,column5\nvalue1,value2,value3,value4,value5"; + $fakeBudgets = [ + 0 => 'dont map', + 1 => 'Fake budget A', + 4 => 'Other fake budget', + ]; + // mock some helpers: + $attachments = $this->mock(AttachmentHelperInterface::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + $repository->shouldReceive('getConfiguration')->once()->withArgs([Mockery::any()])->andReturn($job->configuration); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('getAttachments')->once()->withArgs([Mockery::any()])->andReturn(new Collection([$att])); + $attachments->shouldReceive('getAttachmentContent')->withArgs([Mockery::any()])->andReturn($fileContent); + $budgetMapper = $this->mock(Budgets::class); + $budgetMapper->shouldReceive('getMap')->once()->andReturn($fakeBudgets); + + + $handler = new ConfigureMappingHandler; + $handler->setImportJob($job); + try { + $result = $handler->getNextData(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $expected = [ + 4 => [ // is the one with the budget id, remember? + 'name' => 'budget-id', + 'options' => $fakeBudgets, + 'preProcessMap' => '', + 'values' => ['column5', 'value5'], // see $fileContent + ], + ]; + + $this->assertEquals($expected, $result); + + + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureMappingHandler + */ + public function testGetPreProcessorName(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'mapD' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + $combinations = [ + ['role' => 'tags-space', 'expected' => TagsSpace::class], // tags- space has a pre-processor. Return it. + ['role' => 'description', 'expected' => ''], // description has not. + ['role' => 'no-such-role', 'expected' => ''], // not existing role has not. + ]; + + $handler = new ConfigureMappingHandler; + $handler->setImportJob($job); + foreach ($combinations as $info) { + $this->assertEquals($info['expected'], $handler->getPreProcessorName($info['role'])); + } + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureMappingHandler + */ + public function testGetReader(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'mapF' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // make one attachment. + $att = new Attachment; + $att->filename = 'import_file'; + $att->user_id = $this->user()->id; + $att->attachable_id = $job->id; + $att->attachable_type = ImportJob::class; + $att->md5 = md5('hello'); + $att->mime = 'fake'; + $att->size = 3; + $att->save(); + $config = [ + 'delimiter' => ',', + ]; + + $fileContent = "column1,column2,column3\nvalue1,value2,value3"; + + // mock some helpers: + $attachments = $this->mock(AttachmentHelperInterface::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + $repository->shouldReceive('getConfiguration')->once()->withArgs([Mockery::any()])->andReturn($config); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('getAttachments')->once()->withArgs([Mockery::any()])->andReturn(new Collection([$att])); + $attachments->shouldReceive('getAttachmentContent')->withArgs([Mockery::any()])->andReturn($fileContent); + + $handler = new ConfigureMappingHandler; + $handler->setImportJob($job); + try { + $reader = $handler->getReader(); + } catch (Exception $e) { + $this->assertTrue(false, $e->getMessage()); + } + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureMappingHandler + */ + public function testGetValuesForMapping(): void + { + // create a reader to use in method. + // 5 columns, of which #4 (index 3) is budget-id + // 5 columns, of which #5 (index 4) is tags-space + $file = "value1,value2,value3,1,some tags here\nvalue4,value5,value6,2,more tags there\nvalueX,valueY,valueZ\nA,B,C,,\nd,e,f,1,xxx"; + $reader = Reader::createFromString($file); + + // make config for use in method. + $config = [ + 'has-headers' => false, + ]; + + // make column config + $columnConfig = [ + 3 => [ + 'name' => 'budget-id', + 'options' => [ + 0 => 'dont map', + 1 => 'Fake budget A', + 4 => 'Other fake budget', + ], + 'preProcessMap' => '', + 'values' => [], + ], + ]; + + // expected result + $expected = [ + 3 => [ + 'name' => 'budget-id', + 'options' => [ + 0 => 'dont map', + 1 => 'Fake budget A', + 4 => 'Other fake budget', + ], + 'preProcessMap' => '', + 'values' => ['1', '2'] // all values from column 3 of "CSV" file, minus double values + ], + ]; + + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'mapB' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + $handler = new ConfigureMappingHandler; + $handler->setImportJob($job); + $result = []; + try { + $result = $handler->getValuesForMapping($reader, $config, $columnConfig); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals($expected, $result); + + + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureMappingHandler + */ + public function testSanitizeColumnName(): void + { + + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'mapB' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + $handler = new ConfigureMappingHandler; + $handler->setImportJob($job); + $keys = array_keys(config('csv.import_roles')); + foreach ($keys as $key) { + $this->assertEquals($key, $handler->sanitizeColumnName($key)); + } + $this->assertEquals('_ignore', $handler->sanitizeColumnName('some-bad-name')); + } + +} diff --git a/tests/Unit/Support/Import/JobConfiguration/File/ConfigureRolesHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/File/ConfigureRolesHandlerTest.php new file mode 100644 index 0000000000..daf05e3553 --- /dev/null +++ b/tests/Unit/Support/Import/JobConfiguration/File/ConfigureRolesHandlerTest.php @@ -0,0 +1,525 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Support\Import\JobConfiguration\File; + + +use Exception; +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; +use FireflyIII\Import\Specifics\IngDescription; +use FireflyIII\Models\Attachment; +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Support\Import\JobConfiguration\File\ConfigureRolesHandler; +use Illuminate\Support\Collection; +use League\Csv\Reader; +use Mockery; +use Tests\TestCase; + +/** + * Class ConfigureRolesHandlerTest + */ +class ConfigureRolesHandlerTest extends TestCase +{ + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureRolesHandler + */ + public function testConfigurationCompleteBasic(): void + { + $config = [ + 'column-count' => 5, + 'column-roles' => [ + 0 => 'amount', + 1 => 'description', + 2 => 'note', + 3 => 'foreign-currency-code', + 4 => 'amount_foreign', + ], + ]; + $handler = new ConfigureRolesHandler(); + $result = $handler->configurationComplete($config); + $this->assertCount(0, $result); + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureRolesHandler + */ + public function testConfigurationCompleteForeign(): void + { + $config = [ + 'column-count' => 5, + 'column-roles' => [ + 0 => 'amount', + 1 => 'description', + 2 => 'note', + 3 => 'amount_foreign', + 4 => 'sepa-cc', + ], + ]; + $handler = new ConfigureRolesHandler(); + $result = $handler->configurationComplete($config); + $this->assertCount(1, $result); + $this->assertEquals( + 'If you mark a column as containing an amount in a foreign currency, you must also set the column that contains which currency it is.', + $result->get('error')[0] + ); + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureRolesHandler + */ + public function testConfigurationCompleteNoAmount(): void + { + $config = [ + 'column-count' => 5, + 'column-roles' => [ + 0 => 'sepa-cc', + 1 => 'description', + 2 => 'note', + 3 => 'foreign-currency-code', + 4 => 'amount_foreign', + ], + ]; + $handler = new ConfigureRolesHandler(); + $result = $handler->configurationComplete($config); + $this->assertCount(1, $result); + $this->assertEquals( + 'At the very least, mark one column as the amount-column. It is advisable to also select a column for the description, date and the opposing account.', + $result->get('error')[0] + ); + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureRolesHandler + */ + public function testConfigureJob(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'role-B' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = [ + 'column-count' => 5, + ]; + $job->save(); + + $data = [ + 'role' => [ + 0 => 'description', + 1 => 'budget-id', + 2 => 'sepa-cc', + 4 => 'amount', // no column 3. + ], + 'map' => [ + 0 => '1', // map column 0 (which cannot be mapped anyway) + 1 => '1', // map column 1 (which CAN be mapped) + ], + ]; + + $expected = [ + 'column-count' => 5, + 'column-roles' => [ + 0 => 'description', + 1 => 'budget-id', + 2 => 'sepa-cc', + 3 => '_ignore', // added column 3 + 4 => 'amount', + ], + 'column-do-mapping' => [false, true, false, false, false], + ]; + + $repository = $this->mock(ImportJobRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setStage')->once()->withArgs([Mockery::any(), 'ready_to_run']); + $repository->shouldReceive('setStage')->once()->withArgs([Mockery::any(), 'map']); + $repository->shouldReceive('setConfiguration')->once()->withArgs([Mockery::any(), $expected]); + + $handler = new ConfigureRolesHandler(); + $handler->setImportJob($job); + $handler->configureJob($data); + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureRolesHandler + */ + public function testGetExampleFromLine(): void + { + + $lines = [ + ['one', 'two', '', 'three'], + ['four', 'five', '', 'six'], + ]; + + $handler = new ConfigureRolesHandler; + foreach ($lines as $line) { + $handler->getExampleFromLine($line); + } + $expected = [ + 0 => ['one', 'four'], + 1 => ['two', 'five'], + 3 => ['three', 'six'], + ]; + $this->assertEquals($expected, $handler->getExamples()); + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureRolesHandler + */ + public function testGetExamplesFromFile(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'role-x' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = [ + 'specifics' => [], + 'has-headers' => false, + ]; + $job->save(); + + $file = "one,two,,three\nfour,five,,six\none,three,X,three"; + $reader = Reader::createFromString($file); + $handler = new ConfigureRolesHandler; + $handler->setImportJob($job); + try { + $handler->getExamplesFromFile($reader, $job->configuration); + } catch (Exception $e) { + $this->assertTrue(false, $e->getMessage()); + } + + $expected = [ + 0 => ['one', 'four'], + 1 => ['two', 'five', 'three'], + 2 => ['X'], + 3 => ['three', 'six'], + ]; + $this->assertEquals($expected, $handler->getExamples()); + + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureRolesHandler + */ + public function testGetHeadersHas(): void + { + // create a reader to use in method. + // 5 columns, of which #4 (index 3) is budget-id + // 5 columns, of which #5 (index 4) is tags-space + $file = "header1,header2,header3,header4,header5\nvalue4,value5,value6,2,more tags there\nvalueX,valueY,valueZ\nA,B,C,,\nd,e,f,1,xxx"; + $reader = Reader::createFromString($file); + $config = ['has-headers' => true]; + + $handler = new ConfigureRolesHandler; + try { + $headers = $handler->getHeaders($reader, $config); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals(['header1', 'header2', 'header3', 'header4', 'header5'], $headers); + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureRolesHandler + */ + public function testGetHeadersNone(): void + { + // create a reader to use in method. + // 5 columns, of which #4 (index 3) is budget-id + // 5 columns, of which #5 (index 4) is tags-space + $file = "header1,header2,header3,header4,header5\nvalue4,value5,value6,2,more tags there\nvalueX,valueY,valueZ\nA,B,C,,\nd,e,f,1,xxx"; + $reader = Reader::createFromString($file); + $config = ['has-headers' => false]; + + $handler = new ConfigureRolesHandler; + try { + $headers = $handler->getHeaders($reader, $config); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals([], $headers); + } + + public function testGetNextData(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'role-x' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = [ + 'delimiter' => ',', + 'has-headers' => true, + ]; + $job->save(); + + // make one attachment. + $att = new Attachment; + $att->filename = 'import_file'; + $att->user_id = $this->user()->id; + $att->attachable_id = $job->id; + $att->attachable_type = ImportJob::class; + $att->md5 = md5('hello'); + $att->mime = 'fake'; + $att->size = 3; + $att->save(); + + $fileContent = "column1,column2,column3\nvalue1,value2,value3"; + // mock some helpers: + $attachments = $this->mock(AttachmentHelperInterface::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + $repository->shouldReceive('getConfiguration')->once()->withArgs([Mockery::any()])->andReturn($job->configuration); + $repository->shouldReceive('setConfiguration')->once()->withArgs( + [Mockery::any(), + [ + 'delimiter' => ',', + 'has-headers' => true, + 'column-count' => 3, + ], + ] + ); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('getAttachments')->once()->withArgs([Mockery::any()])->andReturn(new Collection([$att])); + $attachments->shouldReceive('getAttachmentContent')->withArgs([Mockery::any()])->andReturn($fileContent); + + $expected = [ + 'examples' => [ + 0 => ['value1'], + 1 => ['value2'], + 2 => ['value3'], + ], + 'total' => 3, + 'headers' => ['column1', 'column2', 'column3'], + ]; + + $handler = new ConfigureRolesHandler(); + $handler->setImportJob($job); + try { + $result = $handler->getNextData(); + } catch (Exception $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals($expected['examples'], $result['examples']); + $this->assertEquals($expected['total'], $result['total']); + $this->assertEquals($expected['headers'], $result['headers']); + + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureRolesHandler + */ + public function testGetReader(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'role-x' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // make one attachment. + $att = new Attachment; + $att->filename = 'import_file'; + $att->user_id = $this->user()->id; + $att->attachable_id = $job->id; + $att->attachable_type = ImportJob::class; + $att->md5 = md5('hello'); + $att->mime = 'fake'; + $att->size = 3; + $att->save(); + $config = [ + 'delimiter' => ',', + ]; + + $fileContent = "column1,column2,column3\nvalue1,value2,value3"; + + // mock some helpers: + $attachments = $this->mock(AttachmentHelperInterface::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + $repository->shouldReceive('getConfiguration')->once()->withArgs([Mockery::any()])->andReturn($config); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('getAttachments')->once()->withArgs([Mockery::any()])->andReturn(new Collection([$att])); + $attachments->shouldReceive('getAttachmentContent')->withArgs([Mockery::any()])->andReturn($fileContent); + + $handler = new ConfigureRolesHandler(); + $handler->setImportJob($job); + try { + $reader = $handler->getReader(); + } catch (Exception $e) { + $this->assertTrue(false, $e->getMessage()); + } + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureRolesHandler + */ + public function testIgnoreUnmappableColumns(): void + { + $config = [ + 'column-count' => 5, + 'column-roles' => [ + 'description', // cannot be mapped. + 'budget-id', + 'sepa-cc', // cannot be mapped. + 'category-id', + 'tags-comma', // cannot be mapped. + ], + 'column-do-mapping' => [ + 0 => true, + 1 => true, + 2 => true, + 3 => true, + 4 => true, + ], + ]; + $expected = [ + 'column-count' => 5, + 'column-roles' => [ + 'description', // cannot be mapped. + 'budget-id', + 'sepa-cc', // cannot be mapped. + 'category-id', + 'tags-comma', // cannot be mapped. + ], + 'column-do-mapping' => [ + 0 => false, + 1 => true, + 2 => false, + 3 => true, + 4 => false, + ], + ]; + $handler = new ConfigureRolesHandler; + $this->assertEquals($expected, $handler->ignoreUnmappableColumns($config)); + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureRolesHandler + */ + public function testIsMappingNecessaryNo(): void + { + $config = [ + 'column-do-mapping' => [false, false, false], + ]; + $handler = new ConfigureRolesHandler(); + $result = $handler->isMappingNecessary($config); + $this->assertFalse($result); + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureRolesHandler + */ + public function testIsMappingNecessaryYes(): void + { + $config = [ + 'column-do-mapping' => [false, true, false, false], + ]; + $handler = new ConfigureRolesHandler(); + $result = $handler->isMappingNecessary($config); + $this->assertTrue($result); + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureRolesHandler + */ + public function testMakeExamplesUnique(): void + { + $lines = [ + ['one', 'two', '', 'three'], + ['four', 'five', '', 'six'], + ['one', 'three', 'X', 'three'], + ]; + + $handler = new ConfigureRolesHandler; + foreach ($lines as $line) { + $handler->getExampleFromLine($line); + } + $handler->makeExamplesUnique(); + + $expected = [ + 0 => ['one', 'four'], + 1 => ['two', 'five', 'three'], + 2 => ['X'], + 3 => ['three', 'six'], + ]; + $this->assertEquals($expected, $handler->getExamples()); + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureRolesHandler + */ + public function testProcessSpecifics(): void + { + $line = []; + $config = [ + 'specifics' => [ + 'IngDescription' => true, + 'some-bad-specific' => true, + ], + ]; + + $ingDescription = $this->mock(IngDescription::class); + $ingDescription->shouldReceive('run')->once()->withArgs([[]])->andReturn(['a' => 'b']); + + $handler = new ConfigureRolesHandler; + $this->assertEquals(['a' => 'b'], $handler->processSpecifics($config, [])); + + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureRolesHandler + */ + public function testSaveColumCount(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'role-A' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + $repository = $this->mock(ImportJobRepositoryInterface::class); + $repository->shouldReceive('setUser'); + $repository->shouldReceive('setConfiguration')->once() + ->withArgs([Mockery::any(), ['column-count' => 0]]); + + $handler = new ConfigureRolesHandler(); + $handler->setImportJob($job); + $handler->saveColumCount(); + } + +} diff --git a/tests/Unit/Support/Import/JobConfiguration/File/ConfigureUploadHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/File/ConfigureUploadHandlerTest.php new file mode 100644 index 0000000000..51727b981d --- /dev/null +++ b/tests/Unit/Support/Import/JobConfiguration/File/ConfigureUploadHandlerTest.php @@ -0,0 +1,185 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Support\Import\JobConfiguration\File; + + +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Support\Import\JobConfiguration\File\ConfigureUploadHandler; +use Mockery; +use Tests\TestCase; + +/** + * Class ConfigureUploadHandlerTest + */ +class ConfigureUploadHandlerTest extends TestCase +{ + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureUploadHandler + */ + public function testConfigureJobAccount(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'upload-B' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + + $data = [ + 'csv_import_account' => '1', + 'csv_delimiter' => ',', + 'has_headers' => '1', + 'date_format' => 'Y-m-d', + 'apply_rules' => '1', + 'specifics' => ['IngDescription'], + ]; + $expectedConfig = [ + 'has-headers' => true, + 'date-format' => 'Y-m-d', + 'delimiter' => ',', + 'apply-rules' => true, + 'specifics' => [ + 'IngDescription' => 1, + ], + 'import-account' => 1, + ]; + + $repository = $this->mock(ImportJobRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + $accountRepos->shouldReceive('setUser')->once(); + $accountRepos->shouldReceive('findNull')->once()->withArgs([1])->andReturn($this->user()->accounts()->first()); + $repository->shouldReceive('setConfiguration')->once()->withArgs([Mockery::any(), $expectedConfig]); + $repository->shouldReceive('setStage')->once()->withArgs([Mockery::any(), 'roles']); + + $handler = new ConfigureUploadHandler; + $handler->setImportJob($job); + $result = $handler->configureJob($data); + $this->assertCount(0, $result); + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureUploadHandler + */ + public function testConfigureJobNoAccount(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'upload-B' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + + $data = [ + 'csv_import_account' => '1', + 'csv_delimiter' => ',', + 'has_headers' => '1', + 'date_format' => 'Y-m-d', + 'apply_rules' => '1', + 'specifics' => ['IngDescription'], + ]; + $expectedConfig = [ + 'has-headers' => true, + 'date-format' => 'Y-m-d', + 'delimiter' => ',', + 'apply-rules' => true, + 'specifics' => [ + 'IngDescription' => 1, + ], + ]; + + $repository = $this->mock(ImportJobRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + $accountRepos->shouldReceive('setUser')->once(); + $accountRepos->shouldReceive('findNull')->once()->withArgs([1])->andReturn(null); + $repository->shouldReceive('setConfiguration')->once()->withArgs([Mockery::any(), $expectedConfig]); + + $handler = new ConfigureUploadHandler; + $handler->setImportJob($job); + $result = $handler->configureJob($data); + $this->assertCount(1, $result); + $this->assertEquals('You have selected an invalid account to import into.', $result->get('account')[0]); + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureUploadHandler + */ + public function testGetNextData(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'upload-A' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + $repository = $this->mock(ImportJobRepositoryInterface::class); + $repository->shouldReceive('setUser'); + $repository->shouldReceive('setConfiguration')->once()->withArgs([Mockery::any(), ['date-format' => 'Ymd']]); + + $handler = new ConfigureUploadHandler; + $handler->setImportJob($job); + $result = $handler->getNextData(); + $expected = [ + 'accounts' => [], + 'delimiters' => [], + ]; + // not much to compare, really. + $this->assertEquals($expected['accounts'], $result['accounts']); + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\ConfigureUploadHandler + */ + public function testGetSpecifics(): void + { + $array = [ + 'specifics' => [ + 'IngDescription', 'BadFakeNewsThing', + ], + ]; + $expected = [ + 'IngDescription' => 1, + ]; + + $handler = new ConfigureUploadHandler; + $result = $handler->getSpecifics($array); + $this->assertEquals($expected, $result); + } + +} \ No newline at end of file diff --git a/tests/Unit/Support/Import/JobConfiguration/File/NewFileJobHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/File/NewFileJobHandlerTest.php new file mode 100644 index 0000000000..e81a5c752c --- /dev/null +++ b/tests/Unit/Support/Import/JobConfiguration/File/NewFileJobHandlerTest.php @@ -0,0 +1,305 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Support\Import\JobConfiguration\File; + + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; +use FireflyIII\Models\Attachment; +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Support\Import\JobConfiguration\File\NewFileJobHandler; +use Illuminate\Support\Collection; +use Mockery; +use Tests\TestCase; + +/** + * Class NewFileJobHandlerTest + */ +class NewFileJobHandlerTest extends TestCase +{ + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\NewFileJobHandler + */ + public function testConfigureJob(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'newfile-A' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = [ + 'delimiter' => ',', + 'has-headers' => true, + ]; + $job->save(); + + // make one attachment. + $att = new Attachment; + $att->filename = 'configuration_file'; + $att->user_id = $this->user()->id; + $att->attachable_id = $job->id; + $att->attachable_type = ImportJob::class; + $att->md5 = md5('hello'); + $att->mime = 'fake'; + $att->size = 3; + $att->save(); + + // mock stuff + $attachments = $this->mock(AttachmentHelperInterface::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('getConfiguration')->andReturn([])->once(); + $repository->shouldReceive('getAttachments')->twice()->andReturn(new Collection([$att])); + $attachments->shouldReceive('getAttachmentContent')->times(3)->andReturn('{"a": "b"}'); + $repository->shouldReceive('setConfiguration')->withArgs([Mockery::any(), ['file-type' => 'csv']])->once(); + $repository->shouldReceive('setConfiguration')->withArgs([Mockery::any(), ['a' => 'b']])->twice(); + $repository->shouldReceive('setStage')->withArgs([Mockery::any(), 'configure-upload'])->once(); + + // data for configure job: + $data = [ + 'import_file_type' => 'csv', + ]; + + $handler = new NewFileJobHandler; + $handler->setImportJob($job); + try { + $messages = $handler->configureJob($data); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertCount(0, $messages); + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\NewFileJobHandler + */ + public function testConfigureJobBadData(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'newfile-A' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = [ + 'delimiter' => ',', + 'has-headers' => true, + ]; + $job->save(); + + // make one attachment. + $att = new Attachment; + $att->filename = 'configuration_file'; + $att->user_id = $this->user()->id; + $att->attachable_id = $job->id; + $att->attachable_type = ImportJob::class; + $att->md5 = md5('hello'); + $att->mime = 'fake'; + $att->size = 3; + $att->save(); + + // get file: + $content = file_get_contents(storage_path('build') . '/ebcdic.txt'); + + // mock stuff + $attachments = $this->mock(AttachmentHelperInterface::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('getAttachments')->once()->andReturn(new Collection([$att])); + $attachments->shouldReceive('getAttachmentContent')->once()->andReturn($content); + + // data for configure job: + $data = [ + 'import_file_type' => 'csv', + ]; + + $handler = new NewFileJobHandler; + $handler->setImportJob($job); + try { + $messages = $handler->configureJob($data); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertCount(1, $messages); + $this->assertEquals( + 'The file you have uploaded is not encoded as UTF-8 or ASCII. Firefly III cannot handle such files. Please use Notepad++ or Sublime to convert your file to UTF-8.', + $messages->first() + ); + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\NewFileJobHandler + */ + public function testStoreConfiguration(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'newfile-A' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = [ + 'delimiter' => ',', + 'has-headers' => true, + ]; + $job->save(); + + // make one attachment. + $att = new Attachment; + $att->filename = 'configuration_file'; + $att->user_id = $this->user()->id; + $att->attachable_id = $job->id; + $att->attachable_type = ImportJob::class; + $att->md5 = md5('hello'); + $att->mime = 'fake'; + $att->size = 3; + $att->save(); + + // mock stuff + $attachments = $this->mock(AttachmentHelperInterface::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('getAttachments')->once()->andReturn(new Collection([$att])); + $attachments->shouldReceive('getAttachmentContent')->once()->andReturn('{"a": "b"}'); + $repository->shouldReceive('setConfiguration')->withArgs([Mockery::any(), ['a' => 'b']])->once(); + + $handler = new NewFileJobHandler; + $handler->setImportJob($job); + + try { + $handler->storeConfiguration(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\NewFileJobHandler + */ + public function testValidateAttachments(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'newfile-x' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = [ + 'delimiter' => ',', + 'has-headers' => true, + ]; + $job->save(); + + // make one attachment. + $att = new Attachment; + $att->filename = 'import_file'; + $att->user_id = $this->user()->id; + $att->attachable_id = $job->id; + $att->attachable_type = ImportJob::class; + $att->md5 = md5('hello'); + $att->mime = 'fake'; + $att->size = 3; + $att->save(); + + // mock stuff + $attachments = $this->mock(AttachmentHelperInterface::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('getAttachments')->andReturn(new Collection([$att])); + $attachments->shouldReceive('getAttachmentContent')->once()->andReturn('Hello!'); + + + $handler = new NewFileJobHandler; + $handler->setImportJob($job); + + try { + $result = $handler->validateAttachments(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertCount(0, $result); + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\File\NewFileJobHandler + */ + public function testValidateNotUTF(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'newfile-x' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = [ + 'delimiter' => ',', + 'has-headers' => true, + ]; + $job->save(); + + // make one attachment. + $att = new Attachment; + $att->filename = 'import_file'; + $att->user_id = $this->user()->id; + $att->attachable_id = $job->id; + $att->attachable_type = ImportJob::class; + $att->md5 = md5('hello'); + $att->mime = 'fake'; + $att->size = 3; + $att->save(); + + // get file: + $content = file_get_contents(storage_path('build') . '/ebcdic.txt'); + + // mock stuff + $attachments = $this->mock(AttachmentHelperInterface::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('getAttachments')->andReturn(new Collection([$att])); + $attachments->shouldReceive('getAttachmentContent')->once()->andReturn($content); + + + $handler = new NewFileJobHandler; + $handler->setImportJob($job); + + try { + $result = $handler->validateAttachments(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertCount(1, $result); + $this->assertEquals( + 'The file you have uploaded is not encoded as UTF-8 or ASCII. Firefly III cannot handle such files. Please use Notepad++ or Sublime to convert your file to UTF-8.', + $result->first() + ); + } + +} \ No newline at end of file diff --git a/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandlerTest.php new file mode 100644 index 0000000000..8c4ab5f197 --- /dev/null +++ b/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseAccountsHandlerTest.php @@ -0,0 +1,652 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Support\Import\JobConfiguration\Spectre; + + +use Amount; +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\AccountType; +use FireflyIII\Models\ImportJob; +use FireflyIII\Models\TransactionCurrency; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Services\Spectre\Object\Account as SpectreAccount; +use FireflyIII\Services\Spectre\Object\Attempt; +use FireflyIII\Services\Spectre\Object\Holder; +use FireflyIII\Services\Spectre\Object\Login; +use FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseAccountsHandler; +use Illuminate\Support\Collection; +use Mockery; +use Tests\TestCase; + +/** + * Class ChooseAccountsHandlerTest + */ +class ChooseAccountsHandlerTest extends TestCase +{ + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseAccountsHandler + */ + public function testCCFalse(): void + { + // fake job: + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'sca-A' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = [ + 'account_mapping' => [], + ]; + $job->save(); + + // mock repositories: + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $importRepos = $this->mock(ImportJobRepositoryInterface::class); + + // mock calls: + $accountRepos->shouldReceive('setUser')->once(); + $currencyRepos->shouldReceive('setUser')->once(); + $importRepos->shouldReceive('setUser')->once(); + + // call handler: + $handler = new ChooseAccountsHandler(); + $handler->setImportJob($job); + $this->assertFalse($handler->configurationComplete()); + + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseAccountsHandler + */ + public function testCCTrue(): void + { + // fake job: + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'sca-B' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = [ + 'account_mapping' => [ + 4 => 6, + ], + ]; + $job->save(); + + // mock repositories: + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $importRepos = $this->mock(ImportJobRepositoryInterface::class); + + // mock calls: + $accountRepos->shouldReceive('setUser')->once(); + $currencyRepos->shouldReceive('setUser')->once(); + $importRepos->shouldReceive('setUser')->once(); + $importRepos->shouldReceive('setStage')->withArgs([Mockery::any(), 'go-for-import'])->once(); + + // call handler: + $handler = new ChooseAccountsHandler(); + $handler->setImportJob($job); + $this->assertTrue($handler->configurationComplete()); + } + + /** + * Case: Local account is valid. Spectre account is valid. + * + * @covers \FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseAccountsHandler + */ + public function testConfigureJob(): void + { + // fake job: + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'sca-c' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = [ + 'accounts' => [ + 0 => [ + 'id' => 3131, + 'name' => 'Some fake account', + ], + ], + ]; + $job->save(); + + $account = $this->user()->accounts()->inRandomOrder()->first(); + + // data to submit: + $data = [ + 'account_mapping' => [3131 => 872,], + ]; + // expected configuration: + $config = [ + 'accounts' => [0 => ['id' => 3131, 'name' => 'Some fake account',],], + 'account_mapping' => [3131 => 872,], + ]; + + + // mock repositories: + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $importRepos = $this->mock(ImportJobRepositoryInterface::class); + + // mock calls: + $accountRepos->shouldReceive('setUser')->once(); + $currencyRepos->shouldReceive('setUser')->once(); + $importRepos->shouldReceive('setUser')->once(); + $accountRepos->shouldReceive('findNull')->once()->withArgs([872])->andReturn($account); + $importRepos->shouldReceive('setConfiguration')->once()->withArgs([Mockery::any(), $config]); + + + // call handler: + $handler = new ChooseAccountsHandler(); + $handler->setImportJob($job); + $this->assertCount(0, $handler->configureJob($data)); + } + + /** + * Case: Local account is invalid. Spectre account is valid. + * + * @covers \FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseAccountsHandler + */ + public function testConfigureJobInvalidLocal(): void + { + // fake job: + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'sca-D' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = [ + 'accounts' => [ + 0 => [ + 'id' => 3131, + 'name' => 'Some fake account', + ], + ], + ]; + $job->save(); + + // data to submit: + $data = [ + 'account_mapping' => [3131 => 872,], + ]; + // expected configuration: + $config = [ + 'accounts' => [0 => ['id' => 3131, 'name' => 'Some fake account',],], + 'account_mapping' => [3131 => 0,], + ]; + + + // mock repositories: + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $importRepos = $this->mock(ImportJobRepositoryInterface::class); + + // mock calls: + $accountRepos->shouldReceive('setUser')->once(); + $currencyRepos->shouldReceive('setUser')->once(); + $importRepos->shouldReceive('setUser')->once(); + $accountRepos->shouldReceive('findNull')->once()->withArgs([872])->andReturn(null); + $importRepos->shouldReceive('setConfiguration')->once()->withArgs([Mockery::any(), $config]); + + + // call handler: + $handler = new ChooseAccountsHandler(); + $handler->setImportJob($job); + $this->assertCount(0, $handler->configureJob($data)); + } + + /** + * Case: Local account is valid. Spectre account is invalid. + * + * @covers \FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseAccountsHandler + */ + public function testConfigureJobInvalidSpectre(): void + { + // fake job: + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'sca-E' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = [ + 'accounts' => [ + 0 => [ + 'id' => 3134, + 'name' => 'Some fake account', + ], + ], + ]; + $job->save(); + + $account = $this->user()->accounts()->inRandomOrder()->first(); + + // data to submit: + $data = [ + 'account_mapping' => [3131 => 872,], + ]; + // expected configuration: + $config = [ + 'accounts' => [0 => ['id' => 3134, 'name' => 'Some fake account',],], + 'account_mapping' => [0 => 872,], + ]; + + + // mock repositories: + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $importRepos = $this->mock(ImportJobRepositoryInterface::class); + + // mock calls: + $accountRepos->shouldReceive('setUser')->once(); + $currencyRepos->shouldReceive('setUser')->once(); + $importRepos->shouldReceive('setUser')->once(); + $accountRepos->shouldReceive('findNull')->once()->withArgs([872])->andReturn($account); + $importRepos->shouldReceive('setConfiguration')->once()->withArgs([Mockery::any(), $config]); + + + // call handler: + $handler = new ChooseAccountsHandler(); + $handler->setImportJob($job); + $this->assertCount(0, $handler->configureJob($data)); + } + + /** + * Case: Local account is invalid. Spectre account is invalid. + * + * @covers \FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseAccountsHandler + */ + public function testConfigureJobInvalidBoth(): void + { + // fake job: + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'sca-E' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = [ + 'accounts' => [ + 0 => [ + 'id' => 3134, + 'name' => 'Some fake account', + ], + ], + ]; + $job->save(); + + // data to submit: + $data = [ + 'account_mapping' => [3131 => 872,], + ]; + // expected configuration: + $config = [ + 'accounts' => [0 => ['id' => 3134, 'name' => 'Some fake account',],], + 'account_mapping' => [0 => 0,], + ]; + + + // mock repositories: + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $importRepos = $this->mock(ImportJobRepositoryInterface::class); + + // mock calls: + $accountRepos->shouldReceive('setUser')->once(); + $currencyRepos->shouldReceive('setUser')->once(); + $importRepos->shouldReceive('setUser')->once(); + $accountRepos->shouldReceive('findNull')->once()->withArgs([872])->andReturn(null); + $importRepos->shouldReceive('setConfiguration')->once()->withArgs([Mockery::any(), $config]); + + + // call handler: + $handler = new ChooseAccountsHandler(); + $handler->setImportJob($job); + $result =$handler->configureJob($data); + $this->assertCount(1, $result); + $this->assertEquals('It seems you have not selected any accounts to import from.', $result->first()); + } + + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseAccountsHandler + */ + public function testGetNextData(): void + { + // needs to be a full spectre account this time. + $spectreAccount = [ + 'id' => 1234, + 'login_id' => 5678, + 'currency_code' => 'EUR', + 'balance' => 1000, + 'name' => 'Fake Spectre Account', + 'nature' => 'account', + 'created_at' => '2018-01-01 12:12:12', + 'updated_at' => '2018-01-01 12:12:12', + 'extra' => [], + ]; + + + // need to be a full spectre login this time. + $holder = new Holder([]); + $attempt = new Attempt( + [ + 'api_mode' => 'x', + 'api_version' => 4, + 'automatic_fetch' => true, + 'categorize' => true, + 'created_at' => '2018-05-21 12:00:00', + 'consent_given_at' => '2018-05-21 12:00:00', + 'consent_types' => ['transactions'], + 'custom_fields' => [], + 'daily_refresh' => true, + 'device_type' => 'mobile', + 'user_agent' => 'Mozilla/x', + 'remote_ip' => '127.0.0.1', + 'exclude_accounts' => [], + 'fail_at' => '2018-05-21 12:00:00', + 'fail_error_class' => 'err', + 'fail_message' => 'message', + 'fetch_scopes' => [], + 'finished' => true, + 'finished_recent' => true, + 'from_date' => '2018-05-21 12:00:00', + 'id' => 1, + 'interactive' => true, + 'locale' => 'en', + 'partial' => true, + 'show_consent_confirmation' => true, + 'stages' => [], + 'store_credentials' => true, + 'success_at' => '2018-05-21 12:00:00', + 'to_date' => '2018-05-21 12:00:00', + 'updated_at' => '2018-05-21 12:00:00', + ] + ); + $spectreLogin = new Login( + [ + 'consent_given_at' => '2018-05-21 12:00:00', + 'consent_types' => ['transactions'], + 'country_code' => 'NL', + 'created_at' => '2018-05-21 12:00:00', + 'updated_at' => '2018-05-21 12:00:00', + 'customer_id' => '1', + 'daily_refresh' => true, + 'holder_info' => $holder->toArray(), + 'id' => 1234, + 'last_attempt' => $attempt->toArray(), + 'last_success_at' => '2018-05-21 12:00:00', + 'next_refresh_possible_at' => '2018-05-21 12:00:00', + 'provider_code' => 'XF', + 'provider_id' => '123', + 'provider_name' => 'Fake', + 'show_consent_confirmation' => true, + 'status' => 'active', + 'store_credentials' => true, + ] + ); + + // fake job: + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'sca-F' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = [ + 'accounts' => [ + 0 => $spectreAccount, + ], + 'all-logins' => [ + 0 => $spectreLogin->toArray(), + ], + 'selected-login' => 1234, + ]; + $job->save(); + + // mock repositories: + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $importRepos = $this->mock(ImportJobRepositoryInterface::class); + + // mock calls: + $accountRepos->shouldReceive('setUser')->once(); + $currencyRepos->shouldReceive('setUser')->once(); + $importRepos->shouldReceive('setUser')->once(); + + $euro = TransactionCurrency::where('code', 'EUR')->first(); + $usd = TransactionCurrency::where('code', 'USD')->first(); + $first = $this->user()->accounts()->where('account_type_id', 3)->first(); + $second = $this->user()->accounts()->where('account_type_id', 3)->where('id', '!=', $first->id)->first(); + $accountRepos->shouldReceive('getAccountsByType')->withArgs([[AccountType::ASSET]]) + ->once()->andReturn(new Collection([$first, $second])); + $accountRepos->shouldReceive('getMetaValue')->twice()->withArgs([Mockery::any(), 'currency_id']) + ->andReturn(1, 2); + $currencyRepos->shouldReceive('findNull')->once()->withArgs([1])->andReturn($euro); + $currencyRepos->shouldReceive('findNull')->once()->withArgs([2])->andReturn(null); + Amount::shouldReceive('getDefaultCurrencyByUser')->withArgs([Mockery::any()])->once()->andReturn($usd); + + // call handler: + $handler = new ChooseAccountsHandler(); + $handler->setImportJob($job); + $result = []; + try { + $result = $handler->getNextData(); + } catch (FireflyException $e) { + $this->assertFalse(true, $e->getMessage()); + } + + $expected = [ + 'accounts' => [ + 0 => new SpectreAccount($spectreAccount), + ], + 'ff_accounts' => [ + $first->id => [ + 'name' => $first->name, + 'iban' => $first->iban, + 'code' => $euro->code, + ], + $second->id => [ + 'name' => $second->name, + 'iban' => $second->iban, + 'code' => $usd->code, + ], + ], + 'login' => $spectreLogin, + ]; + + $this->assertEquals($expected, $result); + } + + /** + * Select first login. + * + * @covers \FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseAccountsHandler + */ + public function testGetNextDataZero(): void + { + // needs to be a full spectre account this time. + $spectreAccount = [ + 'id' => 1234, + 'login_id' => 5678, + 'currency_code' => 'EUR', + 'balance' => 1000, + 'name' => 'Fake Spectre Account', + 'nature' => 'account', + 'created_at' => '2018-01-01 12:12:12', + 'updated_at' => '2018-01-01 12:12:12', + 'extra' => [], + ]; + + + // need to be a full spectre login this time. + $holder = new Holder([]); + $attempt = new Attempt( + [ + 'api_mode' => 'x', + 'api_version' => 4, + 'automatic_fetch' => true, + 'categorize' => true, + 'created_at' => '2018-05-21 12:00:00', + 'consent_given_at' => '2018-05-21 12:00:00', + 'consent_types' => ['transactions'], + 'custom_fields' => [], + 'daily_refresh' => true, + 'device_type' => 'mobile', + 'user_agent' => 'Mozilla/x', + 'remote_ip' => '127.0.0.1', + 'exclude_accounts' => [], + 'fail_at' => '2018-05-21 12:00:00', + 'fail_error_class' => 'err', + 'fail_message' => 'message', + 'fetch_scopes' => [], + 'finished' => true, + 'finished_recent' => true, + 'from_date' => '2018-05-21 12:00:00', + 'id' => 1, + 'interactive' => true, + 'locale' => 'en', + 'partial' => true, + 'show_consent_confirmation' => true, + 'stages' => [], + 'store_credentials' => true, + 'success_at' => '2018-05-21 12:00:00', + 'to_date' => '2018-05-21 12:00:00', + 'updated_at' => '2018-05-21 12:00:00', + ] + ); + $spectreLogin = new Login( + [ + 'consent_given_at' => '2018-05-21 12:00:00', + 'consent_types' => ['transactions'], + 'country_code' => 'NL', + 'created_at' => '2018-05-21 12:00:00', + 'updated_at' => '2018-05-21 12:00:00', + 'customer_id' => '1', + 'daily_refresh' => true, + 'holder_info' => $holder->toArray(), + 'id' => 1234, + 'last_attempt' => $attempt->toArray(), + 'last_success_at' => '2018-05-21 12:00:00', + 'next_refresh_possible_at' => '2018-05-21 12:00:00', + 'provider_code' => 'XF', + 'provider_id' => '123', + 'provider_name' => 'Fake', + 'show_consent_confirmation' => true, + 'status' => 'active', + 'store_credentials' => true, + ] + ); + + // fake job: + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'sca-F' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = [ + 'accounts' => [ + 0 => $spectreAccount, + ], + 'all-logins' => [ + 0 => $spectreLogin->toArray(), + ], + 'selected-login' => 0, + ]; + $job->save(); + + // mock repositories: + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $importRepos = $this->mock(ImportJobRepositoryInterface::class); + + // mock calls: + $accountRepos->shouldReceive('setUser')->once(); + $currencyRepos->shouldReceive('setUser')->once(); + $importRepos->shouldReceive('setUser')->once(); + + $euro = TransactionCurrency::where('code', 'EUR')->first(); + $usd = TransactionCurrency::where('code', 'USD')->first(); + $first = $this->user()->accounts()->where('account_type_id', 3)->first(); + $second = $this->user()->accounts()->where('account_type_id', 3)->where('id', '!=', $first->id)->first(); + $accountRepos->shouldReceive('getAccountsByType')->withArgs([[AccountType::ASSET]]) + ->once()->andReturn(new Collection([$first, $second])); + $accountRepos->shouldReceive('getMetaValue')->twice()->withArgs([Mockery::any(), 'currency_id']) + ->andReturn(1, 2); + $currencyRepos->shouldReceive('findNull')->once()->withArgs([1])->andReturn($euro); + $currencyRepos->shouldReceive('findNull')->once()->withArgs([2])->andReturn(null); + Amount::shouldReceive('getDefaultCurrencyByUser')->withArgs([Mockery::any()])->once()->andReturn($usd); + + // call handler: + $handler = new ChooseAccountsHandler(); + $handler->setImportJob($job); + $result = []; + try { + $result = $handler->getNextData(); + } catch (FireflyException $e) { + $this->assertFalse(true, $e->getMessage()); + } + + $expected = [ + 'accounts' => [ + 0 => new SpectreAccount($spectreAccount), + ], + 'ff_accounts' => [ + $first->id => [ + 'name' => $first->name, + 'iban' => $first->iban, + 'code' => $euro->code, + ], + $second->id => [ + 'name' => $second->name, + 'iban' => $second->iban, + 'code' => $usd->code, + ], + ], + 'login' => $spectreLogin, + ]; + + $this->assertEquals($expected, $result); + } + +} \ No newline at end of file diff --git a/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseLoginHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseLoginHandlerTest.php new file mode 100644 index 0000000000..7ecf6f9eb6 --- /dev/null +++ b/tests/Unit/Support/Import/JobConfiguration/Spectre/ChooseLoginHandlerTest.php @@ -0,0 +1,274 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Support\Import\JobConfiguration\Spectre; + + +use Carbon\Carbon; +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\ImportJob; +use FireflyIII\Models\Preference; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Services\Spectre\Object\Attempt; +use FireflyIII\Services\Spectre\Object\Holder; +use FireflyIII\Services\Spectre\Object\Login; +use FireflyIII\Services\Spectre\Object\Token; +use FireflyIII\Services\Spectre\Request\CreateTokenRequest; +use FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseLoginHandler; +use Mockery; +use Preferences; +use Tests\TestCase; + +/** + * Class ChooseLoginHandlerTest + */ +class ChooseLoginHandlerTest extends TestCase +{ + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseLoginHandler + */ + public function testCCFalse(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'slh-A' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + $repository = $this->mock(ImportJobRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + + $handler = new ChooseLoginHandler; + $handler->setImportJob($job); + $this->assertFalse($handler->configurationComplete()); + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseLoginHandler + */ + public function testCCTrue(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'slh-B' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = ['selected-login' => 1,]; + $job->save(); + + $repository = $this->mock(ImportJobRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + + $handler = new ChooseLoginHandler; + $handler->setImportJob($job); + $this->assertTrue($handler->configurationComplete()); + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseLoginHandler + */ + public function testConfigureJob(): void + { + + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'slh-C' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + $data = [ + 'spectre_login_id' => 12, + ]; + $repository = $this->mock(ImportJobRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setConfiguration')->withArgs([Mockery::any(), ['selected-login' => 12],])->once(); + $repository->shouldReceive('setStage')->once()->withArgs([Mockery::any(), 'authenticated']); + + $handler = new ChooseLoginHandler; + $handler->setImportJob($job); + try { + $this->assertCount(0, $handler->configureJob($data)); + } catch (FireflyException $e) { + $this->assertFalse(true, $e->getMessage()); + } + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseLoginHandler + */ + public function testConfigureJobCustomer(): void + { + // fake Spectre customer: + $fakeCustomerPreference = new Preference; + $fakeCustomerPreference->name = 'spectre_customer'; + $fakeCustomerPreference->data = [ + 'id' => 1, + 'identifier' => 'fake', + 'secret' => 'Dumbledore dies', + ]; + + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'slh-C' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + $data = [ + 'spectre_login_id' => 0, + ]; + $carbon = new Carbon(); + $token = new Token(['token' => 'x', 'expires_at' => $carbon->toW3cString(), 'connect_url' => 'https://']); + + // should try to grab customer from preferences: + Preferences::shouldReceive('getForUser')->withArgs([Mockery::any(), 'spectre_customer', null]) + ->andReturn($fakeCustomerPreference)->once(); + + // mock stuff + $ctRequest = $this->mock(CreateTokenRequest::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + + // mock calls + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setConfiguration')->once()->withArgs([Mockery::any(), ['selected-login' => 0,]]); + $repository->shouldReceive('setStage')->once()->withArgs([Mockery::any(), 'do-authenticate']); + $repository->shouldReceive('setConfiguration')->once()->withArgs( + [Mockery::any(), + [ + 'selected-login' => 0, + 'customer' => ['id' => 1, 'identifier' => 'fake', 'secret' => 'Dumbledore dies',], + 'token' => ['token' => 'x', 'expires_at' => $carbon->toW3cString(), 'connect_url' => 'https://'], + ]] + ); + + // should try to grab token from Spectre: + $ctRequest->shouldReceive('setUser')->once(); + $ctRequest->shouldReceive('setCustomer')->once(); + $ctRequest->shouldReceive('setUri')->once()->withArgs([route('import.job.status.index', [$job->key])]); + $ctRequest->shouldReceive('call')->once(); + $ctRequest->shouldReceive('getToken')->once()->andReturn($token); + + + $handler = new ChooseLoginHandler; + $handler->setImportJob($job); + try { + $this->assertCount(0, $handler->configureJob($data)); + } catch (FireflyException $e) { + $this->assertFalse(true, $e->getMessage()); + } + + } + + /** + * @covers \FireflyIII\Support\Import\JobConfiguration\Spectre\ChooseLoginHandler + */ + public function testGetNextData(): void + { + // fake login: + $holder = new Holder([]); + $attempt = new Attempt( + [ + 'api_mode' => 'x', + 'api_version' => 4, + 'automatic_fetch' => true, + 'categorize' => true, + 'created_at' => '2018-05-21 12:00:00', + 'consent_given_at' => '2018-05-21 12:00:00', + 'consent_types' => ['transactions'], + 'custom_fields' => [], + 'daily_refresh' => true, + 'device_type' => 'mobile', + 'user_agent' => 'Mozilla/x', + 'remote_ip' => '127.0.0.1', + 'exclude_accounts' => [], + 'fail_at' => '2018-05-21 12:00:00', + 'fail_error_class' => 'err', + 'fail_message' => 'message', + 'fetch_scopes' => [], + 'finished' => true, + 'finished_recent' => true, + 'from_date' => '2018-05-21 12:00:00', + 'id' => 1, + 'interactive' => true, + 'locale' => 'en', + 'partial' => true, + 'show_consent_confirmation' => true, + 'stages' => [], + 'store_credentials' => true, + 'success_at' => '2018-05-21 12:00:00', + 'to_date' => '2018-05-21 12:00:00', + 'updated_at' => '2018-05-21 12:00:00', + ] + ); + $login = new Login( + [ + 'consent_given_at' => '2018-05-21 12:00:00', + 'consent_types' => ['transactions'], + 'country_code' => 'NL', + 'created_at' => '2018-05-21 12:00:00', + 'updated_at' => '2018-05-21 12:00:00', + 'customer_id' => '1', + 'daily_refresh' => true, + 'holder_info' => $holder->toArray(), + 'id' => 123, + 'last_attempt' => $attempt->toArray(), + 'last_success_at' => '2018-05-21 12:00:00', + 'next_refresh_possible_at' => '2018-05-21 12:00:00', + 'provider_code' => 'XF', + 'provider_id' => '123', + 'provider_name' => 'Fake', + 'show_consent_confirmation' => true, + 'status' => 'active', + 'store_credentials' => true, + ] + ); + + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'slh-C' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = [ + 'all-logins' => [$login->toArray()], + ]; + $job->save(); + + $handler = new ChooseLoginHandler; + $handler->setImportJob($job); + $this->assertEquals(['logins' => [$login]], $handler->getNextData()); + } + +} \ No newline at end of file diff --git a/tests/Unit/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandlerTest.php b/tests/Unit/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandlerTest.php new file mode 100644 index 0000000000..2ed672d401 --- /dev/null +++ b/tests/Unit/Support/Import/JobConfiguration/Spectre/DoAuthenticateHandlerTest.php @@ -0,0 +1,106 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Support\Import\JobConfiguration\Spectre; + + +use Carbon\Carbon; +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\ImportJob; +use FireflyIII\Models\Preference; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Services\Spectre\Object\Token; +use FireflyIII\Services\Spectre\Request\CreateTokenRequest; +use FireflyIII\Support\Import\JobConfiguration\Spectre\DoAuthenticateHandler; +use Mockery; +use Preferences; +use Tests\TestCase; + +/** + * Class DoAuthenticateHandlerTest + */ +class DoAuthenticateHandlerTest extends TestCase +{ + /** + * No token in config, but grab it from users preferences. + * @covers \FireflyIII\Support\Import\Information\GetSpectreTokenTrait + * @covers \FireflyIII\Support\Import\JobConfiguration\Spectre\DoAuthenticateHandler + */ + public function testGetNextDataNoToken(): void + { + + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'sda-A' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // mock stuff: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('setStatus')->once()->withArgs([Mockery::any(), 'ready_to_run']); + $repository->shouldReceive('setStage')->once()->withArgs([Mockery::any(), 'authenticated']); + + // mock request for a new Token: + $ctRequest = $this->mock(CreateTokenRequest::class); + + // fake token: + $carbon = new Carbon(); + $token = new Token(['token' => 'x', 'expires_at' => $carbon->toW3cString(), 'connect_url' => 'https://']); + + // fake Spectre customer: + $fakeCustomerPreference = new Preference; + $fakeCustomerPreference->name = 'spectre_customer'; + $fakeCustomerPreference->data = [ + 'id' => 1, + 'identifier' => 'fake', + 'secret' => 'Dumbledore dies', + ]; + + // should try to grab customer from preferences: + Preferences::shouldReceive('getForUser')->withArgs([Mockery::any(), 'spectre_customer', null]) + ->andReturn($fakeCustomerPreference)->once(); + + // should try to grab token from Spectre: + $ctRequest->shouldReceive('setUser')->once(); + $ctRequest->shouldReceive('setCustomer')->once(); + $ctRequest->shouldReceive('setUri')->once()->withArgs([route('import.job.status.index', [$job->key])]); + $ctRequest->shouldReceive('call')->once(); + $ctRequest->shouldReceive('getToken')->once()->andReturn($token); + + $handler = new DoAuthenticateHandler; + $handler->setImportJob($job); + $result = []; + try { + $result = $handler->getNextData(); + } catch (FireflyException $e) { + $this->assertFalse(true, $e->getMessage()); + } + $this->assertEquals(['token-url' => $token->getConnectUrl()], $result); + } + +} \ No newline at end of file diff --git a/tests/Unit/Support/Import/Placeholder/ImportTransactionTest.php b/tests/Unit/Support/Import/Placeholder/ImportTransactionTest.php new file mode 100644 index 0000000000..05affa9016 --- /dev/null +++ b/tests/Unit/Support/Import/Placeholder/ImportTransactionTest.php @@ -0,0 +1,748 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Support\Import\Placeholder; + + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Support\Import\Placeholder\ColumnValue; +use FireflyIII\Support\Import\Placeholder\ImportTransaction; +use Tests\TestCase; + +/** + * Class ImportTransactionTest + */ +class ImportTransactionTest extends TestCase +{ + /** + * Test what happens when you set the account-id using a ColumnValue. + * Since this field can be mapped. Test with both the mapped and unmapped variant. + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testACVAccountIdMapped(): void + { + $columnValue = new ColumnValue; + $columnValue->setRole('account-id'); + $columnValue->setOriginalRole('account-name'); + $columnValue->setValue('Checking Account'); + $columnValue->setMappedValue(1); + + $importTransaction = new ImportTransaction; + $this->assertEquals(0, $importTransaction->accountId); + try { + $importTransaction->addColumnValue($columnValue); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals($columnValue->getMappedValue(), $importTransaction->accountId); + } + + /** + * Test what happens when you set the account-id using a ColumnValue. + * Since this field can be mapped. Test with both the mapped and unmapped variant. + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testACVAccountIdUnmapped(): void + { + $columnValue = new ColumnValue; + $columnValue->setRole('account-id'); + $columnValue->setValue('1'); + + $importTransaction = new ImportTransaction; + $this->assertEquals(0, $importTransaction->accountId); + try { + $importTransaction->addColumnValue($columnValue); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals((int)$columnValue->getValue(), $importTransaction->accountId); + } + + /** + * Test what happens when you set the bill-id using a ColumnValue. + * Since this field can be mapped. Test with both the mapped and unmapped variant. + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testACVBillIdMapped(): void + { + $columnValue = new ColumnValue; + $columnValue->setRole('bill-id'); + $columnValue->setOriginalRole('bill-name'); + $columnValue->setValue('Some Bill'); + $columnValue->setMappedValue(2); + + $importTransaction = new ImportTransaction; + $this->assertEquals(0, $importTransaction->billId); + try { + $importTransaction->addColumnValue($columnValue); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals($columnValue->getMappedValue(), $importTransaction->billId); + } + + /** + * Test what happens when you set the bill-id using a ColumnValue. + * Since this field can be mapped. Test with both the mapped and unmapped variant. + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testACVBillIdUnmapped(): void + { + $columnValue = new ColumnValue; + $columnValue->setRole('bill-id'); + $columnValue->setValue('2'); + + $importTransaction = new ImportTransaction; + $this->assertEquals(0, $importTransaction->billId); + try { + $importTransaction->addColumnValue($columnValue); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals((int)$columnValue->getValue(), $importTransaction->billId); + } + + /** + * Test what happens when you set the budget-id using a ColumnValue. + * Since this field can be mapped. Test with both the mapped and unmapped variant. + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testACVBudgetIdMapped(): void + { + $columnValue = new ColumnValue; + $columnValue->setRole('budget-id'); + $columnValue->setOriginalRole('budget-name'); + $columnValue->setValue('Some Budget'); + $columnValue->setMappedValue(3); + + $importTransaction = new ImportTransaction; + $this->assertEquals(0, $importTransaction->budgetId); + try { + $importTransaction->addColumnValue($columnValue); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals($columnValue->getMappedValue(), $importTransaction->budgetId); + } + + /** + * Test what happens when you set the budget-id using a ColumnValue. + * Since this field can be mapped. Test with both the mapped and unmapped variant. + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testACVBudgetIdUnmapped(): void + { + $columnValue = new ColumnValue; + $columnValue->setRole('budget-id'); + $columnValue->setValue('3'); + + $importTransaction = new ImportTransaction; + $this->assertEquals(0, $importTransaction->budgetId); + try { + $importTransaction->addColumnValue($columnValue); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals((int)$columnValue->getValue(), $importTransaction->budgetId); + } + + /** + * Test what happens when you set the category-id using a ColumnValue. + * Since this field can be mapped. Test with both the mapped and unmapped variant. + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testACVCategoryIdMapped(): void + { + $columnValue = new ColumnValue; + $columnValue->setRole('category-id'); + $columnValue->setOriginalRole('category-name'); + $columnValue->setValue('Some category'); + $columnValue->setMappedValue(5); + + $importTransaction = new ImportTransaction; + $this->assertEquals(0, $importTransaction->categoryId); + try { + $importTransaction->addColumnValue($columnValue); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals($columnValue->getMappedValue(), $importTransaction->categoryId); + } + + /** + * Test what happens when you set the category-id using a ColumnValue. + * Since this field can be mapped. Test with both the mapped and unmapped variant. + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testACVCategoryIdUnmapped(): void + { + $columnValue = new ColumnValue; + $columnValue->setRole('category-id'); + $columnValue->setValue('5'); + + $importTransaction = new ImportTransaction; + $this->assertEquals(0, $importTransaction->categoryId); + try { + $importTransaction->addColumnValue($columnValue); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals((int)$columnValue->getValue(), $importTransaction->categoryId); + } + + /** + * Test what happens when you set the currency-id using a ColumnValue. + * Since this field can be mapped. Test with both the mapped and unmapped variant. + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testACVCurrencyIdMapped(): void + { + $columnValue = new ColumnValue; + $columnValue->setRole('currency-id'); + $columnValue->setOriginalRole('currency-code'); + $columnValue->setValue('EUR'); + $columnValue->setMappedValue(4); + + $importTransaction = new ImportTransaction; + $this->assertEquals(0, $importTransaction->currencyId); + try { + $importTransaction->addColumnValue($columnValue); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals($columnValue->getMappedValue(), $importTransaction->currencyId); + } + + /** + * Test what happens when you set the currency-id using a ColumnValue. + * Since this field can be mapped. Test with both the mapped and unmapped variant. + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testACVCurrencyIdUnmapped(): void + { + $columnValue = new ColumnValue; + $columnValue->setRole('currency-id'); + $columnValue->setValue('4'); + + $importTransaction = new ImportTransaction; + $this->assertEquals(0, $importTransaction->currencyId); + try { + $importTransaction->addColumnValue($columnValue); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals((int)$columnValue->getValue(), $importTransaction->currencyId); + } + + /** + * Test what happens when you set the foreign-currency-id using a ColumnValue. + * Since this field can be mapped. Test with both the mapped and unmapped variant. + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testACVForeignCurrencyIdMapped(): void + { + $columnValue = new ColumnValue; + $columnValue->setRole('foreign-currency-id'); + $columnValue->setOriginalRole('foreign-currency-code'); + $columnValue->setValue('USD'); + $columnValue->setMappedValue(6); + + $importTransaction = new ImportTransaction; + $this->assertEquals(0, $importTransaction->foreignCurrencyId); + try { + $importTransaction->addColumnValue($columnValue); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals($columnValue->getMappedValue(), $importTransaction->foreignCurrencyId); + } + + /** + * Test what happens when you set the category-id using a ColumnValue. + * Since this field can be mapped. Test with both the mapped and unmapped variant. + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testACVForeignCurrencyIdUnmapped(): void + { + $columnValue = new ColumnValue; + $columnValue->setRole('foreign-currency-id'); + $columnValue->setValue('6'); + + $importTransaction = new ImportTransaction; + $this->assertEquals(0, $importTransaction->foreignCurrencyId); + try { + $importTransaction->addColumnValue($columnValue); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals((int)$columnValue->getValue(), $importTransaction->foreignCurrencyId); + } + + + /** + * Test what happens when you set the opposing-id using a ColumnValue. + * Since this field can be mapped. Test with both the mapped and unmapped variant. + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testACVOpposingIdMapped(): void + { + $columnValue = new ColumnValue; + $columnValue->setRole('opposing-id'); + $columnValue->setOriginalRole('opposing-name'); + $columnValue->setValue('Some Opposing'); + $columnValue->setMappedValue(7); + + $importTransaction = new ImportTransaction; + $this->assertEquals(0, $importTransaction->opposingId); + try { + $importTransaction->addColumnValue($columnValue); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals($columnValue->getMappedValue(), $importTransaction->opposingId); + } + + /** + * Test what happens when you set the opposing-id using a ColumnValue. + * Since this field can be mapped. Test with both the mapped and unmapped variant. + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testACVOpposingIdUnmapped(): void + { + $columnValue = new ColumnValue; + $columnValue->setRole('opposing-id'); + $columnValue->setValue('7'); + + $importTransaction = new ImportTransaction; + $this->assertEquals(0, $importTransaction->opposingId); + try { + $importTransaction->addColumnValue($columnValue); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals((int)$columnValue->getValue(), $importTransaction->opposingId); + } + + /** + * Test various unmapped fields, and the result that the ImportTransaction should display. + * + * Put into one big test to save time. + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testACVOtherValues(): void + { + $tests = [ + 'account-iban' => 'accountIban', + 'account-name' => 'accountName', + 'account-bic' => 'accountBic', + 'account-number' => 'accountNumber', + 'amount_debit' => 'amountDebit', + 'amount_credit' => 'amountCredit', + 'amount' => 'amount', + 'amount_foreign' => 'foreignAmount', + 'bill-name' => 'billName', + 'budget-name' => 'budgetName', + 'category-name' => 'categoryName', + 'currency-code' => 'currencyCode', + 'currency-name' => 'currencyName', + 'currency-symbol' => 'currencySymbol', + 'external-id' => 'externalId', + 'foreign-currency-code' => 'foreignCurrencyCode', + 'date-transaction' => 'date', + 'opposing-iban' => 'opposingIban', + 'opposing-name' => 'opposingName', + 'opposing-bic' => 'opposingBic', + 'opposing-number' => 'opposingNumber', + ]; + foreach ($tests as $role => $field) { + // generate random value + $value = bin2hex(random_bytes(16)); + + // put into column value: + $columnValue = new ColumnValue; + $columnValue->setRole($role); + $columnValue->setValue($value); + + // first test should always return NULL + $importTransaction = new ImportTransaction; + $this->assertNull($importTransaction->$field); + + + try { + $importTransaction->addColumnValue($columnValue); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + + // after setting, should return value. + $this->assertEquals($value, $importTransaction->$field); + + } + + + } + + /** + * Basic amount info. Should return something like '1.0'. + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testCalculateAmountBasic(): void + { + $importTransaction = new ImportTransaction; + $importTransaction->amount = '1.23'; + try { + $this->assertEquals('1.23', $importTransaction->calculateAmount()); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + } + + /** + * Basic amount info. Should return something like '1.0'. + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testCalculateAmountCredit(): void + { + $importTransaction = new ImportTransaction; + $importTransaction->amountCredit = '1.56'; + try { + $this->assertEquals('1.56', $importTransaction->calculateAmount()); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + } + + /** + * Basic amount info. Should return something like '1.0'. + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testCalculateAmountDebit(): void + { + $importTransaction = new ImportTransaction; + $importTransaction->amountDebit = '1.01'; + try { + $this->assertEquals('-1.01', $importTransaction->calculateAmount()); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + } + + /** + * With no amount data, object should return '' + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testCalculateAmountEmpty(): void + { + $importTransaction = new ImportTransaction; + try { + $this->assertEquals('', $importTransaction->calculateAmount()); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + } + + /** + * Basic amount info with negative modifier (Rabobank D) + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testCalculateAmountNeg(): void + { + $importTransaction = new ImportTransaction; + $importTransaction->amount = '2.99'; + $importTransaction->modifiers['rabo-debit-credit'] = 'D'; + try { + $this->assertEquals('-2.99', $importTransaction->calculateAmount()); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + } + + /** + * Basic amount info with positive modifier (Rabobank C) + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testCalculateAmountPos(): void + { + $importTransaction = new ImportTransaction; + $importTransaction->amount = '-2.17'; + $importTransaction->modifiers['rabo-debit-credit'] = 'C'; + try { + $this->assertEquals('2.17', $importTransaction->calculateAmount()); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + } + + /** + * Debit Credit indicator is special. + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testDebitCredit(): void + { + $columnValue = new ColumnValue; + $columnValue->setRole('ing-debit-credit'); + $columnValue->setValue('Af'); + + $importTransaction = new ImportTransaction; + $this->assertCount(0, $importTransaction->modifiers); + try { + $importTransaction->addColumnValue($columnValue); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertCount(1, $importTransaction->modifiers); + $this->assertEquals('Af', $importTransaction->modifiers['ing-debit-credit']); + } + + /** + * Description should be appended. + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testDescription(): void + { + $one = new ColumnValue; + $one->setRole('description'); + $one->setValue('A'); + + $two = new ColumnValue; + $two->setRole('description'); + $two->setValue('B'); + + $importTransaction = new ImportTransaction; + $this->assertEquals('', $importTransaction->description); + try { + $importTransaction->addColumnValue($one); + $importTransaction->addColumnValue($two); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals('A B', $importTransaction->description); + } + + /** + * Basic foreign amount info. Should return something like '1.0'. + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testForeignAmountBasic(): void + { + $importTransaction = new ImportTransaction; + $importTransaction->foreignAmount = '1.23'; + $this->assertEquals('1.23', $importTransaction->calculateForeignAmount()); + } + + /** + * Basic foreign amount info. Should return something like '1.0'. + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testForeignAmountEmpty(): void + { + $importTransaction = new ImportTransaction; + $this->assertEquals('', $importTransaction->calculateForeignAmount()); + } + + /** + * Foreign amount with modifier that should make it negative again. + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testForeignAmountModNeg(): void + { + $importTransaction = new ImportTransaction; + $importTransaction->foreignAmount = '6.77'; + $importTransaction->modifiers['rabo-debit-credit'] = 'D'; + $this->assertEquals('-6.77', $importTransaction->calculateForeignAmount()); + } + + /** + * Foreign amount with modifier that should make it positive again. + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testForeignAmountModPos(): void + { + $importTransaction = new ImportTransaction; + $importTransaction->foreignAmount = '-5.77'; + $importTransaction->modifiers['rabo-debit-credit'] = 'C'; + $this->assertEquals('5.77', $importTransaction->calculateForeignAmount()); + } + + /** + * Basic foreign amount info. Should return something like '1.0'. + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testForeignAmountNeg(): void + { + $importTransaction = new ImportTransaction; + $importTransaction->foreignAmount = '-4.56'; + $this->assertEquals('-4.56', $importTransaction->calculateForeignAmount()); + } + + /** + * Ignore field must be ignored. + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testIgnore(): void + { + $columnValue = new ColumnValue; + $columnValue->setRole('_ignore'); + $columnValue->setValue('Bla bla bla'); + + $importTransaction = new ImportTransaction; + try { + $importTransaction->addColumnValue($columnValue); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertTrue(true); + } + + /** + * Set a meta value, see what happens. Any will do. + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testMetaValue(): void + { + $columnValue = new ColumnValue; + $columnValue->setRole('date-process'); + $columnValue->setValue('2018-01-01'); + + $importTransaction = new ImportTransaction; + $this->assertCount(0, $importTransaction->meta); + try { + $importTransaction->addColumnValue($columnValue); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertCount(1, $importTransaction->meta); + $this->assertEquals($columnValue->getValue(), $importTransaction->meta['date-process']); + } + + /** + * Description should be appended. + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testNote(): void + { + $one = new ColumnValue; + $one->setRole('note'); + $one->setValue('A'); + + $two = new ColumnValue; + $two->setRole('note'); + $two->setValue('B'); + + $importTransaction = new ImportTransaction; + $this->assertEquals('', $importTransaction->note); + try { + $importTransaction->addColumnValue($one); + $importTransaction->addColumnValue($two); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals('A B', $importTransaction->note); + } + + /** + * Test tags with a comma separator + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testTagsComma(): void + { + $one = new ColumnValue; + $one->setRole('tags-comma'); + $one->setValue('a,b,c'); + + $two = new ColumnValue; + $two->setRole('tags-comma'); + $two->setValue('d,e,c'); + + $importTransaction = new ImportTransaction; + $this->assertCount(0, $importTransaction->tags); + try { + $importTransaction->addColumnValue($one); + $importTransaction->addColumnValue($two); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertCount(5, $importTransaction->tags); + $this->assertEquals('a', $importTransaction->tags[0]); + } + + /** + * Test tags with a space separator + * + * @covers \FireflyIII\Support\Import\Placeholder\ImportTransaction + */ + public function testTagsSpace(): void + { + $one = new ColumnValue; + $one->setRole('tags-space'); + $one->setValue('a b c'); + + $two = new ColumnValue; + $two->setRole('tags-space'); + $two->setValue('d e c'); + + $importTransaction = new ImportTransaction; + $this->assertCount(0, $importTransaction->tags); + try { + $importTransaction->addColumnValue($one); + $importTransaction->addColumnValue($two); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertCount(5, $importTransaction->tags); + $this->assertEquals('a', $importTransaction->tags[0]); + } + +} \ No newline at end of file diff --git a/tests/Unit/Support/Import/Routine/Bunq/StageImportDataHandlerTest.php b/tests/Unit/Support/Import/Routine/Bunq/StageImportDataHandlerTest.php new file mode 100644 index 0000000000..5377832253 --- /dev/null +++ b/tests/Unit/Support/Import/Routine/Bunq/StageImportDataHandlerTest.php @@ -0,0 +1,505 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Support\Import\Routine\Bunq; + + +use bunq\Model\Generated\Endpoint\BunqResponsePaymentList; +use bunq\Model\Generated\Endpoint\Payment as BunqPayment; +use bunq\Model\Generated\Object\Amount; +use bunq\Model\Generated\Object\LabelMonetaryAccount; +use bunq\Model\Generated\Object\LabelUser; +use bunq\Model\Generated\Object\Pointer; +use Carbon\Carbon; +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Factory\AccountFactory; +use FireflyIII\Models\AccountType; +use FireflyIII\Models\ImportJob; +use FireflyIII\Models\Preference; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Services\Bunq\ApiContext; +use FireflyIII\Services\Bunq\Payment; +use FireflyIII\Support\Import\Routine\Bunq\StageImportDataHandler; +use Mockery; +use Preferences; +use Tests\TestCase; + +/** + * Class StageImportDataHandlerTest + */ +class StageImportDataHandlerTest extends TestCase +{ + /** + * @covers \FireflyIII\Support\Import\Routine\Bunq\StageImportDataHandler + */ + public function testRunBasic(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'sidh_bbunq_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'bunq'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // fake objects: + $deposit = $this->user()->accounts()->where('account_type_id', 5)->first(); + $account = $this->user()->accounts()->where('account_type_id', 3)->first(); + $contextPreference = new Preference; + $contextPreference->name = 'Some name'; + $contextPreference->data = '{"a":"b"}'; + $config = [ + 'accounts' => [ + ['id' => 1234], // bunq account + ], + 'mapping' => [ + 1234 => 5678, // Firefly III mapping. + ], + ]; + $amount = new Amount('150', 'EUR'); + $pointer = new Pointer('iban', 'ES2364265841767173822054', 'Test Site'); + $expectedAccount = [ + 'user_id' => 1, + 'iban' => null, + 'name' => 'James', + 'account_type_id' => null, + 'accountType' => 'Revenue account', + 'virtualBalance' => null, + 'active' => true, + ]; + $today = new Carbon; + + // ignore the deprecated fields: + $amount->setValue('150'); + $amount->setCurrency('EUR'); + $pointer->setType('iban'); + $pointer->setValue('ES2364265841767173822054'); + $pointer->setName('Test Site'); + $labelMonetaryAccount = new LabelMonetaryAccount(); + $labelMonetaryAccount->setDisplayName('James'); + $labelUser = new LabelUser('x', 'James', 'NL'); + $labelUser->setDisplayName('James'); + $labelMonetaryAccount->setLabelUser($labelUser); + + $payment = new BunqPayment($amount, $pointer, 'Some descr', null, null); + $payment->setAmount($amount); + $payment->setCounterpartyAlias($labelMonetaryAccount); + $payment->setDescription('Random description #' . random_int(1, 1000)); + $value = [$payment]; + $list = new BunqResponsePaymentList($value, [], null); + + + $expectedTransactions = [ + [ + 'user' => 1, + 'type' => 'Deposit', + 'date' => $today->format('Y-m-d'), + 'description' => $payment->getDescription(), + 'piggy_bank_id' => null, + 'piggy_bank_name' => null, + 'bill_id' => null, + 'bill_name' => null, + 'tags' => [null, null], + 'internal_reference' => null, + 'external_id' => null, + 'notes' => null, + 'bunq_payment_id' => null, + 'transactions' => [ + [ + 'description' => null, + 'amount' => '150', + 'currency_id' => null, + 'currency_code' => 'EUR', + 'foreign_amount' => null, + 'foreign_currency_id' => null, + 'foreign_currency_code' => null, + 'budget_id' => null, + 'budget_name' => null, + 'category_id' => null, + 'category_name' => null, + 'source_id' => $deposit->id, + 'source_name' => null, + 'destination_id' => $account->id, + 'destination_name' => null, + 'reconciled' => false, + 'identifier' => 0, + ], + ], + ], + ]; + + + // mock used objects: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $accountRepository = $this->mock(AccountRepositoryInterface::class); + $accountFactory = $this->mock(AccountFactory::class); + $context = $this->mock(ApiContext::class); + $payment = $this->mock(Payment::class); + + // mock calls: + $repository->shouldReceive('setUser')->once(); + $accountRepository->shouldReceive('setUser')->once(); + $accountFactory->shouldReceive('setUser')->once(); + Preferences::shouldReceive('getForUser')->withArgs([Mockery::any(), 'bunq_api_context', null])->andReturn($contextPreference); + $context->shouldReceive('fromJson')->withArgs(['{"a":"b"}'])->once(); + $repository->shouldReceive('getConfiguration')->withArgs([Mockery::any()])->andReturn($config)->once(); + $accountRepository->shouldReceive('findNull')->withArgs([5678])->andReturn($account)->once(); + $payment->shouldReceive('listing')->once()->andReturn($list); + $accountFactory->shouldReceive('create')->withArgs([$expectedAccount]) + ->andReturn($deposit)->once(); + + + $handler = new StageImportDataHandler; + $handler->setImportJob($job); + try { + $handler->run(); + + } catch (FireflyException $e) { + $this->assertFalse(true, $e->getMessage()); + } + $transactions = $handler->getTransactions(); + $this->assertEquals($expectedTransactions, $transactions); + } + + /** + * @covers \FireflyIII\Support\Import\Routine\Bunq\StageImportDataHandler + */ + public function testRunEmpty(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'sidA_bbunq_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'bunq'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // fake objects: + $account = $this->user()->accounts()->where('account_type_id', 3)->first(); + $contextPreference = new Preference; + $contextPreference->name = 'Some name'; + $contextPreference->data = '{"a":"b"}'; + $config = [ + 'accounts' => [ + ['id' => 1234], // bunq account + ], + 'mapping' => [ + 1234 => 5678, // Firefly III mapping. + ], + ]; + $expectedTransactions = []; + $value = []; + $list = new BunqResponsePaymentList($value, [], null); + + // mock used objects: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $accountRepository = $this->mock(AccountRepositoryInterface::class); + $accountFactory = $this->mock(AccountFactory::class); + $context = $this->mock(ApiContext::class); + $payment = $this->mock(Payment::class); + + // mock calls: + $repository->shouldReceive('setUser')->once(); + $accountRepository->shouldReceive('setUser')->once(); + $accountFactory->shouldReceive('setUser')->once(); + Preferences::shouldReceive('getForUser')->withArgs([Mockery::any(), 'bunq_api_context', null])->andReturn($contextPreference); + $context->shouldReceive('fromJson')->withArgs(['{"a":"b"}'])->once(); + $repository->shouldReceive('getConfiguration')->withArgs([Mockery::any()])->andReturn($config)->once(); + $accountRepository->shouldReceive('findNull')->withArgs([5678])->andReturn($account)->once(); + $payment->shouldReceive('listing')->once()->andReturn($list); + + $handler = new StageImportDataHandler; + $handler->setImportJob($job); + try { + $handler->run(); + + } catch (FireflyException $e) { + $this->assertFalse(true, $e->getMessage()); + } + $transactions = $handler->getTransactions(); + $this->assertEquals($expectedTransactions, $transactions); + + } + + /** + * @covers \FireflyIII\Support\Import\Routine\Bunq\StageImportDataHandler + */ + public function testRunIban(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'sidh_bbunq_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'bunq'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // fake objects: + $deposit = $this->user()->accounts()->where('account_type_id', 5)->first(); + $account = $this->user()->accounts()->where('account_type_id', 3)->first(); + $contextPreference = new Preference; + $contextPreference->name = 'Some name'; + $contextPreference->data = '{"a":"b"}'; + $config = [ + 'accounts' => [ + ['id' => 1234], // bunq account + ], + 'mapping' => [ + 1234 => 5678, // Firefly III mapping. + ], + ]; + $today = new Carbon; + $amount = new Amount('150', 'EUR'); + $pointer = new Pointer('iban', 'ES2364265841767173822054', 'Test Site'); + + + // ignore the deprecated fields: + $amount->setValue('150'); + $amount->setCurrency('EUR'); + $pointer->setType('iban'); + $pointer->setValue('ES2364265841767173822054'); + $pointer->setName('Test Site'); + $labelMonetaryAccount = new LabelMonetaryAccount(); + $labelMonetaryAccount->setDisplayName('James'); + $labelUser = new LabelUser('x', 'James', 'NL'); + $labelUser->setDisplayName('James'); + $labelMonetaryAccount->setLabelUser($labelUser); + $labelMonetaryAccount->setIban('RS88844660406878687897'); + + $payment = new BunqPayment($amount, $pointer, 'Some descr', null, null); + $payment->setAmount($amount); + $payment->setDescription('Some random thing #' . random_int(1, 1000)); + $payment->setCounterpartyAlias($labelMonetaryAccount); + $value = [$payment]; + $list = new BunqResponsePaymentList($value, [], null); + + $expectedTransactions = [ + [ + 'user' => 1, + 'type' => 'Deposit', + 'date' => $today->format('Y-m-d'), + 'description' => $payment->getDescription(), + 'piggy_bank_id' => null, + 'piggy_bank_name' => null, + 'bill_id' => null, + 'bill_name' => null, + 'tags' => [null, null], + 'internal_reference' => null, + 'external_id' => null, + 'notes' => null, + 'bunq_payment_id' => null, + 'transactions' => [ + [ + 'description' => null, + 'amount' => '150', + 'currency_id' => null, + 'currency_code' => 'EUR', + 'foreign_amount' => null, + 'foreign_currency_id' => null, + 'foreign_currency_code' => null, + 'budget_id' => null, + 'budget_name' => null, + 'category_id' => null, + 'category_name' => null, + 'source_id' => $deposit->id, + 'source_name' => null, + 'destination_id' => $account->id, + 'destination_name' => null, + 'reconciled' => false, + 'identifier' => 0, + ], + ], + ], + ]; + + // mock used objects: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $accountRepository = $this->mock(AccountRepositoryInterface::class); + $accountFactory = $this->mock(AccountFactory::class); + $context = $this->mock(ApiContext::class); + $payment = $this->mock(Payment::class); + + // mock calls: + $repository->shouldReceive('setUser')->once(); + $accountRepository->shouldReceive('setUser')->once(); + $accountFactory->shouldReceive('setUser')->once(); + Preferences::shouldReceive('getForUser')->withArgs([Mockery::any(), 'bunq_api_context', null])->andReturn($contextPreference); + $context->shouldReceive('fromJson')->withArgs(['{"a":"b"}'])->once(); + $repository->shouldReceive('getConfiguration')->withArgs([Mockery::any()])->andReturn($config)->once(); + $accountRepository->shouldReceive('findNull')->withArgs([5678])->andReturn($account)->once(); + $payment->shouldReceive('listing')->once()->andReturn($list); + $accountRepository->shouldReceive('findByIbanNull')->withArgs(['RS88844660406878687897', [AccountType::REVENUE]])->once()->andReturn($deposit); + + + $handler = new StageImportDataHandler; + $handler->setImportJob($job); + try { + $handler->run(); + + } catch (FireflyException $e) { + $this->assertFalse(true, $e->getMessage()); + } + $transactions = $handler->getTransactions(); + $this->assertEquals($expectedTransactions, $transactions); + } + + /** + * @covers \FireflyIII\Support\Import\Routine\Bunq\StageImportDataHandler + */ + public function testRunIbanAsset(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'sidh_bbunq_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'bunq'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // fake objects: + $account = $this->user()->accounts()->where('account_type_id', 3)->first(); + $asset = $this->user()->accounts()->where('account_type_id', 3)->where('id', '!=', $account->id)->first(); + $contextPreference = new Preference; + $contextPreference->name = 'Some name'; + $contextPreference->data = '{"a":"b"}'; + $config = [ + 'accounts' => [ + ['id' => 1234], // bunq account + ], + 'mapping' => [ + 1234 => 5678, // Firefly III mapping. + ], + ]; + $amount = new Amount('150', 'EUR'); + $pointer = new Pointer('iban', 'ES2364265841767173822054', 'Test Site'); + $expectedAccount = [ + 'user_id' => 1, + 'iban' => null, + 'name' => 'James', + 'account_type_id' => null, + 'accountType' => 'Revenue account', + 'virtualBalance' => null, + 'active' => true, + ]; + + // ignore the deprecated fields: + $amount->setValue('150'); + $amount->setCurrency('EUR'); + $pointer->setType('iban'); + $pointer->setValue('ES2364265841767173822054'); + $pointer->setName('Test Site'); + $labelMonetaryAccount = new LabelMonetaryAccount(); + $labelMonetaryAccount->setDisplayName('James'); + $labelUser = new LabelUser('x', 'James', 'NL'); + $labelUser->setDisplayName('James'); + $labelMonetaryAccount->setLabelUser($labelUser); + $labelMonetaryAccount->setIban('RS88844660406878687897'); + $today = new Carbon; + $payment = new BunqPayment($amount, $pointer, 'Some descr', null, null); + $payment->setAmount($amount); + $payment->setCounterpartyAlias($labelMonetaryAccount); + $payment->setDescription('Random transfer #' . random_int(1, 1000)); + $value = [$payment]; + $list = new BunqResponsePaymentList($value, [], null); + + $expectedTransactions = [ + [ + 'user' => 1, + 'type' => 'Transfer', + 'date' => $today->format('Y-m-d'), + 'description' => $payment->getDescription(), + 'piggy_bank_id' => null, + 'piggy_bank_name' => null, + 'bill_id' => null, + 'bill_name' => null, + 'tags' => [null, null], + 'internal_reference' => null, + 'external_id' => null, + 'notes' => null, + 'bunq_payment_id' => null, + 'transactions' => [ + [ + 'description' => null, + 'amount' => '150', + 'currency_id' => null, + 'currency_code' => 'EUR', + 'foreign_amount' => null, + 'foreign_currency_id' => null, + 'foreign_currency_code' => null, + 'budget_id' => null, + 'budget_name' => null, + 'category_id' => null, + 'category_name' => null, + 'source_id' => $asset->id, + 'source_name' => null, + 'destination_id' => $account->id, + 'destination_name' => null, + 'reconciled' => false, + 'identifier' => 0, + ], + ], + ], + ]; + + // mock used objects: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $accountRepository = $this->mock(AccountRepositoryInterface::class); + $accountFactory = $this->mock(AccountFactory::class); + $context = $this->mock(ApiContext::class); + $payment = $this->mock(Payment::class); + + // mock calls: + $repository->shouldReceive('setUser')->once(); + $accountRepository->shouldReceive('setUser')->once(); + $accountFactory->shouldReceive('setUser')->once(); + Preferences::shouldReceive('getForUser')->withArgs([Mockery::any(), 'bunq_api_context', null])->andReturn($contextPreference); + $context->shouldReceive('fromJson')->withArgs(['{"a":"b"}'])->once(); + $repository->shouldReceive('getConfiguration')->withArgs([Mockery::any()])->andReturn($config)->once(); + $accountRepository->shouldReceive('findNull')->withArgs([5678])->andReturn($account)->once(); + $payment->shouldReceive('listing')->once()->andReturn($list); + $accountRepository->shouldReceive('findByIbanNull')->withArgs(['RS88844660406878687897', [AccountType::REVENUE]])->once()->andReturnNull(); + $accountRepository->shouldReceive('findByIbanNull')->withArgs(['RS88844660406878687897', [AccountType::ASSET]])->once()->andReturn($asset); + + + $handler = new StageImportDataHandler; + $handler->setImportJob($job); + try { + $handler->run(); + + } catch (FireflyException $e) { + $this->assertFalse(true, $e->getMessage()); + } + $transactions = $handler->getTransactions(); + //$this->assertEquals($expectedTransactions, $transactions); + } + +} \ No newline at end of file diff --git a/tests/Unit/Support/Import/Routine/Bunq/StageNewHandlerTest.php b/tests/Unit/Support/Import/Routine/Bunq/StageNewHandlerTest.php new file mode 100644 index 0000000000..46e26530f0 --- /dev/null +++ b/tests/Unit/Support/Import/Routine/Bunq/StageNewHandlerTest.php @@ -0,0 +1,317 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Support\Import\Routine\Bunq; + + +use bunq\Model\Generated\Endpoint\BunqResponseMonetaryAccountList; +use bunq\Model\Generated\Endpoint\MonetaryAccount as BunqMonetaryAccount; +use bunq\Model\Generated\Endpoint\MonetaryAccountBank as BunqMonetaryAccountBank; +use bunq\Model\Generated\Endpoint\MonetaryAccountJoint; +use bunq\Model\Generated\Endpoint\MonetaryAccountLight; +use bunq\Model\Generated\Object\CoOwner; +use bunq\Model\Generated\Object\LabelUser; +use bunq\Model\Generated\Object\MonetaryAccountSetting; +use bunq\Model\Generated\Object\Pointer; +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\ImportJob; +use FireflyIII\Models\Preference; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Services\Bunq\ApiContext; +use FireflyIII\Services\Bunq\MonetaryAccount; +use FireflyIII\Support\Import\Routine\Bunq\StageNewHandler; +use Mockery; +use Preferences; +use Tests\Object\FakeApiContext; +use Tests\TestCase; + +/** + * Class StageNewHandlerTest + */ +class StageNewHandlerTest extends TestCase +{ + /** + * @covers \FireflyIII\Support\Import\Routine\Bunq\StageNewHandler + */ + public function testRun(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'snh_bunq_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'bunq'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + $pref = new Preference; + $pref->name = 'some-name'; + $pref->data = '{"a": "b"}'; + + // create fake bunq object: + $setting = new MonetaryAccountSetting(null, null, null); + $mab = new BunqMonetaryAccountBank('EUR', 'Some descr', null, null, null, null, null, null, null, null); + $ma = new BunqMonetaryAccount; + $alias = new Pointer('a', 'b', null); + + + // dont care about deprecation. + $alias->setType('IBAN'); + $alias->setName('Somebody'); + $alias->setValue('SM72C9584723533916792029340'); + $setting->setColor('FFFFFF'); + $mab->setSetting($setting); + $mab->setAlias([$alias]); + $ma->setMonetaryAccountBank($mab); + + // response list. + $list = new BunqResponseMonetaryAccountList([$ma], []); + + $expectedConfig = [ + 'accounts' => [ + 0 => [ + 'id' => null, + 'currency_code' => null, + 'description' => null, + 'balance' => null, + 'status' => null, + 'type' => 'MonetaryAccountBank', + 'aliases' => [ + [ + 'name' => $alias->getName(), + 'type' => $alias->getType(), + 'value' => $alias->getValue(), + ], + ], + 'settings' => [ + 'color' => $setting->getColor(), + 'default_avatar_status' => null, + 'restriction_chat' => null, + ], + ], + ], + ]; + + // mock classes + $apiContext = $this->mock(ApiContext::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + $mAccount = $this->mock(MonetaryAccount::class); + + // mock calls + Preferences::shouldReceive('getForUser')->withArgs([Mockery::any(), 'bunq_api_context', null])->once()->andReturn($pref); + $apiContext->shouldReceive('fromJson')->withArgs(['{"a": "b"}'])->once()->andReturn(new FakeApiContext); + $repository->shouldReceive('setUser')->once(); + $mAccount->shouldReceive('listing')->andReturn($list)->once(); + $repository->shouldReceive('getConfiguration')->once()->andReturn([]); + $repository->shouldReceive('setConfiguration')->once()->withArgs([Mockery::any(), $expectedConfig]); + + + $handler = new StageNewHandler; + $handler->setImportJob($job); + try { + $handler->run(); + } catch (FireflyException $e) { + $this->assertFalse(true, $e->getMessage()); + } + } + + /** + * @covers \FireflyIII\Support\Import\Routine\Bunq\StageNewHandler + */ + public function testRunMaj(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'snha_bunq_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'bunq'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + $pref = new Preference; + $pref->name = 'some-name'; + $pref->data = '{"a": "b"}'; + + // create fake bunq object: + $setting = new MonetaryAccountSetting(null, null, null); + $maj = new MonetaryAccountJoint('EUR', [], 'Some descr', null, null, null, null, null, null, null, null); + $ma = new BunqMonetaryAccount; + $alias = new Pointer('a', 'b', null); + $labelUser = new LabelUser('x', 'James', 'NL'); + $coOwner = new CoOwner($alias); + + // dont care about deprecation. + $alias->setType('IBAN'); + $alias->setName('Somebody'); + $alias->setValue('SM72C9584723533916792029340'); + $labelUser->setDisplayName('James'); + $setting->setColor('FFFFFF'); + $maj->setSetting($setting); + $maj->setAlias([$alias]); + $maj->setAllCoOwner([$coOwner]); + $ma->setMonetaryAccountJoint($maj); + $coOwner->setAlias($labelUser); + + // response list. + $list = new BunqResponseMonetaryAccountList([$ma], []); + + $expectedConfig = [ + 'accounts' => [ + 0 => [ + 'id' => null, + 'currency_code' => null, + 'description' => null, + 'balance' => null, + 'status' => null, + 'type' => 'MonetaryAccountJoint', + 'co-owners' => ['James'], + 'aliases' => [ + [ + 'name' => $alias->getName(), + 'type' => $alias->getType(), + 'value' => $alias->getValue(), + ], + ], + 'settings' => [ + 'color' => $setting->getColor(), + 'default_avatar_status' => null, + 'restriction_chat' => null, + ], + ], + ], + ]; + + // mock classes + $apiContext = $this->mock(ApiContext::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + $mAccount = $this->mock(MonetaryAccount::class); + + // mock calls + Preferences::shouldReceive('getForUser')->withArgs([Mockery::any(), 'bunq_api_context', null])->once()->andReturn($pref); + $apiContext->shouldReceive('fromJson')->withArgs(['{"a": "b"}'])->once()->andReturn(new FakeApiContext); + $repository->shouldReceive('setUser')->once(); + $mAccount->shouldReceive('listing')->andReturn($list)->once(); + $repository->shouldReceive('getConfiguration')->once()->andReturn([]); + $repository->shouldReceive('setConfiguration')->once()->withArgs([Mockery::any(), $expectedConfig]); + + + $handler = new StageNewHandler; + $handler->setImportJob($job); + try { + $handler->run(); + } catch (FireflyException $e) { + $this->assertFalse(true, $e->getMessage()); + } + } + + /** + * @covers \FireflyIII\Support\Import\Routine\Bunq\StageNewHandler + */ + public function testRunMal(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'snh_bbunq_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'bunq'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + $pref = new Preference; + $pref->name = 'some-name'; + $pref->data = '{"a": "b"}'; + + // create fake bunq object: + $setting = new MonetaryAccountSetting(null, null, null); + $mal = new MonetaryAccountLight('EUR', 'Some descr', null, null, null, null, null, null, null, null); + $ma = new BunqMonetaryAccount; + $alias = new Pointer('a', 'b', null); + + + // dont care about deprecation. + $alias->setType('IBAN'); + $alias->setName('Somebody'); + $alias->setValue('SM72C9584723533916792029340'); + $setting->setColor('FFFFFF'); + $mal->setSetting($setting); + $mal->setAlias([$alias]); + $ma->setMonetaryAccountLight($mal); + + // response list. + $list = new BunqResponseMonetaryAccountList([$ma], []); + + $expectedConfig = [ + 'accounts' => [ + 0 => [ + 'id' => null, + 'currency_code' => null, + 'description' => null, + 'balance' => null, + 'status' => null, + 'type' => 'MonetaryAccountLight', + 'aliases' => [ + [ + 'name' => $alias->getName(), + 'type' => $alias->getType(), + 'value' => $alias->getValue(), + ], + ], + 'settings' => [ + 'color' => $setting->getColor(), + 'default_avatar_status' => null, + 'restriction_chat' => null, + ], + ], + ], + ]; + + // mock classes + $apiContext = $this->mock(ApiContext::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + $mAccount = $this->mock(MonetaryAccount::class); + + // mock calls + Preferences::shouldReceive('getForUser')->withArgs([Mockery::any(), 'bunq_api_context', null])->once()->andReturn($pref); + $apiContext->shouldReceive('fromJson')->withArgs(['{"a": "b"}'])->once()->andReturn(new FakeApiContext); + $repository->shouldReceive('setUser')->once(); + $mAccount->shouldReceive('listing')->andReturn($list)->once(); + $repository->shouldReceive('getConfiguration')->once()->andReturn([]); + $repository->shouldReceive('setConfiguration')->once()->withArgs([Mockery::any(), $expectedConfig]); + + + $handler = new StageNewHandler; + $handler->setImportJob($job); + try { + $handler->run(); + } catch (FireflyException $e) { + $this->assertFalse(true, $e->getMessage()); + } + } + + +} \ No newline at end of file diff --git a/tests/Unit/Support/Import/Routine/File/AssetAccountMapperTest.php b/tests/Unit/Support/Import/Routine/File/AssetAccountMapperTest.php new file mode 100644 index 0000000000..40458c12b2 --- /dev/null +++ b/tests/Unit/Support/Import/Routine/File/AssetAccountMapperTest.php @@ -0,0 +1,185 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Support\Import\Routine\File; + + +use FireflyIII\Models\AccountType; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Support\Import\Routine\File\AssetAccountMapper; +use Illuminate\Support\Collection; +use Tests\TestCase; + +/** + * Class AssetAccountMapperTest + */ +class AssetAccountMapperTest extends TestCase +{ + /** + * Should return with the given $default account and not the $bad one. + * + * @covers \FireflyIII\Support\Import\Routine\File\AssetAccountMapper + */ + public function testBadAsset(): void + { + $bad = $this->user()->accounts()->where('account_type_id', 4)->inRandomOrder()->first(); + $default = $this->user()->accounts()->where('account_type_id', 3)->inRandomOrder()->first(); + // mock repository: + $repository = $this->mock(AccountRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('findNull')->once()->withArgs([$bad->id])->andReturn($bad); + $repository->shouldReceive('findNull')->once()->withArgs([$default->id])->andReturn($default); + + $mapper = new AssetAccountMapper; + $mapper->setUser($this->user()); + $mapper->setDefaultAccount($default->id); + $result = $mapper->map($bad->id, []); + $this->assertEquals($default->id, $result->id); + } + + /** + * Should return with the given $expected account. + * + * @covers \FireflyIII\Support\Import\Routine\File\AssetAccountMapper + */ + public function testCorrectAsset(): void + { + $expected = $this->user()->accounts()->where('account_type_id', 3)->inRandomOrder()->first(); + + // mock repository: + $repository = $this->mock(AccountRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('findNull')->once()->withArgs([$expected->id])->andReturn($expected); + + $mapper = new AssetAccountMapper; + $mapper->setUser($this->user()); + $result = $mapper->map($expected->id, []); + $this->assertEquals($expected->id, $result->id); + } + + /** + * Should return with the $default account. + * + * @covers \FireflyIII\Support\Import\Routine\File\AssetAccountMapper + */ + public function testEmpty(): void + { + $default = $this->user()->accounts()->where('account_type_id', 3)->inRandomOrder()->first(); + + // mock repository: + $repository = $this->mock(AccountRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('findNull')->once()->withArgs([$default->id])->andReturn($default); + + $mapper = new AssetAccountMapper; + $mapper->setUser($this->user()); + $mapper->setDefaultAccount($default->id); + $result = $mapper->map(null, []); + $this->assertEquals($default->id, $result->id); + + } + + /** + * Should return with the $default account. + * + * @covers \FireflyIII\Support\Import\Routine\File\AssetAccountMapper + */ + public function testEmptyNoDefault(): void + { + $fallback = $this->user()->accounts()->where('account_type_id', 3)->first(); + + // mock repository: + $repository = $this->mock(AccountRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('getAccountsByType')->once()->withArgs([[AccountType::ASSET]])->andReturn( + new Collection([$fallback]) + ); + + $mapper = new AssetAccountMapper; + $mapper->setUser($this->user()); + $result = $mapper->map(null, []); + $this->assertEquals($fallback->id, $result->id); + + } + + /** + * Should search for the given IBAN and return $expected. + * + * @covers \FireflyIII\Support\Import\Routine\File\AssetAccountMapper + */ + public function testFindByIban(): void + { + $searchValue = 'IamIban'; + $expected = $this->user()->accounts()->where('account_type_id', 3)->inRandomOrder()->first(); + // mock repository: + $repository = $this->mock(AccountRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('findByIbanNull')->once()->withArgs([$searchValue, [AccountType::ASSET]])->andReturn($expected); + + $mapper = new AssetAccountMapper; + $mapper->setUser($this->user()); + $result = $mapper->map(0, ['iban' => $searchValue]); + $this->assertEquals($expected->id, $result->id); + } + + /** + * Should search for the given name and return $expected. + * + * @covers \FireflyIII\Support\Import\Routine\File\AssetAccountMapper + */ + public function testFindByName(): void + { + $searchValue = 'AccountName'; + $expected = $this->user()->accounts()->where('account_type_id', 3)->inRandomOrder()->first(); + // mock repository: + $repository = $this->mock(AccountRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('findByName')->once()->withArgs([$searchValue, [AccountType::ASSET]])->andReturn($expected); + + $mapper = new AssetAccountMapper; + $mapper->setUser($this->user()); + $result = $mapper->map(0, ['name' => $searchValue]); + $this->assertEquals($expected->id, $result->id); + } + + /** + * Should search for the given number and return $expected. + * + * @covers \FireflyIII\Support\Import\Routine\File\AssetAccountMapper + */ + public function testFindByNumber(): void + { + $searchValue = '123456'; + $expected = $this->user()->accounts()->where('account_type_id', 3)->inRandomOrder()->first(); + // mock repository: + $repository = $this->mock(AccountRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('findByAccountNumber')->once()->withArgs([$searchValue, [AccountType::ASSET]])->andReturn($expected); + + $mapper = new AssetAccountMapper; + $mapper->setUser($this->user()); + $result = $mapper->map(0, ['number' => $searchValue]); + $this->assertEquals($expected->id, $result->id); + } + +} \ No newline at end of file diff --git a/tests/Unit/Support/Import/Routine/File/CSVProcessorTest.php b/tests/Unit/Support/Import/Routine/File/CSVProcessorTest.php new file mode 100644 index 0000000000..9c274d5b8f --- /dev/null +++ b/tests/Unit/Support/Import/Routine/File/CSVProcessorTest.php @@ -0,0 +1,85 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Support\Import\Routine\File; + + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\ImportJob; +use FireflyIII\Support\Import\Routine\File\CSVProcessor; +use FireflyIII\Support\Import\Routine\File\ImportableConverter; +use FireflyIII\Support\Import\Routine\File\ImportableCreator; +use FireflyIII\Support\Import\Routine\File\LineReader; +use FireflyIII\Support\Import\Routine\File\MappedValuesValidator; +use FireflyIII\Support\Import\Routine\File\MappingConverger; +use Tests\TestCase; + +/** + * Do some end to end testing here, perhaps? + * + * Class CSVProcessorTest + */ +class CSVProcessorTest extends TestCase +{ + /** + * @covers \FireflyIII\Support\Import\Routine\File\CSVProcessor + */ + public function testBasic(): void + { + + // mock all classes: + $lineReader = $this->mock(LineReader::class); + $lineReader->shouldReceive('setImportJob')->once(); + $lineReader->shouldReceive('getLines')->once()->andReturn([]); + + $mappingConverger = $this->mock(MappingConverger::class); + $mappingConverger->shouldReceive('setImportJob')->once(); + $mappingConverger->shouldReceive('converge')->withArgs([[]])->andReturn([])->once(); + $mappingConverger->shouldReceive('getMappedValues')->andReturn([])->once(); + + + $validator = $this->mock(MappedValuesValidator::class); + $validator->shouldReceive('setImportJob')->once(); + $validator->shouldReceive('validate')->andReturn([]); + + $creator = $this->mock(ImportableCreator::class); + $creator->shouldReceive('convertSets')->withArgs([[]])->andReturn([])->once(); + + $converter = $this->mock(ImportableConverter::class); + $converter->shouldReceive('setImportJob')->once(); + $converter->shouldReceive('setMappedValues')->once()->withArgs([[]])->andReturn([]); + $converter->shouldReceive('convert')->withArgs([[]])->once()->andReturn([]); + + + /** @var ImportJob $job */ + $job = $this->user()->importJobs()->first(); + $processor = new CSVProcessor; + $processor->setImportJob($job); + try { + $result = $processor->run(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals([], $result); + } +} \ No newline at end of file diff --git a/tests/Unit/Support/Import/Routine/File/CurrencyMapperTest.php b/tests/Unit/Support/Import/Routine/File/CurrencyMapperTest.php new file mode 100644 index 0000000000..b11708eb3b --- /dev/null +++ b/tests/Unit/Support/Import/Routine/File/CurrencyMapperTest.php @@ -0,0 +1,175 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Support\Import\Routine\File; + + +use FireflyIII\Models\TransactionCurrency; +use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; +use FireflyIII\Support\Import\Routine\File\CurrencyMapper; +use Tests\TestCase; + +/** + * Class CurrencyMapperTest + */ +class CurrencyMapperTest extends TestCase +{ + /** + * @covers \FireflyIII\Support\Import\Routine\File\CurrencyMapper + */ + public function testBasic(): void + { + $currency = TransactionCurrency::inRandomOrder()->first(); + // mock data + $repository = $this->mock(CurrencyRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('findNull')->once()->withArgs([$currency->id])->andReturn($currency); + $mapper = new CurrencyMapper(); + $mapper->setUser($this->user()); + + $result = $mapper->map($currency->id, []); + $this->assertEquals($currency->id, $result->id); + } + + /** + * @covers \FireflyIII\Support\Import\Routine\File\CurrencyMapper + */ + public function testBasicNotFound(): void + { + $currency = TransactionCurrency::inRandomOrder()->first(); + // mock data + $repository = $this->mock(CurrencyRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('findNull')->once()->withArgs([$currency->id])->andReturn(null); + $repository->shouldReceive('store')->once() + ->withArgs([['code' => null, 'name' => null, 'symbol' => null, 'decimal_places' => 2]])->andReturn(null); + $mapper = new CurrencyMapper(); + $mapper->setUser($this->user()); + + $result = $mapper->map($currency->id, []); + $this->assertNull($result); + } + + /** + * @covers \FireflyIII\Support\Import\Routine\File\CurrencyMapper + */ + public function testFindByCode(): void + { + $currency = TransactionCurrency::inRandomOrder()->first(); + // mock data + $repository = $this->mock(CurrencyRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('findByCodeNull')->withArgs([$currency->code]) + ->andReturn($currency)->once(); + + $mapper = new CurrencyMapper(); + $mapper->setUser($this->user()); + + $result = $mapper->map(null, ['code' => $currency->code]); + $this->assertEquals($currency->id, $result->id); + } + + /** + * @covers \FireflyIII\Support\Import\Routine\File\CurrencyMapper + */ + public function testFindByName(): void + { + $currency = TransactionCurrency::inRandomOrder()->first(); + // mock data + $repository = $this->mock(CurrencyRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('findByNameNull')->withArgs([$currency->name]) + ->andReturn($currency)->once(); + + $mapper = new CurrencyMapper(); + $mapper->setUser($this->user()); + + $result = $mapper->map(null, ['name' => $currency->name]); + $this->assertEquals($currency->id, $result->id); + } + + /** + * @covers \FireflyIII\Support\Import\Routine\File\CurrencyMapper + */ + public function testFindBySymbol(): void + { + $currency = TransactionCurrency::inRandomOrder()->first(); + // mock data + $repository = $this->mock(CurrencyRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('findBySymbolNull')->withArgs([$currency->symbol]) + ->andReturn($currency)->once(); + + $mapper = new CurrencyMapper(); + $mapper->setUser($this->user()); + + $result = $mapper->map(null, ['symbol' => $currency->symbol]); + $this->assertEquals($currency->id, $result->id); + } + + /** + * @covers \FireflyIII\Support\Import\Routine\File\CurrencyMapper + */ + public function testFindAndCreate(): void + { + $currency = TransactionCurrency::inRandomOrder()->first(); + // mock data + $repository = $this->mock(CurrencyRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('findBySymbolNull')->withArgs([$currency->symbol])->andReturn(null)->once(); + $repository->shouldReceive('findByCodeNull')->withArgs([$currency->code])->andReturn(null)->once(); + $repository->shouldReceive('findByNameNull')->withArgs([$currency->name])->andReturn(null)->once(); + + // nothing found, mapper will try to create it. + $repository->shouldReceive('store') + ->withArgs([['code' => $currency->code, 'name' => $currency->name, 'symbol' => $currency->symbol,'decimal_places'=>2]]) + ->once()->andReturn($currency); + + $mapper = new CurrencyMapper(); + $mapper->setUser($this->user()); + + $result = $mapper->map(null, ['name' => $currency->name, 'code' => $currency->code, 'symbol' => $currency->symbol]); + $this->assertEquals($currency->id, $result->id); + } + + /** + * @covers \FireflyIII\Support\Import\Routine\File\CurrencyMapper + */ + public function testEmpty(): void + { + + // mock data + $repository = $this->mock(CurrencyRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('store')->once() + ->withArgs([['code' => null, 'name' => null, 'symbol' => null, 'decimal_places' => 2]])->andReturn(null); + + + $mapper = new CurrencyMapper(); + $mapper->setUser($this->user()); + + $result = $mapper->map(null, []); + $this->assertNull($result); + } + +} \ No newline at end of file diff --git a/tests/Unit/Support/Import/Routine/File/ImportableConverterTest.php b/tests/Unit/Support/Import/Routine/File/ImportableConverterTest.php new file mode 100644 index 0000000000..9e8e32f608 --- /dev/null +++ b/tests/Unit/Support/Import/Routine/File/ImportableConverterTest.php @@ -0,0 +1,535 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Support\Import\Routine\File; + + +use Amount; +use Carbon\Carbon; +use FireflyIII\Models\TransactionCurrency; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Support\Import\Placeholder\ImportTransaction; +use FireflyIII\Support\Import\Routine\File\AssetAccountMapper; +use FireflyIII\Support\Import\Routine\File\CurrencyMapper; +use FireflyIII\Support\Import\Routine\File\ImportableConverter; +use FireflyIII\Support\Import\Routine\File\OpposingAccountMapper; +use Mockery; +use Tests\TestCase; + +/** + * todo test foreign currency + * todo test budget (known and unknown) + * todo test category (known and unknown) + * todo test foreign currency + * + * Class ImportableConverterTest + */ +class ImportableConverterTest extends TestCase +{ + /** + * Basic test. Should match a withdrawal. Amount is negative. + * + * @covers \FireflyIII\Support\Import\Routine\File\ImportableConverter + */ + public function testBasic(): void + { + $nullAccount = ['name' => null, 'iban' => null, 'number' => null, 'bic' => null]; + $importable = new ImportTransaction; + $importable->amount = '-45.67'; + $importable->date = '20180917'; + $importable->tags = ['a', 'b', 'c']; + $importables = [$importable]; + + $job = $this->user()->importJobs()->first(); + $job->configuration = [ + 'date-format' => 'Ymd', + ]; + $job->save(); + + // mock used classes: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $assetMapper = $this->mock(AssetAccountMapper::class); + $opposingMapper = $this->mock(OpposingAccountMapper::class); + $currencyMapper = $this->mock(CurrencyMapper::class); + + // get default currency + $euro = TransactionCurrency::whereCode('EUR')->first(); + $usd = TransactionCurrency::whereCode('USD')->first(); + Amount::shouldReceive('getDefaultCurrencyByUser')->andReturn($euro)->once(); + + // set user and config: + $repository->shouldReceive('setUser')->once(); + $assetMapper->shouldReceive('setUser')->once(); + $opposingMapper->shouldReceive('setUser')->once(); + $currencyMapper->shouldReceive('setUser')->once(); + $assetMapper->shouldReceive('setDefaultAccount')->withArgs([0])->once(); + + // respond to mapping call: + $asset = $this->user()->accounts()->where('account_type_id', 3)->first(); + $expense = $this->user()->accounts()->where('account_type_id', 4)->first(); + + $assetMapper->shouldReceive('map')->once()->withArgs([null, $nullAccount])->andReturn($asset); + $opposingMapper->shouldReceive('map')->once()->withArgs([null, '-45.67', $nullAccount])->andReturn($expense); + $currencyMapper->shouldReceive('map')->once()->withArgs([null, ['name' => null, 'code' => null, 'symbol' => null]])->andReturn($usd); + $currencyMapper->shouldReceive('map')->once()->withArgs([null, ['code' => null]])->andReturn(null); + + + $converter = new ImportableConverter; + $converter->setImportJob($job); + $result = $converter->convert($importables); + + // verify content of $result + $this->assertEquals('withdrawal', $result[0]['type']); + $this->assertEquals('2018-09-17', $result[0]['date']); + $this->assertEquals($importable->tags, $result[0]['tags']); + $this->assertEquals($usd->id, $result[0]['transactions'][0]['currency_id']); + } + + /** + * Two asset accounts mean its a transfer. + * + * @covers \FireflyIII\Support\Import\Routine\File\ImportableConverter + */ + public function testBasicDefaultCurrency(): void + { + $nullAccount = ['name' => null, 'iban' => null, 'number' => null, 'bic' => null]; + $importable = new ImportTransaction; + $importable->amount = '45.67'; + $importables = [$importable]; + + $job = $this->user()->importJobs()->first(); + $job->configuration = [ + 'date-format' => 'Ymd', + ]; + $job->save(); + + // mock used classes: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $assetMapper = $this->mock(AssetAccountMapper::class); + $opposingMapper = $this->mock(OpposingAccountMapper::class); + $currencyMapper = $this->mock(CurrencyMapper::class); + + // get default currency + $euro = TransactionCurrency::whereCode('EUR')->first(); + Amount::shouldReceive('getDefaultCurrencyByUser')->andReturn($euro)->once(); + + // set user and config: + $repository->shouldReceive('setUser')->once(); + $assetMapper->shouldReceive('setUser')->once(); + $opposingMapper->shouldReceive('setUser')->once(); + $currencyMapper->shouldReceive('setUser')->once(); + $assetMapper->shouldReceive('setDefaultAccount')->withArgs([0])->once(); + + // respond to mapping call: + $asset = $this->user()->accounts()->where('account_type_id', 3)->first(); + $other = $this->user()->accounts()->where('account_type_id', 3)->where('id', '!=', $asset->id)->first(); + + $assetMapper->shouldReceive('map')->once()->withArgs([null, $nullAccount])->andReturn($asset); + $opposingMapper->shouldReceive('map')->once()->withArgs([null, '45.67', $nullAccount])->andReturn($other); + $currencyMapper->shouldReceive('map')->once()->withArgs([null, ['name' => null, 'code' => null, 'symbol' => null]])->andReturn(null); + $currencyMapper->shouldReceive('map')->once()->withArgs([null, ['code' => null]])->andReturn(null); + + + $converter = new ImportableConverter; + $converter->setImportJob($job); + $result = $converter->convert($importables); + + // verify content of $result + $today = new Carbon(); + $this->assertEquals('transfer', $result[0]['type']); + $this->assertEquals($today->format('Y-m-d'), $result[0]['date']); + $this->assertEquals([], $result[0]['tags']); + $this->assertEquals($euro->id, $result[0]['transactions'][0]['currency_id']); + } + + /** + * Positive amount, so transaction is a deposit. + * + * @covers \FireflyIII\Support\Import\Routine\File\ImportableConverter + */ + public function testBasicDeposit(): void + { + $nullAccount = ['name' => null, 'iban' => null, 'number' => null, 'bic' => null]; + $importable = new ImportTransaction; + $importable->amount = '45.67'; + $importable->date = '20180917'; + $importable->meta['date-book'] = '2018-01-02'; + $importables = [$importable]; + + $job = $this->user()->importJobs()->first(); + $job->configuration = [ + 'date-format' => 'Ymd', + ]; + $job->save(); + + // mock used classes: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $assetMapper = $this->mock(AssetAccountMapper::class); + $opposingMapper = $this->mock(OpposingAccountMapper::class); + $currencyMapper = $this->mock(CurrencyMapper::class); + + // get default currency + $euro = TransactionCurrency::whereCode('EUR')->first(); + $usd = TransactionCurrency::whereCode('USD')->first(); + Amount::shouldReceive('getDefaultCurrencyByUser')->andReturn($euro)->once(); + + // set user and config: + $repository->shouldReceive('setUser')->once(); + $assetMapper->shouldReceive('setUser')->once(); + $opposingMapper->shouldReceive('setUser')->once(); + $currencyMapper->shouldReceive('setUser')->once(); + $assetMapper->shouldReceive('setDefaultAccount')->withArgs([0])->once(); + + // respond to mapping call: + $asset = $this->user()->accounts()->where('account_type_id', 3)->first(); + $revenue = $this->user()->accounts()->where('account_type_id', 5)->first(); + + $assetMapper->shouldReceive('map')->once()->withArgs([null, $nullAccount])->andReturn($asset); + $opposingMapper->shouldReceive('map')->once()->withArgs([null, '45.67', $nullAccount])->andReturn($revenue); + $currencyMapper->shouldReceive('map')->once()->withArgs([null, ['name' => null, 'code' => null, 'symbol' => null]])->andReturn($usd); + $currencyMapper->shouldReceive('map')->once()->withArgs([null, ['code' => null]])->andReturn(null); + + + $converter = new ImportableConverter; + $converter->setImportJob($job); + $result = $converter->convert($importables); + + // verify content of $result + $this->assertEquals('deposit', $result[0]['type']); + $this->assertEquals('2018-09-17', $result[0]['date']); + $this->assertEquals([], $result[0]['tags']); + $this->assertEquals($usd->id, $result[0]['transactions'][0]['currency_id']); + $this->assertEquals($revenue->id, $result[0]['transactions'][0]['source_id']); + $this->assertEquals($asset->id, $result[0]['transactions'][0]['destination_id']); + $this->assertEquals($importable->meta['date-book'], $result[0]['book_date']); + + } + + /** + * Source and destination are the same. Should result in error message. + * + * @covers \FireflyIII\Support\Import\Routine\File\ImportableConverter + */ + public function testBasicSameAssets(): void + { + $nullAccount = ['name' => null, 'iban' => null, 'number' => null, 'bic' => null]; + $importable = new ImportTransaction; + $importable->amount = '-45.67'; + $importable->date = '20180917'; + $importables = [$importable]; + + $job = $this->user()->importJobs()->first(); + $job->configuration = [ + 'date-format' => 'Ymd', + ]; + $job->save(); + + // mock used classes: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $assetMapper = $this->mock(AssetAccountMapper::class); + $opposingMapper = $this->mock(OpposingAccountMapper::class); + $currencyMapper = $this->mock(CurrencyMapper::class); + + // get default currency + $euro = TransactionCurrency::whereCode('EUR')->first(); + $usd = TransactionCurrency::whereCode('USD')->first(); + Amount::shouldReceive('getDefaultCurrencyByUser')->andReturn($euro)->once(); + + // set user and config: + $repository->shouldReceive('setUser')->once(); + $assetMapper->shouldReceive('setUser')->once(); + $opposingMapper->shouldReceive('setUser')->once(); + $currencyMapper->shouldReceive('setUser')->once(); + $assetMapper->shouldReceive('setDefaultAccount')->withArgs([0])->once(); + + // respond to mapping call: + $asset = $this->user()->accounts()->where('account_type_id', 3)->first(); + + $assetMapper->shouldReceive('map')->once()->withArgs([null, $nullAccount])->andReturn($asset); + $opposingMapper->shouldReceive('map')->once()->withArgs([null, '-45.67', $nullAccount])->andReturn($asset); + $currencyMapper->shouldReceive('map')->once()->withArgs([null, ['name' => null, 'code' => null, 'symbol' => null]])->andReturn($usd); + $currencyMapper->shouldReceive('map')->once()->withArgs([null, ['code' => null]])->andReturn(null); + $repository->shouldReceive('addErrorMessage')->withArgs( + [Mockery::any(), + 'Row #1: Source ("' . $asset->name . '", #' . $asset->id . ') and destination ("' . $asset->name . '", #' . $asset->id . ') are the same account.'] + )->once(); + + $converter = new ImportableConverter; + $converter->setImportJob($job); + $result = $converter->convert($importables); + $this->assertEquals([], $result); + } + + /** + * Two asset accounts mean its a transfer. This has a positive amount. + * + * @covers \FireflyIII\Support\Import\Routine\File\ImportableConverter + */ + public function testBasicTransfer(): void + { + $nullAccount = ['name' => null, 'iban' => null, 'number' => null, 'bic' => null]; + $importable = new ImportTransaction; + $importable->amount = '45.67'; + $importable->date = '20180917'; + $importable->billId = 2; // will be ignored because it's not valid. + $importable->billName = 'Some Bill'; // will be included because bill ID is not valid. + $importables = [$importable]; + + $job = $this->user()->importJobs()->first(); + $job->configuration = [ + 'date-format' => 'Ymd', + ]; + $job->save(); + + // mock used classes: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $assetMapper = $this->mock(AssetAccountMapper::class); + $opposingMapper = $this->mock(OpposingAccountMapper::class); + $currencyMapper = $this->mock(CurrencyMapper::class); + + // get default currency + $euro = TransactionCurrency::whereCode('EUR')->first(); + $usd = TransactionCurrency::whereCode('USD')->first(); + Amount::shouldReceive('getDefaultCurrencyByUser')->andReturn($euro)->once(); + + // set user and config: + $repository->shouldReceive('setUser')->once(); + $assetMapper->shouldReceive('setUser')->once(); + $opposingMapper->shouldReceive('setUser')->once(); + $currencyMapper->shouldReceive('setUser')->once(); + $assetMapper->shouldReceive('setDefaultAccount')->withArgs([0])->once(); + + // respond to mapping call: + $asset = $this->user()->accounts()->where('account_type_id', 3)->first(); + $other = $this->user()->accounts()->where('account_type_id', 3)->where('id', '!=', $asset->id)->first(); + + $assetMapper->shouldReceive('map')->once()->withArgs([null, $nullAccount])->andReturn($asset); + $opposingMapper->shouldReceive('map')->once()->withArgs([null, '45.67', $nullAccount])->andReturn($other); + $currencyMapper->shouldReceive('map')->once()->withArgs([null, ['name' => null, 'code' => null, 'symbol' => null]])->andReturn($usd); + $currencyMapper->shouldReceive('map')->once()->withArgs([null, ['code' => null]])->andReturn(null); + + + $converter = new ImportableConverter; + $converter->setImportJob($job); + $result = $converter->convert($importables); + + // verify content of $result + $this->assertEquals('transfer', $result[0]['type']); + $this->assertEquals('2018-09-17', $result[0]['date']); + $this->assertEquals([], $result[0]['tags']); + $this->assertNull($result[0]['bill_id']); + $this->assertEquals($importable->billName, $result[0]['bill_name']); + $this->assertEquals($usd->id, $result[0]['transactions'][0]['currency_id']); + // since amount is positive, $asset recieves the money + $this->assertEquals($other->id, $result[0]['transactions'][0]['source_id']); + $this->assertEquals($asset->id, $result[0]['transactions'][0]['destination_id']); + } + + /** + * Transfer with negative amount flows the other direction. See source_id and destination_id + * + * @covers \FireflyIII\Support\Import\Routine\File\ImportableConverter + */ + public function testBasicTransferNegative(): void + { + $nullAccount = ['name' => null, 'iban' => null, 'number' => null, 'bic' => null]; + $importable = new ImportTransaction; + $importable->amount = '-45.67'; + $importable->date = '20180917'; + $importable->billId = 3; // is added to array of valid values, see below. + $importable->billName = 'Some bill'; // will be ignored because ID is valid. + $importables = [$importable]; + + $validMappings = [ + 'bill-id' => [3], + ]; + + $job = $this->user()->importJobs()->first(); + $job->configuration = [ + 'date-format' => 'Ymd', + ]; + $job->save(); + + // mock used classes: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $assetMapper = $this->mock(AssetAccountMapper::class); + $opposingMapper = $this->mock(OpposingAccountMapper::class); + $currencyMapper = $this->mock(CurrencyMapper::class); + + // get default currency + $euro = TransactionCurrency::whereCode('EUR')->first(); + $usd = TransactionCurrency::whereCode('USD')->first(); + Amount::shouldReceive('getDefaultCurrencyByUser')->andReturn($euro)->once(); + + // set user and config: + $repository->shouldReceive('setUser')->once(); + $assetMapper->shouldReceive('setUser')->once(); + $opposingMapper->shouldReceive('setUser')->once(); + $currencyMapper->shouldReceive('setUser')->once(); + $assetMapper->shouldReceive('setDefaultAccount')->withArgs([0])->once(); + + // respond to mapping call: + $asset = $this->user()->accounts()->where('account_type_id', 3)->first(); + $other = $this->user()->accounts()->where('account_type_id', 3)->where('id', '!=', $asset->id)->first(); + + $assetMapper->shouldReceive('map')->once()->withArgs([null, $nullAccount])->andReturn($asset); + $opposingMapper->shouldReceive('map')->once()->withArgs([null, '-45.67', $nullAccount])->andReturn($other); + $currencyMapper->shouldReceive('map')->once()->withArgs([null, ['name' => null, 'code' => null, 'symbol' => null]])->andReturn($usd); + $currencyMapper->shouldReceive('map')->once()->withArgs([null, ['code' => null]])->andReturn(null); + + + $converter = new ImportableConverter; + $converter->setImportJob($job); + $converter->setMappedValues($validMappings); + $result = $converter->convert($importables); + + // verify content of $result + $this->assertEquals('transfer', $result[0]['type']); + $this->assertEquals('2018-09-17', $result[0]['date']); + $this->assertEquals([], $result[0]['tags']); + $this->assertEquals(3, $result[0]['bill_id']); + $this->assertNull($result[0]['bill_name']); + $this->assertEquals($usd->id, $result[0]['transactions'][0]['currency_id']); + // since amount is negative, $asset sends the money + $this->assertEquals($asset->id, $result[0]['transactions'][0]['source_id']); + $this->assertEquals($other->id, $result[0]['transactions'][0]['destination_id']); + } + + /** + * When source and dest are weird account types, will give error. + * + * @covers \FireflyIII\Support\Import\Routine\File\ImportableConverter + */ + public function testBasicWeirdAccounts(): void + { + $nullAccount = ['name' => null, 'iban' => null, 'number' => null, 'bic' => null]; + $importable = new ImportTransaction; + $importable->amount = '-45.67'; + $importable->date = '20180917'; + $importables = [$importable]; + + $job = $this->user()->importJobs()->first(); + $job->configuration = [ + 'date-format' => 'Ymd', + ]; + $job->save(); + + // mock used classes: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $assetMapper = $this->mock(AssetAccountMapper::class); + $opposingMapper = $this->mock(OpposingAccountMapper::class); + $currencyMapper = $this->mock(CurrencyMapper::class); + + // get default currency + $euro = TransactionCurrency::whereCode('EUR')->first(); + $usd = TransactionCurrency::whereCode('USD')->first(); + Amount::shouldReceive('getDefaultCurrencyByUser')->andReturn($euro)->once(); + + // set user and config: + $repository->shouldReceive('setUser')->once(); + $assetMapper->shouldReceive('setUser')->once(); + $opposingMapper->shouldReceive('setUser')->once(); + $currencyMapper->shouldReceive('setUser')->once(); + $assetMapper->shouldReceive('setDefaultAccount')->withArgs([0])->once(); + + // respond to mapping call: + $asset = $this->user()->accounts()->where('account_type_id', 6)->first(); + $other = $this->user()->accounts()->where('account_type_id', 2)->where('id', '!=', $asset)->first(); + + $assetMapper->shouldReceive('map')->once()->withArgs([null, $nullAccount])->andReturn($asset); + $opposingMapper->shouldReceive('map')->once()->withArgs([null, '-45.67', $nullAccount])->andReturn($other); + $currencyMapper->shouldReceive('map')->once()->withArgs([null, ['name' => null, 'code' => null, 'symbol' => null]])->andReturn($usd); + $currencyMapper->shouldReceive('map')->once()->withArgs([null, ['code' => null]])->andReturn(null); + $repository->shouldReceive('addErrorMessage')->withArgs( + [Mockery::any(), 'Row #1: Cannot determine transaction type. Source account is a Initial balance account, destination is a Cash account'] + )->once(); + + $converter = new ImportableConverter; + $converter->setImportJob($job); + $result = $converter->convert($importables); + $this->assertEquals([], $result); + } + + /** + * Submit no amount information. + * + * @covers \FireflyIII\Support\Import\Routine\File\ImportableConverter + */ + public function testEmpty(): void + { + + $job = $this->user()->importJobs()->first(); + $job->configuration = []; + $job->save(); + + // mock used classes: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $assetMapper = $this->mock(AssetAccountMapper::class); + $opposingMapper = $this->mock(OpposingAccountMapper::class); + $currencyMapper = $this->mock(CurrencyMapper::class); + $euro = TransactionCurrency::whereCode('EUR')->first(); + Amount::shouldReceive('getDefaultCurrencyByUser')->andReturn($euro)->once(); + $repository->shouldReceive('setUser')->once(); + $assetMapper->shouldReceive('setUser')->once(); + $opposingMapper->shouldReceive('setUser')->once(); + $currencyMapper->shouldReceive('setUser')->once(); + $assetMapper->shouldReceive('setDefaultAccount')->withArgs([0])->once(); + + $converter = new ImportableConverter; + $converter->setImportJob($job); + } + + /** + * Basic input until it stops crashing. + * + * @covers \FireflyIII\Support\Import\Routine\File\ImportableConverter + */ + public function testNoAmount(): void + { + $importable = new ImportTransaction; + $importables = [$importable]; + $job = $this->user()->importJobs()->first(); + $job->configuration = []; + $job->save(); + + // mock used classes: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $assetMapper = $this->mock(AssetAccountMapper::class); + $opposingMapper = $this->mock(OpposingAccountMapper::class); + $currencyMapper = $this->mock(CurrencyMapper::class); + $euro = TransactionCurrency::whereCode('EUR')->first(); + Amount::shouldReceive('getDefaultCurrencyByUser')->andReturn($euro)->once(); + $repository->shouldReceive('setUser')->once(); + $assetMapper->shouldReceive('setUser')->once(); + $opposingMapper->shouldReceive('setUser')->once(); + $currencyMapper->shouldReceive('setUser')->once(); + $assetMapper->shouldReceive('setDefaultAccount')->withArgs([0])->once(); + $repository->shouldReceive('addErrorMessage')->withArgs([Mockery::any(), 'Row #1: No transaction amount information.'])->once(); + + $converter = new ImportableConverter; + $converter->setImportJob($job); + $result = $converter->convert($importables); + $this->assertEquals([], $result); + } + +} \ No newline at end of file diff --git a/tests/Unit/Support/Import/Routine/File/ImportableCreatorTest.php b/tests/Unit/Support/Import/Routine/File/ImportableCreatorTest.php new file mode 100644 index 0000000000..3db3f1ccc6 --- /dev/null +++ b/tests/Unit/Support/Import/Routine/File/ImportableCreatorTest.php @@ -0,0 +1,64 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Support\Import\Routine\File; + + +use FireflyIII\Support\Import\Placeholder\ColumnValue; +use FireflyIII\Support\Import\Placeholder\ImportTransaction; +use FireflyIII\Support\Import\Routine\File\ImportableCreator; +use Tests\TestCase; + +/** + * Class ImportableCreatorTest + */ +class ImportableCreatorTest extends TestCase +{ + /** + * @covers \FireflyIII\Support\Import\Routine\File\ImportableCreator + */ + public function testConvertSets(): void + { + $columnValue =new ColumnValue(); + $columnValue->setOriginalRole('account-name'); + $columnValue->setRole('account-id'); + $columnValue->setValue('Checking Account'); + $columnValue->setMappedValue(1); + + $input = [ + [ + $columnValue + ] + ]; + + + $creator = new ImportableCreator; + $result = $creator->convertSets($input); + + $this->assertCount(1, $result); + $this->assertInstanceOf(ImportTransaction::class, $result[0]); + $this->assertEquals(1, $result[0]->accountId); + + } + +} \ No newline at end of file diff --git a/tests/Unit/Support/Import/Routine/File/LineReaderTest.php b/tests/Unit/Support/Import/Routine/File/LineReaderTest.php new file mode 100644 index 0000000000..1ca935f984 --- /dev/null +++ b/tests/Unit/Support/Import/Routine/File/LineReaderTest.php @@ -0,0 +1,102 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Support\Import\Routine\File; + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Helpers\Attachments\AttachmentHelperInterface; +use FireflyIII\Import\Specifics\IngDescription; +use FireflyIII\Models\Attachment; +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Support\Import\Routine\File\LineReader; +use Illuminate\Support\Collection; +use Tests\TestCase; + +/** + * Class LineReaderTest + */ +class LineReaderTest extends TestCase +{ + /** + * @covers \FireflyIII\Support\Import\Routine\File\LineReader + */ + public function testGetLines(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'linerA' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = [ + 'specifics' => [ + 'IngDescription' => 1, + 'BadSpecific' => 1, + ], + 'has-headers' => true, + 'delimiter' => ',', + ]; + $job->save(); + + $att = new Attachment; + $att->filename = 'import_file'; + $att->user_id = $this->user()->id; + $att->attachable_id = $job->id; + $att->attachable_type = ImportJob::class; + $att->md5 = md5('hello'); + $att->mime = 'fake'; + $att->size = 3; + $att->save(); + + // mock repositories: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $attachments = $this->mock(AttachmentHelperInterface::class); + $specific = $this->mock(IngDescription::class); + + // fake file content: + $content = "header1,header2,header3\ncolumn1,column2,column3\nA,B,C"; + $specifics = [['column1', 'column2', 'column3'], ['A', 'B', 'C']]; + + // mock calls and returns: + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('getAttachments')->once()->andReturn(new Collection([$att])); + $attachments->shouldReceive('getAttachmentContent')->andReturn($content)->once(); + $repository->shouldReceive('getConfiguration')->once()->andReturn($job->configuration); + + // expect the rows to be run throught the specific. + $specific->shouldReceive('run')->withArgs([$specifics[0]])->andReturn($specifics[0])->once(); + $specific->shouldReceive('run')->withArgs([$specifics[1]])->andReturn($specifics[1])->once(); + + $lineReader = new LineReader; + $lineReader->setImportJob($job); + try { + $lines = $lineReader->getLines(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals($specifics, $lines); + } + +} \ No newline at end of file diff --git a/tests/Unit/Support/Import/Routine/File/MappedValuesValidatorTest.php b/tests/Unit/Support/Import/Routine/File/MappedValuesValidatorTest.php new file mode 100644 index 0000000000..9e8ff0da22 --- /dev/null +++ b/tests/Unit/Support/Import/Routine/File/MappedValuesValidatorTest.php @@ -0,0 +1,127 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Support\Import\Routine\File; + + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\Bill\BillRepositoryInterface; +use FireflyIII\Repositories\Budget\BudgetRepositoryInterface; +use FireflyIII\Repositories\Category\CategoryRepositoryInterface; +use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Support\Import\Routine\File\MappedValuesValidator; +use Illuminate\Support\Collection; +use stdClass; +use Tests\TestCase; + +/** + * Class MappedValuesValidatorTest + */ +class MappedValuesValidatorTest extends TestCase +{ + /** + * @covers \FireflyIII\Support\Import\Routine\File\MappedValuesValidator + */ + public function testValidateBasic(): void + { + + $toValidate = [ + 'opposing-id' => [1, 2, 3], + 'account-id' => [4, 5, 6], + 'currency-id' => [7, 8, 9], + 'foreign-currency-id' => [10, 11, 12], + 'bill-id' => [13, 14, 15], + 'budget-id' => [16, 17, 18], + 'category-id' => [19, 20, 21], + ]; + $return = [ + 'opposing-id' => new Collection([$this->objectWithId(1), $this->objectWithId(2)]), + 'account-id' => new Collection([$this->objectWithId(4), $this->objectWithId(5)]), + 'currency-id' => new Collection([$this->objectWithId(7), $this->objectWithId(9)]), + 'foreign-currency-id' => new Collection([$this->objectWithId(10), $this->objectWithId(11)]), + 'bill-id' => new Collection([$this->objectWithId(13), $this->objectWithId(15)]), + 'budget-id' => new Collection([$this->objectWithId(16), $this->objectWithId(17)]), + 'category-id' => new Collection([$this->objectWithId(19), $this->objectWithId(21)]), + ]; + // mock stuff: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); + $billRepos = $this->mock(BillRepositoryInterface::class); + $budgetRepos = $this->mock(BudgetRepositoryInterface::class); + $catRepos = $this->mock(CategoryRepositoryInterface::class); + + // should receive a lot of stuff: + $repository->shouldReceive('setUser')->once(); + $accountRepos->shouldReceive('setUser')->once(); + $currencyRepos->shouldReceive('setUser')->once(); + $billRepos->shouldReceive('setUser')->once(); + $budgetRepos->shouldReceive('setUser')->once(); + $catRepos->shouldReceive('setUser')->once(); + + $accountRepos->shouldReceive('getAccountsById')->once()->withArgs([$toValidate['account-id']])->andReturn($return['account-id']); + $accountRepos->shouldReceive('getAccountsById')->once()->withArgs([$toValidate['opposing-id']])->andReturn($return['opposing-id']); + $currencyRepos->shouldReceive('getByIds')->once()->withArgs([$toValidate['currency-id']])->andReturn($return['currency-id']); + $currencyRepos->shouldReceive('getByIds')->once()->withArgs([$toValidate['foreign-currency-id']])->andReturn($return['foreign-currency-id']); + $billRepos->shouldReceive('getByIds')->once()->withArgs([$toValidate['bill-id']])->andReturn($return['bill-id']); + $budgetRepos->shouldReceive('getByIds')->once()->withArgs([$toValidate['budget-id']])->andReturn($return['budget-id']); + $catRepos->shouldReceive('getByIds')->once()->withArgs([$toValidate['category-id']])->andReturn($return['category-id']); + + + $expected = [ + 'opposing-id' => [1, 2], + 'account-id' => [4, 5], + 'currency-id' => [7, 9], + 'foreign-currency-id' => [10, 11], + 'bill-id' => [13, 15], + 'budget-id' => [16, 17], + 'category-id' => [19, 21], + ]; + $validator = new MappedValuesValidator; + $validator->setImportJob($this->user()->importJobs()->first()); + + try { + $result = $validator->validate($toValidate); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + $this->assertEquals($expected, $result); + + } + + /** + * @param int $id + * + * @return stdClass + */ + private function objectWithId(int $id): stdClass + { + $obj = new stdClass(); + $obj->id = $id; + + return $obj; + } + +} \ No newline at end of file diff --git a/tests/Unit/Support/Import/Routine/File/MappingConvergerTest.php b/tests/Unit/Support/Import/Routine/File/MappingConvergerTest.php new file mode 100644 index 0000000000..e6a56968aa --- /dev/null +++ b/tests/Unit/Support/Import/Routine/File/MappingConvergerTest.php @@ -0,0 +1,154 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Support\Import\Routine\File; + + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\ImportJob; +use FireflyIII\Support\Import\Routine\File\MappingConverger; +use Tests\TestCase; + +/** + * Class MappingConvergerTest + */ +class MappingConvergerTest extends TestCase +{ + /** + * @covers \FireflyIII\Support\Import\Routine\File\MappingConverger + */ + public function testConverge(): void + { + + // configuration + $config = [ + 'column-roles' => [ + 0 => 'account-name', + 1 => 'bill-name', + 2 => 'budget-name', + 3 => 'currency-code', + 4 => 'category-name', + 5 => 'foreign-currency-code', + 6 => 'opposing-number', + 7 => 'description', + 8 => 'opposing-iban', + ], + 'column-mapping-config' => [ + 0 => [ + 'Checking Account' => 1, + ], + 1 => [ + 'BillX' => 2, + ], + 2 => [ + 'BudgetX' => 2, + ], + 3 => [ + 'EUR' => 7, + ], + 4 => [ + 'CategoryX' => 2, + ], + 5 => [ + 'USD' => 4, + ], + 6 => [ + 'SomeNumber' => 3, + ], + 8 => [ + 'IBANX' => 2, + ], + ], + 'column-do-mapping' => [ + 0 => true, + 1 => true, + 2 => true, + 3 => true, + 4 => true, + 5 => true, + 6 => true, + 7 => false, + 8 => false, + ], + ]; + + // just one line to process (should hit everything). + $lines = [ + [ + 0 => 'Checking Account', + 1 => 'BillX', + 2 => 'BudgetX', + 3 => 'EUR', + 4 => 'CategoryX', + 5 => 'USD', + 6 => 'SomeNumber', + 7 => 'I am a description', + 8 => 'IBANX' + ], + [ + 0 => 'CheckingX Account', + 1 => 'BillXA', + 2 => 'BudgetBX', + 3 => 'EUD', + 4 => 'CategoryX', + 5 => 'USA', + 6 => 'SomeANumber', + 7 => 'I am X description', + 8 => 'IBANXX' + ], + ]; + + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'linerB' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'fake'; + $job->file_type = ''; + $job->configuration = $config; + $job->save(); + + + $converger = new MappingConverger; + $converger->setImportJob($job); + try { + $result = $converger->converge($lines); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + // do some comparing, we know what to expect. + + // line 0, column 0 is the account name. + $this->assertEquals($lines[0][0], $result[0][0]->getValue()); + $this->assertEquals($config['column-roles'][0], $result[0][0]->getOriginalRole()); + $this->assertEquals('account-id', $result[0][0]->getRole()); // role changed due to mapping. + $this->assertEquals(1, $result[0][0]->getMappedValue()); // can see which value it was given. + + // line 1, column 0 is the account name, but it could not be mapped. + $this->assertEquals($lines[1][0], $result[1][0]->getValue()); + $this->assertEquals($config['column-roles'][0], $result[1][0]->getOriginalRole()); + $this->assertEquals($config['column-roles'][0], $result[1][0]->getRole()); // role did not change, no mapping. + $this->assertEquals(0, $result[1][0]->getMappedValue()); // value of mapping is 0. + } + +} \ No newline at end of file diff --git a/tests/Unit/Support/Import/Routine/File/OpposingAccountMapperTest.php b/tests/Unit/Support/Import/Routine/File/OpposingAccountMapperTest.php new file mode 100644 index 0000000000..f41f09289c --- /dev/null +++ b/tests/Unit/Support/Import/Routine/File/OpposingAccountMapperTest.php @@ -0,0 +1,219 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Support\Import\Routine\File; + + +use FireflyIII\Models\Account; +use FireflyIII\Models\AccountType; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Support\Import\Routine\File\OpposingAccountMapper; +use Tests\TestCase; + +/** + * Class OpposingAccountMapperTest + */ +class OpposingAccountMapperTest extends TestCase +{ + /** + * + * Should return account with given ID (which is of correct type). + * + * @covers \FireflyIII\Support\Import\Routine\File\OpposingAccountMapper + */ + public function testAccountId(): void + { + $expected = $this->user()->accounts()->where('account_type_id', 4)->inRandomOrder()->first(); + $amount = '-12.34'; + $repository = $this->mock(AccountRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('findNull')->andReturn($expected)->once(); + $mapper = new OpposingAccountMapper; + $mapper->setUser($this->user()); + $mapper->map(1, $amount, []); + } + + /** + * + * Should return account with given ID (which is of wrong account type). + * Will continue the search or store a revenue account with that name. + * + * @covers \FireflyIII\Support\Import\Routine\File\OpposingAccountMapper + */ + public function testAccountIdBadType(): void + { + $expected = $this->user()->accounts()->where('account_type_id', 5)->inRandomOrder()->first(); + $expected->iban = null; + $expected->save(); + $amount = '-12.34'; + $expectedArgs = [ + 'name' => $expected->name, + 'iban' => null, + 'accountNumber' => null, + 'account_type_id' => null, + 'accountType' => AccountType::EXPENSE, + 'active' => true, + 'BIC' => null, + ]; + $repository = $this->mock(AccountRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('findNull')->andReturn($expected)->once(); + $repository->shouldReceive('findByName')->withArgs([$expected->name, [AccountType::EXPENSE]])->andReturnNull(); + $repository->shouldReceive('findByName')->withArgs([$expected->name, [AccountType::ASSET]])->andReturnNull(); + $repository->shouldReceive('store')->withArgs([$expectedArgs])->once() + ->andReturn(new Account); + + + $mapper = new OpposingAccountMapper; + $mapper->setUser($this->user()); + $mapper->map(1, $amount, []); + } + + /** + * + * Should return account with given ID (which is of wrong account type). + * Will continue the search or store a revenue account with that name. + * + * @covers \FireflyIII\Support\Import\Routine\File\OpposingAccountMapper + */ + public function testAccountIdBadTypeIban(): void + { + $expected = $this->user()->accounts()->where('account_type_id', 5)->inRandomOrder()->first(); + $expected->iban = 'AD1200012030200359100100'; + $expected->save(); + + $amount = '-12.34'; + $expectedArgs = [ + 'name' => $expected->name, + 'iban' => $expected->iban, + 'accountNumber' => null, + 'account_type_id' => null, + 'accountType' => AccountType::EXPENSE, + 'active' => true, + 'BIC' => null, + ]; + $repository = $this->mock(AccountRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('findNull')->andReturn($expected)->once(); + $repository->shouldReceive('findByIbanNull')->withArgs([$expected->iban, [AccountType::EXPENSE]])->andReturnNull(); + $repository->shouldReceive('findByIbanNull')->withArgs([$expected->iban, [AccountType::ASSET]])->andReturnNull(); + $repository->shouldReceive('findByName')->withArgs([$expected->name, [AccountType::EXPENSE]])->andReturnNull(); + $repository->shouldReceive('findByName')->withArgs([$expected->name, [AccountType::ASSET]])->andReturnNull(); + $repository->shouldReceive('store')->withArgs([$expectedArgs])->once() + ->andReturn(new Account); + + + $mapper = new OpposingAccountMapper; + $mapper->setUser($this->user()); + $mapper->map(1, $amount, []); + } + + /** + * Amount = negative + * ID = null + * other data = null + * Should call store() with "(no name") for expense account + * + * @covers \FireflyIII\Support\Import\Routine\File\OpposingAccountMapper + */ + public function testBasic(): void + { + $amount = '-12.34'; + $expectedArgs = [ + 'name' => '(no name)', + 'iban' => null, + 'accountNumber' => null, + 'account_type_id' => null, + 'accountType' => AccountType::EXPENSE, + 'active' => true, + 'BIC' => null, + ]; + + $repository = $this->mock(AccountRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('store')->withArgs([$expectedArgs])->once() + ->andReturn(new Account); + + + $mapper = new OpposingAccountMapper; + $mapper->setUser($this->user()); + $mapper->map(null, $amount, []); + } + + /** + * Amount = negative + * ID = null + * other data = null + * Should call store() with "(no name") for expense account + * + * @covers \FireflyIII\Support\Import\Routine\File\OpposingAccountMapper + */ + public function testFindByAccountNumber(): void + { + $expected = $this->user()->accounts()->where('account_type_id', 4)->inRandomOrder()->first(); + $amount = '-12.34'; + $repository = $this->mock(AccountRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('findByAccountNumber')->withArgs(['12345', [AccountType::EXPENSE]]) + ->andReturn($expected)->once(); + + + $mapper = new OpposingAccountMapper; + $mapper->setUser($this->user()); + $result = $mapper->map(null, $amount, ['number' => '12345']); + $this->assertEquals($result->id, $expected->id); + } + + /** + * Amount = positive + * ID = null + * other data = null + * Should call store() with "(no name") for revenue account + * + * @covers \FireflyIII\Support\Import\Routine\File\OpposingAccountMapper + */ + public function testBasicPos(): void + { + $amount = '12.34'; + $expectedArgs = [ + 'name' => '(no name)', + 'iban' => null, + 'accountNumber' => null, + 'account_type_id' => null, + 'accountType' => AccountType::REVENUE, + 'active' => true, + 'BIC' => null, + ]; + + $repository = $this->mock(AccountRepositoryInterface::class); + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('store')->withArgs([$expectedArgs])->once() + ->andReturn(new Account); + + + $mapper = new OpposingAccountMapper; + $mapper->setUser($this->user()); + $mapper->map(null, $amount, []); + } + +} \ No newline at end of file diff --git a/tests/Unit/Support/Import/Routine/Spectre/StageAuthenticatedHandlerTest.php b/tests/Unit/Support/Import/Routine/Spectre/StageAuthenticatedHandlerTest.php new file mode 100644 index 0000000000..99bc1e4a3b --- /dev/null +++ b/tests/Unit/Support/Import/Routine/Spectre/StageAuthenticatedHandlerTest.php @@ -0,0 +1,450 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Support\Import\Routine\Spectre; + + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\ImportJob; +use FireflyIII\Models\Preference; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Services\Spectre\Object\Account as SpectreAccount; +use FireflyIII\Services\Spectre\Object\Attempt; +use FireflyIII\Services\Spectre\Object\Holder; +use FireflyIII\Services\Spectre\Object\Login; +use FireflyIII\Services\Spectre\Request\ListAccountsRequest; +use FireflyIII\Services\Spectre\Request\ListLoginsRequest; +use FireflyIII\Support\Import\Routine\Spectre\StageAuthenticatedHandler; +use Mockery; +use Preferences; +use Tests\TestCase; + +/** + * Class StageAuthenticatedHandlerTest + */ +class StageAuthenticatedHandlerTest extends TestCase +{ + /** + * Already have logins in configuration. + * + * @covers \FireflyIII\Support\Import\Routine\Spectre\StageAuthenticatedHandler + */ + public function testRunBasicHaveLogins(): void + { + // fake login: + $holder = new Holder([]); + $attempt = new Attempt( + [ + 'api_mode' => 'x', + 'api_version' => 4, + 'automatic_fetch' => true, + 'categorize' => true, + 'created_at' => '2018-05-21 12:00:00', + 'consent_given_at' => '2018-05-21 12:00:00', + 'consent_types' => ['transactions'], + 'custom_fields' => [], + 'daily_refresh' => true, + 'device_type' => 'mobile', + 'user_agent' => 'Mozilla/x', + 'remote_ip' => '127.0.0.1', + 'exclude_accounts' => [], + 'fail_at' => '2018-05-21 12:00:00', + 'fail_error_class' => 'err', + 'fail_message' => 'message', + 'fetch_scopes' => [], + 'finished' => true, + 'finished_recent' => true, + 'from_date' => '2018-05-21 12:00:00', + 'id' => 1, + 'interactive' => true, + 'locale' => 'en', + 'partial' => true, + 'show_consent_confirmation' => true, + 'stages' => [], + 'store_credentials' => true, + 'success_at' => '2018-05-21 12:00:00', + 'to_date' => '2018-05-21 12:00:00', + 'updated_at' => '2018-05-21 12:00:00', + ] + ); + $login = new Login( + [ + 'consent_given_at' => '2018-05-21 12:00:00', + 'consent_types' => ['transactions'], + 'country_code' => 'NL', + 'created_at' => '2018-05-21 12:00:00', + 'updated_at' => '2018-05-21 12:00:00', + 'customer_id' => '1', + 'daily_refresh' => true, + 'holder_info' => $holder->toArray(), + 'id' => 1234, + 'last_attempt' => $attempt->toArray(), + 'last_success_at' => '2018-05-21 12:00:00', + 'next_refresh_possible_at' => '2018-05-21 12:00:00', + 'provider_code' => 'XF', + 'provider_id' => '123', + 'provider_name' => 'Fake', + 'show_consent_confirmation' => true, + 'status' => 'active', + 'store_credentials' => true, + ] + ); + + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'sa_a_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = [ + 'all-logins' => [ + $login->toArray(), + ], + 'selected-login' => 1234, + ]; + $job->save(); + + // needs to be a full spectre account this time. + $spectreAccount = new SpectreAccount( + [ + 'id' => 1234, + 'login_id' => 5678, + 'currency_code' => 'EUR', + 'balance' => 1000, + 'name' => 'Fake Spectre Account', + 'nature' => 'account', + 'created_at' => '2018-01-01 12:12:12', + 'updated_at' => '2018-01-01 12:12:12', + 'extra' => [], + ] + ); + + // mock repository: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $laRequest = $this->mock(ListAccountsRequest::class); + + // mock calls: + $repository->shouldReceive('setUser')->once(); + $laRequest->shouldReceive('setUser')->once(); + $laRequest->shouldReceive('setLogin')->withArgs([Mockery::any()])->once(); + $laRequest->shouldReceive('call')->once(); + $laRequest->shouldReceive('getAccounts')->once()->andReturn([$spectreAccount]); + + $expected = [ + 'all-logins' => [ + $login->toArray(), + ], + 'selected-login' => 1234, + 'accounts' => [ + 0 => $spectreAccount->toArray(), + ], + ]; + + $repository->shouldReceive('setConfiguration') + ->withArgs([Mockery::any(), $expected])->once(); + + $handler = new StageAuthenticatedHandler; + $handler->setImportJob($job); + try { + $handler->run(); + } catch (FireflyException $e) { + $this->assertFalse(true, $e->getMessage()); + } + } + + /** + * Already have logins in configuration, but none selected. + * + * @covers \FireflyIII\Support\Import\Routine\Spectre\StageAuthenticatedHandler + */ + public function testRunBasicHaveLoginsNull(): void + { + // fake login: + $holder = new Holder([]); + $attempt = new Attempt( + [ + 'api_mode' => 'x', + 'api_version' => 4, + 'automatic_fetch' => true, + 'categorize' => true, + 'created_at' => '2018-05-21 12:00:00', + 'consent_given_at' => '2018-05-21 12:00:00', + 'consent_types' => ['transactions'], + 'custom_fields' => [], + 'daily_refresh' => true, + 'device_type' => 'mobile', + 'user_agent' => 'Mozilla/x', + 'remote_ip' => '127.0.0.1', + 'exclude_accounts' => [], + 'fail_at' => '2018-05-21 12:00:00', + 'fail_error_class' => 'err', + 'fail_message' => 'message', + 'fetch_scopes' => [], + 'finished' => true, + 'finished_recent' => true, + 'from_date' => '2018-05-21 12:00:00', + 'id' => 1, + 'interactive' => true, + 'locale' => 'en', + 'partial' => true, + 'show_consent_confirmation' => true, + 'stages' => [], + 'store_credentials' => true, + 'success_at' => '2018-05-21 12:00:00', + 'to_date' => '2018-05-21 12:00:00', + 'updated_at' => '2018-05-21 12:00:00', + ] + ); + $login = new Login( + [ + 'consent_given_at' => '2018-05-21 12:00:00', + 'consent_types' => ['transactions'], + 'country_code' => 'NL', + 'created_at' => '2018-05-21 12:00:00', + 'updated_at' => '2018-05-21 12:00:00', + 'customer_id' => '1', + 'daily_refresh' => true, + 'holder_info' => $holder->toArray(), + 'id' => 1234, + 'last_attempt' => $attempt->toArray(), + 'last_success_at' => '2018-05-21 12:00:00', + 'next_refresh_possible_at' => '2018-05-21 12:00:00', + 'provider_code' => 'XF', + 'provider_id' => '123', + 'provider_name' => 'Fake', + 'show_consent_confirmation' => true, + 'status' => 'active', + 'store_credentials' => true, + ] + ); + + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'sa_a_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = [ + 'all-logins' => [ + $login->toArray(), + ], + 'selected-login' => 0, + ]; + $job->save(); + + // needs to be a full spectre account this time. + $spectreAccount = new SpectreAccount( + [ + 'id' => 1234, + 'login_id' => 5678, + 'currency_code' => 'EUR', + 'balance' => 1000, + 'name' => 'Fake Spectre Account', + 'nature' => 'account', + 'created_at' => '2018-01-01 12:12:12', + 'updated_at' => '2018-01-01 12:12:12', + 'extra' => [], + ] + ); + + // mock repository: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $laRequest = $this->mock(ListAccountsRequest::class); + + // mock calls: + $repository->shouldReceive('setUser')->once(); + $laRequest->shouldReceive('setUser')->once(); + $laRequest->shouldReceive('setLogin')->withArgs([Mockery::any()])->once(); + $laRequest->shouldReceive('call')->once(); + $laRequest->shouldReceive('getAccounts')->once()->andReturn([$spectreAccount]); + + $expected = [ + 'all-logins' => [ + $login->toArray(), + ], + 'selected-login' => 0, + 'accounts' => [ + 0 => $spectreAccount->toArray(), + ], + ]; + + $repository->shouldReceive('setConfiguration') + ->withArgs([Mockery::any(), $expected])->once(); + + $handler = new StageAuthenticatedHandler; + $handler->setImportJob($job); + try { + $handler->run(); + } catch (FireflyException $e) { + $this->assertFalse(true, $e->getMessage()); + } + } + + /** + * No logins in config, will grab them from Spectre. + * + * @covers \FireflyIII\Support\Import\Routine\Spectre\StageAuthenticatedHandler + */ + public function testRunBasicZeroLogins(): void + { + // fake login: + $holder = new Holder([]); + $attempt = new Attempt( + [ + 'api_mode' => 'x', + 'api_version' => 4, + 'automatic_fetch' => true, + 'categorize' => true, + 'created_at' => '2018-05-21 12:00:00', + 'consent_given_at' => '2018-05-21 12:00:00', + 'consent_types' => ['transactions'], + 'custom_fields' => [], + 'daily_refresh' => true, + 'device_type' => 'mobile', + 'user_agent' => 'Mozilla/x', + 'remote_ip' => '127.0.0.1', + 'exclude_accounts' => [], + 'fail_at' => '2018-05-21 12:00:00', + 'fail_error_class' => 'err', + 'fail_message' => 'message', + 'fetch_scopes' => [], + 'finished' => true, + 'finished_recent' => true, + 'from_date' => '2018-05-21 12:00:00', + 'id' => 1, + 'interactive' => true, + 'locale' => 'en', + 'partial' => true, + 'show_consent_confirmation' => true, + 'stages' => [], + 'store_credentials' => true, + 'success_at' => '2018-05-21 12:00:00', + 'to_date' => '2018-05-21 12:00:00', + 'updated_at' => '2018-05-21 12:00:00', + ] + ); + $login = new Login( + [ + 'consent_given_at' => '2018-05-21 12:00:00', + 'consent_types' => ['transactions'], + 'country_code' => 'NL', + 'created_at' => '2018-05-21 12:00:00', + 'updated_at' => '2018-05-21 12:00:00', + 'customer_id' => '1', + 'daily_refresh' => true, + 'holder_info' => $holder->toArray(), + 'id' => 1234, + 'last_attempt' => $attempt->toArray(), + 'last_success_at' => '2018-05-21 12:00:00', + 'next_refresh_possible_at' => '2018-05-21 12:00:00', + 'provider_code' => 'XF', + 'provider_id' => '123', + 'provider_name' => 'Fake', + 'show_consent_confirmation' => true, + 'status' => 'active', + 'store_credentials' => true, + ] + ); + + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'sa_a_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = [ + 'all-logins' => [], + 'selected-login' => 0, + ]; + $job->save(); + + // needs to be a full spectre account this time. + $spectreAccount = new SpectreAccount( + [ + 'id' => 1234, + 'login_id' => 5678, + 'currency_code' => 'EUR', + 'balance' => 1000, + 'name' => 'Fake Spectre Account', + 'nature' => 'account', + 'created_at' => '2018-01-01 12:12:12', + 'updated_at' => '2018-01-01 12:12:12', + 'extra' => [], + ] + ); + // mock preference + $fakeCustomerPreference = new Preference; + $fakeCustomerPreference->name = 'spectre_customer'; + $fakeCustomerPreference->data = [ + 'id' => 1, + 'identifier' => 'fake', + 'secret' => 'Dumbledore dies', + ]; + + // mock call for preferences + Preferences::shouldReceive('getForUser')->once()->withArgs([Mockery::any(), 'spectre_customer', null])->andReturn($fakeCustomerPreference); + + // mock repository: + $repository = $this->mock(ImportJobRepositoryInterface::class); + $laRequest = $this->mock(ListAccountsRequest::class); + $llRequest = $this->mock(ListLoginsRequest::class); + + // mock calls: + $repository->shouldReceive('setUser')->once(); + $laRequest->shouldReceive('setUser')->once(); + $laRequest->shouldReceive('setLogin')->withArgs([Mockery::any()])->once(); + $laRequest->shouldReceive('call')->once(); + $laRequest->shouldReceive('getAccounts')->once()->andReturn([$spectreAccount]); + + // mock calls for list logins (return empty list for now). + $llRequest->shouldReceive('setUser')->once(); + $llRequest->shouldReceive('setCustomer')->once(); + $llRequest->shouldReceive('call')->once(); + $llRequest->shouldReceive('getLogins')->once()->andReturn([$login]); + + $expected = [ + 'all-logins' => [ + $login->toArray(), + ], + 'selected-login' => 0, + 'accounts' => [ + 0 => $spectreAccount->toArray(), + ], + ]; + + $repository->shouldReceive('setConfiguration') + ->withArgs([Mockery::any(), $expected])->once(); + + $handler = new StageAuthenticatedHandler; + $handler->setImportJob($job); + try { + $handler->run(); + } catch (FireflyException $e) { + $this->assertFalse(true, $e->getMessage()); + } + } + +} \ No newline at end of file diff --git a/tests/Unit/Support/Import/Routine/Spectre/StageImportDataHandlerTest.php b/tests/Unit/Support/Import/Routine/Spectre/StageImportDataHandlerTest.php new file mode 100644 index 0000000000..a64cfcfb31 --- /dev/null +++ b/tests/Unit/Support/Import/Routine/Spectre/StageImportDataHandlerTest.php @@ -0,0 +1,637 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Support\Import\Routine\Spectre; + + +use Carbon\Carbon; +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\ImportJob; +use FireflyIII\Repositories\Account\AccountRepositoryInterface; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Services\Spectre\Object\Account as SpectreAccount; +use FireflyIII\Services\Spectre\Object\Transaction as SpectreTransaction; +use FireflyIII\Services\Spectre\Request\ListTransactionsRequest; +use FireflyIII\Support\Import\Routine\File\OpposingAccountMapper; +use FireflyIII\Support\Import\Routine\Spectre\StageImportDataHandler; +use Mockery; +use Tests\TestCase; + +/** + * Class StageImportDataHandlerTest + */ +class StageImportDataHandlerTest extends TestCase +{ + /** + * @covers \FireflyIII\Support\Import\Routine\Spectre\StageImportDataHandler + */ + public function testRunBasic(): void + { + // needs to be a full spectre account this time. + $spectreAccount = new SpectreAccount( + [ + 'id' => 1234, + 'login_id' => 5678, + 'currency_code' => 'EUR', + 'balance' => 1000, + 'name' => 'Fake Spectre Account', + 'nature' => 'account', + 'created_at' => '2018-01-01 12:12:12', + 'updated_at' => '2018-01-01 12:12:12', + 'extra' => [], + ] + ); + + $today = new Carbon; + // create fake transactions: + $op1 = 'Some opposing account #' . random_int(1, 100); + $op2 = 'Some opposing revenue account #' . random_int(1, 100); + $transactions = [ + new SpectreTransaction( + [ + 'id' => 1, + 'mode' => 'mode', + 'status' => 'active', + 'made_on' => $today->toW3cString(), + 'amount' => -123.45, + 'currency_code' => 'EUR', + 'description' => 'Fake description #' . random_int(1, 100), + 'category' => 'some-category', + 'duplicated' => false, + 'extra' => [ + 'payee' => $op1, + ], + 'account_id' => 1234, + 'created_at' => $today->toW3cString(), + 'updated_at' => $today->toW3cString(), + ] + ), + new SpectreTransaction( + [ + 'id' => 2, + 'mode' => 'mode', + 'status' => 'active', + 'made_on' => $today->toW3cString(), + 'amount' => 563.21, + 'currency_code' => 'EUR', + 'description' => 'Fake second description #' . random_int(1, 100), + 'category' => 'some-other-category', + 'duplicated' => false, + 'extra' => [ + 'payee' => $op2, + ], + 'account_id' => 1234, + 'created_at' => $today->toW3cString(), + 'updated_at' => $today->toW3cString(), + ] + ), + ]; + + + $account = $this->user()->accounts()->where('account_type_id', 3)->first(); + $expense = $this->user()->accounts()->where('account_type_id', 4)->first(); + $revenue = $this->user()->accounts()->where('account_type_id', 5)->first(); + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'sid_a_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = [ + 'accounts' => [$spectreAccount->toArray()], + 'account_mapping' => [ + 1234 => 322, + ], + ]; + $job->save(); + + // mock repositories + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $importRepos = $this->mock(ImportJobRepositoryInterface::class); + $lrRequest = $this->mock(ListTransactionsRequest::class); + $mapper = $this->mock(OpposingAccountMapper::class); + + // expected result + $expected = [ + 0 => [ + 'type' => 'withdrawal', + 'date' => $today->format('Y-m-d'), + 'tags' => ['mode', 'active'], + 'user' => $job->user_id, + 'notes' => "Imported from \"Fake Spectre Account\" \npayee: " . $op1 . " \n", + 'external_id' => '1', + // journal data: + 'description' => $transactions[0]->getDescription(), + 'piggy_bank_id' => null, + 'piggy_bank_name' => null, + 'bill_id' => null, + 'bill_name' => null, + + // transaction data: + 'transactions' => [ + [ + 'currency_id' => null, + 'currency_code' => 'EUR', + 'description' => null, + 'amount' => '-123.45', + 'budget_id' => null, + 'budget_name' => null, + 'category_id' => null, + 'category_name' => 'some-category', + 'source_id' => $account->id, + 'source_name' => null, + 'destination_id' => $expense->id, + 'destination_name' => null, + 'foreign_currency_id' => null, + 'foreign_currency_code' => null, + 'foreign_amount' => null, + 'reconciled' => false, + 'identifier' => 0, + ], + ], + ], + 1 => [ + 'type' => 'deposit', + 'date' => $today->format('Y-m-d'), + 'tags' => ['mode', 'active'], + 'user' => $job->user_id, + 'notes' => "Imported from \"Fake Spectre Account\" \npayee: " . $op2 . " \n", + 'external_id' => '2', + // journal data: + 'description' => $transactions[1]->getDescription(), + 'piggy_bank_id' => null, + 'piggy_bank_name' => null, + 'bill_id' => null, + 'bill_name' => null, + + // transaction data: + 'transactions' => [ + [ + 'currency_id' => null, + 'currency_code' => 'EUR', + 'description' => null, + 'amount' => '563.21', + 'budget_id' => null, + 'budget_name' => null, + 'category_id' => null, + 'category_name' => 'some-other-category', + 'source_id' => $revenue->id, + 'source_name' => null, + 'destination_id' => $account->id, + 'destination_name' => null, + 'foreign_currency_id' => null, + 'foreign_currency_code' => null, + 'foreign_amount' => null, + 'reconciled' => false, + 'identifier' => 0, + ], + ], + ], + ]; + $accountRepos->shouldReceive('setUser')->once(); + $accountRepos->shouldReceive('findNull')->once()->withArgs([322])->andReturn($account); + $importRepos->shouldReceive('setUser')->once(); + $importRepos->shouldReceive('setTransactions')->once() + ->withArgs([Mockery::any(), $expected]); + $lrRequest->shouldReceive('setUser')->once(); + $lrRequest->shouldReceive('setAccount')->once()->withArgs([Mockery::any()]); + $lrRequest->shouldReceive('call')->once(); + $lrRequest->shouldReceive('getTransactions')->once()->andReturn($transactions); + $mapper->shouldReceive('setUser')->once(); + // mapper should be called twice: + $mapper->shouldReceive('map')->withArgs( + [null, -123.45, ['name' => $op1, 'iban' => null, 'number' => null, 'bic' => null]] + )->once()->andReturn($expense); + $mapper->shouldReceive('map')->withArgs( + [null, 563.21, ['name' => $op2, 'iban' => null, 'number' => null, 'bic' => null]] + )->once()->andReturn($revenue); + + + $handler = new StageImportDataHandler; + $handler->setImportJob($job); + try { + $handler->run(); + } catch (FireflyException $e) { + $this->assertFalse(true, $e->getMessage()); + } + } + + /** + * Also has empty local account. + * + * @covers \FireflyIII\Support\Import\Routine\Spectre\StageImportDataHandler + */ + public function testRunForeignCurrency(): void + { + // needs to be a full spectre account this time. + $spectreAccount = new SpectreAccount( + [ + 'id' => 1234, + 'login_id' => 5678, + 'currency_code' => 'EUR', + 'balance' => 1000, + 'name' => 'Fake Spectre Account', + 'nature' => 'account', + 'created_at' => '2018-01-01 12:12:12', + 'updated_at' => '2018-01-01 12:12:12', + 'extra' => [], + ] + ); + + $today = new Carbon; + // create fake transactions: + $op1 = 'Some opposing account #' . random_int(1, 100); + $op2 = 'Some opposing revenue account #' . random_int(1, 100); + $transactions = [ + new SpectreTransaction( + [ + 'id' => 1, + 'mode' => 'mode', + 'status' => 'active', + 'made_on' => $today->toW3cString(), + 'amount' => -123.45, + 'currency_code' => 'EUR', + 'description' => 'Fake description #' . random_int(1, 100), + 'category' => 'some-category', + 'duplicated' => true, + 'extra' => [ + 'payee' => $op1, + 'original_amount' => -200.01, + ], + 'account_id' => 1234, + 'created_at' => $today->toW3cString(), + 'updated_at' => $today->toW3cString(), + ] + ), + new SpectreTransaction( + [ + 'id' => 2, + 'mode' => 'mode', + 'status' => 'active', + 'made_on' => $today->toW3cString(), + 'amount' => 563.21, + 'currency_code' => 'EUR', + 'description' => 'Fake second description #' . random_int(1, 100), + 'category' => 'some-other-category', + 'duplicated' => false, + 'extra' => [ + 'payee' => $op2, + 'customer_category_name' => 'cat-name', + 'original_currency_code' => 'USD', + ], + 'account_id' => 1234, + 'created_at' => $today->toW3cString(), + 'updated_at' => $today->toW3cString(), + ] + ), + ]; + + + $account = $this->user()->accounts()->where('account_type_id', 3)->first(); + $expense = $this->user()->accounts()->where('account_type_id', 4)->first(); + $revenue = $this->user()->accounts()->where('account_type_id', 5)->first(); + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'sid_a_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = [ + 'accounts' => [$spectreAccount->toArray()], + 'account_mapping' => [ + 1234 => 322, + 5678 => 0, + ], + ]; + $job->save(); + + // mock repositories + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $importRepos = $this->mock(ImportJobRepositoryInterface::class); + $lrRequest = $this->mock(ListTransactionsRequest::class); + $mapper = $this->mock(OpposingAccountMapper::class); + + // expected result + $expected = [ + 0 => [ + 'type' => 'withdrawal', + 'date' => $today->format('Y-m-d'), + 'tags' => ['mode', 'active', 'possibly-duplicated'], + 'user' => $job->user_id, + 'notes' => "Imported from \"Fake Spectre Account\" \npayee: " . $op1 . " \n", + 'external_id' => '1', + // journal data: + 'description' => $transactions[0]->getDescription(), + 'piggy_bank_id' => null, + 'piggy_bank_name' => null, + 'bill_id' => null, + 'bill_name' => null, + + // transaction data: + 'transactions' => [ + [ + 'currency_id' => null, + 'currency_code' => 'EUR', + 'description' => null, + 'amount' => '-123.45', + 'budget_id' => null, + 'budget_name' => null, + 'category_id' => null, + 'category_name' => 'some-category', + 'source_id' => $account->id, + 'source_name' => null, + 'destination_id' => $expense->id, + 'destination_name' => null, + 'foreign_currency_id' => null, + 'foreign_currency_code' => null, + 'foreign_amount' => '-200.01', + 'reconciled' => false, + 'identifier' => 0, + ], + ], + ], + 1 => [ + 'type' => 'deposit', + 'date' => $today->format('Y-m-d'), + 'tags' => ['mode', 'active', 'cat-name'], + 'user' => $job->user_id, + 'notes' => "Imported from \"Fake Spectre Account\" \npayee: " . $op2 . " \n", + 'external_id' => '2', + // journal data: + 'description' => $transactions[1]->getDescription(), + 'piggy_bank_id' => null, + 'piggy_bank_name' => null, + 'bill_id' => null, + 'bill_name' => null, + + // transaction data: + 'transactions' => [ + [ + 'currency_id' => null, + 'currency_code' => 'EUR', + 'description' => null, + 'amount' => '563.21', + 'budget_id' => null, + 'budget_name' => null, + 'category_id' => null, + 'category_name' => 'some-other-category', + 'source_id' => $revenue->id, + 'source_name' => null, + 'destination_id' => $account->id, + 'destination_name' => null, + 'foreign_currency_id' => null, + 'foreign_currency_code' => 'USD', + 'foreign_amount' => null, + 'reconciled' => false, + 'identifier' => 0, + ], + ], + ], + ]; + $accountRepos->shouldReceive('setUser')->once(); + $accountRepos->shouldReceive('findNull')->once()->withArgs([322])->andReturn($account); + $importRepos->shouldReceive('setUser')->once(); + $importRepos->shouldReceive('setTransactions')->once() + ->withArgs([Mockery::any(), $expected]); + $lrRequest->shouldReceive('setUser')->once(); + $lrRequest->shouldReceive('setAccount')->once()->withArgs([Mockery::any()]); + $lrRequest->shouldReceive('call')->once(); + $lrRequest->shouldReceive('getTransactions')->once()->andReturn($transactions); + $mapper->shouldReceive('setUser')->once(); + // mapper should be called twice: + $mapper->shouldReceive('map')->withArgs( + [null, -123.45, ['name' => $op1, 'iban' => null, 'number' => null, 'bic' => null]] + )->once()->andReturn($expense); + $mapper->shouldReceive('map')->withArgs( + [null, 563.21, ['name' => $op2, 'iban' => null, 'number' => null, 'bic' => null]] + )->once()->andReturn($revenue); + + + $handler = new StageImportDataHandler; + $handler->setImportJob($job); + try { + $handler->run(); + } catch (FireflyException $e) { + $this->assertFalse(true, $e->getMessage()); + } + } + + /** + * @covers \FireflyIII\Support\Import\Routine\Spectre\StageImportDataHandler + */ + public function testRunWithDuplication(): void + { + // needs to be a full spectre account this time. + $spectreAccount = new SpectreAccount( + [ + 'id' => 1234, + 'login_id' => 5678, + 'currency_code' => 'EUR', + 'balance' => 1000, + 'name' => 'Fake Spectre Account', + 'nature' => 'account', + 'created_at' => '2018-01-01 12:12:12', + 'updated_at' => '2018-01-01 12:12:12', + 'extra' => [], + ] + ); + + $today = new Carbon; + // create fake transactions: + $op1 = 'Some opposing account #' . random_int(1, 100); + $op2 = 'Some opposing revenue account #' . random_int(1, 100); + $transactions = [ + new SpectreTransaction( + [ + 'id' => 1, + 'mode' => 'mode', + 'status' => 'active', + 'made_on' => $today->toW3cString(), + 'amount' => -123.45, + 'currency_code' => 'EUR', + 'description' => 'Fake description #' . random_int(1, 100), + 'category' => 'some-category', + 'duplicated' => true, + 'extra' => [ + 'payee' => $op1, + ], + 'account_id' => 1234, + 'created_at' => $today->toW3cString(), + 'updated_at' => $today->toW3cString(), + ] + ), + new SpectreTransaction( + [ + 'id' => 2, + 'mode' => 'mode', + 'status' => 'active', + 'made_on' => $today->toW3cString(), + 'amount' => 563.21, + 'currency_code' => 'EUR', + 'description' => 'Fake second description #' . random_int(1, 100), + 'category' => 'some-other-category', + 'duplicated' => false, + 'extra' => [ + 'payee' => $op2, + 'customer_category_name' => 'cat-name', + ], + 'account_id' => 1234, + 'created_at' => $today->toW3cString(), + 'updated_at' => $today->toW3cString(), + ] + ), + ]; + + + $account = $this->user()->accounts()->where('account_type_id', 3)->first(); + $expense = $this->user()->accounts()->where('account_type_id', 4)->first(); + $revenue = $this->user()->accounts()->where('account_type_id', 5)->first(); + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'sid_a_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = [ + 'accounts' => [$spectreAccount->toArray()], + 'account_mapping' => [ + 1234 => 322, + ], + ]; + $job->save(); + + // mock repositories + $accountRepos = $this->mock(AccountRepositoryInterface::class); + $importRepos = $this->mock(ImportJobRepositoryInterface::class); + $lrRequest = $this->mock(ListTransactionsRequest::class); + $mapper = $this->mock(OpposingAccountMapper::class); + + // expected result + $expected = [ + 0 => [ + 'type' => 'withdrawal', + 'date' => $today->format('Y-m-d'), + 'tags' => ['mode', 'active', 'possibly-duplicated'], + 'user' => $job->user_id, + 'notes' => "Imported from \"Fake Spectre Account\" \npayee: " . $op1 . " \n", + 'external_id' => '1', + // journal data: + 'description' => $transactions[0]->getDescription(), + 'piggy_bank_id' => null, + 'piggy_bank_name' => null, + 'bill_id' => null, + 'bill_name' => null, + + // transaction data: + 'transactions' => [ + [ + 'currency_id' => null, + 'currency_code' => 'EUR', + 'description' => null, + 'amount' => '-123.45', + 'budget_id' => null, + 'budget_name' => null, + 'category_id' => null, + 'category_name' => 'some-category', + 'source_id' => $account->id, + 'source_name' => null, + 'destination_id' => $expense->id, + 'destination_name' => null, + 'foreign_currency_id' => null, + 'foreign_currency_code' => null, + 'foreign_amount' => null, + 'reconciled' => false, + 'identifier' => 0, + ], + ], + ], + 1 => [ + 'type' => 'deposit', + 'date' => $today->format('Y-m-d'), + 'tags' => ['mode', 'active', 'cat-name'], + 'user' => $job->user_id, + 'notes' => "Imported from \"Fake Spectre Account\" \npayee: " . $op2 . " \n", + 'external_id' => '2', + // journal data: + 'description' => $transactions[1]->getDescription(), + 'piggy_bank_id' => null, + 'piggy_bank_name' => null, + 'bill_id' => null, + 'bill_name' => null, + + // transaction data: + 'transactions' => [ + [ + 'currency_id' => null, + 'currency_code' => 'EUR', + 'description' => null, + 'amount' => '563.21', + 'budget_id' => null, + 'budget_name' => null, + 'category_id' => null, + 'category_name' => 'some-other-category', + 'source_id' => $revenue->id, + 'source_name' => null, + 'destination_id' => $account->id, + 'destination_name' => null, + 'foreign_currency_id' => null, + 'foreign_currency_code' => null, + 'foreign_amount' => null, + 'reconciled' => false, + 'identifier' => 0, + ], + ], + ], + ]; + $accountRepos->shouldReceive('setUser')->once(); + $accountRepos->shouldReceive('findNull')->once()->withArgs([322])->andReturn($account); + $importRepos->shouldReceive('setUser')->once(); + $importRepos->shouldReceive('setTransactions')->once() + ->withArgs([Mockery::any(), $expected]); + $lrRequest->shouldReceive('setUser')->once(); + $lrRequest->shouldReceive('setAccount')->once()->withArgs([Mockery::any()]); + $lrRequest->shouldReceive('call')->once(); + $lrRequest->shouldReceive('getTransactions')->once()->andReturn($transactions); + $mapper->shouldReceive('setUser')->once(); + // mapper should be called twice: + $mapper->shouldReceive('map')->withArgs( + [null, -123.45, ['name' => $op1, 'iban' => null, 'number' => null, 'bic' => null]] + )->once()->andReturn($expense); + $mapper->shouldReceive('map')->withArgs( + [null, 563.21, ['name' => $op2, 'iban' => null, 'number' => null, 'bic' => null]] + )->once()->andReturn($revenue); + + + $handler = new StageImportDataHandler; + $handler->setImportJob($job); + try { + $handler->run(); + } catch (FireflyException $e) { + $this->assertFalse(true, $e->getMessage()); + } + } + +} \ No newline at end of file diff --git a/tests/Unit/Support/Import/Routine/Spectre/StageNewHandlerTest.php b/tests/Unit/Support/Import/Routine/Spectre/StageNewHandlerTest.php new file mode 100644 index 0000000000..1b1271100f --- /dev/null +++ b/tests/Unit/Support/Import/Routine/Spectre/StageNewHandlerTest.php @@ -0,0 +1,369 @@ +. + */ + +declare(strict_types=1); + +namespace Tests\Unit\Support\Import\Routine\Spectre; + + +use FireflyIII\Exceptions\FireflyException; +use FireflyIII\Models\ImportJob; +use FireflyIII\Models\Preference; +use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface; +use FireflyIII\Services\Spectre\Object\Attempt; +use FireflyIII\Services\Spectre\Object\Customer; +use FireflyIII\Services\Spectre\Object\Holder; +use FireflyIII\Services\Spectre\Object\Login; +use FireflyIII\Services\Spectre\Request\ListCustomersRequest; +use FireflyIII\Services\Spectre\Request\ListLoginsRequest; +use FireflyIII\Services\Spectre\Request\NewCustomerRequest; +use FireflyIII\Support\Import\Routine\Spectre\StageNewHandler; +use Mockery; +use Preferences; +use Tests\TestCase; + +/** + * Class StageNewHandlerTest + */ +class StageNewHandlerTest extends TestCase +{ + + // todo run() with zero logins and an existing customer (must be retrieved from Spectre). + // todo run() with one login and an existing customer (must be retrieved from Spectre). + + /** + * run() with zero logins and a non-existing customer (must be created by Spectre). + * + * @covers \FireflyIII\Support\Import\Information\GetSpectreCustomerTrait + * @covers \FireflyIII\Support\Import\Routine\Spectre\StageNewHandler + */ + public function testRunBasic(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'sn_a_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // fake Spectre customer: + $fakeCustomer = new Customer( + [ + 'id' => 1, + 'identifier' => 'fake', + 'secret' => 'Dumbledore dies', + ] + ); + + // mock classes: + $llRequest = $this->mock(ListLoginsRequest::class); + $lcRequest = $this->mock(ListCustomersRequest::class); + $ncRequest = $this->mock(NewCustomerRequest::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + + + // mock calls for list logins (return empty list for now). + $llRequest->shouldReceive('setUser')->once(); + $llRequest->shouldReceive('setCustomer')->once(); + $llRequest->shouldReceive('call')->once(); + $llRequest->shouldReceive('getLogins')->once()->andReturn([]); + + // mock calls for list customers (return empty list). + $lcRequest->shouldReceive('setUser')->once(); + $lcRequest->shouldReceive('call')->once(); + $lcRequest->shouldReceive('getCustomers')->once()->andReturn([]); + + // create new customer: + $ncRequest->shouldReceive('setUser')->once(); + $ncRequest->shouldReceive('getCustomer')->once()->andReturn($fakeCustomer); + + // mock calls for repository: + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('getConfiguration')->once()->withArgs([Mockery::any()])->andReturn([]); + + // mock call for preferences + Preferences::shouldReceive('getForUser')->once()->withArgs([Mockery::any(), 'spectre_customer', null])->andReturnNull(); + + + $handler = new StageNewHandler; + $handler->setImportJob($job); + try { + $handler->run(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + } + + /** + * run() with zero logins and an existing customer (from preferences). + * + * @covers \FireflyIII\Support\Import\Information\GetSpectreCustomerTrait + * @covers \FireflyIII\Support\Import\Routine\Spectre\StageNewHandler + */ + public function testRunExistingCustomer(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'sn_a_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + $fakeCustomerPreference = new Preference; + $fakeCustomerPreference->name = 'spectre_customer'; + $fakeCustomerPreference->data = [ + 'id' => 1, + 'identifier' => 'fake', + 'secret' => 'Dumbledore dies', + ]; + + // mock classes: + $llRequest = $this->mock(ListLoginsRequest::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + + + // mock calls for list logins (return empty list for now). + $llRequest->shouldReceive('setUser')->once(); + $llRequest->shouldReceive('setCustomer')->once(); + $llRequest->shouldReceive('call')->once(); + $llRequest->shouldReceive('getLogins')->once()->andReturn([]); + + // mock call for preferences + Preferences::shouldReceive('getForUser')->once()->withArgs([Mockery::any(), 'spectre_customer', null])->andReturn($fakeCustomerPreference); + + // mock calls for repository: + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('getConfiguration')->once()->withArgs([Mockery::any()])->andReturn([]); + + $handler = new StageNewHandler; + $handler->setImportJob($job); + try { + $handler->run(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + } + + /** + * run() with zero logins and multiple customers at Spectre (none in prefs) + * + * @covers \FireflyIII\Support\Import\Information\GetSpectreCustomerTrait + * @covers \FireflyIII\Support\Import\Routine\Spectre\StageNewHandler + */ + public function testRunMultiCustomer(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'sn_a_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // fake Spectre customer: + $fakeCustomer = new Customer( + [ + 'id' => 1, + 'identifier' => 'fake', + 'secret' => 'Dumbledore dies', + ] + ); + + $correctCustomer = new Customer( + [ + 'id' => 1, + 'identifier' => 'default_ff3_customer', + 'secret' => 'Firefly III', + ] + ); + + // mock classes: + $llRequest = $this->mock(ListLoginsRequest::class); + $lcRequest = $this->mock(ListCustomersRequest::class); + $ncRequest = $this->mock(NewCustomerRequest::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + + // mock calls for list logins (return empty list for now). + $llRequest->shouldReceive('setUser')->once(); + $llRequest->shouldReceive('setCustomer')->once(); + $llRequest->shouldReceive('call')->once(); + $llRequest->shouldReceive('getLogins')->once()->andReturn([]); + + // mock calls for list customers (return empty list). + $lcRequest->shouldReceive('setUser')->once(); + $lcRequest->shouldReceive('call')->once(); + $lcRequest->shouldReceive('getCustomers')->once()->andReturn([$fakeCustomer, $correctCustomer]); + + // mock calls for repository: + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('getConfiguration')->once()->withArgs([Mockery::any()])->andReturn([]); + + // mock call for preferences + Preferences::shouldReceive('getForUser')->withArgs([Mockery::any(), 'spectre_customer', null])->andReturnNull()->once(); + Preferences::shouldReceive('setForUser')->withArgs([Mockery::any(), 'spectre_customer', $correctCustomer->toArray()])->once(); + + $handler = new StageNewHandler; + $handler->setImportJob($job); + try { + $handler->run(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + } + + /** + * run() with one login and multiple customers at Spectre (none in prefs) + * + * @covers \FireflyIII\Support\Import\Information\GetSpectreCustomerTrait + * @covers \FireflyIII\Support\Import\Routine\Spectre\StageNewHandler + */ + public function testRunMultiCustomerLogin(): void + { + $job = new ImportJob; + $job->user_id = $this->user()->id; + $job->key = 'sn_a_' . random_int(1, 1000); + $job->status = 'new'; + $job->stage = 'new'; + $job->provider = 'spectre'; + $job->file_type = ''; + $job->configuration = []; + $job->save(); + + // fake Spectre customer: + $fakeCustomer = new Customer( + [ + 'id' => 1, + 'identifier' => 'fake', + 'secret' => 'Dumbledore dies', + ] + ); + + $correctCustomer = new Customer( + [ + 'id' => 1, + 'identifier' => 'default_ff3_customer', + 'secret' => 'Firefly III', + ] + ); + + // fake login: + $holder = new Holder([]); + $attempt = new Attempt( + [ + 'api_mode' => 'x', + 'api_version' => 4, + 'automatic_fetch' => true, + 'categorize' => true, + 'created_at' => '2018-05-21 12:00:00', + 'consent_given_at' => '2018-05-21 12:00:00', + 'consent_types' => ['transactions'], + 'custom_fields' => [], + 'daily_refresh' => true, + 'device_type' => 'mobile', + 'user_agent' => 'Mozilla/x', + 'remote_ip' => '127.0.0.1', + 'exclude_accounts' => [], + 'fail_at' => '2018-05-21 12:00:00', + 'fail_error_class' => 'err', + 'fail_message' => 'message', + 'fetch_scopes' => [], + 'finished' => true, + 'finished_recent' => true, + 'from_date' => '2018-05-21 12:00:00', + 'id' => 1, + 'interactive' => true, + 'locale' => 'en', + 'partial' => true, + 'show_consent_confirmation' => true, + 'stages' => [], + 'store_credentials' => true, + 'success_at' => '2018-05-21 12:00:00', + 'to_date' => '2018-05-21 12:00:00', + 'updated_at' => '2018-05-21 12:00:00', + ] + ); + $login = new Login( + [ + 'consent_given_at' => '2018-05-21 12:00:00', + 'consent_types' => ['transactions'], + 'country_code' => 'NL', + 'created_at' => '2018-05-21 12:00:00', + 'updated_at' => '2018-05-21 12:00:00', + 'customer_id' => '1', + 'daily_refresh' => true, + 'holder_info' => $holder->toArray(), + 'id' => 123, + 'last_attempt' => $attempt->toArray(), + 'last_success_at' => '2018-05-21 12:00:00', + 'next_refresh_possible_at' => '2018-05-21 12:00:00', + 'provider_code' => 'XF', + 'provider_id' => '123', + 'provider_name' => 'Fake', + 'show_consent_confirmation' => true, + 'status' => 'active', + 'store_credentials' => true, + ] + ); + + // mock classes: + $llRequest = $this->mock(ListLoginsRequest::class); + $lcRequest = $this->mock(ListCustomersRequest::class); + $ncRequest = $this->mock(NewCustomerRequest::class); + $repository = $this->mock(ImportJobRepositoryInterface::class); + + // mock calls for list logins (return empty list for now). + $llRequest->shouldReceive('setUser')->once(); + $llRequest->shouldReceive('setCustomer')->once(); + $llRequest->shouldReceive('call')->once(); + $llRequest->shouldReceive('getLogins')->once()->andReturn([$login]); + + // mock calls for list customers (return empty list). + $lcRequest->shouldReceive('setUser')->once(); + $lcRequest->shouldReceive('call')->once(); + $lcRequest->shouldReceive('getCustomers')->once()->andReturn([$fakeCustomer, $correctCustomer]); + + // mock call for preferences + Preferences::shouldReceive('getForUser')->withArgs([Mockery::any(), 'spectre_customer', null])->andReturnNull()->once(); + Preferences::shouldReceive('setForUser')->withArgs([Mockery::any(), 'spectre_customer', $correctCustomer->toArray()])->once(); + + // mock calls for repository: + $repository->shouldReceive('setUser')->once(); + $repository->shouldReceive('getConfiguration')->once()->withArgs([Mockery::any()])->andReturn([]); + $repository->shouldReceive('setConfiguration')->once() + ->withArgs([Mockery::any(), ['all-logins' => [$login->toArray()]]]); + + $handler = new StageNewHandler; + $handler->setImportJob($job); + try { + $handler->run(); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } + } +} \ No newline at end of file diff --git a/tests/Unit/TransactionRules/Actions/AddTagTest.php b/tests/Unit/TransactionRules/Actions/AddTagTest.php index 3104d86475..4923559e51 100644 --- a/tests/Unit/TransactionRules/Actions/AddTagTest.php +++ b/tests/Unit/TransactionRules/Actions/AddTagTest.php @@ -37,7 +37,7 @@ class AddTagTest extends TestCase * @covers \FireflyIII\TransactionRules\Actions\AddTag::__construct * @covers \FireflyIII\TransactionRules\Actions\AddTag::act() */ - public function testActExistingTag() + public function testActExistingTag(): void { $tag = Tag::inRandomOrder()->whereNull('deleted_at')->first(); $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); @@ -55,7 +55,7 @@ class AddTagTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Actions\AddTag::act() */ - public function testActNoTag() + public function testActNoTag(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $ruleAction = new RuleAction; diff --git a/tests/Unit/TransactionRules/Actions/AppendDescriptionTest.php b/tests/Unit/TransactionRules/Actions/AppendDescriptionTest.php index 2c99c3df51..3e338eddc4 100644 --- a/tests/Unit/TransactionRules/Actions/AppendDescriptionTest.php +++ b/tests/Unit/TransactionRules/Actions/AppendDescriptionTest.php @@ -36,7 +36,7 @@ class AppendDescriptionTest extends TestCase * @covers \FireflyIII\TransactionRules\Actions\AppendDescription::__construct * @covers \FireflyIII\TransactionRules\Actions\AppendDescription::act() */ - public function testActExistingTag() + public function testActExistingTag(): void { $ruleAction = new RuleAction; $ruleAction->action_value = 'APPEND'; diff --git a/tests/Unit/TransactionRules/Actions/AppendNotesTest.php b/tests/Unit/TransactionRules/Actions/AppendNotesTest.php index f796ebe2ca..c4200d77fe 100644 --- a/tests/Unit/TransactionRules/Actions/AppendNotesTest.php +++ b/tests/Unit/TransactionRules/Actions/AppendNotesTest.php @@ -37,7 +37,7 @@ class AppendNotesTest extends TestCase * @covers \FireflyIII\TransactionRules\Actions\AppendNotes::__construct() * @covers \FireflyIII\TransactionRules\Actions\AppendNotes::act() */ - public function testAct() + public function testAct(): void { // give journal some notes. $journal = TransactionJournal::find(3); @@ -66,7 +66,7 @@ class AppendNotesTest extends TestCase * @covers \FireflyIII\TransactionRules\Actions\AppendNotes::__construct() * @covers \FireflyIII\TransactionRules\Actions\AppendNotes::act() */ - public function testActNewNote() + public function testActNewNote(): void { // give journal some notes. $journal = TransactionJournal::find(4); diff --git a/tests/Unit/TransactionRules/Actions/ClearBudgetTest.php b/tests/Unit/TransactionRules/Actions/ClearBudgetTest.php index b597ae3992..97f6e456e8 100644 --- a/tests/Unit/TransactionRules/Actions/ClearBudgetTest.php +++ b/tests/Unit/TransactionRules/Actions/ClearBudgetTest.php @@ -37,7 +37,7 @@ class ClearBudgetTest extends TestCase * @covers \FireflyIII\TransactionRules\Actions\ClearBudget::__construct() * @covers \FireflyIII\TransactionRules\Actions\ClearBudget::act() */ - public function testAct() + public function testAct(): void { // associate budget with journal: $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); diff --git a/tests/Unit/TransactionRules/Actions/ClearCategoryTest.php b/tests/Unit/TransactionRules/Actions/ClearCategoryTest.php index fa96275bde..e9b43a7d6d 100644 --- a/tests/Unit/TransactionRules/Actions/ClearCategoryTest.php +++ b/tests/Unit/TransactionRules/Actions/ClearCategoryTest.php @@ -37,7 +37,7 @@ class ClearCategoryTest extends TestCase * @covers \FireflyIII\TransactionRules\Actions\ClearCategory::__construct() * @covers \FireflyIII\TransactionRules\Actions\ClearCategory::act() */ - public function testAct() + public function testAct(): void { // associate budget with journal: $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); diff --git a/tests/Unit/TransactionRules/Actions/ClearNotesTest.php b/tests/Unit/TransactionRules/Actions/ClearNotesTest.php index 4a4a53f229..d4231b541a 100644 --- a/tests/Unit/TransactionRules/Actions/ClearNotesTest.php +++ b/tests/Unit/TransactionRules/Actions/ClearNotesTest.php @@ -22,6 +22,7 @@ declare(strict_types=1); namespace Tests\Unit\TransactionRules\Actions; +use Exception; use FireflyIII\Models\Note; use FireflyIII\Models\RuleAction; use FireflyIII\Models\TransactionJournal; @@ -37,7 +38,7 @@ class ClearNotesTest extends TestCase * @covers \FireflyIII\TransactionRules\Actions\ClearNotes::__construct() * @covers \FireflyIII\TransactionRules\Actions\ClearNotes::act() */ - public function testAct() + public function testAct(): void { // give journal a note: $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); @@ -54,7 +55,11 @@ class ClearNotesTest extends TestCase $ruleAction = new RuleAction; $ruleAction->action_value = null; $action = new ClearNotes($ruleAction); - $result = $action->act($journal); + try { + $result = $action->act($journal); + } catch (Exception $e) { + $this->assertTrue(false, $e->getMessage()); + } $this->assertTrue($result); // assert result diff --git a/tests/Unit/TransactionRules/Actions/PrependDescriptionTest.php b/tests/Unit/TransactionRules/Actions/PrependDescriptionTest.php index a01343cba9..118873e738 100644 --- a/tests/Unit/TransactionRules/Actions/PrependDescriptionTest.php +++ b/tests/Unit/TransactionRules/Actions/PrependDescriptionTest.php @@ -36,7 +36,7 @@ class PrependDescriptionTest extends TestCase * @covers \FireflyIII\TransactionRules\Actions\PrependDescription::__construct() * @covers \FireflyIII\TransactionRules\Actions\PrependDescription::act() */ - public function testAct() + public function testAct(): void { // get journal, give fixed description $description = 'text' . random_int(1, 1000); diff --git a/tests/Unit/TransactionRules/Actions/PrependNotesTest.php b/tests/Unit/TransactionRules/Actions/PrependNotesTest.php index cd08f9f60b..e67bebf15b 100644 --- a/tests/Unit/TransactionRules/Actions/PrependNotesTest.php +++ b/tests/Unit/TransactionRules/Actions/PrependNotesTest.php @@ -37,7 +37,7 @@ class PrependNotesTest extends TestCase * @covers \FireflyIII\TransactionRules\Actions\PrependNotes::__construct() * @covers \FireflyIII\TransactionRules\Actions\PrependNotes::act() */ - public function testAct() + public function testAct(): void { // give journal some notes. $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); @@ -66,7 +66,7 @@ class PrependNotesTest extends TestCase * @covers \FireflyIII\TransactionRules\Actions\PrependNotes::__construct() * @covers \FireflyIII\TransactionRules\Actions\PrependNotes::act() */ - public function testActNewNote() + public function testActNewNote(): void { // give journal some notes. $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); diff --git a/tests/Unit/TransactionRules/Actions/RemoveAllTagsTest.php b/tests/Unit/TransactionRules/Actions/RemoveAllTagsTest.php index fa0b305f99..cb0960d8f7 100644 --- a/tests/Unit/TransactionRules/Actions/RemoveAllTagsTest.php +++ b/tests/Unit/TransactionRules/Actions/RemoveAllTagsTest.php @@ -37,7 +37,7 @@ class RemoveAllTagsTest extends TestCase * @covers \FireflyIII\TransactionRules\Actions\RemoveAllTags::__construct() * @covers \FireflyIII\TransactionRules\Actions\RemoveAllTags::act() */ - public function testAct() + public function testAct(): void { // find journal with at least one tag $journalIds = DB::table('tag_transaction_journal')->get(['transaction_journal_id'])->pluck('transaction_journal_id')->toArray(); diff --git a/tests/Unit/TransactionRules/Actions/RemoveTagTest.php b/tests/Unit/TransactionRules/Actions/RemoveTagTest.php index 637f1ebbe0..aed4d3dce9 100644 --- a/tests/Unit/TransactionRules/Actions/RemoveTagTest.php +++ b/tests/Unit/TransactionRules/Actions/RemoveTagTest.php @@ -37,7 +37,7 @@ class RemoveTagTest extends TestCase * @covers \FireflyIII\TransactionRules\Actions\RemoveTag::__construct() * @covers \FireflyIII\TransactionRules\Actions\RemoveTag::act() */ - public function testAct() + public function testAct(): void { // find journal with at least one tag @@ -64,7 +64,7 @@ class RemoveTagTest extends TestCase * @covers \FireflyIII\TransactionRules\Actions\RemoveTag::__construct() * @covers \FireflyIII\TransactionRules\Actions\RemoveTag::act() */ - public function testActNoTag() + public function testActNoTag(): void { // get journal, link al tags: /** @var TransactionJournal $journal */ diff --git a/tests/Unit/TransactionRules/Actions/SetBudgetTest.php b/tests/Unit/TransactionRules/Actions/SetBudgetTest.php index 1e087f571e..3a4c6a2ab7 100644 --- a/tests/Unit/TransactionRules/Actions/SetBudgetTest.php +++ b/tests/Unit/TransactionRules/Actions/SetBudgetTest.php @@ -39,7 +39,7 @@ class SetBudgetTest extends TestCase * @covers \FireflyIII\TransactionRules\Actions\SetBudget::__construct() * @covers \FireflyIII\TransactionRules\Actions\SetBudget::act() */ - public function testAct() + public function testAct(): void { // get journal, remove all budgets $journal = TransactionJournal::inRandomOrder()->where('transaction_type_id', 1)->whereNull('deleted_at')->first(); diff --git a/tests/Unit/TransactionRules/Actions/SetCategoryTest.php b/tests/Unit/TransactionRules/Actions/SetCategoryTest.php index c49f74df33..b8c9f9c720 100644 --- a/tests/Unit/TransactionRules/Actions/SetCategoryTest.php +++ b/tests/Unit/TransactionRules/Actions/SetCategoryTest.php @@ -37,7 +37,7 @@ class SetCategoryTest extends TestCase * @covers \FireflyIII\TransactionRules\Actions\SetCategory::__construct() * @covers \FireflyIII\TransactionRules\Actions\SetCategory::act() */ - public function testAct() + public function testAct(): void { // get journal, remove all budgets $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); diff --git a/tests/Unit/TransactionRules/Actions/SetDescriptionTest.php b/tests/Unit/TransactionRules/Actions/SetDescriptionTest.php index d6320379b4..fc6691c67d 100644 --- a/tests/Unit/TransactionRules/Actions/SetDescriptionTest.php +++ b/tests/Unit/TransactionRules/Actions/SetDescriptionTest.php @@ -36,7 +36,7 @@ class SetDescriptionTest extends TestCase * @covers \FireflyIII\TransactionRules\Actions\SetDescription::__construct() * @covers \FireflyIII\TransactionRules\Actions\SetDescription::act() */ - public function testAct() + public function testAct(): void { // get journal, give fixed description $description = 'text' . random_int(1, 1000); diff --git a/tests/Unit/TransactionRules/Actions/SetDestinationAccountTest.php b/tests/Unit/TransactionRules/Actions/SetDestinationAccountTest.php index 7e8d397689..0cd9b5594e 100644 --- a/tests/Unit/TransactionRules/Actions/SetDestinationAccountTest.php +++ b/tests/Unit/TransactionRules/Actions/SetDestinationAccountTest.php @@ -44,7 +44,7 @@ class SetDestinationAccountTest extends TestCase * * @covers \FireflyIII\TransactionRules\Actions\SetDestinationAccount */ - public function testActDepositExisting() + public function testActDepositExisting(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $type = TransactionType::whereType(TransactionType::DEPOSIT)->first(); @@ -86,7 +86,7 @@ class SetDestinationAccountTest extends TestCase * * @covers \FireflyIII\TransactionRules\Actions\SetDestinationAccount */ - public function testActDepositNotExisting() + public function testActDepositNotExisting(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $type = TransactionType::whereType(TransactionType::DEPOSIT)->first(); @@ -114,7 +114,7 @@ class SetDestinationAccountTest extends TestCase * * @covers \FireflyIII\TransactionRules\Actions\SetDestinationAccount */ - public function testActWithDrawalNotExisting() + public function testActWithDrawalNotExisting(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $type = TransactionType::whereType(TransactionType::WITHDRAWAL)->first(); @@ -146,7 +146,7 @@ class SetDestinationAccountTest extends TestCase * * @covers \FireflyIII\TransactionRules\Actions\SetDestinationAccount */ - public function testActWithdrawalExisting() + public function testActWithdrawalExisting(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $type = TransactionType::whereType(TransactionType::WITHDRAWAL)->first(); @@ -189,7 +189,7 @@ class SetDestinationAccountTest extends TestCase * * @covers \FireflyIII\TransactionRules\Actions\SetDestinationAccount */ - public function testSplitJournal() + public function testSplitJournal(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $transaction = Transaction::orderBy('count', 'DESC')->groupBy('transaction_journal_id') diff --git a/tests/Unit/TransactionRules/Actions/SetNotesTest.php b/tests/Unit/TransactionRules/Actions/SetNotesTest.php index ad6ec7400a..d7f58138e5 100644 --- a/tests/Unit/TransactionRules/Actions/SetNotesTest.php +++ b/tests/Unit/TransactionRules/Actions/SetNotesTest.php @@ -37,7 +37,7 @@ class SetNotesTest extends TestCase * @covers \FireflyIII\TransactionRules\Actions\SetNotes::__construct() * @covers \FireflyIII\TransactionRules\Actions\SetNotes::act() */ - public function testAct() + public function testAct(): void { // give journal a note: $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); @@ -66,7 +66,7 @@ class SetNotesTest extends TestCase * @covers \FireflyIII\TransactionRules\Actions\SetNotes::__construct() * @covers \FireflyIII\TransactionRules\Actions\SetNotes::act() */ - public function testActNoNotes() + public function testActNoNotes(): void { // give journal a note: $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); diff --git a/tests/Unit/TransactionRules/Actions/SetSourceAccountTest.php b/tests/Unit/TransactionRules/Actions/SetSourceAccountTest.php index b31de17f98..4e5fbf69d5 100644 --- a/tests/Unit/TransactionRules/Actions/SetSourceAccountTest.php +++ b/tests/Unit/TransactionRules/Actions/SetSourceAccountTest.php @@ -42,7 +42,7 @@ class SetSourceAccountTest extends TestCase * * @covers \FireflyIII\TransactionRules\Actions\SetSourceAccount */ - public function testActDepositExistingUpdated() + public function testActDepositExistingUpdated(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); @@ -86,7 +86,7 @@ class SetSourceAccountTest extends TestCase * * @covers \FireflyIII\TransactionRules\Actions\SetSourceAccount */ - public function testActDepositRevenue() + public function testActDepositRevenue(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $type = TransactionType::whereType(TransactionType::DEPOSIT)->first(); @@ -115,7 +115,7 @@ class SetSourceAccountTest extends TestCase * * @covers \FireflyIII\TransactionRules\Actions\SetSourceAccount */ - public function testActWithdrawalExistingUpdated() + public function testActWithdrawalExistingUpdated(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $type = TransactionType::whereType(TransactionType::WITHDRAWAL)->first(); @@ -157,7 +157,7 @@ class SetSourceAccountTest extends TestCase * * @covers \FireflyIII\TransactionRules\Actions\SetSourceAccount */ - public function testActWithdrawalNotExisting() + public function testActWithdrawalNotExisting(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $type = TransactionType::whereType(TransactionType::WITHDRAWAL)->first(); @@ -184,7 +184,7 @@ class SetSourceAccountTest extends TestCase * * @covers \FireflyIII\TransactionRules\Actions\SetSourceAccount */ - public function testSplitJournal() + public function testSplitJournal(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $transaction = Transaction::orderBy('count', 'DESC')->groupBy('transaction_journal_id') diff --git a/tests/Unit/TransactionRules/Triggers/AmountExactlyTest.php b/tests/Unit/TransactionRules/Triggers/AmountExactlyTest.php index db6bde769c..df24de6658 100644 --- a/tests/Unit/TransactionRules/Triggers/AmountExactlyTest.php +++ b/tests/Unit/TransactionRules/Triggers/AmountExactlyTest.php @@ -35,7 +35,7 @@ class AmountExactlyTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\AmountExactly::triggered */ - public function testTriggeredExact() + public function testTriggeredExact(): void { $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('setUser'); @@ -51,7 +51,7 @@ class AmountExactlyTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\AmountExactly::triggered */ - public function testTriggeredNotExact() + public function testTriggeredNotExact(): void { $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('setUser'); @@ -67,7 +67,7 @@ class AmountExactlyTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\AmountExactly::willMatchEverything */ - public function testWillMatchEverythingNotNull() + public function testWillMatchEverythingNotNull(): void { $value = 'x'; $result = AmountExactly::willMatchEverything($value); @@ -77,7 +77,7 @@ class AmountExactlyTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\AmountExactly::willMatchEverything */ - public function testWillMatchEverythingNull() + public function testWillMatchEverythingNull(): void { $value = null; $result = AmountExactly::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/AmountLessTest.php b/tests/Unit/TransactionRules/Triggers/AmountLessTest.php index b345e897e5..afdfbf23d7 100644 --- a/tests/Unit/TransactionRules/Triggers/AmountLessTest.php +++ b/tests/Unit/TransactionRules/Triggers/AmountLessTest.php @@ -35,7 +35,7 @@ class AmountLessTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\AmountLess::triggered */ - public function testTriggeredExact() + public function testTriggeredExact(): void { $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('setUser'); @@ -52,7 +52,7 @@ class AmountLessTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\AmountLess::triggered */ - public function testTriggeredLess() + public function testTriggeredLess(): void { $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('setUser'); @@ -69,7 +69,7 @@ class AmountLessTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\AmountLess::triggered */ - public function testTriggeredNotLess() + public function testTriggeredNotLess(): void { $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('setUser'); @@ -86,7 +86,7 @@ class AmountLessTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\AmountLess::willMatchEverything */ - public function testWillMatchEverythingNotNull() + public function testWillMatchEverythingNotNull(): void { $value = 'x'; $result = AmountLess::willMatchEverything($value); @@ -96,7 +96,7 @@ class AmountLessTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\AmountLess::willMatchEverything */ - public function testWillMatchEverythingNull() + public function testWillMatchEverythingNull(): void { $value = null; $result = AmountLess::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/AmountMoreTest.php b/tests/Unit/TransactionRules/Triggers/AmountMoreTest.php index 9459037d45..5e71d43bee 100644 --- a/tests/Unit/TransactionRules/Triggers/AmountMoreTest.php +++ b/tests/Unit/TransactionRules/Triggers/AmountMoreTest.php @@ -35,7 +35,7 @@ class AmountMoreTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\AmountMore::triggered */ - public function testTriggeredExact() + public function testTriggeredExact(): void { $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('setUser'); @@ -52,7 +52,7 @@ class AmountMoreTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\AmountMore::triggered */ - public function testTriggeredMore() + public function testTriggeredMore(): void { $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('setUser'); @@ -69,7 +69,7 @@ class AmountMoreTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\AmountMore::triggered */ - public function testTriggeredNotMore() + public function testTriggeredNotMore(): void { $journalRepos = $this->mock(JournalRepositoryInterface::class); $journalRepos->shouldReceive('setUser'); @@ -86,7 +86,7 @@ class AmountMoreTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\AmountMore::willMatchEverything */ - public function testWillMatchEverythingNotNull() + public function testWillMatchEverythingNotNull(): void { $value = '1'; $result = AmountMore::willMatchEverything($value); @@ -96,7 +96,7 @@ class AmountMoreTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\AmountMore::willMatchEverything */ - public function testWillMatchEverythingNull() + public function testWillMatchEverythingNull(): void { $value = null; $result = AmountMore::willMatchEverything($value); @@ -106,7 +106,7 @@ class AmountMoreTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\AmountMore::willMatchEverything */ - public function testWillMatchEverythingZero() + public function testWillMatchEverythingZero(): void { $value = '0'; $result = AmountMore::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/BudgetIsTest.php b/tests/Unit/TransactionRules/Triggers/BudgetIsTest.php index 06af062137..871d608ada 100644 --- a/tests/Unit/TransactionRules/Triggers/BudgetIsTest.php +++ b/tests/Unit/TransactionRules/Triggers/BudgetIsTest.php @@ -24,6 +24,7 @@ namespace Tests\Unit\TransactionRules\Triggers; use FireflyIII\Models\TransactionJournal; use FireflyIII\TransactionRules\Triggers\BudgetIs; +use Illuminate\Support\Collection; use Tests\TestCase; /** @@ -34,7 +35,7 @@ class BudgetIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\BudgetIs::triggered */ - public function testTriggeredJournal() + public function testTriggeredJournal(): void { do { $journal = TransactionJournal::inRandomOrder()->where('transaction_type_id', 1)->whereNull('deleted_at')->first(); @@ -54,7 +55,7 @@ class BudgetIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\BudgetIs::triggered */ - public function testTriggeredNotJournal() + public function testTriggeredNotJournal(): void { do { $journal = TransactionJournal::inRandomOrder()->where('transaction_type_id', 1)->whereNull('deleted_at')->first(); @@ -75,13 +76,14 @@ class BudgetIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\BudgetIs::triggered */ - public function testTriggeredTransaction() + public function testTriggeredTransaction(): void { do { $journal = TransactionJournal::inRandomOrder()->where('transaction_type_id', 1)->whereNull('deleted_at')->first(); $count = $journal->transactions()->count(); } while ($count !== 2); + /** @var Collection $transactions */ $transactions = $journal->transactions()->get(); $budget = $journal->user->budgets()->first(); @@ -101,7 +103,7 @@ class BudgetIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\BudgetIs::willMatchEverything */ - public function testWillMatchEverythingNotNull() + public function testWillMatchEverythingNotNull(): void { $value = 'x'; $result = BudgetIs::willMatchEverything($value); @@ -111,7 +113,7 @@ class BudgetIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\BudgetIs::willMatchEverything */ - public function testWillMatchEverythingNull() + public function testWillMatchEverythingNull(): void { $value = null; $result = BudgetIs::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/CategoryIsTest.php b/tests/Unit/TransactionRules/Triggers/CategoryIsTest.php index 380cc1a6d3..2fda7c1e74 100644 --- a/tests/Unit/TransactionRules/Triggers/CategoryIsTest.php +++ b/tests/Unit/TransactionRules/Triggers/CategoryIsTest.php @@ -34,7 +34,7 @@ class CategoryIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\CategoryIs::triggered */ - public function testTriggeredJournal() + public function testTriggeredJournal(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $category = $journal->user->categories()->first(); @@ -50,7 +50,7 @@ class CategoryIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\CategoryIs::triggered */ - public function testTriggeredNotJournal() + public function testTriggeredNotJournal(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $category = $journal->user->categories()->first(); @@ -67,7 +67,7 @@ class CategoryIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\CategoryIs::triggered */ - public function testTriggeredTransaction() + public function testTriggeredTransaction(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $transaction = $journal->transactions()->first(); @@ -87,7 +87,7 @@ class CategoryIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\CategoryIs::willMatchEverything */ - public function testWillMatchEverythingNotNull() + public function testWillMatchEverythingNotNull(): void { $value = 'x'; $result = CategoryIs::willMatchEverything($value); @@ -97,7 +97,7 @@ class CategoryIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\CategoryIs::willMatchEverything */ - public function testWillMatchEverythingNull() + public function testWillMatchEverythingNull(): void { $value = null; $result = CategoryIs::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/DescriptionContainsTest.php b/tests/Unit/TransactionRules/Triggers/DescriptionContainsTest.php index a05eb9246d..193d3521c0 100644 --- a/tests/Unit/TransactionRules/Triggers/DescriptionContainsTest.php +++ b/tests/Unit/TransactionRules/Triggers/DescriptionContainsTest.php @@ -34,7 +34,7 @@ class DescriptionContainsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionContains::triggered */ - public function testTriggeredCase() + public function testTriggeredCase(): void { $journal = new TransactionJournal; $journal->description = 'Lorem IPSUM bla bla '; @@ -46,7 +46,7 @@ class DescriptionContainsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionContains::triggered */ - public function testTriggeredDefault() + public function testTriggeredDefault(): void { $journal = new TransactionJournal; $journal->description = 'Should contain test string'; @@ -58,7 +58,7 @@ class DescriptionContainsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionContains::triggered */ - public function testTriggeredEnd() + public function testTriggeredEnd(): void { $journal = new TransactionJournal; $journal->description = 'Something is going to happen'; @@ -70,7 +70,7 @@ class DescriptionContainsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionContains::triggered */ - public function testTriggeredNot() + public function testTriggeredNot(): void { $journal = new TransactionJournal; $journal->description = 'Lorem IPSUM bla bla '; @@ -82,7 +82,7 @@ class DescriptionContainsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionContains::triggered */ - public function testTriggeredStart() + public function testTriggeredStart(): void { $journal = new TransactionJournal; $journal->description = 'Something is going to happen'; @@ -94,7 +94,7 @@ class DescriptionContainsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionContains::willMatchEverything */ - public function testWillMatchEverythingEmpty() + public function testWillMatchEverythingEmpty(): void { $value = ''; $result = DescriptionContains::willMatchEverything($value); @@ -104,7 +104,7 @@ class DescriptionContainsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionContains::willMatchEverything */ - public function testWillMatchEverythingNotNull() + public function testWillMatchEverythingNotNull(): void { $value = 'x'; $result = DescriptionContains::willMatchEverything($value); @@ -114,7 +114,7 @@ class DescriptionContainsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionContains::willMatchEverything */ - public function testWillMatchEverythingNull() + public function testWillMatchEverythingNull(): void { $value = null; $result = DescriptionContains::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/DescriptionEndsTest.php b/tests/Unit/TransactionRules/Triggers/DescriptionEndsTest.php index 0b47ccb2bf..cce83e5e77 100644 --- a/tests/Unit/TransactionRules/Triggers/DescriptionEndsTest.php +++ b/tests/Unit/TransactionRules/Triggers/DescriptionEndsTest.php @@ -34,7 +34,7 @@ class DescriptionEndsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionEnds::triggered */ - public function testTriggeredCase() + public function testTriggeredCase(): void { $journal = new TransactionJournal; $journal->description = 'Lorem IPSUMbla'; @@ -46,7 +46,7 @@ class DescriptionEndsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionEnds::triggered */ - public function testTriggeredClose() + public function testTriggeredClose(): void { $journal = new TransactionJournal; $journal->description = 'Something is going to happen'; @@ -58,7 +58,7 @@ class DescriptionEndsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionEnds::triggered */ - public function testTriggeredDefault() + public function testTriggeredDefault(): void { $journal = new TransactionJournal; $journal->description = 'Should contain test string'; @@ -70,7 +70,7 @@ class DescriptionEndsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionEnds::triggered */ - public function testTriggeredLongSearch() + public function testTriggeredLongSearch(): void { $journal = new TransactionJournal; $journal->description = 'Something'; @@ -82,7 +82,7 @@ class DescriptionEndsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionEnds::triggered */ - public function testTriggeredLonger() + public function testTriggeredLonger(): void { $journal = new TransactionJournal; $journal->description = 'Something is going to happen'; @@ -94,7 +94,7 @@ class DescriptionEndsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionEnds::triggered */ - public function testTriggeredNot() + public function testTriggeredNot(): void { $journal = new TransactionJournal; $journal->description = 'Lorem IPSUM blabla'; @@ -106,7 +106,7 @@ class DescriptionEndsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionEnds::willMatchEverything */ - public function testWillMatchEverythingEmpty() + public function testWillMatchEverythingEmpty(): void { $value = ''; $result = DescriptionEnds::willMatchEverything($value); @@ -116,7 +116,7 @@ class DescriptionEndsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionEnds::willMatchEverything */ - public function testWillMatchEverythingNotNull() + public function testWillMatchEverythingNotNull(): void { $value = 'x'; $result = DescriptionEnds::willMatchEverything($value); @@ -126,7 +126,7 @@ class DescriptionEndsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionEnds::willMatchEverything */ - public function testWillMatchEverythingNull() + public function testWillMatchEverythingNull(): void { $value = null; $result = DescriptionEnds::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/DescriptionIsTest.php b/tests/Unit/TransactionRules/Triggers/DescriptionIsTest.php index 70a4d721a7..8047c1ee21 100644 --- a/tests/Unit/TransactionRules/Triggers/DescriptionIsTest.php +++ b/tests/Unit/TransactionRules/Triggers/DescriptionIsTest.php @@ -34,7 +34,7 @@ class DescriptionIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionIs::triggered */ - public function testTriggeredCase() + public function testTriggeredCase(): void { $journal = new TransactionJournal; $journal->description = 'Lorem IPSUMbla'; @@ -46,7 +46,7 @@ class DescriptionIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionIs::triggered */ - public function testTriggeredClose() + public function testTriggeredClose(): void { $journal = new TransactionJournal; $journal->description = 'Something is going to happen'; @@ -58,7 +58,7 @@ class DescriptionIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionIs::triggered */ - public function testTriggeredDefault() + public function testTriggeredDefault(): void { $journal = new TransactionJournal; $journal->description = 'Should be test string'; @@ -70,7 +70,7 @@ class DescriptionIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionIs::triggered */ - public function testTriggeredNot() + public function testTriggeredNot(): void { $journal = new TransactionJournal; $journal->description = 'Lorem IPSUM blabla'; @@ -82,7 +82,7 @@ class DescriptionIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionIs::willMatchEverything */ - public function testWillMatchEverythingNotNull() + public function testWillMatchEverythingNotNull(): void { $value = 'x'; $result = DescriptionIs::willMatchEverything($value); @@ -92,7 +92,7 @@ class DescriptionIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionIs::willMatchEverything */ - public function testWillMatchEverythingNull() + public function testWillMatchEverythingNull(): void { $value = null; $result = DescriptionIs::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/DescriptionStartsTest.php b/tests/Unit/TransactionRules/Triggers/DescriptionStartsTest.php index 48b8002bfb..d676ae8ea4 100644 --- a/tests/Unit/TransactionRules/Triggers/DescriptionStartsTest.php +++ b/tests/Unit/TransactionRules/Triggers/DescriptionStartsTest.php @@ -34,7 +34,7 @@ class DescriptionStartsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionStarts::triggered */ - public function testTriggeredCase() + public function testTriggeredCase(): void { $journal = new TransactionJournal; $journal->description = 'Lorem IPSUMbla'; @@ -46,7 +46,7 @@ class DescriptionStartsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionStarts::triggered */ - public function testTriggeredClose() + public function testTriggeredClose(): void { $journal = new TransactionJournal; $journal->description = 'Something is going to happen'; @@ -58,7 +58,7 @@ class DescriptionStartsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionStarts::triggered */ - public function testTriggeredDefault() + public function testTriggeredDefault(): void { $journal = new TransactionJournal; $journal->description = 'Should contain test string'; @@ -70,7 +70,7 @@ class DescriptionStartsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionStarts::triggered */ - public function testTriggeredLongSearch() + public function testTriggeredLongSearch(): void { $journal = new TransactionJournal; $journal->description = 'Something'; @@ -82,7 +82,7 @@ class DescriptionStartsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionStarts::triggered */ - public function testTriggeredNot() + public function testTriggeredNot(): void { $journal = new TransactionJournal; $journal->description = 'Lorem IPSUM blabla'; @@ -94,7 +94,7 @@ class DescriptionStartsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionStarts::willMatchEverything */ - public function testWillMatchEverythingEmpty() + public function testWillMatchEverythingEmpty(): void { $value = ''; $result = DescriptionStarts::willMatchEverything($value); @@ -104,7 +104,7 @@ class DescriptionStartsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionStarts::willMatchEverything */ - public function testWillMatchEverythingNotNull() + public function testWillMatchEverythingNotNull(): void { $value = 'x'; $result = DescriptionStarts::willMatchEverything($value); @@ -114,7 +114,7 @@ class DescriptionStartsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\DescriptionStarts::willMatchEverything */ - public function testWillMatchEverythingNull() + public function testWillMatchEverythingNull(): void { $value = null; $result = DescriptionStarts::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/FromAccountContainsTest.php b/tests/Unit/TransactionRules/Triggers/FromAccountContainsTest.php index bff1abe830..39e17cd036 100644 --- a/tests/Unit/TransactionRules/Triggers/FromAccountContainsTest.php +++ b/tests/Unit/TransactionRules/Triggers/FromAccountContainsTest.php @@ -34,7 +34,7 @@ class FromAccountContainsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\FromAccountContains::triggered */ - public function testTriggered() + public function testTriggered(): void { $count = 0; while ($count === 0) { @@ -52,7 +52,7 @@ class FromAccountContainsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\FromAccountContains::triggered */ - public function testTriggeredNot() + public function testTriggeredNot(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); @@ -64,7 +64,7 @@ class FromAccountContainsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\FromAccountContains::willMatchEverything */ - public function testWillMatchEverythingEmpty() + public function testWillMatchEverythingEmpty(): void { $value = ''; $result = FromAccountContains::willMatchEverything($value); @@ -74,7 +74,7 @@ class FromAccountContainsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\FromAccountContains::willMatchEverything */ - public function testWillMatchEverythingNotNull() + public function testWillMatchEverythingNotNull(): void { $value = 'x'; $result = FromAccountContains::willMatchEverything($value); @@ -84,7 +84,7 @@ class FromAccountContainsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\FromAccountContains::willMatchEverything */ - public function testWillMatchEverythingNull() + public function testWillMatchEverythingNull(): void { $value = null; $result = FromAccountContains::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/FromAccountEndsTest.php b/tests/Unit/TransactionRules/Triggers/FromAccountEndsTest.php index f158707b9f..0c362edd1f 100644 --- a/tests/Unit/TransactionRules/Triggers/FromAccountEndsTest.php +++ b/tests/Unit/TransactionRules/Triggers/FromAccountEndsTest.php @@ -34,7 +34,7 @@ class FromAccountEndsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\FromAccountEnds::triggered */ - public function testTriggered() + public function testTriggered(): void { $count = 0; while ($count === 0) { @@ -52,7 +52,7 @@ class FromAccountEndsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\FromAccountEnds::triggered */ - public function testTriggeredLonger() + public function testTriggeredLonger(): void { $count = 0; while ($count === 0) { @@ -70,7 +70,7 @@ class FromAccountEndsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\FromAccountEnds::triggered */ - public function testTriggeredNot() + public function testTriggeredNot(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); @@ -82,7 +82,7 @@ class FromAccountEndsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\FromAccountEnds::willMatchEverything */ - public function testWillMatchEverythingEmpty() + public function testWillMatchEverythingEmpty(): void { $value = ''; $result = FromAccountEnds::willMatchEverything($value); @@ -92,7 +92,7 @@ class FromAccountEndsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\FromAccountEnds::willMatchEverything */ - public function testWillMatchEverythingNotNull() + public function testWillMatchEverythingNotNull(): void { $value = 'x'; $result = FromAccountEnds::willMatchEverything($value); @@ -102,7 +102,7 @@ class FromAccountEndsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\FromAccountEnds::willMatchEverything */ - public function testWillMatchEverythingNull() + public function testWillMatchEverythingNull(): void { $value = null; $result = FromAccountEnds::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/FromAccountIsTest.php b/tests/Unit/TransactionRules/Triggers/FromAccountIsTest.php index d2a91b8b71..0ac584ec44 100644 --- a/tests/Unit/TransactionRules/Triggers/FromAccountIsTest.php +++ b/tests/Unit/TransactionRules/Triggers/FromAccountIsTest.php @@ -34,7 +34,7 @@ class FromAccountIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\FromAccountIs::triggered */ - public function testTriggered() + public function testTriggered(): void { $count = 0; while ($count === 0) { @@ -52,7 +52,7 @@ class FromAccountIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\FromAccountIs::triggered */ - public function testTriggeredNot() + public function testTriggeredNot(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); @@ -64,7 +64,7 @@ class FromAccountIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\FromAccountIs::willMatchEverything */ - public function testWillMatchEverythingEmpty() + public function testWillMatchEverythingEmpty(): void { $value = ''; $result = FromAccountIs::willMatchEverything($value); @@ -74,7 +74,7 @@ class FromAccountIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\FromAccountIs::willMatchEverything */ - public function testWillMatchEverythingNotNull() + public function testWillMatchEverythingNotNull(): void { $value = 'x'; $result = FromAccountIs::willMatchEverything($value); @@ -84,7 +84,7 @@ class FromAccountIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\FromAccountIs::willMatchEverything */ - public function testWillMatchEverythingNull() + public function testWillMatchEverythingNull(): void { $value = null; $result = FromAccountIs::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php b/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php index 0d9742099e..e411beae7f 100644 --- a/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php +++ b/tests/Unit/TransactionRules/Triggers/FromAccountStartsTest.php @@ -34,7 +34,7 @@ class FromAccountStartsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\FromAccountStarts::triggered */ - public function testTriggered() + public function testTriggered(): void { $transaction = null; do { @@ -51,7 +51,7 @@ class FromAccountStartsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\FromAccountStarts::triggered */ - public function testTriggeredLonger() + public function testTriggeredLonger(): void { $transaction = null; do { @@ -69,7 +69,7 @@ class FromAccountStartsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\FromAccountStarts::triggered */ - public function testTriggeredNot() + public function testTriggeredNot(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); @@ -81,7 +81,7 @@ class FromAccountStartsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\FromAccountStarts::willMatchEverything */ - public function testWillMatchEverythingEmpty() + public function testWillMatchEverythingEmpty(): void { $value = ''; $result = FromAccountStarts::willMatchEverything($value); @@ -91,7 +91,7 @@ class FromAccountStartsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\FromAccountStarts::willMatchEverything */ - public function testWillMatchEverythingNotNull() + public function testWillMatchEverythingNotNull(): void { $value = 'x'; $result = FromAccountStarts::willMatchEverything($value); @@ -101,7 +101,7 @@ class FromAccountStartsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\FromAccountStarts::willMatchEverything */ - public function testWillMatchEverythingNull() + public function testWillMatchEverythingNull(): void { $value = null; $result = FromAccountStarts::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/HasAnyBudgetTest.php b/tests/Unit/TransactionRules/Triggers/HasAnyBudgetTest.php index 6ad4a71235..a2c7664c40 100644 --- a/tests/Unit/TransactionRules/Triggers/HasAnyBudgetTest.php +++ b/tests/Unit/TransactionRules/Triggers/HasAnyBudgetTest.php @@ -34,7 +34,7 @@ class HasAnyBudgetTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\HasAnyBudget::triggered */ - public function testTriggered() + public function testTriggered(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $budget = $journal->user->budgets()->first(); @@ -50,7 +50,7 @@ class HasAnyBudgetTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\HasAnyBudget::triggered */ - public function testTriggeredNot() + public function testTriggeredNot(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->budgets()->detach(); @@ -63,7 +63,7 @@ class HasAnyBudgetTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\HasAnyBudget::triggered */ - public function testTriggeredTransactions() + public function testTriggeredTransactions(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $budget = $journal->user->budgets()->first(); @@ -86,7 +86,7 @@ class HasAnyBudgetTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\HasAnyBudget::willMatchEverything */ - public function testWillMatchEverything() + public function testWillMatchEverything(): void { $value = ''; $result = HasAnyBudget::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/HasAnyCategoryTest.php b/tests/Unit/TransactionRules/Triggers/HasAnyCategoryTest.php index d1b0081bd2..0c6d828515 100644 --- a/tests/Unit/TransactionRules/Triggers/HasAnyCategoryTest.php +++ b/tests/Unit/TransactionRules/Triggers/HasAnyCategoryTest.php @@ -35,7 +35,7 @@ class HasAnyCategoryTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\HasAnyCategory::triggered */ - public function testTriggered() + public function testTriggered(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $category = $journal->user->categories()->first(); @@ -51,14 +51,14 @@ class HasAnyCategoryTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\HasAnyCategory::triggered */ - public function testTriggeredNot() + public function testTriggeredNot(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->categories()->detach(); // also detach transactions: /** @var Transaction $transaction */ - foreach($journal->transactions as $transaction) { + foreach ($journal->transactions as $transaction) { $transaction->categories()->detach(); } @@ -71,10 +71,16 @@ class HasAnyCategoryTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\HasAnyCategory::triggered */ - public function testTriggeredTransactions() + public function testTriggeredTransactions(): void { - /** @var TransactionJournal $journal */ - $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); + $count = 0; + $journal = null; + while ($count === 0) { + /** @var TransactionJournal $journal */ + $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); + $count = $journal->transactions()->count(); + } + $category = $journal->user->categories()->first(); $journal->categories()->detach(); $this->assertEquals(0, $journal->categories()->count()); @@ -94,7 +100,7 @@ class HasAnyCategoryTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\HasAnyCategory::willMatchEverything */ - public function testWillMatchEverything() + public function testWillMatchEverything(): void { $value = ''; $result = HasAnyCategory::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/HasAnyTagTest.php b/tests/Unit/TransactionRules/Triggers/HasAnyTagTest.php index 1f0a928e88..366ef620ec 100644 --- a/tests/Unit/TransactionRules/Triggers/HasAnyTagTest.php +++ b/tests/Unit/TransactionRules/Triggers/HasAnyTagTest.php @@ -34,7 +34,7 @@ class HasAnyTagTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\HasAnyTag::triggered */ - public function testTriggered() + public function testTriggered(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $tag = $journal->user->tags()->first(); @@ -50,7 +50,7 @@ class HasAnyTagTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\HasAnyTag::triggered */ - public function testTriggeredNot() + public function testTriggeredNot(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->tags()->detach(); @@ -63,7 +63,7 @@ class HasAnyTagTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\HasAnyTag::willMatchEverything */ - public function testWillMatchEverything() + public function testWillMatchEverything(): void { $value = ''; $result = HasAnyTag::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/HasAttachmentTest.php b/tests/Unit/TransactionRules/Triggers/HasAttachmentTest.php index 9b2a4316c9..841261bb6d 100644 --- a/tests/Unit/TransactionRules/Triggers/HasAttachmentTest.php +++ b/tests/Unit/TransactionRules/Triggers/HasAttachmentTest.php @@ -34,7 +34,7 @@ class HasAttachmentTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\HasAttachment::triggered */ - public function testTriggered() + public function testTriggered(): void { do { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); @@ -53,7 +53,7 @@ class HasAttachmentTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\HasAttachment::triggered */ - public function testTriggeredFalse() + public function testTriggeredFalse(): void { do { // this is kind of cheating but OK. @@ -71,7 +71,7 @@ class HasAttachmentTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\HasAttachment::willMatchEverything */ - public function testWillMatchEverything() + public function testWillMatchEverything(): void { $value = '5'; $result = HasAttachment::willMatchEverything($value); @@ -81,7 +81,7 @@ class HasAttachmentTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\HasAttachment::willMatchEverything */ - public function testWillMatchEverythingTrue() + public function testWillMatchEverythingTrue(): void { $value = -1; $result = HasAttachment::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/HasNoBudgetTest.php b/tests/Unit/TransactionRules/Triggers/HasNoBudgetTest.php index b0df151e08..f1eb119f9e 100644 --- a/tests/Unit/TransactionRules/Triggers/HasNoBudgetTest.php +++ b/tests/Unit/TransactionRules/Triggers/HasNoBudgetTest.php @@ -35,7 +35,7 @@ class HasNoBudgetTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\HasNoBudget::triggered */ - public function testTriggeredBudget() + public function testTriggeredBudget(): void { $journal = TransactionJournal::inRandomOrder()->where('transaction_type_id', 1)->whereNull('deleted_at')->first(); $budget = $journal->user->budgets()->first(); @@ -51,7 +51,7 @@ class HasNoBudgetTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\HasNoBudget::triggered */ - public function testTriggeredNoBudget() + public function testTriggeredNoBudget(): void { /** @var TransactionJournal $journal */ $journal = TransactionJournal::inRandomOrder()->where('transaction_type_id', 1)->whereNull('deleted_at')->first(); @@ -70,7 +70,7 @@ class HasNoBudgetTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\HasNoBudget::triggered */ - public function testTriggeredTransaction() + public function testTriggeredTransaction(): void { /** @var TransactionJournal $journal */ $journal = TransactionJournal::inRandomOrder()->where('transaction_type_id', 1)->whereNull('deleted_at')->first(); @@ -93,7 +93,7 @@ class HasNoBudgetTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\HasNoBudget::willMatchEverything */ - public function testWillMatchEverythingNull() + public function testWillMatchEverythingNull(): void { $value = null; $result = HasNoBudget::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/HasNoCategoryTest.php b/tests/Unit/TransactionRules/Triggers/HasNoCategoryTest.php index 18875e841c..74ed15ed63 100644 --- a/tests/Unit/TransactionRules/Triggers/HasNoCategoryTest.php +++ b/tests/Unit/TransactionRules/Triggers/HasNoCategoryTest.php @@ -35,7 +35,7 @@ class HasNoCategoryTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\HasNoCategory::triggered */ - public function testTriggeredCategory() + public function testTriggeredCategory(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $category = $journal->user->categories()->first(); @@ -51,7 +51,7 @@ class HasNoCategoryTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\HasNoCategory::triggered */ - public function testTriggeredNoCategory() + public function testTriggeredNoCategory(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->categories()->detach(); @@ -73,14 +73,18 @@ class HasNoCategoryTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\HasNoCategory::triggered */ - public function testTriggeredTransaction() + public function testTriggeredTransaction(): void { - $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); + $count = 0; + while ($count === 0) { + $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); + $count = $journal->transactions()->count(); + } $transaction = $journal->transactions()->first(); $category = $journal->user->categories()->first(); $journal->categories()->detach(); - $transaction->categories()->save($category); + $transaction->categories()->sync([$category->id]); $this->assertEquals(0, $journal->categories()->count()); $this->assertEquals(1, $transaction->categories()->count()); @@ -92,7 +96,7 @@ class HasNoCategoryTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\HasNoCategory::willMatchEverything */ - public function testWillMatchEverythingNull() + public function testWillMatchEverythingNull(): void { $value = null; $result = HasNoCategory::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/HasNoTagTest.php b/tests/Unit/TransactionRules/Triggers/HasNoTagTest.php index 027176dce7..a29108d8c4 100644 --- a/tests/Unit/TransactionRules/Triggers/HasNoTagTest.php +++ b/tests/Unit/TransactionRules/Triggers/HasNoTagTest.php @@ -34,7 +34,7 @@ class HasNoTagTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\HasNoTag::triggered */ - public function testTriggeredNoTag() + public function testTriggeredNoTag(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->tags()->detach(); @@ -48,7 +48,7 @@ class HasNoTagTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\HasNoTag::triggered */ - public function testTriggeredTag() + public function testTriggeredTag(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $tag = $journal->user->tags()->first(); @@ -64,7 +64,7 @@ class HasNoTagTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\HasNoTag::willMatchEverything */ - public function testWillMatchEverythingNull() + public function testWillMatchEverythingNull(): void { $value = null; $result = HasNoTag::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/NotesAnyTest.php b/tests/Unit/TransactionRules/Triggers/NotesAnyTest.php index 556eb42664..4d55a7d7ec 100644 --- a/tests/Unit/TransactionRules/Triggers/NotesAnyTest.php +++ b/tests/Unit/TransactionRules/Triggers/NotesAnyTest.php @@ -35,7 +35,7 @@ class NotesAnyTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesAny::triggered */ - public function testTriggered() + public function testTriggered(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->notes()->delete(); @@ -51,7 +51,7 @@ class NotesAnyTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesAny::triggered */ - public function testTriggeredEmpty() + public function testTriggeredEmpty(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->notes()->delete(); @@ -67,7 +67,7 @@ class NotesAnyTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesAny::triggered */ - public function testTriggeredNone() + public function testTriggeredNone(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->notes()->delete(); @@ -79,7 +79,7 @@ class NotesAnyTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesAny::willMatchEverything */ - public function testWillMatchEverythingNull() + public function testWillMatchEverythingNull(): void { $value = null; $result = NotesAny::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/NotesAreTest.php b/tests/Unit/TransactionRules/Triggers/NotesAreTest.php index 1bb3ea917f..eccbc8f127 100644 --- a/tests/Unit/TransactionRules/Triggers/NotesAreTest.php +++ b/tests/Unit/TransactionRules/Triggers/NotesAreTest.php @@ -35,7 +35,7 @@ class NotesAreTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesAre::triggered */ - public function testTriggered() + public function testTriggered(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->notes()->delete(); @@ -51,7 +51,7 @@ class NotesAreTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesAre::triggered */ - public function testTriggeredDifferent() + public function testTriggeredDifferent(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->notes()->delete(); @@ -67,7 +67,7 @@ class NotesAreTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesAre::triggered */ - public function testTriggeredEmpty() + public function testTriggeredEmpty(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->notes()->delete(); @@ -83,7 +83,7 @@ class NotesAreTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesAre::triggered */ - public function testTriggeredNone() + public function testTriggeredNone(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->notes()->delete(); @@ -95,7 +95,7 @@ class NotesAreTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesAre::willMatchEverything */ - public function testWillMatchEverythingNotNull() + public function testWillMatchEverythingNotNull(): void { $value = 'x'; $result = NotesAre::willMatchEverything($value); @@ -105,7 +105,7 @@ class NotesAreTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesAre::willMatchEverything */ - public function testWillMatchEverythingNull() + public function testWillMatchEverythingNull(): void { $value = null; $result = NotesAre::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/NotesContainTest.php b/tests/Unit/TransactionRules/Triggers/NotesContainTest.php index 2ca2b43161..536eceba47 100644 --- a/tests/Unit/TransactionRules/Triggers/NotesContainTest.php +++ b/tests/Unit/TransactionRules/Triggers/NotesContainTest.php @@ -35,7 +35,7 @@ class NotesContainTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesContain::triggered */ - public function testTriggered() + public function testTriggered(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->notes()->delete(); @@ -51,7 +51,7 @@ class NotesContainTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesContain::triggered */ - public function testTriggeredDifferent() + public function testTriggeredDifferent(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->notes()->delete(); @@ -67,7 +67,7 @@ class NotesContainTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesContain::triggered */ - public function testTriggeredEmpty() + public function testTriggeredEmpty(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->notes()->delete(); @@ -83,7 +83,7 @@ class NotesContainTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesContain::triggered */ - public function testTriggeredNone() + public function testTriggeredNone(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->notes()->delete(); @@ -95,7 +95,7 @@ class NotesContainTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesContain::triggered */ - public function testTriggeredPartial() + public function testTriggeredPartial(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->notes()->delete(); @@ -111,7 +111,7 @@ class NotesContainTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesContain::willMatchEverything */ - public function testWillMatchEverythingEmpty() + public function testWillMatchEverythingEmpty(): void { $value = ''; $result = NotesContain::willMatchEverything($value); @@ -121,7 +121,7 @@ class NotesContainTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesContain::willMatchEverything */ - public function testWillMatchEverythingNotNull() + public function testWillMatchEverythingNotNull(): void { $value = 'x'; $result = NotesContain::willMatchEverything($value); @@ -131,7 +131,7 @@ class NotesContainTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesContain::willMatchEverything */ - public function testWillMatchEverythingNull() + public function testWillMatchEverythingNull(): void { $value = null; $result = NotesContain::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/NotesEmptyTest.php b/tests/Unit/TransactionRules/Triggers/NotesEmptyTest.php index 12910fd587..fc6c9a7440 100644 --- a/tests/Unit/TransactionRules/Triggers/NotesEmptyTest.php +++ b/tests/Unit/TransactionRules/Triggers/NotesEmptyTest.php @@ -35,7 +35,7 @@ class NotesEmptyTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesEmpty::triggered */ - public function testTriggered() + public function testTriggered(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->notes()->delete(); @@ -47,7 +47,7 @@ class NotesEmptyTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesEmpty::triggered */ - public function testTriggeredEmpty() + public function testTriggeredEmpty(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->notes()->delete(); @@ -63,7 +63,7 @@ class NotesEmptyTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesEmpty::triggered */ - public function testTriggeredPartial() + public function testTriggeredPartial(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->notes()->delete(); @@ -79,7 +79,7 @@ class NotesEmptyTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesEmpty::willMatchEverything */ - public function testWillMatchEverythingNotNull() + public function testWillMatchEverythingNotNull(): void { $value = 'x'; $result = NotesEmpty::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/NotesEndTest.php b/tests/Unit/TransactionRules/Triggers/NotesEndTest.php index e410264174..b64a9b1779 100644 --- a/tests/Unit/TransactionRules/Triggers/NotesEndTest.php +++ b/tests/Unit/TransactionRules/Triggers/NotesEndTest.php @@ -35,7 +35,7 @@ class NotesEndTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesEnd::triggered */ - public function testTriggered() + public function testTriggered(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->notes()->delete(); @@ -51,7 +51,7 @@ class NotesEndTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesEnd::triggered */ - public function testTriggeredLonger() + public function testTriggeredLonger(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->notes()->delete(); @@ -67,7 +67,7 @@ class NotesEndTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesEnd::triggered */ - public function testTriggeredNoMatch() + public function testTriggeredNoMatch(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->notes()->delete(); @@ -83,7 +83,7 @@ class NotesEndTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesEnd::willMatchEverything */ - public function testWillMatchEverythingEmpty() + public function testWillMatchEverythingEmpty(): void { $value = ''; $result = NotesEnd::willMatchEverything($value); @@ -93,7 +93,7 @@ class NotesEndTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesEnd::willMatchEverything */ - public function testWillMatchEverythingNotNull() + public function testWillMatchEverythingNotNull(): void { $value = 'x'; $result = NotesEnd::willMatchEverything($value); @@ -103,7 +103,7 @@ class NotesEndTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesEnd::willMatchEverything */ - public function testWillMatchEverythingNull() + public function testWillMatchEverythingNull(): void { $value = null; $result = NotesEnd::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/NotesStartTest.php b/tests/Unit/TransactionRules/Triggers/NotesStartTest.php index 7a795bc2be..aac0578057 100644 --- a/tests/Unit/TransactionRules/Triggers/NotesStartTest.php +++ b/tests/Unit/TransactionRules/Triggers/NotesStartTest.php @@ -35,7 +35,7 @@ class NotesStartTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesStart::triggered */ - public function testTriggered() + public function testTriggered(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->notes()->delete(); @@ -51,7 +51,7 @@ class NotesStartTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesStart::triggered */ - public function testTriggeredLonger() + public function testTriggeredLonger(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->notes()->delete(); @@ -67,7 +67,7 @@ class NotesStartTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesStart::triggered */ - public function testTriggeredNoMatch() + public function testTriggeredNoMatch(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->notes()->delete(); @@ -83,7 +83,7 @@ class NotesStartTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesStart::willMatchEverything */ - public function testWillMatchEverythingEmpty() + public function testWillMatchEverythingEmpty(): void { $value = ''; $result = NotesStart::willMatchEverything($value); @@ -93,7 +93,7 @@ class NotesStartTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesStart::willMatchEverything */ - public function testWillMatchEverythingNotNull() + public function testWillMatchEverythingNotNull(): void { $value = 'x'; $result = NotesStart::willMatchEverything($value); @@ -103,7 +103,7 @@ class NotesStartTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\NotesStart::willMatchEverything */ - public function testWillMatchEverythingNull() + public function testWillMatchEverythingNull(): void { $value = null; $result = NotesStart::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/TagIsTest.php b/tests/Unit/TransactionRules/Triggers/TagIsTest.php index 8abe809705..46d9cff567 100644 --- a/tests/Unit/TransactionRules/Triggers/TagIsTest.php +++ b/tests/Unit/TransactionRules/Triggers/TagIsTest.php @@ -24,6 +24,7 @@ namespace Tests\Unit\TransactionRules\Triggers; use FireflyIII\Models\TransactionJournal; use FireflyIII\TransactionRules\Triggers\TagIs; +use Illuminate\Support\Collection; use Tests\TestCase; /** @@ -34,7 +35,7 @@ class TagIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\TagIs::triggered */ - public function testNotTriggered() + public function testNotTriggered(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->tags()->detach(); @@ -48,10 +49,11 @@ class TagIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\TagIs::triggered */ - public function testTriggered() + public function testTriggered(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $journal->tags()->detach(); + /** @var Collection $tags */ $tags = $journal->user->tags()->take(3)->get(); $search = ''; foreach ($tags as $index => $tag) { @@ -70,7 +72,7 @@ class TagIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\TagIs::willMatchEverything */ - public function testWillMatchEverythingEmpty() + public function testWillMatchEverythingEmpty(): void { $value = ''; $result = TagIs::willMatchEverything($value); @@ -80,7 +82,7 @@ class TagIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\TagIs::willMatchEverything */ - public function testWillMatchEverythingNotNull() + public function testWillMatchEverythingNotNull(): void { $value = 'x'; $result = TagIs::willMatchEverything($value); @@ -90,7 +92,7 @@ class TagIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\TagIs::willMatchEverything */ - public function testWillMatchEverythingNull() + public function testWillMatchEverythingNull(): void { $value = null; $result = TagIs::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/ToAccountContainsTest.php b/tests/Unit/TransactionRules/Triggers/ToAccountContainsTest.php index d161459c5d..0163d93b72 100644 --- a/tests/Unit/TransactionRules/Triggers/ToAccountContainsTest.php +++ b/tests/Unit/TransactionRules/Triggers/ToAccountContainsTest.php @@ -34,7 +34,7 @@ class ToAccountContainsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\ToAccountContains::triggered */ - public function testTriggered() + public function testTriggered(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $transaction = $journal->transactions()->where('amount', '>', 0)->first(); @@ -47,7 +47,7 @@ class ToAccountContainsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\ToAccountContains::triggered */ - public function testTriggeredNot() + public function testTriggeredNot(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $trigger = ToAccountContains::makeFromStrings('some name' . random_int(1, 234), false); @@ -58,7 +58,7 @@ class ToAccountContainsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\ToAccountContains::willMatchEverything */ - public function testWillMatchEverythingEmpty() + public function testWillMatchEverythingEmpty(): void { $value = ''; $result = ToAccountContains::willMatchEverything($value); @@ -68,7 +68,7 @@ class ToAccountContainsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\ToAccountContains::willMatchEverything */ - public function testWillMatchEverythingNotNull() + public function testWillMatchEverythingNotNull(): void { $value = 'x'; $result = ToAccountContains::willMatchEverything($value); @@ -78,7 +78,7 @@ class ToAccountContainsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\ToAccountContains::willMatchEverything */ - public function testWillMatchEverythingNull() + public function testWillMatchEverythingNull(): void { $value = null; $result = ToAccountContains::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/ToAccountEndsTest.php b/tests/Unit/TransactionRules/Triggers/ToAccountEndsTest.php index 87738847d7..14b52e1e87 100644 --- a/tests/Unit/TransactionRules/Triggers/ToAccountEndsTest.php +++ b/tests/Unit/TransactionRules/Triggers/ToAccountEndsTest.php @@ -34,7 +34,7 @@ class ToAccountEndsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\ToAccountEnds::triggered */ - public function testTriggered() + public function testTriggered(): void { $count = 0; while ($count === 0) { @@ -52,7 +52,7 @@ class ToAccountEndsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\ToAccountEnds::triggered */ - public function testTriggeredLonger() + public function testTriggeredLonger(): void { $count = 0; while ($count === 0) { @@ -70,7 +70,7 @@ class ToAccountEndsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\ToAccountEnds::triggered */ - public function testTriggeredNot() + public function testTriggeredNot(): void { $count = 0; while ($count === 0) { @@ -86,7 +86,7 @@ class ToAccountEndsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\ToAccountEnds::willMatchEverything */ - public function testWillMatchEverythingEmpty() + public function testWillMatchEverythingEmpty(): void { $value = ''; $result = ToAccountEnds::willMatchEverything($value); @@ -96,7 +96,7 @@ class ToAccountEndsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\ToAccountEnds::willMatchEverything */ - public function testWillMatchEverythingNotNull() + public function testWillMatchEverythingNotNull(): void { $value = 'x'; $result = ToAccountEnds::willMatchEverything($value); @@ -106,7 +106,7 @@ class ToAccountEndsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\ToAccountEnds::willMatchEverything */ - public function testWillMatchEverythingNull() + public function testWillMatchEverythingNull(): void { $value = null; $result = ToAccountEnds::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/ToAccountIsTest.php b/tests/Unit/TransactionRules/Triggers/ToAccountIsTest.php index e8ae02cdff..16f68cda1e 100644 --- a/tests/Unit/TransactionRules/Triggers/ToAccountIsTest.php +++ b/tests/Unit/TransactionRules/Triggers/ToAccountIsTest.php @@ -34,7 +34,7 @@ class ToAccountIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\ToAccountIs::triggered */ - public function testTriggered() + public function testTriggered(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $transaction = $journal->transactions()->where('amount', '>', 0)->first(); @@ -48,7 +48,7 @@ class ToAccountIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\ToAccountIs::triggered */ - public function testTriggeredNot() + public function testTriggeredNot(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); @@ -60,7 +60,7 @@ class ToAccountIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\ToAccountIs::willMatchEverything */ - public function testWillMatchEverythingEmpty() + public function testWillMatchEverythingEmpty(): void { $value = ''; $result = ToAccountIs::willMatchEverything($value); @@ -70,7 +70,7 @@ class ToAccountIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\ToAccountIs::willMatchEverything */ - public function testWillMatchEverythingNotNull() + public function testWillMatchEverythingNotNull(): void { $value = 'x'; $result = ToAccountIs::willMatchEverything($value); @@ -80,7 +80,7 @@ class ToAccountIsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\ToAccountIs::willMatchEverything */ - public function testWillMatchEverythingNull() + public function testWillMatchEverythingNull(): void { $value = null; $result = ToAccountIs::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/ToAccountStartsTest.php b/tests/Unit/TransactionRules/Triggers/ToAccountStartsTest.php index f99844c634..bc5a23f749 100644 --- a/tests/Unit/TransactionRules/Triggers/ToAccountStartsTest.php +++ b/tests/Unit/TransactionRules/Triggers/ToAccountStartsTest.php @@ -34,7 +34,7 @@ class ToAccountStartsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\ToAccountStarts::triggered */ - public function testTriggered() + public function testTriggered(): void { $count = 0; while ($count === 0) { @@ -52,7 +52,7 @@ class ToAccountStartsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\ToAccountStarts::triggered */ - public function testTriggeredLonger() + public function testTriggeredLonger(): void { $count = 0; while ($count === 0) { @@ -70,7 +70,7 @@ class ToAccountStartsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\ToAccountStarts::triggered */ - public function testTriggeredNot() + public function testTriggeredNot(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); @@ -82,7 +82,7 @@ class ToAccountStartsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\ToAccountStarts::willMatchEverything */ - public function testWillMatchEverythingEmpty() + public function testWillMatchEverythingEmpty(): void { $value = ''; $result = ToAccountStarts::willMatchEverything($value); @@ -92,7 +92,7 @@ class ToAccountStartsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\ToAccountStarts::willMatchEverything */ - public function testWillMatchEverythingNotNull() + public function testWillMatchEverythingNotNull(): void { $value = 'x'; $result = ToAccountStarts::willMatchEverything($value); @@ -102,7 +102,7 @@ class ToAccountStartsTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\ToAccountStarts::willMatchEverything */ - public function testWillMatchEverythingNull() + public function testWillMatchEverythingNull(): void { $value = null; $result = ToAccountStarts::willMatchEverything($value); diff --git a/tests/Unit/TransactionRules/Triggers/TransactionTypeTest.php b/tests/Unit/TransactionRules/Triggers/TransactionTypeTest.php index f359da8e4f..19d63a514e 100644 --- a/tests/Unit/TransactionRules/Triggers/TransactionTypeTest.php +++ b/tests/Unit/TransactionRules/Triggers/TransactionTypeTest.php @@ -34,7 +34,7 @@ class TransactionTypeTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\TransactionType::triggered */ - public function testTriggered() + public function testTriggered(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $type = $journal->transactionType->type; @@ -46,7 +46,7 @@ class TransactionTypeTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\TransactionType::triggered */ - public function testTriggeredFalse() + public function testTriggeredFalse(): void { $journal = TransactionJournal::inRandomOrder()->whereNull('deleted_at')->first(); $trigger = TransactionType::makeFromStrings('NonExisting', false); @@ -57,7 +57,7 @@ class TransactionTypeTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\TransactionType::willMatchEverything */ - public function testWillMatchEverythingNotNull() + public function testWillMatchEverythingNotNull(): void { $value = 'x'; $result = TransactionType::willMatchEverything($value); @@ -67,7 +67,7 @@ class TransactionTypeTest extends TestCase /** * @covers \FireflyIII\TransactionRules\Triggers\TransactionType::willMatchEverything */ - public function testWillMatchEverythingNull() + public function testWillMatchEverythingNull(): void { $value = null; $result = TransactionType::willMatchEverything($value); diff --git a/tests/Unit/Transformers/AccountTransformerTest.php b/tests/Unit/Transformers/AccountTransformerTest.php index 90d2e76505..4e7bd534d9 100644 --- a/tests/Unit/Transformers/AccountTransformerTest.php +++ b/tests/Unit/Transformers/AccountTransformerTest.php @@ -45,7 +45,7 @@ class AccountTransformerTest extends TestCase * * @covers \FireflyIII\Transformers\AccountTransformer::transform */ - public function testBasic() + public function testBasic(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos->shouldReceive('setUser'); @@ -83,7 +83,7 @@ class AccountTransformerTest extends TestCase * * @covers \FireflyIII\Transformers\AccountTransformer::transform */ - public function testBasicDate() + public function testBasicDate(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos->shouldReceive('setUser'); @@ -121,7 +121,7 @@ class AccountTransformerTest extends TestCase * * @covers \FireflyIII\Transformers\AccountTransformer::transform */ - public function testCCDataAsset() + public function testCCDataAsset(): void { // make new account: $account = Account::create( @@ -212,7 +212,7 @@ class AccountTransformerTest extends TestCase * * @covers \FireflyIII\Transformers\AccountTransformer::transform */ - public function testIgnoreCCExpense() + public function testIgnoreCCExpense(): void { // make new account: @@ -297,7 +297,7 @@ class AccountTransformerTest extends TestCase * * @covers \FireflyIII\Transformers\AccountTransformer::transform */ - public function testOpeningBalance() + public function testOpeningBalance(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos->shouldReceive('setUser'); @@ -355,7 +355,7 @@ class AccountTransformerTest extends TestCase * * @covers \FireflyIII\Transformers\AccountTransformer::transform */ - public function testWithCurrency() + public function testWithCurrency(): void { $accountRepos = $this->mock(AccountRepositoryInterface::class); $accountRepos->shouldReceive('setUser'); @@ -401,7 +401,7 @@ class AccountTransformerTest extends TestCase * * @covers \FireflyIII\Transformers\AccountTransformer::transform */ - public function testWithNotes() + public function testWithNotes(): void { // make new account: $account = Account::create( diff --git a/tests/Unit/Transformers/AttachmentTransformerTest.php b/tests/Unit/Transformers/AttachmentTransformerTest.php index e7b8034c3a..6c6869a7f3 100644 --- a/tests/Unit/Transformers/AttachmentTransformerTest.php +++ b/tests/Unit/Transformers/AttachmentTransformerTest.php @@ -39,7 +39,7 @@ class AttachmentTransformerTest extends TestCase * * @covers \FireflyIII\Transformers\AttachmentTransformer::transform */ - public function testBasic() + public function testBasic(): void { $md5 = md5('hello' . random_int(1, 10000)); $attachment = Attachment::create( diff --git a/tests/Unit/Transformers/BillTransformerTest.php b/tests/Unit/Transformers/BillTransformerTest.php index a7a0c714d8..c46b5e0157 100644 --- a/tests/Unit/Transformers/BillTransformerTest.php +++ b/tests/Unit/Transformers/BillTransformerTest.php @@ -44,7 +44,7 @@ class BillTransformerTest extends TestCase * @covers \FireflyIII\Transformers\BillTransformer::paidData * @covers \FireflyIII\Transformers\BillTransformer::payDates */ - public function testBasic() + public function testBasic(): void { $bill = Bill::create( @@ -73,7 +73,7 @@ class BillTransformerTest extends TestCase * * @covers \FireflyIII\Transformers\BillTransformer::transform */ - public function testNote() + public function testNote(): void { $bill = Bill::create( @@ -115,7 +115,7 @@ class BillTransformerTest extends TestCase * @covers \FireflyIII\Transformers\BillTransformer::lastPaidDate * @covers \FireflyIII\Transformers\BillTransformer::nextDateMatch */ - public function testWithDates() + public function testWithDates(): void { // mock stuff $repository = $this->mock(BillRepositoryInterface::class); diff --git a/tests/Unit/Transformers/BudgetTransformerTest.php b/tests/Unit/Transformers/BudgetTransformerTest.php index a9554212b3..576bdb767c 100644 --- a/tests/Unit/Transformers/BudgetTransformerTest.php +++ b/tests/Unit/Transformers/BudgetTransformerTest.php @@ -39,7 +39,7 @@ class BudgetTransformerTest extends TestCase * * @covers \FireflyIII\Transformers\BudgetTransformer::transform */ - public function testBasic() + public function testBasic(): void { $budget = Budget::create( diff --git a/tests/Unit/Transformers/CategoryTransformerTest.php b/tests/Unit/Transformers/CategoryTransformerTest.php index 68cdae5e43..702842a883 100644 --- a/tests/Unit/Transformers/CategoryTransformerTest.php +++ b/tests/Unit/Transformers/CategoryTransformerTest.php @@ -39,7 +39,7 @@ class CategoryTransformerTest extends TestCase * * @covers \FireflyIII\Transformers\CategoryTransformer::transform */ - public function testBasic() + public function testBasic(): void { $category = Category::create( diff --git a/tests/Unit/Transformers/JournalMetaTransformerTest.php b/tests/Unit/Transformers/JournalMetaTransformerTest.php index 4b4a970b59..bb877867b9 100644 --- a/tests/Unit/Transformers/JournalMetaTransformerTest.php +++ b/tests/Unit/Transformers/JournalMetaTransformerTest.php @@ -38,7 +38,7 @@ class JournalMetaTransformerTest extends TestCase * * @covers \FireflyIII\Transformers\JournalMetaTransformer::transform */ - public function testBasic() + public function testBasic(): void { $data = 'Lots of data'; $hash = hash('sha256', json_encode($data)); diff --git a/tests/Unit/Transformers/PiggyBankEventTransformerTest.php b/tests/Unit/Transformers/PiggyBankEventTransformerTest.php index 967f2b2dde..68a5de351a 100644 --- a/tests/Unit/Transformers/PiggyBankEventTransformerTest.php +++ b/tests/Unit/Transformers/PiggyBankEventTransformerTest.php @@ -43,7 +43,7 @@ class PiggyBankEventTransformerTest extends TestCase * * @covers \FireflyIII\Transformers\PiggyBankEventTransformer::transform */ - public function testBasic() + public function testBasic(): void { // make new account: $account = Account::create( @@ -87,7 +87,7 @@ class PiggyBankEventTransformerTest extends TestCase * * @covers \FireflyIII\Transformers\PiggyBankEventTransformer::transform */ - public function testBasicCurrency() + public function testBasicCurrency(): void { // mock repository. $repository = $this->mock(CurrencyRepositoryInterface::class); diff --git a/tests/Unit/Transformers/PiggyBankTransformerTest.php b/tests/Unit/Transformers/PiggyBankTransformerTest.php index db311a65ae..6115fff42a 100644 --- a/tests/Unit/Transformers/PiggyBankTransformerTest.php +++ b/tests/Unit/Transformers/PiggyBankTransformerTest.php @@ -44,12 +44,14 @@ class PiggyBankTransformerTest extends TestCase * * @covers \FireflyIII\Transformers\PiggyBankTransformer::transform() */ - public function testBasic() + public function testBasic(): void { // mock repository: $repository = $this->mock(PiggyBankRepositoryInterface::class); $repository->shouldReceive('setUser')->once(); $repository->shouldReceive('getCurrentAmount')->andReturn('12.34')->once(); + $repository->shouldReceive('getSuggestedMonthlyAmount')->andReturn('12.34')->once(); + // make new account and piggy $account = Account::create( @@ -87,17 +89,19 @@ class PiggyBankTransformerTest extends TestCase * * @covers \FireflyIII\Transformers\PiggyBankTransformer::transform() */ - public function testBasicWithCurrency() + public function testBasicWithCurrency(): void { // mock repository. $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); $currencyRepos->shouldReceive('setUser')->once(); $currencyRepos->shouldReceive('findNull')->withArgs([1])->andReturn(TransactionCurrency::find(1))->once(); + // mock repository: $repository = $this->mock(PiggyBankRepositoryInterface::class); $repository->shouldReceive('setUser')->once(); $repository->shouldReceive('getCurrentAmount')->andReturn('12.34')->once(); + $repository->shouldReceive('getSuggestedMonthlyAmount')->andReturn('12.34')->once(); // make new account and piggy $account = Account::create( @@ -144,7 +148,7 @@ class PiggyBankTransformerTest extends TestCase * * @covers \FireflyIII\Transformers\PiggyBankTransformer::transform() */ - public function testBasicWithCurrencyAndNote() + public function testBasicWithCurrencyAndNote(): void { // mock repository. $currencyRepos = $this->mock(CurrencyRepositoryInterface::class); @@ -155,6 +159,7 @@ class PiggyBankTransformerTest extends TestCase $repository = $this->mock(PiggyBankRepositoryInterface::class); $repository->shouldReceive('setUser')->once(); $repository->shouldReceive('getCurrentAmount')->andReturn('12.34')->once(); + $repository->shouldReceive('getSuggestedMonthlyAmount')->andReturn('12.34')->once(); // make new account and piggy $account = Account::create( diff --git a/tests/Unit/Transformers/TagTransformerTest.php b/tests/Unit/Transformers/TagTransformerTest.php index 16326f0a10..de3e80cb64 100644 --- a/tests/Unit/Transformers/TagTransformerTest.php +++ b/tests/Unit/Transformers/TagTransformerTest.php @@ -39,7 +39,7 @@ class TagTransformerTest extends TestCase * * @covers \FireflyIII\Transformers\TagTransformer::transform */ - public function testBasic() + public function testBasic(): void { $tag = Tag::create( [ diff --git a/tests/Unit/Transformers/TransactionTransformerTest.php b/tests/Unit/Transformers/TransactionTransformerTest.php index 6c891c424d..a75ddcdce1 100644 --- a/tests/Unit/Transformers/TransactionTransformerTest.php +++ b/tests/Unit/Transformers/TransactionTransformerTest.php @@ -24,6 +24,7 @@ declare(strict_types=1); namespace Tests\Unit\Transformers; +use FireflyIII\Exceptions\FireflyException; use FireflyIII\Helpers\Collector\JournalCollector; use FireflyIII\Helpers\Filter\NegativeAmountFilter; use FireflyIII\Helpers\Filter\PositiveAmountFilter; @@ -48,9 +49,8 @@ class TransactionTransformerTest extends TestCase * Basic journal (withdrawal) * * @covers \FireflyIII\Transformers\TransactionTransformer::transform - * throws \FireflyIII\Exceptions\FireflyException */ - public function testBasic() + public function testBasic(): void { // make new asset account: $asset = Account::create( @@ -103,7 +103,11 @@ class TransactionTransformerTest extends TestCase // use collector to get it: $transaction = $this->getTransaction($journal); $transformer = new TransactionTransformer(new ParameterBag); - $result = $transformer->transform($transaction); + try { + $result = $transformer->transform($transaction); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } // basic fields: $this->assertEquals($journal->id, $result['journal_id']); $this->assertEquals('Withdrawal', $result['type']); @@ -134,7 +138,7 @@ class TransactionTransformerTest extends TestCase * @covers \FireflyIII\Transformers\TransactionTransformer::transform * throws \FireflyIII\Exceptions\FireflyException */ - public function testDeposit() + public function testDeposit(): void { // make new asset account: $asset = Account::create( @@ -187,7 +191,11 @@ class TransactionTransformerTest extends TestCase // use collector to get it: $transaction = $this->getTransaction($journal); $transformer = new TransactionTransformer(new ParameterBag); - $result = $transformer->transform($transaction); + try { + $result = $transformer->transform($transaction); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } // basic fields: $this->assertEquals($journal->id, $result['journal_id']); $this->assertEquals('Deposit', $result['type']); @@ -218,7 +226,7 @@ class TransactionTransformerTest extends TestCase * @covers \FireflyIII\Transformers\TransactionTransformer::transform * throws \FireflyIII\Exceptions\FireflyException */ - public function testDepositBudget() + public function testDepositBudget(): void { // make new asset account: $asset = Account::create( @@ -281,7 +289,11 @@ class TransactionTransformerTest extends TestCase // use collector to get it: $transaction = $this->getTransaction($journal); $transformer = new TransactionTransformer(new ParameterBag); - $result = $transformer->transform($transaction); + try { + $result = $transformer->transform($transaction); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } // basic fields: $this->assertEquals($journal->id, $result['journal_id']); $this->assertEquals('Deposit', $result['type']); @@ -311,7 +323,7 @@ class TransactionTransformerTest extends TestCase * @covers \FireflyIII\Transformers\TransactionTransformer::transform * throws \FireflyIII\Exceptions\FireflyException */ - public function testForeignAmount() + public function testForeignAmount(): void { // make new asset account: $asset = Account::create( @@ -368,7 +380,11 @@ class TransactionTransformerTest extends TestCase // use collector to get it: $transaction = $this->getTransaction($journal); $transformer = new TransactionTransformer(new ParameterBag); - $result = $transformer->transform($transaction); + try { + $result = $transformer->transform($transaction); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } // basic fields: $this->assertEquals($journal->id, $result['journal_id']); $this->assertEquals('Withdrawal', $result['type']); @@ -403,7 +419,7 @@ class TransactionTransformerTest extends TestCase * @covers \FireflyIII\Transformers\TransactionTransformer::transform * throws \FireflyIII\Exceptions\FireflyException */ - public function testJournalBudget() + public function testJournalBudget(): void { // make new asset account: $asset = Account::create( @@ -467,7 +483,11 @@ class TransactionTransformerTest extends TestCase // use collector to get it: $transaction = $this->getTransaction($journal); $transformer = new TransactionTransformer(new ParameterBag); - $result = $transformer->transform($transaction); + try { + $result = $transformer->transform($transaction); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } // basic fields: $this->assertEquals($journal->id, $result['journal_id']); $this->assertEquals('Withdrawal', $result['type']); @@ -501,7 +521,7 @@ class TransactionTransformerTest extends TestCase * @covers \FireflyIII\Transformers\TransactionTransformer::transform * throws \FireflyIII\Exceptions\FireflyException */ - public function testJournalCategory() + public function testJournalCategory(): void { // make new asset account: $asset = Account::create( @@ -565,7 +585,11 @@ class TransactionTransformerTest extends TestCase // use collector to get it: $transaction = $this->getTransaction($journal); $transformer = new TransactionTransformer(new ParameterBag); - $result = $transformer->transform($transaction); + try { + $result = $transformer->transform($transaction); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } // basic fields: $this->assertEquals($journal->id, $result['journal_id']); $this->assertEquals('Withdrawal', $result['type']); @@ -599,7 +623,7 @@ class TransactionTransformerTest extends TestCase * @covers \FireflyIII\Transformers\TransactionTransformer::transform * throws \FireflyIII\Exceptions\FireflyException */ - public function testOpeningBalanceNeg() + public function testOpeningBalanceNeg(): void { // make new asset account: $asset = Account::create( @@ -652,7 +676,11 @@ class TransactionTransformerTest extends TestCase // use collector to get it: $transaction = $this->getTransaction($journal); $transformer = new TransactionTransformer(new ParameterBag); - $result = $transformer->transform($transaction); + try { + $result = $transformer->transform($transaction); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } // basic fields: $this->assertEquals($journal->id, $result['journal_id']); $this->assertEquals('Opening balance', $result['type']); @@ -684,7 +712,7 @@ class TransactionTransformerTest extends TestCase * @covers \FireflyIII\Transformers\TransactionTransformer::transform * throws \FireflyIII\Exceptions\FireflyException */ - public function testOpeningBalancePos() + public function testOpeningBalancePos(): void { // make new asset account: $asset = Account::create( @@ -738,7 +766,11 @@ class TransactionTransformerTest extends TestCase // use collector to get it: $transaction = $this->getTransaction($journal); $transformer = new TransactionTransformer(new ParameterBag); - $result = $transformer->transform($transaction); + try { + $result = $transformer->transform($transaction); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } // basic fields: $this->assertEquals($journal->id, $result['journal_id']); $this->assertEquals('Opening balance', $result['type']); @@ -769,7 +801,7 @@ class TransactionTransformerTest extends TestCase * @covers \FireflyIII\Transformers\TransactionTransformer::transform * throws \FireflyIII\Exceptions\FireflyException */ - public function testReconciliationNeg() + public function testReconciliationNeg(): void { // make new asset account: $asset = Account::create( @@ -823,7 +855,11 @@ class TransactionTransformerTest extends TestCase // use collector to get it: $transaction = $this->getTransaction($journal); $transformer = new TransactionTransformer(new ParameterBag); - $result = $transformer->transform($transaction); + try { + $result = $transformer->transform($transaction); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } // basic fields: $this->assertEquals($journal->id, $result['journal_id']); $this->assertEquals('Reconciliation', $result['type']); @@ -854,7 +890,7 @@ class TransactionTransformerTest extends TestCase * @covers \FireflyIII\Transformers\TransactionTransformer::transform * throws \FireflyIII\Exceptions\FireflyException */ - public function testReconciliationPos() + public function testReconciliationPos(): void { // make new asset account: $asset = Account::create( @@ -908,7 +944,11 @@ class TransactionTransformerTest extends TestCase // use collector to get it: $transaction = $this->getTransaction($journal); $transformer = new TransactionTransformer(new ParameterBag); - $result = $transformer->transform($transaction); + try { + $result = $transformer->transform($transaction); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } // basic fields: $this->assertEquals($journal->id, $result['journal_id']); $this->assertEquals('Reconciliation', $result['type']); @@ -939,7 +979,7 @@ class TransactionTransformerTest extends TestCase * @covers \FireflyIII\Transformers\TransactionTransformer::transform * throws \FireflyIII\Exceptions\FireflyException */ - public function testTransactionBudget() + public function testTransactionBudget(): void { // make new asset account: $asset = Account::create( @@ -1005,7 +1045,11 @@ class TransactionTransformerTest extends TestCase // use collector to get it: $transaction = $this->getTransaction($journal); $transformer = new TransactionTransformer(new ParameterBag); - $result = $transformer->transform($transaction); + try { + $result = $transformer->transform($transaction); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } // basic fields: $this->assertEquals($journal->id, $result['journal_id']); $this->assertEquals('Withdrawal', $result['type']); @@ -1039,7 +1083,7 @@ class TransactionTransformerTest extends TestCase * @covers \FireflyIII\Transformers\TransactionTransformer::transform * throws \FireflyIII\Exceptions\FireflyException */ - public function testTransactionCategory() + public function testTransactionCategory(): void { // make new asset account: $asset = Account::create( @@ -1104,7 +1148,11 @@ class TransactionTransformerTest extends TestCase // use collector to get it: $transaction = $this->getTransaction($journal); $transformer = new TransactionTransformer(new ParameterBag); - $result = $transformer->transform($transaction); + try { + $result = $transformer->transform($transaction); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } // basic fields: $this->assertEquals($journal->id, $result['journal_id']); $this->assertEquals('Withdrawal', $result['type']); @@ -1138,7 +1186,7 @@ class TransactionTransformerTest extends TestCase * @covers \FireflyIII\Transformers\TransactionTransformer::transform * throws \FireflyIII\Exceptions\FireflyException */ - public function testTransactionDescription() + public function testTransactionDescription(): void { // make new asset account: $asset = Account::create( @@ -1191,7 +1239,11 @@ class TransactionTransformerTest extends TestCase // use collector to get it: $transaction = $this->getTransaction($journal); $transformer = new TransactionTransformer(new ParameterBag); - $result = $transformer->transform($transaction); + try { + $result = $transformer->transform($transaction); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } // basic fields: $this->assertEquals($journal->id, $result['journal_id']); $this->assertEquals('Withdrawal', $result['type']); @@ -1222,7 +1274,7 @@ class TransactionTransformerTest extends TestCase * @covers \FireflyIII\Transformers\TransactionTransformer::transform * throws \FireflyIII\Exceptions\FireflyException */ - public function testTransferOne() + public function testTransferOne(): void { // make new asset account: $left = Account::create( @@ -1275,7 +1327,11 @@ class TransactionTransformerTest extends TestCase // use collector to get it: $transaction = $this->getTransaction($journal); $transformer = new TransactionTransformer(new ParameterBag); - $result = $transformer->transform($transaction); + try { + $result = $transformer->transform($transaction); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } // basic fields: $this->assertEquals($journal->id, $result['journal_id']); $this->assertEquals('Transfer', $result['type']); @@ -1306,7 +1362,7 @@ class TransactionTransformerTest extends TestCase * @covers \FireflyIII\Transformers\TransactionTransformer::transform * throws \FireflyIII\Exceptions\FireflyException */ - public function testTransferTwo() + public function testTransferTwo(): void { // make new asset account: $left = Account::create( @@ -1361,7 +1417,11 @@ class TransactionTransformerTest extends TestCase // use collector to get it: $transaction = $this->getTransaction($journal); $transformer = new TransactionTransformer(new ParameterBag); - $result = $transformer->transform($transaction); + try { + $result = $transformer->transform($transaction); + } catch (FireflyException $e) { + $this->assertTrue(false, $e->getMessage()); + } // basic fields: $this->assertEquals($journal->id, $result['journal_id']); $this->assertEquals('Transfer', $result['type']); diff --git a/tests/Unit/Transformers/UserTransformerTest.php b/tests/Unit/Transformers/UserTransformerTest.php index a4210037f1..e3d89383cb 100644 --- a/tests/Unit/Transformers/UserTransformerTest.php +++ b/tests/Unit/Transformers/UserTransformerTest.php @@ -39,7 +39,7 @@ class UserTransformerTest extends TestCase * * @covers \FireflyIII\Transformers\UserTransformer::transform */ - public function testBasic() + public function testBasic(): void { $user = $this->user(); $transformer = new UserTransformer(new ParameterBag()); @@ -54,7 +54,7 @@ class UserTransformerTest extends TestCase * * @covers \FireflyIII\Transformers\UserTransformer::transform */ - public function testEmptyUser() + public function testEmptyUser(): void { $user = $this->emptyUser(); $transformer = new UserTransformer(new ParameterBag());