From 13604bdeb377c70ea972814707a52e1e45bdeda2 Mon Sep 17 00:00:00 2001 From: Amir Ghasempoor <88371724+amirghasempoor@users.noreply.github.com> Date: Sat, 18 Oct 2025 09:22:18 +0330 Subject: [PATCH 1/2] Revert "Feature/harim data" --- .../Commands/RoadObservationProblems.php | 3 +- app/Console/Kernel.php | 4 +-- .../Harim/PanjareVahedController.php | 3 +- .../Harim/PanjareVahed/ReceiveNewRequest.php | 1 - .../Mission/RequestPortal/UpdateRequest.php | 2 +- ...0_15_085149_add_column_to_harims_table.php | 29 ------------------- routes/v3.php | 2 +- 7 files changed, 6 insertions(+), 38 deletions(-) delete mode 100644 database/migrations/2025_10_15_085149_add_column_to_harims_table.php diff --git a/app/Console/Commands/RoadObservationProblems.php b/app/Console/Commands/RoadObservationProblems.php index e25b3109..b585d167 100755 --- a/app/Console/Commands/RoadObservationProblems.php +++ b/app/Console/Commands/RoadObservationProblems.php @@ -78,8 +78,7 @@ class RoadObservationProblems extends Command $mobile = $value->MobileForSendEventSms; } - $city = findCityFromGeoJson($value->YGeo, $value->XGeo); - $cityModel = $city ? City::query()->find($city['city_id']) : City::query()->find(NikarayanComplaints::mapCities((int) $value->fk_Town)); + $cityModel = City::findCityWithLatLng($value->XGeo, $value->YGeo); $rop = RoadObserved::query()->updateOrCreate( ['fk_RegisteredEventMessage' => $value->fk_RegisteredEventMessage], [ diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 281693b9..72869440 100755 --- a/app/Console/Kernel.php +++ b/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") -// ->weekly()->at('03:00')->appendOutputTo(storage_path('logs/mariadb-backup.log')); + $schedule->command("db:backup") + ->weekly()->at('03:00')->appendOutputTo(storage_path('logs/mariadb-backup.log')); $schedule->command('telescope:prune --hours=48') ->dailyAt('04:00') diff --git a/app/Http/Controllers/V3/Dashboard/Harim/PanjareVahedController.php b/app/Http/Controllers/V3/Dashboard/Harim/PanjareVahedController.php index 8f9a6c43..4c91eda7 100644 --- a/app/Http/Controllers/V3/Dashboard/Harim/PanjareVahedController.php +++ b/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; diff --git a/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/ReceiveNewRequest.php b/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/ReceiveNewRequest.php index f74449b8..d2013ad4 100644 --- a/app/Http/Requests/V3/Dashboard/Harim/PanjareVahed/ReceiveNewRequest.php +++ b/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', ]; } } diff --git a/app/Http/Requests/V3/Mission/RequestPortal/UpdateRequest.php b/app/Http/Requests/V3/Mission/RequestPortal/UpdateRequest.php index 7c672f6f..293c2e37 100644 --- a/app/Http/Requests/V3/Mission/RequestPortal/UpdateRequest.php +++ b/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', diff --git a/database/migrations/2025_10_15_085149_add_column_to_harims_table.php b/database/migrations/2025_10_15_085149_add_column_to_harims_table.php deleted file mode 100644 index 06bbcf76..00000000 --- a/database/migrations/2025_10_15_085149_add_column_to_harims_table.php +++ /dev/null @@ -1,29 +0,0 @@ -longText('data')->nullable(); - $table->string('token', 255); - }); - } - - /** - * Reverse the migrations. - */ - public function down(): void - { - Schema::table('harims', function (Blueprint $table) { - $table->dropColumn(['data', 'token']); - }); - } -}; diff --git a/routes/v3.php b/routes/v3.php index 77c84bb2..338a4cc4 100644 --- a/routes/v3.php +++ b/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'); From 309a5d2579906bfed26850fbc67a458e2476afca Mon Sep 17 00:00:00 2001 From: amirghasempoor Date: Sun, 14 Dec 2025 10:54:58 +0330 Subject: [PATCH 2/2] remove conflicts --- app/Console/Commands/RoadObservationProblems.php | 3 ++- app/Console/Kernel.php | 4 ++-- routes/v3.php | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Console/Commands/RoadObservationProblems.php b/app/Console/Commands/RoadObservationProblems.php index b585d167..e25b3109 100755 --- a/app/Console/Commands/RoadObservationProblems.php +++ b/app/Console/Commands/RoadObservationProblems.php @@ -78,7 +78,8 @@ class RoadObservationProblems extends Command $mobile = $value->MobileForSendEventSms; } - $cityModel = City::findCityWithLatLng($value->XGeo, $value->YGeo); + $city = findCityFromGeoJson($value->YGeo, $value->XGeo); + $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], [ diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 296328c1..f4c047dd 100755 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -42,8 +42,8 @@ class Kernel extends ConsoleKernel $schedule->command("webservice:roadobserved --daily-mode") ->dailyAt('00:45')->appendOutputTo(storage_path('logs/nikarayan.log')); - $schedule->command("db:backup") - ->weekly()->at('03:00')->appendOutputTo(storage_path('logs/mariadb-backup.log')); +// $schedule->command("db:backup") +// ->weekly()->at('03:00')->appendOutputTo(storage_path('logs/mariadb-backup.log')); $schedule->command('telescope:prune --hours=48') ->dailyAt('04:00') diff --git a/routes/v3.php b/routes/v3.php index b060cdd2..01351520 100644 --- a/routes/v3.php +++ b/routes/v3.php @@ -388,7 +388,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')->middleware('permission:update-safety-and-privacy'); + Route::post('operator/{safetyAndPrivacy}', 'update')->name('update'); 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');