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

chenge and debug mission code

Browse Source
This commit is contained in:
joddyabott
2025-06-11 10:30:56 +03:30
parent b3f22d2fdf
commit a861343625
6 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/Enums/MissionTypes.php Normal file
View File

@@ -0,0 +1,19 @@
<?php
namespace App\Enums;
enum MissionTypes: int
{
case SAATY= 1;
case ROZANE = 2;
public static function name(int $state): string
{
$mapArray = [
1 => 'ساعتی',
2 => 'روزانه',
];
return $mapArray[$state];
}
}

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

@@ -3,6 +3,7 @@
namespace App\Http\Controllers\V3\Dashboard\Mission;
use App\Enums\MissionStates;
use App\Enums\MissionTypes;
use App\Http\Controllers\Controller;
use App\Http\Requests\V3\Mission\RequestPortal\StoreRequest;
use App\Http\Requests\V3\Mission\RequestPortal\UpdateRequest;
@@ -27,10 +28,6 @@ class RequestPortalController extends Controller
DB::transaction(function () use ($request) {
$user = auth()->user();
$state = MissionStates::REQUEST_CREATED->value;
$geojson = [
'type' => 'Polygon',
'coordinates' => [$request->area]
];
$mission = Mission::query()->create([
'user_id' => $user->id,
@@ -48,7 +45,7 @@ class RequestPortalController extends Controller
'request_date' => now(),
'description' => $request->description,
'end_point' => $request->end_point,
'area' => json_encode($geojson)
'area' => json_encode($request->area),
]);
$mission->rahdaran()->attach($request->rahdaran);
@@ -66,10 +63,6 @@ class RequestPortalController extends Controller
{
DB::transaction(function () use ($mission, $request) {
$state = MissionStates::REQUEST_CREATED->value;
$geojson = [
'type' => 'Polygon',
'coordinates' => [$request->area]
];
$mission->update([
'state_id' => $state,
'state_name' => MissionStates::name($state),
@@ -80,7 +73,7 @@ class RequestPortalController extends Controller
'request_date' => $request->request_date,
'description' => $request->description,
'end_point' => $request->end_point,
'area' => json_encode($geojson)
'area' => json_encode($request->area),
]);
$mission->rahdaran()->sync($request->rahdaran);

3
app/Http/Requests/V3/Mission/RequestPortal/StoreRequest.php
View File

@@ -25,10 +25,9 @@ class StoreRequest extends FormRequest
'rahdaran' => 'required|array',
'rahdaran.*' => 'exists:rahdaran,id',
'requested_machines' => 'required|array',
'type' => 'required|string|max:50',
'type' => 'required|in:1,2',
'start_date' => 'required|date',
'end_date' => 'required|date',
'request_date' => 'required|date',
'description' => 'string',
'end_point' => 'required|string',
'area' => 'required|array',

3
app/Http/Requests/V3/Mission/RequestPortal/UpdateRequest.php
View File

@@ -26,10 +26,9 @@ class UpdateRequest extends FormRequest
'rahdaran' => 'required|array',
'rahdaran.*' => 'exists:rahdaran,id',
'requested_machines' => 'required|array',
'type' => 'required|string|max:50',
'type' => 'required|in:1,2',
'start_date' => 'required|date',
'end_date' => 'required|date',
'request_date' => 'required|date',
'description' => 'string',
'end_point' => 'required|string',
'area' => 'required|array',

9
app/Models/Mission.php
View File

@@ -17,7 +17,14 @@ class Mission extends Model
protected function requestedMachines(): Attribute
{
return Attribute::make(
get: fn ($value) => json_decode($value)
get: fn($value) => json_decode($value)
);
}
protected function area(): Attribute
{
return Attribute::make(
get: fn($value) => json_decode($value)
);
}

2
database/migrations/2025_06_10_093806_add_area_to_missions_table.php
View File

@@ -12,7 +12,7 @@ return new class extends Migration
public function up(): void
{
Schema::table('missions', function (Blueprint $table) {
$table->geometry('area');
$table->json('area');
});
}