From fc644fa2216c23c7c067df6df1a8647b882db081 Mon Sep 17 00:00:00 2001 From: marcio1002 Date: Wed, 13 Dec 2023 18:46:10 -0300 Subject: [PATCH] =?UTF-8?q?Ajustes=20e=20corre=C3=A7=C3=B5es=20nos=20endpo?= =?UTF-8?q?ints?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Exceptions/Handler.php | 3 +- app/Helpers/ResponseJson.php | 25 +++++++ app/Http/Controllers/Auth/AuthController.php | 38 ++++------ app/Http/Controllers/ClientController.php | 23 +++--- app/Http/Controllers/EconomyController.php | 14 ++-- app/Http/Controllers/FaqController.php | 64 ++++++----------- app/Http/Controllers/NewsController.php | 38 +++++----- .../Controllers/NotificationController.php | 71 ++++++------------- .../OperationSummaryController.php | 35 +++------ app/Http/Controllers/PldController.php | 66 ++++++----------- app/Http/Controllers/TelemetryController.php | 40 ++++------- app/Http/Controllers/UserController.php | 24 ++----- app/Http/Resources/AboutUsResource.php | 16 ----- .../Resources/DadosCadastraisResponse.php | 17 ----- app/Http/Resources/EconomyResource.php | 17 ----- app/Http/Resources/FaqResource.php | 16 ----- app/Http/Resources/NewsResource.php | 17 ----- app/Http/Resources/NotificationResource.php | 17 ----- .../Resources/OperationSummaryResource.php | 17 ----- app/Http/Resources/OverviewResource.php | 17 ----- app/Http/Resources/PldResource.php | 17 ----- app/Http/Resources/TelemetryResource.php | 17 ----- app/Http/Resources/UserResource.php | 19 ----- insertEconomy.php | 12 ++++ routes/api.php | 9 ++- 25 files changed, 195 insertions(+), 454 deletions(-) create mode 100644 app/Helpers/ResponseJson.php delete mode 100644 app/Http/Resources/AboutUsResource.php delete mode 100644 app/Http/Resources/DadosCadastraisResponse.php delete mode 100644 app/Http/Resources/EconomyResource.php delete mode 100644 app/Http/Resources/FaqResource.php delete mode 100644 app/Http/Resources/NewsResource.php delete mode 100644 app/Http/Resources/NotificationResource.php delete mode 100644 app/Http/Resources/OperationSummaryResource.php delete mode 100644 app/Http/Resources/OverviewResource.php delete mode 100644 app/Http/Resources/PldResource.php delete mode 100644 app/Http/Resources/TelemetryResource.php delete mode 100644 app/Http/Resources/UserResource.php create mode 100644 insertEconomy.php diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 67bcce0..ba14f79 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -2,6 +2,7 @@ namespace App\Exceptions; +use App\Helpers\ResponseJson; use Illuminate\Http\Response; use Illuminate\Support\Facades\App; use Illuminate\Database\QueryException; @@ -149,6 +150,6 @@ class Handler extends ExceptionHandler { [$message, $status_code] = $this->messageCustom($ex); - return response()->json(['error' => $message], $status_code); + return ResponseJson::error($message, $status_code); } } diff --git a/app/Helpers/ResponseJson.php b/app/Helpers/ResponseJson.php new file mode 100644 index 0000000..d7977b6 --- /dev/null +++ b/app/Helpers/ResponseJson.php @@ -0,0 +1,25 @@ +json(compact('message'), $status_code); + } + + public static function data(mixed $data, $status_code = Response::HTTP_OK): JsonResponse + { + return response()->json(compact('data'), $status_code); + } + + public static function error(mixed $error, int $status_code): JsonResponse + { + return response()->json(compact('error'), $status_code); + } +} diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index e5fe6d2..4a67647 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -2,13 +2,14 @@ namespace App\Http\Controllers\Auth; +use App\Models\User; +use App\Helpers\ResponseJson; use App\Http\Controllers\Controller; use App\Http\Requests\LoginResquest; -use App\Models\User; + use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; -use Illuminate\Support\Str; -use Laravel\Sanctum\PersonalAccessToken; +use Illuminate\Support\Facades\Auth; class AuthController extends Controller { @@ -16,41 +17,32 @@ class AuthController extends Controller { $credentials = $request->only('email', 'password'); - if (!auth()->attempt($credentials)) - { + if (!auth()->attempt($credentials)) { abort(401, 'Inavalid Credentials'); } $user = User::with('roles')->where('email', $credentials['email'])->firstOrFail(); - $token = $user->createToken('API Token', $user->roles->pluck('name')->toArray()); + $token = $user->createToken( + 'API Token', + $user->roles->pluck('name')->toArray() + ); return response()->json([ 'token' => $token->plainTextToken, 'user' => $user ], 200); - } public function logout(Request $request): JsonResponse { - $requestToken = $request->header('authorization'); + /** + * @var \App\Models\User|null; + */ + $user = Auth::user(); - $array = Str::of($requestToken)->explode('|'); + $user?->currentAccessToken()?->delete(); - $token = (new PersonalAccessToken()) - ->findToken($array->offsetGet(1)); - - if (!$token){ - return response()->json([ - 'message' => 'Token has already been revoked.' - ], 500); - } - - $token->delete(); - - return response()->json([ - 'message' => 'Token Revoked.' - ], 200); + return ResponseJson::message('Token Revoked.'); } } diff --git a/app/Http/Controllers/ClientController.php b/app/Http/Controllers/ClientController.php index 5ea0150..046627e 100644 --- a/app/Http/Controllers/ClientController.php +++ b/app/Http/Controllers/ClientController.php @@ -4,10 +4,10 @@ declare(strict_types=1); namespace App\Http\Controllers; -use App\Http\Resources\DadosCadastraisResponse; -use App\Repositories\DadosCadastrais\DadosCadastraisContractInterface; use App\Traits\ApiResponse; -use Illuminate\Http\Response; +use App\Helpers\ResponseJson; +use App\Repositories\DadosCadastrais\DadosCadastraisContractInterface; + use Illuminate\Http\Request; class ClientController extends Controller @@ -15,19 +15,14 @@ class ClientController extends Controller use ApiResponse; public function __construct( - protected DadosCadastraisContractInterface $dadosCadastraisContract) - { + protected DadosCadastraisContractInterface $dadosCadastraisContract + ) { } public function index(Request $request) { - try { - $response = $this->dadosCadastraisContract->search($request->all()); - return (new DadosCadastraisResponse($response)) - ->response() - ->setStatusCode(Response::HTTP_OK); - } catch (\Exception $ex) { - return $this->errorResponse(false, $ex->getMessage(), Response::HTTP_INTERNAL_SERVER_ERROR); - } + $response = $this->dadosCadastraisContract->search($request->all()); + + return ResponseJson::data($response); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/EconomyController.php b/app/Http/Controllers/EconomyController.php index ce36463..b515e5e 100644 --- a/app/Http/Controllers/EconomyController.php +++ b/app/Http/Controllers/EconomyController.php @@ -4,12 +4,12 @@ declare(strict_types=1); namespace App\Http\Controllers; -use App\Http\Resources\EconomyResource; +use App\Helpers\ResponseJson; use App\Repositories\Economy\EconomyContractInterface; use App\Traits\ApiResponse; + use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; -use Illuminate\Http\Response; class EconomyController extends Controller { @@ -24,14 +24,14 @@ class EconomyController extends Controller { $response = $this->economyContract->search($request->all()); - return response()->json($response, Response::HTTP_OK); + return ResponseJson::data($response); } public function grossAnnualEconomy(Request $request): JsonResponse { $response = $this->economyContract->getGrossAnnualEconomy($request->all()); - return response()->json($response, Response::HTTP_OK); + return ResponseJson::data($response); } public function grossMonthlyEconomy(Request $request): JsonResponse @@ -39,20 +39,20 @@ class EconomyController extends Controller $response = $this->economyContract->getGrossMonthlyEconomy($request->all()); - return response()->json($response, Response::HTTP_OK); + return ResponseJson::data($response); } public function captiveMonthlyEconomy(Request $request): JsonResponse { $response = $this->economyContract->getCaptiveMonthlyEconomy($request->all()); - return response()->json($response, Response::HTTP_OK); + return ResponseJson::data($response); } public function costMWhEconomy(Request $request): JsonResponse { $response = $this->economyContract->getCostMWhEconomy($request->all()); - return response()->json($response, Response::HTTP_OK); + return ResponseJson::data($response); } } diff --git a/app/Http/Controllers/FaqController.php b/app/Http/Controllers/FaqController.php index a32f359..cae109e 100644 --- a/app/Http/Controllers/FaqController.php +++ b/app/Http/Controllers/FaqController.php @@ -4,9 +4,10 @@ declare(strict_types=1); namespace App\Http\Controllers; -use App\Http\Resources\FaqResource; -use App\Repositories\Faqs\FaqContractInterface; use App\Traits\ApiResponse; +use App\Helpers\ResponseJson; +use App\Repositories\Faqs\FaqContractInterface; + use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; use Illuminate\Http\Response; @@ -17,64 +18,41 @@ class FaqController extends Controller public function __construct( protected FaqContractInterface $faq - ){} + ) { + } public function index(): JsonResponse { - try { - $response = $this->faq->all(); - return (new FaqResource($response)) - ->response() - ->setStatusCode(Response::HTTP_OK); - } catch (\Exception $ex) { - return $this->errorResponse(false, $ex->getMessage(), Response::HTTP_INTERNAL_SERVER_ERROR); - } + $response = $this->faq->all(); + + return ResponseJson::data($response); } public function store(Request $notificationRequest): JsonResponse { - try { - $response = $this->faq->create($notificationRequest->all()); - return (new FaqResource($response)) - ->response() - ->setStatusCode(Response::HTTP_CREATED); - } catch (\Exception $ex) { - return $this->errorResponse(false, $ex->getMessage(), Response::HTTP_INTERNAL_SERVER_ERROR); - } + $response = $this->faq->create($notificationRequest->all()); + + return ResponseJson::data($response, Response::HTTP_CREATED); } public function show(int $id): JsonResponse { - try { - $response = $this->faq->find($id); - return (new FaqResource($response)) - ->response() - ->setStatusCode(Response::HTTP_OK); - }catch (\Exception $ex){ - return $this->errorResponse(false, $ex->getMessage(), Response::HTTP_INTERNAL_SERVER_ERROR); - } + $response = $this->faq->find($id); + + return ResponseJson::data($response); } public function update(Request $request, $id): JsonResponse { - try { - $response = $this->faq->update($request->all(), $id); - return (new FaqResource($response)) - ->response() - ->setStatusCode(Response::HTTP_ACCEPTED); - }catch (\Exception $ex){ - return $this->errorResponse(false, $ex->getMessage(), Response::HTTP_INTERNAL_SERVER_ERROR); - } + $response = $this->faq->update($request->all(), $id); + + return ResponseJson::data($response); } public function destroy($id): JsonResponse { - try { - $response = $this->faq->destroy($id); - return response()->json($response, Response::HTTP_NO_CONTENT); - }catch (\Exception $ex){ - return $this->errorResponse(false, $ex->getMessage(), Response::HTTP_INTERNAL_SERVER_ERROR); - } - } + $response = $this->faq->destroy($id); -} \ No newline at end of file + return ResponseJson::data($response); + } +} diff --git a/app/Http/Controllers/NewsController.php b/app/Http/Controllers/NewsController.php index 11fef11..8a9a778 100644 --- a/app/Http/Controllers/NewsController.php +++ b/app/Http/Controllers/NewsController.php @@ -4,27 +4,31 @@ declare(strict_types=1); namespace App\Http\Controllers; -use App\Http\Resources\NewsResource; -use Carbon\Carbon; -use DateTimeZone; -use Illuminate\Http\Response; +use App\Helpers\ResponseJson; + use Illuminate\Support\Arr; +use Illuminate\Support\Carbon; class NewsController extends Controller { public function send() { - try { - $xmlObject = xmlToObject(config('services.webhook.news')); - $resource = @json_decode(@json_encode($xmlObject->children()), true); - $resource = collect($resource['channel']['item']) - ->transform(fn($item) - => Arr::set($item, 'pubDate', Carbon::parse($item['pubDate'])->translatedFormat('D, d F Y H:i:s'))); - return (new NewsResource($resource)) - ->response() - ->setStatusCode(Response::HTTP_OK); - } catch (\Exception $ex) { - return $this->errorResponse(false, $ex->getMessage(), Response::HTTP_INTERNAL_SERVER_ERROR); - } + $xmlObject = xmlToObject(config('services.webhook.news')); + + $resource = \json_decode( + \json_encode($xmlObject->children()), + true + ); + + $resource = collect($resource['channel']['item']) + ->transform( + fn ($item) => Arr::set( + $item, + 'pubDate', + Carbon::parse($item['pubDate'])->translatedFormat('D, d F Y H:i:s') + ) + ); + + return ResponseJson::data($resource); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/NotificationController.php b/app/Http/Controllers/NotificationController.php index 7e8e907..8269d4d 100644 --- a/app/Http/Controllers/NotificationController.php +++ b/app/Http/Controllers/NotificationController.php @@ -4,10 +4,11 @@ declare(strict_types=1); namespace App\Http\Controllers; +use App\Helpers\ResponseJson; use App\Http\Requests\StoreNotificationRequest; -use App\Http\Resources\NotificationResource; use App\Repositories\Notifications\NotificationContractInterface; use App\Traits\ApiResponse; + use Illuminate\Http\Request; use Illuminate\Http\JsonResponse; use Illuminate\Http\Response; @@ -18,75 +19,49 @@ class NotificationController extends Controller public function __construct( protected NotificationContractInterface $notification - ){} + ) { + } public function index(): JsonResponse { - try { - $response = $this->notification->all(); - return (new NotificationResource($response)) - ->response() - ->setStatusCode(Response::HTTP_OK); - } catch (\Exception $ex) { - return $this->errorResponse(false, $ex->getMessage(), Response::HTTP_INTERNAL_SERVER_ERROR); - } + $response = $this->notification->all(); + + return ResponseJson::data($response); } public function store(StoreNotificationRequest $request): JsonResponse { - try { - $response = $this->notification->create($request->validated()); - $response->users()->sync($request->input('users.*.user_id', [])); + $response = $this->notification->create($request->validated()); + $response->users()->sync($request->input('users.*.user_id', [])); - return (new NotificationResource($response)) - ->response() - ->setStatusCode(Response::HTTP_CREATED); - } catch (\Exception $ex) { - return $this->errorResponse(false, $ex->getMessage(), Response::HTTP_INTERNAL_SERVER_ERROR); - } + return ResponseJson::data($response, Response::HTTP_CREATED); } public function show(int $id): JsonResponse { - try { - $response = $this->notification->find($id); - return (new NotificationResource($response)) - ->response() - ->setStatusCode(Response::HTTP_OK); - }catch (\Exception $ex){ - return $this->errorResponse(false, $ex->getMessage(), Response::HTTP_INTERNAL_SERVER_ERROR); - } + $response = $this->notification->find($id); + + return ResponseJson::data($response); } public function update(Request $request, $id): JsonResponse { - try { - $response = $this->notification->update($request->all(), $id); - return (new NotificationResource($response)) - ->response() - ->setStatusCode(Response::HTTP_ACCEPTED); - }catch (\Exception $ex){ - return $this->errorResponse(false, $ex->getMessage(), Response::HTTP_INTERNAL_SERVER_ERROR); - } + $response = $this->notification->update($request->all(), $id); + + return ResponseJson::data($response); } public function destroy($id): JsonResponse { - try { - $response = $this->notification->destroy($id); - return response()->json($response, Response::HTTP_NO_CONTENT); - }catch (\Exception $ex){ - return $this->errorResponse(false, $ex->getMessage(), Response::HTTP_INTERNAL_SERVER_ERROR); - } + $response = $this->notification->destroy($id); + + return ResponseJson::data($response); } public function notify() { - try { - $response = $this->notification->getNotify(); - return response()->json($response, Response::HTTP_OK); - }catch (\Exception $ex){ - return $this->errorResponse(false, $ex->getMessage(), Response::HTTP_INTERNAL_SERVER_ERROR); - } + $response = $this->notification->getNotify(); + + return ResponseJson::data($response); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/OperationSummaryController.php b/app/Http/Controllers/OperationSummaryController.php index 20a6206..ec5d281 100644 --- a/app/Http/Controllers/OperationSummaryController.php +++ b/app/Http/Controllers/OperationSummaryController.php @@ -5,12 +5,11 @@ declare(strict_types=1); namespace App\Http\Controllers; use App\Helpers\Helpers; -use App\Http\Resources\OperationSummaryResource; -use App\Repositories\DadosTe\DadosTeContractInterface; use App\Traits\ApiResponse; -use DateTime; +use App\Helpers\ResponseJson; +use App\Repositories\DadosTe\DadosTeContractInterface; + use Illuminate\Http\Request; -use Illuminate\Http\Response; class OperationSummaryController extends Controller { @@ -18,33 +17,21 @@ class OperationSummaryController extends Controller public function __construct( protected DadosTeContractInterface $dadosTeContract - ) - { + ) { } public function index(Request $request) { - try { - $response = $this->dadosTeContract->search($request->all(), true); - $response = Helpers::orderByDate($response, 'm/Y'); - return (new OperationSummaryResource($response)) - ->response() - ->setStatusCode(Response::HTTP_OK); - } catch (\Exception $ex) { - return $this->errorResponse(false, $ex->getMessage(), Response::HTTP_INTERNAL_SERVER_ERROR); - } + $response = $this->dadosTeContract->search($request->all(), true); + $response = Helpers::orderByDate($response, 'm/Y'); + + return ResponseJson::data($response); } public function operationSummary(Request $request) { - try { - $response = $this->dadosTeContract->getOperationSummary($request->all()); - return (new OperationSummaryResource($response)) - ->response() - ->setStatusCode(Response::HTTP_OK); - } catch (\Exception $ex) { - return $this->errorResponse(false, $ex->getMessage(), Response::HTTP_INTERNAL_SERVER_ERROR); - } - } + $response = $this->dadosTeContract->getOperationSummary($request->all()); + return ResponseJson::data($response); + } } diff --git a/app/Http/Controllers/PldController.php b/app/Http/Controllers/PldController.php index de9af4a..b518509 100644 --- a/app/Http/Controllers/PldController.php +++ b/app/Http/Controllers/PldController.php @@ -5,11 +5,11 @@ declare(strict_types=1); namespace App\Http\Controllers; use App\Helpers\Helpers; -use App\Http\Resources\PldResource; -use App\Repositories\Pld\PldContractInterface; +use App\Helpers\ResponseJson; use App\Traits\ApiResponse; +use App\Repositories\Pld\PldContractInterface; + use Illuminate\Http\Request; -use Illuminate\Http\Response; class PldController extends Controller { @@ -18,66 +18,42 @@ class PldController extends Controller public function __construct( protected PldContractInterface $pldContract - ){} + ) { + } public function index(Request $request) { - try { - $response = $this->pldContract->search($request->all()); - $response = Helpers::orderByDate($response, 'm/Y', 'mes_ref'); - return (new PldResource($response)) - ->response() - ->setStatusCode(Response::HTTP_OK); - }catch (\Exception $ex){ - return $this->errorResponse(false, $ex->getMessage(), Response::HTTP_INTERNAL_SERVER_ERROR); - } + $response = $this->pldContract->search($request->all()); + $response = Helpers::orderByDate($response, 'm/Y', 'mes_ref'); + + return ResponseJson::data($response); } public function overviewByRegion() { - try { - $response = $this->pldContract->getOverviewByRegion(); - return (new PldResource($response)) - ->response() - ->setStatusCode(Response::HTTP_OK); - }catch (\Exception $ex){ - return $this->errorResponse(false, $ex->getMessage(), Response::HTTP_INTERNAL_SERVER_ERROR); - } + $response = $this->pldContract->getOverviewByRegion(); + + return ResponseJson::data($response); } public function listConsumption(Request $request) { - try { - $response = $this->pldContract->getListConsumption($request->all()); - return (new PldResource($response)) - ->response() - ->setStatusCode(Response::HTTP_OK); - }catch (\Exception $ex){ - return $this->errorResponse(false, $ex->getMessage(), Response::HTTP_INTERNAL_SERVER_ERROR); - } + $response = $this->pldContract->getListConsumption($request->all()); + + return ResponseJson::data($response); } public function consumptionByDaily(Request $request) { - try { - $response = $this->pldContract->getConsumptionByDaily($request->all()); - return (new PldResource($response)) - ->response() - ->setStatusCode(Response::HTTP_OK); - }catch (\Exception $ex){ - return $this->errorResponse(false, $ex->getMessage(), Response::HTTP_INTERNAL_SERVER_ERROR); - } + $response = $this->pldContract->getConsumptionByDaily($request->all()); + + return ResponseJson::data($response); } public function consumptionBySchedule(Request $request) { - try { - $response = $this->pldContract->getConsumptionBySchedule($request->all()); - return (new PldResource($response)) - ->response() - ->setStatusCode(Response::HTTP_OK); - }catch (\Exception $ex){ - return $this->errorResponse(false, $ex->getMessage(), Response::HTTP_INTERNAL_SERVER_ERROR); - } + $response = $this->pldContract->getConsumptionBySchedule($request->all()); + + return ResponseJson::data($response); } } diff --git a/app/Http/Controllers/TelemetryController.php b/app/Http/Controllers/TelemetryController.php index 50dedf9..435535c 100644 --- a/app/Http/Controllers/TelemetryController.php +++ b/app/Http/Controllers/TelemetryController.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace App\Http\Controllers; +use App\Helpers\ResponseJson; use App\Http\Resources\TelemetryResource; use App\Repositories\Med5min\Med5minContractInterface; use App\Traits\ApiResponse; @@ -17,42 +18,27 @@ class TelemetryController extends Controller public function __construct( protected Med5minContractInterface $med5minContract - ){} + ) { + } public function index(Request $request) { - try { - $response = $this->med5minContract->search($request->all()); - return (new TelemetryResource($response)) - ->response() - ->setStatusCode(Response::HTTP_OK); - } catch (\Exception $ex) { - return $this->errorResponse(false, $ex->getMessage(), Response::HTTP_INTERNAL_SERVER_ERROR); - } + $response = $this->med5minContract->search($request->all()); + + return ResponseJson::data($response); } public function discretization(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); - } + $response = $this->med5minContract->getDiscretization($request->all(), $request->getPathInfo()); + + return ResponseJson::data($response); } 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); - } - } + $response = $this->med5minContract->getDiscretization($request->all(), $request->getPathInfo()); -} \ No newline at end of file + return ResponseJson::data($response); + } +} diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index ab303d6..9b5dd62 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -4,9 +4,9 @@ declare(strict_types=1); namespace App\Http\Controllers; +use App\Helpers\ResponseJson; use App\Http\Requests\ImportUsersWithSmartUsersRequest; use App\Traits\ApiResponse; -use App\Http\Resources\UserResource; use App\Http\Requests\StoreUserRequest; use App\Imports\UsersWithSmartUsersImport; use App\Repositories\Users\UserContractInterface; @@ -36,9 +36,7 @@ class UserController extends Controller { $response = $this->user->getOrdered(); - return (new UserResource($response)) - ->response() - ->setStatusCode(Response::HTTP_OK); + return ResponseJson::data($response); } /** @@ -62,9 +60,7 @@ class UserController extends Controller $response = $this->user->create($data); $response->roles()->sync($data['role']); - return (new UserResource($response)) - ->response() - ->setStatusCode(Response::HTTP_CREATED); + return ResponseJson::data($response, Response::HTTP_CREATED); } /** @@ -77,9 +73,7 @@ class UserController extends Controller { $response = $this->user->find($id); - return (new UserResource($response)) - ->response() - ->setStatusCode(Response::HTTP_OK); + return ResponseJson::data($response); } /** @@ -95,9 +89,7 @@ class UserController extends Controller $data['password'] = $request->password; $response = $this->user->update($data, $id); - return (new UserResource($response)) - ->response() - ->setStatusCode(Response::HTTP_ACCEPTED); + return ResponseJson::data($response); } /** @@ -109,7 +101,7 @@ class UserController extends Controller public function destroy($id): JsonResponse { $response = $this->user->destroy($id); - + return response()->json($response, Response::HTTP_NO_CONTENT); } @@ -134,9 +126,7 @@ class UserController extends Controller disk: $disk, ); - return response() - ->json(['message' => 'Dados importados com sucesso!']) - ->setStatusCode(Response::HTTP_CREATED); + return ResponseJson::message('Dados importados com sucesso!', Response::HTTP_CREATED); } catch (\Throwable $th) { throw $th; } finally { diff --git a/app/Http/Resources/AboutUsResource.php b/app/Http/Resources/AboutUsResource.php deleted file mode 100644 index f68949e..0000000 --- a/app/Http/Resources/AboutUsResource.php +++ /dev/null @@ -1,16 +0,0 @@ -group(function (){ Route::post('login', [\App\Http\Controllers\Auth\AuthController::class, 'login']); - Route::post('logout', [\App\Http\Controllers\Auth\AuthController::class, 'logout']); Route::post('/forgot-password', \App\Http\Controllers\Auth\ForgotPasswordController::class); Route::post('/reset-password', \App\Http\Controllers\Auth\ResetPasswordController::class); }); +/* --- Routes verified --- */ Route::middleware(['auth:sanctum', 'verified'])->group(function () { Route::get('notification', [\App\Http\Controllers\NotificationController::class, 'index']); Route::get('notification/{notification}', [\App\Http\Controllers\NotificationController::class, 'show']); @@ -35,6 +35,7 @@ Route::middleware(['auth:sanctum', 'verified'])->group(function () { Route::get('download', [\App\Http\Controllers\InfoSectorialController::class, 'download']); }); +/* --- Routes Admin --- */ Route::middleware(['auth:sanctum', 'ability:Admin'])->group(function () { Route::apiResource('user', \App\Http\Controllers\UserController::class); @@ -53,6 +54,7 @@ Route::middleware(['auth:sanctum', 'ability:Admin'])->group(function () { Route::post('sendFile', [\App\Http\Controllers\FileController::class, 'store']); }); +/* --- Routes Client --- */ Route::middleware(['auth:sanctum', 'ability:Client'])->group(function () { Route::post('pld/overview', [\App\Http\Controllers\PldController::class, 'overviewByRegion']); //Visão Geral por Região @@ -81,4 +83,9 @@ Route::middleware(['auth:sanctum', 'ability:Client'])->group(function () { }); +/* --- Routes Admin and Client --- */ +Route::middleware(['auth:sanctum', 'ability:Admin,Client'])->group(function() { + Route::post('logout', [\App\Http\Controllers\Auth\AuthController::class, 'logout']); +}); + Route::post('import', [\App\Http\Controllers\UserController::class, 'importUserControll']); \ No newline at end of file