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

Fix meta services for recurrences.

Browse Source
This commit is contained in:
James Cole
2021-03-15 10:31:11 +01:00
parent 1783f0beb1
commit a0b46d9d8a
14 changed files with 553 additions and 525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
app/Services/Internal/Update/RecurrenceUpdateService.php
View File

@@ -114,63 +114,6 @@ class RecurrenceUpdateService
return $recurrence;
}
/**
* TODO this method is way too complex.
*
* @param Recurrence $recurrence
* @param array $transactions
*
* @throws FireflyException
*/
private function updateTransactions(Recurrence $recurrence, array $transactions): void
{
$originalCount = $recurrence->recurrenceTransactions()->count();
if (0 === count($transactions)) {
// wont drop transactions, rather avoid.
return;
}
// user added or removed repetitions, delete all and recreate:
if ($originalCount !== count($transactions)) {
Log::debug('Del + recreate');
$this->deleteTransactions($recurrence);
$this->createTransactions($recurrence, $transactions);
return;
}
// loop all and try to match them:
if ($originalCount === count($transactions)) {
Log::debug('Loop and find');
foreach ($transactions as $current) {
$match = $this->matchTransaction($recurrence, $current);
if (null === $match) {
throw new FireflyException('Cannot match recurring transaction to existing transaction. Not sure what to do. Break.');
}
// TODO find currency
// TODO find foreign currency
// update fields
$fields = [
'source_id' => 'source_id',
'destination_id' => 'destination_id',
'amount' => 'amount',
'foreign_amount' => 'foreign_amount',
'description' => 'description',
];
foreach ($fields as $field => $column) {
if (array_key_exists($field, $current)) {
$match->$column = $current[$field];
$match->save();
}
}
// update meta data
// budget_id
// category_id
// tags
// piggy_bank_id
}
}
}
/**
* @param Recurrence $recurrence
* @param string $text
@@ -272,6 +215,71 @@ class RecurrenceUpdateService
return $query->first();
}
/**
* TODO this method is way too complex.
*
* @param Recurrence $recurrence
* @param array $transactions
*
* @throws FireflyException
*/
private function updateTransactions(Recurrence $recurrence, array $transactions): void
{
$originalCount = $recurrence->recurrenceTransactions()->count();
if (0 === count($transactions)) {
// wont drop transactions, rather avoid.
return;
}
// user added or removed repetitions, delete all and recreate:
if ($originalCount !== count($transactions)) {
Log::debug('Del + recreate');
$this->deleteTransactions($recurrence);
$this->createTransactions($recurrence, $transactions);
return;
}
// loop all and try to match them:
if ($originalCount === count($transactions)) {
Log::debug('Loop and find');
foreach ($transactions as $current) {
$match = $this->matchTransaction($recurrence, $current);
if (null === $match) {
throw new FireflyException('Cannot match recurring transaction to existing transaction. Not sure what to do. Break.');
}
// TODO find currency
// TODO find foreign currency
// update fields
$fields = [
'source_id' => 'source_id',
'destination_id' => 'destination_id',
'amount' => 'amount',
'foreign_amount' => 'foreign_amount',
'description' => 'description',
];
foreach ($fields as $field => $column) {
if (array_key_exists($field, $current)) {
$match->$column = $current[$field];
$match->save();
}
}
// update meta data
if (array_key_exists('budget_id', $current)) {
$this->setBudget($match, (int)$current['budget_id']);
}
if (array_key_exists('category_id', $current)) {
$this->setCategory($match, (int)$current['category_id']);
}
if (array_key_exists('tags', $current)) {
$this->updateTags($match, $current['tags']);
}
if (array_key_exists('piggy_bank_id', $current)) {
$this->updatePiggyBank($match, (int)$current['piggy_bank_id']);
}
}
}
}
/**
* @param array $data
*