RMS/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use pint and fix code

Browse Source
This commit is contained in:
faezehzafarbakhsh
2025-11-09 15:41:29 +03:30
parent 40513d72b8
commit bb4886a9fa
6 changed files with 77 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
app/Http/Controllers/V3/Dashboard/Harim/GeneralManagerController.php
View File

@@ -7,7 +7,6 @@ use App\Enums\HarimStates;
use App\Events\V3\Dashboard\Harim\ConfirmGuaranteeLetterNeedEvent;
use App\Events\V3\Dashboard\Harim\ConfirmNoRoadAccessNeedEvent;
use App\Events\V3\Dashboard\Harim\ConfirmRoadAccessEditNeedEvent;
use App\Events\V3\Dashboard\Harim\ConfirmRoadAccessNeedEvent;
use App\Events\V3\Dashboard\Harim\RejectRequestEvent;
use App\Facades\DataTable\DataTableFacade;
use App\Http\Controllers\Controller;
@@ -26,7 +25,6 @@ use App\Models\Harim;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
class GeneralManagerController extends Controller
{
use ApiResponse;
@@ -49,10 +47,10 @@ class GeneralManagerController extends Controller
public function rejectRequest(RejectRequest $request, Harim $harim): JsonResponse
{
$harim->updateStateWithHistory(
action:HarimAction::CONFIRM->value,
action: HarimAction::CONFIRM->value,
description: $request->expert_description,
data: [
'state_id' => HarimStates::EMKAN_PAZIR_NEMEBASHAD->value,
'state_id' => HarimStates::EMKAN_PAZIR_NEMEBASHAD->value,
'state_name' => HarimStates::EMKAN_PAZIR_NEMEBASHAD->label(),
]
);
@@ -64,10 +62,10 @@ class GeneralManagerController extends Controller
public function referRequest(ReferRequest $request, Harim $harim): JsonResponse
{
$harim->updateStateWithHistory(
action:HarimAction::REFER->value,
action: HarimAction::REFER->value,
description: $request->expert_description,
data: [
'state_id' => HarimStates::BARESI_TAVASOT_MOAVEN->value,
'state_id' => HarimStates::BARESI_TAVASOT_MOAVEN->value,
'state_name' => HarimStates::BARESI_TAVASOT_MOAVEN->label(),
]
);
@@ -78,10 +76,10 @@ class GeneralManagerController extends Controller
public function referFile(ReferFileRequest $request, Harim $harim): JsonResponse
{
$harim->updateStateWithHistory(
action:HarimAction::REFER->value,
action: HarimAction::REFER->value,
description: $request->expert_description,
data: [
'state_id' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MOAVEN->value,
'state_id' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MOAVEN->value,
'state_name' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MOAVEN->label(),
]
);
@@ -92,10 +90,10 @@ class GeneralManagerController extends Controller
public function confirmRoadAccessNeed(ConfirmRoadAccessNeedRequest $request, Harim $harim): JsonResponse
{
$harim->updateStateWithHistory(
action:HarimAction::CONFIRM->value,
action: HarimAction::CONFIRM->value,
description: $request->expert_description,
data: [
'state_id' => HarimStates::ERSAL_BE_PANJAREH_VAHED_NIAZ_BE_RAH_DASTRASI->value,
'state_id' => HarimStates::ERSAL_BE_PANJAREH_VAHED_NIAZ_BE_RAH_DASTRASI->value,
'state_name' => HarimStates::ERSAL_BE_PANJAREH_VAHED_NIAZ_BE_RAH_DASTRASI->label(),
]
);
@@ -106,10 +104,10 @@ class GeneralManagerController extends Controller
public function confirmNoRoadAccessNeed(ConfirmNoRoadAccessNeedRequest $request, Harim $harim): JsonResponse
{
$harim->updateStateWithHistory(
action:HarimAction::CONFIRM->value,
action: HarimAction::CONFIRM->value,
description: $request->expert_description,
data: [
'state_id' => HarimStates::ERSAL_BE_PANJAREH_VAHED_BEDONEH_NIAZ_BE_RAH_DASTRASI->value,
'state_id' => HarimStates::ERSAL_BE_PANJAREH_VAHED_BEDONEH_NIAZ_BE_RAH_DASTRASI->value,
'state_name' => HarimStates::ERSAL_BE_PANJAREH_VAHED_BEDONEH_NIAZ_BE_RAH_DASTRASI->label(),
]
);
@@ -121,10 +119,10 @@ class GeneralManagerController extends Controller
public function confirmRoadAccessEditNeed(ConfirmRoadAccessEditNeedRequest $request, Harim $harim): JsonResponse
{
$harim->updateStateWithHistory(
action:HarimAction::CONFIRM->value,
action: HarimAction::CONFIRM->value,
description: $request->expert_description,
data: [
'state_id' => HarimStates::UPDATE_RAHE_DASTRASI_BARGOZARE_SHODE->value,
'state_id' => HarimStates::UPDATE_RAHE_DASTRASI_BARGOZARE_SHODE->value,
'state_name' => HarimStates::UPDATE_RAHE_DASTRASI_BARGOZARE_SHODE->label(),
]
);
@@ -136,10 +134,10 @@ class GeneralManagerController extends Controller
public function confirmGuaranteeLetterNeed(ConfirmGuaranteeLetterNeedRequest $request, Harim $harim): JsonResponse
{
$harim->updateStateWithHistory(
action:HarimAction::CONFIRM->value,
action: HarimAction::CONFIRM->value,
description: $request->expert_description,
data: [
'state_id' => HarimStates::ARSE_VA_AYAN_NAHAI->value,
'state_id' => HarimStates::ARSE_VA_AYAN_NAHAI->value,
'state_name' => HarimStates::ARSE_VA_AYAN_NAHAI->label(),
]
);
@@ -156,10 +154,10 @@ class GeneralManagerController extends Controller
public function referPayment(ReferPaymentRequest $request, Harim $harim): JsonResponse
{
$harim->updateStateWithHistory(
action:HarimAction::REFER->value,
action: HarimAction::REFER->value,
description: $request->expert_description,
data: [
'state_id' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_MOAVEN->value,
'state_id' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_MOAVEN->value,
'state_name' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_MOAVEN->label(),
]
);
@@ -171,10 +169,10 @@ class GeneralManagerController extends Controller
public function confirmPayment(ConfirmPaymentRequest $request, Harim $harim): JsonResponse
{
$harim->updateStateWithHistory(
action:HarimAction::CONFIRM->value,
action: HarimAction::CONFIRM->value,
description: $request->expert_description,
data: [
'state_id' => HarimStates::ETMAM_FARAYAND->value,
'state_id' => HarimStates::ETMAM_FARAYAND->value,
'state_name' => HarimStates::ETMAM_FARAYAND->label(),
]
);

32
app/Http/Controllers/V3/Dashboard/Harim/HarimOfficeController.php
View File

@@ -19,9 +19,6 @@ use App\Models\Harim;
use App\Models\Province;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
use Throwable;
class HarimOfficeController extends Controller
{
@@ -45,10 +42,10 @@ class HarimOfficeController extends Controller
public function rejectRequest(RejectRequest $request, Harim $harim): JsonResponse
{
$harim->updateStateWithHistory(
action:HarimAction::NO->value,
action: HarimAction::NO->value,
description: $request->expert_description,
data: [
'state_id' => HarimStates::BARESI_TAVASOT_MOAVEN->value,
'state_id' => HarimStates::BARESI_TAVASOT_MOAVEN->value,
'state_name' => HarimStates::BARESI_TAVASOT_MOAVEN->label(),
'is_possible' => false,
]
@@ -60,10 +57,10 @@ class HarimOfficeController extends Controller
public function referRequest(ReferRequest $request, Harim $harim): JsonResponse
{
$harim->updateStateWithHistory(
action:HarimAction::REFER->value,
action: HarimAction::REFER->value,
description: $request->expert_description,
data: [
'state_id' => HarimStates::BARESI_EDARE_SHAHRESTAN->value,
'state_id' => HarimStates::BARESI_EDARE_SHAHRESTAN->value,
'state_name' => HarimStates::BARESI_EDARE_SHAHRESTAN->label(),
]
);
@@ -74,10 +71,10 @@ class HarimOfficeController extends Controller
public function needRoadAccess(NeedRoadAccessRequest $request, Harim $harim): JsonResponse
{
$harim->updateStateWithHistory(
action:HarimAction::YES->value,
action: HarimAction::YES->value,
description: $request->expert_description,
data: [
'state_id' => HarimStates::BARESI_TAVASOT_MOAVEN->value,
'state_id' => HarimStates::BARESI_TAVASOT_MOAVEN->value,
'state_name' => HarimStates::BARESI_TAVASOT_MOAVEN->label(),
'is_possible' => true,
'need_access_road' => true,
@@ -91,10 +88,10 @@ class HarimOfficeController extends Controller
public function withoutRoadAccess(WithoutRoadAccessRequest $request, Harim $harim): JsonResponse
{
$harim->updateStateWithHistory(
action:HarimAction::YES->value,
action: HarimAction::YES->value,
description: $request->expert_description,
data: [
'state_id' => HarimStates::BARESI_TAVASOT_MOAVEN->value,
'state_id' => HarimStates::BARESI_TAVASOT_MOAVEN->value,
'state_name' => HarimStates::BARESI_TAVASOT_MOAVEN->label(),
'is_possible' => true,
'need_access_road' => false,
@@ -108,10 +105,10 @@ class HarimOfficeController extends Controller
public function fileAccepted(FileAcceptedRequest $request, Harim $harim): JsonResponse
{
$harim->updateStateWithHistory(
action:HarimAction::YES->value,
action: HarimAction::YES->value,
description: $request->expert_description,
data: [
'state_id' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MOAVEN->value,
'state_id' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MOAVEN->value,
'state_name' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MOAVEN->label(),
'access_road_allowed' => true,
]
@@ -123,10 +120,10 @@ class HarimOfficeController extends Controller
public function fileRejected(FileRejectedRequest $request, Harim $harim): JsonResponse
{
$harim->updateStateWithHistory(
action:HarimAction::YES->value,
action: HarimAction::YES->value,
description: $request->expert_description,
data: [
'state_id' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MOAVEN->value,
'state_id' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MOAVEN->value,
'state_name' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MOAVEN->label(),
'access_road_allowed' => false,
]
@@ -135,7 +132,6 @@ class HarimOfficeController extends Controller
return $this->successResponse();
}
public function show(ShowRequest $request, Harim $harim): JsonResponse
{
return $this->successResponse($harim->load('histories'));
@@ -155,10 +151,10 @@ class HarimOfficeController extends Controller
public function computingPayment(ComputingPaymentRequest $request, Harim $harim): JsonResponse
{
$harim->updateStateWithHistory(
action:HarimAction::CONFIRM->value,
action: HarimAction::CONFIRM->value,
description: $request->expert_description,
data: [
'state_id' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_MOAVEN->value,
'state_id' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_MOAVEN->value,
'state_name' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_MOAVEN->label(),
'traffic' => $request->traffic,
'position' => $request->position,

62
app/Http/Controllers/V3/Dashboard/Harim/PanjareVahedController.php
View File

@@ -24,14 +24,13 @@ class PanjareVahedController extends Controller
$iv = config('harim_web_services.Harim_Info.iv');
$keyString = config('harim_web_services.Harim_Info.key');
$key = hash('sha256',$keyString, true);
$key = hash('sha256', $keyString, true);
$decrypted = openssl_decrypt($request->data,'aes-256-cbc',$key,false, $iv);
$decrypted = openssl_decrypt($request->data, 'aes-256-cbc', $key, false, $iv);
$decodedString = json_decode($decrypted);
$decodedArray = json_decode($decodedString, true);
$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]);
preg_match('/POINT\(([^ ]+) ([^ ]+)\)/', $result->point, $matches);
@@ -52,34 +51,32 @@ class PanjareVahedController extends Controller
->first(['id', 'name_fa', 'province_id']);
}
$state = HarimStates::BARESI_EDARE_SHAHRESTAN->value;
$harim = Harim::query()->firstOrCreate(
[
'panjare_vahed_id' => $request->request_id
'panjare_vahed_id' => $request->request_id,
],
[
'state_id' => $state,
'state_name' => HarimStates::name($state),
'panjare_vahed_id' => $request->request_id,
'national_id' => $request->national_id,
'phone_number' => $request->phone_number,
'request_date' => $request->request_date,
'province_id' => $city->province_id,
'province_name' => $city->province()->first()->name_fa,
'city_id' => $city->id,
'city_name' => $city->name_fa,
'edareh_shahri_id' => $city->edarateShahri()->first()->id,
'requested_organization' => $request->requested_organization,
'plan_group' => $request->plan_group,
'plan_title' => $request->plan_title,
'worksheet_id' => $request->worksheet,
'response_options' => json_encode($request->response_options),
'isic' => $request->isic,
'primary_area' => json_encode($request->primary_area),
'data' => $decodedString,
'token' => $decodedArray['token'],
]);
'state_id' => HarimStates::BARESI_EDARE_SHAHRESTAN->value,
'state_name' => HarimStates::BARESI_EDARE_SHAHRESTAN->label(),
'panjare_vahed_id' => $request->request_id,
'national_id' => $request->national_id,
'phone_number' => $request->phone_number,
'request_date' => $request->request_date,
'province_id' => $city->province_id,
'province_name' => $city->province()->first()->name_fa,
'city_id' => $city->id,
'city_name' => $city->name_fa,
'edareh_shahri_id' => $city->edarateShahri()->first()->id,
'requested_organization' => $request->requested_organization,
'plan_group' => $request->plan_group,
'plan_title' => $request->plan_title,
'worksheet_id' => $request->worksheet,
'response_options' => json_encode($request->response_options),
'isic' => $request->isic,
'primary_area' => json_encode($request->primary_area),
'data' => $decodedString,
'token' => $decodedArray['token'],
]);
return response()->json([
'id' => $harim->id,
@@ -92,13 +89,11 @@ class PanjareVahedController extends Controller
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->update([
'state_id' => $state,
'state_name' => HarimStates::name($state),
'state_id' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM->value,
'state_name' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM->label(),
'access_road' => json_encode($request->access_road),
'data' => $request->data['data'],
'token' => $request->data['token'],
@@ -135,13 +130,12 @@ class PanjareVahedController extends Controller
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->update([
'state_id' => $state,
'state_name' => HarimStates::name($state),
'state_id' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_DAFTAR_HARIM->value,
'state_name' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_DAFTAR_HARIM->label(),
'final_area' => json_encode($request->final_area),
'final_plan' => json_encode($request->final_plan),
'data' => $request->data['data'],

6
app/Http/Controllers/V3/Dashboard/Harim/ProvinceOfficeController.php
View File

@@ -12,7 +12,6 @@ use App\Http\Traits\ApiResponse;
use App\Models\Harim;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
class ProvinceOfficeController extends Controller
{
@@ -34,13 +33,14 @@ class ProvinceOfficeController extends Controller
return response()->json($data);
}
public function feedback(FeedBackRequest $request, Harim $harim): JsonResponse
{
$harim->updateStateWithHistory(
action:HarimAction::FEEDBACK->value,
action: HarimAction::FEEDBACK->value,
description: $request->expert_description,
data: [
'state_id' => HarimStates::BARESI_TAVASOT_DAFTAR_HARIM->value,
'state_id' => HarimStates::BARESI_TAVASOT_DAFTAR_HARIM->value,
'state_name' => HarimStates::BARESI_TAVASOT_DAFTAR_HARIM->label(),
'forbidden_area' => $request->input('forbidden_area'),
]

27
app/Http/Controllers/V3/Dashboard/Harim/TechnicalDeputyController.php
View File

@@ -18,7 +18,6 @@ use App\Models\Harim;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
class TechnicalDeputyController extends Controller
{
use ApiResponse;
@@ -41,10 +40,10 @@ class TechnicalDeputyController extends Controller
public function confirmRequest(ConfirmRequest $request, Harim $harim): JsonResponse
{
$harim->updateStateWithHistory(
action:HarimAction::CONFIRM->value,
action: HarimAction::CONFIRM->value,
description: $request->expert_description,
data: [
'state_id' => HarimStates::BARESI_TAVASOT_MODIR_KOL->value,
'state_id' => HarimStates::BARESI_TAVASOT_MODIR_KOL->value,
'state_name' => HarimStates::BARESI_TAVASOT_MODIR_KOL->label(),
]
);
@@ -55,10 +54,10 @@ class TechnicalDeputyController extends Controller
public function referRequest(ReferRequest $request, Harim $harim): JsonResponse
{
$harim->updateStateWithHistory(
action:HarimAction::REFER->value,
action: HarimAction::REFER->value,
description: $request->expert_description,
data: [
'state_id' => HarimStates::BARESI_TAVASOT_DAFTAR_HARIM->value,
'state_id' => HarimStates::BARESI_TAVASOT_DAFTAR_HARIM->value,
'state_name' => HarimStates::BARESI_TAVASOT_DAFTAR_HARIM->label(),
]
);
@@ -69,10 +68,10 @@ class TechnicalDeputyController extends Controller
public function confirmRoadAccess(ConfirmRoadAccessRequest $request, Harim $harim): JsonResponse
{
$harim->updateStateWithHistory(
action:HarimAction::CONFIRM->value,
action: HarimAction::CONFIRM->value,
description: $request->expert_description,
data: [
'state_id' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MODIR_KOL->value,
'state_id' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MODIR_KOL->value,
'state_name' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_MODIR_KOL->label(),
]
);
@@ -83,10 +82,10 @@ class TechnicalDeputyController extends Controller
public function referRoadAccess(ReferRoadAccessRequest $request, Harim $harim): JsonResponse
{
$harim->updateStateWithHistory(
action:HarimAction::REFER->value,
action: HarimAction::REFER->value,
description: $request->expert_description,
data: [
'state_id' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM->value,
'state_id' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM->value,
'state_name' => HarimStates::BARESI_RAHE_DASTRASI_APLODE_SHODE_TAVASOTE_DAFTAR_HARIM->label(),
]
);
@@ -102,26 +101,28 @@ class TechnicalDeputyController extends Controller
public function referPayment(ReferPaymentRequest $request, Harim $harim): JsonResponse
{
$harim->updateStateWithHistory(
action:HarimAction::REFER->value,
action: HarimAction::REFER->value,
description: $request->expert_description,
data: [
'state_id' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_DAFTAR_HARIM->value,
'state_id' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_DAFTAR_HARIM->value,
'state_name' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_DAFTAR_HARIM->label(),
]
);
return $this->successResponse();
}
public function confirmPayment(ConfirmPaymentRequest $request, Harim $harim): JsonResponse
{
$harim->updateStateWithHistory(
action:HarimAction::CONFIRM->value,
action: HarimAction::CONFIRM->value,
description: $request->expert_description,
data: [
'state_id' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_MODIR_KOL->value,
'state_id' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_MODIR_KOL->value,
'state_name' => HarimStates::BARESI_ARSE_VA_AYAN_ERSAL_SHODE_TAVASOT_MODIR_KOL->label(),
]
);
return $this->successResponse();
}
}

1
app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/ReceiveNewRequest.php
View File

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