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

Moved more stuff to the journal collector.

Browse Source
This commit is contained in:
James Cole
2016-11-05 18:08:44 +01:00
parent 37435da459
commit 1e2124c5ed
8 changed files with 100 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
app/Helpers/Collector/JournalCollector.php
View File

@@ -232,12 +232,7 @@ class JournalCollector
*/
public function setBudget(Budget $budget): JournalCollector
{
if (!$this->joinedBudget) {
// join some extra tables:
$this->joinedBudget = true;
$this->query->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id');
$this->query->leftJoin('budget_transaction', 'budget_transaction.transaction_id', '=', 'transactions.id');
}
$this->joinBudgetTables();
$this->query->where(
function (EloquentBuilder $q) use ($budget) {
@@ -256,12 +251,7 @@ class JournalCollector
*/
public function setCategory(Category $category): JournalCollector
{
if (!$this->joinedCategory) {
// join some extra tables:
$this->joinedCategory = true;
$this->query->leftJoin('category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id');
$this->query->leftJoin('category_transaction', 'category_transaction.transaction_id', '=', 'transactions.id');
}
$this->joinCategoryTables();
$this->query->where(
function (EloquentBuilder $q) use ($category) {
@@ -354,17 +344,29 @@ class JournalCollector
return $this;
}
/**
* @return JournalCollector
*/
public function withoutBudget(): JournalCollector
{
$this->joinBudgetTables();
$this->query->where(
function (EloquentBuilder $q) {
$q->whereNull('budget_transaction.budget_id');
$q->whereNull('budget_transaction_journal.budget_id');
}
);
return $this;
}
/**
* @return JournalCollector
*/
public function withoutCategory(): JournalCollector
{
if (!$this->joinedCategory) {
// join some extra tables:
$this->joinedCategory = true;
$this->query->leftJoin('category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id');
$this->query->leftJoin('category_transaction', 'category_transaction.transaction_id', '=', 'transactions.id');
}
$this->joinCategoryTables();
$this->query->where(
function (EloquentBuilder $q) {
@@ -376,6 +378,32 @@ class JournalCollector
return $this;
}
/**
*
*/
private function joinBudgetTables()
{
if (!$this->joinedBudget) {
// join some extra tables:
$this->joinedBudget = true;
$this->query->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id');
$this->query->leftJoin('budget_transaction', 'budget_transaction.transaction_id', '=', 'transactions.id');
}
}
/**
*
*/
private function joinCategoryTables()
{
if (!$this->joinedCategory) {
// join some extra tables:
$this->joinedCategory = true;
$this->query->leftJoin('category_transaction_journal', 'category_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id');
$this->query->leftJoin('category_transaction', 'category_transaction.transaction_id', '=', 'transactions.id');
}
}
/**
* @return EloquentBuilder
*/