improve code in controller and form request for V3 whit pint package

2025-10-27 13:20:14 +03:30
parent 71f5001477
commit b155db758a
118 changed files with 604 additions and 559 deletions
--- a/app/Http/Controllers/V3/Dashboard/RoadItem/DetailController.php
+++ b/app/Http/Controllers/V3/Dashboard/RoadItem/DetailController.php
@@ -6,7 +6,6 @@ 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
 {
--- a/app/Http/Controllers/V3/Dashboard/RoadItem/OperatorController.php
+++ b/app/Http/Controllers/V3/Dashboard/RoadItem/OperatorController.php
@@ -11,12 +11,10 @@ use App\Http\Requests\V3\RoadItem\Operator\UpdateRequest;
 use App\Http\Traits\ApiResponse;
 use App\Models\EdarateShahri;
 use App\Models\InfoItem;
-use App\Models\Mission;
 use App\Models\ObservedItem;
 use App\Models\RoadItemsProject;
 use App\Services\Cartables\RoadItem\OperatorService;
 use App\Services\NominatimService;
-use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
@@ -29,24 +27,28 @@ use Throwable;
 class OperatorController extends Controller
 {
    use ApiResponse;
+
    /**
     * Display a listing of the resource.
     */
    public function index(Request $request, OperatorService $operatorService): JsonResponse
    {
        $data = $operatorService->dataTable($request);
+
        return response()->json($data);
    }

    public function excel(Request $request, OperatorService $operatorService): BinaryFileResponse
    {
-        $name = 'گزارش از کارتابل عملیات فعالیت روزانه ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
+        $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 Throwable
     */
    public function store(StoreRequest $request, NominatimService $nominatimService): JsonResponse
@@ -55,13 +57,13 @@ class OperatorController extends Controller
            ->where('sub_item', $request->sub_item_id)
            ->firstOrFail();

-        if ($info_item->needs_end_point && !$request->end_point) {
+        if ($info_item->needs_end_point && ! $request->end_point) {
            throw ValidationException::withMessages([
                'end_point' => __('validation.required', ['attribute' => 'end_point']),
            ]);
        }

-        if ((!$request->before_image || !$request->after_image) && $info_item->needs_image) {
+        if ((! $request->before_image || ! $request->after_image) && $info_item->needs_image) {
            throw ValidationException::withMessages([
                'before_image' => __('validation.required', ['attribute' => 'before_image']),
                'after_image' => __('validation.required', ['attribute' => 'after_image']),
@@ -72,8 +74,7 @@ class OperatorController extends Controller
        $end_coordinates = $info_item->needs_end_point ? explode(',', $request->end_point) : null;

        DB::transaction(function () use ($request, $nominatimService,
-            $start_coordinates, $end_coordinates, $info_item)
-        {
+            $start_coordinates, $end_coordinates, $info_item) {
            $user = auth()->user();
            $road_item = RoadItemsProject::query()->create([
                'user_id' => $user->id,
@@ -103,7 +104,7 @@ class OperatorController extends Controller
                'edarat_name' => $user->edarate_shahri_name,
                'activity_date' => $request->activity_date,
                '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,
                'mission_id' => $request->mission_id,
            ]);
@@ -111,13 +112,13 @@ class OperatorController extends Controller
            if ($request->has('after_image')) {
                $road_item->files()->create([
                    'path' => FileFacade::save($request->file('after_image'),
-                        "/road_items_projects_new/{$road_item->id}/after")
+                        "/road_items_projects_new/{$road_item->id}/after"),
                ]);
            }
            if ($request->has('before_image')) {
                $road_item->files()->create([
                    'path' => FileFacade::save($request->file('before_image'),
-                        "/road_items_projects_new/{$road_item->id}/before")
+                        "/road_items_projects_new/{$road_item->id}/before"),
                ]);
            }

@@ -152,7 +153,7 @@ class OperatorController extends Controller
        $end_coordinates = null;

        if ($info_item->needs_end_point) {
-            if (!$request->end_point) {
+            if (! $request->end_point) {
                throw ValidationException::withMessages([
                    'end_point' => __('validation.required', ['attribute' => 'end_point']),
                ]);
@@ -166,14 +167,14 @@ class OperatorController extends Controller
                FileFacade::delete($roadItemsProject->files[0]->path, true);
                $roadItemsProject->files[0]->update([
                    'path' => FileFacade::save($request->file('after_image'),
-                        "/road_items_projects_new/{$roadItemsProject->id}/after")
+                        "/road_items_projects_new/{$roadItemsProject->id}/after"),
                ]);
            }
            if ($request->has('before_image')) {
                FileFacade::delete($roadItemsProject->files[1]->path, true);
                $roadItemsProject->files[1]->update([
                    'path' => FileFacade::save($request->file('before_image'),
-                        "/road_items_projects_new/{$roadItemsProject->id}/before")
+                        "/road_items_projects_new/{$roadItemsProject->id}/before"),
                ]);
            }
        }
@@ -193,7 +194,6 @@ class OperatorController extends Controller
            $roadItemsProject->cmmsMachines()->sync($request->machines_id);
            $roadItemsProject->missions()->sync($request->mission_id);

-
            auth()->user()->addActivityComplete(1155);
        });

--- a/app/Http/Controllers/V3/Dashboard/RoadItem/ReportController.php
+++ b/app/Http/Controllers/V3/Dashboard/RoadItem/ReportController.php
@@ -94,8 +94,9 @@ class ReportController extends Controller
    public function countryActivityExcelPerItem(Request $request, ReportService $reportService): BinaryFileResponse
    {
        auth()->user()->addActivityComplete(1034);
-        $name = 'گزارش کشوری از فعالیت روزانه و جاری - جدول 1 ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
+        $name = 'گزارش کشوری از فعالیت روزانه و جاری - جدول 1 '.verta()->now()->format('Y-m-d H-i').'.xlsx';
        $activities = $reportService->countryActivityPerItem($request);
+
        return Excel::download(new CountryActivityPerItemReport([
            'activities' => $activities,
            'provinces' => Province::all(['id', 'name_fa']),
@@ -106,8 +107,9 @@ class ReportController extends Controller
    public function provinceActivityExcelPerItem(Request $request, ReportService $reportService): BinaryFileResponse
    {
        auth()->user()->addActivityComplete(1034);
-        $name = 'گزارش استانی از فعالیت روزانه و جاری - جدول 1 ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
+        $name = 'گزارش استانی از فعالیت روزانه و جاری - جدول 1 '.verta()->now()->format('Y-m-d H-i').'.xlsx';
        $activities = $reportService->provinceActivityPerItem($request);
+
        return Excel::download(new ProvinceActivityPerItemReport([
            'activities' => $activities,
            'edarateShahri' => EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']),
@@ -118,7 +120,7 @@ class ReportController extends Controller
    public function countryActivityExcelPerSubItem(Request $request, ReportService $reportService): BinaryFileResponse
    {
        auth()->user()->addActivityComplete(1034);
-        $name = "گزارش کشوری از فعالیت روزانه و جاری - جدول 2 " . verta()->now()->format('Y-m-d H-i') . '.xlsx';
+        $name = 'گزارش کشوری از فعالیت روزانه و جاری - جدول 2 '.verta()->now()->format('Y-m-d H-i').'.xlsx';
        $activities = $reportService->countryActivityPerSubItem($request);
        $subItems = InfoItem::query()
            ->where('item', $request->item)
@@ -127,7 +129,7 @@ class ReportController extends Controller
        return Excel::download(new CountryActivityPerSubItemReport([
            'activities' => $activities,
            'provinces' => Province::all(['id', 'name_fa']),
-            'subItems' => $subItems
+            'subItems' => $subItems,
        ]), $name);
    }

@@ -135,7 +137,7 @@ class ReportController extends Controller
    {
        auth()->user()->addActivityComplete(1034);
        $activities = $reportService->provinceActivityPerSubItem($request);
-        $name = "گزارش استانی از فعالیت روزانه و جاری - جدول 2 " . verta()->now()->format('Y-m-d H-i') . '.xlsx';
+        $name = 'گزارش استانی از فعالیت روزانه و جاری - جدول 2 '.verta()->now()->format('Y-m-d H-i').'.xlsx';
        $subItems = InfoItem::query()
            ->where('item', $request->item)
            ->get(['id', 'item', 'item_str', 'sub_item_str', 'sub_item_unit', 'sub_item']);
@@ -154,16 +156,16 @@ class ReportController extends Controller
        $subId = $request->sub_id;
        $item = $request->item;
        $status = $request->status;
-        $dateFrom = $request->date_from ? $request->date_from . ' 00:00:00' : now()->startOfDay()->toDateTimeString();
-        $dateTo = $request->date_to ? $request->date_to . ' 23:59:59' : now()->addDay()->startOfDay()->toDateTimeString();
+        $dateFrom = $request->date_from ? $request->date_from.' 00:00:00' : now()->startOfDay()->toDateTimeString();
+        $dateTo = $request->date_to ? $request->date_to.' 23:59:59' : now()->addDay()->startOfDay()->toDateTimeString();

        $data = RoadItemsProject::query()
            ->where('is_new', '=', 1)
-            ->when($provinceId, fn($query, $provinceId) => $query->where('road_items_projects.province_id', '=', $provinceId))
-            ->when($cityId, fn($query, $cityId) => $query->where('road_items_projects.city_id', '=', $cityId))
-            ->when($subId, fn($query, $subId) => $query->where('sub_items', 'like', '%' . $subId . '%'))
-            ->when($item, fn($query, $item) => $query->where('item', '=', $item))
-            ->when(!is_null($status), fn($query, $status) => $query->where('status', '=', $status))
+            ->when($provinceId, fn ($query, $provinceId) => $query->where('road_items_projects.province_id', '=', $provinceId))
+            ->when($cityId, fn ($query, $cityId) => $query->where('road_items_projects.city_id', '=', $cityId))
+            ->when($subId, fn ($query, $subId) => $query->where('sub_items', 'like', '%'.$subId.'%'))
+            ->when($item, fn ($query, $item) => $query->where('item', '=', $item))
+            ->when(! is_null($status), fn ($query, $status) => $query->where('status', '=', $status))
            ->leftJoin('users', 'users.id', '=', 'road_items_projects.user_id')
            ->whereBetween('road_items_projects.activity_date', [$dateFrom, $dateTo])
            ->select('road_items_projects.id as i', 'start_lat as l', 'start_lng as g', 'status')
--- a/app/Http/Controllers/V3/Dashboard/RoadItem/SupervisorController.php
+++ b/app/Http/Controllers/V3/Dashboard/RoadItem/SupervisorController.php
@@ -7,11 +7,9 @@ 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;
@@ -47,8 +45,9 @@ class SupervisorController extends Controller
     */
    public function excel(Request $request, SupervisorService $supervisorService): BinaryFileResponse
    {
-        $name = 'گزارش از کارتابل ارزیابی فعالیت روزانه ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
+        $name = 'گزارش از کارتابل ارزیابی فعالیت روزانه '.verta()->now()->format('Y-m-d H:i').'.xlsx';
        $data = $supervisorService->dataTable($request, true);
+
        return Excel::download(new SupervisorCartableReport($data['data']), $name);
    }

@@ -107,7 +106,7 @@ class SupervisorController extends Controller
                'supervisor_id' => null,
                'supervisor_description' => null,
                'supervising_time' => null,
-                'supervisor_name' =>  null,
+                'supervisor_name' => null,
            ]);
            auth()->user()->addActivityComplete(1150);
        });