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

Make sure the loop is broken. #595

Browse Source
This commit is contained in:
James Cole 2017-02-25 13:34:44 +01:00
parent 8decf8ab9f
commit eed8fe22c6
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/Http/Controllers/AccountController.php
View File

@ -258,8 +258,12 @@ class AccountController extends Controller
if (strlen($moment) > 0 && $moment !== 'all') { if (strlen($moment) > 0 && $moment !== 'all') {
$start = new Carbon($moment); $start = new Carbon($moment);
$end = Navigation::endOfPeriod($start, $range); $end = Navigation::endOfPeriod($start, $range);
$subTitle = $account->name . ' (' . strval(trans('firefly.from_to_breadcrumb', $subTitle = $account->name . ' (' . strval(
['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)])) . ')'; trans(
'firefly.from_to_breadcrumb',
['start' => $start->formatLocalized($this->monthAndDayFormat), 'end' => $end->formatLocalized($this->monthAndDayFormat)]
)
) . ')';
$chartUri = route('chart.account.period', [$account->id, $start->format('Y-m-d')]); $chartUri = route('chart.account.period', [$account->id, $start->format('Y-m-d')]);
$periods = $this->periodEntries($account); $periods = $this->periodEntries($account);
} }
@ -273,10 +277,13 @@ class AccountController extends Controller
$accountType = $account->accountType->type; $accountType = $account->accountType->type;
$count = 0; $count = 0;
$loop = 0;
// grab journals, but be prepared to jump a period back to get the right ones: // grab journals, but be prepared to jump a period back to get the right ones:
while ($count === 0) { Log::info('Now at loop start.');
while ($count === 0 && $loop < 3) {
$loop++;
$collector = app(JournalCollectorInterface::class); $collector = app(JournalCollectorInterface::class);
Log::debug('Count is zero, search for journals.'); Log::info('Count is zero, search for journals.');
$collector->setAccounts(new Collection([$account]))->setLimit($pageSize)->setPage($page); $collector->setAccounts(new Collection([$account]))->setLimit($pageSize)->setPage($page);
if (!is_null($start)) { if (!is_null($start)) {
$collector->setRange($start, $end); $collector->setRange($start, $end);
@ -288,7 +295,7 @@ class AccountController extends Controller
$start->subDay(); $start->subDay();
$start = Navigation::startOfPeriod($start, $range); $start = Navigation::startOfPeriod($start, $range);
$end = Navigation::endOfPeriod($start, $range); $end = Navigation::endOfPeriod($start, $range);
Log::debug(sprintf('Count is still zero, go back in time to "%s" and "%s"!', $start->format('Y-m-d'), $end->format('Y-m-d'))); Log::info(sprintf('Count is still zero, go back in time to "%s" and "%s"!', $start->format('Y-m-d'), $end->format('Y-m-d')));
} }
} }

2
tests/Feature/Controllers/AccountControllerTest.php
View File

@ -175,7 +175,7 @@ class AccountControllerTest extends TestCase
{ {
$this->be($this->user()); $this->be($this->user());
$this->changeDateRange($this->user(), $range); $this->changeDateRange($this->user(), $range);
$response = $this->get(route('accounts.show.all', [1])); $response = $this->get(route('accounts.show', [1, 'all']));
$response->assertStatus(200); $response->assertStatus(200);
// has bread crumb // has bread crumb
$response->assertSee('<ol class="breadcrumb">'); $response->assertSee('<ol class="breadcrumb">');