Expand tests and API code.

This commit is contained in:
James Cole
2018-02-18 10:31:15 +01:00
parent 6cda9f2900
commit eb0da038fb
28 changed files with 1171 additions and 172 deletions

View File

@@ -26,6 +26,7 @@ namespace FireflyIII\Transformers;
use Carbon\Carbon;
use FireflyIII\Helpers\Collector\JournalCollector;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\Note;
@@ -100,7 +101,7 @@ class AccountTransformer extends TransformerAbstract
$pageSize = intval(app('preferences')->getForUser($account->user, 'listPageSize', 50)->data);
// journals always use collector and limited using URL parameters.
$collector = new JournalCollector;
$collector = app(JournalCollectorInterface::class);
$collector->setUser($account->user);
$collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
if ($account->accountType->type === AccountType::ASSET) {

View File

@@ -25,6 +25,7 @@ namespace FireflyIII\Transformers;
use Carbon\Carbon;
use FireflyIII\Helpers\Collector\JournalCollector;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Models\Bill;
use FireflyIII\Models\Note;
use FireflyIII\Repositories\Bill\BillRepositoryInterface;
@@ -96,7 +97,7 @@ class BillTransformer extends TransformerAbstract
$pageSize = intval(app('preferences')->getForUser($bill->user, 'listPageSize', 50)->data);
// journals always use collector and limited using URL parameters.
$collector = new JournalCollector;
$collector = app(JournalCollectorInterface::class);
$collector->setUser($bill->user);
$collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
$collector->setAllAssetAccounts();

View File

@@ -25,6 +25,7 @@ namespace FireflyIII\Transformers;
use FireflyIII\Helpers\Collector\JournalCollector;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Models\Budget;
use Illuminate\Support\Collection;
use League\Fractal\Resource\Collection as FractalCollection;
@@ -78,7 +79,7 @@ class BudgetTransformer extends TransformerAbstract
$pageSize = intval(app('preferences')->getForUser($budget->user, 'listPageSize', 50)->data);
// journals always use collector and limited using URL parameters.
$collector = new JournalCollector;
$collector = app(JournalCollectorInterface::class);
$collector->setUser($budget->user);
$collector->withOpposingAccount()->withCategoryInformation()->withBudgetInformation();
$collector->setAllAssetAccounts();

View File

@@ -25,6 +25,7 @@ namespace FireflyIII\Transformers;
use FireflyIII\Helpers\Collector\JournalCollector;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Models\Category;
use Illuminate\Support\Collection;
use League\Fractal\Resource\Collection as FractalCollection;
@@ -78,7 +79,7 @@ class CategoryTransformer extends TransformerAbstract
$pageSize = intval(app('preferences')->getForUser($category->user, 'listPageSize', 50)->data);
// journals always use collector and limited using URL parameters.
$collector = new JournalCollector;
$collector = app(JournalCollectorInterface::class);
$collector->setUser($category->user);
$collector->withOpposingAccount()->withCategoryInformation()->withCategoryInformation();
$collector->setAllAssetAccounts();

View File

@@ -25,6 +25,7 @@ namespace FireflyIII\Transformers;
use FireflyIII\Helpers\Collector\JournalCollector;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Models\TransactionJournalMeta;
use Illuminate\Support\Collection;
use League\Fractal\Resource\Collection as FractalCollection;
@@ -78,7 +79,7 @@ class JournalMetaTransformer extends TransformerAbstract
$pageSize = intval(app('preferences')->getForUser($journal->user, 'listPageSize', 50)->data);
// journals always use collector and limited using URL parameters.
$collector = new JournalCollector;
$collector = app(JournalCollectorInterface::class);
$collector->setUser($journal->user);
$collector->withOpposingAccount()->withCategoryInformation()->withCategoryInformation();
$collector->setAllAssetAccounts();

View File

@@ -25,6 +25,7 @@ namespace FireflyIII\Transformers;
use FireflyIII\Helpers\Collector\JournalCollector;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Models\PiggyBankEvent;
use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
use Illuminate\Support\Collection;
@@ -94,7 +95,7 @@ class PiggyBankEventTransformer extends TransformerAbstract
$pageSize = intval(app('preferences')->getForUser($journal->user, 'listPageSize', 50)->data);
// journals always use collector and limited using URL parameters.
$collector = new JournalCollector;
$collector = app(JournalCollectorInterface::class);
$collector->setUser($journal->user);
$collector->withOpposingAccount()->withCategoryInformation()->withCategoryInformation();
$collector->setAllAssetAccounts();

View File

@@ -25,6 +25,7 @@ namespace FireflyIII\Transformers;
use FireflyIII\Helpers\Collector\JournalCollector;
use FireflyIII\Helpers\Collector\JournalCollectorInterface;
use FireflyIII\Models\Tag;
use League\Fractal\Resource\Collection as FractalCollection;
use League\Fractal\Resource\Item;
@@ -77,7 +78,7 @@ class TagTransformer extends TransformerAbstract
$pageSize = intval(app('preferences')->getForUser($tag->user, 'listPageSize', 50)->data);
// journals always use collector and limited using URL parameters.
$collector = new JournalCollector;
$collector = app(JournalCollectorInterface::class);
$collector->setUser($tag->user);
$collector->withOpposingAccount()->withCategoryInformation()->withCategoryInformation();
$collector->setAllAssetAccounts();