kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-18 10:16:49 +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

15
app/Repositories/Journal/JournalRepository.php
View File

@@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Repositories\Journal;
use Carbon\Carbon;
use DB;
use Exception;
use FireflyIII\Factory\TransactionJournalFactory;
use FireflyIII\Factory\TransactionJournalMetaFactory;
@@ -157,11 +158,21 @@ class JournalRepository implements JournalRepositoryInterface
*/
public function findByHash(string $hash): ?TransactionJournalMeta
{
return TransactionJournalMeta
$jsonEncode = json_encode($hash);
$hashOfHash = hash('sha256', $jsonEncode);
Log::debug(sprintf('JSON encoded hash is: %s', $jsonEncode));
Log::debug(sprintf('Hash of hash is: %s', $hashOfHash));
$result = TransactionJournalMeta
::leftJoin('transaction_journals', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id')
->where('data', json_encode($hash))
->where('hash', $hashOfHash)
->where('name', 'importHashV2')
->first(['journal_meta.*']);
if (null === $result) {
Log::debug('Result is null');
}
return $result;
}
/**