Clean up v2 api points.

This commit is contained in:
James Cole 2023-10-29 06:09:21 +01:00
parent 4bb171128e
commit aa1a521cf0
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
7 changed files with 17 additions and 32 deletions

View File

@ -66,5 +66,5 @@ parameters:
- ../bootstrap/app.php
# The level 8 is the highest level. original was 5
level: 4
level: 1

View File

@ -45,23 +45,6 @@ class BalanceController extends Controller
{
use CleansChartData;
private AccountRepositoryInterface $repository;
/**
*
*/
public function __construct()
{
parent::__construct();
$this->middleware(
function ($request, $next) {
$this->repository = app(AccountRepositoryInterface::class);
return $next($request);
}
);
}
/**
* The code is practically a duplicate of ReportController::operations.
*

View File

@ -33,9 +33,9 @@ use Illuminate\Http\Request;
use Illuminate\Pagination\LengthAwarePaginator;
/**
* Class ListController
* Class IndexController
*/
class ListController extends Controller
class IndexController extends Controller
{
private BudgetRepositoryInterface $repository;
@ -61,13 +61,12 @@ class ListController extends Controller
*/
public function index(Request $request): JsonResponse
{
echo 'this needs move to Administration';
throw new FireflyException('Needs migration to IndexController');
$pageSize = $this->parameters->get('limit');
$collection = $this->repository->getActiveBudgets();
$total = $collection->count();
$collection->slice($this->pageXSize * $this->parameters->get('page'), $this->pXageSize);
$collection->slice($pageSize * $this->parameters->get('page'), $pageSize);
$paginator = new LengthAwarePaginator($collection, $total, $this->pagXeSize, $this->parameters->get('page'));
$paginator = new LengthAwarePaginator($collection, $total, $pageSize, $this->parameters->get('page'));
$transformer = new BudgetTransformer();
return response()

View File

@ -59,18 +59,20 @@ class ShowController extends Controller
}
/**
* 2023-10-29 removed the cerSum reference, not sure where this is used atm
* so removed from api.php. Also applies to "spent" method.
*
* This endpoint is documented at:
* TODO add URL
*
*/
public function budgeted(DateRequest $request, Budget $budget): JsonResponse
{
throw new FireflyException('Needs refactoring, uses deprecated method.');
$data = $request->getAll();
$result = $this->repository->budgetedInPeriodForBudget($budget, $data['start'], $data['end']);
$converted = $this->cerSum(array_values($result));
//$converted = $this->cerSum(array_values($result));
return response()->json($converted);
return response()->json($result);
}
/**
@ -80,11 +82,10 @@ class ShowController extends Controller
*/
public function spent(DateRequest $request, Budget $budget): JsonResponse
{
throw new FireflyException('Needs refactoring, uses deprecated method.');
$data = $request->getAll();
$result = $this->repository->spentInPeriodForBudget($budget, $data['start'], $data['end']);
$converted = $this->cerSum(array_values($result));
// $converted = $this->cerSum(array_values($result));
return response()->json($converted);
return response()->json($result);
}
}

View File

@ -186,6 +186,7 @@ class NetWorth implements NetWorthInterface
/**
* @inheritDoc
* @deprecated
*/
public function sumNetWorthByCurrency(Carbon $date): array
{

View File

@ -68,6 +68,7 @@ interface NetWorthInterface
* @param Carbon $date
*
* @return array
* @deprecated
*/
public function sumNetWorthByCurrency(Carbon $date): array;
}

View File

@ -186,8 +186,8 @@ Route::group(
Route::get('{budget}/limits', ['uses' => 'BudgetLimit\IndexController@index', 'as' => 'budget-limits.index']);
Route::get('sum/budgeted', ['uses' => 'Budget\IndexController@budgeted', 'as' => 'sum.budgeted']);
Route::get('sum/spent', ['uses' => 'Budget\IndexController@spent', 'as' => 'sum.spent']);
Route::get('{budget}/budgeted', ['uses' => 'Budget\ShowController@budgeted', 'as' => 'budget.budgeted']);
Route::get('{budget}/spent', ['uses' => 'Budget\ShowController@spent', 'as' => 'budget.spent']);
//Route::get('{budget}/budgeted', ['uses' => 'Budget\ShowController@budgeted', 'as' => 'budget.budgeted']);
//Route::get('{budget}/spent', ['uses' => 'Budget\ShowController@spent', 'as' => 'budget.spent']);
}
);