add mission id to road item
This commit is contained in:
@@ -51,7 +51,6 @@ class OperatorController extends Controller
|
|||||||
*/
|
*/
|
||||||
public function store(StoreRequest $request, NominatimService $nominatimService): JsonResponse
|
public function store(StoreRequest $request, NominatimService $nominatimService): JsonResponse
|
||||||
{
|
{
|
||||||
|
|
||||||
$info_item = InfoItem::query()->where('item', $request->item_id)
|
$info_item = InfoItem::query()->where('item', $request->item_id)
|
||||||
->where('sub_item', $request->sub_item_id)
|
->where('sub_item', $request->sub_item_id)
|
||||||
->firstOrFail();
|
->firstOrFail();
|
||||||
@@ -72,7 +71,9 @@ class OperatorController extends Controller
|
|||||||
$start_coordinates = explode(',', $request->start_point);
|
$start_coordinates = explode(',', $request->start_point);
|
||||||
$end_coordinates = $info_item->needs_end_point ? explode(',', $request->end_point) : null;
|
$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();
|
$user = auth()->user();
|
||||||
$road_item = RoadItemsProject::query()->create([
|
$road_item = RoadItemsProject::query()->create([
|
||||||
'user_id' => $user->id,
|
'user_id' => $user->id,
|
||||||
@@ -104,6 +105,7 @@ class OperatorController extends Controller
|
|||||||
'activity_time' => $request->activity_time,
|
'activity_time' => $request->activity_time,
|
||||||
'activity_date_time' => $request->activity_date." ".$request->activity_time,
|
'activity_date_time' => $request->activity_date." ".$request->activity_time,
|
||||||
'is_new' => 1,
|
'is_new' => 1,
|
||||||
|
'mission_id' => $request->mission_id,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
if ($request->has('after_image')) {
|
if ($request->has('after_image')) {
|
||||||
@@ -123,8 +125,6 @@ class OperatorController extends Controller
|
|||||||
new ProhibitedAction('اقدام مربوطه قبلا رسیدگی شده است.')
|
new ProhibitedAction('اقدام مربوطه قبلا رسیدگی شده است.')
|
||||||
);
|
);
|
||||||
|
|
||||||
$road_item->missions()->attach($request->mission_id);
|
|
||||||
|
|
||||||
$user->addActivityComplete(1154);
|
$user->addActivityComplete(1154);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -50,10 +50,9 @@ class OperatorController extends Controller
|
|||||||
'edare_name' => $mission->edare_shahri_name,
|
'edare_name' => $mission->edare_shahri_name,
|
||||||
'start_time' => $mission->start_time,
|
'start_time' => $mission->start_time,
|
||||||
'end_time' => $mission->finish_time,
|
'end_time' => $mission->finish_time,
|
||||||
|
'mission_id' => $mission->id,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$road_patrol->missions()->attach($mission->id);
|
|
||||||
|
|
||||||
auth()->user()->addActivityComplete(1147);
|
auth()->user()->addActivityComplete(1147);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ return new class extends Migration
|
|||||||
public function down(): void
|
public function down(): void
|
||||||
{
|
{
|
||||||
Schema::table('road_patrols', function (Blueprint $table) {
|
Schema::table('road_patrols', function (Blueprint $table) {
|
||||||
|
$table->dropForeign('road_patrols_mission_id_foreign');
|
||||||
$table->dropColumn('mission_id');
|
$table->dropColumn('mission_id');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ return new class extends Migration
|
|||||||
public function up(): void
|
public function up(): void
|
||||||
{
|
{
|
||||||
Schema::table('road_items_projects', function (Blueprint $table) {
|
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
|
public function down(): void
|
||||||
{
|
{
|
||||||
Schema::table('road_items_projects', function (Blueprint $table) {
|
Schema::table('road_items_projects', function (Blueprint $table) {
|
||||||
|
$table->dropForeign('road_items_projects_mission_id_foreign');
|
||||||
$table->dropColumn('mission_id');
|
$table->dropColumn('mission_id');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user