kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-05 04:03:26 +00:00
Code Issues Projects Releases Wiki Activity

Fix API version and match API

Browse Source
This commit is contained in:
James Cole
2023-08-01 11:15:19 +02:00
parent 7c9f7f04b7
commit bfc5c5d154
5 changed files with 90 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Api/V2/Controllers/Chart/AccountController.php
View File

@@ -31,7 +31,7 @@ use FireflyIII\Models\Account;
use FireflyIII\Models\AccountType;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Repositories\Administration\Account\AccountRepositoryInterface;
use FireflyIII\Support\Http\Api\ConvertsExchangeRates;
use FireflyIII\Support\Http\Api\CleansChartData;
use FireflyIII\User;
use Illuminate\Http\JsonResponse;
use Psr\Container\ContainerExceptionInterface;
@@ -42,7 +42,7 @@ use Psr\Container\NotFoundExceptionInterface;
*/
class AccountController extends Controller
{
use ConvertsExchangeRates;
use CleansChartData;
private AccountRepositoryInterface $repository;
@@ -81,6 +81,7 @@ class AccountController extends Controller
$start = $dates['start'];
/** @var Carbon $end */
$end = $dates['end'];
$end->endOfDay();
/** @var User $user */
$user = auth()->user();
@@ -120,8 +121,9 @@ class AccountController extends Controller
'native_code' => $default->code,
'native_symbol' => $default->symbol,
'native_decimal_places' => (int)$default->decimal_places,
'start_date' => $start->toAtomString(),
'end_date' => $end->toAtomString(),
'start' => $start->toAtomString(),
'end' => $end->toAtomString(),
'period' => '1D',
'entries' => [],
'native_entries' => [],
];
@@ -146,6 +148,6 @@ class AccountController extends Controller
$chartData[] = $currentSet;
}
return response()->json($chartData);
return response()->json($this->clean($chartData));
}
}

13
app/Api/V2/Controllers/Chart/BalanceController.php
View File

@@ -28,7 +28,7 @@ use FireflyIII\Helpers\Collector\GroupCollectorInterface;
use FireflyIII\Models\TransactionCurrency;
use FireflyIII\Models\TransactionType;
use FireflyIII\Repositories\Administration\Account\AccountRepositoryInterface;
use FireflyIII\Support\Http\Api\ConvertsExchangeRates;
use FireflyIII\Support\Http\Api\CleansChartData;
use FireflyIII\Support\Http\Api\ExchangeRateConverter;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Collection;
@@ -38,7 +38,7 @@ use Illuminate\Support\Collection;
*/
class BalanceController extends Controller
{
use ConvertsExchangeRates;
use CleansChartData;
private AccountRepositoryInterface $repository;
@@ -76,6 +76,7 @@ class BalanceController extends Controller
$start = $params['start'];
/** @var Carbon $end */
$end = $params['end'];
$end->endOfDay();
/** @var Collection $accounts */
$accounts = $params['accounts'];
$preferredRange = $params['period'];
@@ -196,6 +197,9 @@ class BalanceController extends Controller
'native_symbol' => $currency['native_symbol'],
'native_code' => $currency['native_code'],
'native_decimal_places' => $currency['native_decimal_places'],
'start' => $start->toAtomString(),
'end' => $end->toAtomString(),
'period' => $preferredRange,
'entries' => [],
'native_entries' => [],
];
@@ -209,6 +213,9 @@ class BalanceController extends Controller
'native_symbol' => $currency['native_symbol'],
'native_code' => $currency['native_code'],
'native_decimal_places' => $currency['native_decimal_places'],
'start' => $start->toAtomString(),
'end' => $end->toAtomString(),
'period' => $preferredRange,
'entries' => [],
'native_entries' => [],
@@ -233,7 +240,7 @@ class BalanceController extends Controller
$chartData[] = $income;
$chartData[] = $expense;
}
return response()->json($chartData);
return response()->json($this->clean($chartData));
}
}