Partial coverage of the transaction controller.

2025-10-12 15:35:15 +00:00 · 2015-05-04 23:46:14 +02:00
parent eb090f7265
commit 3176e54614
5 changed files with 392 additions and 50 deletions
--- a/app/Http/Controllers/TransactionController.php
+++ b/app/Http/Controllers/TransactionController.php
@@ -1,6 +1,7 @@
 <?php namespace FireflyIII\Http\Controllers;

 use Auth;
+use Carbon\Carbon;
 use ExpandedForm;
 use FireflyIII\Events\JournalCreated;
 use FireflyIII\Events\JournalSaved;
@@ -8,9 +9,10 @@ use FireflyIII\Http\Requests;
 use FireflyIII\Http\Requests\JournalFormRequest;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
+use FireflyIII\Repositories\Account\AccountRepositoryInterface;
 use FireflyIII\Repositories\Journal\JournalRepositoryInterface;
-use Illuminate\Pagination\LengthAwarePaginator;
 use Input;
+use Log;
 use Redirect;
 use Response;
 use Session;
@@ -34,19 +36,14 @@ class TransactionController extends Controller
    }

    /**
-     * Shows the view helping the user to create a new transaction journal.
+     * @param AccountRepositoryInterface $repository
+     * @param string                     $what
     *
-     * @param string $what
-     *
-     * @return \Illuminate\View\View
+     * @return View
     */
-    public function create($what = 'deposit')
+    public function create(AccountRepositoryInterface $repository, $what = 'deposit')
    {
-        $accounts   = ExpandedForm::makeSelectList(
-            Auth::user()->accounts()->accountTypeIn(['Default account', 'Asset account'])->orderBy('accounts.name', 'ASC')->orderBy('name', 'ASC')->where(
-                'active', 1
-            )->orderBy('name', 'DESC')->get(['accounts.*'])
-        );
+        $accounts   = ExpandedForm::makeSelectList($repository->getAccounts(['Default account', 'Asset account']));
        $budgets    = ExpandedForm::makeSelectList(Auth::user()->budgets()->get());
        $budgets[0] = '(no budget)';
        $piggies    = ExpandedForm::makeSelectList(Auth::user()->piggyBanks()->get());
@@ -99,11 +96,11 @@ class TransactionController extends Controller
     *
     * @return \Illuminate\Http\RedirectResponse
     */
-    public function destroy(TransactionJournal $transactionJournal)
+    public function destroy(JournalRepositoryInterface $repository, TransactionJournal $transactionJournal)
    {
        Session::flash('success', 'Transaction "' . e($transactionJournal->description) . '" destroyed.');

-        $transactionJournal->delete();
+        $repository->delete($transactionJournal);

        // redirect to previous URL:
        return Redirect::to(Session::get('transactions.delete.url'));
@@ -116,14 +113,10 @@ class TransactionController extends Controller
     *
     * @return $this
     */
-    public function edit(TransactionJournal $journal)
+    public function edit(AccountRepositoryInterface $repository, TransactionJournal $journal)
    {
        $what         = strtolower($journal->transactiontype->type);
-        $accounts     = ExpandedForm::makeSelectList(
-            Auth::user()->accounts()->accountTypeIn(['Default account', 'Asset account'])->orderBy('accounts.name', 'ASC')->where('active', 1)->orderBy(
-                'name', 'DESC'
-            )->get(['accounts.*'])
-        );
+        $accounts     = ExpandedForm::makeSelectList($repository->getAccounts(['Default account', 'Asset account']));
        $budgets      = ExpandedForm::makeSelectList(Auth::user()->budgets()->get());
        $budgets[0]   = '(no budget)';
        $transactions = $journal->transactions()->orderBy('amount', 'DESC')->get();
@@ -176,12 +169,14 @@ class TransactionController extends Controller
    }

    /**
-     * @param $what
+     * @param JournalRepositoryInterface $repository
+     * @param                            $what
     *
-     * @return $this
+     * @return View
     */
-    public function index($what)
+    public function index(JournalRepositoryInterface $repository, $what)
    {
+        $types = [];
        switch ($what) {
            case 'expenses':
            case 'withdrawal':
@@ -203,18 +198,10 @@ class TransactionController extends Controller
                break;
        }

-        $page   = intval(\Input::get('page'));
-        $offset = $page > 0 ? ($page - 1) * 50 : 0;
+        $page     = intval(Input::get('page'));
+        $offset   = $page > 0 ? ($page - 1) * 50 : 0;
+        $journals = $repository->getJournalsOfTypes($types, $offset, $page);

-        $set      = Auth::user()->transactionJournals()->transactionTypes($types)->withRelevantData()->take(50)->offset($offset)
-                        ->orderBy('date', 'DESC')
-                        ->orderBy('order', 'ASC')
-                        ->orderBy('id', 'DESC')
-                        ->get(
-                            ['transaction_journals.*']
-                        );
-        $count    = Auth::user()->transactionJournals()->transactionTypes($types)->count();
-        $journals = new LengthAwarePaginator($set, $count, 50, $page);
        $journals->setPath('transactions/' . $what);

        return view('transactions.index', compact('subTitle', 'what', 'subTitleIcon', 'journals'));
@@ -222,15 +209,19 @@ class TransactionController extends Controller
    }

    /**
-     * Reorder transactions (which all must have the same date)
+     * @param JournalRepositoryInterface $repository
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
     */
-    public function reorder()
+    public function reorder(JournalRepositoryInterface $repository)
    {
-        $ids = Input::get('items');
+        $ids  = Input::get('items');
+        $date = new Carbon(Input::get('date'));
        if (count($ids) > 0) {
            $order = 0;
            foreach ($ids as $id) {
-                $journal = Auth::user()->transactionjournals()->where('id', $id)->where('date', Input::get('date'))->first();
+
+                $journal = $repository->getWithDate($id, $date);
                if ($journal) {
                    $journal->order = $order;
                    $order++;
@@ -248,19 +239,11 @@ class TransactionController extends Controller
     *
     * @return $this
     */
-    public function show(TransactionJournal $journal)
+    public function show(JournalRepositoryInterface $repository, TransactionJournal $journal)
    {
        $journal->transactions->each(
-            function (Transaction $t) use ($journal) {
-                $t->before = floatval(
-                    $t->account->transactions()->leftJoin(
-                        'transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id'
-                    )
-                               ->where('transaction_journals.date', '<=', $journal->date->format('Y-m-d'))
-                               ->where('transaction_journals.order', '>=', $journal->order)
-                               ->where('transaction_journals.id', '!=', $journal->id)
-                               ->sum('transactions.amount')
-                );
+            function (Transaction $t) use ($journal, $repository) {
+                $t->before = $repository->getAmountBefore($journal, $t);
                $t->after  = $t->before + $t->amount;
            }
        );
--- a/app/Repositories/Journal/JournalRepository.php
+++ b/app/Repositories/Journal/JournalRepository.php
@@ -4,6 +4,7 @@ namespace FireflyIII\Repositories\Journal;

 use App;
 use Auth;
+use Carbon\Carbon;
 use DB;
 use FireflyIII\Models\Account;
 use FireflyIII\Models\AccountType;
@@ -13,6 +14,7 @@ use FireflyIII\Models\Tag;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
+use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;
 use Log;

@@ -24,6 +26,23 @@ use Log;
 class JournalRepository implements JournalRepositoryInterface
 {

+    /**
+     * @param TransactionJournal $journal
+     *
+     * @return bool
+     */
+    public function delete(TransactionJournal $journal)
+    {
+        // delete transactions first:
+        /** @var Transaction $transaction */
+        foreach ($journal->transactions()->get() as $transaction) {
+            $transaction->delete();
+        }
+        $journal->delete();
+
+        return true;
+    }
+
    /**
     * Get users first transaction journal
     *
@@ -34,6 +53,25 @@ class JournalRepository implements JournalRepositoryInterface
        return Auth::user()->transactionjournals()->orderBy('date', 'ASC')->first(['transaction_journals.*']);
    }

+    /**
+     * @param TransactionJournal $journal
+     * @param Transaction        $transaction
+     *
+     * @return float
+     */
+    public function getAmountBefore(TransactionJournal $journal, Transaction $transaction)
+    {
+        return floatval(
+            $transaction->account->transactions()->leftJoin(
+                'transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id'
+            )
+                                 ->where('transaction_journals.date', '<=', $journal->date->format('Y-m-d'))
+                                 ->where('transaction_journals.order', '>=', $journal->order)
+                                 ->where('transaction_journals.id', '!=', $journal->id)
+                                 ->sum('transactions.amount')
+);
+    }
+
    /**
     * @param TransactionType $dbType
     *
@@ -44,6 +82,28 @@ class JournalRepository implements JournalRepositoryInterface
        return Auth::user()->transactionjournals()->where('transaction_type_id', $dbType->id)->orderBy('id', 'DESC')->take(50)->get();
    }

+    /**
+     * @param array $types
+     * @param int   $offset
+     * @param int   $page
+     *
+     * @return LengthAwarePaginator
+     */
+    public function getJournalsOfTypes(array $types, $offset, $page)
+    {
+        $set      = Auth::user()->transactionJournals()->transactionTypes($types)->withRelevantData()->take(50)->offset($offset)
+                        ->orderBy('date', 'DESC')
+                        ->orderBy('order', 'ASC')
+                        ->orderBy('id', 'DESC')
+                        ->get(
+                            ['transaction_journals.*']
+                        );
+        $count    = Auth::user()->transactionJournals()->transactionTypes($types)->count();
+        $journals = new LengthAwarePaginator($set, $count, 50, $page);
+
+        return $journals;
+    }
+
    /**
     * @param $type
     *
@@ -54,6 +114,17 @@ class JournalRepository implements JournalRepositoryInterface
        return TransactionType::whereType($type)->first();
    }

+    /**
+     * @param        $id
+     * @param Carbon $date
+     *
+     * @return TransactionJournal
+     */
+    public function getWithDate($id, Carbon $date)
+    {
+        return Auth::user()->transactionjournals()->where('id', $id)->where('date', $date->format('Y-m-d'))->first();
+    }
+
    /**
     *
     * * Remember: a balancingAct takes at most one expense and one transfer.
--- a/app/Repositories/Journal/JournalRepositoryInterface.php
+++ b/app/Repositories/Journal/JournalRepositoryInterface.php
@@ -2,9 +2,11 @@

 namespace FireflyIII\Repositories\Journal;

+use Carbon\Carbon;
 use FireflyIII\Models\Transaction;
 use FireflyIII\Models\TransactionJournal;
 use FireflyIII\Models\TransactionType;
+use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Collection;

 /**
@@ -14,6 +16,13 @@ use Illuminate\Support\Collection;
 */
 interface JournalRepositoryInterface
 {
+    /**
+     * @param TransactionJournal $journal
+     *
+     * @return bool
+     */
+    public function delete(TransactionJournal $journal);
+
    /**
     * Get users first transaction journal
     *
@@ -21,6 +30,22 @@ interface JournalRepositoryInterface
     */
    public function first();

+    /**
+     * @param        $id
+     * @param Carbon $date
+     *
+     * @return TransactionJournal
+     */
+    public function getWithDate($id, Carbon $date);
+
+    /**
+     * @param TransactionJournal $journal
+     * @param Transaction        $transaction
+     *
+     * @return float
+     */
+    public function getAmountBefore(TransactionJournal $journal, Transaction $transaction);
+
    /**
     * @param TransactionType $dbType
     *
@@ -28,6 +53,15 @@ interface JournalRepositoryInterface
     */
    public function getJournalsOfType(TransactionType $dbType);

+    /**
+     * @param array $types
+     * @param int   $offset
+     * @param int   $page
+     *
+     * @return LengthAwarePaginator
+     */
+    public function getJournalsOfTypes(array $types, $offset, $page);
+
    /**
     * @param $type
     *