Update tests and code.

firefly-iii · Dec 21, 2018 · 2c7d94e · 2c7d94e
1 parent a5520d4
commit 2c7d94e
Show file tree

Hide file tree

Showing 24 changed files with 378 additions and 150 deletions.
diff --git a/app/Api/V1/Controllers/AccountController.php b/app/Api/V1/Controllers/AccountController.php
@@ -29,7 +29,6 @@
 use FireflyIII\Models\Account;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Support\Http\Api\AccountFilter;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\AccountTransformer;
@@ -54,8 +53,6 @@
 class AccountController extends Controller
 {
     use AccountFilter, TransactionFilter;
-    /** @var CurrencyRepositoryInterface The currency repository */
-    private $currencyRepository;
     /** @var AccountRepositoryInterface The account repository */
     private $repository;
 
@@ -73,9 +70,6 @@ function ($request, $next) {
                 $this->repository = app(AccountRepositoryInterface::class);
                 $this->repository->setUser($user);
 
-                $this->currencyRepository = app(CurrencyRepositoryInterface::class);
-                $this->currencyRepository->setUser($user);
-
                 return $next($request);
             }
         );
@@ -210,12 +204,7 @@ public function show(Request $request, Account $account): JsonResponse
      */
     public function store(AccountRequest $request): JsonResponse
     {
-        $data = $request->getAll();
-        // if currency ID is 0, find the currency by the code:
-        if (0 === $data['currency_id']) {
-            $currency            = $this->currencyRepository->findByCodeNull($data['currency_code']);
-            $data['currency_id'] = null === $currency ? 0 : $currency->id;
-        }
+        $data    = $request->getAll();
         $account = $this->repository->store($data);
         $manager = new Manager;
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
@@ -244,10 +233,9 @@ public function transactions(Request $request, Account $account): JsonResponse
         $type     = $request->get('type') ?? 'default';
         $this->parameters->set('type', $type);
 
-        $types    = $this->mapTransactionTypes($this->parameters->get('type'));
-        $manager  = new Manager();
-        $baseUrl  = $request->getSchemeAndHttpHost() . '/api/v1';
-
+        $types   = $this->mapTransactionTypes($this->parameters->get('type'));
+        $manager = new Manager();
+        $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
 
 
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
@@ -282,7 +270,7 @@ public function transactions(Request $request, Account $account): JsonResponse
         $transformer = app(TransactionTransformer::class);
         $transformer->setParameters($this->parameters);
 
-        $resource     = new FractalCollection($transactions, $transformer, 'transactions');
+        $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
@@ -298,13 +286,7 @@ public function transactions(Request $request, Account $account): JsonResponse
      */
     public function update(AccountRequest $request, Account $account): JsonResponse
     {
-        $data = $request->getAll();
-        // if currency ID is 0, find the currency by the code:
-        if (0 === $data['currency_id']) {
-            $currency            = $this->currencyRepository->findByCodeNull($data['currency_code']);
-            $data['currency_id'] = null === $currency ? 0 : $currency->id;
-        }
-        // set correct type:
+        $data         = $request->getAll();
         $data['type'] = config('firefly.shortNamesByFullName.' . $account->accountType->type);
         $this->repository->update($account, $data);
         $manager = new Manager;

diff --git a/app/Api/V1/Controllers/AvailableBudgetController.php b/app/Api/V1/Controllers/AvailableBudgetController.php
@@ -25,7 +25,9 @@
 
 use FireflyIII\Api\V1\Requests\AvailableBudgetRequest;
 use FireflyIII\Exceptions\FireflyException;
+use FireflyIII\Factory\TransactionCurrencyFactory;
 use FireflyIII\Models\AvailableBudget;
+use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
 use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface;
 use FireflyIII\Transformers\AvailableBudgetTransformer;
@@ -155,11 +157,11 @@ public function show(Request $request, AvailableBudget $availableBudget): JsonRe
      */
     public function store(AvailableBudgetRequest $request): JsonResponse
     {
-        $data     = $request->getAll();
-        $currency = $this->currencyRepository->findNull($data['currency_id']);
-        if (null === $currency) {
-            $currency = $this->currencyRepository->findByCodeNull($data['currency_code']);
-        }
+        $data = $request->getAll();
+        /** @var TransactionCurrencyFactory $factory */
+        $factory  = app(TransactionCurrencyFactory::class);
+        $currency = $factory->find($data['currency_id'], $data['currency_code']);
+
         if (null === $currency) {
             $currency = app('amount')->getDefaultCurrency();
         }
@@ -178,7 +180,6 @@ public function store(AvailableBudgetRequest $request): JsonResponse
     }
 
 
-
     /**
      * Update the specified resource in storage.
      *
@@ -190,6 +191,22 @@ public function store(AvailableBudgetRequest $request): JsonResponse
     public function update(AvailableBudgetRequest $request, AvailableBudget $availableBudget): JsonResponse
     {
         $data = $request->getAll();
+
+        /** @var TransactionCurrencyFactory $factory */
+        $factory = app(TransactionCurrencyFactory::class);
+        /** @var TransactionCurrency $currency */
+        $currency = $factory->find($data['currency_id'] ?? null, $data['currency_code'] ?? null);
+
+        if (null === $currency) {
+            // use default currency:
+            $currency = app('amount')->getDefaultCurrency();
+        }
+        $currency->enabled = true;
+        $currency->save();
+        unset($data['currency_code']);
+        $data['currency_id'] = $currency->id;
+
+
         $this->repository->updateAvailableBudget($availableBudget, $data);
         $manager = new Manager;
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';

diff --git a/app/Api/V1/Controllers/BillController.php b/app/Api/V1/Controllers/BillController.php
@@ -29,7 +29,6 @@
 use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
 use FireflyIII\Models\Bill;
 use FireflyIII\Repositories\Bill\BillRepositoryInterface;
-use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\AttachmentTransformer;
 use FireflyIII\Transformers\BillTransformer;
@@ -288,7 +287,7 @@ public function transactions(Request $request, Bill $bill): JsonResponse
         $transformer = app(TransactionTransformer::class);
         $transformer->setParameters($this->parameters);
 
-        $resource     = new FractalCollection($transactions, $transformer, 'transactions');
+        $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');

diff --git a/app/Api/V1/Controllers/BudgetController.php b/app/Api/V1/Controllers/BudgetController.php
@@ -27,11 +27,8 @@
 use FireflyIII\Api\V1\Requests\BudgetRequest;
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Helpers\Collector\TransactionCollectorInterface;
-use FireflyIII\Helpers\Filter\InternalTransferFilter;
 use FireflyIII\Models\Budget;
-use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Budget\BudgetRepositoryInterface;
-use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\BudgetLimitTransformer;
 use FireflyIII\Transformers\BudgetTransformer;

diff --git a/app/Api/V1/Controllers/BudgetLimitController.php b/app/Api/V1/Controllers/BudgetLimitController.php
@@ -219,7 +219,7 @@ public function transactions(Request $request, BudgetLimit $budgetLimit): JsonRe
         $transformer = app(TransactionTransformer::class);
         $transformer->setParameters($this->parameters);
 
-        $resource     = new FractalCollection($transactions, $transformer, 'transactions');
+        $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');

diff --git a/app/Api/V1/Controllers/CategoryController.php b/app/Api/V1/Controllers/CategoryController.php
@@ -30,7 +30,6 @@
 use FireflyIII\Models\Category;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Category\CategoryRepositoryInterface;
-use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\CategoryTransformer;
 use FireflyIII\Transformers\TransactionTransformer;

diff --git a/app/Api/V1/Controllers/ImportController.php b/app/Api/V1/Controllers/ImportController.php
@@ -28,7 +28,6 @@
 use FireflyIII\Models\ImportJob;
 use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\ImportJob\ImportJobRepositoryInterface;
-use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Support\Http\Api\TransactionFilter;
 use FireflyIII\Transformers\ImportJobTransformer;
 use FireflyIII\Transformers\TransactionTransformer;
@@ -176,7 +175,7 @@ public function transactions(Request $request, ImportJob $importJob): JsonRespon
         $transformer = app(TransactionTransformer::class);
         $transformer->setParameters($this->parameters);
 
-        $resource   = new FractalCollection($transactions, $transformer, 'transactions');
+        $resource = new FractalCollection($transactions, $transformer, 'transactions');
         $resource->setPaginator(new IlluminatePaginatorAdapter($paginator));
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');

diff --git a/app/Api/V1/Controllers/RuleController.php b/app/Api/V1/Controllers/RuleController.php
@@ -30,7 +30,6 @@
 use FireflyIII\Models\AccountType;
 use FireflyIII\Models\Rule;
 use FireflyIII\Repositories\Account\AccountRepositoryInterface;
-use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Repositories\Rule\RuleRepositoryInterface;
 use FireflyIII\TransactionRules\TransactionMatcher;
 use FireflyIII\Transformers\RuleTransformer;

diff --git a/app/Api/V1/Controllers/TransactionController.php b/app/Api/V1/Controllers/TransactionController.php
@@ -179,7 +179,7 @@ public function piggyBankEvents(Request $request, Transaction $transaction): Jso
         $baseUrl = $request->getSchemeAndHttpHost() . '/api/v1';
         $manager->setSerializer(new JsonApiSerializer($baseUrl));
 
-        $events   = $this->repository->getPiggyBankEventsByTr($transaction);
+        $events = $this->repository->getPiggyBankEventsByTr($transaction);
 
         /** @var PiggyBankEventTransformer $transformer */
         $transformer = app(PiggyBankEventTransformer::class);
@@ -225,7 +225,7 @@ public function show(Request $request, Transaction $transaction): JsonResponse
         /** @var TransactionTransformer $transformer */
         $transformer = app(TransactionTransformer::class);
         $transformer->setParameters($this->parameters);
-        $resource     = new FractalCollection($transactions, $transformer, 'transactions');
+        $resource = new FractalCollection($transactions, $transformer, 'transactions');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -274,7 +274,7 @@ public function store(TransactionRequest $request, JournalRepositoryInterface $r
         $transformer = app(TransactionTransformer::class);
         $transformer->setParameters($this->parameters);
 
-        $resource     = new FractalCollection($transactions, $transformer, 'transactions');
+        $resource = new FractalCollection($transactions, $transformer, 'transactions');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
     }
@@ -323,7 +323,7 @@ public function update(TransactionRequest $request, JournalRepositoryInterface $
         $transformer = app(TransactionTransformer::class);
         $transformer->setParameters($this->parameters);
 
-        $resource     = new FractalCollection($transactions, $transformer, 'transactions');
+        $resource = new FractalCollection($transactions, $transformer, 'transactions');
 
         return response()->json($manager->createData($resource)->toArray())->header('Content-Type', 'application/vnd.api+json');
 

diff --git a/app/Factory/AccountFactory.php b/app/Factory/AccountFactory.php
@@ -30,6 +30,7 @@
 use FireflyIII\Exceptions\FireflyException;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
+use FireflyIII\Models\TransactionCurrency;
 use FireflyIII\Services\Internal\Support\AccountServiceTrait;
 use FireflyIII\User;
 use Log;
@@ -47,7 +48,8 @@ class AccountFactory
     use AccountServiceTrait;
 
     /**
-     * Constructor.
+     * AccountFactory constructor.
+     * @codeCoverageIgnore
      */
     public function __construct()
     {
@@ -79,7 +81,6 @@ public function create(array $data): Account
         // account may exist already:
         $return = $this->find($data['name'], $type->type);
 
-
         if (null === $return) {
             // create it:
             $databaseData
@@ -92,6 +93,21 @@ public function create(array $data): Account
                 'iban'            => $data['iban'],
             ];
 
+            // find currency, or use default currency instead.
+            /** @var TransactionCurrencyFactory $factory */
+            $factory = app(TransactionCurrencyFactory::class);
+            /** @var TransactionCurrency $currency */
+            $currency = $factory->find((int)($data['currency_id'] ?? null), (string)($data['currency_code'] ?? null));
+
+            if (null === $currency) {
+                // use default currency:
+                $currency = app('amount')->getDefaultCurrencyByUser($this->user);
+            }
+            $currency->enabled =true;
+            $currency->save();
+
+            unset($data['currency_code']);
+            $data['currency_id'] = $currency->id;
             // remove virtual balance when not an asset account or a liability
             $canHaveVirtual = [AccountType::ASSET, AccountType::DEBT, AccountType::LOAN, AccountType::MORTGAGE, AccountType::CREDITCARD];
             if (!\in_array($type->type, $canHaveVirtual, true)) {

diff --git a/app/Factory/BillFactory.php b/app/Factory/BillFactory.php
@@ -61,7 +61,7 @@ public function create(array $data): ?Bill
         /** @var TransactionCurrencyFactory $factory */
         $factory = app(TransactionCurrencyFactory::class);
         /** @var TransactionCurrency $currency */
-        $currency = $factory->find((int)$data['currency_id'], (string)$data['currency_code']);
+        $currency = $factory->find((int)($data['currency_id'] ?? null), (string)($data['currency_code'] ?? null));
 
         if(null === $currency) {
             // use default currency:

diff --git a/app/Factory/TransactionCurrencyFactory.php b/app/Factory/TransactionCurrencyFactory.php
@@ -37,7 +37,8 @@
 class TransactionCurrencyFactory
 {
     /**
-     * Constructor.
+     * TransactionCurrencyFactory constructor.
+     * @codeCoverageIgnore
      */
     public function __construct()
     {

diff --git a/app/Factory/TransactionFactory.php b/app/Factory/TransactionFactory.php
@@ -72,7 +72,8 @@ public function create(array $data): ?Transaction
             throw new FireflyException('Amount is an empty string, which Firefly III cannot handle. Apologies.');
         }
         if (null === $currencyId) {
-            throw new FireflyException('Cannot store transaction without currency information.'); // @codeCoverageIgnore
+            $currency   = app('amount')->getDefaultCurrencyByUser($data['account']->user);
+            $currencyId = $currency->id;
         }
         $data['foreign_amount'] = '' === (string)$data['foreign_amount'] ? null : $data['foreign_amount'];
         Log::debug(sprintf('Create transaction for account #%d ("%s") with amount %s', $data['account']->id, $data['account']->name, $data['amount']));

diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php
@@ -894,7 +894,7 @@ public function updateAvailableBudget(AvailableBudget $availableBudget, array $d
         if (null !== $existing) {
             throw new FireflyException(sprintf('An entry already exists for these parameters: available budget object with ID #%d', $existing->id));
         }
-        $availableBudget->transaction_currency_id = $data['transaction_currency_id'];
+        $availableBudget->transaction_currency_id = $data['currency_id'];
         $availableBudget->start_date              = $data['start_date'];
         $availableBudget->end_date                = $data['end_date'];
         $availableBudget->amount                  = $data['amount'];
@@ -931,6 +931,8 @@ public function updateBudgetLimit(BudgetLimit $budgetLimit, array $data): Budget
         if (null === $currency) {
             $currency = app('amount')->getDefaultCurrencyByUser($this->user);
         }
+        $currency->enabled = true;
+        $currency->save();
         $budgetLimit->transaction_currency_id = $currency->id;
 
         $budgetLimit->save();

diff --git a/app/Rules/IsValidAttachmentModel.php b/app/Rules/IsValidAttachmentModel.php
@@ -33,6 +33,7 @@
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Contracts\Validation\Rule;
+use Log;
 
 /**
  * Class IsValidAttachmentModel
@@ -112,14 +113,15 @@ public function passes($attribute, $value): bool
             return null !== $transaction;
         }
 
-        if (TransactionJournal::class === $this->model) {
+        if (TransactionJournal::class === $model) {
             $repository = app(JournalRepositoryInterface::class);
             $user       = auth()->user();
             $repository->setUser($user);
             $result = $repository->findNull((int)$value);
 
             return null !== $result;
         }
+        Log::error(sprintf('No model was recognized from string "%s"', $model));
 
         return false;
     }

diff --git a/app/Services/Internal/Support/AccountServiceTrait.php b/app/Services/Internal/Support/AccountServiceTrait.php
@@ -332,14 +332,17 @@ public function updateMetaData(Account $account, array $data): void
      * @param string  $note
      *
      * @return bool
-     * @throws \Exception
      */
     public function updateNote(Account $account, string $note): bool
     {
         if ('' === $note) {
             $dbNote = $account->notes()->first();
             if (null !== $dbNote) {
-                $dbNote->delete();
+                try {
+                    $dbNote->delete();
+                } catch (\Exception $e) {
+                    Log::debug($e->getMessage());
+                }
             }
 
             return true;
@@ -365,7 +368,7 @@ public function updateNote(Account $account, string $note): bool
     public function validIBData(array $data): bool
     {
         $data['openingBalance'] = (string)($data['openingBalance'] ?? '');
-        if (isset($data['openingBalance'], $data['openingBalanceDate']) && \strlen($data['openingBalance']) > 0) {
+        if ('' !== $data['openingBalance'] && isset($data['openingBalance'], $data['openingBalanceDate'])) {
             Log::debug('Array has valid opening balance data.');
 
             return true;