kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-06-09 03:44:57 +00:00
Code Issues Projects Releases Wiki Activity

Updated search modifiers.

Browse Source
This commit is contained in:
James Cole
2017-02-19 07:38:51 +01:00
parent b5032a7597
commit 1f6180ce5d
2 changed files with 56 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/Support/Search/Search.php
View File

@@ -193,8 +193,9 @@ class Search implements SearchInterface
/** @var JournalCollectorInterface $collector */
$collector = app(JournalCollectorInterface::class);
$collector->setUser($this->user);
$collector->setAllAssetAccounts()->setLimit($pageSize)->setPage($page)->withOpposingAccount();
$set = $collector->getPaginatedJournals();
$collector->setAllAssetAccounts()->setLimit($pageSize)->setPage($page)
->withOpposingAccount()->withCategoryInformation();
$set = $collector->getPaginatedJournals()->getCollection();
$words = $this->words;
Log::debug(sprintf('Found %d journals to check. ', $set->count()));
@@ -292,35 +293,9 @@ class Search implements SearchInterface
return false;
}
// then a for-each and a switch for every possible other thingie.
foreach ($this->modifiers as $modifier) {
switch ($modifier['type']) {
default:
throw new FireflyException(sprintf('Search modifier "%s" is not (yet) supported. Sorry!', $modifier['type']));
break;
case 'amount_is':
$res = Modifier::amountIs($transaction, $modifier['value']);
Log::debug(sprintf('Amount is %s? %s', $modifier['value'], var_export($res, true)));
break;
case 'amount_less':
$res = Modifier::amountLess($transaction, $modifier['value']);
Log::debug(sprintf('Amount less than %s? %s', $modifier['value'], var_export($res, true)));
break;
case 'amount_more':
$res = Modifier::amountMore($transaction, $modifier['value']);
Log::debug(sprintf('Amount more than %s? %s', $modifier['value'], var_export($res, true)));
break;
case 'source':
$res = Modifier::source($transaction, $modifier['value']);
Log::debug(sprintf('Source is %s? %s', $modifier['value'], var_export($res, true)));
break;
case 'destination':
$res = Modifier::destination($transaction, $modifier['value']);
Log::debug(sprintf('Destination is %s? %s', $modifier['value'], var_export($res, true)));
break;
}
$res = Modifier::apply($modifier, $transaction);
if ($res === false) {
return $res;
}