kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-05-03 20:56:21 +00:00
Code Issues Projects Releases Wiki Activity

Better reporting for double imported rows. See also #164

Browse Source
This commit is contained in:
James Cole
2016-08-14 09:49:04 +02:00
parent da5e48d769
commit 106665a468
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Import/ImportStorage.php
View File

@@ -85,14 +85,17 @@ class ImportStorage
/**
* @param string $hash
*
* @return bool
* @return TransactionJournal
*/
private function alreadyImported(string $hash): bool
private function alreadyImported(string $hash): TransactionJournal
{
$count = TransactionJournalMeta::where('name', 'originalImportHash')->where('data', json_encode($hash))->count();
$meta = TransactionJournalMeta::where('name', 'originalImportHash')->where('data', json_encode($hash))->first(['journal_meta.*']);
if (!is_null($meta)) {
return $meta->transactionjournal;
}
return $count > 0;
return new TransactionJournal;
}
/**
@@ -252,12 +255,15 @@ class ImportStorage
return $result;
}
if ($this->alreadyImported($entry->hash)) {
Log::warning(sprintf('Cannot import row %d, because it has already been imported.', $index));
$alreadyImported = $this->alreadyImported($entry->hash);
if (!is_null($alreadyImported->id)) {
Log::warning(sprintf('Cannot import row %d, because it has already been imported (journal #%d).', $index, $alreadyImported->id));
$result = new ImportResult();
$result->failed();
$errorText = sprintf('Row #%d: This row has been imported before.', $index);
$errorText = trans(
'firefly.import_double',
['row' => $index, 'link' => route('transactions.show', [$alreadyImported->id]), 'description' => $alreadyImported->description]
);
$result->appendError($errorText);
$extendedStatus = $this->job->extended_status;
$extendedStatus['errors'][] = $errorText;