Smart/smartEnergyView-backend
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ajustes

Browse Source
This commit is contained in:
marcio1002 2023-12-18 20:15:16 -03:00
parent 71a9d2aab7
commit 0b58e2923b
7 changed files with 32 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
app/Http/Controllers/Auth/ForgotPasswordController.php
View File

@ -2,6 +2,7 @@
namespace App\Http\Controllers\Auth;
use App\Helpers\ResponseJson;
use App\Http\Requests\ForgotPasswordRequest;
use App\Mail\ResetPassword;
use App\Models\User;
@ -10,6 +11,7 @@ use Carbon\Carbon;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Facades\DB;
@ -19,40 +21,33 @@ class ForgotPasswordController extends Controller
public function __invoke(ForgotPasswordRequest $request)
{
$verify = User::where('email', $request->all()['email'])->exists();
$email = $request->validated('email');
if ($verify) {
$is_email = User::where('email', $email)->exists();
$verify2 = DB::table('password_resets')->where([
['email', $request->all()['email']]
]);
if (!$is_email) return ResponseJson::error(
'Esse e-mail não existe no nosso sistema',
Response::HTTP_BAD_REQUEST
);
if ($verify2->exists()) {
$verify2->delete();
}
DB::table('password_resets')->where('email', $email)->delete();
$token = random_int(100000, 999999);
$password_reset = DB::table('password_resets')->insert([
'email' => $request->all()['email'],
'token' => $token,
'created_at' => Carbon::now()
$token = random_int(100000, 999999);
]);
DB::table('password_resets')->insert([
'email' => $email,
'token' => $token,
'created_at' => Carbon::now()
]);
if ($password_reset) {
$sendMail = Mail::to($request->all()['email'])->send(new ResetPassword($token));
return $this->successResponse(true, "Please check your email for a 6 digit pin", 200);
}
} else {
return $this->errorResponse(false, "This email does not exist", 400);
}
Mail::to($email)->send(new ResetPassword($token));
return ResponseJson::message("Verifique seu e-mail");
}
public function verifyPin(Request $request)
{
}
}

20
app/Http/Controllers/InfoSectorialController.php
View File

@ -4,6 +4,7 @@ declare(strict_types=1);
namespace App\Http\Controllers;
use App\Helpers\ResponseJson;
use App\Http\Requests\UploadInfoSectorialRequest;
use App\Models\InfoSectorial;
use App\Traits\ApiResponse;
@ -19,7 +20,7 @@ class InfoSectorialController extends Controller
$data = $uploadInfoSectorialRequest->all();
if (!$uploadInfoSectorialRequest->hasFile('file')) {
return $this->errorResponse( false, '', 500);
return $this->errorResponse(false, '', 500);
}
$file = $uploadInfoSectorialRequest->file('file');
@ -27,24 +28,19 @@ class InfoSectorialController extends Controller
$data['name'] = Str::of($file->getClientOriginalName())->explode('.')->offsetGet(0);
$data['uid'] = Str::of($file->hashName())->explode('.')->offsetGet(0);
$extension = $file->getClientOriginalExtension();
$data['path'] = $file->storeAs('pdf', $data['uid'].".{$extension}", 's3');
$data['path'] = $file->storeAs('pdf', $data['uid'] . ".{$extension}", 's3');
return InfoSectorial::query()->create($data);
}
public function download()
{
$created_at = InfoSectorial::query()->max('created_at');
$created_at = InfoSectorial::max('created_at');
$data = InfoSectorial::query()->where('created_at', '=', $created_at)->first();
$data = InfoSectorial::where('created_at', '=', $created_at)->first();
if (!Storage::disk('s3')->exists($data->path))
{
return $this->errorResponse( false, '', 500);
}
$path['path'] = Storage::disk('s3')->url($data->path);
return response()->json($path, 200);
return ResponseJson::data(
!empty($data) ? Storage::disk('s3')->url($data->path) : ''
);
}
}

3
app/Http/Controllers/NotificationController.php
View File

@ -62,7 +62,6 @@ class NotificationController extends Controller
{
$response = $this->notification->getNotify();
// return ResponseJson::data($response);
return response()->json($response);
return ResponseJson::data($response);
}
}

3
app/Http/Controllers/PldController.php
View File

@ -40,8 +40,7 @@ class PldController extends Controller
{
$response = $this->pldContract->getListConsumption($request->all());
// return ResponseJson::data($response);
return response()->json($response);
return ResponseJson::data($response);
}
public function consumptionByDaily(Request $request)

9
app/Repositories/Economy/EconomyRepository.php
View File

@ -7,14 +7,11 @@ namespace App\Repositories\Economy;
use App\Helpers\Helpers;
use App\Models\Economy;
use App\Repositories\AbstractRepository;
use Carbon\Carbon;
use DateInterval;
use DatePeriod;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Str;
class EconomyRepository extends AbstractRepository implements EconomyContractInterface
{
@ -48,8 +45,8 @@ class EconomyRepository extends AbstractRepository implements EconomyContractInt
];
return $this->execute($params, $field)
->where(DB::raw(
"TO_DATE(economia.mes, 'YYMM')"),
->where(
DB::raw("TO_DATE(economia.mes, 'YYMM')"),
">=",
DB::raw("TO_DATE(TO_CHAR(current_date , 'YYYY-12-01'), 'YYYY-MM-DD') - interval '1' year"))
->where(function ($query) {

2
routes/api.php
View File

@ -14,8 +14,6 @@ use Illuminate\Support\Facades\Route;
|
*/
Route::get('test', fn() => new TempMail('Marcio', '123', false));
Route::prefix('auth')->group(function (){
Route::post('login', [\App\Http\Controllers\Auth\AuthController::class, 'login']);
Route::post('/forgot-password', \App\Http\Controllers\Auth\ForgotPasswordController::class);

2
send-password.php
View File

@ -25,7 +25,7 @@ $users = [
['client_id' => '180119211', 'email' => 'financeiro@novakcarnes.com.br', 'password' => 'PBB*q60X'],
['client_id' => '180120211', 'email' => 'david@granortesa.ind.br', 'password' => '5liE2$rp'],
['client_id' => '180121211', 'email' => 'marcio.grutzmacher@hame.com.br', 'password' => 'UgReGotP'],
['client_id' => '180122211', 'email' => 'willian@herbarium.net', '@%by5Dup'],
['client_id' => '180122211', 'email' => 'willian@herbarium.net', 'password' => '@%by5Dup'],
['client_id' => '180123211', 'email' => 'fabiatavares@hsmonica.com', 'password' => '%hCOQGo8'],
['client_id' => '180124211', 'email' => 'kelston@jjpplasticos.com.br', 'password' => 'ZbRztLMb'],
['client_id' => '180125211', 'email' => 'ronaldo@kabel.com.br', 'password' => '0N3ZN4Xd'],