diff --git a/app/Http/Controllers/TelemetryController.php b/app/Http/Controllers/TelemetryController.php index afd0ca9..50dedf9 100644 --- a/app/Http/Controllers/TelemetryController.php +++ b/app/Http/Controllers/TelemetryController.php @@ -43,6 +43,16 @@ class TelemetryController extends Controller } } - + public function download(Request $request) + { + try { + $response = $this->med5minContract->getDiscretization($request->all(), $request->getPathInfo()); + return (new TelemetryResource($response)) + ->response() + ->setStatusCode(Response::HTTP_OK); + } catch (\Exception $ex) { + return $this->errorResponse(false, $ex->getMessage(), Response::HTTP_INTERNAL_SERVER_ERROR); + } + } } \ No newline at end of file diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index ce20c97..9324b8d 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -33,7 +33,7 @@ class UserController extends Controller public function index(): JsonResponse { try { - $response = $this->user->withRelationsByAll('roles'); + $response = $this->user->getOrdered(); return (new UserResource($response)) ->response() ->setStatusCode(Response::HTTP_OK); diff --git a/app/Repositories/Users/UserContractInterface.php b/app/Repositories/Users/UserContractInterface.php index 202be52..301731b 100644 --- a/app/Repositories/Users/UserContractInterface.php +++ b/app/Repositories/Users/UserContractInterface.php @@ -6,5 +6,5 @@ use App\Repositories\ContractInterface; interface UserContractInterface extends ContractInterface { - + public function getOrdered(); } \ No newline at end of file diff --git a/app/Repositories/Users/UserRepository.php b/app/Repositories/Users/UserRepository.php index f3d02f7..c188bfb 100644 --- a/app/Repositories/Users/UserRepository.php +++ b/app/Repositories/Users/UserRepository.php @@ -14,4 +14,8 @@ class UserRepository extends AbstractRepository implements UserContractInterface parent::__construct($user); } + public function getOrdered() + { + return $this->model->with('roles')->orderBy('name')->get(); + } } \ No newline at end of file diff --git a/routes/api.php b/routes/api.php index dffe142..3413bfd 100644 --- a/routes/api.php +++ b/routes/api.php @@ -71,6 +71,8 @@ Route::middleware(['auth:sanctum', 'ability:Client'])->group(function () { Route::post('telemetry/demand', [\App\Http\Controllers\TelemetryController::class, 'discretization']); Route::post('telemetry/discretization', [\App\Http\Controllers\TelemetryController::class, 'discretization']); + Route::get('telemetry/download', [\App\Http\Controllers\TelemetryController::class, 'download']); + Route::post('operation/summary', [\App\Http\Controllers\OperationSummaryController::class, 'operationSummary']); // Resumo Operações Route::post('operation', [\App\Http\Controllers\OperationSummaryController::class, 'index']);