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

Update transaction journal repository / provider

Browse Source
This commit is contained in:
James Cole
2016-03-03 08:55:43 +01:00
parent b4f1bbf793
commit 5ce4104644
3 changed files with 85 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
app/Repositories/Journal/JournalRepository.php
View File

@@ -3,7 +3,6 @@ declare(strict_types = 1);
namespace FireflyIII\Repositories\Journal;
use Auth;
use Carbon\Carbon;
use DB;
use FireflyIII\Exceptions\FireflyException;
@@ -15,6 +14,7 @@ use FireflyIII\Models\Tag;
use FireflyIII\Models\Transaction;
use FireflyIII\Models\TransactionJournal;
use FireflyIII\Models\TransactionType;
use FireflyIII\User;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Support\Collection;
use Log;
@@ -26,6 +26,19 @@ use Log;
*/
class JournalRepository implements JournalRepositoryInterface
{
/** @var User */
private $user;
/**
* BillRepository constructor.
*
* @param User $user
*/
public function __construct(User $user)
{
Log::debug('Constructed transaction journal repository for user #' . $user->id . ' (' . $user->email . ')');
$this->user = $user;
}
/**
* @param TransactionJournal $journal
@@ -46,7 +59,7 @@ class JournalRepository implements JournalRepositoryInterface
*/
public function first()
{
$entry = Auth::user()->transactionjournals()->orderBy('date', 'ASC')->first(['transaction_journals.*']);
$entry = $this->user->transactionjournals()->orderBy('date', 'ASC')->first(['transaction_journals.*']);
return $entry;
}
@@ -85,14 +98,14 @@ class JournalRepository implements JournalRepositoryInterface
*/
public function getCollectionOfTypes(array $types, int $offset, int $count)
{
$set = Auth::user()->transactionJournals()->transactionTypes($types)
->take($count)->offset($offset)
->orderBy('date', 'DESC')
->orderBy('order', 'ASC')
->orderBy('id', 'DESC')
->get(
['transaction_journals.*']
);
$set = $this->user->transactionJournals()->transactionTypes($types)
->take($count)->offset($offset)
->orderBy('date', 'DESC')
->orderBy('order', 'ASC')
->orderBy('id', 'DESC')
->get(
['transaction_journals.*']
);
return $set;
}
@@ -104,7 +117,7 @@ class JournalRepository implements JournalRepositoryInterface
*/
public function getJournalsOfType(TransactionType $dbType)
{
return Auth::user()->transactionjournals()->where('transaction_type_id', $dbType->id)->orderBy('id', 'DESC')->take(50)->get();
return $this->user->transactionjournals()->where('transaction_type_id', $dbType->id)->orderBy('id', 'DESC')->take(50)->get();
}
/**
@@ -118,18 +131,18 @@ class JournalRepository implements JournalRepositoryInterface
*/
public function getJournalsOfTypes(array $types, int $offset, int $page, int $pagesize = 50)
{
$set = Auth::user()
->transactionJournals()
->expanded()
->transactionTypes($types)
->take($pagesize)
->offset($offset)
->orderBy('date', 'DESC')
->orderBy('order', 'ASC')
->orderBy('id', 'DESC')
->get(TransactionJournal::QUERYFIELDS);
$set = $this->user
->transactionJournals()
->expanded()
->transactionTypes($types)
->take($pagesize)
->offset($offset)
->orderBy('date', 'DESC')
->orderBy('order', 'ASC')
->orderBy('id', 'DESC')
->get(TransactionJournal::QUERYFIELDS);
$count = Auth::user()->transactionJournals()->transactionTypes($types)->count();
$count = $this->user->transactionJournals()->transactionTypes($types)->count();
$journals = new LengthAwarePaginator($set, $count, $pagesize, $page);
return $journals;
@@ -153,7 +166,7 @@ class JournalRepository implements JournalRepositoryInterface
*/
public function getWithDate(int $journalId, Carbon $date)
{
return Auth::user()->transactionjournals()->where('id', $journalId)->where('date', $date->format('Y-m-d 00:00:00'))->first();
return $this->user->transactionjournals()->where('id', $journalId)->where('date', $date->format('Y-m-d 00:00:00'))->first();
}
/**