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

Code consistency and new tests.

Browse Source
This commit is contained in:
James Cole
2018-05-12 15:50:01 +02:00
parent a47da92d81
commit 5bf520b6ed
35 changed files with 1262 additions and 1157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Support/Import/Configuration/File/ConfigurationInterface.php
View File

@@ -47,7 +47,7 @@ interface ConfigurationInterface
public function getNextData(): array;
/**
* @param ImportJob $job
* @param ImportJob $importJob
*/
public function setJob(ImportJob $job): void;
public function setImportJob(ImportJob $importJob): void;
}

8
app/Support/Import/Configuration/File/ConfigureMappingHandler.php
View File

@@ -337,13 +337,13 @@ class ConfigureMappingHandler implements ConfigurationInterface
}
/**
* @param ImportJob $job
* @param ImportJob $importJob
*/
public function setJob(ImportJob $job): void
public function setImportJob(ImportJob $importJob): void
{
$this->importJob = $job;
$this->importJob = $importJob;
$this->repository = app(ImportJobRepositoryInterface::class);
$this->repository->setUser($job->user);
$this->repository->setUser($importJob->user);
$this->attachments = app(AttachmentHelperInterface::class);
$this->columnConfig = [];
}

8
app/Support/Import/Configuration/File/ConfigureRolesHandler.php
View File

@@ -400,13 +400,13 @@ class ConfigureRolesHandler implements ConfigurationInterface
/**
* Set job and some start values.
*
* @param ImportJob $job
* @param ImportJob $importJob
*/
public function setJob(ImportJob $job): void
public function setImportJob(ImportJob $importJob): void
{
$this->importJob = $job;
$this->importJob = $importJob;
$this->repository = app(ImportJobRepositoryInterface::class);
$this->repository->setUser($job->user);
$this->repository->setUser($importJob->user);
$this->attachments = app(AttachmentHelperInterface::class);
$this->totalColumns = 0;
$this->examples = [];

10
app/Support/Import/Configuration/File/ConfigureUploadHandler.php
View File

@@ -81,15 +81,15 @@ class ConfigureUploadHandler implements ConfigurationInterface
}
/**
* @param ImportJob $job
* @param ImportJob $importJob
*/
public function setJob(ImportJob $job): void
public function setImportJob(ImportJob $importJob): void
{
$this->importJob = $job;
$this->importJob = $importJob;
$this->repository = app(ImportJobRepositoryInterface::class);
$this->repository->setUser($job->user);
$this->repository->setUser($importJob->user);
$this->accountRepos = app(AccountRepositoryInterface::class);
$this->accountRepos->setUser($job->user);
$this->accountRepos->setUser($importJob->user);
}

6
app/Support/Import/Configuration/File/NewFileJobHandler.php
View File

@@ -104,12 +104,12 @@ class NewFileJobHandler implements ConfigurationInterface
/**
* @param ImportJob $job
*/
public function setJob(ImportJob $job): void
public function setImportJob(ImportJob $importJob): void
{
$this->importJob = $job;
$this->importJob = $importJob;
$this->repository = app(ImportJobRepositoryInterface::class);
$this->attachments = app(AttachmentHelperInterface::class);
$this->repository->setUser($job->user);
$this->repository->setUser($importJob->user);
}
/**

26
app/Support/Import/Routine/Fake/StageFinalHandler.php
View File

@@ -25,6 +25,7 @@ declare(strict_types=1);
namespace FireflyIII\Support\Import\Routine\Fake;
use Carbon\Carbon;
use FireflyIII\Models\ImportJob;
/**
* @codeCoverageIgnore
@@ -34,17 +35,8 @@ use Carbon\Carbon;
*/
class StageFinalHandler
{
private $job;
/**
* @param mixed $job
*/
public function setJob($job): void
{
$this->job = $job;
}
/** @var ImportJob */
private $importJob;
/**
* @return array
@@ -58,7 +50,7 @@ class StageFinalHandler
'type' => 'withdrawal',
'date' => Carbon::create()->format('Y-m-d'),
'tags' => '',
'user' => $this->job->user_id,
'user' => $this->importJob->user_id,
// all custom fields:
'internal_reference' => null,
@@ -103,7 +95,7 @@ class StageFinalHandler
'type' => 'transfer',
'date' => '2017-02-28',
'tags' => '',
'user' => $this->job->user_id,
'user' => $this->importJob->user_id,
// all custom fields:
'internal_reference' => null,
@@ -145,4 +137,12 @@ class StageFinalHandler
}
/**
* @param ImportJob $importJob
*/
public function setImportJob(ImportJob $importJob): void
{
$this->importJob = $importJob;
}
}

8
app/Support/Import/Routine/File/CSVProcessor.php
View File

@@ -80,11 +80,11 @@ class CSVProcessor implements FileProcessorInterface
}
/**
* @param ImportJob $job
* @param ImportJob $importJob
*/
public function setImportJob(ImportJob $job): void
public function setImportJob(ImportJob $importJob): void
{
Log::debug('Now in setJob()');
$this->importJob = $job;
Log::debug('Now in setImportJob()');
$this->importJob = $importJob;
}
}

4
app/Support/Import/Routine/File/FileProcessorInterface.php
View File

@@ -43,7 +43,7 @@ interface FileProcessorInterface
/**
* Set values.
*
* @param ImportJob $job
* @param ImportJob $importJob
*/
public function setImportJob(ImportJob $job): void;
public function setImportJob(ImportJob $importJob): void;
}

24
app/Support/Import/Routine/File/ImportableConverter.php
View File

@@ -31,6 +31,7 @@ use FireflyIII\Models\ImportJob;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
use FireflyIII\Support\Import\Placeholder\ImportTransaction;
use InvalidArgumentException;
use Log;
/**
@@ -112,6 +113,8 @@ class ImportableConverter
}
/**
* @codeCoverageIgnore
*
* @param array $mappedValues
*/
public function setMappedValues(array $mappedValues): void
@@ -179,18 +182,27 @@ class ImportableConverter
Log::debug('Destination is an expense account. This is a withdrawal.');
$transactionType = 'withdrawal';
}
if ($transactionType === 'unknown') {
Log::error(
if ($destination->id === $source->id) {
throw new FireflyException(
sprintf(
'Cannot determine transaction type. Source account is a %s, destination is a %s',
$source->accountType->type, $destination->accountType->type
), ['source' => $source->toArray(), 'dest' => $destination->toArray()]
'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 $e) {
} catch (InvalidDateException|InvalidArgumentException $e) {
Log::error($e->getMessage());
Log::error($e->getTraceAsString());
$date = new Carbon;

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

@@ -82,6 +82,7 @@ class MappingConverger
}
/**
* @codeCoverageIgnore
* @return array
*/
public function getMappedValues(): array