Merge branch 'feature/MachineList' into 'develop'

Feature/machine list

See merge request witelgroup/rms_v2!138

app/Console/Commands/GetMachinesInfoListCommand.php

@@ -47,6 +47,7 @@ class GetMachinesInfoListCommand extends Command
                     [
                         'car_name' => $entry['CarName'] == [] ? null : $entry['CarName'],
                         'car_group' => $entry['CarGroup'] == [] ? null : $entry['CarGroup'],
+                        'car_type' => $entry['CarType'] == [] ? null : $entry['CarType'],
                         'machine_code' => $entry['MachineCode'],
                         'unit_name' => $entry['UnitName'],
                         'car_status' => $entry['Status'],

app/Http/Controllers/V3/Dashboard/Mission/TransportationUnitController.php

@@ -7,6 +7,7 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\V3\Mission\TransportaionUnit\AllocateRequest;
 use App\Http\Requests\V3\Mission\TransportaionUnit\DeallocateRequest;
 use App\Http\Traits\ApiResponse;
+use App\Models\CMMSMachine;
 use App\Models\Mission;
 use App\Services\Cartables\Mission\TransportationUnitService;
 use Illuminate\Http\JsonResponse;
@@ -65,8 +66,12 @@ class TransportationUnitController extends Controller
         return $this->successResponse();
     }
 
-    public function rahdaran(Mission $mission): JsonResponse
+    public function machinesList(Mission $mission): JsonResponse
     {
-        return $this->successResponse($mission->rahdaran()->get(['rahdaran.id', 'rahdaran.name', 'rahdaran.code']));
+        return $this->successResponse(
+            CMMSMachine::query()
+                ->where('car_type', '=', $mission->car_type)
+                ->get(['machine_code', 'id', 'plak_number', 'car_name'])
+        );
     }
 }

app/Http/Requests/V3/Mission/ControlUnit/StartRequest.php

@@ -13,7 +13,7 @@ class StartRequest extends FormRequest
      */
     public function authorize(): bool
     {
-        return $this->mission->state_id == MissionStates::PENDING_CONFIRMATION->value;
+        return ($this->mission->state_id == MissionStates::PENDING_CONFIRMATION->value && $this->mission->code == $this->code);
     }
 
     /**
@@ -24,7 +24,7 @@ class StartRequest extends FormRequest
     public function rules(): array
     {
         return [
-            //
+            'code' => 'required|string',
         ];
     }
 }

database/migrations/2025_07_12_140123_add_column_to_cmms_machines_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('cmms_machines', function (Blueprint $table) {
+            $table->string('car_type')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('cmms_machines', function (Blueprint $table) {
+            $table->dropColumn('car_type');
+        });
+    }
+};

routes/v3.php

@@ -467,6 +467,7 @@ Route::prefix('missions')
                 Route::get('/', 'index')->name('index');
                 Route::post('/allocate/{mission}', 'allocate')->name('allocate');
                 Route::post('/deallocate/{mission}', 'deallocate')->name('deallocate');
+                Route::post('/machines_list/{mission}', 'machinesList')->name('machinesList');
             });
         Route::name('controlUnit.')
             ->prefix('control_unit')