apply demeter law for transaction type calls

- adds contants for transaction type names
- demeter law = never speaks with strangers

app/Repositories/Account/AccountRepository.php

@@ -330,7 +330,7 @@ class AccountRepository implements AccountRepositoryInterface
               ->where('transaction_journals.user_id', Auth::user()->id)
               ->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
               ->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
-              ->where('transaction_types.type', 'Transfer');
+              ->where('transaction_types.type', TransactionType::TRANSFER);
 
         }
         )->get();
@@ -376,7 +376,7 @@ class AccountRepository implements AccountRepositoryInterface
         return TransactionJournal
             ::orderBy('transaction_journals.date', 'ASC')
             ->accountIs($account)
-            ->transactionTypes(['Opening balance'])
+            ->transactionTypes([TransactionType::OPENING_BALANCE])
             ->orderBy('created_at', 'ASC')
             ->first(['transaction_journals.*']);
     }
@@ -549,7 +549,7 @@ class AccountRepository implements AccountRepositoryInterface
      */
     protected function storeInitialBalance(Account $account, Account $opposing, array $data)
     {
-        $transactionType = TransactionType::whereType('Opening balance')->first();
+        $transactionType = TransactionType::whereType(TransactionType::OPENING_BALANCE)->first();
         $journal         = TransactionJournal::create(
             [
                 'user_id'                 => $data['user'],

app/Repositories/Bill/BillRepository.php

@@ -154,7 +154,7 @@ class BillRepository implements BillRepositoryInterface
         }
         $journals = new Collection;
         if (count($ids) > 0) {
-            $journals = Auth::user()->transactionjournals()->transactionTypes(['Withdrawal'])->whereIn('transaction_journals.id', $ids)->get(
+            $journals = Auth::user()->transactionjournals()->transactionTypes([TransactionType::WITHDRAWAL])->whereIn('transaction_journals.id', $ids)->get(
                 ['transaction_journals.*']
             );
         }
@@ -280,7 +280,7 @@ class BillRepository implements BillRepositoryInterface
         /*
          * Can only support withdrawals.
          */
-        if ($journal->transactionType->type !== 'Withdrawal') {
+        if (false === $journal->isWithdrawal()) {
             return false;
         }
 

app/Repositories/Budget/BudgetRepository.php

@@ -7,6 +7,7 @@ use Carbon\Carbon;
 use FireflyIII\Models\Budget;
 use FireflyIII\Models\BudgetLimit;
 use FireflyIII\Models\LimitRepetition;
+use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Shared\ComponentRepository;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Database\Query\Builder as QueryBuilder;
@@ -54,7 +55,7 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
     public function expensesOnDayCorrected(Budget $budget, Carbon $date)
     {
         bcscale(2);
-        $sum = $budget->transactionjournals()->transactionTypes(['Withdrawal'])->onDate($date)->get(['transaction_journals.*'])->sum('amount');
+        $sum = $budget->transactionjournals()->transactionTypes([TransactionType::WITHDRAWAL])->onDate($date)->get(['transaction_journals.*'])->sum('amount');
 
         return $sum;
     }
@@ -306,7 +307,7 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
             )
             ->after($start)
             ->before($end)
-            ->transactionTypes(['Withdrawal'])
+            ->transactionTypes([TransactionType::WITHDRAWAL])
             ->get(['transaction_journals.*'])->sum('amount');
 
         bcscale(2);

app/Repositories/Category/CategoryRepository.php

@@ -7,6 +7,7 @@ use Carbon\Carbon;
 use Crypt;
 use FireflyIII\Models\Category;
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Models\TransactionType;
 use FireflyIII\Repositories\Shared\ComponentRepository;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Support\Collection;
@@ -76,7 +77,7 @@ class CategoryRepository extends ComponentRepository implements CategoryReposito
                    ->before($end)
                    ->where('categories.user_id', Auth::user()->id)
                    ->after($start)
-                   ->transactionTypes(['Withdrawal'])
+                   ->transactionTypes([TransactionType::WITHDRAWAL])
                    ->get(['categories.id as category_id', 'categories.encrypted as category_encrypted', 'categories.name', 'transaction_journals.*']);
 
         bcscale(2);
@@ -200,7 +201,7 @@ class CategoryRepository extends ComponentRepository implements CategoryReposito
      */
     public function spentOnDaySumCorrected(Category $category, Carbon $date)
     {
-        return $category->transactionjournals()->transactionTypes(['Withdrawal'])->onDate($date)->get(['transaction_journals.*'])->sum('amount');
+        return $category->transactionjournals()->transactionTypes([TransactionType::WITHDRAWAL])->onDate($date)->get(['transaction_journals.*'])->sum('amount');
     }
 
     /**
@@ -285,7 +286,7 @@ class CategoryRepository extends ComponentRepository implements CategoryReposito
             return $cache->get(); // @codeCoverageIgnore
         }
 
-        $sum = $category->transactionjournals()->transactionTypes(['Withdrawal'])->before($end)->after($start)->get(['transaction_journals.*'])->sum(
+        $sum = $category->transactionjournals()->transactionTypes([TransactionType::WITHDRAWAL])->before($end)->after($start)->get(['transaction_journals.*'])->sum(
             'amount'
         );
 
@@ -315,7 +316,7 @@ class CategoryRepository extends ComponentRepository implements CategoryReposito
             return $cache->get(); // @codeCoverageIgnore
         }
 
-        $sum = $category->transactionjournals()->transactionTypes(['Deposit'])->before($end)->after($start)->get(['transaction_journals.*'])->sum(
+        $sum = $category->transactionjournals()->transactionTypes([TransactionType::DEPOSIT])->before($end)->after($start)->get(['transaction_journals.*'])->sum(
             'amount'
         );
 
@@ -367,6 +368,6 @@ class CategoryRepository extends ComponentRepository implements CategoryReposito
      */
     public function earnedOnDaySumCorrected(Category $category, Carbon $date)
     {
-        return $category->transactionjournals()->transactionTypes(['Deposit'])->onDate($date)->get(['transaction_journals.*'])->sum('amount');
+        return $category->transactionjournals()->transactionTypes([TransactionType::DEPOSIT])->onDate($date)->get(['transaction_journals.*'])->sum('amount');
     }
 }

app/Repositories/Journal/JournalRepository.php

@@ -327,15 +327,15 @@ class JournalRepository implements JournalRepositoryInterface
         $fromAccount = null;
         $toAccount   = null;
         switch ($type->type) {
-            case 'Withdrawal':
+            case TransactionType::WITHDRAWAL:
                 list($fromAccount, $toAccount) = $this->storeWithdrawalAccounts($data);
                 break;
 
-            case 'Deposit':
+            case TransactionType::DEPOSIT:
                 list($fromAccount, $toAccount) = $this->storeDepositAccounts($data);
 
                 break;
-            case 'Transfer':
+            case TransactionType::TRANSFER:
                 $fromAccount = Account::find($data['account_from_id']);
                 $toAccount   = Account::find($data['account_to_id']);
                 break;

app/Repositories/Shared/ComponentRepository.php

@@ -3,6 +3,7 @@
 namespace FireflyIII\Repositories\Shared;
 
 use Carbon\Carbon;
+use FireflyIII\Models\TransactionType;
 use FireflyIII\Support\CacheProperties;
 use Illuminate\Database\Query\JoinClause;
 
@@ -39,7 +40,10 @@ class ComponentRepository
         }
 
         if ($shared === true) { // shared is true: always ignore transfers between accounts!
-            $sum = $object->transactionjournals()->transactionTypes(['Withdrawal', 'Deposit', 'Opening balance'])->before($end)->after($start)
+            $sum = $object->transactionjournals()
+                          ->transactionTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::OPENING_BALANCE])
+                          ->before($end)
+                          ->after($start)
                           ->get(['transaction_journals.*'])->sum('amount');
         } else {
             // do something else, SEE budgets.
@@ -47,7 +51,7 @@ class ComponentRepository
             $sum = $object->transactionjournals()->before($end)->after($start)
                           ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
                           ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
-                          ->transactionTypes(['Withdrawal', 'Deposit', 'Opening balance'])
+                          ->transactionTypes([TransactionType::WITHDRAWAL, TransactionType::DEPOSIT, TransactionType::OPENING_BALANCE])
                           ->leftJoin(
                               'account_meta', function (JoinClause $join) {
                               $join->on('account_meta.account_id', '=', 'accounts.id')->where('account_meta.name', '=', 'accountRole');

app/Repositories/Tag/TagRepository.php

@@ -77,7 +77,7 @@ class TagRepository implements TagRepositoryInterface
 
         /** @var Tag $tag */
         foreach ($tags as $tag) {
-            $journals = $tag->transactionjournals()->after($start)->before($end)->transactionTypes(['Transfer'])->get(['transaction_journals.*']);
+            $journals = $tag->transactionjournals()->after($start)->before($end)->transactionTypes([TransactionType::TRANSFER])->get(['transaction_journals.*']);
 
             /** @var TransactionJournal $journal */
             foreach ($journals as $journal) {
@@ -158,7 +158,7 @@ class TagRepository implements TagRepositoryInterface
 
         if ($tag->tagMode == 'balancingAct' || $tag->tagMode == 'nothing') {
             foreach ($tag->transactionjournals as $journal) {
-                if ($journal->transactionType->type == 'Transfer') {
+                if ($journal->isTransfer()) {
                     return false;
                 }
             }
@@ -169,7 +169,7 @@ class TagRepository implements TagRepositoryInterface
          */
         $count = 0;
         foreach ($tag->transactionjournals as $journal) {
-            if ($journal->transactionType->type == 'Withdrawal') {
+            if ($journal->isWithdrawal()) {
                 $count++;
             }
         }
@@ -201,7 +201,7 @@ class TagRepository implements TagRepositoryInterface
          * If any transaction is a deposit, cannot become a balancing act.
          */
         foreach ($tag->transactionjournals as $journal) {
-            if ($journal->transactionType->type == 'Deposit') {
+            if ($journal->isDeposit()) {
                 return false;
             }
         }
@@ -239,10 +239,10 @@ class TagRepository implements TagRepositoryInterface
     protected function connectBalancingAct(TransactionJournal $journal, Tag $tag)
     {
         /** @var TransactionType $withdrawal */
-        $withdrawal  = TransactionType::whereType('Withdrawal')->first();
+        $withdrawal  = TransactionType::whereType(TransactionType::WITHDRAWAL)->first();
         $withdrawals = $tag->transactionjournals()->where('transaction_type_id', $withdrawal->id)->count();
         /** @var TransactionType $transfer */
-        $transfer  = TransactionType::whereType('Transfer')->first();
+        $transfer  = TransactionType::whereType(TransactionType::TRANSFER)->first();
         $transfers = $tag->transactionjournals()->where('transaction_type_id', $transfer->id)->count();
 
 
@@ -275,11 +275,11 @@ class TagRepository implements TagRepositoryInterface
     protected function connectAdvancePayment(TransactionJournal $journal, Tag $tag)
     {
         /** @var TransactionType $transfer */
-        $transfer = TransactionType::whereType('Transfer')->first();
+        $transfer = TransactionType::whereType(TransactionType::TRANSFER)->first();
         /** @var TransactionType $withdrawal */
-        $withdrawal = TransactionType::whereType('Withdrawal')->first();
+        $withdrawal = TransactionType::whereType(TransactionType::WITHDRAWAL)->first();
         /** @var TransactionType $deposit */
-        $deposit = TransactionType::whereType('Deposit')->first();
+        $deposit = TransactionType::whereType(TransactionType::DEPOSIT)->first();
 
         $withdrawals = $tag->transactionjournals()->where('transaction_type_id', $withdrawal->id)->count();
         $deposits    = $tag->transactionjournals()->where('transaction_type_id', $deposit->id)->count();
@@ -326,10 +326,10 @@ class TagRepository implements TagRepositoryInterface
         foreach ($tag->transactionjournals as $check) {
             // $checkAccount is the source_account for a withdrawal
             // $checkAccount is the destination_account for a deposit
-            if ($check->transactionType->type == 'Withdrawal' && $check->source_account->id != $journal->destination_account->id) {
+            if ($check->isWithdrawal() && $check->source_account->id != $journal->destination_account->id) {
                 $match = false;
             }
-            if ($check->transactionType->type == 'Deposit' && $check->destination_account->id != $journal->destination_account->id) {
+            if ($check->isDeposit() && $check->destination_account->id != $journal->destination_account->id) {
                 $match = false;
             }