kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-05 04:03:26 +00:00
Code Issues Projects Releases Wiki Activity

Simplify function

Browse Source
This commit is contained in:
James Cole
2020-10-23 18:33:06 +02:00
parent cf540bf173
commit 20598d877d
1 changed files with 80 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
app/Services/Internal/Update/GroupUpdateService.php
View File

@@ -40,7 +40,7 @@ class GroupUpdateService
* Update a transaction group. * Update a transaction group.
* *
* @param TransactionGroup $transactionGroup * @param TransactionGroup $transactionGroup
* @param array $data * @param array $data
* *
* @return TransactionGroup * @return TransactionGroup
* @throws FireflyException * @throws FireflyException
@@ -48,6 +48,7 @@ class GroupUpdateService
public function update(TransactionGroup $transactionGroup, array $data): TransactionGroup public function update(TransactionGroup $transactionGroup, array $data): TransactionGroup
{ {
Log::debug('Now in group update service', $data); Log::debug('Now in group update service', $data);
/** @var array $transactions */
$transactions = $data['transactions'] ?? []; $transactions = $data['transactions'] ?? [];
// update group name. // update group name.
if (array_key_exists('group_title', $data)) { if (array_key_exists('group_title', $data)) {
@@ -69,10 +70,85 @@ class GroupUpdateService
Log::debug('Going to update split group.'); Log::debug('Going to update split group.');
$existing = $transactionGroup->transactionJournals->pluck('id')->toArray(); $existing = $transactionGroup->transactionJournals->pluck('id')->toArray();
$updated = []; $updated = $this->updateTransactions($transactionGroup, $transactions);
$result = array_diff($existing, $updated);
if (count($result) > 0) {
/** @var string $deletedId */
foreach ($result as $deletedId) {
/** @var TransactionJournal $journal */
$journal = $transactionGroup->transactionJournals()->find((int)$deletedId);
/** @var JournalDestroyService $service */
$service = app(JournalDestroyService::class);
$service->destroy($journal);
}
}
app('preferences')->mark();
$transactionGroup->refresh();
return $transactionGroup;
}
/**
* @param TransactionGroup $transactionGroup
* @param array $data
*
* @throws FireflyException
*/
private function createTransactionJournal(TransactionGroup $transactionGroup, array $data): void
{
$submission = [
'transactions' => [
$data,
],
];
/** @var TransactionJournalFactory $factory */
$factory = app(TransactionJournalFactory::class);
$factory->setUser($transactionGroup->user);
try {
$collection = $factory->create($submission);
} catch (FireflyException $e) {
Log::error($e->getMessage());
Log::error($e->getTraceAsString());
throw new FireflyException(sprintf('Could not create new transaction journal: %s', $e->getMessage()));
}
$collection->each(
function (TransactionJournal $journal) use ($transactionGroup) {
$transactionGroup->transactionJournals()->save($journal);
}
);
}
/**
* Update single journal.
*
* @param TransactionGroup $transactionGroup
* @param TransactionJournal $journal
* @param array $data
*/
private function updateTransactionJournal(TransactionGroup $transactionGroup, TransactionJournal $journal, array $data): void
{
/** @var JournalUpdateService $updateService */
$updateService = app(JournalUpdateService::class);
$updateService->setTransactionGroup($transactionGroup);
$updateService->setTransactionJournal($journal);
$updateService->setData($data);
$updateService->update();
}
/**
* @param TransactionGroup $transactionGroup
* @param array $transactions
*
* @return array
* @throws FireflyException
*/
private function updateTransactions(TransactionGroup $transactionGroup, array $transactions): array
{
$updated = [];
/** /**
* @var int $index * @var int $index
* @var array $transaction * @var array $transaction
*/ */
foreach ($transactions as $index => $transaction) { foreach ($transactions as $index => $transaction) {
@@ -104,65 +180,8 @@ class GroupUpdateService
Log::debug('Done calling updateTransactionJournal'); Log::debug('Done calling updateTransactionJournal');
} }
} }
$result = array_diff($existing, $updated);
if (count($result) > 0) {
/** @var string $deletedId */
foreach ($result as $deletedId) {
$journal = $transactionGroup->transactionJournals()->find((int)$deletedId);
/** @var JournalDestroyService $service */
$service = app(JournalDestroyService::class);
$service->destroy($journal);
}
}
app('preferences')->mark(); return $updated;
$transactionGroup->refresh();
return $transactionGroup;
}
/**
* @param TransactionGroup $transactionGroup
* @param array $data
* @throws FireflyException
*/
private function createTransactionJournal(TransactionGroup $transactionGroup, array $data): void
{
$submission = [
'transactions' => [
$data,
],
];
/** @var TransactionJournalFactory $factory */
$factory = app(TransactionJournalFactory::class);
$factory->setUser($transactionGroup->user);
try {
$collection = $factory->create($submission);
} catch (FireflyException $e) {
Log::error($e->getMessage());
Log::error($e->getTraceAsString());
throw new FireflyException(sprintf('Could not create new transaction journal: %s', $e->getMessage()));
}
$collection->each(function (TransactionJournal $journal) use ($transactionGroup) {
$transactionGroup->transactionJournals()->save($journal);
});
}
/**
* Update single journal.
*
* @param TransactionGroup $transactionGroup
* @param TransactionJournal $journal
* @param array $data
*/
private function updateTransactionJournal(TransactionGroup $transactionGroup, TransactionJournal $journal, array $data): void
{
/** @var JournalUpdateService $updateService */
$updateService = app(JournalUpdateService::class);
$updateService->setTransactionGroup($transactionGroup);
$updateService->setTransactionJournal($journal);
$updateService->setData($data);
$updateService->update();
} }
} }