kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Big refactor to remove the deprecated transaction collector.

Browse Source
This commit is contained in:
James Cole
2019-05-30 12:31:19 +02:00
parent 10a6ff9bf8
commit 8b7e87ae57
117 changed files with 1314 additions and 1208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Support/Import/Routine/Spectre/StageAuthenticatedHandler.php
View File

@@ -56,8 +56,8 @@ class StageAuthenticatedHandler
// grab a list of logins.
$config = $this->importJob->configuration;
$logins = $config['all-logins'] ?? [];
Log::debug(sprintf('%d logins in config', \count($logins)));
if (0 === \count($logins)) {
Log::debug(sprintf('%d logins in config', count($logins)));
if (0 === count($logins)) {
// get logins from Spectre.
$logins = $this->getLogins();
$config['all-logins'] = $logins;
@@ -115,7 +115,7 @@ class StageAuthenticatedHandler
$request->setLogin($login);
$request->call();
$accounts = $request->getAccounts();
Log::debug(sprintf('Found %d accounts using login', \count($accounts)));
Log::debug(sprintf('Found %d accounts using login', count($accounts)));
return $accounts;
}
@@ -137,7 +137,7 @@ class StageAuthenticatedHandler
$logins = $request->getLogins();
$return = [];
Log::debug(sprintf('Found %d logins in users Spectre account.', \count($logins)));
Log::debug(sprintf('Found %d logins in users Spectre account.', count($logins)));
/** @var Login $login */
foreach ($logins as $login) {

14
app/Support/Import/Routine/Spectre/StageImportDataHandler.php
View File

@@ -59,8 +59,8 @@ class StageImportDataHandler
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 (0 === \count($accounts)) {
Log::debug(sprintf('Count of accounts in array is %d', count($accounts)));
if (0 === count($accounts)) {
throw new FireflyException('There are no accounts in this import job. Cannot continue.'); // @codeCoverageIgnore
}
$toImport = $config['account_mapping'] ?? [];
@@ -73,14 +73,14 @@ class StageImportDataHandler
$merge = $this->getTransactions($spectreAccount, $localAccount);
$totalSet[] = $merge;
Log::debug(
sprintf('Found %d transactions in account "%s" (%s)', \count($merge), $spectreAccount->getName(), $spectreAccount->getCurrencyCode())
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)));
Log::debug(sprintf('Found %d transactions in total.', count($totalSet)));
$this->repository->setTransactions($this->importJob, $totalSet);
}
@@ -112,8 +112,8 @@ class StageImportDataHandler
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)));
$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));
@@ -216,7 +216,7 @@ class StageImportDataHandler
];
$array[] = $entry;
}
Log::debug(sprintf('Return %d entries', \count($array)));
Log::debug(sprintf('Return %d entries', count($array)));
return $array;
}

2
app/Support/Import/Routine/Spectre/StageNewHandler.php
View File

@@ -80,7 +80,7 @@ class StageNewHandler
$list = $request->getLogins();
// count is zero?
$this->countLogins = \count($list);
$this->countLogins = count($list);
Log::debug(sprintf('Number of logins is %d', $this->countLogins));
if ($this->countLogins > 0) {
$store = [];