Merge branch 'feature/MachinCodeList' into 'develop'

Feature/machin code list

See merge request witelgroup/rms_v2!45

app/Http/Controllers/V2/Dashboard/RoadObservationController.php

@@ -329,6 +329,7 @@ class RoadObservationController extends Controller
             'road_observeds.id',
             'Title',
             'road_observeds.created_at',
+            'road_observeds.StartTime_DateTime',
             'lat',
             'lng',
             'FeatureTypeTitle',
@@ -340,7 +341,7 @@ class RoadObservationController extends Controller
             'edarate_shahri.name_fa'
         ];
 
-        $aliases = ['', 'road_observeds_id', '', 'road_observeds_created_at', '', '', '', '', '', 'province_id', '', '', 'edarate_shahri_name_fa'];
+        $aliases = ['', 'road_observeds_id', '', 'road_observeds_created_at', 'road_observeds_nikarayan_created_at', '', '', '', '', '', 'province_id', '', '', 'edarate_shahri_name_fa'];
 
         $selectRaw = makeSelectQuery($fields, $aliases);
 

app/Http/Controllers/V3/CMMSMachinesController.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Controllers\V3;
+
+use App\Http\Controllers\Controller;
+use App\Http\Traits\ApiResponse;
+use App\Models\CMMSMachine;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CMMSMachinesController extends Controller
+{
+    use ApiResponse;
+
+    public function list(): JsonResponse
+    {
+        $machinesList = CMMSMachine::query()->get(['machine_code']);
+
+        return $this->successResponse($machinesList);
+    }
+
+    public function search(Request $request): JsonResponse
+    {
+        $matchedSearchedMachines = CMMSMachine::query()
+            ->where('machine_code', 'LIKE', "%{$request->machine_code}%")
+            ->get();
+
+        return $this->successResponse($matchedSearchedMachines);
+    }
+}

app/Http/Controllers/V3/RahdaranController.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Controllers\V3;
+
+use App\Http\Controllers\Controller;
+use App\Http\Traits\ApiResponse;
+use App\Models\Rahdaran;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class RahdaranController extends Controller
+{
+    use ApiResponse;
+
+    public function list(): JsonResponse
+    {
+        $rahdaranList = Rahdaran::query()->get();
+
+        return $this->successResponse($rahdaranList);
+    }
+
+    public function search(Request $request): JsonResponse
+    {
+        $matchedSearchedRahdaran = Rahdaran::query()
+            ->where('code', 'LIKE', "%{$request->code}%")
+            ->get();
+
+        return $this->successResponse($matchedSearchedRahdaran);
+    }
+}

database/seeders/CMMSMachineSeeder.php

@@ -5,6 +5,7 @@ namespace Database\Seeders;
 use App\Models\CMMSMachine;
 use Illuminate\Database\Console\Seeds\WithoutModelEvents;
 use Illuminate\Database\Seeder;
+use Illuminate\Support\Facades\DB;
 
 class CMMSMachineSeeder extends Seeder
 {
@@ -13,6 +14,7 @@ class CMMSMachineSeeder extends Seeder
      */
     public function run(): void
     {
-        CMMSMachine::factory(5)->create();
+        $sqlFile = file_get_contents(storage_path('/sql-files/cmms_machines.sql'));
+        DB::unprepared($sqlFile);
     }
 }

routes/v3.php

@@ -4,8 +4,10 @@ use App\Http\Controllers\V3\Auth\LogoutController;
 use App\Http\Controllers\V3\Azmayesh\AzmayeshController;
 use App\Http\Controllers\V3\Azmayesh\AzmayeshSampleController;
 use App\Http\Controllers\V3\Azmayesh\AzmayeshTypeController;
+use App\Http\Controllers\V3\CMMSMachinesController;
 use App\Http\Controllers\V3\Harim\DivarkeshiController;
 use App\Http\Controllers\V3\ProfileController;
+use App\Http\Controllers\V3\RahdaranController;
 use App\Http\Controllers\V3\RoadItemsProjectController;
 use Illuminate\Support\Facades\Route;
 
@@ -114,3 +116,19 @@ Route::prefix('road_items')
         Route::get('/operator_report', 'operatorCartableReport')
             ->name('operatorCartableReport');
     });
+
+Route::prefix('cmms_machines')
+    ->name('cmms_machines')
+    ->controller(CMMSMachinesController::class)
+    ->group(function () {
+        Route::get('/list', 'list')->name('list');
+        Route::get('/search', 'search')->name('search');
+    });
+
+Route::prefix('rahdaran')
+    ->name('rahdaran')
+    ->controller(RahdaranController::class)
+    ->group(function () {
+        Route::get('/list', 'list')->name('list');
+        Route::get('/search', 'search')->name('search');
+    });