IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add some debug entries.

Browse Source
This commit is contained in:
James Cole 2018-07-09 20:42:16 +02:00
parent f670d930f3
commit c99e233026
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Import/Routine/FileRoutine.php
View File

@ -48,7 +48,7 @@ class FileRoutine implements RoutineInterface
public function run(): void
{
Log::debug(sprintf('Now in run() for file routine with status: %s', $this->importJob->status));
if ($this->importJob->status === 'ready_to_run') {
if ('ready_to_run' === $this->importJob->status) {
$this->repository->setStatus($this->importJob, 'running');
// get processor, depending on file type
// is just CSV for now.

2
app/Providers/EventServiceProvider.php
View File

@ -135,7 +135,7 @@ class EventServiceProvider extends ServiceProvider
$repository = app(UserRepositoryInterface::class);
$user = $repository->findNull((int)$oauthClient->user_id);
if (null === $user) {
Log::error('OAuth client generated but no user associated.');
Log::info('OAuth client generated but no user associated.');
return;
}

8
app/Support/Import/Placeholder/ImportTransaction.php
View File

@ -139,8 +139,10 @@ class ImportTransaction
);
// @codeCoverageIgnoreEnd
case 'account-id':
$mappedValue = $this->getMappedValue($columnValue);
// could be the result of a mapping?
$this->accountId = $this->getMappedValue($columnValue);
$this->accountId = $mappedValue;
Log::debug(sprintf('Going to set the account-id. Original value is "%s", mapped value is "%s".', $columnValue->getValue(), $mappedValue));
break;
case 'account-iban':
$this->accountIban = $columnValue->getValue();
@ -233,7 +235,9 @@ class ImportTransaction
$this->note = trim($this->note . ' ' . $columnValue->getValue());
break;
case 'opposing-id':
$this->opposingId = $this->getMappedValue($columnValue);
$mappedValue = $this->getMappedValue($columnValue);
$this->opposingId = $mappedValue;
Log::debug(sprintf('Going to set the OPPOSING-id. Original value is "%s", mapped value is "%s".', $columnValue->getValue(), $mappedValue));
break;
case 'opposing-iban':
$this->opposingIban = $columnValue->getValue();

10
app/Support/Import/Routine/File/MappingConverger.php
View File

@ -121,12 +121,17 @@ class MappingConverger
private function getRoleForColumn(int $column, int $mapped): string
{
$role = $this->roles[$column] ?? '_ignore';
if ($mapped === 0) {
if (0 === $mapped) {
Log::debug(sprintf('Column #%d with role "%s" is not mapped.', $column, $role));
return $role;
}
if (!(isset($this->doMapping[$column]) && $this->doMapping[$column] === true)) {
if (!(isset($this->doMapping[$column]) && true === $this->doMapping[$column])) {
// if the mapping has been filled in already by a role with a higher priority,
// ignore the mapping.
Log::debug(sprintf('Column #%d ("%s") has something.', $column, $role));
return $role;
}
@ -172,6 +177,7 @@ class MappingConverger
// also store the $mapped values in a "mappedValues" array.
$this->mappedValues[$newRole][] = $mapped;
Log::debug(sprintf('Values mapped to role "%s" are: ', $newRole), $this->mappedValues[$newRole]);
return $newRole;
}