diff --git a/app/Repositories/TransactionGroup/TransactionGroupRepository.php b/app/Repositories/TransactionGroup/TransactionGroupRepository.php index cec90bef6d..0c17708cc1 100644 --- a/app/Repositories/TransactionGroup/TransactionGroupRepository.php +++ b/app/Repositories/TransactionGroup/TransactionGroupRepository.php @@ -484,4 +484,16 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface return $return; } + + /** + * @inheritDoc + */ + public function countAttachments(int $journalId): int + { + /** @var TransactionJournal $journal */ + $journal = $this->user->transactionJournals()->find($journalId); + + return $journal->attachments()->count(); + + } } diff --git a/app/Repositories/TransactionGroup/TransactionGroupRepositoryInterface.php b/app/Repositories/TransactionGroup/TransactionGroupRepositoryInterface.php index 4fd2384149..fc01fc13d6 100644 --- a/app/Repositories/TransactionGroup/TransactionGroupRepositoryInterface.php +++ b/app/Repositories/TransactionGroup/TransactionGroupRepositoryInterface.php @@ -86,6 +86,13 @@ interface TransactionGroupRepositoryInterface */ public function getLocation(int $journalId): ?Location; + /** + * @param int $journalId + * + * @return int + */ + public function countAttachments(int $journalId): int; + /** * Return object with all found meta field things as Carbon objects. * diff --git a/app/Transformers/TransactionGroupTransformer.php b/app/Transformers/TransactionGroupTransformer.php index ba494f4863..c12e01adce 100644 --- a/app/Transformers/TransactionGroupTransformer.php +++ b/app/Transformers/TransactionGroupTransformer.php @@ -212,6 +212,8 @@ class TransactionGroupTransformer extends AbstractTransformer 'longitude' => $longitude, 'latitude' => $latitude, 'zoom_level' => $zoomLevel, + + 'has_attachments' => $this->hasAttachments((int)$row['transaction_journal_id']), ]; } @@ -248,6 +250,16 @@ class TransactionGroupTransformer extends AbstractTransformer return $this->groupRepos->getLocation($journalId); } + /** + * @param int $journalId + * + * @return bool + */ + private function hasAttachments(int $journalId): bool + { + return $this->groupRepos->countAttachments($journalId) > 0; + } + /** * @param array $array * @param string $key diff --git a/config/firefly.php b/config/firefly.php index e2ea3ed8ef..4729dcddb2 100644 --- a/config/firefly.php +++ b/config/firefly.php @@ -102,7 +102,7 @@ return [ 'handle_debts' => true, ], 'version' => '5.6.5', - 'api_version' => '1.5.4', + 'api_version' => '1.5.5', 'db_version' => 18, // generic settings