Various API updates.

app/Api/V1/Controllers/AvailableBudgetController.php

@@ -102,21 +102,11 @@ class AvailableBudgetController extends Controller
         // types to get, page size:
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
-        // get list of available budgets. Count it and split it.
-        $collection = $this->repository->getAvailableBudgets();
-
-        // filter list on start and end date, if present.
-        // TODO: put this in the query.
         $start = $this->parameters->get('start');
         $end   = $this->parameters->get('end');
-        if (null !== $start && null !== $end) {
-            $collection = $collection->filter(
-                function (AvailableBudget $availableBudget) use ($start, $end) {
-                    return $availableBudget->start_date->gte($start) && $availableBudget->end_date->lte($end);
-                }
-            );
-        }
 
+        // get list of available budgets. Count it and split it.
+        $collection       = $this->repository->getAvailableBudgetsByDate($start, $end);
         $count            = $collection->count();
         $availableBudgets = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
 

app/Api/V1/Controllers/Chart/AccountController.php

@@ -32,16 +32,17 @@ use FireflyIII\Models\AccountType;
 use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
+use FireflyIII\Support\Http\Api\ApiSupport;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Collection;
 
 /**
  * Class AccountController
  */
 class AccountController extends Controller
 {
+    use ApiSupport;
     /** @var CurrencyRepositoryInterface */
     private $currencyRepository;
     /** @var AccountRepositoryInterface */
@@ -156,42 +157,6 @@ class AccountController extends Controller
         return response()->json($chartData);
     }
 
-    /**
-     * Small helper function for the revenue and expense account charts.
-     * TODO should include Trait instead of doing this.
-     *
-     * @param Collection $accounts
-     *
-     * @return array
-     */
-    protected function extractNames(Collection $accounts): array
-    {
-        $return = [];
-        /** @var Account $account */
-        foreach ($accounts as $account) {
-            $return[$account->id] = $account->name;
-        }
-
-        return $return;
-    }
-
-    /**
-     * Small helper function for the revenue and expense account charts.
-     * TODO should include Trait instead of doing this.
-     *
-     * @param array $names
-     *
-     * @return array
-     */
-    protected function expandNames(array $names): array
-    {
-        $result = [];
-        foreach ($names as $entry) {
-            $result[$entry['name']] = 0;
-        }
-
-        return $result;
-    }
 
     /**
      * @param Request $request
@@ -213,8 +178,8 @@ class AccountController extends Controller
 
         // user's preferences
         $defaultSet = $this->repository->getAccountsByType([AccountType::DEFAULT, AccountType::ASSET])->pluck('id')->toArray();
-        $frontPage = app('preferences')->get('frontPageAccounts', $defaultSet);
-        $default   = app('amount')->getDefaultCurrency();
+        $frontPage  = app('preferences')->get('frontPageAccounts', $defaultSet);
+        $default    = app('amount')->getDefaultCurrency();
         if (0 === count($frontPage->data)) {
             $frontPage->data = $defaultSet;
             $frontPage->save();

app/Api/V1/Controllers/CurrencyController.php

@@ -28,7 +28,6 @@ use FireflyIII\Api\V1\Requests\CurrencyRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 use FireflyIII\Models\Account;
-use FireflyIII\Models\AvailableBudget;
 use FireflyIII\Models\Bill;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\Recurrence;
@@ -181,18 +180,11 @@ class CurrencyController extends Controller
         $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
 
         // get list of available budgets. Count it and split it.
+
         /** @var BudgetRepositoryInterface $repository */
         $repository = app(BudgetRepositoryInterface::class);
         $repository->setUser($admin);
-        $unfiltered = $repository->getAvailableBudgets();
-
-        // filter list.
-        $collection = $unfiltered->filter(
-            function (AvailableBudget $availableBudget) use ($currency) {
-                return $availableBudget->transaction_currency_id === $currency->id;
-            }
-        );
-
+        $collection       = $repository->getAvailableBudgetsByCurrency($currency);
         $count            = $collection->count();
         $availableBudgets = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
 
@@ -279,16 +271,7 @@ class CurrencyController extends Controller
         $manager    = new Manager;
         $baseUrl    = $request->getSchemeAndHttpHost() . '/api/v1';
         $pageSize   = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-        $unfiltered = $repository->getAllBudgetLimits($this->parameters->get('start'), $this->parameters->get('end'));
-
-        // TODO replace this
-        // filter budget limits on currency ID
-        $collection = $unfiltered->filter(
-            function (BudgetLimit $budgetLimit) use ($currency) {
-                return $budgetLimit->transaction_currency_id === $currency->id;
-            }
-        );
-
+        $collection = $repository->getAllBudgetLimitsByCurrency($currency, $this->parameters->get('start'), $this->parameters->get('end'));
         $count        = $collection->count();
         $budgetLimits = $collection->slice(($this->parameters->get('page') - 1) * $pageSize, $pageSize);
         $paginator    = new LengthAwarePaginator($budgetLimits, $count, $pageSize, $this->parameters->get('page'));

app/Api/V1/Controllers/RuleController.php

@@ -34,7 +34,7 @@ use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
 use FireflyIII\TransactionRules\TransactionMatcher;
 use FireflyIII\Transformers\RuleTransformer;
-use FireflyIII\Transformers\TransactionTransformer;
+use FireflyIII\Transformers\TransactionGroupTransformer;
 use FireflyIII\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -184,7 +184,6 @@ class RuleController extends Controller
     }
 
     /**
-     * TODO deprecated return values in transformer.
      * @param Request $request
      * @param Rule $rule
      *
@@ -193,10 +192,10 @@ class RuleController extends Controller
      */
     public function testRule(Request $request, Rule $rule): JsonResponse
     {
-        $pageSize     = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
-        $page         = 0 === (int)$request->query('page') ? 1 : (int)$request->query('page');
+        $pageSize = (int)app('preferences')->getForUser(auth()->user(), 'listPageSize', 50)->data;
+        $page     = 0 === (int)$request->query('page') ? 1 : (int)$request->query('page');
         /** @var Carbon $startDate */
-        $startDate    = null === $request->query('start_date') ? null : Carbon::createFromFormat('Y-m-d', $request->query('start_date'));
+        $startDate = null === $request->query('start_date') ? null : Carbon::createFromFormat('Y-m-d', $request->query('start_date'));
         /** @var Carbon $endDate */
         $endDate      = null === $request->query('end_date') ? null : Carbon::createFromFormat('Y-m-d', $request->query('end_date'));
         $searchLimit  = 0 === (int)$request->query('search_limit') ? (int)config('firefly.test-triggers.limit') : (int)$request->query('search_limit');
@@ -229,11 +228,11 @@ class RuleController extends Controller
         $matcher->setAccounts($accounts);
 
         $matchingTransactions = $matcher->findTransactionsByRule();
-        $matchingTransactions = $matchingTransactions->unique('id');
 
         // make paginator out of results.
-        $count        = $matchingTransactions->count();
-        $transactions = $matchingTransactions->slice(($page - 1) * $pageSize, $pageSize);
+        $count        = count($matchingTransactions);
+        $transactions = array_slice($matchingTransactions, ($page - 1) * $pageSize, $pageSize);
+
         // make paginator:
         $paginator = new LengthAwarePaginator($transactions, $count, $pageSize, $this->parameters->get('page'));
         $paginator->setPath(route('api.v1.rules.test', [$rule->id]) . $this->buildParams());
@@ -243,8 +242,8 @@ class RuleController extends Controller
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        /** @var TransactionTransformer $transformer */
-        $transformer = app(TransactionTransformer::class);
+        /** @var TransactionGroupTransformer $transformer */
+        $transformer = app(TransactionGroupTransformer::class);
         $transformer->setParameters($this->parameters);
 
         $resource = new FractalCollection($matchingTransactions, $transformer, 'transactions');
@@ -321,6 +320,7 @@ class RuleController extends Controller
         $resource = new Item($rule, $transformer, 'rules');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
-
     }
+
+    // TODO move rule up, move rule down.
 }