use pint and fix code

This commit is contained in:
2025-11-09 15:41:29 +03:30
parent 40513d72b8
commit bb4886a9fa
6 changed files with 77 additions and 89 deletions

View File

@@ -7,7 +7,6 @@ use App\Enums\HarimStates;
use App\Events\V3\Dashboard\Harim\ConfirmGuaranteeLetterNeedEvent; use App\Events\V3\Dashboard\Harim\ConfirmGuaranteeLetterNeedEvent;
use App\Events\V3\Dashboard\Harim\ConfirmNoRoadAccessNeedEvent; use App\Events\V3\Dashboard\Harim\ConfirmNoRoadAccessNeedEvent;
use App\Events\V3\Dashboard\Harim\ConfirmRoadAccessEditNeedEvent; use App\Events\V3\Dashboard\Harim\ConfirmRoadAccessEditNeedEvent;
use App\Events\V3\Dashboard\Harim\ConfirmRoadAccessNeedEvent;
use App\Events\V3\Dashboard\Harim\RejectRequestEvent; use App\Events\V3\Dashboard\Harim\RejectRequestEvent;
use App\Facades\DataTable\DataTableFacade; use App\Facades\DataTable\DataTableFacade;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
@@ -26,7 +25,6 @@ use App\Models\Harim;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
class GeneralManagerController extends Controller class GeneralManagerController extends Controller
{ {
use ApiResponse; use ApiResponse;

View File

@@ -19,9 +19,6 @@ use App\Models\Harim;
use App\Models\Province; use App\Models\Province;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Throwable;
class HarimOfficeController extends Controller class HarimOfficeController extends Controller
{ {
@@ -135,7 +132,6 @@ class HarimOfficeController extends Controller
return $this->successResponse(); return $this->successResponse();
} }
public function show(ShowRequest $request, Harim $harim): JsonResponse public function show(ShowRequest $request, Harim $harim): JsonResponse
{ {
return $this->successResponse($harim->load('histories')); return $this->successResponse($harim->load('histories'));

View File

@@ -31,7 +31,6 @@ class PanjareVahedController extends Controller
$decodedString = json_decode($decrypted); $decodedString = json_decode($decrypted);
$decodedArray = json_decode($decodedString, true); $decodedArray = json_decode($decodedString, true);
$wkt = 'POLYGON(('.implode(',', array_map(fn ($c) => "{$c[0]} {$c[1]}", $request->primary_area['coordinates'])).'))'; $wkt = 'POLYGON(('.implode(',', array_map(fn ($c) => "{$c[0]} {$c[1]}", $request->primary_area['coordinates'])).'))';
$result = DB::selectOne('SELECT ST_AsText(ST_PointOnSurface(ST_GeomFromText(?, 4326))) AS point', [$wkt]); $result = DB::selectOne('SELECT ST_AsText(ST_PointOnSurface(ST_GeomFromText(?, 4326))) AS point', [$wkt]);
preg_match('/POINT\(([^ ]+) ([^ ]+)\)/', $result->point, $matches); preg_match('/POINT\(([^ ]+) ([^ ]+)\)/', $result->point, $matches);
@@ -52,15 +51,13 @@ class PanjareVahedController extends Controller
->first(['id', 'name_fa', 'province_id']); ->first(['id', 'name_fa', 'province_id']);
} }
$state = HarimStates::BARESI_EDARE_SHAHRESTAN->value;
$harim = Harim::query()->firstOrCreate( $harim = Harim::query()->firstOrCreate(
[ [
'panjare_vahed_id' => $request->request_id 'panjare_vahed_id' => $request->request_id,
], ],
[ [
'state_id' => $state, 'state_id' => HarimStates::BARESI_EDARE_SHAHRESTAN->value,
'state_name' => HarimStates::name($state), 'state_name' => HarimStates::BARESI_EDARE_SHAHRESTAN->label(),
'panjare_vahed_id' => $request->request_id, 'panjare_vahed_id' => $request->request_id,
'national_id' => $request->national_id, 'national_id' => $request->national_id,
'phone_number' => $request->phone_number, 'phone_number' => $request->phone_number,
@@ -92,13 +89,11 @@ class PanjareVahedController extends Controller
public function getAccessRoad(GetAccessRoadRequest $request): JsonResponse public function getAccessRoad(GetAccessRoadRequest $request): JsonResponse
{ {
$state = HarimStates::BARESI_FILE_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM->value;
$harim = Harim::query()->firstWhere('panjare_vahed_id', '=', $request->request_id); $harim = Harim::query()->firstWhere('panjare_vahed_id', '=', $request->request_id);
$harim->update([ $harim->update([
'state_id' => $state, 'state_id' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM->value,
'state_name' => HarimStates::name($state), 'state_name' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM->label(),
'access_road' => json_encode($request->access_road), 'access_road' => json_encode($request->access_road),
'data' => $request->data['data'], 'data' => $request->data['data'],
'token' => $request->data['token'], 'token' => $request->data['token'],
@@ -135,13 +130,12 @@ class PanjareVahedController extends Controller
public function getFinalPolygons(GetFinalPolygonsRequest $request): JsonResponse public function getFinalPolygons(GetFinalPolygonsRequest $request): JsonResponse
{ {
$state = HarimStates::TAEDE_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_DAFTAR_HARIM->value;
$harim = Harim::query()->firstWhere('panjare_vahed_id', '=', $request->request_id); $harim = Harim::query()->firstWhere('panjare_vahed_id', '=', $request->request_id);
$harim->update([ $harim->update([
'state_id' => $state, 'state_id' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_DAFTAR_HARIM->value,
'state_name' => HarimStates::name($state), 'state_name' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_DAFTAR_HARIM->label(),
'final_area' => json_encode($request->final_area), 'final_area' => json_encode($request->final_area),
'final_plan' => json_encode($request->final_plan), 'final_plan' => json_encode($request->final_plan),
'data' => $request->data['data'], 'data' => $request->data['data'],

View File

@@ -12,7 +12,6 @@ use App\Http\Traits\ApiResponse;
use App\Models\Harim; use App\Models\Harim;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
class ProvinceOfficeController extends Controller class ProvinceOfficeController extends Controller
{ {
@@ -34,6 +33,7 @@ class ProvinceOfficeController extends Controller
return response()->json($data); return response()->json($data);
} }
public function feedback(FeedBackRequest $request, Harim $harim): JsonResponse public function feedback(FeedBackRequest $request, Harim $harim): JsonResponse
{ {
$harim->updateStateWithHistory( $harim->updateStateWithHistory(

View File

@@ -18,7 +18,6 @@ use App\Models\Harim;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request; use Illuminate\Http\Request;
class TechnicalDeputyController extends Controller class TechnicalDeputyController extends Controller
{ {
use ApiResponse; use ApiResponse;
@@ -109,6 +108,7 @@ class TechnicalDeputyController extends Controller
'state_name' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_DAFTAR_HARIM->label(), 'state_name' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_DAFTAR_HARIM->label(),
] ]
); );
return $this->successResponse(); return $this->successResponse();
} }
@@ -122,6 +122,7 @@ class TechnicalDeputyController extends Controller
'state_name' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_MODIR_KOL->label(), 'state_name' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_MODIR_KOL->label(),
] ]
); );
return $this->successResponse(); return $this->successResponse();
} }
} }

View File

@@ -2,7 +2,6 @@
namespace App\Http\Requests\V3\Dashboard\Harim\PanjareVahed; namespace App\Http\Requests\V3\Dashboard\Harim\PanjareVahed;
use App\Models\Harim;
use Illuminate\Contracts\Validation\ValidationRule; use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Contracts\Validation\Validator; use Illuminate\Contracts\Validation\Validator;
use Illuminate\Foundation\Http\FormRequest; use Illuminate\Foundation\Http\FormRequest;