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

Code cleanup.

Browse Source
This commit is contained in:
James Cole
2021-03-28 11:46:23 +02:00
parent 2c575f3ca5
commit b5eeacc128
124 changed files with 1568 additions and 1384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Helpers/Attachments/AttachmentHelper.php
View File

@@ -55,6 +55,7 @@ class AttachmentHelper implements AttachmentHelperInterface
/** @var Filesystem The disk where attachments are stored. */
protected $uploadDisk;
/**
* AttachmentHelper constructor.
*
@@ -69,6 +70,7 @@ class AttachmentHelper implements AttachmentHelperInterface
$this->attachments = new Collection;
$this->uploadDisk = Storage::disk('upload');
}
/**
* Returns the content of an attachment.
*

12
app/Helpers/Collector/Extensions/AccountCollection.php
View File

@@ -52,6 +52,7 @@ trait AccountCollection
return $this;
}
/**
* These accounts must not be source accounts.
*
@@ -70,6 +71,7 @@ trait AccountCollection
return $this;
}
/**
* Define which accounts can be part of the source and destination transactions.
*
@@ -115,6 +117,7 @@ trait AccountCollection
return $this;
}
/**
* Define which accounts can be part of the source and destination transactions.
*
@@ -133,6 +136,7 @@ trait AccountCollection
return $this;
}
/**
* Define which accounts can be part of the source and destination transactions.
*
@@ -151,6 +155,7 @@ trait AccountCollection
return $this;
}
/**
* Either account can be set, but NOT both. This effectively excludes internal transfers.
*
@@ -187,6 +192,7 @@ trait AccountCollection
return $this;
}
/**
* Will include the source and destination account names and types.
*
@@ -210,9 +216,9 @@ trait AccountCollection
$this->query->leftJoin('account_types as dest_account_type', 'dest_account_type.id', '=', 'dest_account.account_type_id');
// and add fields:
$this->fields[] = 'dest_account.name as destination_account_name';
$this->fields[] = 'dest_account.iban as destination_account_iban';
$this->fields[] = 'dest_account_type.type as destination_account_type';
$this->fields[] = 'dest_account.name as destination_account_name';
$this->fields[] = 'dest_account.iban as destination_account_iban';
$this->fields[] = 'dest_account_type.type as destination_account_type';
$this->hasAccountInfo = true;
}

2
app/Helpers/Collector/Extensions/CollectorProperties.php
View File

@@ -43,7 +43,7 @@ trait CollectorProperties
/** @var bool Will be true if query result contains category info. */
private $hasCatInformation;
/** @var bool Will be true for attachments */
private $hasJoinedAttTables;
private $hasJoinedAttTables;
private bool $hasJoinedMetaTables;
/** @var bool Will be true of the query has the tag info tables joined. */
private $hasJoinedTagTables;

1
app/Helpers/Collector/Extensions/TimeCollection.php
View File

@@ -102,6 +102,7 @@ trait TimeCollection
return $this;
}
/**
* Collect transactions updated on a specific date.
*

38
app/Helpers/Collector/GroupCollector.php
View File

@@ -485,6 +485,25 @@ class GroupCollector implements GroupCollectorInterface
return $this;
}
/**
* Join table to get attachment information.
*/
private function joinAttachmentTables(): void
{
if (false === $this->hasJoinedAttTables) {
// join some extra tables:
$this->hasJoinedAttTables = true;
$this->query->leftJoin('attachments', 'attachments.attachable_id', '=', 'transaction_journals.id')
->where(
static function (EloquentBuilder $q1) {
$q1->where('attachments.attachable_type', TransactionJournal::class);
$q1->where('attachments.uploaded', 1);
$q1->orWhereNull('attachments.attachable_type');
}
);
}
}
/**
* Build the query.
*/
@@ -528,25 +547,6 @@ class GroupCollector implements GroupCollectorInterface
->orderBy('source.amount', 'DESC');
}
/**
* Join table to get attachment information.
*/
private function joinAttachmentTables(): void
{
if (false === $this->hasJoinedAttTables) {
// join some extra tables:
$this->hasJoinedAttTables = true;
$this->query->leftJoin('attachments', 'attachments.attachable_id', '=', 'transaction_journals.id')
->where(
static function (EloquentBuilder $q1) {
$q1->where('attachments.attachable_type', TransactionJournal::class);
$q1->where('attachments.uploaded', 1);
$q1->orWhereNull('attachments.attachable_type');
}
);
}
}
/**
*
*/