Merge pull request #67 from witelgroup/revert-66-feature/HarimData

Revert "Feature/harim data"

app/Console/Commands/RoadObservationProblems.php

@@ -78,8 +78,7 @@ class RoadObservationProblems extends Command
                         $mobile = $value->MobileForSendEventSms;
                     }
 
-                    $city = findCityFromGeoJson($value->YGeo, $value->XGeo);
+                    $cityModel = City::findCityWithLatLng($value->XGeo, $value->YGeo);
-                    $cityModel = $city ? City::query()->find($city['city_id']) : City::query()->find(NikarayanComplaints::mapCities((int) $value->fk_Town));
                     $rop = RoadObserved::query()->updateOrCreate(
                         ['fk_RegisteredEventMessage' => $value->fk_RegisteredEventMessage],
                         [

app/Console/Kernel.php

@@ -41,8 +41,8 @@ class Kernel extends ConsoleKernel
         $schedule->command("webservice:roadobserved --daily-mode")
             ->dailyAt('00:45')->appendOutputTo(storage_path('logs/nikarayan.log'));
 
-//        $schedule->command("db:backup")
+        $schedule->command("db:backup")
-//            ->weekly()->at('03:00')->appendOutputTo(storage_path('logs/mariadb-backup.log'));
+            ->weekly()->at('03:00')->appendOutputTo(storage_path('logs/mariadb-backup.log'));
 
         $schedule->command('telescope:prune --hours=48')
             ->dailyAt('04:00')

app/Http/Controllers/V3/Dashboard/Harim/PanjareVahedController.php

@@ -62,8 +62,6 @@ class PanjareVahedController extends Controller
             'response_options' => json_encode($request->response_options),
             'isic' => $request->isic,
             'primary_area' => json_encode($request->primary_area),
-            'data' => $request->data['data'],
-            'token' => $request->data['token'],
         ]);
 
         return $this->successResponse([
@@ -87,6 +85,7 @@ class PanjareVahedController extends Controller
         return $this->successResponse();
     }
 
+
     public function getRejectRequest(GetRejectRequest $request)
     {
         $state = HarimStates::MOKHALEFAT_BA_DASTGAH->value;

app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/ReceiveNewRequest.php

@@ -36,7 +36,6 @@ class ReceiveNewRequest extends FormRequest
             'primary_area' => 'required|array',
             'primary_area.type' => 'required|string',
             'primary_area.coordinates' => 'required|array',
-            'data' => 'required|array',
         ];
     }
 }

app/Http/Requests/V3/Mission/RequestPortal/UpdateRequest.php

@@ -26,7 +26,7 @@ class UpdateRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'rahdaran' => 'array',
+            'rahdaran' => 'required|array',
             'rahdaran.*' => 'exists:rahdaran,id',
             'requested_machines' => 'required|array',
             'type' => 'required|in:1,2',

database/migrations/2025_10_15_085149_add_column_to_harims_table.php

@@ -1,29 +0,0 @@
-<?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('harims', function (Blueprint $table) {
-            $table->longText('data')->nullable();
-            $table->string('token', 255);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('harims', function (Blueprint $table) {
-            $table->dropColumn(['data', 'token']);
-        });
-    }
-};

routes/v3.php

@@ -386,7 +386,7 @@ Route::prefix('safety_and_privacy')
                 Route::get('/map', 'map')->name('map');
                 Route::post('operator/second_step_store/{safetyAndPrivacy}', 'secondStepStore')->name('secondStepStore')->middleware(['validate-store-access','permission:add-safety-and-privacy','check-axis-type']);
                 Route::post('operator/third_step_store/{safetyAndPrivacy}', 'thirdStepStore')->name('thirdStepStore')->middleware(['validate-store-access','permission:add-safety-and-privacy','check-axis-type']);
-                Route::post('operator/{safetyAndPrivacy}', 'update')->name('update');
+                Route::post('operator/{safetyAndPrivacy}', 'update')->name('update')->middleware('permission:update-safety-and-privacy');
                 Route::get('operator/{safetyAndPrivacy}', 'show')->name('show');
                 Route::delete('operator/{safetyAndPrivacy}', 'destroy')->name('destroy')->middleware('permission:delete-safety-and-privacy');
                 Route::get('/deserialize/{safetyAndPrivacy}', 'deserialize')->name('deserialize');