Skip to content

Firefly III: a personal finances manager

Remove statistics when creating a new journal.

James Cole8f24ac4fcd5c
diff --git a/app/Handlers/Events/StoredGroupEventHandler.php b/app/Handlers/Events/StoredGroupEventHandler.php
index 367c4b4d09..b5912ad2b9 100644
--- a/app/Handlers/Events/StoredGroupEventHandler.php
+++ b/app/Handlers/Events/StoredGroupEventHandler.php
@@ -28,6 +28,7 @@ use FireflyIII\Events\RequestedSendWebhookMessages;
use FireflyIII\Events\StoredTransactionGroup;
use FireflyIII\Generator\Webhook\MessageGeneratorInterface;
use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\PeriodStatistic\PeriodStatisticRepositoryInterface;
use FireflyIII\Repositories\RuleGroup\RuleGroupRepositoryInterface;
use FireflyIII\Services\Internal\Support\CreditRecalculateService;
use FireflyIII\TransactionRules\Engine\RuleEngineInterface;
@@ -36,6 +37,8 @@ use Illuminate\Support\Facades\Log;
/**
* Class StoredGroupEventHandler
+ *
+ * TODO migrate to observer?
*/
class StoredGroupEventHandler
{
@@ -44,6 +47,7 @@ class StoredGroupEventHandler
$this->processRules($event);
$this->recalculateCredit($event);
$this->triggerWebhooks($event);
+ $this->removePeriodStatistics($event);
}
/**
@@ -58,14 +62,14 @@ class StoredGroupEventHandler
}
Log::debug('Now in StoredGroupEventHandler::processRules()');
- $journals = $storedGroupEvent->transactionGroup->transactionJournals;
- $array = [];
+ $journals = $storedGroupEvent->transactionGroup->transactionJournals;
+ $array = [];
/** @var TransactionJournal $journal */
foreach ($journals as $journal) {
$array[] = $journal->id;
}
- $journalIds = implode(',', $array);
+ $journalIds = implode(',', $array);
Log::debug(sprintf('Add local operator for journal(s): %s', $journalIds));
// collect rules:
@@ -74,10 +78,10 @@ class StoredGroupEventHandler
// add the groups to the rule engine.
// it should run the rules in the group and cancel the group if necessary.
- $groups = $ruleGroupRepository->getRuleGroupsWithRules('store-journal');
+ $groups = $ruleGroupRepository->getRuleGroupsWithRules('store-journal');
// create and fire rule engine.
- $newRuleEngine = app(RuleEngineInterface::class);
+ $newRuleEngine = app(RuleEngineInterface::class);
$newRuleEngine->setUser($storedGroupEvent->transactionGroup->user);
$newRuleEngine->addOperator(['type' => 'journal_id', 'value' => $journalIds]);
$newRuleEngine->setRuleGroups($groups);
@@ -86,7 +90,7 @@ class StoredGroupEventHandler
private function recalculateCredit(StoredTransactionGroup $event): void
{
- $group = $event->transactionGroup;
+ $group = $event->transactionGroup;
/** @var CreditRecalculateService $object */
$object = app(CreditRecalculateService::class);
@@ -94,20 +98,33 @@ class StoredGroupEventHandler
$object->recalculate();
}
+ private function removePeriodStatistics(StoredTransactionGroup $event): void
+ {
+ /** @var PeriodStatisticRepositoryInterface $repository */
+ $repository = app(PeriodStatisticRepositoryInterface::class);
+ /** @var TransactionJournal $journal */
+ foreach ($event->transactionGroup->transactionJournals as $journal) {
+ $source = $journal->transactions()->where('amount', '<', '0')->first();
+ $dest = $journal->transactions()->where('amount', '>', '0')->first();
+ $repository->deleteStatisticsForModel($source->account, $journal->date);
+ $repository->deleteStatisticsForModel($dest->account, $journal->date);
+ }
+ }
+
/**
* This method processes all webhooks that respond to the "stored transaction group" trigger (100)
*/
private function triggerWebhooks(StoredTransactionGroup $storedGroupEvent): void
{
Log::debug(__METHOD__);
- $group = $storedGroupEvent->transactionGroup;
+ $group = $storedGroupEvent->transactionGroup;
if (false === $storedGroupEvent->fireWebhooks) {
Log::info(sprintf('Will not fire webhooks for transaction group #%d', $group->id));
return;
}
- $user = $group->user;
+ $user = $group->user;
/** @var MessageGeneratorInterface $engine */
$engine = app(MessageGeneratorInterface::class);
diff --git a/app/Repositories/PeriodStatistic/PeriodStatisticRepository.php b/app/Repositories/PeriodStatistic/PeriodStatisticRepository.php
index 00da6827ee..9036fa1d7f 100644
--- a/app/Repositories/PeriodStatistic/PeriodStatisticRepository.php
+++ b/app/Repositories/PeriodStatistic/PeriodStatisticRepository.php
@@ -74,4 +74,9 @@ class PeriodStatisticRepository implements PeriodStatisticRepositoryInterface
{
return $model->primaryPeriodStatistics()->where('start', '>=', $start)->where('end', '<=', $end)->get();
}
+
+ public function deleteStatisticsForModel(Model $model, Carbon $date): void
+ {
+ $model->primaryPeriodStatistics()->where('start', '<=', $date)->where('end', '>=', $date)->delete();
+ }
}
diff --git a/app/Repositories/PeriodStatistic/PeriodStatisticRepositoryInterface.php b/app/Repositories/PeriodStatistic/PeriodStatisticRepositoryInterface.php
index d26d85d101..6e4f7cf422 100644
--- a/app/Repositories/PeriodStatistic/PeriodStatisticRepositoryInterface.php
+++ b/app/Repositories/PeriodStatistic/PeriodStatisticRepositoryInterface.php
@@ -37,4 +37,6 @@ interface PeriodStatisticRepositoryInterface
public function saveStatistic(Model $model, int $currencyId, Carbon $start, Carbon $end, string $type, int $count, string $amount): PeriodStatistic;
public function allInRangeForModel(Model $model, Carbon $start, Carbon $end): Collection;
+
+ public function deleteStatisticsForModel(Model $model, Carbon $date): void;
}