mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-10-14 00:04:24 +00:00
API will display journal location.
This commit is contained in:
@@ -32,6 +32,7 @@ use FireflyIII\Exceptions\FireflyException;
|
|||||||
use FireflyIII\Factory\TransactionGroupFactory;
|
use FireflyIII\Factory\TransactionGroupFactory;
|
||||||
use FireflyIII\Models\AccountMeta;
|
use FireflyIII\Models\AccountMeta;
|
||||||
use FireflyIII\Models\Attachment;
|
use FireflyIII\Models\Attachment;
|
||||||
|
use FireflyIII\Models\Location;
|
||||||
use FireflyIII\Models\Note;
|
use FireflyIII\Models\Note;
|
||||||
use FireflyIII\Models\PiggyBankEvent;
|
use FireflyIII\Models\PiggyBankEvent;
|
||||||
use FireflyIII\Models\Transaction;
|
use FireflyIII\Models\Transaction;
|
||||||
@@ -472,4 +473,15 @@ class TransactionGroupRepository implements TransactionGroupRepositoryInterface
|
|||||||
|
|
||||||
return $journal->tags()->get();
|
return $journal->tags()->get();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @inheritDoc
|
||||||
|
*/
|
||||||
|
public function getLocation(int $journalId): ?Location
|
||||||
|
{
|
||||||
|
/** @var TransactionJournal $journal */
|
||||||
|
$journal = $this->user->transactionJournals()->find($journalId);
|
||||||
|
|
||||||
|
return $journal->locations()->first();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -25,6 +25,7 @@ namespace FireflyIII\Repositories\TransactionGroup;
|
|||||||
|
|
||||||
use FireflyIII\Exceptions\DuplicateTransactionException;
|
use FireflyIII\Exceptions\DuplicateTransactionException;
|
||||||
use FireflyIII\Exceptions\FireflyException;
|
use FireflyIII\Exceptions\FireflyException;
|
||||||
|
use FireflyIII\Models\Location;
|
||||||
use FireflyIII\Models\TransactionGroup;
|
use FireflyIII\Models\TransactionGroup;
|
||||||
use FireflyIII\Support\NullArrayObject;
|
use FireflyIII\Support\NullArrayObject;
|
||||||
use FireflyIII\User;
|
use FireflyIII\User;
|
||||||
@@ -96,6 +97,16 @@ interface TransactionGroupRepositoryInterface
|
|||||||
*/
|
*/
|
||||||
public function getMetaFields(int $journalId, array $fields): NullArrayObject;
|
public function getMetaFields(int $journalId, array $fields): NullArrayObject;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the location of a journal or NULL.
|
||||||
|
*
|
||||||
|
* @param int $journalId
|
||||||
|
*
|
||||||
|
* @return Location|null
|
||||||
|
*/
|
||||||
|
public function getLocation(int $journalId): ?Location;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the note text for a journal (by ID).
|
* Get the note text for a journal (by ID).
|
||||||
*
|
*
|
||||||
|
@@ -27,6 +27,7 @@ use FireflyIII\Exceptions\FireflyException;
|
|||||||
use FireflyIII\Models\Bill;
|
use FireflyIII\Models\Bill;
|
||||||
use FireflyIII\Models\Budget;
|
use FireflyIII\Models\Budget;
|
||||||
use FireflyIII\Models\Category;
|
use FireflyIII\Models\Category;
|
||||||
|
use FireflyIII\Models\Location;
|
||||||
use FireflyIII\Models\Transaction;
|
use FireflyIII\Models\Transaction;
|
||||||
use FireflyIII\Models\TransactionCurrency;
|
use FireflyIII\Models\TransactionCurrency;
|
||||||
use FireflyIII\Models\TransactionGroup;
|
use FireflyIII\Models\TransactionGroup;
|
||||||
@@ -72,6 +73,7 @@ class TransactionGroupTransformer extends AbstractTransformer
|
|||||||
{
|
{
|
||||||
$data = new NullArrayObject($group);
|
$data = new NullArrayObject($group);
|
||||||
$first = new NullArrayObject(reset($group['transactions']));
|
$first = new NullArrayObject(reset($group['transactions']));
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'id' => (int)$first['transaction_group_id'],
|
'id' => (int)$first['transaction_group_id'],
|
||||||
'created_at' => $first['created_at']->toAtomString(),
|
'created_at' => $first['created_at']->toAtomString(),
|
||||||
@@ -329,6 +331,16 @@ class TransactionGroupTransformer extends AbstractTransformer
|
|||||||
$foreignAmount = number_format((float)$foreignAmount, $foreignCurrency['decimal_places'], '.', '');
|
$foreignAmount = number_format((float)$foreignAmount, $foreignCurrency['decimal_places'], '.', '');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$longitude = null;
|
||||||
|
$latitude = null;
|
||||||
|
$zoomLevel = null;
|
||||||
|
$location = $this->getLocation($journal);
|
||||||
|
if (null !== $location) {
|
||||||
|
$longitude = $location->longitude;
|
||||||
|
$latitude = $location->latitude;
|
||||||
|
$zoomLevel = $location->zoom_level;
|
||||||
|
}
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'user' => (int)$journal->user_id,
|
'user' => (int)$journal->user_id,
|
||||||
'transaction_journal_id' => (int)$journal->id,
|
'transaction_journal_id' => (int)$journal->id,
|
||||||
@@ -396,6 +408,11 @@ class TransactionGroupTransformer extends AbstractTransformer
|
|||||||
'due_date' => $metaDates['due_date'],
|
'due_date' => $metaDates['due_date'],
|
||||||
'payment_date' => $metaDates['payment_date'],
|
'payment_date' => $metaDates['payment_date'],
|
||||||
'invoice_date' => $metaDates['invoice_date'],
|
'invoice_date' => $metaDates['invoice_date'],
|
||||||
|
|
||||||
|
// location data
|
||||||
|
'longitude' => $longitude,
|
||||||
|
'latitude' => $latitude,
|
||||||
|
'zoom_level' => $zoomLevel,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -428,11 +445,13 @@ class TransactionGroupTransformer extends AbstractTransformer
|
|||||||
foreach ($transactions as $transaction) {
|
foreach ($transactions as $transaction) {
|
||||||
$result[] = $this->transformTransaction($transaction);
|
$result[] = $this->transformTransaction($transaction);
|
||||||
}
|
}
|
||||||
|
|
||||||
return $result;
|
return $result;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param array $transaction
|
* @param array $transaction
|
||||||
|
*
|
||||||
* @return array
|
* @return array
|
||||||
*/
|
*/
|
||||||
private function transformTransaction(array $transaction): array
|
private function transformTransaction(array $transaction): array
|
||||||
@@ -450,6 +469,16 @@ class TransactionGroupTransformer extends AbstractTransformer
|
|||||||
$metaFieldData = $this->groupRepos->getMetaFields((int)$row['transaction_journal_id'], $this->metaFields);
|
$metaFieldData = $this->groupRepos->getMetaFields((int)$row['transaction_journal_id'], $this->metaFields);
|
||||||
$metaDateData = $this->groupRepos->getMetaDateFields((int)$row['transaction_journal_id'], $this->metaDateFields);
|
$metaDateData = $this->groupRepos->getMetaDateFields((int)$row['transaction_journal_id'], $this->metaDateFields);
|
||||||
|
|
||||||
|
$longitude = null;
|
||||||
|
$latitude = null;
|
||||||
|
$zoomLevel = null;
|
||||||
|
$location = $this->getLocationById((int)$row['transaction_journal_id']);
|
||||||
|
if (null !== $location) {
|
||||||
|
$longitude = $location->longitude;
|
||||||
|
$latitude = $location->latitude;
|
||||||
|
$zoomLevel = $location->zoom_level;
|
||||||
|
}
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'user' => (int)$row['user_id'],
|
'user' => (int)$row['user_id'],
|
||||||
'transaction_journal_id' => (int)$row['transaction_journal_id'],
|
'transaction_journal_id' => (int)$row['transaction_journal_id'],
|
||||||
@@ -521,6 +550,11 @@ class TransactionGroupTransformer extends AbstractTransformer
|
|||||||
'due_date' => $this->dateFromArray($metaDateData, 'due_date'),
|
'due_date' => $this->dateFromArray($metaDateData, 'due_date'),
|
||||||
'payment_date' => $this->dateFromArray($metaDateData, 'payment_date'),
|
'payment_date' => $this->dateFromArray($metaDateData, 'payment_date'),
|
||||||
'invoice_date' => $this->dateFromArray($metaDateData, 'invoice_date'),
|
'invoice_date' => $this->dateFromArray($metaDateData, 'invoice_date'),
|
||||||
|
|
||||||
|
// location data
|
||||||
|
'longitude' => $longitude,
|
||||||
|
'latitude' => $latitude,
|
||||||
|
'zoom_level' => $zoomLevel,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -528,6 +562,7 @@ class TransactionGroupTransformer extends AbstractTransformer
|
|||||||
* @param array $array
|
* @param array $array
|
||||||
* @param string $key
|
* @param string $key
|
||||||
* @param string|null $default
|
* @param string|null $default
|
||||||
|
*
|
||||||
* @return string|null
|
* @return string|null
|
||||||
*/
|
*/
|
||||||
private function stringFromArray(array $array, string $key, ?string $default): ?string
|
private function stringFromArray(array $array, string $key, ?string $default): ?string
|
||||||
@@ -538,12 +573,14 @@ class TransactionGroupTransformer extends AbstractTransformer
|
|||||||
if (null !== $default) {
|
if (null !== $default) {
|
||||||
return $default;
|
return $default;
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param array $array
|
* @param array $array
|
||||||
* @param string $key
|
* @param string $key
|
||||||
|
*
|
||||||
* @return int|null
|
* @return int|null
|
||||||
*/
|
*/
|
||||||
private function integerFromArray(array $array, string $key): ?int
|
private function integerFromArray(array $array, string $key): ?int
|
||||||
@@ -551,12 +588,14 @@ class TransactionGroupTransformer extends AbstractTransformer
|
|||||||
if (array_key_exists($key, $array)) {
|
if (array_key_exists($key, $array)) {
|
||||||
return (int)$array[$key];
|
return (int)$array[$key];
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param NullArrayObject $object
|
* @param NullArrayObject $object
|
||||||
* @param string $key
|
* @param string $key
|
||||||
|
*
|
||||||
* @return string|null
|
* @return string|null
|
||||||
*/
|
*/
|
||||||
private function dateFromArray(NullArrayObject $object, string $key): ?string
|
private function dateFromArray(NullArrayObject $object, string $key): ?string
|
||||||
@@ -567,4 +606,24 @@ class TransactionGroupTransformer extends AbstractTransformer
|
|||||||
|
|
||||||
return $object[$key]->toAtomString();
|
return $object[$key]->toAtomString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param TransactionJournal $journal
|
||||||
|
*
|
||||||
|
* @return Location|null
|
||||||
|
*/
|
||||||
|
private function getLocation(TransactionJournal $journal): ?Location
|
||||||
|
{
|
||||||
|
return $journal->locations()->first();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param int $journalId
|
||||||
|
*
|
||||||
|
* @return Location|null
|
||||||
|
*/
|
||||||
|
private function getLocationById(int $journalId): ?Location
|
||||||
|
{
|
||||||
|
return $this->groupRepos->getLocation($journalId);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user