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

improve code in controller and form request for V3 whit pint package

Browse Source
This commit is contained in:
faezehzafarbakhsh
2025-10-27 13:20:14 +03:30
parent 71f5001477
commit b155db758a
118 changed files with 604 additions and 559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/V3/Dashboard/Harim/DetailController.php
View File

@@ -2,7 +2,6 @@
namespace App\Http\Controllers\V3\Dashboard\Harim;
use App\Facades\DataTable\DataTableFacade;
use App\Http\Controllers\Controller;
use App\Http\Traits\ApiResponse;
use App\Models\HarimState;

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

@@ -11,10 +11,10 @@ use App\Events\V3\Dashboard\Harim\ConfirmRoadAccessNeedEvent;
use App\Events\V3\Dashboard\Harim\RejectRequestEvent;
use App\Facades\DataTable\DataTableFacade;
use App\Http\Controllers\Controller;
use App\Http\Requests\V3\Dashboard\Harim\GeneralManager\ConfirmRoadAccessEditNeedRequest;
use App\Http\Requests\V3\Dashboard\Harim\GeneralManager\ConfirmRoadAccessNeedRequest;
use App\Http\Requests\V3\Dashboard\Harim\GeneralManager\ConfirmGuaranteeLetterNeedRequest;
use App\Http\Requests\V3\Dashboard\Harim\GeneralManager\ConfirmNoRoadAccessNeedRequest;
use App\Http\Requests\V3\Dashboard\Harim\GeneralManager\ConfirmRoadAccessEditNeedRequest;
use App\Http\Requests\V3\Dashboard\Harim\GeneralManager\ConfirmRoadAccessNeedRequest;
use App\Http\Requests\V3\Dashboard\Harim\GeneralManager\ReferFileRequest;
use App\Http\Requests\V3\Dashboard\Harim\GeneralManager\ReferRequest;
use App\Http\Requests\V3\Dashboard\Harim\GeneralManager\RejectRequest;
@@ -34,7 +34,7 @@ class GeneralManagerController extends Controller
$query = Harim::query()
->where('province_id', '=', auth()->user()->province_id);
$data = DataTableFacade::run(
$data = DataTableFacade::run(
$query,
$request,
allowedFilters: ['*'],
@@ -46,8 +46,7 @@ class GeneralManagerController extends Controller
public function rejectRequest(RejectRequest $request, Harim $harim): JsonResponse
{
DB::transaction(function () use ($request, $harim)
{
DB::transaction(function () use ($request, $harim) {
$action = HarimAction::CONFIRM->value;
$harim->histories()->create([
@@ -74,12 +73,11 @@ class GeneralManagerController extends Controller
public function referRequest(ReferRequest $request, Harim $harim): JsonResponse
{
DB::transaction(function () use ($request, $harim)
{
DB::transaction(function () use ($request, $harim) {
$action = HarimAction::REFER->value;
$harim->histories()->create([
'expert_id'=> auth()->user()->id,
'expert_id' => auth()->user()->id,
'previous-state_id' => $harim->state_id,
'previous_state_name' => $harim->state_name,
'export_description' => $request->export_description,
@@ -100,12 +98,11 @@ class GeneralManagerController extends Controller
public function referFile(ReferFileRequest $request, Harim $harim): JsonResponse
{
DB::transaction(function () use ($request, $harim)
{
DB::transaction(function () use ($request, $harim) {
$action = HarimAction::REFER->value;
$harim->histories()->create([
'expert_id'=> auth()->user()->id,
'expert_id' => auth()->user()->id,
'previous-state_id' => $harim->state_id,
'previous_state_name' => $harim->state_name,
'export_description' => $request->export_description,
@@ -126,8 +123,7 @@ class GeneralManagerController extends Controller
public function confirmRoadAccessNeed(ConfirmRoadAccessNeedRequest $request, Harim $harim): JsonResponse
{
DB::transaction(function () use ($request, $harim)
{
DB::transaction(function () use ($request, $harim) {
$action = HarimAction::CONFIRM->value;
$harim->histories()->create([
@@ -154,8 +150,7 @@ class GeneralManagerController extends Controller
public function confirmNoRoadAccessNeed(ConfirmNoRoadAccessNeedRequest $request, Harim $harim): JsonResponse
{
DB::transaction(function () use ($request, $harim)
{
DB::transaction(function () use ($request, $harim) {
$action = HarimAction::CONFIRM->value;
$harim->histories()->create([
@@ -183,8 +178,7 @@ class GeneralManagerController extends Controller
public function confirmRoadAccessEditNeed(ConfirmRoadAccessEditNeedRequest $request, Harim $harim): JsonResponse
{
DB::transaction(function () use ($request, $harim)
{
DB::transaction(function () use ($request, $harim) {
$action = HarimAction::CONFIRM->value;
$harim->histories()->create([
@@ -211,8 +205,7 @@ class GeneralManagerController extends Controller
public function confirmGuaranteeLetterNeed(ConfirmGuaranteeLetterNeedRequest $request, Harim $harim): JsonResponse
{
DB::transaction(function () use ($request, $harim)
{
DB::transaction(function () use ($request, $harim) {
$action = HarimAction::CONFIRM->value;
$harim->histories()->create([

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

@@ -6,12 +6,12 @@ use App\Enums\HarimAction;
use App\Enums\HarimStates;
use App\Facades\DataTable\DataTableFacade;
use App\Http\Controllers\Controller;
use App\Http\Requests\V3\Dashboard\Harim\HarimOffice\FileRejectedRequest;
use App\Http\Requests\V3\Dashboard\Harim\HarimOffice\FileAcceptedRequest;
use App\Http\Requests\V3\Dashboard\Harim\HarimOffice\FileRejectedRequest;
use App\Http\Requests\V3\Dashboard\Harim\HarimOffice\NeedRoadAccessRequest;
use App\Http\Requests\V3\Dashboard\Harim\HarimOffice\ReferRequest;
use App\Http\Requests\V3\Dashboard\Harim\HarimOffice\RejectRequest;
use App\Http\Requests\V3\Dashboard\Harim\HarimOffice\ShowRequest;
use App\Http\Requests\V3\Dashboard\Harim\HarimOffice\NeedRoadAccessRequest;
use App\Http\Requests\V3\Dashboard\Harim\HarimOffice\WithoutRoadAccessRequest;
use App\Http\Traits\ApiResponse;
use App\Models\Harim;
@@ -22,7 +22,7 @@ use Illuminate\Support\Facades\DB;
class HarimOfficeController extends Controller
{
use ApiResponse ;
use ApiResponse;
public function index(Request $request): JsonResponse
{
@@ -39,7 +39,6 @@ class HarimOfficeController extends Controller
return response()->json($data);
}
public function rejectRequest(RejectRequest $request, Harim $harim): JsonResponse
{
DB::transaction(function () use ($request, $harim) {
@@ -67,7 +66,7 @@ class HarimOfficeController extends Controller
public function referRequest(ReferRequest $request, Harim $harim): JsonResponse
{
DB::transaction(function () use ($request,$harim) {
DB::transaction(function () use ($request, $harim) {
$action = HarimAction::REFER->value;
$harim->histories()->create([
@@ -75,7 +74,7 @@ class HarimOfficeController extends Controller
'previous_state_id' => $harim->state_id,
'previous_state_name' => $harim->state_name,
'expert_description' => $request->expert_description,
'action_id' => $action,
'action_id' => $action,
'action_name' => HarimAction::name($action),
]);
@@ -92,7 +91,7 @@ class HarimOfficeController extends Controller
public function needRoadAccess(NeedRoadAccessRequest $request, Harim $harim): JsonResponse
{
DB::transaction(function () use ($request,$harim) {
DB::transaction(function () use ($request, $harim) {
$action = HarimAction::YES->value;
$harim->histories()->create([
'expert_id' => auth()->user()->id,
@@ -105,12 +104,12 @@ class HarimOfficeController extends Controller
$state = HarimStates::BARESI_TAVASOT_MOAVEN->value;
$harim ->update([
$harim->update([
'state_id' => $state,
'state_name' => HarimStates::name($state),
'is_possible' => true,
'need_access_road' => true,
'need_payment' => $request->need_payment
'need_payment' => $request->need_payment,
]);
});
@@ -119,7 +118,7 @@ class HarimOfficeController extends Controller
public function withoutRoadAccess(WithoutRoadAccessRequest $request, Harim $harim): JsonResponse
{
DB::transaction(function () use ($request,$harim) {
DB::transaction(function () use ($request, $harim) {
$action = HarimAction::YES->value;
$harim->histories()->create([
'expert_id' => auth()->user()->id,
@@ -132,20 +131,21 @@ class HarimOfficeController extends Controller
$state = HarimStates::BARESI_TAVASOT_MOAVEN->value;
$harim ->update([
$harim->update([
'state_id' => $state,
'state_name' => HarimStates::name($state),
'is_possible' => true,
'need_access_road' => false,
'need_payment' => $request->need_payment
'need_payment' => $request->need_payment,
]);
});
return $this->successResponse();
}
public function fileAccepted(FileAcceptedRequest $request, Harim $harim): JsonResponse
{
DB::transaction(function () use ($request,$harim) {
DB::transaction(function () use ($request, $harim) {
$action = HarimAction::YES->value;
$harim->histories()->create([
'expert_id' => auth()->user()->id,
@@ -158,7 +158,7 @@ class HarimOfficeController extends Controller
$state = HarimStates::BARESI_FILE_APLODE_SHODE_TAVASOTE_MOAVEN->value;
$harim ->update([
$harim->update([
'state_id' => $state,
'state_name' => HarimStates::name($state),
'access_road_allowed' => true,
@@ -167,9 +167,10 @@ class HarimOfficeController extends Controller
return $this->successResponse();
}
public function fileRejected(FileRejectedRequest $request, Harim $harim): JsonResponse
{
DB::transaction(function () use ($request,$harim) {
DB::transaction(function () use ($request, $harim) {
$action = HarimAction::NO->value;
$harim->histories()->create([
'expert_id' => auth()->user()->id,
@@ -182,7 +183,7 @@ class HarimOfficeController extends Controller
$state = HarimStates::BARESI_FILE_APLODE_SHODE_TAVASOTE_MOAVEN->value;
$harim ->update([
$harim->update([
'state_id' => $state,
'state_name' => HarimStates::name($state),
'access_road_allowed' => false,
@@ -191,6 +192,7 @@ class HarimOfficeController extends Controller
return $this->successResponse();
}
public function show(ShowRequest $request, Harim $harim): JsonResponse
{
return $this->successResponse($harim->load('histories'));

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

@@ -21,8 +21,8 @@ class PanjareVahedController extends Controller
public function receiveNewRequest(ReceiveNewRequest $request): JsonResponse
{
$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]);
$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);
try {
@@ -32,8 +32,7 @@ class PanjareVahedController extends Controller
ST_GeomFromText('POINT($matches[1] $matches[2])', 4326))"
)
->firstOrFail(['id', 'name_fa', 'province_id']);
}
catch (ModelNotFoundException $exception){
} catch (ModelNotFoundException $exception) {
$city = City::query()
->orderByRaw("ST_Distance(
geometry,
@@ -126,7 +125,6 @@ class PanjareVahedController extends Controller
$harim = Harim::query()->firstWhere('panjare_vahed_id', '=', $request->request_id);
$harim->update([
'state_id' => $state,
'state_name' => HarimStates::name($state),

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

@@ -30,12 +30,14 @@ class ProvinceOfficeController extends Controller
allowedFilters: ['*'],
allowedSortings: ['*'],
);
return response()->json($data);
}
public function feedback(FeedBackRequest $request, Harim $harim): JsonResponse
{
DB::transaction(function () use ($request,$harim) {
DB::transaction(function () use ($request, $harim) {
$action = HarimAction::FEEDBACK->value;
$harim->histories()->create([
@@ -49,12 +51,13 @@ class ProvinceOfficeController extends Controller
$state = HarimStates::BARESI_TAVASOT_DAFTAR_HARIM->value;
$harim ->update([
$harim->update([
'state_id' => $state,
'state_name' => HarimStates::name($state),
'forbidden_area' => $request->input('forbidden_area'),
]);
});
return $this->successResponse();
}

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

@@ -20,23 +20,25 @@ use Illuminate\Support\Facades\DB;
class TechnicalDeputyController extends Controller
{
use ApiResponse;
public function index(Request $request): JsonResponse
{
$query = Harim::query()
->where('province_id', '=', auth()->user()->province_id);
$data = DataTableFacade::run(
$query,
$request,
allowedFilters: ['*'],
allowedSortings: ['*'],
$query,
$request,
allowedFilters: ['*'],
allowedSortings: ['*'],
);
return response()->json($data);
}
public function confirmRequest(ConfirmRequest $request, Harim $harim): JsonResponse
{
DB::transaction(function () use ($request,$harim) {
DB::transaction(function () use ($request, $harim) {
$action = HarimAction::CONFIRM->value;
$harim->histories()->create([
@@ -44,13 +46,13 @@ class TechnicalDeputyController extends Controller
'previous_state_id' => $harim->state_id,
'previous_state_name' => $harim->state_name,
'expert_description' => $request->expert_description,
'action_id' => $action,
'action_id' => $action,
'action_name' => HarimAction::name($action),
]);
$state = HarimStates::BARESI_TAVASOT_MODIR_KOL->value;
$harim ->update([
$harim->update([
'state_id' => $state,
'state_name' => HarimStates::name($state),
]);
@@ -58,9 +60,10 @@ class TechnicalDeputyController extends Controller
return $this->successResponse();
}
public function referRequest(ReferRequest $request, Harim $harim): JsonResponse
{
DB::transaction(function () use ($request,$harim) {
DB::transaction(function () use ($request, $harim) {
$action = HarimAction::REFER->value;
$harim->histories()->create([
@@ -68,7 +71,7 @@ class TechnicalDeputyController extends Controller
'previous_state_id' => $harim->state_id,
'previous_state_name' => $harim->state_name,
'expert_description' => $request->expert_description,
'action_id' => $action,
'action_id' => $action,
'action_name' => HarimAction::name($action),
]);
@@ -82,6 +85,7 @@ class TechnicalDeputyController extends Controller
return $this->successResponse();
}
public function confirmRoadAccess(ConfirmRoadAccessRequest $request, Harim $harim): JsonResponse
{
DB::transaction(function () use ($request, $harim) {
@@ -129,6 +133,7 @@ class TechnicalDeputyController extends Controller
return $this->successResponse();
}
public function show(ShowRequest $request, Harim $harim): JsonResponse
{
return $this->successResponse($harim->load('histories'));