Reformat various code.

2025-02-25 18:45:27 -06:00 · 2022-03-29 14:59:58 +02:00
parent 29bed2547c
commit d1a09ff33b
115 changed files with 2700 additions and 2699 deletions
--- a/app/Support/Search/AccountSearch.php
+++ b/app/Support/Search/AccountSearch.php
@@ -37,14 +37,13 @@ class AccountSearch implements GenericSearchInterface
    /** @var string */
    public const SEARCH_ALL = 'all';
    /** @var string */
-    public const SEARCH_NAME = 'name';
-    /** @var string */
    public const SEARCH_IBAN = 'iban';
    /** @var string */
-    public const SEARCH_NUMBER = 'number';
-    /** @var string */
    public const SEARCH_ID = 'id';
-
+    /** @var string */
+    public const SEARCH_NAME = 'name';
+    /** @var string */
+    public const SEARCH_NUMBER = 'number';
    private string $field;
    private string $query;
    private array  $types;
@@ -62,11 +61,11 @@ class AccountSearch implements GenericSearchInterface
    public function search(): Collection
    {

-        $searchQuery = $this->user->accounts()
-                                  ->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id')
-                                  ->leftJoin('account_meta', 'accounts.id', '=', 'account_meta.account_id')
-                                  ->whereIn('account_types.type', $this->types);
-        $like = sprintf('%%%s%%', $this->query);
+        $searchQuery   = $this->user->accounts()
+                                    ->leftJoin('account_types', 'accounts.account_type_id', '=', 'account_types.id')
+                                    ->leftJoin('account_meta', 'accounts.id', '=', 'account_meta.account_id')
+                                    ->whereIn('account_types.type', $this->types);
+        $like          = sprintf('%%%s%%', $this->query);
        $originalQuery = $this->query;
        switch ($this->field) {
            default:
@@ -88,7 +87,7 @@ class AccountSearch implements GenericSearchInterface
                );
                break;
            case self::SEARCH_ID:
-                $searchQuery->where('accounts.id', '=', (int)$originalQuery);
+                $searchQuery->where('accounts.id', '=', (int) $originalQuery);
                break;
            case self::SEARCH_NAME:
                $searchQuery->where('accounts.name', 'LIKE', $like);
--- a/app/Support/Search/OperatorQuerySearch.php
+++ b/app/Support/Search/OperatorQuerySearch.php
@@ -170,73 +170,6 @@ class OperatorQuerySearch implements SearchInterface
        $this->collector->setSearchWords($this->words);
    }

-    /**
-     * @inheritDoc
-     * @codeCoverageIgnore
-     */
-    public function searchTime(): float
-    {
-        return microtime(true) - $this->startTime;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function searchTransactions(): LengthAwarePaginator
-    {
-        if (empty($this->getWords()) && empty($this->getOperators())) {
-            return new LengthAwarePaginator([], 0, 5, 1);
-        }
-
-        return $this->collector->getPaginatedGroups();
-    }
-
-    /**
-     * @param Carbon $date
-     */
-    public function setDate(Carbon $date): void
-    {
-        $this->date = $date;
-    }
-
-    /**
-     * @param int $limit
-     */
-    public function setLimit(int $limit): void
-    {
-        $this->limit = $limit;
-        $this->collector->setLimit($this->limit);
-    }
-
-    /**
-     * @inheritDoc
-     * @codeCoverageIgnore
-     */
-    public function setPage(int $page): void
-    {
-        $this->page = $page;
-        $this->collector->setPage($this->page);
-    }
-
-    /**
-     * @inheritDoc
-     * @codeCoverageIgnore
-     */
-    public function setUser(User $user): void
-    {
-        $this->accountRepository->setUser($user);
-        $this->billRepository->setUser($user);
-        $this->categoryRepository->setUser($user);
-        $this->budgetRepository->setUser($user);
-        $this->tagRepository->setUser($user);
-        $this->collector = app(GroupCollectorInterface::class);
-        $this->collector->setUser($user);
-        $this->collector->withAccountInformation()->withCategoryInformation()->withBudgetInformation();
-
-        $this->setLimit((int) app('preferences')->getForUser($user, 'listPageSize', 50)->data);
-
-    }
-
    /**
     * @param Node $searchNode
     *
@@ -1152,14 +1085,6 @@ class OperatorQuerySearch implements SearchInterface
        ];
    }

-    /**
-     * @return array
-     */
-    public function getWords(): array
-    {
-        return $this->words;
-    }
-
    /**
     * @param array $range
     *
@@ -1199,46 +1124,6 @@ class OperatorQuerySearch implements SearchInterface
        }
    }

-    /**
-     * @param string $field
-     * @param array  $range
-     * @return void
-     * @throws FireflyException
-     */
-    private function setExactObjectDateParams(string $field,array $range): void
-    {
-        /**
-         * @var string        $key
-         * @var Carbon|string $value
-         */
-        foreach ($range as $key => $value) {
-            switch ($key) {
-                default:
-                    throw new FireflyException(sprintf('Cannot handle key "%s" in setExactObjectDateParams()', $key));
-                case 'exact':
-                    Log::debug(sprintf('Set %s_is_exact value "%s"',$field, $value->format('Y-m-d')));
-                    $this->collector->setObjectRange($value, clone $value, $field);
-                    $this->operators->push(['type' => sprintf('%s_on', $field), 'value' => $value->format('Y-m-d'),]);
-                    break;
-                case 'year':
-                    Log::debug(sprintf('Set %s_is_exact YEAR value "%s"', $field, $value));
-                    $this->collector->objectYearIs($value, $field);
-                    $this->operators->push(['type' => sprintf('%s_on_year', $field), 'value' => $value,]);
-                    break;
-                case 'month':
-                    Log::debug(sprintf('Set %s_is_exact MONTH value "%s"', $field, $value));
-                    $this->collector->objectMonthIs($value, $field);
-                    $this->operators->push(['type' => sprintf('%s_on_month', $field), 'value' => $value,]);
-                    break;
-                case 'day':
-                    Log::debug(sprintf('Set %s_is_exact DAY value "%s"', $field, $value));
-                    $this->collector->objectDayIs($value, $field);
-                    $this->operators->push(['type' => sprintf('%s_on_day', $field), 'value' => $value,]);
-                    break;
-            }
-        }
-    }
-
    /**
     * @param array $range
     *
@@ -1277,6 +1162,85 @@ class OperatorQuerySearch implements SearchInterface
        }
    }

+    /**
+     * @param array $range
+     *
+     * @throws FireflyException
+     */
+    private function setDateAfterParams(array $range)
+    {
+        /**
+         * @var string        $key
+         * @var Carbon|string $value
+         */
+        foreach ($range as $key => $value) {
+            switch ($key) {
+                default:
+                    throw new FireflyException(sprintf('Cannot handle key "%s" in setDateAfterParams()', $key));
+                case 'exact':
+                    $this->collector->setAfter($value);
+                    $this->operators->push(['type' => 'date_after', 'value' => $value->format('Y-m-d'),]);
+                    break;
+                case 'year':
+                    Log::debug(sprintf('Set date_is_after YEAR value "%s"', $value));
+                    $this->collector->yearAfter($value);
+                    $this->operators->push(['type' => 'date_after_year', 'value' => $value,]);
+                    break;
+                case 'month':
+                    Log::debug(sprintf('Set date_is_after MONTH value "%s"', $value));
+                    $this->collector->monthAfter($value);
+                    $this->operators->push(['type' => 'date_after_month', 'value' => $value,]);
+                    break;
+                case 'day':
+                    Log::debug(sprintf('Set date_is_after DAY value "%s"', $value));
+                    $this->collector->dayAfter($value);
+                    $this->operators->push(['type' => 'date_after_day', 'value' => $value,]);
+                    break;
+            }
+        }
+    }
+
+    /**
+     * @param string $field
+     * @param array  $range
+     * @return void
+     * @throws FireflyException
+     */
+    private function setExactMetaDateParams(string $field, array $range): void
+    {
+        Log::debug('Now in setExactMetaDateParams()');
+        /**
+         * @var string        $key
+         * @var Carbon|string $value
+         */
+        foreach ($range as $key => $value) {
+            switch ($key) {
+                default:
+                    throw new FireflyException(sprintf('Cannot handle key "%s" in setExactMetaDateParams()', $key));
+                case 'exact':
+                    Log::debug(sprintf('Set %s_is_exact value "%s"', $field, $value->format('Y-m-d')));
+                    $this->collector->setMetaDateRange($value, $value, $field);
+                    $this->operators->push(['type' => sprintf('%s_on', $field), 'value' => $value->format('Y-m-d'),]);
+                    break;
+                case 'year':
+                    Log::debug(sprintf('Set %s_is_exact YEAR value "%s"', $field, $value));
+                    $this->collector->metaYearIs($value, $field);
+                    $this->operators->push(['type' => sprintf('%s_on_year', $field), 'value' => $value,]);
+                    break;
+                case 'month':
+                    Log::debug(sprintf('Set %s_is_exact MONTH value "%s"', $field, $value));
+                    $this->collector->metaMonthIs($value, $field);
+                    $this->operators->push(['type' => sprintf('%s_on_month', $field), 'value' => $value,]);
+                    break;
+                case 'day':
+                    Log::debug(sprintf('Set %s_is_exact DAY value "%s"', $field, $value));
+                    $this->collector->metaDayIs($value, $field);
+                    $this->operators->push(['type' => sprintf('%s_on_day', $field), 'value' => $value,]);
+                    break;
+            }
+        }
+    }
+
    /**
     * @param string $field
     * @param array  $range
@@ -1356,11 +1320,12 @@ class OperatorQuerySearch implements SearchInterface
    }

    /**
-     * @param array $range
-     *
+     * @param string $field
+     * @param array  $range
+     * @return void
     * @throws FireflyException
     */
-    private function setDateAfterParams(array $range)
+    private function setExactObjectDateParams(string $field, array $range): void
    {
        /**
         * @var string        $key
@@ -1369,63 +1334,26 @@ class OperatorQuerySearch implements SearchInterface
        foreach ($range as $key => $value) {
            switch ($key) {
                default:
-                    throw new FireflyException(sprintf('Cannot handle key "%s" in setDateAfterParams()', $key));
+                    throw new FireflyException(sprintf('Cannot handle key "%s" in setExactObjectDateParams()', $key));
                case 'exact':
-                    $this->collector->setAfter($value);
-                    $this->operators->push(['type' => 'date_after', 'value' => $value->format('Y-m-d'),]);
+                    Log::debug(sprintf('Set %s_is_exact value "%s"', $field, $value->format('Y-m-d')));
+                    $this->collector->setObjectRange($value, clone $value, $field);
+                    $this->operators->push(['type' => sprintf('%s_on', $field), 'value' => $value->format('Y-m-d'),]);
                    break;
                case 'year':
-                    Log::debug(sprintf('Set date_is_after YEAR value "%s"', $value));
-                    $this->collector->yearAfter($value);
-                    $this->operators->push(['type' => 'date_after_year', 'value' => $value,]);
+                    Log::debug(sprintf('Set %s_is_exact YEAR value "%s"', $field, $value));
+                    $this->collector->objectYearIs($value, $field);
+                    $this->operators->push(['type' => sprintf('%s_on_year', $field), 'value' => $value,]);
                    break;
                case 'month':
-                    Log::debug(sprintf('Set date_is_after MONTH value "%s"', $value));
-                    $this->collector->monthAfter($value);
-                    $this->operators->push(['type' => 'date_after_month', 'value' => $value,]);
+                    Log::debug(sprintf('Set %s_is_exact MONTH value "%s"', $field, $value));
+                    $this->collector->objectMonthIs($value, $field);
+                    $this->operators->push(['type' => sprintf('%s_on_month', $field), 'value' => $value,]);
                    break;
                case 'day':
-                    Log::debug(sprintf('Set date_is_after DAY value "%s"', $value));
-                    $this->collector->dayAfter($value);
-                    $this->operators->push(['type' => 'date_after_day', 'value' => $value,]);
-                    break;
-            }
-        }
-    }
-
-    /**
-     * @param array $range
-     *
-     * @throws FireflyException
-     */
-    private function setObjectDateAfterParams(string $field, array $range)
-    {
-        /**
-         * @var string        $key
-         * @var Carbon|string $value
-         */
-        foreach ($range as $key => $value) {
-            switch ($key) {
-                default:
-                    throw new FireflyException(sprintf('Cannot handle key "%s" in setDateAfterParams()', $key));
-                case 'exact':
-                    $this->collector->setObjectAfter($value, $field);
-                    $this->operators->push(['type' => sprintf('%s_after', $field), 'value' => $value->format('Y-m-d'),]);
-                    break;
-                case 'year':
-                    Log::debug(sprintf('Set date_is_after YEAR value "%s"', $value));
-                    $this->collector->objectYearAfter($value, $field);
-                    $this->operators->push(['type' => sprintf('%s_after_year', $field), 'value' => $value,]);
-                    break;
-                case 'month':
-                    Log::debug(sprintf('Set date_is_after MONTH value "%s"', $value));
-                    $this->collector->objectMonthAfter($value, $field);
-                    $this->operators->push(['type' => sprintf('%s_after_month', $field), 'value' => $value,]);
-                    break;
-                case 'day':
-                    Log::debug(sprintf('Set date_is_after DAY value "%s"', $value));
-                    $this->collector->objectDayAfter($value, $field);
-                    $this->operators->push(['type' => sprintf('%s_after_day', $field), 'value' => $value,]);
+                    Log::debug(sprintf('Set %s_is_exact DAY value "%s"', $field, $value));
+                    $this->collector->objectDayIs($value, $field);
+                    $this->operators->push(['type' => sprintf('%s_on_day', $field), 'value' => $value,]);
                    break;
            }
        }
@@ -1470,14 +1398,12 @@ class OperatorQuerySearch implements SearchInterface
    }

    /**
-     * @param string $field
-     * @param array  $range
-     * @return void
+     * @param array $range
+     *
     * @throws FireflyException
     */
-    private function setExactMetaDateParams(string $field, array $range): void
+    private function setObjectDateAfterParams(string $field, array $range)
    {
-        Log::debug('Now in setExactMetaDateParams()');
        /**
         * @var string        $key
         * @var Carbon|string $value
@@ -1485,28 +1411,102 @@ class OperatorQuerySearch implements SearchInterface
        foreach ($range as $key => $value) {
            switch ($key) {
                default:
-                    throw new FireflyException(sprintf('Cannot handle key "%s" in setExactMetaDateParams()', $key));
+                    throw new FireflyException(sprintf('Cannot handle key "%s" in setDateAfterParams()', $key));
                case 'exact':
-                    Log::debug(sprintf('Set %s_is_exact value "%s"', $field, $value->format('Y-m-d')));
-                    $this->collector->setMetaDateRange($value, $value, $field);
-                    $this->operators->push(['type' => sprintf('%s_on', $field), 'value' => $value->format('Y-m-d'),]);
+                    $this->collector->setObjectAfter($value, $field);
+                    $this->operators->push(['type' => sprintf('%s_after', $field), 'value' => $value->format('Y-m-d'),]);
                    break;
                case 'year':
-                    Log::debug(sprintf('Set %s_is_exact YEAR value "%s"', $field, $value));
-                    $this->collector->metaYearIs($value, $field);
-                    $this->operators->push(['type' => sprintf('%s_on_year', $field), 'value' => $value,]);
+                    Log::debug(sprintf('Set date_is_after YEAR value "%s"', $value));
+                    $this->collector->objectYearAfter($value, $field);
+                    $this->operators->push(['type' => sprintf('%s_after_year', $field), 'value' => $value,]);
                    break;
                case 'month':
-                    Log::debug(sprintf('Set %s_is_exact MONTH value "%s"', $field, $value));
-                    $this->collector->metaMonthIs($value, $field);
-                    $this->operators->push(['type' => sprintf('%s_on_month', $field), 'value' => $value,]);
+                    Log::debug(sprintf('Set date_is_after MONTH value "%s"', $value));
+                    $this->collector->objectMonthAfter($value, $field);
+                    $this->operators->push(['type' => sprintf('%s_after_month', $field), 'value' => $value,]);
                    break;
                case 'day':
-                    Log::debug(sprintf('Set %s_is_exact DAY value "%s"', $field, $value));
-                    $this->collector->metaDayIs($value, $field);
-                    $this->operators->push(['type' => sprintf('%s_on_day', $field), 'value' => $value,]);
+                    Log::debug(sprintf('Set date_is_after DAY value "%s"', $value));
+                    $this->collector->objectDayAfter($value, $field);
+                    $this->operators->push(['type' => sprintf('%s_after_day', $field), 'value' => $value,]);
                    break;
            }
        }
    }
+
+    /**
+     * @inheritDoc
+     * @codeCoverageIgnore
+     */
+    public function searchTime(): float
+    {
+        return microtime(true) - $this->startTime;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function searchTransactions(): LengthAwarePaginator
+    {
+        if (empty($this->getWords()) && empty($this->getOperators())) {
+            return new LengthAwarePaginator([], 0, 5, 1);
+        }
+
+        return $this->collector->getPaginatedGroups();
+    }
+
+    /**
+     * @return array
+     */
+    public function getWords(): array
+    {
+        return $this->words;
+    }
+
+    /**
+     * @param Carbon $date
+     */
+    public function setDate(Carbon $date): void
+    {
+        $this->date = $date;
+    }
+
+    /**
+     * @inheritDoc
+     * @codeCoverageIgnore
+     */
+    public function setPage(int $page): void
+    {
+        $this->page = $page;
+        $this->collector->setPage($this->page);
+    }
+
+    /**
+     * @inheritDoc
+     * @codeCoverageIgnore
+     */
+    public function setUser(User $user): void
+    {
+        $this->accountRepository->setUser($user);
+        $this->billRepository->setUser($user);
+        $this->categoryRepository->setUser($user);
+        $this->budgetRepository->setUser($user);
+        $this->tagRepository->setUser($user);
+        $this->collector = app(GroupCollectorInterface::class);
+        $this->collector->setUser($user);
+        $this->collector->withAccountInformation()->withCategoryInformation()->withBudgetInformation();
+
+        $this->setLimit((int) app('preferences')->getForUser($user, 'listPageSize', 50)->data);
+
+    }
+
+    /**
+     * @param int $limit
+     */
+    public function setLimit(int $limit): void
+    {
+        $this->limit = $limit;
+        $this->collector->setLimit($this->limit);
+    }
 }