kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-04 11:48:05 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup expected and unexpected bugs in the factories.

Browse Source
This commit is contained in:
James Cole
2019-06-16 13:15:32 +02:00
parent 4a1e56671b
commit 23d7abd55f
16 changed files with 173 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Factory/RecurrenceFactory.php
View File

@@ -29,7 +29,6 @@ use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Models\Recurrence;
use FireflyIII\Services\Internal\Support\RecurringTransactionTrait;
use FireflyIII\Services\Internal\Support\TransactionServiceTrait;
use FireflyIII\Services\Internal\Support\TransactionTypeTrait;
use FireflyIII\User;
use Log;
@@ -42,10 +41,11 @@ class RecurrenceFactory
/** @var User */
private $user;
use TransactionTypeTrait, TransactionServiceTrait, RecurringTransactionTrait;
use TransactionTypeTrait, RecurringTransactionTrait;
/**
* Constructor.
* @codeCoverageIgnore
*/
public function __construct()
{
@@ -64,6 +64,7 @@ class RecurrenceFactory
try {
$type = $this->findTransactionType(ucfirst($data['recurrence']['type']));
} catch (FireflyException $e) {
Log::error(sprintf('Cannot make a recurring transaction of type "%s"', $data['recurrence']['type']));
Log::error($e->getMessage());
return null;
@@ -90,7 +91,14 @@ class RecurrenceFactory
$this->updateMetaData($recurrence, $data);
$this->createRepetitions($recurrence, $data['repetitions'] ?? []);
$this->createTransactions($recurrence, $data['transactions'] ?? []);
try {
$this->createTransactions($recurrence, $data['transactions'] ?? []);
// @codeCoverageIgnoreStart
} catch (FireflyException $e) {
// TODO make sure error props to the user.
Log::error($e->getMessage());
}
// @codeCoverageIgnoreEnd
return $recurrence;
}