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

This commit is contained in:
2025-10-27 13:20:14 +03:30
parent 71f5001477
commit b155db758a
118 changed files with 604 additions and 559 deletions

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'));