Some code cleaning up and refactoring.

app/Helpers/Report/BalanceReportHelper.php

@@ -83,6 +83,54 @@ class BalanceReportHelper implements BalanceReportHelperInterface
         return $balance;
     }
 
+    /**
+     * This method collects all transfers that are part of a "balancing act" tag
+     * and groups the amounts of those transfers by their destination account.
+     *
+     * This is used to indicate which expenses, usually outside of budgets, have been
+     * corrected by transfers from a savings account.
+     *
+     * @param Collection $accounts
+     * @param Carbon     $start
+     * @param Carbon     $end
+     *
+     * @return Collection
+     */
+    private function allCoveredByBalancingActs(Collection $accounts, Carbon $start, Carbon $end): Collection
+    {
+        $ids = $accounts->pluck('id')->toArray();
+        $set = $this->user->tags()
+                          ->leftJoin('tag_transaction_journal', 'tag_transaction_journal.tag_id', '=', 'tags.id')
+                          ->leftJoin('transaction_journals', 'tag_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
+                          ->leftJoin('transaction_types', 'transaction_journals.transaction_type_id', '=', 'transaction_types.id')
+                          ->leftJoin(
+                              'transactions AS t_source', function (JoinClause $join) {
+                              $join->on('transaction_journals.id', '=', 't_source.transaction_journal_id')->where('t_source.amount', '<', 0);
+                          }
+                          )
+                          ->leftJoin(
+                              'transactions AS t_to', function (JoinClause $join) {
+                              $join->on('transaction_journals.id', '=', 't_to.transaction_journal_id')->where('t_to.amount', '>', 0);
+                          }
+                          )
+                          ->where('tags.tagMode', 'balancingAct')
+                          ->where('transaction_types.type', TransactionType::TRANSFER)
+                          ->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
+                          ->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
+                          ->whereNull('transaction_journals.deleted_at')
+                          ->whereIn('t_source.account_id', $ids)
+                          ->whereIn('t_destination.account_id', $ids)
+                          ->groupBy('t_destination.account_id')
+                          ->get(
+                              [
+                                  't_destination.account_id',
+                                  DB::raw('SUM(`t_destination`.`amount`) as `sum`'),
+                              ]
+                          );
+
+        return $set;
+    }
+
 
     /**
      * @param Budget     $budget
@@ -133,7 +181,7 @@ class BalanceReportHelper implements BalanceReportHelperInterface
     private function createDifferenceBalanceLine(Collection $accounts, Collection $spentData, Carbon $start, Carbon $end): BalanceLine
     {
         $diff     = new BalanceLine;
-        $tagsLeft = $this->tagRepository->allCoveredByBalancingActs($accounts, $start, $end);
+        $tagsLeft = $this->allCoveredByBalancingActs($accounts, $start, $end);
 
         $diff->setRole(BalanceLine::ROLE_DIFFROLE);
 
@@ -211,7 +259,7 @@ class BalanceReportHelper implements BalanceReportHelperInterface
     private function createTagsBalanceLine(Collection $accounts, Carbon $start, Carbon $end): BalanceLine
     {
         $tags     = new BalanceLine;
-        $tagsLeft = $this->tagRepository->allCoveredByBalancingActs($accounts, $start, $end);
+        $tagsLeft = $this->allCoveredByBalancingActs($accounts, $start, $end);
 
         $tags->setRole(BalanceLine::ROLE_TAGROLE);
 

app/Http/Controllers/TagController.php

@@ -132,8 +132,8 @@ class TagController extends Controller
         /*
          * Can this tag become another type?
          */
-        $allowAdvance        = $repository->tagAllowAdvance($tag);
+        $allowAdvance        = Tag::tagAllowAdvance($tag);
-        $allowToBalancingAct = $repository->tagAllowBalancing($tag);
+        $allowToBalancingAct = Tag::tagAllowBalancing($tag);
 
         // edit tag options:
         if ($allowAdvance === false) {

app/Models/Tag.php

@@ -5,7 +5,7 @@ namespace FireflyIII\Models;
 
 use Auth;
 use Crypt;
-use Illuminate\Database\Eloquent\Model;
+use FireflyIII\Support\Models\TagSupport;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
@@ -40,7 +40,7 @@ use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
  * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereZoomLevel($value)
  * @mixin \Eloquent
  */
-class Tag extends Model
+class Tag extends TagSupport
 {
     protected $dates    = ['created_at', 'updated_at', 'date'];
     protected $fillable = ['user_id', 'tag', 'date', 'description', 'longitude', 'latitude', 'zoomLevel', 'tagMode'];

app/Repositories/Tag/TagRepository.php

@@ -25,7 +25,7 @@ class TagRepository implements TagRepositoryInterface
     private $user;
 
     /**
-     * BillRepository constructor.
+     * TagRepository constructor.
      *
      * @param User $user
      */
@@ -34,48 +34,6 @@ class TagRepository implements TagRepositoryInterface
         $this->user = $user;
     }
 
-    /**
-     * @param Collection $accounts
-     * @param Carbon     $start
-     * @param Carbon     $end
-     *
-     * @return Collection
-     */
-    public function allCoveredByBalancingActs(Collection $accounts, Carbon $start, Carbon $end): Collection
-    {
-        $ids = $accounts->pluck('id')->toArray();
-        $set = $this->user->tags()
-                          ->leftJoin('tag_transaction_journal', 'tag_transaction_journal.tag_id', '=', 'tags.id')
-                          ->leftJoin('transaction_journals', 'tag_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
-                          ->leftJoin('transaction_types', 'transaction_journals.transaction_type_id', '=', 'transaction_types.id')
-                          ->leftJoin(
-                              'transactions AS t_from', function (JoinClause $join) {
-                              $join->on('transaction_journals.id', '=', 't_from.transaction_journal_id')->where('t_from.amount', '<', 0);
-                          }
-                          )
-                          ->leftJoin(
-                              'transactions AS t_to', function (JoinClause $join) {
-                              $join->on('transaction_journals.id', '=', 't_to.transaction_journal_id')->where('t_to.amount', '>', 0);
-                          }
-                          )
-                          ->where('tags.tagMode', 'balancingAct')
-                          ->where('transaction_types.type', TransactionType::TRANSFER)
-                          ->where('transaction_journals.date', '>=', $start->format('Y-m-d'))
-                          ->where('transaction_journals.date', '<=', $end->format('Y-m-d'))
-                          ->whereNull('transaction_journals.deleted_at')
-                          ->whereIn('t_from.account_id', $ids)
-                          ->whereIn('t_to.account_id', $ids)
-                          ->groupBy('t_to.account_id')
-                          ->get(
-                              [
-                                  't_to.account_id',
-                                  DB::raw('SUM(`t_to`.`amount`) as `sum`'),
-                              ]
-                          );
-
-        return $set;
-    }
-
     /**
      *
      * @param TransactionJournal $journal
@@ -160,74 +118,6 @@ class TagRepository implements TagRepositoryInterface
 
     }
 
-    /**
-     * Can a tag become an advance payment?
-     *
-     * @param Tag $tag
-     *
-     * @return bool
-     */
-    public function tagAllowAdvance(Tag $tag): bool
-    {
-        /*
-         * If this tag is a balancing act, and it contains transfers, it cannot be
-         * changes to an advancePayment.
-         */
-
-        if ($tag->tagMode == 'balancingAct' || $tag->tagMode == 'nothing') {
-            foreach ($tag->transactionjournals as $journal) {
-                if ($journal->isTransfer()) {
-                    return false;
-                }
-            }
-        }
-
-        /*
-         * If this tag contains more than one expenses, it cannot become an advance payment.
-         */
-        $count = 0;
-        foreach ($tag->transactionjournals as $journal) {
-            if ($journal->isWithdrawal()) {
-                $count++;
-            }
-        }
-        if ($count > 1) {
-            return false;
-        }
-
-        return true;
-
-    }
-
-    /**
-     * Can a tag become a balancing act?
-     *
-     * @param Tag $tag
-     *
-     * @return bool
-     */
-    public function tagAllowBalancing(Tag $tag): bool
-    {
-        /*
-         * If has more than two transactions already, cannot become a balancing act:
-         */
-        if ($tag->transactionjournals->count() > 2) {
-            return false;
-        }
-
-        /*
-         * If any transaction is a deposit, cannot become a balancing act.
-         */
-        foreach ($tag->transactionjournals as $journal) {
-            if ($journal->isDeposit()) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-
     /**
      * @param Tag   $tag
      * @param array $data

app/Repositories/Tag/TagRepositoryInterface.php

@@ -17,15 +17,8 @@ use Illuminate\Support\Collection;
 interface TagRepositoryInterface
 {
     /**
-     * @param Collection $accounts
+     * This method will connect a journal with a tag.
-     * @param Carbon     $start
-     * @param Carbon     $end
      *
-     * @return Collection
-     */
-    public function allCoveredByBalancingActs(Collection $accounts, Carbon $start, Carbon $end): Collection;
-
-    /**
      * @param TransactionJournal $journal
      * @param Tag                $tag
      *
@@ -34,6 +27,8 @@ interface TagRepositoryInterface
     public function connect(TransactionJournal $journal, Tag $tag): bool;
 
     /**
+     * This method destroys a tag.
+     *
      * @param Tag $tag
      *
      * @return bool
@@ -41,11 +36,15 @@ interface TagRepositoryInterface
     public function destroy(Tag $tag): bool;
 
     /**
+     * This method returns all the user's tags.
+     *
      * @return Collection
      */
     public function get(): Collection;
 
     /**
+     * This method stores a tag.
+     *
      * @param array $data
      *
      * @return Tag
@@ -53,24 +52,8 @@ interface TagRepositoryInterface
     public function store(array $data): Tag;
 
     /**
-     * Can a tag become an advance payment?
+     * Update a tag.
      *
-     * @param Tag $tag
-     *
-     * @return bool
-     */
-    public function tagAllowAdvance(Tag $tag): bool;
-
-    /**
-     * Can a tag become a balancing act?
-     *
-     * @param Tag $tag
-     *
-     * @return bool
-     */
-    public function tagAllowBalancing(Tag $tag): bool;
-
-    /**
      * @param Tag   $tag
      * @param array $data
      *

app/Repositories/User/UserRepository.php

@@ -51,6 +51,6 @@ class UserRepository implements UserRepositoryInterface
      */
     public function count(): int
     {
-        return User::count();
+        return $this->all()->count();
     }
 }

app/Repositories/User/UserRepositoryInterface.php

@@ -22,11 +22,15 @@ use Illuminate\Support\Collection;
 interface UserRepositoryInterface
 {
     /**
+     * Returns a collection of all users.
+     *
      * @return Collection
      */
     public function all(): Collection;
 
     /**
+     * Gives a user a role.
+     *
      * @param User   $user
      * @param string $role
      *
@@ -35,6 +39,8 @@ interface UserRepositoryInterface
     public function attachRole(User $user, string $role): bool;
 
     /**
+     * Returns a count of all users.
+     * 
      * @return int
      */
     public function count(): int;

app/Support/Models/TagSupport.php

@@ -0,0 +1,78 @@
+<?php
+declare(strict_types = 1);
+
+namespace FireflyIII\Support\Models;
+
+use FireflyIII\Models\Tag;
+use Illuminate\Database\Eloquent\Model;
+
+class TagSupport extends Model
+{
+    /**
+     * Can a tag become an advance payment?
+     *
+     * @param Tag $tag
+     *
+     * @return bool
+     */
+    public static function tagAllowAdvance(Tag $tag): bool
+    {
+        /*
+                * If this tag is a balancing act, and it contains transfers, it cannot be
+                * changes to an advancePayment.
+                */
+
+        if ($tag->tagMode == 'balancingAct' || $tag->tagMode == 'nothing') {
+            foreach ($tag->transactionjournals as $journal) {
+                if ($journal->isTransfer()) {
+                    return false;
+                }
+            }
+        }
+
+        /*
+         * If this tag contains more than one expenses, it cannot become an advance payment.
+         */
+        $count = 0;
+        foreach ($tag->transactionjournals as $journal) {
+            if ($journal->isWithdrawal()) {
+                $count++;
+            }
+        }
+        if ($count > 1) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Can a tag become a balancing act?
+     *
+     * @param Tag $tag
+     *
+     * @return bool
+     */
+    public static function tagAllowBalancing(Tag $tag): bool
+    {
+        /*
+         * If has more than two transactions already, cannot become a balancing act:
+         */
+        if ($tag->transactionjournals->count() > 2) {
+            return false;
+        }
+
+        /*
+         * If any transaction is a deposit, cannot become a balancing act.
+         */
+        foreach ($tag->transactionjournals as $journal) {
+            if ($journal->isDeposit()) {
+                return false;
+            }
+        }
+
+        return true;
+
+    }
+
+}