From 847d6cdf7336908b1808325f8fb3fe134838dcc2 Mon Sep 17 00:00:00 2001
From: joddyabott <faezehzafarbakhsh@gmail.com>
Date: Sun, 1 Jun 2025 09:41:27 +0330
Subject: [PATCH] debug operator and supervisor

---
 .../RoadObservation/OperatorController.php    | 34 +++++-----
 .../RoadObservation/SupervisorController.php  | 63 ++++++++++---------
 2 files changed, 52 insertions(+), 45 deletions(-)

diff --git a/app/Http/Controllers/V3/Dashboard/RoadObservation/OperatorController.php b/app/Http/Controllers/V3/Dashboard/RoadObservation/OperatorController.php
index 684115ae..bd3033ee 100644
--- a/app/Http/Controllers/V3/Dashboard/RoadObservation/OperatorController.php
+++ b/app/Http/Controllers/V3/Dashboard/RoadObservation/OperatorController.php
@@ -188,24 +188,26 @@ class OperatorController
     {
         $province = Province::query()->find($request->province_id);
 
-        RoadObservationHistory::query()->create([
-            'id' => $roadObserved->id,
-            'user_id' => auth()->user()->id,
-            'action' => 'refer',
-            'description' => $request->refer_description,
-            'from_edareh' => $roadObserved->edarate_shahri_id,
-            'to_edareh' => $request->edarate_shahri_id,
-            'from_province' => $roadObserved->province_id,
-            'to_province' => $province->id
-        ]);
+        DB::transaction(function () use ($roadObserved, $request, $province) {
+            RoadObservationHistory::query()->create([
+                'id' => $roadObserved->id,
+                'user_id' => auth()->user()->id,
+                'action' => 'refer',
+                'description' => $request->refer_description,
+                'from_edareh' => $roadObserved->edarate_shahri_id,
+                'to_edareh' => $request->edarate_shahri_id,
+                'from_province' => $roadObserved->province_id,
+                'to_province' => $province->id
+            ]);
 
-        $roadObserved->update([
-            'edarate_shahri_id' => $request->edarate_shahri_id,
-            'province_id' => $province->id,
-            'province_fa' => $province->name_fa,
-        ]);
+            $roadObserved->update([
+                'edarate_shahri_id' => $request->edarate_shahri_id,
+                'province_id' => $province->id,
+                'province_fa' => $province->name_fa,
+            ]);
 
-        auth()->user()->addActivityComplete(1037);
+            auth()->user()->addActivityComplete(1037);
+        });
 
         return $this->successResponse();
     }
diff --git a/app/Http/Controllers/V3/Dashboard/RoadObservation/SupervisorController.php b/app/Http/Controllers/V3/Dashboard/RoadObservation/SupervisorController.php
index 5af4756c..02e48f63 100644
--- a/app/Http/Controllers/V3/Dashboard/RoadObservation/SupervisorController.php
+++ b/app/Http/Controllers/V3/Dashboard/RoadObservation/SupervisorController.php
@@ -13,6 +13,7 @@ use App\Services\Cartables\RoadObservation\SupervisorService;
 use App\Services\Cartables\RoadObservationTableService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
 use Maatwebsite\Excel\Facades\Excel;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
 
@@ -29,16 +30,18 @@ class SupervisorController
     {
         $statusFa = $request->verify == 1 ? 'تایید شده' : 'عدم تایید';
 
-        $roadObserved->update([
-            'status' => $request->verify,
-            'status_fa' => $statusFa,
-            'supervisor_id' => auth()->user()->id,
-            'supervisor_name' => auth()->user()->name,
-            'supervisor_description' => $request->description,
-            'supervising_time' => now(),
-        ]);
+        DB::transaction(function () use ($request, $statusFa, $roadObserved) {
+            $roadObserved->update([
+                'status' => $request->verify,
+                'status_fa' => $statusFa,
+                'supervisor_id' => auth()->user()->id,
+                'supervisor_name' => auth()->user()->name,
+                'supervisor_description' => $request->description,
+                'supervising_time' => now(),
+            ]);
 
-        auth()->user()->addActivityComplete(1138);
+            auth()->user()->addActivityComplete(1138);
+        });
 
         return $this->successResponse();
     }
@@ -54,33 +57,35 @@ class SupervisorController
     public function restore(RestoreRequest $request, RoadObserved $roadObserved): JsonResponse
     {
         if ($roadObserved->image_before) {
-            FileFacade::delete($roadObserved->image_before);
+            FileFacade::delete($roadObserved->image_before, true);
         }
 
         if ($roadObserved->image_after) {
-            FileFacade::delete($roadObserved->image_after);
+            FileFacade::delete($roadObserved->image_after, true);
         }
 
-        $roadObserved->update([
-            'image_before' => null,
-            'image_after' => null,
-            'rms_last_activity' => null,
-            'rms_last_activity_fa' => null,
-            'updated_at_fa' => null,
-            'updated_at' => null,
-            'rms_status' => 0,
-            'status' => null,
-            'status_fa' => null,
-        ]);
+        DB::transaction(function () use ($request, $roadObserved) {
+            $roadObserved->update([
+                'image_before' => null,
+                'image_after' => null,
+                'rms_last_activity' => null,
+                'rms_last_activity_fa' => null,
+                'updated_at_fa' => null,
+                'updated_at' => null,
+                'rms_status' => 0,
+                'status' => null,
+                'status_fa' => null,
+            ]);
 
-        RoadObservationHistory::query()->create([
-            'id' => $roadObserved->id,
-            'user_id' => auth()->user()->id,
-            'action' => 'restore',
-            'description' => $request->restore_description,
-        ]);
+            RoadObservationHistory::query()->create([
+                'id' => $roadObserved->id,
+                'user_id' => auth()->user()->id,
+                'action' => 'restore',
+                'description' => $request->restore_description,
+            ]);
 
-        auth()->user()->addActivityComplete(1141);
+            auth()->user()->addActivityComplete(1141);
+        });
 
         return $this->successResponse();
     }