Modificações com padronização de retorno nas rotas e algumas correções

This commit is contained in:
marcio1002 2024-01-29 15:12:22 -03:00
parent 0b58e2923b
commit 8a4f4daaa5
34 changed files with 454 additions and 203 deletions

View File

@ -3,6 +3,7 @@ APP_ENV=local
APP_KEY= APP_KEY=
APP_DEBUG=true APP_DEBUG=true
APP_URL=http://localhost APP_URL=http://localhost
FRONTEND_URL=http://localhost:3444
LOG_CHANNEL=stack LOG_CHANNEL=stack
LOG_DEPRECATIONS_CHANNEL=null LOG_DEPRECATIONS_CHANNEL=null

1
.gitignore vendored
View File

@ -4,6 +4,7 @@
/storage/*.key /storage/*.key
/vendor /vendor
.env .env
.env.local
.env.backup .env.backup
.phpunit.result.cache .phpunit.result.cache
Homestead.json Homestead.json

View File

@ -1,64 +1,3 @@
<p align="center"><a href="https://laravel.com" target="_blank"><img src="https://raw.githubusercontent.com/laravel/art/master/logo-lockup/5%20SVG/2%20CMYK/1%20Full%20Color/laravel-logolockup-cmyk-red.svg" width="400"></a></p> # API
<p align="center"> ## Requerimentos
<a href="https://travis-ci.org/laravel/framework"><img src="https://travis-ci.org/laravel/framework.svg" alt="Build Status"></a>
<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/dt/laravel/framework" alt="Total Downloads"></a>
<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/v/laravel/framework" alt="Latest Stable Version"></a>
<a href="https://packagist.org/packages/laravel/framework"><img src="https://img.shields.io/packagist/l/laravel/framework" alt="License"></a>
</p>
## About Laravel
Laravel is a web application framework with expressive, elegant syntax. We believe development must be an enjoyable and creative experience to be truly fulfilling. Laravel takes the pain out of development by easing common tasks used in many web projects, such as:
- [Simple, fast routing engine](https://laravel.com/docs/routing).
- [Powerful dependency injection container](https://laravel.com/docs/container).
- Multiple back-ends for [session](https://laravel.com/docs/session) and [cache](https://laravel.com/docs/cache) storage.
- Expressive, intuitive [database ORM](https://laravel.com/docs/eloquent).
- Database agnostic [schema migrations](https://laravel.com/docs/migrations).
- [Robust background job processing](https://laravel.com/docs/queues).
- [Real-time event broadcasting](https://laravel.com/docs/broadcasting).
Laravel is accessible, powerful, and provides tools required for large, robust applications.
## Learning Laravel
Laravel has the most extensive and thorough [documentation](https://laravel.com/docs) and video tutorial library of all modern web application frameworks, making it a breeze to get started with the framework.
If you don't feel like reading, [Laracasts](https://laracasts.com) can help. Laracasts contains over 2000 video tutorials on a range of topics including Laravel, modern PHP, unit testing, and JavaScript. Boost your skills by digging into our comprehensive video library.
## Laravel Sponsors
We would like to extend our thanks to the following sponsors for funding Laravel development. If you are interested in becoming a sponsor, please visit the Laravel [Patreon page](https://patreon.com/taylorotwell).
### Premium Partners
- **[Vehikl](https://vehikl.com/)**
- **[Tighten Co.](https://tighten.co)**
- **[Kirschbaum Development Group](https://kirschbaumdevelopment.com)**
- **[64 Robots](https://64robots.com)**
- **[Cubet Techno Labs](https://cubettech.com)**
- **[Cyber-Duck](https://cyber-duck.co.uk)**
- **[Many](https://www.many.co.uk)**
- **[Webdock, Fast VPS Hosting](https://www.webdock.io/en)**
- **[DevSquad](https://devsquad.com)**
- **[Curotec](https://www.curotec.com/services/technologies/laravel/)**
- **[OP.GG](https://op.gg)**
- **[WebReinvent](https://webreinvent.com/?utm_source=laravel&utm_medium=github&utm_campaign=patreon-sponsors)**
- **[Lendio](https://lendio.com)**
## Contributing
Thank you for considering contributing to the Laravel framework! The contribution guide can be found in the [Laravel documentation](https://laravel.com/docs/contributions).
## Code of Conduct
In order to ensure that the Laravel community is welcoming to all, please review and abide by the [Code of Conduct](https://laravel.com/docs/contributions#code-of-conduct).
## Security Vulnerabilities
If you discover a security vulnerability within Laravel, please send an e-mail to Taylor Otwell via [taylor@laravel.com](mailto:taylor@laravel.com). All security vulnerabilities will be promptly addressed.
## License
The Laravel framework is open-sourced software licensed under the [MIT license](https://opensource.org/licenses/MIT).

View File

@ -16,6 +16,7 @@ class Kernel extends ConsoleKernel
protected function schedule(Schedule $schedule) protected function schedule(Schedule $schedule)
{ {
// $schedule->command('inspire')->hourly(); // $schedule->command('inspire')->hourly();
$schedule->command('telescope:prune')->cron('0 0 */21 * *');
} }
/** /**

View File

@ -2,7 +2,7 @@
namespace App\Exceptions; namespace App\Exceptions;
use App\Helpers\ResponseJson; use App\Helpers\ResponseJsonMessage;
use Illuminate\Http\Response; use Illuminate\Http\Response;
use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\App;
use Illuminate\Database\QueryException; use Illuminate\Database\QueryException;
@ -51,13 +51,12 @@ class Handler extends ExceptionHandler
private function messageCustom(\Throwable $ex): array private function messageCustom(\Throwable $ex): array
{ {
$messageCustom = []; $messageCustom = [];
$class_exceptions = [ $class_exceptions = [
AuthorizationException::class => fn ($e) => [ AuthorizationException::class => fn ($e) => [
'Unauthorized', 'Forbidden',
Response::HTTP_UNAUTHORIZED Response::HTTP_FORBIDDEN
], ],
AuthenticationException::class => fn ($e) => [ AuthenticationException::class => fn ($e) => [
@ -115,7 +114,6 @@ class Handler extends ExceptionHandler
]; ];
} }
return $messageCustom; return $messageCustom;
} }
@ -135,7 +133,7 @@ class Handler extends ExceptionHandler
Log::error($message); Log::error($message);
return false; return false; //https://laravel.com/docs/9.x/errors#reporting-exceptions
}); });
} }
@ -150,6 +148,6 @@ class Handler extends ExceptionHandler
{ {
[$message, $status_code] = $this->messageCustom($ex); [$message, $status_code] = $this->messageCustom($ex);
return ResponseJson::error($message, $status_code); return ResponseJsonMessage::withError($message, $status_code);
} }
} }

View File

@ -5,20 +5,20 @@ namespace App\Helpers;
use Illuminate\Http\Response; use Illuminate\Http\Response;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
class ResponseJson class ResponseJsonMessage
{ {
public static function message(string $message, $status_code = Response::HTTP_OK): JsonResponse public static function withMessage(string $message, $status_code = Response::HTTP_OK): JsonResponse
{ {
return response()->json(compact('message'), $status_code); return response()->json(compact('message'), $status_code);
} }
public static function data(mixed $data, $status_code = Response::HTTP_OK): JsonResponse public static function withData(mixed $data, $status_code = Response::HTTP_OK): JsonResponse
{ {
return response()->json(compact('data'), $status_code); return response()->json(compact('data'), $status_code);
} }
public static function error(mixed $error, int $status_code): JsonResponse public static function withError(mixed $error, int $status_code): JsonResponse
{ {
return response()->json(compact('error'), $status_code); return response()->json(compact('error'), $status_code);
} }

View File

@ -4,17 +4,13 @@ declare(strict_types=1);
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Helpers\ResponseJson; use App\Helpers\ResponseJsonMessage;
use App\Http\Requests\StoreAboutUsRequest; use App\Http\Requests\StoreAboutUsRequest;
use App\Http\Resources\AboutUsResource;
use App\Repositories\AboutUs\AboutUsContractInterface; use App\Repositories\AboutUs\AboutUsContractInterface;
use App\Traits\ApiResponse;
use Illuminate\Http\Response;
class AboutUsController extends Controller class AboutUsController extends Controller
{ {
use ApiResponse;
public function __construct( public function __construct(
protected AboutUsContractInterface $aboutUsContract protected AboutUsContractInterface $aboutUsContract
@ -25,7 +21,7 @@ class AboutUsController extends Controller
{ {
$response = $this->aboutUsContract->all(); $response = $this->aboutUsContract->all();
return ResponseJson::data($response); return ResponseJsonMessage::withData($response);
} }
@ -40,6 +36,6 @@ class AboutUsController extends Controller
$response = $this->aboutUsContract->create($aboutUsRequest->validated()); $response = $this->aboutUsContract->create($aboutUsRequest->validated());
} }
return ResponseJson::data($response); return ResponseJsonMessage::withData($response);
} }
} }

View File

@ -3,7 +3,7 @@
namespace App\Http\Controllers\Auth; namespace App\Http\Controllers\Auth;
use App\Models\User; use App\Models\User;
use App\Helpers\ResponseJson; use App\Helpers\ResponseJsonMessage;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Http\Requests\LoginResquest; use App\Http\Requests\LoginResquest;
@ -43,6 +43,6 @@ class AuthController extends Controller
$user?->currentAccessToken()?->delete(); $user?->currentAccessToken()?->delete();
return ResponseJson::message('Token Revoked.'); return ResponseJsonMessage::withMessage('Token Revoked.');
} }
} }

View File

@ -2,11 +2,11 @@
namespace App\Http\Controllers\Auth; namespace App\Http\Controllers\Auth;
use App\Helpers\ResponseJson; use App\Helpers\ResponseJsonMessage;
use App\Http\Requests\ForgotPasswordRequest; use App\Http\Requests\ForgotPasswordRequest;
use App\Mail\ResetPassword; use App\Mail\ResetPassword;
use App\Models\User; use App\Models\User;
use App\Traits\ApiResponse;
use Carbon\Carbon; use Carbon\Carbon;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@ -17,7 +17,7 @@ use Illuminate\Support\Facades\DB;
class ForgotPasswordController extends Controller class ForgotPasswordController extends Controller
{ {
use ApiResponse;
public function __invoke(ForgotPasswordRequest $request) public function __invoke(ForgotPasswordRequest $request)
{ {
@ -25,7 +25,7 @@ class ForgotPasswordController extends Controller
$is_email = User::where('email', $email)->exists(); $is_email = User::where('email', $email)->exists();
if (!$is_email) return ResponseJson::error( if (!$is_email) return ResponseJsonMessage::withError(
'Esse e-mail não existe no nosso sistema', 'Esse e-mail não existe no nosso sistema',
Response::HTTP_BAD_REQUEST Response::HTTP_BAD_REQUEST
); );
@ -43,7 +43,7 @@ class ForgotPasswordController extends Controller
Mail::to($email)->send(new ResetPassword($token)); Mail::to($email)->send(new ResetPassword($token));
return ResponseJson::message("Verifique seu e-mail"); return ResponseJsonMessage::withMessage("Verifique seu e-mail");
} }

View File

@ -2,17 +2,17 @@
namespace App\Http\Controllers\Auth; namespace App\Http\Controllers\Auth;
use App\Models\User;
use App\Helpers\ResponseJsonMessage;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Http\Requests\ResetPasswordRequest; use App\Http\Requests\ResetPasswordRequest;
use App\Models\User;
use App\Traits\ApiResponse; use Illuminate\Support\Carbon;
use Carbon\Carbon;
use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Hash;
class ResetPasswordController extends Controller class ResetPasswordController extends Controller
{ {
use ApiResponse;
public function __invoke(ResetPasswordRequest $resetPasswordRequest) public function __invoke(ResetPasswordRequest $resetPasswordRequest)
{ {
@ -24,11 +24,12 @@ class ResetPasswordController extends Controller
if ($check->exists()) { if ($check->exists()) {
$difference = Carbon::now()->diffInSeconds($check->first()->created_at); $difference = Carbon::now()->diffInSeconds($check->first()->created_at);
if ($difference > 3600) { if ($difference > 3600) {
return $this->errorResponse(false, "Token Expired", 400); return ResponseJsonMessage::withError("Token Expired", 400);
} }
$delete = DB::table('password_resets')->where([ DB::table('password_resets')->where([
['email', $resetPasswordRequest->email], ['email', $resetPasswordRequest->email],
['token', $resetPasswordRequest->token], ['token', $resetPasswordRequest->token],
])->delete(); ])->delete();
@ -39,11 +40,7 @@ class ResetPasswordController extends Controller
'password' => $resetPasswordRequest->password 'password' => $resetPasswordRequest->password
]); ]);
return $this->successResponse([ ResponseJsonMessage::withData($user);
'user' => $user
],
"You can now reset your password",
200);
} else { } else {
return $this->errorResponse(false, "Invalid token", 401); return $this->errorResponse(false, "Invalid token", 401);

View File

@ -4,16 +4,14 @@ declare(strict_types=1);
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Traits\ApiResponse;
use App\Helpers\ResponseJson; use App\Helpers\ResponseJsonMessage;
use App\Repositories\DadosCadastrais\DadosCadastraisContractInterface; use App\Repositories\DadosCadastrais\DadosCadastraisContractInterface;
use Illuminate\Http\Request; use Illuminate\Http\Request;
class ClientController extends Controller class ClientController extends Controller
{ {
use ApiResponse;
public function __construct( public function __construct(
protected DadosCadastraisContractInterface $dadosCadastraisContract protected DadosCadastraisContractInterface $dadosCadastraisContract
) { ) {
@ -23,6 +21,6 @@ class ClientController extends Controller
{ {
$response = $this->dadosCadastraisContract->search($request->all()); $response = $this->dadosCadastraisContract->search($request->all());
return ResponseJson::data($response); return ResponseJsonMessage::withData($response);
} }
} }

View File

@ -4,16 +4,16 @@ declare(strict_types=1);
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Helpers\ResponseJson; use App\Helpers\ResponseJsonMessage;
use App\Repositories\Economy\EconomyContractInterface; use App\Repositories\Economy\EconomyContractInterface;
use App\Traits\ApiResponse;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
class EconomyController extends Controller class EconomyController extends Controller
{ {
use ApiResponse;
public function __construct( public function __construct(
protected EconomyContractInterface $economyContract protected EconomyContractInterface $economyContract
@ -24,14 +24,14 @@ class EconomyController extends Controller
{ {
$response = $this->economyContract->search($request->all()); $response = $this->economyContract->search($request->all());
return ResponseJson::data($response); return ResponseJsonMessage::withData($response);
} }
public function grossAnnualEconomy(Request $request): JsonResponse public function grossAnnualEconomy(Request $request): JsonResponse
{ {
$response = $this->economyContract->getGrossAnnualEconomy($request->all()); $response = $this->economyContract->getGrossAnnualEconomy($request->all());
return ResponseJson::data($response); return ResponseJsonMessage::withData($response);
} }
public function grossMonthlyEconomy(Request $request): JsonResponse public function grossMonthlyEconomy(Request $request): JsonResponse
@ -39,20 +39,20 @@ class EconomyController extends Controller
$response = $this->economyContract->getGrossMonthlyEconomy($request->all()); $response = $this->economyContract->getGrossMonthlyEconomy($request->all());
return ResponseJson::data($response); return ResponseJsonMessage::withData($response);
} }
public function captiveMonthlyEconomy(Request $request): JsonResponse public function captiveMonthlyEconomy(Request $request): JsonResponse
{ {
$response = $this->economyContract->getCaptiveMonthlyEconomy($request->all()); $response = $this->economyContract->getCaptiveMonthlyEconomy($request->all());
return ResponseJson::data($response); return ResponseJsonMessage::withData($response);
} }
public function costMWhEconomy(Request $request): JsonResponse public function costMWhEconomy(Request $request): JsonResponse
{ {
$response = $this->economyContract->getCostMWhEconomy($request->all()); $response = $this->economyContract->getCostMWhEconomy($request->all());
return ResponseJson::data($response); return ResponseJsonMessage::withData($response);
} }
} }

View File

@ -4,8 +4,8 @@ declare(strict_types=1);
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Traits\ApiResponse;
use App\Helpers\ResponseJson; use App\Helpers\ResponseJsonMessage;
use App\Repositories\Faqs\FaqContractInterface; use App\Repositories\Faqs\FaqContractInterface;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
@ -14,7 +14,7 @@ use Illuminate\Http\Response;
class FaqController extends Controller class FaqController extends Controller
{ {
use ApiResponse;
public function __construct( public function __construct(
protected FaqContractInterface $faq protected FaqContractInterface $faq
@ -25,34 +25,34 @@ class FaqController extends Controller
{ {
$response = $this->faq->all(); $response = $this->faq->all();
return ResponseJson::data($response); return ResponseJsonMessage::withData($response);
} }
public function store(Request $notificationRequest): JsonResponse public function store(Request $notificationRequest): JsonResponse
{ {
$response = $this->faq->create($notificationRequest->all()); $response = $this->faq->create($notificationRequest->all());
return ResponseJson::data($response, Response::HTTP_CREATED); return ResponseJsonMessage::withData($response, Response::HTTP_CREATED);
} }
public function show(int $id): JsonResponse public function show(int $id): JsonResponse
{ {
$response = $this->faq->find($id); $response = $this->faq->find($id);
return ResponseJson::data($response); return ResponseJsonMessage::withData($response);
} }
public function update(Request $request, $id): JsonResponse public function update(Request $request, $id): JsonResponse
{ {
$response = $this->faq->update($request->all(), $id); $response = $this->faq->update($request->all(), $id);
return ResponseJson::data($response); return ResponseJsonMessage::withData($response);
} }
public function destroy($id): JsonResponse public function destroy($id): JsonResponse
{ {
$response = $this->faq->destroy($id); $response = $this->faq->destroy($id);
return ResponseJson::data($response); return ResponseJsonMessage::withData($response);
} }
} }

View File

@ -4,16 +4,16 @@ declare(strict_types=1);
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Helpers\ResponseJson; use App\Helpers\ResponseJsonMessage;
use App\Http\Requests\UploadInfoSectorialRequest; use App\Http\Requests\UploadInfoSectorialRequest;
use App\Models\InfoSectorial; use App\Models\InfoSectorial;
use App\Traits\ApiResponse;
use Illuminate\Support\Facades\Storage; use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Str; use Illuminate\Support\Str;
class InfoSectorialController extends Controller class InfoSectorialController extends Controller
{ {
use ApiResponse;
public function updateFile(UploadInfoSectorialRequest $uploadInfoSectorialRequest) public function updateFile(UploadInfoSectorialRequest $uploadInfoSectorialRequest)
{ {
@ -39,7 +39,7 @@ class InfoSectorialController extends Controller
$data = InfoSectorial::where('created_at', '=', $created_at)->first(); $data = InfoSectorial::where('created_at', '=', $created_at)->first();
return ResponseJson::data( return ResponseJsonMessage::withData(
!empty($data) ? Storage::disk('s3')->url($data->path) : '' !empty($data) ? Storage::disk('s3')->url($data->path) : ''
); );
} }

View File

@ -4,7 +4,7 @@ declare(strict_types=1);
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Helpers\ResponseJson; use App\Helpers\ResponseJsonMessage;
use Illuminate\Support\Arr; use Illuminate\Support\Arr;
use Illuminate\Support\Carbon; use Illuminate\Support\Carbon;
@ -29,6 +29,6 @@ class NewsController extends Controller
) )
); );
return ResponseJson::data($resource); return ResponseJsonMessage::withData($resource);
} }
} }

View File

@ -4,10 +4,10 @@ declare(strict_types=1);
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Helpers\ResponseJson; use App\Helpers\ResponseJsonMessage;
use App\Http\Requests\StoreNotificationRequest; use App\Http\Requests\StoreNotificationRequest;
use App\Repositories\Notifications\NotificationContractInterface; use App\Repositories\Notifications\NotificationContractInterface;
use App\Traits\ApiResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
@ -15,7 +15,7 @@ use Illuminate\Http\Response;
class NotificationController extends Controller class NotificationController extends Controller
{ {
use ApiResponse;
public function __construct( public function __construct(
protected NotificationContractInterface $notification protected NotificationContractInterface $notification
@ -26,7 +26,7 @@ class NotificationController extends Controller
{ {
$response = $this->notification->all(); $response = $this->notification->all();
return ResponseJson::data($response); return ResponseJsonMessage::withData($response);
} }
public function store(StoreNotificationRequest $request): JsonResponse public function store(StoreNotificationRequest $request): JsonResponse
@ -34,34 +34,34 @@ class NotificationController extends Controller
$response = $this->notification->create($request->validated()); $response = $this->notification->create($request->validated());
$response->users()->sync($request->input('users.*.user_id', [])); $response->users()->sync($request->input('users.*.user_id', []));
return ResponseJson::data($response, Response::HTTP_CREATED); return ResponseJsonMessage::withData($response, Response::HTTP_CREATED);
} }
public function show(int $id): JsonResponse public function show(int $id): JsonResponse
{ {
$response = $this->notification->find($id); $response = $this->notification->find($id);
return ResponseJson::data($response); return ResponseJsonMessage::withData($response);
} }
public function update(Request $request, $id): JsonResponse public function update(Request $request, $id): JsonResponse
{ {
$response = $this->notification->update($request->all(), $id); $response = $this->notification->update($request->all(), $id);
return ResponseJson::data($response); return ResponseJsonMessage::withData($response);
} }
public function destroy($id): JsonResponse public function destroy($id): JsonResponse
{ {
$response = $this->notification->destroy($id); $response = $this->notification->destroy($id);
return ResponseJson::data($response); return ResponseJsonMessage::withData($response);
} }
public function notify() public function notify()
{ {
$response = $this->notification->getNotify(); $response = $this->notification->getNotify();
return ResponseJson::data($response); return ResponseJsonMessage::withData($response);
} }
} }

View File

@ -5,15 +5,15 @@ declare(strict_types=1);
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Helpers\Helpers; use App\Helpers\Helpers;
use App\Traits\ApiResponse;
use App\Helpers\ResponseJson; use App\Helpers\ResponseJsonMessage;
use App\Repositories\DadosTe\DadosTeContractInterface; use App\Repositories\DadosTe\DadosTeContractInterface;
use Illuminate\Http\Request; use Illuminate\Http\Request;
class OperationSummaryController extends Controller class OperationSummaryController extends Controller
{ {
use ApiResponse;
public function __construct( public function __construct(
protected DadosTeContractInterface $dadosTeContract protected DadosTeContractInterface $dadosTeContract
@ -25,13 +25,13 @@ class OperationSummaryController extends Controller
$response = $this->dadosTeContract->search($request->all(), true); $response = $this->dadosTeContract->search($request->all(), true);
$response = Helpers::orderByDate($response, 'm/Y'); $response = Helpers::orderByDate($response, 'm/Y');
return ResponseJson::data($response); return ResponseJsonMessage::withData($response);
} }
public function operationSummary(Request $request) public function operationSummary(Request $request)
{ {
$response = $this->dadosTeContract->getOperationSummary($request->all()); $response = $this->dadosTeContract->getOperationSummary($request->all());
return ResponseJson::data($response); return ResponseJsonMessage::withData($response);
} }
} }

View File

@ -5,8 +5,8 @@ declare(strict_types=1);
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Helpers\Helpers; use App\Helpers\Helpers;
use App\Helpers\ResponseJson; use App\Helpers\ResponseJsonMessage;
use App\Traits\ApiResponse;
use App\Repositories\Pld\PldContractInterface; use App\Repositories\Pld\PldContractInterface;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@ -14,7 +14,7 @@ use Illuminate\Http\Request;
class PldController extends Controller class PldController extends Controller
{ {
use ApiResponse;
public function __construct( public function __construct(
protected PldContractInterface $pldContract protected PldContractInterface $pldContract
@ -26,34 +26,34 @@ class PldController extends Controller
$response = $this->pldContract->search($request->all()); $response = $this->pldContract->search($request->all());
$response = Helpers::orderByDate($response, 'm/Y', 'mes_ref'); $response = Helpers::orderByDate($response, 'm/Y', 'mes_ref');
return ResponseJson::data($response); return ResponseJsonMessage::withData($response);
} }
public function overviewByRegion() public function overviewByRegion()
{ {
$response = $this->pldContract->getOverviewByRegion(); $response = $this->pldContract->getOverviewByRegion();
return ResponseJson::data($response); return ResponseJsonMessage::withData($response);
} }
public function listConsumption(Request $request) public function listConsumption(Request $request)
{ {
$response = $this->pldContract->getListConsumption($request->all()); $response = $this->pldContract->getListConsumption($request->all());
return ResponseJson::data($response); return ResponseJsonMessage::withData($response);
} }
public function consumptionByDaily(Request $request) public function consumptionByDaily(Request $request)
{ {
$response = $this->pldContract->getConsumptionByDaily($request->all()); $response = $this->pldContract->getConsumptionByDaily($request->all());
return ResponseJson::data($response); return ResponseJsonMessage::withData($response);
} }
public function consumptionBySchedule(Request $request) public function consumptionBySchedule(Request $request)
{ {
$response = $this->pldContract->getConsumptionBySchedule($request->all()); $response = $this->pldContract->getConsumptionBySchedule($request->all());
return ResponseJson::data($response); return ResponseJsonMessage::withData($response);
} }
} }

View File

@ -4,17 +4,17 @@ declare(strict_types=1);
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Helpers\ResponseJson; use App\Helpers\ResponseJsonMessage;
use App\Http\Resources\TelemetryResource; use App\Http\Resources\TelemetryResource;
use App\Repositories\Med5min\Med5minContractInterface; use App\Repositories\Med5min\Med5minContractInterface;
use App\Traits\ApiResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Http\Response; use Illuminate\Http\Response;
class TelemetryController extends Controller class TelemetryController extends Controller
{ {
use ApiResponse;
public function __construct( public function __construct(
protected Med5minContractInterface $med5minContract protected Med5minContractInterface $med5minContract
@ -25,20 +25,20 @@ class TelemetryController extends Controller
{ {
$response = $this->med5minContract->search($request->all()); $response = $this->med5minContract->search($request->all());
return ResponseJson::data($response); return ResponseJsonMessage::withData($response);
} }
public function discretization(Request $request) public function discretization(Request $request)
{ {
$response = $this->med5minContract->getDiscretization($request->all(), $request->getPathInfo()); $response = $this->med5minContract->getDiscretization($request->all(), $request->getPathInfo());
return ResponseJson::data($response); return ResponseJsonMessage::withData($response);
} }
public function download(Request $request) public function download(Request $request)
{ {
$response = $this->med5minContract->getDiscretization($request->all(), $request->getPathInfo()); $response = $this->med5minContract->getDiscretization($request->all(), $request->getPathInfo());
return ResponseJson::data($response); return ResponseJsonMessage::withData($response);
} }
} }

View File

@ -4,9 +4,9 @@ declare(strict_types=1);
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App\Helpers\ResponseJson; use App\Helpers\ResponseJsonMessage;
use App\Http\Requests\ImportUsersWithSmartUsersRequest; use App\Http\Requests\ImportUsersWithSmartUsersRequest;
use App\Traits\ApiResponse;
use App\Http\Requests\StoreUserRequest; use App\Http\Requests\StoreUserRequest;
use App\Imports\UsersWithSmartUsersImport; use App\Imports\UsersWithSmartUsersImport;
use App\Repositories\Users\UserContractInterface; use App\Repositories\Users\UserContractInterface;
@ -20,8 +20,6 @@ use Maatwebsite\Excel\Facades\Excel;
class UserController extends Controller class UserController extends Controller
{ {
use ApiResponse;
public function __construct( public function __construct(
protected UserContractInterface $user protected UserContractInterface $user
) { ) {
@ -36,7 +34,7 @@ class UserController extends Controller
{ {
$response = $this->user->getOrdered(); $response = $this->user->getOrdered();
return ResponseJson::data($response); return ResponseJsonMessage::withData($response);
} }
/** /**
@ -60,7 +58,7 @@ class UserController extends Controller
$response = $this->user->create($data); $response = $this->user->create($data);
$response->roles()->sync($data['role']); $response->roles()->sync($data['role']);
return ResponseJson::data($response, Response::HTTP_CREATED); return ResponseJsonMessage::withData($response, Response::HTTP_CREATED);
} }
/** /**
@ -73,7 +71,7 @@ class UserController extends Controller
{ {
$response = $this->user->find($id); $response = $this->user->find($id);
return ResponseJson::data($response); return ResponseJsonMessage::withData($response);
} }
/** /**
@ -89,7 +87,7 @@ class UserController extends Controller
$data['password'] = $request->password; $data['password'] = $request->password;
$response = $this->user->update($data, $id); $response = $this->user->update($data, $id);
return ResponseJson::data($response); return ResponseJsonMessage::withData($response);
} }
/** /**
@ -100,9 +98,9 @@ class UserController extends Controller
*/ */
public function destroy($id): JsonResponse public function destroy($id): JsonResponse
{ {
$response = $this->user->destroy($id); $this->user->destroy($id);
return response()->json($response, Response::HTTP_NO_CONTENT); return ResponseJsonMessage::withMessage('Usuário deletado!');
} }
public function importUserControll(ImportUsersWithSmartUsersRequest $request): JsonResponse public function importUserControll(ImportUsersWithSmartUsersRequest $request): JsonResponse
@ -126,7 +124,7 @@ class UserController extends Controller
disk: $disk, disk: $disk,
); );
return ResponseJson::message('Dados importados com sucesso!', Response::HTTP_CREATED); return ResponseJsonMessage::withMessage('Dados importados com sucesso!', Response::HTTP_CREATED);
} catch (\Throwable $th) { } catch (\Throwable $th) {
throw $th; throw $th;
} finally { } finally {

View File

@ -0,0 +1,65 @@
<?php
namespace App\Providers;
use Illuminate\Support\Facades\Gate;
use Laravel\Telescope\IncomingEntry;
use Laravel\Telescope\Telescope;
use Laravel\Telescope\TelescopeApplicationServiceProvider;
class TelescopeServiceProvider extends TelescopeApplicationServiceProvider
{
/**
* Register any application services.
*/
public function register(): void
{
// Telescope::night();
$this->hideSensitiveRequestDetails();
Telescope::filter(function (IncomingEntry $entry) {
if ($this->app->environment('local')) {
return true;
}
return $entry->isReportableException() ||
$entry->isFailedRequest() ||
$entry->isFailedJob() ||
$entry->isScheduledTask() ||
$entry->hasMonitoredTag();
});
}
/**
* Prevent sensitive request details from being logged by Telescope.
*/
protected function hideSensitiveRequestDetails(): void
{
if ($this->app->environment('local')) {
return;
}
Telescope::hideRequestParameters(['_token']);
Telescope::hideRequestHeaders([
'cookie',
'x-csrf-token',
'x-xsrf-token',
]);
}
/**
* Register the Telescope gate.
*
* This gate determines who can access Telescope in non-local environments.
*/
protected function gate(): void
{
Gate::define('viewTelescope', function () {
return in_array(request()->query('email'), [
'smart_admin_monitor@energiasmart.com.br'
]);
});
}
}

View File

@ -5,7 +5,6 @@ declare(strict_types=1);
namespace App\Repositories\DadosCadastrais; namespace App\Repositories\DadosCadastrais;
use App\Models\DadosCadastrais; use App\Models\DadosCadastrais;
use App\Models\DadosTe;
use App\Repositories\AbstractRepository; use App\Repositories\AbstractRepository;

View File

@ -213,11 +213,11 @@ class PldRepository extends AbstractRepository implements PldContractInterface
} }
protected static function max($query){ protected static function max($query){
return $query->max(DB::raw("value")); return $query->max(DB::raw("value")) ?? 0;
} }
protected static function min($query){ protected static function min($query){
return $query->min(DB::raw("value")); return $query->min(DB::raw("value")) ?? 0;
} }
protected static function standardDeviation($query): float|bool protected static function standardDeviation($query): float|bool

View File

@ -1,27 +0,0 @@
<?php
namespace App\Traits;
use Illuminate\Http\JsonResponse;
trait ApiResponse
{
protected function successResponse ($data, string $message = null, int $code = 200): JsonResponse
{
return response()->json([
'status' => 'Success',
'message' => $message,
'data' => $data
], $code);
}
protected function errorResponse ($data, string $message, int $code): JsonResponse
{
return response()->json([
'status' => 'Error',
'message' => $message,
'data' => $data
], $code);
}
}

View File

@ -14,6 +14,7 @@
"guzzlehttp/guzzle": "^7.2", "guzzlehttp/guzzle": "^7.2",
"laravel/framework": "^9.11", "laravel/framework": "^9.11",
"laravel/sanctum": "^2.14.1", "laravel/sanctum": "^2.14.1",
"laravel/telescope": "^4.17",
"laravel/tinker": "^2.7", "laravel/tinker": "^2.7",
"league/flysystem-aws-s3-v3": "^3.0", "league/flysystem-aws-s3-v3": "^3.0",
"maatwebsite/excel": "^3.1", "maatwebsite/excel": "^3.1",
@ -52,7 +53,7 @@
"post-update-cmd": [ "post-update-cmd": [
"@php artisan vendor:publish --tag=laravel-assets --ansi --force" "@php artisan vendor:publish --tag=laravel-assets --ansi --force"
], ],
"post-root-package-install": [ "create-env": [
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\"" "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
], ],
"generate-key": [ "generate-key": [
@ -74,8 +75,10 @@
"@php artisan event:clear --ansi", "@php artisan event:clear --ansi",
"@php artisan config:clear --ansi" "@php artisan config:clear --ansi"
], ],
"authorized-files": "sudo chown -R www-data:www-data storage/ bootstrap/cache/ public/ && sudo chown -R :www-data storage/", "queue": "@php artisan queue:listen --tries=2 --backoff=10 --timeout=60",
"dev": "@php artisan serve --host=0.0.0.0 --port=8080 --ansi" "schedule": "@php artisan schedule:work",
"authorized-files": "sudo chown -R www-data:www-data storage/ storage/framework/cache storage/framework/cache/data bootstrap/cache/ public/ && sudo chown -R :www-data storage/",
"dev": "@php artisan serve --host=0.0.0.0 --port=8181"
}, },
"extra": { "extra": {
"laravel": { "laravel": {

73
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "1f36b276eeb3b2bf2ebbb68446d3f120", "content-hash": "8a789b9a2a406dff84a0f0d15b72a9c8",
"packages": [ "packages": [
{ {
"name": "aws/aws-crt-php", "name": "aws/aws-crt-php",
@ -1584,6 +1584,77 @@
}, },
"time": "2023-07-14T13:56:28+00:00" "time": "2023-07-14T13:56:28+00:00"
}, },
{
"name": "laravel/telescope",
"version": "v4.17.3",
"source": {
"type": "git",
"url": "https://github.com/laravel/telescope.git",
"reference": "17a420d0121b03ea90648dd4484b62abe6d3e261"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/telescope/zipball/17a420d0121b03ea90648dd4484b62abe6d3e261",
"reference": "17a420d0121b03ea90648dd4484b62abe6d3e261",
"shasum": ""
},
"require": {
"ext-json": "*",
"laravel/framework": "^8.37|^9.0|^10.0",
"php": "^8.0",
"symfony/var-dumper": "^5.0|^6.0"
},
"require-dev": {
"ext-gd": "*",
"guzzlehttp/guzzle": "^6.0|^7.0",
"laravel/octane": "^1.4",
"orchestra/testbench": "^6.0|^7.0|^8.0",
"phpstan/phpstan": "^1.10",
"phpunit/phpunit": "^9.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "4.x-dev"
},
"laravel": {
"providers": [
"Laravel\\Telescope\\TelescopeServiceProvider"
]
}
},
"autoload": {
"psr-4": {
"Laravel\\Telescope\\": "src/",
"Laravel\\Telescope\\Database\\Factories\\": "database/factories/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Taylor Otwell",
"email": "taylor@laravel.com"
},
{
"name": "Mohamed Said",
"email": "mohamed@laravel.com"
}
],
"description": "An elegant debug assistant for the Laravel framework.",
"keywords": [
"debugging",
"laravel",
"monitoring"
],
"support": {
"issues": "https://github.com/laravel/telescope/issues",
"source": "https://github.com/laravel/telescope/tree/v4.17.3"
},
"time": "2023-12-11T22:00:12+00:00"
},
{ {
"name": "laravel/tinker", "name": "laravel/tinker",
"version": "v2.8.2", "version": "v2.8.2",

View File

@ -198,6 +198,7 @@ return [
// App\Providers\BroadcastServiceProvider::class, // App\Providers\BroadcastServiceProvider::class,
App\Providers\EventServiceProvider::class, App\Providers\EventServiceProvider::class,
App\Providers\RouteServiceProvider::class, App\Providers\RouteServiceProvider::class,
App\Providers\TelescopeServiceProvider::class,
/* /*
* Laravel Auditing * Laravel Auditing

189
config/telescope.php Normal file
View File

@ -0,0 +1,189 @@
<?php
use Laravel\Telescope\Http\Middleware\Authorize;
use Laravel\Telescope\Watchers;
return [
/*
|--------------------------------------------------------------------------
| Telescope Domain
|--------------------------------------------------------------------------
|
| This is the subdomain where Telescope will be accessible from. If the
| setting is null, Telescope will reside under the same domain as the
| application. Otherwise, this value will be used as the subdomain.
|
*/
'domain' => env('TELESCOPE_DOMAIN'),
/*
|--------------------------------------------------------------------------
| Telescope Path
|--------------------------------------------------------------------------
|
| This is the URI path where Telescope will be accessible from. Feel free
| to change this path to anything you like. Note that the URI will not
| affect the paths of its internal API that aren't exposed to users.
|
*/
'path' => env('TELESCOPE_PATH', 'telescope'),
/*
|--------------------------------------------------------------------------
| Telescope Storage Driver
|--------------------------------------------------------------------------
|
| This configuration options determines the storage driver that will
| be used to store Telescope's data. In addition, you may set any
| custom options as needed by the particular driver you choose.
|
*/
'driver' => env('TELESCOPE_DRIVER', 'database'),
'storage' => [
'database' => [
'connection' => env('DB_CONNECTION', 'pgsql'),
'chunk' => 1000,
],
],
/*
|--------------------------------------------------------------------------
| Telescope Master Switch
|--------------------------------------------------------------------------
|
| This option may be used to disable all Telescope watchers regardless
| of their individual configuration, which simply provides a single
| and convenient way to enable or disable Telescope data storage.
|
*/
'enabled' => env('TELESCOPE_ENABLED', true),
/*
|--------------------------------------------------------------------------
| Telescope Route Middleware
|--------------------------------------------------------------------------
|
| These middleware will be assigned to every Telescope route, giving you
| the chance to add your own middleware to this list or change any of
| the existing middleware. Or, you can simply stick with this list.
|
*/
'middleware' => [
'web',
Authorize::class,
],
/*
|--------------------------------------------------------------------------
| Allowed / Ignored Paths & Commands
|--------------------------------------------------------------------------
|
| The following array lists the URI paths and Artisan commands that will
| not be watched by Telescope. In addition to this list, some Laravel
| commands, like migrations and queue commands, are always ignored.
|
*/
'only_paths' => [
// 'api/*'
],
'ignore_paths' => [
'livewire*',
'nova-api*',
'pulse*',
],
'ignore_commands' => [
//
],
/*
|--------------------------------------------------------------------------
| Telescope Watchers
|--------------------------------------------------------------------------
|
| The following array lists the "watchers" that will be registered with
| Telescope. The watchers gather the application's profile data when
| a request or task is executed. Feel free to customize this list.
|
*/
'watchers' => [
Watchers\BatchWatcher::class => env('TELESCOPE_BATCH_WATCHER', true),
Watchers\CacheWatcher::class => [
'enabled' => env('TELESCOPE_CACHE_WATCHER', true),
'hidden' => [],
],
Watchers\ClientRequestWatcher::class => env('TELESCOPE_CLIENT_REQUEST_WATCHER', true),
Watchers\CommandWatcher::class => [
'enabled' => env('TELESCOPE_COMMAND_WATCHER', true),
'ignore' => [],
],
Watchers\DumpWatcher::class => [
'enabled' => env('TELESCOPE_DUMP_WATCHER', true),
'always' => env('TELESCOPE_DUMP_WATCHER_ALWAYS', false),
],
Watchers\EventWatcher::class => [
'enabled' => env('TELESCOPE_EVENT_WATCHER', true),
'ignore' => [],
],
Watchers\ExceptionWatcher::class => env('TELESCOPE_EXCEPTION_WATCHER', true),
Watchers\GateWatcher::class => [
'enabled' => env('TELESCOPE_GATE_WATCHER', true),
'ignore_abilities' => [],
'ignore_packages' => true,
'ignore_paths' => [],
],
Watchers\JobWatcher::class => env('TELESCOPE_JOB_WATCHER', true),
Watchers\LogWatcher::class => [
'enabled' => env('TELESCOPE_LOG_WATCHER', true),
'level' => 'error',
],
Watchers\MailWatcher::class => env('TELESCOPE_MAIL_WATCHER', true),
Watchers\ModelWatcher::class => [
'enabled' => env('TELESCOPE_MODEL_WATCHER', true),
'events' => ['eloquent.*'],
'hydrations' => true,
],
Watchers\NotificationWatcher::class => env('TELESCOPE_NOTIFICATION_WATCHER', true),
Watchers\QueryWatcher::class => [
'enabled' => env('TELESCOPE_QUERY_WATCHER', true),
'ignore_packages' => true,
'ignore_paths' => [],
'slow' => 100,
],
Watchers\RedisWatcher::class => env('TELESCOPE_REDIS_WATCHER', true),
Watchers\RequestWatcher::class => [
'enabled' => env('TELESCOPE_REQUEST_WATCHER', true),
'size_limit' => env('TELESCOPE_RESPONSE_SIZE_LIMIT', 64),
'ignore_http_methods' => [],
'ignore_status_codes' => [],
],
Watchers\ScheduleWatcher::class => env('TELESCOPE_SCHEDULE_WATCHER', true),
Watchers\ViewWatcher::class => env('TELESCOPE_VIEW_WATCHER', true),
],
];

8
public/vendor/telescope/app-dark.css vendored Normal file

File diff suppressed because one or more lines are too long

7
public/vendor/telescope/app.css vendored Normal file

File diff suppressed because one or more lines are too long

2
public/vendor/telescope/app.js vendored Normal file

File diff suppressed because one or more lines are too long

BIN
public/vendor/telescope/favicon.ico vendored Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

View File

@ -0,0 +1,5 @@
{
"/app.js": "/app.js?id=613c227dfb4d6e1fc4db1b1a90513610",
"/app-dark.css": "/app-dark.css?id=b11fa9a28e9d3aeb8c92986f319b3c44",
"/app.css": "/app.css?id=b3ccfbe68f24cff776f83faa8dead721"
}

View File

@ -21,7 +21,7 @@ Route::prefix('auth')->group(function (){
}); });
/* --- Routes verified --- */ /* --- Routes verified --- */
Route::middleware(['auth:sanctum', 'verified'])->group(function () { Route::middleware(['auth:sanctum', 'ability:Client', 'verified'])->group(function () {
Route::get('notification', [\App\Http\Controllers\NotificationController::class, 'index']); Route::get('notification', [\App\Http\Controllers\NotificationController::class, 'index']);
Route::get('notification/{notification}', [\App\Http\Controllers\NotificationController::class, 'show']); Route::get('notification/{notification}', [\App\Http\Controllers\NotificationController::class, 'show']);
@ -58,7 +58,6 @@ Route::middleware(['auth:sanctum', 'ability:Admin'])->group(function () {
/* --- Routes Client --- */ /* --- Routes Client --- */
Route::middleware(['auth:sanctum', 'ability:Client'])->group(function () { Route::middleware(['auth:sanctum', 'ability:Client'])->group(function () {
Route::post('pld/overview', [\App\Http\Controllers\PldController::class, 'overviewByRegion']); //Visão Geral por Região Route::post('pld/overview', [\App\Http\Controllers\PldController::class, 'overviewByRegion']); //Visão Geral por Região
Route::post('pld/list', [\App\Http\Controllers\PldController::class, 'listConsumption']); // Tabela de Consumo Route::post('pld/list', [\App\Http\Controllers\PldController::class, 'listConsumption']); // Tabela de Consumo
Route::post('pld/daily', [\App\Http\Controllers\PldController::class, 'consumptionByDaily']); // Consumo por Diário Route::post('pld/daily', [\App\Http\Controllers\PldController::class, 'consumptionByDaily']); // Consumo por Diário