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

resolve the conflicts

Browse Source
This commit is contained in:
amirghasempoor
2025-12-14 10:50:52 +03:30
parent f67369b6da d89fbdb4dd
commit 47360baeef
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Console/Commands/RoadObservationProblems.php
View File

@@ -78,8 +78,7 @@ class RoadObservationProblems extends Command
$mobile = $value->MobileForSendEventSms; $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( $rop = RoadObserved::query()->updateOrCreate(
['fk_RegisteredEventMessage' => $value->fk_RegisteredEventMessage], ['fk_RegisteredEventMessage' => $value->fk_RegisteredEventMessage],
[ [

4
app/Console/Kernel.php
View File

@@ -42,8 +42,8 @@ class Kernel extends ConsoleKernel
$schedule->command("webservice:roadobserved --daily-mode") $schedule->command("webservice:roadobserved --daily-mode")
->dailyAt('00:45')->appendOutputTo(storage_path('logs/nikarayan.log')); ->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') $schedule->command('telescope:prune --hours=48')
->dailyAt('04:00') ->dailyAt('04:00')

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

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

2
routes/v3.php
View File

@@ -388,7 +388,7 @@ Route::prefix('safety_and_privacy')
Route::get('/map', 'map')->name('map'); 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/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/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::get('operator/{safetyAndPrivacy}', 'show')->name('show');
Route::delete('operator/{safetyAndPrivacy}', 'destroy')->name('destroy')->middleware('permission:delete-safety-and-privacy'); Route::delete('operator/{safetyAndPrivacy}', 'destroy')->name('destroy')->middleware('permission:delete-safety-and-privacy');
Route::get('/deserialize/{safetyAndPrivacy}', 'deserialize')->name('deserialize'); Route::get('/deserialize/{safetyAndPrivacy}', 'deserialize')->name('deserialize');