IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-01 13:09:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix https://github.com/firefly-iii/firefly-iii/issues/5694

Browse Source
This commit is contained in:
James Cole 2022-02-17 19:22:58 +01:00
parent 280762fff3
commit ec93b7b5a0
No known key found for this signature in database
GPG Key ID: BDE6667570EADBD5
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -481,6 +481,7 @@ class GroupCollector implements GroupCollectorInterface
public function withAttachmentInformation(): GroupCollectorInterface public function withAttachmentInformation(): GroupCollectorInterface
{ {
$this->fields[] = 'attachments.id as attachment_id'; $this->fields[] = 'attachments.id as attachment_id';
$this->fields[] = 'attachments.uploaded as attachment_uploaded';
$this->joinAttachmentTables(); $this->joinAttachmentTables();
return $this; return $this;
@ -498,7 +499,7 @@ class GroupCollector implements GroupCollectorInterface
->where( ->where(
static function (EloquentBuilder $q1) { static function (EloquentBuilder $q1) {
$q1->where('attachments.attachable_type', TransactionJournal::class); $q1->where('attachments.attachable_type', TransactionJournal::class);
$q1->where('attachments.uploaded', true); //$q1->where('attachments.uploaded', true);
$q1->orWhereNull('attachments.attachable_type'); $q1->orWhereNull('attachments.attachable_type');
} }
); );
@ -564,8 +565,8 @@ class GroupCollector implements GroupCollectorInterface
*/ */
public function dumpQueryInLogs(): void public function dumpQueryInLogs(): void
{ {
Log::debug($this->query->select($this->fields)->toSql()) ; Log::debug($this->query->select($this->fields)->toSql());
Log::debug('Bindings',$this->query->getBindings()); Log::debug('Bindings', $this->query->getBindings());
} }
/** /**
@ -578,7 +579,7 @@ class GroupCollector implements GroupCollectorInterface
private function convertToInteger(array $array): array private function convertToInteger(array $array): array
{ {
foreach ($this->integerFields as $field) { foreach ($this->integerFields as $field) {
$array[$field] = array_key_exists($field, $array) ? (int)$array[$field] : null; $array[$field] = array_key_exists($field, $array) ? (int) $array[$field] : null;
} }
return $array; return $array;
@ -594,7 +595,8 @@ class GroupCollector implements GroupCollectorInterface
{ {
$newArray = $newJournal->toArray(); $newArray = $newJournal->toArray();
if (array_key_exists('attachment_id', $newArray)) { if (array_key_exists('attachment_id', $newArray)) {
$attachmentId = (int)$newJournal['tag_id']; $attachmentId = (int) $newJournal['attachment_id'];
$existingJournal['attachments'][$attachmentId] = [ $existingJournal['attachments'][$attachmentId] = [
'id' => $attachmentId, 'id' => $attachmentId,
]; ];
@ -613,7 +615,7 @@ class GroupCollector implements GroupCollectorInterface
{ {
$newArray = $newJournal->toArray(); $newArray = $newJournal->toArray();
if (array_key_exists('tag_id', $newArray)) { // assume the other fields are present as well. if (array_key_exists('tag_id', $newArray)) { // assume the other fields are present as well.
$tagId = (int)$newJournal['tag_id']; $tagId = (int) $newJournal['tag_id'];
$tagDate = null; $tagDate = null;
try { try {
@ -623,7 +625,7 @@ class GroupCollector implements GroupCollectorInterface
} }
$existingJournal['tags'][$tagId] = [ $existingJournal['tags'][$tagId] = [
'id' => (int)$newArray['tag_id'], 'id' => (int) $newArray['tag_id'],
'name' => $newArray['tag_name'], 'name' => $newArray['tag_name'],
'date' => $tagDate, 'date' => $tagDate,
'description' => $newArray['tag_description'], 'description' => $newArray['tag_description'],
@ -649,21 +651,21 @@ class GroupCollector implements GroupCollectorInterface
// make new array // make new array
$parsedGroup = $this->parseAugmentedJournal($augumentedJournal); $parsedGroup = $this->parseAugmentedJournal($augumentedJournal);
$groupArray = [ $groupArray = [
'id' => (int)$augumentedJournal->transaction_group_id, 'id' => (int) $augumentedJournal->transaction_group_id,
'user_id' => (int)$augumentedJournal->user_id, 'user_id' => (int) $augumentedJournal->user_id,
'title' => $augumentedJournal->transaction_group_title, 'title' => $augumentedJournal->transaction_group_title,
'transaction_type' => $parsedGroup['transaction_type_type'], 'transaction_type' => $parsedGroup['transaction_type_type'],
'count' => 1, 'count' => 1,
'sums' => [], 'sums' => [],
'transactions' => [], 'transactions' => [],
]; ];
$journalId = (int)$augumentedJournal->transaction_journal_id; $journalId = (int) $augumentedJournal->transaction_journal_id;
$groupArray['transactions'][$journalId] = $parsedGroup; $groupArray['transactions'][$journalId] = $parsedGroup;
$groups[$groupId] = $groupArray; $groups[$groupId] = $groupArray;
continue; continue;
} }
// or parse the rest. // or parse the rest.
$journalId = (int)$augumentedJournal->transaction_journal_id; $journalId = (int) $augumentedJournal->transaction_journal_id;
if (array_key_exists($journalId, $groups[$groupId]['transactions'])) { if (array_key_exists($journalId, $groups[$groupId]['transactions'])) {
// append data to existing group + journal (for multiple tags or multiple attachments) // append data to existing group + journal (for multiple tags or multiple attachments)
$groups[$groupId]['transactions'][$journalId] = $this->mergeTags($groups[$groupId]['transactions'][$journalId], $augumentedJournal); $groups[$groupId]['transactions'][$journalId] = $this->mergeTags($groups[$groupId]['transactions'][$journalId], $augumentedJournal);
@ -708,9 +710,9 @@ class GroupCollector implements GroupCollectorInterface
// convert values to integers: // convert values to integers:
$result = $this->convertToInteger($result); $result = $this->convertToInteger($result);
$result['reconciled'] = 1 === (int)$result['reconciled']; $result['reconciled'] = 1 === (int) $result['reconciled'];
if (array_key_exists('tag_id', $result) && null !== $result['tag_id']) { // assume the other fields are present as well. if (array_key_exists('tag_id', $result) && null !== $result['tag_id']) { // assume the other fields are present as well.
$tagId = (int)$augumentedJournal['tag_id']; $tagId = (int) $augumentedJournal['tag_id'];
$tagDate = null; $tagDate = null;
try { try {
$tagDate = Carbon::parse($augumentedJournal['tag_date']); $tagDate = Carbon::parse($augumentedJournal['tag_date']);
@ -719,7 +721,7 @@ class GroupCollector implements GroupCollectorInterface
} }
$result['tags'][$tagId] = [ $result['tags'][$tagId] = [
'id' => (int)$result['tag_id'], 'id' => (int) $result['tag_id'],
'name' => $result['tag_name'], 'name' => $result['tag_name'],
'date' => $tagDate, 'date' => $tagDate,
'description' => $result['tag_description'], 'description' => $result['tag_description'],
@ -728,8 +730,9 @@ class GroupCollector implements GroupCollectorInterface
// also merge attachments: // also merge attachments:
if (array_key_exists('attachment_id', $result)) { if (array_key_exists('attachment_id', $result)) {
$attachmentId = (int)$augumentedJournal['attachment_id']; $uploaded = 1 === (int)$result['attachment_uploaded'];
if (0 !== $attachmentId) { $attachmentId = (int) $augumentedJournal['attachment_id'];
if (0 !== $attachmentId && $uploaded) {
$result['attachments'][$attachmentId] = [ $result['attachments'][$attachmentId] = [
'id' => $attachmentId, 'id' => $attachmentId,
]; ];
@ -753,7 +756,7 @@ class GroupCollector implements GroupCollectorInterface
foreach ($groups as $groudId => $group) { foreach ($groups as $groudId => $group) {
/** @var array $transaction */ /** @var array $transaction */
foreach ($group['transactions'] as $transaction) { foreach ($group['transactions'] as $transaction) {
$currencyId = (int)$transaction['currency_id']; $currencyId = (int) $transaction['currency_id'];
// set default: // set default:
if (!array_key_exists($currencyId, $groups[$groudId]['sums'])) { if (!array_key_exists($currencyId, $groups[$groudId]['sums'])) {
@ -766,7 +769,7 @@ class GroupCollector implements GroupCollectorInterface
$groups[$groudId]['sums'][$currencyId]['amount'] = bcadd($groups[$groudId]['sums'][$currencyId]['amount'], $transaction['amount'] ?? '0'); $groups[$groudId]['sums'][$currencyId]['amount'] = bcadd($groups[$groudId]['sums'][$currencyId]['amount'], $transaction['amount'] ?? '0');
if (null !== $transaction['foreign_amount'] && null !== $transaction['foreign_currency_id']) { if (null !== $transaction['foreign_amount'] && null !== $transaction['foreign_currency_id']) {
$currencyId = (int)$transaction['foreign_currency_id']; $currencyId = (int) $transaction['foreign_currency_id'];
// set default: // set default:
if (!array_key_exists($currencyId, $groups[$groudId]['sums'])) { if (!array_key_exists($currencyId, $groups[$groudId]['sums'])) {