separate operator from supervisor in road item

2025-06-16 10:49:04 +03:30
parent dc887a5215
commit c9cc74ec48
12 changed files with 384 additions and 154 deletions
--- a/app/Http/Controllers/V3/Dashboard/RoadItem/DetailController.php
+++ b/app/Http/Controllers/V3/Dashboard/RoadItem/DetailController.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Controllers\V3\Dashboard\RoadItem;
+
+use App\Http\Controllers\Controller;
+use App\Http\Traits\ApiResponse;
+use App\Models\RoadItemsProject;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DetailController extends Controller
+{
+    use ApiResponse;
+
+    public function machines(RoadItemsProject $roadItemsProject): JsonResponse
+    {
+        return $this->successResponse($roadItemsProject->cmmsMachines()->get(['cmms_machines.id', 'cmms_machines.machine_code', 'cmms_machines.car_name', 'cmms_machines.plak_number']));
+    }
+
+    public function rahdaran(RoadItemsProject $roadItemsProject): JsonResponse
+    {
+        return $this->successResponse($roadItemsProject->rahdaran()->get(['rahdaran.id', 'rahdaran.name', 'rahdaran.code']));
+    }
+
+    public function files(RoadItemsProject $roadItemsProject): JsonResponse
+    {
+        return $this->successResponse($roadItemsProject->files()->get(['path']));
+    }
+}
--- a/app/Http/Controllers/V3/Dashboard/RoadItem/OperatorController.php
+++ b/app/Http/Controllers/V3/Dashboard/RoadItem/OperatorController.php
@@ -1,130 +1,51 @@
 <?php

-namespace App\Http\Controllers\V3\Dashboard;
+namespace App\Http\Controllers\V3\Dashboard\RoadItem;

+use App\Exceptions\ProhibitedAction;
 use App\Exports\V3\RoadItemsProjects\OperatorCartableReport;
-use App\Exports\V3\RoadItemsProjects\SupervisorCartableReport;
 use App\Http\Controllers\Controller;
-use App\Http\Requests\V3\RoadItemsProject\StoreRequest;
-use App\Http\Requests\V3\RoadItemsProject\UpdateRequest;
-use App\Http\Requests\V3\RoadItemsProject\VerifyBySupervisorRequest;
 use App\Http\Traits\ApiResponse;
 use App\Models\EdarateShahri;
 use App\Models\InfoItem;
 use App\Models\RoadItemsProject;
-use App\Services\NominatimService;
+use App\Services\Cartables\RoadItem\OperatorService;
 use App\Services\Cartables\RoadItemTableService;
+use App\Services\NominatimService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Gate;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Validation\ValidationException;
 use Maatwebsite\Excel\Facades\Excel;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;

-class RoadItemsProjectController extends Controller
+class OperatorController extends Controller
 {
    use ApiResponse;
    /**
     * Display a listing of the resource.
     */
-    public function supervisorIndex(Request $request, RoadItemTableService $roadItemTableService): JsonResponse
+    public function index(Request $request, OperatorService $operatorService): JsonResponse
    {
-        $data = $roadItemTableService->supervisorCartableReport($request);
-
-        foreach ($data['data'] as $road_item) {
-            if (Gate::allows('gate-supervise-road-item', $road_item)) {
-                $road_item['can_supervise'] = 1;
-            } else {
-                $road_item['can_supervise'] = 0;
-            }
-        }
-
+        $data = $operatorService->dataTable($request);
        return response()->json($data);
    }

-    public function verifyBySupervisor(VerifyBySupervisorRequest $request, RoadItemsProject $roadItemsProject): JsonResponse
+    public function excel(Request $request, OperatorService $operatorService): BinaryFileResponse
    {
-        $status_fa = $request->verify == 1 ? 'تایید شده' : 'عدم تایید';
-        $user = auth()->user();
-
-        $roadItemsProject->update([
-            'status' => $request->verify,
-            'status_fa' => $status_fa,
-            'supervisor_id' => $user->id,
-            'supervisor_name' => $user->name,
-            'supervisor_description' => $request->description,
-            'supervising_time' => now(),
-        ]);
-
-        $user->addActivityComplete(1149);
-
-        return $this->successResponse();
-    }
-
-    public function restore(RoadItemsProject $roadItemsProject): JsonResponse
-    {
-        if ($roadItemsProject->status == 0) {
-            return $this->errorResponse('امکان بازگردانی وضعیت این فعالیت وجود ندارد!');
-        }
-
-        $roadItemsProject->update([
-            'status' => 0,
-            'status_fa' => 'در حال بررسی',
-            'supervisor_id' => null,
-            'supervisor_description' => null,
-            'supervising_time' => null,
-            'supervisor_name' =>  null,
-        ]);
-        auth()->user()->addActivityComplete(1150);
-
-        return $this->successResponse();
-    }
-
-    public function delete(RoadItemsProject $roadItemsProject): JsonResponse
-    {
-        if ($roadItemsProject->files()->exists()) {
-            Storage::delete('public/'. $roadItemsProject->files[0]->path);
-            Storage::delete('public/'. $roadItemsProject->files[1]->path);
-            $roadItemsProject->files()->delete();
-        }
-        auth()->user()->addActivityComplete(1151);
-
-        $roadItemsProject->delete();
-
-        return $this->successResponse();
-    }
-
-
-    public function supervisorCartableReport(Request $request, RoadItemTableService $roadItemTableService): BinaryFileResponse
-    {
-        $name = 'گزارش از کارتابل ارزیابی فعالیت روزانه ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
-        $data = $roadItemTableService->supervisorCartableReport($request, true);
-        return Excel::download(new SupervisorCartableReport($data['data']), $name);
-    }
-
-    public function operatorIndex(Request $request, RoadItemTableService $roadItemTableService): JsonResponse
-    {
-        $data = $roadItemTableService->operatorCartableReport($request);
-        return response()->json($data);
+        $name = 'گزارش از کارتابل عملیات فعالیت روزانه ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
+        $data = $operatorService->dataTable($request, true);
+        return Excel::download(new OperatorCartableReport($data['data']), $name);
    }

    /**
     * Store a newly created resource in storage.
-     * @throws ValidationException
+     * @throws \Throwable
     */
-    public function store(StoreRequest $request, NominatimService $nominatimService): JsonResponse
+    public function store(Request $request, NominatimService $nominatimService): JsonResponse
    {
        $user = auth()->user();

-        if ($user->edarate_ostani_id || is_null($user->city_id)) {
-            return $this->errorResponse('امکان ثبت فعالیت برای ادارات استانی و ستادی وجود ندارد!');
-        }
-
-        if (is_null($user->edarate_shahri_id)) {
-            return $this->errorResponse('اداره شهری برای شما در سامانه ثبت نشده است!');
-        }
-
        $info_item = InfoItem::query()->where('item', $request->item_id)
            ->where('sub_item', $request->sub_item_id)
            ->firstOrFail();
@@ -184,9 +105,7 @@ class RoadItemsProjectController extends Controller

        $road_item = RoadItemsProject::store($user, $attributes, $before_image, $after_image, $request->observed_item_id);

-        if ($road_item === -1) {
-            return $this->errorResponse('اقدام مربوطه قبلا رسیدگی شده است.');
-        }
+        throw_if($road_item === -1, new ProhibitedAction('اقدام مربوطه قبلا رسیدگی شده است.'));

        $road_item->rahdaran()->attach($request->rahdaran_id);
        $road_item->cmmsMachines()->attach($request->machines_id);
@@ -197,10 +116,17 @@ class RoadItemsProjectController extends Controller
    }

    /**
-     * Update the specified resource in storage.
-     * @throws ValidationException
+     * Display the specified resource.
     */
-    public function update(UpdateRequest $request, RoadItemsProject $roadItemsProject): JsonResponse
+    public function show(RoadItemsProject $roadItemsProject): JsonResponse
+    {
+        return $this->successResponse($roadItemsProject);
+    }
+
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(Request $request, RoadItemsProject $roadItemsProject): JsonResponse
    {
        $info_item = InfoItem::query()->where('item', $roadItemsProject->item)
            ->where('sub_item', $roadItemsProject->sub_item)
@@ -264,25 +190,20 @@ class RoadItemsProjectController extends Controller
        return $this->successResponse();
    }

-    public function operatorCartableReport(Request $request, RoadItemTableService $roadItemTableService): BinaryFileResponse
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy(RoadItemsProject $roadItemsProject): JsonResponse
    {
-        $name = 'گزارش از کارتابل عملیات فعالیت روزانه ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
-        $data = $roadItemTableService->operatorCartableReport($request, true);
-        return Excel::download(new OperatorCartableReport($data['data']), $name);
-    }
+        if ($roadItemsProject->files()->exists()) {
+            Storage::delete('public/'. $roadItemsProject->files[0]->path);
+            Storage::delete('public/'. $roadItemsProject->files[1]->path);
+            $roadItemsProject->files()->delete();
+        }
+        auth()->user()->addActivityComplete(1151);

-    public function roadItemMachine(RoadItemsProject $roadItemsProject): JsonResponse
-    {
-        return $this->successResponse($roadItemsProject->cmmsMachines()->get(['cmms_machines.id', 'cmms_machines.machine_code', 'cmms_machines.car_name', 'cmms_machines.plak_number']));
-    }
+        $roadItemsProject->delete();

-    public function roadItemRahdar(RoadItemsProject $roadItemsProject): JsonResponse
-    {
-        return $this->successResponse($roadItemsProject->rahdaran()->get(['rahdaran.id', 'rahdaran.name', 'rahdaran.code']));
-    }
-
-    public function roadItemFile(RoadItemsProject $roadItemsProject): JsonResponse
-    {
-        return $this->successResponse($roadItemsProject->files()->get(['path']));
+        return $this->successResponse();
    }
 }
--- a/app/Http/Controllers/V3/Dashboard/RoadItem/SupervisorController.php
+++ b/app/Http/Controllers/V3/Dashboard/RoadItem/SupervisorController.php
@@ -0,0 +1,117 @@
+<?php
+
+namespace App\Http\Controllers\V3\Dashboard\RoadItem;
+
+use App\Exceptions\ProhibitedAction;
+use App\Exports\V3\RoadItemsProjects\SupervisorCartableReport;
+use App\Http\Controllers\Controller;
+use App\Http\Requests\V3\RoadItem\Supervisor\ConfirmRequest;
+use App\Http\Requests\V3\RoadItem\Supervisor\RejectRequest;
+use App\Http\Requests\V3\RoadItem\VerifyBySupervisorRequest;
+use App\Http\Traits\ApiResponse;
+use App\Models\RoadItemsProject;
+use App\Services\Cartables\RoadItem\SupervisorService;
+use App\Services\Cartables\RoadItemTableService;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Gate;
+use Maatwebsite\Excel\Facades\Excel;
+use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Throwable;
+
+class SupervisorController extends Controller
+{
+    use ApiResponse;
+
+    /**
+     * @throws Throwable
+     */
+    public function index(Request $request, SupervisorService $supervisorService): JsonResponse
+    {
+        $data = $supervisorService->dataTable($request);
+
+        foreach ($data['data'] as $road_item) {
+            if (Gate::allows('gate-supervise-road-item', $road_item)) {
+                $road_item['can_supervise'] = 1;
+            } else {
+                $road_item['can_supervise'] = 0;
+            }
+        }
+
+        return response()->json($data);
+    }
+
+    /**
+     * @throws Throwable
+     */
+    public function excel(Request $request, SupervisorService $supervisorService): BinaryFileResponse
+    {
+        $name = 'گزارش از کارتابل ارزیابی فعالیت روزانه ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
+        $data = $supervisorService->dataTable($request, true);
+        return Excel::download(new SupervisorCartableReport($data['data']), $name);
+    }
+
+    public function confirm(ConfirmRequest $request, RoadItemsProject $roadItemsProject): JsonResponse
+    {
+        $user = auth()->user();
+
+        DB::transaction(function () use ($request, $roadItemsProject, $user) {
+            $roadItemsProject->update([
+                'status' => 1,
+                'status_fa' => 'تایید شده',
+                'supervisor_id' => $user->id,
+                'supervisor_name' => $user->name,
+                'supervisor_description' => $request->description,
+                'supervising_time' => now(),
+            ]);
+
+            $user->addActivityComplete(1149);
+        });
+
+        return $this->successResponse();
+    }
+
+    public function reject(RejectRequest $request, RoadItemsProject $roadItemsProject): JsonResponse
+    {
+        $user = auth()->user();
+
+        DB::transaction(function () use ($request, $roadItemsProject, $user) {
+            $roadItemsProject->update([
+                'status' => 2,
+                'status_fa' => 'عدم تایید',
+                'supervisor_id' => $user->id,
+                'supervisor_name' => $user->name,
+                'supervisor_description' => $request->description,
+                'supervising_time' => now(),
+            ]);
+
+            $user->addActivityComplete(1149);
+        });
+
+        return $this->successResponse();
+    }
+
+    /**
+     * @throws Throwable
+     */
+    public function restore(RoadItemsProject $roadItemsProject): JsonResponse
+    {
+
+        throw_if($roadItemsProject->status == 0, new ProhibitedAction('امکان بازگردانی وضعیت این فعالیت وجود ندارد!'));
+
+        DB::transaction(function () use ($roadItemsProject) {
+            $roadItemsProject->update([
+                'status' => 0,
+                'status_fa' => 'در حال بررسی',
+                'supervisor_id' => null,
+                'supervisor_description' => null,
+                'supervising_time' => null,
+                'supervisor_name' =>  null,
+            ]);
+            auth()->user()->addActivityComplete(1150);
+        });
+
+        return $this->successResponse();
+    }
+}