Update search.

2025-10-12 23:45:10 +00:00 · 2022-03-27 16:03:50 +02:00
parent 679e72e5e2
commit 980120f1bd
9 changed files with 1164 additions and 174 deletions
--- a/app/Helpers/Collector/Extensions/AmountCollection.php
+++ b/app/Helpers/Collector/Extensions/AmountCollection.php
@@ -86,4 +86,61 @@ trait AmountCollection

        return $this;
    }
+
+    /**
+     * Get transactions with a specific foreign amount.
+     *
+     * @param string $amount
+     *
+     * @return GroupCollectorInterface
+     */
+    public function foreignAmountIs(string $amount): GroupCollectorInterface
+    {
+        $this->query->where(
+            static function (EloquentBuilder $q) use ($amount) {
+                $q->whereNotNull('source.foreign_amount');
+                $q->where('source.foreign_amount', app('steam')->negative($amount));
+            }
+        );
+
+        return $this;
+    }
+
+    /**
+     * Get transactions where the amount is less than.
+     *
+     * @param string $amount
+     *
+     * @return GroupCollectorInterface
+     */
+    public function foreignAmountLess(string $amount): GroupCollectorInterface
+    {
+        $this->query->where(
+            function (EloquentBuilder $q) use ($amount) {
+                $q->whereNotNull('destination.foreign_amount');
+                $q->where('destination.foreign_amount', '<=', app('steam')->positive($amount));
+            }
+        );
+
+        return $this;
+    }
+
+    /**
+     * Get transactions where the amount is more than.
+     *
+     * @param string $amount
+     *
+     * @return GroupCollectorInterface
+     */
+    public function foreignAmountMore(string $amount): GroupCollectorInterface
+    {
+        $this->query->where(
+            function (EloquentBuilder $q) use ($amount) {
+                $q->whereNotNull('destination.foreign_amount');
+                $q->where('destination.foreign_amount', '>=', app('steam')->positive($amount));
+            }
+        );
+
+        return $this;
+    }
 }
--- a/app/Helpers/Collector/Extensions/MetaCollection.php
+++ b/app/Helpers/Collector/Extensions/MetaCollection.php
@@ -51,6 +51,19 @@ trait MetaCollection
        return $this;
    }

+    /**
+     * Join table to get tag information.
+     */
+    protected function joinMetaDataTables(): void
+    {
+        if (false === $this->hasJoinedMetaTables) {
+            $this->hasJoinedMetaTables = true;
+            $this->query->leftJoin('journal_meta', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id');
+            $this->fields[] = 'journal_meta.name as meta_name';
+            $this->fields[] = 'journal_meta.data as meta_data';
+        }
+    }
+
    /**
     * @inheritDoc
     */
@@ -75,75 +88,6 @@ trait MetaCollection
        return $this;
    }

-    /**
-     * Where has no tags.
-     *
-     * @return GroupCollectorInterface
-     */
-    public function hasAnyTag(): GroupCollectorInterface
-    {
-        $this->withTagInformation();
-        $this->query->whereNotNull('tag_transaction_journal.tag_id');
-
-        return $this;
-    }
-
-    /**
-     * @return GroupCollectorInterface
-     */
-    public function withTagInformation(): GroupCollectorInterface
-    {
-        $this->fields[] = 'tags.id as tag_id';
-        $this->fields[] = 'tags.tag as tag_name';
-        $this->fields[] = 'tags.date as tag_date';
-        $this->fields[] = 'tags.description as tag_description';
-        $this->fields[] = 'tags.latitude as tag_latitude';
-        $this->fields[] = 'tags.longitude as tag_longitude';
-        $this->fields[] = 'tags.zoomLevel as tag_zoom_level';
-
-        $this->joinTagTables();
-
-        return $this;
-    }
-
-    /**
-     * Join table to get tag information.
-     */
-    protected function joinTagTables(): void
-    {
-        if (false === $this->hasJoinedTagTables) {
-            // join some extra tables:
-            $this->hasJoinedTagTables = true;
-            $this->query->leftJoin('tag_transaction_journal', 'tag_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id');
-            $this->query->leftJoin('tags', 'tag_transaction_journal.tag_id', '=', 'tags.id');
-        }
-    }
-
-    /**
-     * Join table to get tag information.
-     */
-    protected function joinMetaDataTables(): void
-    {
-        if (false === $this->hasJoinedMetaTables) {
-            $this->hasJoinedMetaTables = true;
-            $this->query->leftJoin('journal_meta', 'transaction_journals.id', '=', 'journal_meta.transaction_journal_id');
-            $this->fields[] = 'journal_meta.name as meta_name';
-            $this->fields[] = 'journal_meta.data as meta_data';
-        }
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function setExternalUrl(string $url): GroupCollectorInterface
-    {
-        $this->joinMetaDataTables();
-        $this->query->where('journal_meta.name', '=', 'external_url');
-        $this->query->where('journal_meta.data', '=', json_encode($url));
-
-        return $this;
-    }
-
    /**
     * @param string $url
     * @return GroupCollectorInterface
@@ -191,6 +135,50 @@ trait MetaCollection
        return $this;
    }

+    /**
+     * Where has no tags.
+     *
+     * @return GroupCollectorInterface
+     */
+    public function hasAnyTag(): GroupCollectorInterface
+    {
+        $this->withTagInformation();
+        $this->query->whereNotNull('tag_transaction_journal.tag_id');
+
+        return $this;
+    }
+
+    /**
+     * @return GroupCollectorInterface
+     */
+    public function withTagInformation(): GroupCollectorInterface
+    {
+        $this->fields[] = 'tags.id as tag_id';
+        $this->fields[] = 'tags.tag as tag_name';
+        $this->fields[] = 'tags.date as tag_date';
+        $this->fields[] = 'tags.description as tag_description';
+        $this->fields[] = 'tags.latitude as tag_latitude';
+        $this->fields[] = 'tags.longitude as tag_longitude';
+        $this->fields[] = 'tags.zoomLevel as tag_zoom_level';
+
+        $this->joinTagTables();
+
+        return $this;
+    }
+
+    /**
+     * Join table to get tag information.
+     */
+    protected function joinTagTables(): void
+    {
+        if (false === $this->hasJoinedTagTables) {
+            // join some extra tables:
+            $this->hasJoinedTagTables = true;
+            $this->query->leftJoin('tag_transaction_journal', 'tag_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id');
+            $this->query->leftJoin('tags', 'tag_transaction_journal.tag_id', '=', 'tags.id');
+        }
+    }
+
    /**
     * @inheritDoc
     */
@@ -472,11 +460,11 @@ trait MetaCollection
    /**
     * @inheritDoc
     */
-    public function setRecurrenceId(string $recurringId): GroupCollectorInterface
+    public function setExternalUrl(string $url): GroupCollectorInterface
    {
        $this->joinMetaDataTables();
-        $this->query->where('journal_meta.name', '=', 'recurrence_id');
-        $this->query->where('journal_meta.data', '=', sprintf('%s', json_encode($recurringId)));
+        $this->query->where('journal_meta.name', '=', 'external_url');
+        $this->query->where('journal_meta.data', '=', json_encode($url));

        return $this;
    }
@@ -494,6 +482,18 @@ trait MetaCollection
        return $this;
    }

+    /**
+     * @inheritDoc
+     */
+    public function setRecurrenceId(string $recurringId): GroupCollectorInterface
+    {
+        $this->joinMetaDataTables();
+        $this->query->where('journal_meta.name', '=', 'recurrence_id');
+        $this->query->where('journal_meta.data', '=', sprintf('%s', json_encode($recurringId)));
+
+        return $this;
+    }
+
    /**
     * Limit results to a specific tag.
     *
--- a/app/Helpers/Collector/Extensions/TimeCollection.php
+++ b/app/Helpers/Collector/Extensions/TimeCollection.php
@@ -32,25 +32,245 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
 */
 trait TimeCollection
 {
-
+    /**
+     * @param string $day
+     * @return GroupCollectorInterface
+     */
    public function dayAfter(string $day): GroupCollectorInterface
    {
        $this->query->whereDay('transaction_journals.date', '>=', $day);
        return $this;
    }

+    /**
+     * @param string $day
+     * @return GroupCollectorInterface
+     */
    public function dayBefore(string $day): GroupCollectorInterface
    {
        $this->query->whereDay('transaction_journals.date', '<=', $day);
        return $this;
    }

+    /**
+     * @param string $day
+     * @return GroupCollectorInterface
+     */
    public function dayIs(string $day): GroupCollectorInterface
    {
        $this->query->whereDay('transaction_journals.date', '=', $day);
        return $this;
    }

+    /**
+     * @param string $day
+     * @param string $field
+     * @return GroupCollectorInterface
+     */
+    public function metaDayAfter(string $day, string $field): GroupCollectorInterface
+    {
+        $this->withMetaDate($field);
+        $filter              = function (int $index, array $object) use ($field, $day): bool {
+            foreach ($object['transactions'] as $transaction) {
+                if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
+                ) {
+                    return $transaction[$field]->day >= (int) $day;
+                }
+            }
+
+            return true;
+        };
+        $this->postFilters[] = $filter;
+
+        return $this;
+    }
+
+    /**
+     * @param string $day
+     * @param string $field
+     * @return GroupCollectorInterface
+     */
+    public function metaDayBefore(string $day, string $field): GroupCollectorInterface
+    {
+        $this->withMetaDate($field);
+        $filter              = function (int $index, array $object) use ($field, $day): bool {
+            foreach ($object['transactions'] as $transaction) {
+                if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
+                ) {
+                    return $transaction[$field]->day <= (int) $day;
+                }
+            }
+
+            return true;
+        };
+        $this->postFilters[] = $filter;
+
+        return $this;
+    }
+
+    /**
+     * @param string $day
+     * @param string $field
+     * @return GroupCollectorInterface
+     */
+    public function metaDayIs(string $day, string $field): GroupCollectorInterface
+    {
+        $this->withMetaDate($field);
+        $filter              = function (int $index, array $object) use ($field, $day): bool {
+            foreach ($object['transactions'] as $transaction) {
+                if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
+                ) {
+                    return (int) $day === $transaction[$field]->day;
+                }
+            }
+
+            return false;
+        };
+        $this->postFilters[] = $filter;
+        return $this;
+    }
+
+    /**
+     * @param string $month
+     * @param string $field
+     * @return GroupCollectorInterface
+     */
+    public function metaMonthAfter(string $month, string $field): GroupCollectorInterface
+    {
+        $this->withMetaDate($field);
+        $filter              = function (int $index, array $object) use ($field, $month): bool {
+            foreach ($object['transactions'] as $transaction) {
+                if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
+                ) {
+                    return $transaction[$field]->month >= (int) $month;
+                }
+            }
+
+            return true;
+        };
+        $this->postFilters[] = $filter;
+
+        return $this;
+    }
+
+    /**
+     * @param string $month
+     * @param string $field
+     * @return GroupCollectorInterface
+     */
+    public function metaMonthBefore(string $month, string $field): GroupCollectorInterface
+    {
+        $this->withMetaDate($field);
+        $filter              = function (int $index, array $object) use ($field, $month): bool {
+            foreach ($object['transactions'] as $transaction) {
+                if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
+                ) {
+                    return $transaction[$field]->month <= (int) $month;
+                }
+            }
+
+            return true;
+        };
+        $this->postFilters[] = $filter;
+
+        return $this;
+    }
+
+    /**
+     * @param string $month
+     * @param string $field
+     * @return GroupCollectorInterface
+     */
+    public function metaMonthIs(string $month, string $field): GroupCollectorInterface
+    {
+        $this->withMetaDate($field);
+        $filter              = function (int $index, array $object) use ($field, $month): bool {
+            foreach ($object['transactions'] as $transaction) {
+                if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
+                ) {
+                    return (int) $month === $transaction[$field]->month;
+                }
+            }
+
+            return false;
+        };
+        $this->postFilters[] = $filter;
+        return $this;
+    }
+
+    /**
+     * @param string $year
+     * @param string $field
+     * @return GroupCollectorInterface
+     */
+    public function metaYearAfter(string $year, string $field): GroupCollectorInterface
+    {
+        $this->withMetaDate($field);
+        $filter              = function (int $index, array $object) use ($field, $year): bool {
+            foreach ($object['transactions'] as $transaction) {
+                if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
+                ) {
+                    return $transaction[$field]->year >= (int) $year;
+                }
+            }
+
+            return true;
+        };
+        $this->postFilters[] = $filter;
+
+        return $this;
+    }
+
+    /**
+     * @param string $year
+     * @param string $field
+     * @return GroupCollectorInterface
+     */
+    public function metaYearBefore(string $year, string $field): GroupCollectorInterface
+    {
+        $this->withMetaDate($field);
+        $filter              = function (int $index, array $object) use ($field, $year): bool {
+            foreach ($object['transactions'] as $transaction) {
+                if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
+                ) {
+                    return $transaction[$field]->year <= (int) $year;
+                }
+            }
+
+            return true;
+        };
+        $this->postFilters[] = $filter;
+
+        return $this;
+    }
+
+    /**
+     * @param string $year
+     * @param string $field
+     * @return GroupCollectorInterface
+     */
+    public function metaYearIs(string $year, string $field): GroupCollectorInterface
+    {
+        $this->withMetaDate($field);
+        $filter              = function (int $index, array $object) use ($field, $year): bool {
+            foreach ($object['transactions'] as $transaction) {
+                if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
+                ) {
+                    return $year === (string) $transaction[$field]->year;
+                }
+            }
+
+            return true;
+        };
+        $this->postFilters[] = $filter;
+
+        return $this;
+    }
+
+    /**
+     * @param string $month
+     * @return GroupCollectorInterface
+     */
    public function monthAfter(string $month): GroupCollectorInterface
    {
        $this->query->whereMonth('transaction_journals.date', '>=', $month);
@@ -58,6 +278,10 @@ trait TimeCollection

    }

+    /**
+     * @param string $month
+     * @return GroupCollectorInterface
+     */
    public function monthBefore(string $month): GroupCollectorInterface
    {
        $this->query->whereMonth('transaction_journals.date', '<=', $month);
@@ -65,11 +289,113 @@ trait TimeCollection

    }

+    /**
+     * @param string $month
+     * @return GroupCollectorInterface
+     */
    public function monthIs(string $month): GroupCollectorInterface
    {
        $this->query->whereMonth('transaction_journals.date', '=', $month);
        return $this;
+    }

+    /**
+     * @param string $day
+     * @param string $field
+     * @return GroupCollectorInterface
+     */
+    public function objectDayAfter(string $day, string $field): GroupCollectorInterface
+    {
+        $this->query->whereDay(sprintf('transaction_journals.%s', $field), '>=', $day);
+        return $this;
+    }
+
+    /**
+     * @param string $day
+     * @param string $field
+     * @return GroupCollectorInterface
+     */
+    public function objectDayBefore(string $day, string $field): GroupCollectorInterface
+    {
+        $this->query->whereDay(sprintf('transaction_journals.%s', $field), '<=', $day);
+        return $this;
+    }
+
+    /**
+     * @param string $day
+     * @param string $field
+     * @return GroupCollectorInterface
+     */
+    public function objectDayIs(string $day, string $field): GroupCollectorInterface
+    {
+        $this->query->whereDay(sprintf('transaction_journals.%s', $field), '=', $day);
+        return $this;
+    }
+
+    /**
+     * @param string $month
+     * @param string $field
+     * @return GroupCollectorInterface
+     */
+    public function objectMonthAfter(string $month, string $field): GroupCollectorInterface
+    {
+        $this->query->whereMonth(sprintf('transaction_journals.%s', $field), '>=', $month);
+        return $this;
+    }
+
+    /**
+     * @param string $month
+     * @param string $field
+     * @return GroupCollectorInterface
+     */
+    public function objectMonthBefore(string $month, string $field): GroupCollectorInterface
+    {
+        $this->query->whereMonth(sprintf('transaction_journals.%s', $field), '<=', $month);
+        return $this;
+    }
+
+    /**
+     * @param string $month
+     * @param string $field
+     * @return GroupCollectorInterface
+     */
+    public function objectMonthIs(string $month, string $field): GroupCollectorInterface
+    {
+        $this->query->whereMonth(sprintf('transaction_journals.%s', $field), '=', $month);
+        return $this;
+    }
+
+    /**
+     * @param string $year
+     * @param string $field
+     * @return GroupCollectorInterface
+     */
+    public function objectYearAfter(string $year, string $field): GroupCollectorInterface
+    {
+        $this->query->whereYear(sprintf('transaction_journals.%s', $field), '>=', $year);
+        return $this;
+    }
+
+    /**
+     * @param string $year
+     * @param string $field
+     * @return GroupCollectorInterface
+     */
+    public function objectYearBefore(string $year, string $field): GroupCollectorInterface
+    {
+        $this->query->whereYear(sprintf('transaction_journals.%s', $field), '<=', $year);
+        return $this;
+    }
+
+    /**
+     * @param string $year
+     * @param string $field
+     * @return GroupCollectorInterface
+     */
+    public function objectYearIs(string $year, string $field): GroupCollectorInterface
+    {
+        $this->query->whereYear(sprintf('transaction_journals.%s', $field), '=', $year);
+        return $this;
    }

    /**
@@ -120,24 +446,60 @@ trait TimeCollection
    }

    /**
-     * Set the start and end time of the results to return.
-     *
-     * @param Carbon $start
-     * @param Carbon $end
-     *
+     * @param Carbon $date
+     * @param string $field
     * @return GroupCollectorInterface
     */
-    public function setRange(Carbon $start, Carbon $end): GroupCollectorInterface
+    public function setMetaAfter(Carbon $date, string $field): GroupCollectorInterface
    {
-        if ($end < $start) {
-            [$start, $end] = [$end, $start];
-        }
-        // always got to end of day / start of day for ranges.
-        $startStr = $start->format('Y-m-d 00:00:00');
-        $endStr   = $end->format('Y-m-d 23:59:59');
+        $this->withMetaDate($field);
+        $date->startOfDay();
+        $filter              = function (int $index, array $object) use ($field, $date): bool {
+            foreach ($object['transactions'] as $transaction) {
+                if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
+                ) {
+                    return $transaction[$field]->gte($date);
+                }
+            }

-        $this->query->where('transaction_journals.date', '>=', $startStr);
-        $this->query->where('transaction_journals.date', '<=', $endStr);
+            return true;
+        };
+        $this->postFilters[] = $filter;
+
+        return $this;
+    }
+
+    /**
+     * @param Carbon $date
+     * @param string $field
+     * @return GroupCollectorInterface
+     */
+    public function setMetaBefore(Carbon $date, string $field): GroupCollectorInterface
+    {
+        $this->withMetaDate($field);
+        $filter              = function (int $index, array $object) use ($field, $date): bool {
+            foreach ($object['transactions'] as $transaction) {
+                if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
+                ) {
+                    return $transaction[$field]->lte($date);
+                }
+            }
+
+            return true;
+        };
+        $this->postFilters[] = $filter;
+
+        return $this;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function withMetaDate(string $field): GroupCollectorInterface
+    {
+        $this->joinMetaDataTables();
+        $this->query->where('journal_meta.name', '=', $field);
+        $this->query->whereNotNull('journal_meta.data');

        return $this;
    }
@@ -160,13 +522,13 @@ trait TimeCollection

        $filter              = function (int $index, array $object) use ($field, $start, $end): bool {
            foreach ($object['transactions'] as $transaction) {
-                if (array_key_exists('interest_date', $transaction) && $transaction['interest_date'] instanceof Carbon
+                if (array_key_exists($field, $transaction) && $transaction[$field] instanceof Carbon
                ) {
-                    return $transaction['interest_date']->gte($start) && $transaction['interest_date']->lte($end);
+                    return $transaction[$field]->gte($start) && $transaction[$field]->lte($end);
                }
            }

-            return true;
+            return false;
        };
        $this->postFilters[] = $filter;
        return $this;
@@ -174,13 +536,63 @@ trait TimeCollection
    }

    /**
-     * @inheritDoc
+     * @param Carbon $date
+     * @param string $field
+     * @return GroupCollectorInterface
     */
-    public function withMetaDate(string $field): GroupCollectorInterface
+    public function setObjectAfter(Carbon $date, string $field): GroupCollectorInterface
    {
-        $this->joinMetaDataTables();
-        $this->query->where('journal_meta.name', '=', $field);
-        $this->query->whereNotNull('journal_meta.data');
+        $afterStr = $date->format('Y-m-d 00:00:00');
+        $this->query->where(sprintf('transaction_journals.%s', $field), '>=', $afterStr);
+
+        return $this;
+    }
+
+    /**
+     * @param Carbon $date
+     * @param string $field
+     * @return GroupCollectorInterface
+     */
+    public function setObjectBefore(Carbon $date, string $field): GroupCollectorInterface
+    {
+        die('a');
+    }
+
+    /**
+     * @param Carbon $start
+     * @param Carbon $end
+     * @param string $field
+     * @return GroupCollectorInterface
+     */
+    public function setObjectRange(Carbon $start, Carbon $end, string $field): GroupCollectorInterface
+    {
+        $after  = $start->format('Y-m-d 00:00:00');
+        $before = $end->format('Y-m-d 23:59:59');
+        $this->query->where(sprintf('transaction_journals.%s', $field), '>=', $after);
+        $this->query->where(sprintf('transaction_journals.%s', $field), '<=', $before);
+
+        return $this;
+    }
+
+    /**
+     * Set the start and end time of the results to return.
+     *
+     * @param Carbon $start
+     * @param Carbon $end
+     *
+     * @return GroupCollectorInterface
+     */
+    public function setRange(Carbon $start, Carbon $end): GroupCollectorInterface
+    {
+        if ($end < $start) {
+            [$start, $end] = [$end, $start];
+        }
+        // always got to end of day / start of day for ranges.
+        $startStr = $start->format('Y-m-d 00:00:00');
+        $endStr   = $end->format('Y-m-d 23:59:59');
+
+        $this->query->where('transaction_journals.date', '>=', $startStr);
+        $this->query->where('transaction_journals.date', '<=', $endStr);

        return $this;
    }
@@ -219,4 +631,5 @@ trait TimeCollection
        $this->query->whereYear('transaction_journals.date', '=', $year);
        return $this;
    }
+
 }