IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix https://github.com/firefly-iii/firefly-iii/issues/8467

Browse Source
This commit is contained in:
James Cole 2024-01-28 17:29:25 +01:00
parent 642539e410
commit 4f1187bf6e
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/Support/Export/ExportDataGenerator.php
View File

@ -664,7 +664,11 @@ class ExportDataGenerator
*/ */
private function exportRules(): string private function exportRules(): string
{ {
$header = ['user_id', 'rule_id', 'row_contains', 'created_at', 'updated_at', 'group_id', 'title', 'description', 'order', 'active', 'stop_processing', 'strict', 'trigger_type', 'trigger_value', 'trigger_order', 'trigger_active', 'trigger_stop_processing', 'action_type', 'action_value', 'action_order', 'action_active', 'action_stop_processing']; $header = [
'user_id', 'rule_id', 'row_contains',
'created_at', 'updated_at', 'group_id', 'title', 'description', 'order', 'active', 'stop_processing', 'strict',
'trigger_type', 'trigger_value', 'trigger_order', 'trigger_active', 'trigger_stop_processing',
'action_type', 'action_value', 'action_order', 'action_active', 'action_stop_processing'];
$ruleRepos = app(RuleRepositoryInterface::class); $ruleRepos = app(RuleRepositoryInterface::class);
$ruleRepos->setUser($this->user); $ruleRepos->setUser($this->user);
$rules = $ruleRepos->getAll(); $rules = $ruleRepos->getAll();
@ -672,32 +676,37 @@ class ExportDataGenerator
/** @var Rule $rule */ /** @var Rule $rule */
foreach ($rules as $rule) { foreach ($rules as $rule) {
$records[] = [ $entry = [
$this->user->id, $rule->id, $this->user->id, $rule->id,
'rule', 'rule',
$rule->created_at->toAtomString(), $rule->updated_at->toAtomString(), $rule->ruleGroup->id, $rule->ruleGroup->title, $rule->title, $rule->description, $rule->order, $rule->active, $rule->stop_processing, $rule->strict, $rule->created_at->toAtomString(), $rule->updated_at->toAtomString(), $rule->ruleGroup->id, $rule->ruleGroup->title, $rule->title, $rule->description, $rule->order, $rule->active, $rule->stop_processing, $rule->strict,
null, null, null, null, null, null, null, null, null,
]; ];
$records[] = $entry;
/** @var RuleTrigger $trigger */ /** @var RuleTrigger $trigger */
foreach ($rule->ruleTriggers as $trigger) { foreach ($rule->ruleTriggers as $trigger) {
$records[] = [ $entry = [
$this->user->id, $this->user->id,
$rule->id, $rule->id,
'trigger', 'trigger',
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
$trigger->trigger_type, $trigger->trigger_value, $trigger->order, $trigger->active, $trigger->stop_processing, $trigger->trigger_type, $trigger->trigger_value, $trigger->order, $trigger->active, $trigger->stop_processing,
null, null, null, null, null,
]; ];
$records[] = $entry;
} }
/** @var RuleAction $action */ /** @var RuleAction $action */
foreach ($rule->ruleActions as $action) { foreach ($rule->ruleActions as $action) {
$records[] = [ $entry = [
$this->user->id, $this->user->id,
$rule->id, $rule->id,
'action', 'action',
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
$action->action_type, $action->action_value, $action->order, $action->active, $action->stop_processing, $action->action_type, $action->action_value, $action->order, $action->active, $action->stop_processing,
]; ];
$records[] = $entry;
} }
} }