kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

New features for rules in search.

Browse Source
This commit is contained in:
James Cole
2020-08-27 07:12:44 +02:00
parent 7df084dd3c
commit 4c81a46af6
9 changed files with 132 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/Repositories/Rule/RuleRepository.php
View File

@@ -27,6 +27,7 @@ use FireflyIII\Models\Rule;
use FireflyIII\Models\RuleAction;
use FireflyIII\Models\RuleGroup;
use FireflyIII\Models\RuleTrigger;
use FireflyIII\Support\Search\OperatorQuerySearch;
use FireflyIII\User;
use Illuminate\Support\Collection;
use Log;
@@ -119,7 +120,7 @@ class RuleRepository implements RuleRepositoryInterface
*/
public function getHighestOrderInRuleGroup(RuleGroup $ruleGroup): int
{
return (int)$ruleGroup->rules()->max('order');
return (int) $ruleGroup->rules()->max('order');
}
/**
@@ -461,8 +462,8 @@ class RuleRepository implements RuleRepositoryInterface
*/
public function duplicate(Rule $rule): Rule
{
$newRule = $rule->replicate();
$newRule->title = (string)trans('firefly.rule_copy_of', ['title' => $rule->title]);
$newRule = $rule->replicate();
$newRule->title = (string) trans('firefly.rule_copy_of', ['title' => $rule->title]);
$newRule->save();
// replicate all triggers
@@ -503,13 +504,13 @@ class RuleRepository implements RuleRepositoryInterface
*/
public function getStoreRules(): Collection
{
$collection = $this->user->rules()->with(['ruleGroup','ruleTriggers'])->get();
$filtered = new Collection;
$collection = $this->user->rules()->with(['ruleGroup', 'ruleTriggers'])->get();
$filtered = new Collection;
/** @var Rule $rule */
foreach($collection as $rule) {
foreach ($collection as $rule) {
/** @var RuleTrigger $ruleTrigger */
foreach($rule->ruleTriggers as $ruleTrigger) {
if('user_action' === $ruleTrigger->trigger_type && 'store-journal' === $ruleTrigger->trigger_value) {
foreach ($rule->ruleTriggers as $ruleTrigger) {
if ('user_action' === $ruleTrigger->trigger_type && 'store-journal' === $ruleTrigger->trigger_value) {
$filtered->push($rule);
}
}
@@ -522,17 +523,33 @@ class RuleRepository implements RuleRepositoryInterface
*/
public function getUpdateRules(): Collection
{
$collection = $this->user->rules()->with(['ruleGroup','ruleTriggers'])->get();
$filtered = new Collection;
$collection = $this->user->rules()->with(['ruleGroup', 'ruleTriggers'])->get();
$filtered = new Collection;
/** @var Rule $rule */
foreach($collection as $rule) {
foreach ($collection as $rule) {
/** @var RuleTrigger $ruleTrigger */
foreach($rule->ruleTriggers as $ruleTrigger) {
if('user_action' === $ruleTrigger->trigger_type && 'update-journal' === $ruleTrigger->trigger_value) {
foreach ($rule->ruleTriggers as $ruleTrigger) {
if ('user_action' === $ruleTrigger->trigger_type && 'update-journal' === $ruleTrigger->trigger_value) {
$filtered->push($rule);
}
}
}
return $filtered;
}
/**
* @inheritDoc
*/
public function getSearchQuery(Rule $rule): string
{
$params = [];
/** @var RuleTrigger $trigger */
foreach ($rule->ruleTriggers as $trigger) {
if ('user_action' !== $trigger->trigger_type) {
$params[] = sprintf('%s:"%s"', OperatorQuerySearch::getRootOperator($trigger->trigger_type), $trigger->trigger_value);
}
}
return implode(' ', $params);
}
}

8
app/Repositories/Rule/RuleRepositoryInterface.php
View File

@@ -39,6 +39,14 @@ interface RuleRepositoryInterface
*/
public function count(): int;
/**
* Return search query for rule.
*
* @param Rule $rule
* @return string
*/
public function getSearchQuery(Rule $rule): string;
/**
* @param Rule $rule
* @param RuleGroup $ruleGroup