improve all of the code

This commit is contained in:
2025-05-19 11:53:09 +03:30
parent 355941d1e1
commit 3ee7a49ce9
4 changed files with 96 additions and 96 deletions

View File

@@ -1,82 +0,0 @@
<?php
namespace App\Http\Controllers\V3\Dashboard\Mission;
use App\Http\Controllers\Controller;
use App\Http\Requests\V3\Mission\RequestPortal\StoreRequest;
use App\Http\Requests\V3\Mission\RequestPortal\UpdateRequest;
use App\Http\Traits\ApiResponse;
use App\Models\Mission;
use App\Services\Missions\CartableService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
class CartableController extends Controller
{
use ApiResponse;
public function index(Request $request,CartableService $cartableService): JsonResponse
{
return response()->json($cartableService->datatable($request));
}
public function store(StoreRequest $request): JsonResponse
{
$mission = Mission::query()->create([
'user_id'=> auth()->user()->id(),
'state_id' => $request->state_id,
'state_name' => $request->state_name,
'requested_machine_type' =>$request->requested_machine_type,
'requested_machine_numbers' =>$request->requested_machine_numbers,
'type' =>$request->type,
'start_date' =>$request->start_date,
'end_date' =>$request->end_date,
'request_date' =>$request->request_date,
'description' =>$request->description,
'start_point' =>$request->start_point,
'end_point' =>$request->end_point,
]);
$mission->rahdaran()->attach($request->rahdaran);
return $this->successResponse();
}
public function show(Mission $mission): JsonResponse
{
return $this->successResponse($mission);
}
public function update(UpdateRequest $request,Mission $mission): JsonResponse
{
$mission->update([
'state_id' => $request->state_id,
'state_name' => $request->state_name,
'requested_machine_type' =>$request->requested_machine_type,
'requested_machine_numbers' =>$request->requested_machine_numbers,
'type' =>$request->type,
'start_date' =>$request->start_date,
'end_date' =>$request->end_date,
'request_date' =>$request->request_date,
'description' =>$request->description,
'start_point' =>$request->start_point,
'end_point' =>$request->end_point,
]);
$mission->rahdaran()->sync($request->rahdaran);
return $this->successResponse();
}
public function destroy(Mission $mission): JsonResponse
{
$mission->rahdaran()->detach();
$mission->delete();
return $this->successResponse();
}
}

View File

@@ -0,0 +1,87 @@
<?php
namespace App\Http\Controllers\V3\Dashboard\Mission;
use App\Enums\MissionStates;
use App\Http\Controllers\Controller;
use App\Http\Requests\V3\Mission\RequestPortal\StoreRequest;
use App\Http\Requests\V3\Mission\RequestPortal\UpdateRequest;
use App\Http\Traits\ApiResponse;
use App\Models\Mission;
use App\Services\Mission\RequestPortalService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\DB;
class RequestPortalController extends Controller
{
use ApiResponse;
public function index(Request $request, RequestPortalService $requestPortalService): JsonResponse
{
return response()->json($requestPortalService->datatable($request));
}
public function store(StoreRequest $request): JsonResponse
{
DB::transaction(function () use ($request) {
$state = MissionStates::REQUEST_CREATED->value;
$mission = Mission::query()->create([
'user_id'=> auth()->user()->id,
'state_id' =>$state,
'state_name' => MissionStates::name($state),
'requested_machine_type' => $request->requested_machine_type,
'requested_machine_numbers' => $request->requested_machine_numbers,
'type' => $request->type,
'start_date' => $request->start_date,
'end_date' => $request->end_date,
'request_date' => $request->request_date,
'description' => $request->description,
'start_point' => $request->start_point,
'end_point' => $request->end_point,
]);
$mission->rahdaran()->attach($request->rahdaran);
});
return $this->successResponse();
}
public function show(Mission $mission): JsonResponse
{
return $this->successResponse($mission);
}
public function update(UpdateRequest $request,Mission $mission): JsonResponse
{
DB::transaction(function () use ($mission, $request) {
$state = MissionStates::REQUEST_CREATED->value;
$mission->update([
'state_id' =>$state,
'state_name' => MissionStates::name($state),
'requested_machine_type' => $request->requested_machine_type,
'requested_machine_numbers' => $request->requested_machine_numbers,
'type' => $request->type,
'start_date' => $request->start_date,
'end_date' => $request->end_date,
'request_date' => $request->request_date,
'description' => $request->description,
'start_point' => $request->start_point,
'end_point' => $request->end_point,
]);
$mission->rahdaran()->sync($request->rahdaran);
});
return $this->successResponse();
}
public function destroy(Mission $mission): JsonResponse
{
DB::transaction(function () use ($mission) {
$mission->rahdaran()->detach();
$mission->delete();
});
return $this->successResponse();
}
}