kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-05-05 05:33:36 +00:00
Code Issues Projects Releases Wiki Activity

🤖 Auto commit for release 'develop' on 2026-01-23

Browse Source
This commit is contained in:
JC5
2026-01-23 15:14:29 +01:00
parent 8f15a32bd6
commit eeeba86d38
888 changed files with 10732 additions and 10387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,14 +61,14 @@ class RuleRepository implements RuleRepositoryInterface, UserGroupInterface
public function duplicate(Rule $rule): Rule
{
$newRule = $rule->replicate();
$newRule = $rule->replicate();
$newRule->title = (string) trans('firefly.rule_copy_of', ['title' => $rule->title]);
$newRule->save();
// replicate all triggers
/** @var RuleTrigger $trigger */
foreach ($rule->ruleTriggers as $trigger) {
$newTrigger = $trigger->replicate();
$newTrigger = $trigger->replicate();
$newTrigger->rule_id = $newRule->id;
$newTrigger->save();
}
@@ -76,7 +76,7 @@ class RuleRepository implements RuleRepositoryInterface, UserGroupInterface
// replicate all actions
/** @var RuleAction $action */
foreach ($rule->ruleActions as $action) {
$newAction = $action->replicate();
$newAction = $action->replicate();
$newAction->rule_id = $newRule->id;
$newAction->save();
}
@@ -92,7 +92,8 @@ class RuleRepository implements RuleRepositoryInterface, UserGroupInterface
return $this->user
->rules()
->with(['ruleGroup'])
->get();
->get()
;
}
/**
@@ -116,7 +117,7 @@ class RuleRepository implements RuleRepositoryInterface, UserGroupInterface
{
$count = $rule->ruleTriggers()->count();
if (0 === $count) {
throw new FireflyException('Rules should have more than zero triggers, rule #' . $rule->id . ' has none!');
throw new FireflyException('Rules should have more than zero triggers, rule #'.$rule->id.' has none!');
}
return $rule->ruleTriggers()->where('trigger_type', 'user_action')->first()->trigger_value;
@@ -146,7 +147,7 @@ class RuleRepository implements RuleRepositoryInterface, UserGroupInterface
if ('user_action' === $trigger->trigger_type) {
continue;
}
$triggerType = $trigger->trigger_type;
$triggerType = $trigger->trigger_type;
if (str_starts_with((string) $trigger->trigger_type, '-')) {
$triggerType = substr((string) $trigger->trigger_type, 1);
}
@@ -173,7 +174,8 @@ class RuleRepository implements RuleRepositoryInterface, UserGroupInterface
->orderBy('rules.order', 'ASC')
->orderBy('rules.id', 'ASC')
->with(['ruleGroup', 'ruleTriggers'])
->get(['rules.*']);
->get(['rules.*'])
;
$filtered = new Collection();
/** @var Rule $rule */
@@ -200,7 +202,8 @@ class RuleRepository implements RuleRepositoryInterface, UserGroupInterface
->orderBy('rules.order', 'ASC')
->orderBy('rules.id', 'ASC')
->with(['ruleGroup', 'ruleTriggers'])
->get();
->get()
;
$filtered = new Collection();
/** @var Rule $rule */
@@ -232,7 +235,7 @@ class RuleRepository implements RuleRepositoryInterface, UserGroupInterface
*/
public function store(array $data): Rule
{
$ruleGroup = null;
$ruleGroup = null;
if (array_key_exists('rule_group_id', $data)) {
$ruleGroup = $this->user->ruleGroups()->find($data['rule_group_id']);
}
@@ -240,7 +243,8 @@ class RuleRepository implements RuleRepositoryInterface, UserGroupInterface
$ruleGroup = $this->user
->ruleGroups()
->where('title', $data['rule_group_title'])
->first();
->first()
;
}
if (null === $ruleGroup) {
throw new FireflyException('No such rule group.');
@@ -249,17 +253,17 @@ class RuleRepository implements RuleRepositoryInterface, UserGroupInterface
/** @var RuleGroup $ruleGroup */
// start by creating a new rule:
$rule = new Rule();
$rule = new Rule();
$rule->user()->associate($this->user);
$rule->userGroup()->associate($this->user->userGroup);
$rule->rule_group_id = $ruleGroup->id;
$rule->order = 31337;
$rule->active = array_key_exists('active', $data) ? $data['active'] : true;
$rule->strict = array_key_exists('strict', $data) ? $data['strict'] : false;
$rule->rule_group_id = $ruleGroup->id;
$rule->order = 31337;
$rule->active = array_key_exists('active', $data) ? $data['active'] : true;
$rule->strict = array_key_exists('strict', $data) ? $data['strict'] : false;
$rule->stop_processing = array_key_exists('stop_processing', $data) ? $data['stop_processing'] : false;
$rule->title = array_key_exists('title', $data) ? $data['title'] : '';
$rule->description = array_key_exists('description', $data) ? $data['description'] : '';
$rule->title = array_key_exists('title', $data) ? $data['title'] : '';
$rule->description = array_key_exists('description', $data) ? $data['description'] : '';
$rule->save();
$rule->refresh();
@@ -284,7 +288,7 @@ class RuleRepository implements RuleRepositoryInterface, UserGroupInterface
return $rule;
}
public function find(int $ruleId): null|Rule
public function find(int $ruleId): ?Rule
{
/** @var null|Rule */
return $this->user->rules()->find($ruleId);
@@ -293,19 +297,19 @@ class RuleRepository implements RuleRepositoryInterface, UserGroupInterface
private function setRuleTrigger(string $moment, Rule $rule): void
{
/** @var null|RuleTrigger $trigger */
$trigger = $rule->ruleTriggers()->where('trigger_type', 'user_action')->first();
$trigger = $rule->ruleTriggers()->where('trigger_type', 'user_action')->first();
if (null !== $trigger) {
$trigger->trigger_value = $moment;
$trigger->save();
return;
}
$trigger = new RuleTrigger();
$trigger->order = 0;
$trigger->trigger_type = 'user_action';
$trigger->trigger_value = $moment;
$trigger->rule_id = $rule->id;
$trigger->active = true;
$trigger = new RuleTrigger();
$trigger->order = 0;
$trigger->trigger_type = 'user_action';
$trigger->trigger_value = $moment;
$trigger->rule_id = $rule->id;
$trigger->active = true;
$trigger->stop_processing = false;
$trigger->save();
}
@@ -321,10 +325,10 @@ class RuleRepository implements RuleRepositoryInterface, UserGroupInterface
public function setOrder(Rule $rule, int $newOrder): void
{
$oldOrder = $rule->order;
$groupId = $rule->rule_group_id;
$maxOrder = $this->maxOrder($rule->ruleGroup);
$newOrder = $newOrder > $maxOrder ? $maxOrder + 1 : $newOrder;
$oldOrder = $rule->order;
$groupId = $rule->rule_group_id;
$maxOrder = $this->maxOrder($rule->ruleGroup);
$newOrder = $newOrder > $maxOrder ? $maxOrder + 1 : $newOrder;
Log::debug(sprintf('New order will be %d', $newOrder));
if ($newOrder > $oldOrder) {
@@ -334,7 +338,8 @@ class RuleRepository implements RuleRepositoryInterface, UserGroupInterface
->where('rules.order', '<=', $newOrder)
->where('rules.order', '>', $oldOrder)
->where('rules.id', '!=', $rule->id)
->decrement('rules.order');
->decrement('rules.order')
;
$rule->order = $newOrder;
Log::debug(sprintf('Order of rule #%d ("%s") is now %d', $rule->id, $rule->title, $newOrder));
$rule->save();
@@ -348,7 +353,8 @@ class RuleRepository implements RuleRepositoryInterface, UserGroupInterface
->where('rules.order', '>=', $newOrder)
->where('rules.order', '<', $oldOrder)
->where('rules.id', '!=', $rule->id)
->increment('rules.order');
->increment('rules.order')
;
$rule->order = $newOrder;
Log::debug(sprintf('Order of rule #%d ("%s") is now %d', $rule->id, $rule->title, $newOrder));
$rule->save();
@@ -373,7 +379,7 @@ class RuleRepository implements RuleRepositoryInterface, UserGroupInterface
// empty the value in case the rule needs no context
// TODO create a helper to automatically return these.
$needTrue = [
$needTrue = [
'reconciled',
'has_attachments',
'has_any_category',
@@ -394,18 +400,18 @@ class RuleRepository implements RuleRepositoryInterface, UserGroupInterface
'account_is_cash',
'exists',
'no_external_id',
'any_external_id'
'any_external_id',
];
if (in_array($type, $needTrue, true)) {
$value = '';
}
$triggerValues = [
$triggerValues = [
'action' => $type,
'value' => $value,
'stop_processing' => $stopProcessing,
'order' => $order,
'active' => $active
'active' => $active,
];
$this->storeTrigger($rule, $triggerValues);
++$order;
@@ -414,13 +420,13 @@ class RuleRepository implements RuleRepositoryInterface, UserGroupInterface
public function storeTrigger(Rule $rule, array $values): RuleTrigger
{
$ruleTrigger = new RuleTrigger();
$ruleTrigger = new RuleTrigger();
$ruleTrigger->rule()->associate($rule);
$ruleTrigger->order = $values['order'];
$ruleTrigger->active = $values['active'];
$ruleTrigger->order = $values['order'];
$ruleTrigger->active = $values['active'];
$ruleTrigger->stop_processing = $values['stop_processing'];
$ruleTrigger->trigger_type = $values['action'];
$ruleTrigger->trigger_value = $values['value'] ?? '';
$ruleTrigger->trigger_type = $values['action'];
$ruleTrigger->trigger_value = $values['value'] ?? '';
$ruleTrigger->save();
return $ruleTrigger;
@@ -438,7 +444,7 @@ class RuleRepository implements RuleRepositoryInterface, UserGroupInterface
'value' => $value,
'stop_processing' => $stopProcessing,
'order' => $order,
'active' => $active
'active' => $active,
];
$this->storeAction($rule, $actionValues);
++$order;
@@ -447,13 +453,13 @@ class RuleRepository implements RuleRepositoryInterface, UserGroupInterface
public function storeAction(Rule $rule, array $values): RuleAction
{
$ruleAction = new RuleAction();
$ruleAction = new RuleAction();
$ruleAction->rule()->associate($rule);
$ruleAction->order = $values['order'];
$ruleAction->active = $values['active'];
$ruleAction->order = $values['order'];
$ruleAction->active = $values['active'];
$ruleAction->stop_processing = $values['stop_processing'];
$ruleAction->action_type = $values['action'];
$ruleAction->action_value = $values['value'] ?? '';
$ruleAction->action_type = $values['action'];
$ruleAction->action_value = $values['value'] ?? '';
$ruleAction->save();
return $ruleAction;
@@ -470,7 +476,7 @@ class RuleRepository implements RuleRepositoryInterface, UserGroupInterface
}
$rule->save();
$rule->refresh();
$group = $rule->ruleGroup;
$group = $rule->ruleGroup;
// update the order:
$this->resetRuleOrder($group);
if (array_key_exists('order', $data)) {