use journal repository instead of direct calls.

app/Repositories/Bill/BillRepository.php

@@ -29,6 +29,7 @@ use FireflyIII\Models\Bill;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\Services\Internal\Destroy\BillDestroyService;
 use FireflyIII\Services\Internal\Update\BillUpdateService;
 use FireflyIII\Support\CacheProperties;
@@ -253,12 +254,15 @@ class BillRepository implements BillRepositoryInterface
      */
     public function getOverallAverage(Bill $bill): string
     {
+        /** @var JournalRepositoryInterface $repos */
+        $repos = app(JournalRepositoryInterface::class);
+        $repos->setUser($this->user);
         $journals = $bill->transactionJournals()->get();
         $sum      = '0';
         $count    = strval($journals->count());
         /** @var TransactionJournal $journal */
         foreach ($journals as $journal) {
-            $sum = bcadd($sum, $journal->amountPositive());
+            $sum = bcadd($sum, $repos->getJournalTotal($journal));
         }
         $avg = '0';
         if ($journals->count() > 0) {
@@ -376,15 +380,19 @@ class BillRepository implements BillRepositoryInterface
      */
     public function getYearAverage(Bill $bill, Carbon $date): string
     {
+        /** @var JournalRepositoryInterface $repos */
+        $repos = app(JournalRepositoryInterface::class);
+        $repos->setUser($this->user);
+
         $journals = $bill->transactionJournals()
                          ->where('date', '>=', $date->year . '-01-01 00:00:00')
-                         ->where('date', '<=', $date->year . '-12-31 00:00:00')
+                         ->where('date', '<=', $date->year . '-12-31 23:59:59')
                          ->get();
         $sum      = '0';
         $count    = strval($journals->count());
         /** @var TransactionJournal $journal */
         foreach ($journals as $journal) {
-            $sum = bcadd($sum, $journal->amountPositive());
+            $sum = bcadd($sum, $repos->getJournalTotal($journal));
         }
         $avg = '0';
         if ($journals->count() > 0) {
@@ -494,15 +502,20 @@ class BillRepository implements BillRepositoryInterface
         if (false === $journal->isWithdrawal()) {
             return false;
         }
-        $destinationAccounts = $journal->destinationAccountList();
-        $sourceAccounts      = $journal->sourceAccountList();
+
+        /** @var JournalRepositoryInterface $repos */
+        $repos = app(JournalRepositoryInterface::class);
+        $repos->setUser($this->user);
+
+        $destinationAccounts = $repos->getJournalDestinationAccounts($journal);
+        $sourceAccounts      = $repos->getJournalDestinationAccounts($journal);
         $matches             = explode(',', $bill->match);
         $description         = strtolower($journal->description) . ' ';
         $description         .= strtolower(join(' ', $destinationAccounts->pluck('name')->toArray()));
         $description         .= strtolower(join(' ', $sourceAccounts->pluck('name')->toArray()));
 
         $wordMatch   = $this->doWordMatch($matches, $description);
-        $amountMatch = $this->doAmountMatch($journal->amountPositive(), $bill->amount_min, $bill->amount_max);
+        $amountMatch = $this->doAmountMatch($repos->getJournalTotal($journal), $bill->amount_min, $bill->amount_max);
 
         // when both, update!
         if ($wordMatch && $amountMatch) {
@@ -561,6 +574,7 @@ class BillRepository implements BillRepositoryInterface
     }
 
     /**
+     * TODO refactor
      * @param float $amount
      * @param float $min
      * @param float $max
@@ -577,6 +591,7 @@ class BillRepository implements BillRepositoryInterface
     }
 
     /**
+     * TODO refactor
      * @param array $matches
      * @param       $description
      *

app/Repositories/Journal/JournalRepository.php

@@ -356,6 +356,30 @@ class JournalRepository implements JournalRepositoryInterface
         return $list;
     }
 
+    /**
+     * Return total amount of journal. Is always positive.
+     *
+     * @param TransactionJournal $journal
+     *
+     * @return string
+     */
+    public function getJournalTotal(TransactionJournal $journal): string
+    {
+        $cache = new CacheProperties;
+        $cache->addProperty($journal->id);
+        $cache->addProperty('amount-positive');
+        if ($cache->has()) {
+            return $cache->get(); // @codeCoverageIgnore
+        }
+
+        // saves on queries:
+        $amount = $journal->transactions()->where('amount', '>', 0)->get()->sum('amount');
+        $amount = strval($amount);
+        $cache->store($amount);
+
+        return $amount;
+    }
+
     /**
      * Return value of a meta field (or NULL) as a string.
      *
@@ -475,6 +499,24 @@ class JournalRepository implements JournalRepositoryInterface
         return $set;
     }
 
+    /**
+     * Will tell you if journal is reconciled or not.
+     *
+     * @param TransactionJournal $journal
+     *
+     * @return bool
+     */
+    public function isJournalReconciled(TransactionJournal $journal): bool
+    {
+        foreach ($journal->transactions as $transaction) {
+            if ($transaction->reconciled) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * @param Transaction $transaction
      *

app/Repositories/Journal/JournalRepositoryInterface.php

@@ -36,7 +36,6 @@ use Illuminate\Support\MessageBag;
  */
 interface JournalRepositoryInterface
 {
-
     /**
      * @param TransactionJournal $journal
      * @param TransactionType    $type
@@ -165,6 +164,15 @@ interface JournalRepositoryInterface
      */
     public function getJournalSourceAccounts(TransactionJournal $journal): Collection;
 
+    /**
+     * Return total amount of journal. Is always positive.
+     *
+     * @param TransactionJournal $journal
+     *
+     * @return string
+     */
+    public function getJournalTotal(TransactionJournal $journal): string;
+
     /**
      * Return value of a meta field (or NULL).
      *
@@ -230,6 +238,15 @@ interface JournalRepositoryInterface
      */
     public function getTransactionsById(array $transactionIds): Collection;
 
+    /**
+     * Will tell you if journal is reconciled or not.
+     *
+     * @param TransactionJournal $journal
+     *
+     * @return bool
+     */
+    public function isJournalReconciled(TransactionJournal $journal): bool;
+
     /**
      * @param Transaction $transaction
      *

app/Repositories/PiggyBank/PiggyBankRepository.php

@@ -28,6 +28,7 @@ use FireflyIII\Models\PiggyBank;
 use FireflyIII\Models\PiggyBankEvent;
 use FireflyIII\Models\PiggyBankRepetition;
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
 use FireflyIII\User;
 use Illuminate\Support\Collection;
 use Log;
@@ -222,8 +223,12 @@ class PiggyBankRepository implements PiggyBankRepositoryInterface
      */
     public function getExactAmount(PiggyBank $piggyBank, PiggyBankRepetition $repetition, TransactionJournal $journal): string
     {
-        $amount  = $journal->amountPositive();
-        $sources = $journal->sourceAccountList()->pluck('id')->toArray();
+        /** @var JournalRepositoryInterface $repos */
+        $repos = app(JournalRepositoryInterface::class);
+        $repos->setUser($this->user);
+
+        $amount  = $repos->getJournalTotal($journal);
+        $sources = $repos->getJournalSourceAccounts($journal)->pluck('id')->toArray();
         $room    = bcsub(strval($piggyBank->targetamount), strval($repetition->currentamount));
         $compare = bcmul($repetition->currentamount, '-1');