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

Some last minute fixes.

Browse Source
This commit is contained in:
James Cole
2018-06-02 18:19:35 +02:00
parent d4779c8c8f
commit a6b09acd5e
9 changed files with 50 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/Import/Storage/ImportArrayStorage.php
View File

@@ -173,12 +173,15 @@ class ImportArrayStorage
*/
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('sha256', $json, false);
return $hash;
}
/**
@@ -227,6 +230,8 @@ class ImportArrayStorage
{
$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));
@@ -380,6 +385,22 @@ class ImportArrayStorage
// 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']);