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

9
app/Http/Controllers/V3/Dashboard/Mission/ControlUnitController.php
View File

@@ -18,6 +18,7 @@ use Illuminate\Support\Facades\DB;
class ControlUnitController extends Controller
{
use ApiResponse;
public function index(Request $request, ControlUnitService $controlUnitService): JsonResponse
{
return response()->json($controlUnitService->datatable($request));
@@ -25,7 +26,7 @@ class ControlUnitController extends Controller
public function start(StartRequest $request, Mission $mission): JsonResponse
{
DB::transaction(function () use ($request, $mission) {
DB::transaction(function () use ($mission) {
$mission->histories()->create([
'user_id' => auth()->user()->id,
'previous_state_id' => $mission->state_id,
@@ -36,7 +37,7 @@ class ControlUnitController extends Controller
$mission->update([
'state_id' => $state,
'state_name' => MissionStates::name($state),
'start_time' => now()
'start_time' => now(),
]);
});
@@ -45,7 +46,7 @@ class ControlUnitController extends Controller
public function finish(FinishRequest $request, Mission $mission): JsonResponse
{
DB::transaction(function () use ($request, $mission) {
DB::transaction(function () use ($mission) {
$mission->histories()->create([
'user_id' => auth()->user()->id,
'previous_state_id' => $mission->state_id,
@@ -63,7 +64,7 @@ class ControlUnitController extends Controller
});
if ($mission->category_id == 2) {
$rpc = new OperatorController();
$rpc = new OperatorController;
$rpc->store($mission);
}

3
app/Http/Controllers/V3/Dashboard/Mission/DetailController.php
View File

@@ -6,7 +6,6 @@ use App\Http\Controllers\Controller;
use App\Http\Traits\ApiResponse;
use App\Models\Mission;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
class DetailController extends Controller
{
@@ -28,7 +27,7 @@ class DetailController extends Controller
'code' => $rahdar->code,
'is_driver' => (bool) $rahdar->pivot->is_driver,
];
});
});
return $this->successResponse($rahdaran);
}

29
app/Http/Controllers/V3/Dashboard/Mission/RequestPortalController.php
View File

@@ -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);
}
});

10
app/Http/Controllers/V3/Dashboard/Mission/TransportationUnitController.php
View File

@@ -27,19 +27,19 @@ class TransportationUnitController extends Controller
{
DB::transaction(function () use ($request, $mission) {
$mission->machines()->attach($request->machines);
$mission->rahdaran()->attach($request->driver, ['is_driver'=>true]);
$mission->rahdaran()->attach($request->driver, ['is_driver' => true]);
$mission->histories()->create([
'user_id' => auth()->user()->id,
'previous_state_id' => $mission->state_id,
'previous_state_name' => $mission->state_name
'previous_state_name' => $mission->state_name,
]);
$state = MissionStates::PENDING_CONFIRMATION->value;
$mission->update([
'state_id' => $state,
'state_name' => MissionStates::name($state),
'km' => $request->km
'km' => $request->km,
]);
});
@@ -53,7 +53,7 @@ class TransportationUnitController extends Controller
'user_id' => auth()->user()->id,
'previous_state_id' => $mission->state_id,
'previous_state_name' => $mission->state_name,
'user_description' => $request->description
'user_description' => $request->description,
]);
$state = MissionStates::REJECT_BY_TRANSPORTATION->value;
@@ -61,7 +61,7 @@ class TransportationUnitController extends Controller
$mission->update([
'state_id' => $state,
'state_name' => MissionStates::name($state),
'description' => $request->description
'description' => $request->description,
]);
});