kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-25 14:58:40 +00:00
Code Issues Projects Releases Wiki Activity

Register and use interface.

Browse Source
This commit is contained in:
James Cole
2016-11-20 08:57:48 +01:00
parent 8417f45d02
commit e1e94a788c
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/HomeController.php
View File

@@ -15,7 +15,7 @@ namespace FireflyIII\Http\Controllers;
use Artisan; use Artisan;
use Carbon\Carbon; use Carbon\Carbon;
use FireflyIII\Exceptions\FireflyException; use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Collector\JournalCollector; use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Models\AccountType; use FireflyIII\Models\AccountType;
use FireflyIII\Models\Tag; use FireflyIII\Models\Tag;
use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI; use FireflyIII\Repositories\Account\AccountRepositoryInterface as ARI;
@@ -143,7 +143,7 @@ class HomeController extends Controller
$showDepositsFrontpage = Preferences::get('showDepositsFrontpage', false)->data; $showDepositsFrontpage = Preferences::get('showDepositsFrontpage', false)->data;
foreach ($accounts as $account) { foreach ($accounts as $account) {
$collector = new JournalCollector(auth()->user()); $collector = app(JournalCollectorInterface::class);
$collector->setAccounts(new Collection([$account]))->setRange($start, $end)->setLimit(10)->setPage(1); $collector->setAccounts(new Collection([$account]))->setRange($start, $end)->setLimit(10)->setPage(1);
$set = $collector->getJournals(); $set = $collector->getJournals();

17
app/Providers/JournalServiceProvider.php
View File

@@ -44,6 +44,23 @@ class JournalServiceProvider extends ServiceProvider
{ {
$this->registerRepository(); $this->registerRepository();
$this->registerTasker(); $this->registerTasker();
$this->registerCollector();
}
private function registerCollector() {
$this->app->bind(
'FireflyIII\Helpers\Collector\JournalCollectorInterface',
function (Application $app, array $arguments) {
if (!isset($arguments[0]) && $app->auth->check()) {
return app('FireflyIII\Helpers\Collector\JournalCollector', [auth()->user()]);
}
if (!isset($arguments[0]) && !$app->auth->check()) {
throw new FireflyException('There is no user present.');
}
return app('FireflyIII\Helpers\Collector\JournalCollector', $arguments);
}
);
} }
private function registerRepository() private function registerRepository()