PHPStorm can order methods by alphabet, who knew.

app/Services/Internal/Support/AccountServiceTrait.php

@@ -507,6 +507,52 @@ trait AccountServiceTrait
         return $group;
     }
 
+    /**
+     * TODO refactor to "getfirstjournal"
+     *
+     * @throws FireflyException
+     */
+    private function getObJournal(TransactionGroup $group): TransactionJournal
+    {
+        /** @var null|TransactionJournal $journal */
+        $journal = $group->transactionJournals()->first();
+        if (null === $journal) {
+            throw new FireflyException(sprintf('Group #%d has no OB journal', $group->id));
+        }
+
+        return $journal;
+    }
+
+    /**
+     * TODO Rename to getOpposingTransaction
+     *
+     * @throws FireflyException
+     */
+    private function getOBTransaction(TransactionJournal $journal, Account $account): Transaction
+    {
+        /** @var null|Transaction $transaction */
+        $transaction = $journal->transactions()->where('account_id', '!=', $account->id)->first();
+        if (null === $transaction) {
+            throw new FireflyException(sprintf('Could not get OB transaction for journal #%d', $journal->id));
+        }
+
+        return $transaction;
+    }
+
+    /**
+     * @throws FireflyException
+     */
+    private function getNotOBTransaction(TransactionJournal $journal, Account $account): Transaction
+    {
+        /** @var null|Transaction $transaction */
+        $transaction = $journal->transactions()->where('account_id', $account->id)->first();
+        if (null === $transaction) {
+            throw new FireflyException(sprintf('Could not get non-OB transaction for journal #%d', $journal->id));
+        }
+
+        return $transaction;
+    }
+
     /**
      * Update or create the opening balance group.
      * Since opening balance and date can still be empty strings, it may fail.
@@ -657,50 +703,4 @@ trait AccountServiceTrait
 
         return $group;
     }
-
-    /**
-     * TODO refactor to "getfirstjournal"
-     *
-     * @throws FireflyException
-     */
-    private function getObJournal(TransactionGroup $group): TransactionJournal
-    {
-        /** @var null|TransactionJournal $journal */
-        $journal = $group->transactionJournals()->first();
-        if (null === $journal) {
-            throw new FireflyException(sprintf('Group #%d has no OB journal', $group->id));
-        }
-
-        return $journal;
-    }
-
-    /**
-     * TODO Rename to getOpposingTransaction
-     *
-     * @throws FireflyException
-     */
-    private function getOBTransaction(TransactionJournal $journal, Account $account): Transaction
-    {
-        /** @var null|Transaction $transaction */
-        $transaction = $journal->transactions()->where('account_id', '!=', $account->id)->first();
-        if (null === $transaction) {
-            throw new FireflyException(sprintf('Could not get OB transaction for journal #%d', $journal->id));
-        }
-
-        return $transaction;
-    }
-
-    /**
-     * @throws FireflyException
-     */
-    private function getNotOBTransaction(TransactionJournal $journal, Account $account): Transaction
-    {
-        /** @var null|Transaction $transaction */
-        $transaction = $journal->transactions()->where('account_id', $account->id)->first();
-        if (null === $transaction) {
-            throw new FireflyException(sprintf('Could not get non-OB transaction for journal #%d', $journal->id));
-        }
-
-        return $transaction;
-    }
 }

app/Services/Internal/Support/CreditRecalculateService.php

@@ -73,16 +73,6 @@ class CreditRecalculateService
         $this->processWork();
     }
 
-    public function setAccount(?Account $account): void
-    {
-        $this->account = $account;
-    }
-
-    public function setGroup(TransactionGroup $group): void
-    {
-        $this->group = $group;
-    }
-
     private function processGroup(): void
     {
         /** @var TransactionJournal $journal */
@@ -171,7 +161,7 @@ class CreditRecalculateService
         app('log')->debug(sprintf('Now processing account #%d ("%s"). All amounts with 2 decimals!', $account->id, $account->name));
         // get opening balance (if present)
         $this->repository->setUser($account->user);
-        $direction      = (string) $this->repository->getMetaValue($account, 'liability_direction');
+        $direction      = (string)$this->repository->getMetaValue($account, 'liability_direction');
         $openingBalance = $this->repository->getOpeningBalance($account);
         if (null !== $openingBalance) {
             app('log')->debug(sprintf('Found opening balance transaction journal #%d', $openingBalance->id));
@@ -461,4 +451,14 @@ class CreditRecalculateService
     {
         return TransactionType::TRANSFER === $transactionType && -1 === bccomp($amount, '0');
     }
+
+    public function setAccount(?Account $account): void
+    {
+        $this->account = $account;
+    }
+
+    public function setGroup(TransactionGroup $group): void
+    {
+        $this->group = $group;
+    }
 }

app/Services/Internal/Support/JournalServiceTrait.php

@@ -110,124 +110,6 @@ trait JournalServiceTrait
         return $result;
     }
 
-    /**
-     * @throws FireflyException
-     */
-    protected function getAmount(string $amount): string
-    {
-        if ('' === $amount) {
-            throw new FireflyException(sprintf('The amount cannot be an empty string: "%s"', $amount));
-        }
-        app('log')->debug(sprintf('Now in getAmount("%s")', $amount));
-        if (0 === bccomp('0', $amount)) {
-            throw new FireflyException(sprintf('The amount seems to be zero: "%s"', $amount));
-        }
-
-        return $amount;
-    }
-
-    protected function getForeignAmount(?string $amount): ?string
-    {
-        if (null === $amount) {
-            app('log')->debug('No foreign amount info in array. Return NULL');
-
-            return null;
-        }
-        if ('' === $amount) {
-            app('log')->debug('Foreign amount is empty string, return NULL.');
-
-            return null;
-        }
-        if (0 === bccomp('0', $amount)) {
-            app('log')->debug('Foreign amount is 0.0, return NULL.');
-
-            return null;
-        }
-        app('log')->debug(sprintf('Foreign amount is %s', $amount));
-
-        return $amount;
-    }
-
-    protected function storeBudget(TransactionJournal $journal, NullArrayObject $data): void
-    {
-        if (TransactionType::WITHDRAWAL !== $journal->transactionType->type) {
-            $journal->budgets()->sync([]);
-
-            return;
-        }
-        $budget = $this->budgetRepository->findBudget($data['budget_id'], $data['budget_name']);
-        if (null !== $budget) {
-            app('log')->debug(sprintf('Link budget #%d to journal #%d', $budget->id, $journal->id));
-            $journal->budgets()->sync([$budget->id]);
-
-            return;
-        }
-        // if the budget is NULL, sync empty.
-        $journal->budgets()->sync([]);
-    }
-
-    protected function storeCategory(TransactionJournal $journal, NullArrayObject $data): void
-    {
-        $category = $this->categoryRepository->findCategory($data['category_id'], $data['category_name']);
-        if (null !== $category) {
-            app('log')->debug(sprintf('Link category #%d to journal #%d', $category->id, $journal->id));
-            $journal->categories()->sync([$category->id]);
-
-            return;
-        }
-        // if the category is NULL, sync empty.
-        $journal->categories()->sync([]);
-    }
-
-    protected function storeNotes(TransactionJournal $journal, ?string $notes): void
-    {
-        $notes = (string)$notes;
-        $note  = $journal->notes()->first();
-        if ('' !== $notes) {
-            if (null === $note) {
-                $note = new Note();
-                $note->noteable()->associate($journal);
-            }
-            $note->text = $notes;
-            $note->save();
-            app('log')->debug(sprintf('Stored notes for journal #%d', $journal->id));
-
-            return;
-        }
-        // try to delete existing notes.
-        $note?->delete();
-    }
-
-    /**
-     * Link tags to journal.
-     */
-    protected function storeTags(TransactionJournal $journal, ?array $tags): void
-    {
-        app('log')->debug('Now in storeTags()', $tags ?? []);
-        $this->tagFactory->setUser($journal->user);
-        $set = [];
-        if (!is_array($tags)) {
-            app('log')->debug('Tags is not an array, break.');
-
-            return;
-        }
-        app('log')->debug('Start of loop.');
-        foreach ($tags as $string) {
-            $string = (string)$string;
-            app('log')->debug(sprintf('Now at tag "%s"', $string));
-            if ('' !== $string) {
-                $tag = $this->tagFactory->findOrCreate($string);
-                if (null !== $tag) {
-                    $set[] = $tag->id;
-                }
-            }
-        }
-        $set = array_unique($set);
-        app('log')->debug('End of loop.');
-        app('log')->debug(sprintf('Total nr. of tags: %d', count($tags)), $tags);
-        $journal->tags()->sync($set);
-    }
-
     private function findAccountById(array $data, array $types): ?Account
     {
         // first attempt, find by ID.
@@ -435,4 +317,122 @@ trait JournalServiceTrait
 
         return $account;
     }
+
+    /**
+     * @throws FireflyException
+     */
+    protected function getAmount(string $amount): string
+    {
+        if ('' === $amount) {
+            throw new FireflyException(sprintf('The amount cannot be an empty string: "%s"', $amount));
+        }
+        app('log')->debug(sprintf('Now in getAmount("%s")', $amount));
+        if (0 === bccomp('0', $amount)) {
+            throw new FireflyException(sprintf('The amount seems to be zero: "%s"', $amount));
+        }
+
+        return $amount;
+    }
+
+    protected function getForeignAmount(?string $amount): ?string
+    {
+        if (null === $amount) {
+            app('log')->debug('No foreign amount info in array. Return NULL');
+
+            return null;
+        }
+        if ('' === $amount) {
+            app('log')->debug('Foreign amount is empty string, return NULL.');
+
+            return null;
+        }
+        if (0 === bccomp('0', $amount)) {
+            app('log')->debug('Foreign amount is 0.0, return NULL.');
+
+            return null;
+        }
+        app('log')->debug(sprintf('Foreign amount is %s', $amount));
+
+        return $amount;
+    }
+
+    protected function storeBudget(TransactionJournal $journal, NullArrayObject $data): void
+    {
+        if (TransactionType::WITHDRAWAL !== $journal->transactionType->type) {
+            $journal->budgets()->sync([]);
+
+            return;
+        }
+        $budget = $this->budgetRepository->findBudget($data['budget_id'], $data['budget_name']);
+        if (null !== $budget) {
+            app('log')->debug(sprintf('Link budget #%d to journal #%d', $budget->id, $journal->id));
+            $journal->budgets()->sync([$budget->id]);
+
+            return;
+        }
+        // if the budget is NULL, sync empty.
+        $journal->budgets()->sync([]);
+    }
+
+    protected function storeCategory(TransactionJournal $journal, NullArrayObject $data): void
+    {
+        $category = $this->categoryRepository->findCategory($data['category_id'], $data['category_name']);
+        if (null !== $category) {
+            app('log')->debug(sprintf('Link category #%d to journal #%d', $category->id, $journal->id));
+            $journal->categories()->sync([$category->id]);
+
+            return;
+        }
+        // if the category is NULL, sync empty.
+        $journal->categories()->sync([]);
+    }
+
+    protected function storeNotes(TransactionJournal $journal, ?string $notes): void
+    {
+        $notes = (string)$notes;
+        $note  = $journal->notes()->first();
+        if ('' !== $notes) {
+            if (null === $note) {
+                $note = new Note();
+                $note->noteable()->associate($journal);
+            }
+            $note->text = $notes;
+            $note->save();
+            app('log')->debug(sprintf('Stored notes for journal #%d', $journal->id));
+
+            return;
+        }
+        // try to delete existing notes.
+        $note?->delete();
+    }
+
+    /**
+     * Link tags to journal.
+     */
+    protected function storeTags(TransactionJournal $journal, ?array $tags): void
+    {
+        app('log')->debug('Now in storeTags()', $tags ?? []);
+        $this->tagFactory->setUser($journal->user);
+        $set = [];
+        if (!is_array($tags)) {
+            app('log')->debug('Tags is not an array, break.');
+
+            return;
+        }
+        app('log')->debug('Start of loop.');
+        foreach ($tags as $string) {
+            $string = (string)$string;
+            app('log')->debug(sprintf('Now at tag "%s"', $string));
+            if ('' !== $string) {
+                $tag = $this->tagFactory->findOrCreate($string);
+                if (null !== $tag) {
+                    $set[] = $tag->id;
+                }
+            }
+        }
+        $set = array_unique($set);
+        app('log')->debug('End of loop.');
+        app('log')->debug(sprintf('Total nr. of tags: %d', count($tags)), $tags);
+        $journal->tags()->sync($set);
+    }
 }

app/Services/Internal/Support/RecurringTransactionTrait.php

@@ -125,7 +125,7 @@ trait RecurringTransactionTrait
             if (!$validator->validateDestination(['id' => $destination->id])) {
                 throw new FireflyException(sprintf('Destination invalid: %s', $validator->destError));
             }
-            if (array_key_exists('foreign_amount', $array) && '' === (string) $array['foreign_amount']) {
+            if (array_key_exists('foreign_amount', $array) && '' === (string)$array['foreign_amount']) {
                 unset($array['foreign_amount']);
             }
             // TODO typeOverrule. The account validator may have a different opinion on the type of the transaction.
@@ -137,25 +137,25 @@ trait RecurringTransactionTrait
                     'source_id'               => $source->id,
                     'destination_id'          => $destination->id,
                     'amount'                  => $array['amount'],
-                    'foreign_amount'          => array_key_exists('foreign_amount', $array) ? (string) $array['foreign_amount'] : null,
+                    'foreign_amount'          => array_key_exists('foreign_amount', $array) ? (string)$array['foreign_amount'] : null,
                     'description'             => $array['description'],
                 ]
             );
             $transaction->save();
 
             if (array_key_exists('budget_id', $array)) {
-                $this->setBudget($transaction, (int) $array['budget_id']);
+                $this->setBudget($transaction, (int)$array['budget_id']);
             }
             if (array_key_exists('bill_id', $array)) {
-                $this->setBill($transaction, (int) $array['bill_id']);
+                $this->setBill($transaction, (int)$array['bill_id']);
             }
             if (array_key_exists('category_id', $array)) {
-                $this->setCategory($transaction, (int) $array['category_id']);
+                $this->setCategory($transaction, (int)$array['category_id']);
             }
 
             // same for piggy bank
             if (array_key_exists('piggy_bank_id', $array)) {
-                $this->updatePiggyBank($transaction, (int) $array['piggy_bank_id']);
+                $this->updatePiggyBank($transaction, (int)$array['piggy_bank_id']);
             }
 
             if (array_key_exists('tags', $array) && is_array($array['tags'])) {
@@ -167,8 +167,8 @@ trait RecurringTransactionTrait
     protected function findAccount(array $expectedTypes, ?int $accountId, ?string $accountName): Account
     {
         $result       = null;
-        $accountId    = (int) $accountId;
-        $accountName  = (string) $accountName;
+        $accountId    = (int)$accountId;
+        $accountName  = (string)$accountName;
 
         /** @var AccountRepositoryInterface $repository */
         $repository   = app(AccountRepositoryInterface::class);
@@ -210,61 +210,6 @@ trait RecurringTransactionTrait
         return $result ?? $repository->getCashAccount();
     }
 
-    protected function updatePiggyBank(RecurrenceTransaction $transaction, int $piggyId): void
-    {
-        /** @var PiggyBankFactory $factory */
-        $factory   = app(PiggyBankFactory::class);
-        $factory->setUser($transaction->recurrence->user);
-        $piggyBank = $factory->find($piggyId, null);
-        if (null !== $piggyBank) {
-            /** @var null|RecurrenceMeta $entry */
-            $entry        = $transaction->recurrenceTransactionMeta()->where('name', 'piggy_bank_id')->first();
-            if (null === $entry) {
-                $entry = RecurrenceTransactionMeta::create(['rt_id' => $transaction->id, 'name' => 'piggy_bank_id', 'value' => $piggyBank->id]);
-            }
-            $entry->value = $piggyBank->id;
-            $entry->save();
-        }
-        if (null === $piggyBank) {
-            // delete if present
-            $transaction->recurrenceTransactionMeta()->where('name', 'piggy_bank_id')->delete();
-        }
-    }
-
-    protected function updateTags(RecurrenceTransaction $transaction, array $tags): void
-    {
-        if (0 !== count($tags)) {
-            /** @var null|RecurrenceMeta $entry */
-            $entry        = $transaction->recurrenceTransactionMeta()->where('name', 'tags')->first();
-            if (null === $entry) {
-                $entry = RecurrenceTransactionMeta::create(['rt_id' => $transaction->id, 'name' => 'tags', 'value' => json_encode($tags)]);
-            }
-            $entry->value = json_encode($tags);
-            $entry->save();
-        }
-        if (0 === count($tags)) {
-            // delete if present
-            $transaction->recurrenceTransactionMeta()->where('name', 'tags')->delete();
-        }
-    }
-
-    protected function deleteRepetitions(Recurrence $recurrence): void
-    {
-        $recurrence->recurrenceRepetitions()->delete();
-    }
-
-    protected function deleteTransactions(Recurrence $recurrence): void
-    {
-        app('log')->debug('deleteTransactions()');
-
-        /** @var RecurrenceTransaction $transaction */
-        foreach ($recurrence->recurrenceTransactions as $transaction) {
-            $transaction->recurrenceTransactionMeta()->delete();
-
-            $transaction->delete();
-        }
-    }
-
     private function setBudget(RecurrenceTransaction $transaction, int $budgetId): void
     {
         $budgetFactory = app(BudgetFactory::class);
@@ -325,4 +270,59 @@ trait RecurringTransactionTrait
         $meta->value     = $category->id;
         $meta->save();
     }
+
+    protected function updatePiggyBank(RecurrenceTransaction $transaction, int $piggyId): void
+    {
+        /** @var PiggyBankFactory $factory */
+        $factory   = app(PiggyBankFactory::class);
+        $factory->setUser($transaction->recurrence->user);
+        $piggyBank = $factory->find($piggyId, null);
+        if (null !== $piggyBank) {
+            /** @var null|RecurrenceMeta $entry */
+            $entry        = $transaction->recurrenceTransactionMeta()->where('name', 'piggy_bank_id')->first();
+            if (null === $entry) {
+                $entry = RecurrenceTransactionMeta::create(['rt_id' => $transaction->id, 'name' => 'piggy_bank_id', 'value' => $piggyBank->id]);
+            }
+            $entry->value = $piggyBank->id;
+            $entry->save();
+        }
+        if (null === $piggyBank) {
+            // delete if present
+            $transaction->recurrenceTransactionMeta()->where('name', 'piggy_bank_id')->delete();
+        }
+    }
+
+    protected function updateTags(RecurrenceTransaction $transaction, array $tags): void
+    {
+        if (0 !== count($tags)) {
+            /** @var null|RecurrenceMeta $entry */
+            $entry        = $transaction->recurrenceTransactionMeta()->where('name', 'tags')->first();
+            if (null === $entry) {
+                $entry = RecurrenceTransactionMeta::create(['rt_id' => $transaction->id, 'name' => 'tags', 'value' => json_encode($tags)]);
+            }
+            $entry->value = json_encode($tags);
+            $entry->save();
+        }
+        if (0 === count($tags)) {
+            // delete if present
+            $transaction->recurrenceTransactionMeta()->where('name', 'tags')->delete();
+        }
+    }
+
+    protected function deleteRepetitions(Recurrence $recurrence): void
+    {
+        $recurrence->recurrenceRepetitions()->delete();
+    }
+
+    protected function deleteTransactions(Recurrence $recurrence): void
+    {
+        app('log')->debug('deleteTransactions()');
+
+        /** @var RecurrenceTransaction $transaction */
+        foreach ($recurrence->recurrenceTransactions as $transaction) {
+            $transaction->recurrenceTransactionMeta()->delete();
+
+            $transaction->delete();
+        }
+    }
 }