diff --git a/app/Http/Controllers/V3/Dashboard/RoadItem/OperatorController.php b/app/Http/Controllers/V3/Dashboard/RoadItem/OperatorController.php index f9d065a1..b62da19b 100644 --- a/app/Http/Controllers/V3/Dashboard/RoadItem/OperatorController.php +++ b/app/Http/Controllers/V3/Dashboard/RoadItem/OperatorController.php @@ -51,7 +51,6 @@ class OperatorController extends Controller */ public function store(StoreRequest $request, NominatimService $nominatimService): JsonResponse { - $info_item = InfoItem::query()->where('item', $request->item_id) ->where('sub_item', $request->sub_item_id) ->firstOrFail(); @@ -72,7 +71,9 @@ class OperatorController extends Controller $start_coordinates = explode(',', $request->start_point); $end_coordinates = $info_item->needs_end_point ? explode(',', $request->end_point) : null; - DB::transaction(function () use ($request, $nominatimService, $start_coordinates, $end_coordinates, $info_item) { + DB::transaction(function () use ($request, $nominatimService, + $start_coordinates, $end_coordinates, $info_item) + { $user = auth()->user(); $road_item = RoadItemsProject::query()->create([ 'user_id' => $user->id, @@ -104,6 +105,7 @@ class OperatorController extends Controller 'activity_time' => $request->activity_time, 'activity_date_time' => $request->activity_date." ".$request->activity_time, 'is_new' => 1, + 'mission_id' => $request->mission_id, ]); if ($request->has('after_image')) { @@ -123,8 +125,6 @@ class OperatorController extends Controller new ProhibitedAction('اقدام مربوطه قبلا رسیدگی شده است.') ); - $road_item->missions()->attach($request->mission_id); - $user->addActivityComplete(1154); }); diff --git a/app/Http/Controllers/V3/Dashboard/RoadPatrol/OperatorController.php b/app/Http/Controllers/V3/Dashboard/RoadPatrol/OperatorController.php index 9e906fe8..230bb22a 100644 --- a/app/Http/Controllers/V3/Dashboard/RoadPatrol/OperatorController.php +++ b/app/Http/Controllers/V3/Dashboard/RoadPatrol/OperatorController.php @@ -50,10 +50,9 @@ class OperatorController extends Controller 'edare_name' => $mission->edare_shahri_name, 'start_time' => $mission->start_time, 'end_time' => $mission->finish_time, + 'mission_id' => $mission->id, ]); - $road_patrol->missions()->attach($mission->id); - auth()->user()->addActivityComplete(1147); }); diff --git a/database/migrations/2025_09_08_103933_add_mission_id_to_road_patrols_table.php b/database/migrations/2025_09_08_103933_add_mission_id_to_road_patrols_table.php index 0a1a50af..60148d95 100644 --- a/database/migrations/2025_09_08_103933_add_mission_id_to_road_patrols_table.php +++ b/database/migrations/2025_09_08_103933_add_mission_id_to_road_patrols_table.php @@ -22,6 +22,7 @@ return new class extends Migration public function down(): void { Schema::table('road_patrols', function (Blueprint $table) { + $table->dropForeign('road_patrols_mission_id_foreign'); $table->dropColumn('mission_id'); }); } diff --git a/database/migrations/2025_09_08_104123_add_mission_id_toroad_items_projectss_table.php b/database/migrations/2025_09_08_104123_add_mission_id_to_road_items_projects_table.php similarity index 78% rename from database/migrations/2025_09_08_104123_add_mission_id_toroad_items_projectss_table.php rename to database/migrations/2025_09_08_104123_add_mission_id_to_road_items_projects_table.php index 88fc2655..62d511c4 100644 --- a/database/migrations/2025_09_08_104123_add_mission_id_toroad_items_projectss_table.php +++ b/database/migrations/2025_09_08_104123_add_mission_id_to_road_items_projects_table.php @@ -12,7 +12,7 @@ return new class extends Migration public function up(): void { Schema::table('road_items_projects', function (Blueprint $table) { - $table->foreignId('v')->nullable()->constrained('missions'); + $table->foreignId('mission_id')->nullable()->constrained('missions'); }); } @@ -22,6 +22,7 @@ return new class extends Migration public function down(): void { Schema::table('road_items_projects', function (Blueprint $table) { + $table->dropForeign('road_items_projects_mission_id_foreign'); $table->dropColumn('mission_id'); }); }