IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Throw better exception.

Browse Source
This commit is contained in:
James Cole 2020-03-12 05:11:19 +01:00
parent 5e8d94d16a
commit 72a4e86e2f
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/Transformers/TransactionGroupTransformer.php
View File

@ -23,6 +23,7 @@ declare(strict_types=1);
namespace FireflyIII\Transformers; namespace FireflyIII\Transformers;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Budget; use FireflyIII\Models\Budget;
use FireflyIII\Models\Category; use FireflyIII\Models\Category;
use FireflyIII\Models\Transaction; use FireflyIII\Models\Transaction;
@ -32,6 +33,7 @@ use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface; use FireflyIII\Repositories\TransactionGroup\TransactionGroupRepositoryInterface;
use FireflyIII\Support\NullArrayObject; use FireflyIII\Support\NullArrayObject;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use Log;
/** /**
* Class TransactionGroupTransformer * Class TransactionGroupTransformer
@ -98,9 +100,11 @@ class TransactionGroupTransformer extends AbstractTransformer
* @param TransactionGroup $group * @param TransactionGroup $group
* *
* @return array * @return array
* @throws FireflyException
*/ */
public function transformObject(TransactionGroup $group): array public function transformObject(TransactionGroup $group): array
{ {
try {
$result = [ $result = [
'id' => (int)$group->id, 'id' => (int)$group->id,
'created_at' => $group->created_at->toAtomString(), 'created_at' => $group->created_at->toAtomString(),
@ -115,7 +119,11 @@ class TransactionGroupTransformer extends AbstractTransformer
], ],
], ],
]; ];
} catch(FireflyException $e) {
Log::error($e->getMessage());
Log::error($e->getTraceAsString());
throw new FireflyException(sprintf('Transaction group #%d is broken. Please check out your log files.', $group->id));
}
// do something else. // do something else.
return $result; return $result;
@ -125,36 +133,47 @@ class TransactionGroupTransformer extends AbstractTransformer
* @param TransactionJournal $journal * @param TransactionJournal $journal
* *
* @return Transaction * @return Transaction
* @throws FireflyException
*/ */
private function getDestinationTransaction(TransactionJournal $journal): Transaction private function getDestinationTransaction(TransactionJournal $journal): Transaction
{ {
$result = $journal->transactions->first(
return $journal->transactions->first(
static function (Transaction $transaction) { static function (Transaction $transaction) {
return (float)$transaction->amount > 0; return (float)$transaction->amount > 0;
} }
); );
if (null === $result) {
throw new FireflyException(sprintf('Journal #%d unexpectedly has no destination transaction.', $journal->id));
}
return $result;
} }
/** /**
* @param TransactionJournal $journal * @param TransactionJournal $journal
* *
* @return Transaction * @return Transaction
* @throws FireflyException
*/ */
private function getSourceTransaction(TransactionJournal $journal): Transaction private function getSourceTransaction(TransactionJournal $journal): Transaction
{ {
$result = $journal->transactions->first(
return $journal->transactions->first(
static function (Transaction $transaction) { static function (Transaction $transaction) {
return (float)$transaction->amount < 0; return (float)$transaction->amount < 0;
} }
); );
if (null === $result) {
throw new FireflyException(sprintf('Journal #%d unexpectedly has no source transaction.', $journal->id));
}
return $result;
} }
/** /**
* @param Collection $transactionJournals * @param Collection $transactionJournals
* *
* @return array * @return array
* @throws FireflyException
*/ */
private function transformJournals(Collection $transactionJournals): array private function transformJournals(Collection $transactionJournals): array
{ {