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

More code to catch exceptions in #1238

Browse Source
This commit is contained in:
James Cole
2018-03-10 22:34:02 +01:00
parent dd2f3c861b
commit a55d18709c
7 changed files with 103 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -367,6 +367,35 @@ class JournalRepository implements JournalRepositoryInterface
return $amount;
}
/**
* Return Carbon value of a meta field (or NULL).
*
* @param TransactionJournal $journal
* @param string $field
*
* @return null|Carbon
*/
public function getMetaDate(TransactionJournal $journal, string $field): ?Carbon
{
$cache = new CacheProperties;
$cache->addProperty('journal-meta-updated');
$cache->addProperty($journal->id);
$cache->addProperty($field);
if ($cache->has()) {
return $cache->get(); // @codeCoverageIgnore
}
$entry = $journal->transactionJournalMeta()->where('name', $field)->first();
if (is_null($entry)) {
return null;
}
$value = new Carbon($entry->data);
$cache->store($value);
return $value;
}
/**
* Return value of a meta field (or NULL) as a string.
*
@@ -377,12 +406,8 @@ class JournalRepository implements JournalRepositoryInterface
*/
public function getMetaField(TransactionJournal $journal, string $field): ?string
{
$class = new \stdClass;
$class->value = 'hi there';
$value = null;
$cache = new CacheProperties;
$cache->addProperty('journal-meta');
$cache->addProperty('journal-meta-updated');
$cache->addProperty($journal->id);
$cache->addProperty($field);
@@ -390,19 +415,25 @@ class JournalRepository implements JournalRepositoryInterface
return $cache->get(); // @codeCoverageIgnore
}
Log::debug(sprintf('Looking for journal #%d meta field "%s".', $journal->id, $field));
$entry = $journal->transactionJournalMeta()->where('name', $field)->first();
if (is_null($entry)) {
return null;
}
$value = $entry->data;
$cache->store($value);
$value = $entry->data;
// return when array:
if (is_array($value)) {
return join(',', $value);
$return = join(',', $value);
$cache->store($return);
return $return;
}
// return when something else:
try {
$return = strval($value);
$cache->store($return);
} catch (Exception $e) {
Log::error($e->getMessage());