improve code in controller and form request for V3 whit pint package
This commit is contained in:
@@ -8,8 +8,8 @@ use App\Enums\MissionTypes;
|
||||
use App\Enums\MissionZones;
|
||||
use App\Http\Controllers\Controller;
|
||||
use App\Http\Controllers\V3\Dashboard\RoadPatrol\OperatorController;
|
||||
use App\Http\Requests\V3\Mission\RequestPortal\NoProcessRequest;
|
||||
use App\Http\Requests\V3\Mission\RequestPortal\ContinueMissionRequest;
|
||||
use App\Http\Requests\V3\Mission\RequestPortal\NoProcessRequest;
|
||||
use App\Http\Requests\V3\Mission\RequestPortal\StoreRequest;
|
||||
use App\Http\Requests\V3\Mission\RequestPortal\UpdateRequest;
|
||||
use App\Http\Traits\ApiResponse;
|
||||
@@ -66,7 +66,7 @@ class RequestPortalController extends Controller
|
||||
|
||||
$mission->rahdaran()->sync($request->rahdaran);
|
||||
|
||||
if ($category == 3){
|
||||
if ($category == 3) {
|
||||
RoadObserved::query()
|
||||
->find($request->road_observed_id)
|
||||
->missions()
|
||||
@@ -82,11 +82,11 @@ class RequestPortalController extends Controller
|
||||
return $this->successResponse($mission);
|
||||
}
|
||||
|
||||
public function continueMission(ContinueMissionRequest $request , Mission $mission): JsonResponse
|
||||
public function continueMission(ContinueMissionRequest $request, Mission $mission): JsonResponse
|
||||
{
|
||||
DB::transaction(function () use ($request, $mission) {
|
||||
$user = auth()->user();
|
||||
|
||||
|
||||
$mission->update([
|
||||
'finish_time' => now(),
|
||||
'state_id' => MissionStates::END_MISSION->value,
|
||||
@@ -118,18 +118,18 @@ class RequestPortalController extends Controller
|
||||
'category_id' => $category,
|
||||
'category_name' => MissionCategory::name($category),
|
||||
'explanation' => $request->explanation,
|
||||
'start_time' => now()
|
||||
'start_time' => now(),
|
||||
]);
|
||||
|
||||
$newMission->rahdaran()->sync($request->rahdaran);
|
||||
$newMission->machines()->attach($request->machines);
|
||||
$newMission->rahdaran()->attach($request->driver, ['is_driver' => true]);
|
||||
$newMission->rahdaran()->sync($request->rahdaran);
|
||||
$newMission->machines()->attach($request->machines);
|
||||
$newMission->rahdaran()->attach($request->driver, ['is_driver' => true]);
|
||||
|
||||
if ($category == 3){
|
||||
if ($category == 3) {
|
||||
RoadObserved::query()
|
||||
->find($request->road_observed_id)
|
||||
->missions()
|
||||
->attach( $newMission->id);
|
||||
->attach($newMission->id);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -159,7 +159,7 @@ class RequestPortalController extends Controller
|
||||
]);
|
||||
|
||||
$mission->rahdaran()->sync($request->rahdaran);
|
||||
if ($request->category_id == 3){
|
||||
if ($request->category_id == 3) {
|
||||
RoadObserved::query()
|
||||
->find($request->road_observed_id)
|
||||
->missions()
|
||||
@@ -169,14 +169,17 @@ class RequestPortalController extends Controller
|
||||
|
||||
return $this->successResponse();
|
||||
}
|
||||
|
||||
public function destroy(Mission $mission): JsonResponse
|
||||
{
|
||||
DB::transaction(function () use ($mission) {
|
||||
$mission->rahdaran()->detach();
|
||||
$mission->delete();
|
||||
});
|
||||
|
||||
return $this->successResponse();
|
||||
}
|
||||
|
||||
public function noProcess(NoProcessRequest $request): JsonResponse
|
||||
{
|
||||
DB::transaction(function () use ($request) {
|
||||
@@ -185,7 +188,7 @@ class RequestPortalController extends Controller
|
||||
$end = Carbon::parse($request->end_date);
|
||||
$type = $start->diffInMinutes($end) > 480 ? MissionTypes::NO_PROCESS_ROZANE->value : MissionTypes::NO_PROCESS_SAATY->value;
|
||||
$user = auth()->user();
|
||||
$zone= $request->zone;
|
||||
$zone = $request->zone;
|
||||
$state = MissionStates::END_MISSION->value;
|
||||
|
||||
$mission = Mission::query()->create([
|
||||
@@ -218,7 +221,7 @@ class RequestPortalController extends Controller
|
||||
$mission->rahdaran()->attach($request->driver, ['is_driver' => true]);
|
||||
|
||||
if ($mission->category_id == 2) {
|
||||
$rpc = new OperatorController();
|
||||
$rpc = new OperatorController;
|
||||
$rpc->store($mission);
|
||||
}
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user