seperate the logic into service reports

app/Http/Controllers/V3/Dashboard/Reports/RoadItemsReportController.php

@@ -32,132 +32,45 @@ class RoadItemsReportController extends Controller
         ]);
     }
 
-    public function countryActivityPerSubItem(Request $request): JsonResponse
+    public function countryActivityPerSubItem(Request $request, RoadItemReportService $roadItemReportService): JsonResponse
     {
-        $fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString();
-        $toDate = $request->date_to ? $request->date_to . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
-        $item = $request->item;
-
-        $provinceRoadItemsPerSubItem = RoadItemsProject::query()->selectRaw('
-            sub_item AS t,
-            COUNT(*) AS c,
-            CAST(SUM(CASE WHEN sub_item_data > 0 THEN sub_item_data ELSE ABS(sub_item_data) END) AS UNSIGNED) AS s,
-            province_id AS p')
-            ->where('item', '=', $item)
-            ->whereBetween('activity_date_time', [$fromDate, $toDate])
-            ->where('status', '=', 1)
-            ->groupBy('province_id', 'sub_item')
-            ->get();
-
-        $countryRoadItemsPerSubItem = RoadItemsProject::query()->selectRaw('
-            sub_item AS t,
-            COUNT(*) AS c,
-            CAST(SUM(CASE WHEN sub_item_data > 0 THEN sub_item_data ELSE ABS(sub_item_data) END) AS UNSIGNED) AS s,
-            -1 AS p')
-            ->where('item', '=', $item)
-            ->whereBetween('activity_date_time', [$fromDate, $toDate])
-            ->where('status', '=', 1)
-            ->groupBy('sub_item')
-            ->get();
-
-
-        $activities = $provinceRoadItemsPerSubItem->push(...$countryRoadItemsPerSubItem);
+        $activities = $roadItemReportService->countryActivityPerSubItem($request);
         $provinces = Province::all(['id', 'name_fa']);
         $subItems = InfoItem::query()
-            ->where('item', $item)
+            ->where('item', $request->item)
             ->get(['id', 'item', 'item_str', 'sub_item_str', 'sub_item_unit', 'sub_item']);
 
         return $this->successResponse([
-            'activities' => $activities,
+            'activities' => $activities['data'],
             'sub_items' => $subItems,
             'provinces' => $provinces,
         ]);
     }
 
-    public function provinceActivityPerSubItem(Request $request): JsonResponse
+    public function provinceActivityPerSubItem(Request $request, RoadItemReportService $roadItemReportService): JsonResponse
     {
-        $fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString();
-        $toDate = $request->date_to ? $request->date_to . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
-        $item = $request->item;
-        $province = $request->province_id;
+        $activities = $roadItemReportService->provinceActivityPerSubItem($request);
 
-        $cityRoadItemsPerSubItem = RoadItemsProject::query()->selectRaw('
-            sub_item AS t,
-            COUNT(*) AS c,
-            CAST(SUM(CASE WHEN sub_item_data > 0 THEN sub_item_data ELSE ABS(sub_item_data) END) AS UNSIGNED) AS s,
-            province_id AS p,
-            edarat_id AS ci
-        ')
-            ->where('item', '=', $item)
-            ->where('province_id', '=', $province)
-            ->whereBetween('activity_date_time', [$fromDate, $toDate])
-            ->where('status', '=', 1)
-            ->groupBy('edarat_id', 'sub_item')
-            ->get();
+        $edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
 
-        $provinceRoadItemsPerSubItem = RoadItemsProject::query()->selectRaw('
-            sub_item AS t,
-            COUNT(*) AS c,
-            CAST(SUM(CASE WHEN sub_item_data > 0 THEN sub_item_data ELSE ABS(sub_item_data) END) AS UNSIGNED) AS s,
-            province_id AS p,
-            -1 AS ci
-        ')
-            ->where('item', '=', $item)
-            ->where('province_id', '=', $province)
-            ->whereBetween('activity_date_time', [$fromDate, $toDate])
-            ->where('status', '=', 1)
-            ->groupBy('sub_item')
-            ->get();
-
-
-        $edarateShahri = EdarateShahri::query()->where('province_id', '=', $province)->get(['id', 'name_fa']);
-        $activities = $cityRoadItemsPerSubItem->push(...$provinceRoadItemsPerSubItem);
         $subItems = InfoItem::query()
-            ->where('item', $item)
+            ->where('item', $request->item)
             ->get(['id', 'item', 'item_str', 'sub_item_str', 'sub_item_unit', 'sub_item']);
 
         return $this->successResponse([
-            'activities' => $activities,
+            'activities' => $activities['data'],
             'edarateShahri' => $edarateShahri,
             'sub_items' => $subItems,
         ]);
     }
 
-    public function countryActivityPerItem(Request $request): JsonResponse
+    public function countryActivityPerItem(Request $request, RoadItemReportService $roadItemReportService): JsonResponse
     {
         if (auth()->check()) {
             auth()->user()->addActivityComplete(1033);
         }
 
-        $fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString();
-        $toDate = $request->date_to ? $request->date_to . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
-        $user = auth()->user();
-//        $isSpecialUser = in_array($user->username, ['witel', 'drdanesh']);
-        $isSpecialUser = $user->hasPermissionTo("show-road-item-supervise-cartable");
-        $provinceId = $isSpecialUser ? null : $user->province_id;
-
-        $provinceActivity = RoadItemsProject::query()
-            ->selectRaw('COUNT(*) AS s, province_id AS p, item AS i')
-            ->where('status', 1)
-            ->whereBetween('activity_date_time', [$fromDate, $toDate])
-            ->when(!$isSpecialUser, function ($query) use ($provinceId) {
-                $query->where('province_id', $provinceId);
-            })
-            ->groupBy('province_id', 'item');
-
-        $countryActivity = RoadItemsProject::query()
-            ->selectRaw('COUNT(*) AS s, -1 AS p, item AS i')
-            ->where('status', 1)
-            ->whereBetween('activity_date_time', [$fromDate, $toDate])
-            ->when(!$isSpecialUser, function ($query) use ($provinceId) {
-                $query->where('province_id', $provinceId);
-            })
-            ->groupBy('item');
-
-        $activities = $provinceActivity
-            ->unionAll($countryActivity)
-            ->get();
-
+        $activities = $roadItemReportService->countryActivityPerItem($request);
         $provinces = Province::all(['id', 'name_fa']);
 
         return $this->successResponse([
@@ -166,37 +79,10 @@ class RoadItemsReportController extends Controller
         ]);
     }
 
-    public function provinceActivityPerItem(Request $request): JsonResponse
+    public function provinceActivityPerItem(Request $request, RoadItemReportService $roadItemReportService): JsonResponse
     {
-        $provinceId = $request->province_id;
-        $fromDate = $request->from_date ? $request->from_date . ' 00:00:00' : now()->startOfDay()->toDateTimeString();
-        $toDate = $request->date_to ? $request->date_to . ' 23:59:59' : now()->endOfDay()->toDateTimeString();
-
-        $edarehActivity = RoadItemsProject::query()
-            ->selectRaw('
-            COUNT(*) AS s,
-            edarat_id AS c,
-            item AS i')
-            ->where('status', '=', 1)
-            ->whereBetween('activity_date_time', [$fromDate, $toDate])
-            ->where('province_id', $provinceId)
-            ->groupBy('item', 'edarat_id');
-
-        $cityActivity = RoadItemsProject::query()
-            ->selectRaw('
-            COUNT(*) AS s,
-            -1 AS c,
-            item AS i')
-            ->where('status', '=', 1)
-            ->whereBetween('activity_date_time', [$fromDate, $toDate])
-            ->where('province_id', $provinceId)
-            ->groupBy('item');
-
-        $activities = $edarehActivity
-            ->unionAll($cityActivity)
-            ->get();
-
-        $edarateShahri = EdarateShahri::query()->where('province_id', '=', $provinceId)->get(['id', 'name_fa']);
+        $activities = $roadItemReportService->provinceActivityPerItem($request);
+        $edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);
 
         return $this->successResponse([
             'activities' => $activities,
@@ -228,48 +114,35 @@ class RoadItemsReportController extends Controller
         return $this->successResponse($data);
     }
 
-    public function countryActivityExcelPerItem(Request $request): BinaryFileResponse
+    public function countryActivityExcelPerItem(Request $request, RoadItemReportService $roadItemReportService): BinaryFileResponse
     {
         auth()->user()->addActivityComplete(1034);
         $name = 'گزارش کشوری از فعالیت روزانه و جاری - جدول 1 ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
-        return Excel::download(new CountryActivityPerItemReport($request->fromDate, $request->toDate), $name);
+        $activities = $roadItemReportService->countryActivityPerItem($request);
+        return Excel::download(new CountryActivityPerItemReport($activities), $name);
     }
 
-    public function provinceActivityExcelPerItem(Request $request): BinaryFileResponse
+    public function provinceActivityExcelPerItem(Request $request, RoadItemReportService $roadItemReportService): BinaryFileResponse
     {
         auth()->user()->addActivityComplete(1034);
         $name = 'گزارش استانی از فعالیت روزانه و جاری - جدول 1 ' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
-        return Excel::download(new ProvinceActivityPerItemReport($request->fromDate, $request->toDate, $request->province), $name);
+        $activities = $roadItemReportService->provinceActivityPerItem($request);
+        return Excel::download(new ProvinceActivityPerItemReport($activities), $name);
     }
 
     public function countryActivityExcelPerSubItem(Request $request, RoadItemReportService $roadItemReportService): BinaryFileResponse
     {
         auth()->user()->addActivityComplete(1034);
-
-        $activities = $roadItemReportService->countryActivityPerSubItem(
-            $request->item,
-            $request->fromDate,
-            $request->toDate,
-        );
-
         $name = "گزارش کشوری از فعالیت روزانه و جاری - جدول 2 " . verta()->now()->format('Y-m-d H-i') . '.xlsx';
-
+        $activities = $roadItemReportService->countryActivityPerSubItem($request);
         return Excel::download(new CountryActivityPerSubItemReport($activities), $name);
     }
 
     public function provinceActivityExcelPerSubItem(Request $request, RoadItemReportService $roadItemReportService): BinaryFileResponse
     {
         auth()->user()->addActivityComplete(1034);
-
-        $activities = $roadItemReportService->provinceActivityPerSubItem(
-            $request->item,
-            $request->fromDate,
-            $request->toDate,
-            $request->province_id
-        );
-
+        $activities = $roadItemReportService->provinceActivityPerSubItem($request);
         $name = "گزارش استانی از فعالیت روزانه و جاری - جدول 2 " . verta()->now()->format('Y-m-d H-i') . '.xlsx';
-
         return Excel::download(new ProvinceActivityPerSubItemReport($activities), $name);
     }
 }

app/Http/Controllers/V3/Dashboard/RoadItemsProjectController.php

@@ -2,9 +2,8 @@
 
 namespace App\Http\Controllers\V3\Dashboard;
 
-use App\Exports\V2\RoadItems\OperatorCartableExport;
-use App\Exports\V2\RoadItems\SupervisorCartableExport;
-use App\Facades\DataTable\DataTableFacade;
+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;
@@ -14,6 +13,7 @@ use App\Models\EdarateShahri;
 use App\Models\InfoItem;
 use App\Models\RoadItemsProject;
 use App\Services\NominatimService;
+use App\Services\Reports\RoadItemReportService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Gate;
@@ -28,39 +28,9 @@ class RoadItemsProjectController extends Controller
     /**
      * Display a listing of the resource.
      */
-    public function supervisorIndex(Request $request): JsonResponse
+    public function supervisorIndex(Request $request, RoadItemReportService $roadItemReportService): JsonResponse
     {
-        $columns = array(
-            'id', 'user_id', 'start_lat', 'start_lng', 'end_lat',
-            'end_lng', 'project_distance', 'item', 'item_fa', 'sub_item_fa', 'sub_item',
-            'sub_item_data', 'created_at', 'updated_at', 'province_id', 'province_fa',
-            'unit_fa', 'status', 'status_fa', 'supervisor_description', 'supervising_time',
-            'supervisor_name', 'edarat_id', 'edarat_name', 'activity_date_time','cmmsMachines.machine_code', 'rahdaran.code',
-        );
-
-        $allowedFilters = $columns;
-        $allowedSortings = $columns;
-
-        $user = auth()->user();
-        $query = null;
-
-        if ($user->hasPermissionTo('show-road-item-supervise-cartable')) {
-            $query = RoadItemsProject::query()->where('is_new', 1)->with(['files', 'rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']);
-        }
-        elseif ($user->hasPermissionTo('show-road-item-supervise-cartable-province')) {
-            if (is_null($user->province_id)) {
-                return $this->errorResponse('استانی برای شما در سامانه ثبت نشده است!');
-            }
-            $query = RoadItemsProject::query()->where('is_new', 1)
-                ->with(['files', 'rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number'])->where('province_id', auth()->user()->province_id);
-        }
-
-        $data = DataTableFacade::run(
-            $query,
-            $request,
-            allowedFilters: $allowedFilters,
-            allowedSortings: $allowedSortings);
-
+        $data = $roadItemReportService->supervisorCartableReport($request);
 
         foreach ($data['data'] as $road_item) {
             if (Gate::allows('gate-supervise-road-item', $road_item)) {
@@ -126,36 +96,16 @@ class RoadItemsProjectController extends Controller
     }
 
 
-    public function supervisorCartableReport(Request $request): BinaryFileResponse
+    public function supervisorCartableReport(Request $request, RoadItemReportService $roadItemReportService): BinaryFileResponse
     {
         $name = 'گزارش از کارتابل ارزیابی فعالیت روزانه ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
-        return Excel::download(new SupervisorCartableExport($request->id, $request->item, $request->status,
-            $request->fromDate, $request->toDate, $request->province_id, $request->edarat_id), $name);
+        $data = $roadItemReportService->supervisorCartableReport($request);
+        return Excel::download(new SupervisorCartableReport($data), $name);
     }
 
-    public function operatorIndex(Request $request): JsonResponse
+    public function operatorIndex(Request $request, RoadItemReportService $roadItemReportService): JsonResponse
     {
-        $columns = array(
-            'id', 'user_id', 'start_lat', 'start_lng', 'end_lat',
-            'end_lng', 'project_distance', 'item', 'item_fa', 'sub_item_fa', 'sub_item',
-            'sub_item_data', 'created_at', 'updated_at', 'province_id', 'province_fa',
-            'unit_fa', 'status', 'status_fa', 'supervisor_description', 'supervising_time',
-            'supervisor_name', 'edarat_id', 'edarat_name', 'activity_date_time', 'cmmsMachines.machine_code', 'rahdaran.code',
-        );
-
-        $allowedFilters = $columns;
-        $allowedSortings = $columns;
-
-        $query = RoadItemsProject::with(['files', 'rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number'])
-            ->where('is_new', 1)
-            ->where('user_id', auth()->user()->id);
-
-        $data = DataTableFacade::run(
-            $query,
-            $request,
-            allowedFilters: $allowedFilters,
-            allowedSortings: $allowedSortings);
-
+        $data = $roadItemReportService->operatorCartableReport($request);
         return response()->json($data);
     }
 
@@ -314,12 +264,10 @@ class RoadItemsProjectController extends Controller
         return $this->successResponse();
     }
 
-    public function operatorCartableReport(Request $request): BinaryFileResponse
+    public function operatorCartableReport(Request $request, RoadItemReportService $roadItemReportService): BinaryFileResponse
     {
         $name = 'گزارش از کارتابل عملیات فعالیت روزانه ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
-        return Excel::download(
-            new OperatorCartableExport($request->id, $request->item, $request->status, $request->fromDate, $request->toDate),
-            $name
-        );
+        $data = $roadItemReportService->operatorCartableReport($request);
+        return Excel::download(new OperatorCartableReport($data), $name);
     }
 }

app/Http/Controllers/V3/Dashboard/RoadPatrolProjectController.php

@@ -4,6 +4,8 @@ namespace App\Http\Controllers\V3\Dashboard;
 
 use App\Exports\V2\RoadPatrol\OperatorCartableExport;
 use App\Exports\V2\RoadPatrol\SupervisorCartableExport;
+use App\Exports\V3\RoadPatrols\OperatorCartableReport;
+use App\Exports\V3\RoadPatrols\SupervisorCartableReport;
 use App\Facades\DataTable\DataTableFacade;
 use App\Facades\Sms\Sms;
 use App\Http\Controllers\Controller;
@@ -16,6 +18,7 @@ use App\Models\RoadItemsProject;
 use App\Models\RoadObserved;
 use App\Models\RoadPatrol;
 use App\Services\NominatimService;
+use App\Services\Reports\RoadPatrolReportService;
 use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -30,40 +33,9 @@ class RoadPatrolProjectController extends Controller
 {
     use ApiResponse;
 
-    public function supervisorIndex(Request $request): JsonResponse
+    public function supervisorIndex(Request $request, RoadPatrolReportService $roadPatrolReportService): JsonResponse
     {
-        $columns = array(
-            'id', 'start_lat', 'start_lon', 'end_lat', 'end_lon', 'operator_id', 'created_at',
-            'operator_name', 'officer_plaque', 'officer_phone_number', 'officer_name',
-            'supervisor_description', 'supervising_time', 'supervisor_name', 'status',
-            'status_fa', 'distance', 'province_id', 'province_fa', 'edare_id', 'edare_name',
-            'start_time', 'end_time','description', 'cmmsMachines.machine_code', 'rahdaran.code',
-        );
-
-        $allowedFilters = $columns;
-        $allowedSortings = $columns;
-
-        $user = auth()->user();
-        $query = null;
-
-        if ($user->hasPermissionTo('show-road-patrol-supervise-cartable')) {
-            $query = RoadPatrol::query()
-                ->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number']);
-        }
-        elseif ($user->hasPermissionTo('show-road-patrol-supervise-cartable-province')) {
-            if (is_null($user->province_id)) {
-                return $this->errorResponse('استانی برای شما در سامانه ثبت نشده است!');
-            }
-            $query = RoadPatrol::query()
-                ->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number'])
-                ->where('province_id', '=', $user->province_id);
-        }
-
-        $data = DataTableFacade::run(
-            $query,
-            $request,
-            allowedFilters: $allowedFilters,
-            allowedSortings: $allowedSortings);
+        $data = $roadPatrolReportService->supervisorCartableReport($request);
 
         foreach ($data['data'] as $road_patrol) {
             if (Gate::allows('gate-supervise-road-item', $road_patrol)) {
@@ -111,37 +83,16 @@ class RoadPatrolProjectController extends Controller
         return $this->successResponse();
     }
 
-    public function supervisorCartableReport(Request $request): BinaryFileResponse
+    public function supervisorCartableReport(Request $request, RoadPatrolReportService $roadPatrolReportService): BinaryFileResponse
     {
         $name = 'گزارش از کارتابل ارزیابی گشت راهداری ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
-        return Excel::download(
-            new SupervisorCartableExport($request->id, $request->fromDate,
-                $request->toDate, $request->province_id, $request->edare_id
-            ), $name
-        );
+        $data = $roadPatrolReportService->supervisorCartableReport($request);
+        return Excel::download(new SupervisorCartableReport($data), $name);
     }
 
-    public function operatorIndex(Request $request): JsonResponse
+    public function operatorIndex(Request $request, RoadPatrolReportService $roadPatrolReportService): JsonResponse
     {
-        $columns = array(
-            'id', 'start_lat', 'start_lon', 'end_lat', 'end_lon', 'officer_plaque', 'created_at',
-            'officer_phone_number', 'officer_name', 'supervisor_description', 'supervising_time',
-            'supervisor_name', 'status', 'status_fa', 'distance', 'start_time', 'end_time', 'cmmsMachines.machine_code', 'rahdaran.code',
-        );
-
-        $allowedFilters = $columns;
-        $allowedSortings = $columns;
-
-        $query = RoadPatrol::query()
-            ->with(['rahdaran:id,name,code', 'cmmsMachines:id,machine_code,car_name,plak_number'])
-            ->where('operator_id', '=', auth()->user()->id);
-
-        $data = DataTableFacade::run(
-            $query,
-            $request,
-            allowedFilters: $allowedFilters,
-            allowedSortings: $allowedSortings);
-
+        $data = $roadPatrolReportService->operatorCartableReport($request);
         return response()->json($data);
     }
 
@@ -369,12 +320,10 @@ class RoadPatrolProjectController extends Controller
         return $this->successResponse($roadPatrol);
     }
 
-    public function operatorCartableReport(Request $request): BinaryFileResponse
+    public function operatorCartableReport(Request $request, RoadPatrolReportService $roadPatrolReportService): BinaryFileResponse
     {
         $name = 'گزارش از کارتابل عملیات گشت راهداری ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
-        return Excel::download(
-            new OperatorCartableExport($request->id, $request->status, $request->officer_name, $request->fromDate, $request->toDate),
-            $name
-        );
+        $data = $roadPatrolReportService->operatorCartableReport($request);
+        return Excel::download(new OperatorCartableReport($data), $name);
     }
 }