create new category for Road patrole service

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

@@ -8,9 +8,8 @@ use App\Http\Controllers\Controller;
 use App\Http\Traits\ApiResponse;
 use App\Models\EdarateShahri;
 use App\Models\Province;
-use App\Models\RoadObserved;
 use App\Models\RoadPatrol;
-use App\Services\Cartables\RoadPatrolTableService;
+use App\Services\Cartables\RoadPatrol\ReportService;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Maatwebsite\Excel\Facades\Excel;
@@ -19,7 +18,7 @@ use Symfony\Component\HttpFoundation\BinaryFileResponse;
 class RoadPatrolReportController extends Controller
 {
     use ApiResponse;
-    public function countryPatrolActivity(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
+    public function countryPatrolActivity(Request $request, ReportService $roadPatrolTableService): JsonResponse
     {
         $activities = $roadPatrolTableService->countryActivity($request);
 
@@ -31,7 +30,7 @@ class RoadPatrolReportController extends Controller
         ]);
     }
 
-    public function provincePatrolActivity(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
+    public function provincePatrolActivity(Request $request, ReportService $roadPatrolTableService): JsonResponse
     {
         $request->validate(["province_id" => "required",]);
 
@@ -45,7 +44,7 @@ class RoadPatrolReportController extends Controller
         ]);
     }
 
-    public function countryActivityExcel(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
+    public function countryActivityExcel(Request $request, ReportService $roadPatrolTableService): BinaryFileResponse
     {
         $activities = $roadPatrolTableService->countryActivity($request);
         $provinces = Province::all(['id', 'name_fa']);
@@ -58,7 +57,7 @@ class RoadPatrolReportController extends Controller
         ]), $name);
     }
 
-    public function provinceActivityExcel(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
+    public function provinceActivityExcel(Request $request, ReportService $roadPatrolTableService): BinaryFileResponse
     {
         $activities = $roadPatrolTableService->provinceActivity($request);
         $edarateShahri = EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']);

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

@@ -16,8 +16,8 @@ use App\Models\Mission;
 use App\Models\RoadItemsProject;
 use App\Models\RoadObserved;
 use App\Models\RoadPatrol;
+use App\Services\Cartables\RoadPatrol\ReportService;
 use App\Services\NominatimService;
-use App\Services\Cartables\RoadPatrolTableService;
 use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -32,7 +32,7 @@ class RoadPatrolProjectController extends Controller
 {
     use ApiResponse;
 
-    public function supervisorIndex(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
+    public function supervisorIndex(Request $request, ReportService $roadPatrolTableService): JsonResponse
     {
         $data = $roadPatrolTableService->supervisorCartableReport($request);
 
@@ -82,14 +82,14 @@ class RoadPatrolProjectController extends Controller
         return $this->successResponse();
     }
 
-    public function supervisorCartableReport(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
+    public function supervisorCartableReport(Request $request, ReportService $roadPatrolTableService): BinaryFileResponse
     {
         $name = 'گزارش از کارتابل ارزیابی گشت راهداری ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
         $data = $roadPatrolTableService->supervisorCartableReport($request, true);
         return Excel::download(new SupervisorCartableReport($data['data']), $name);
     }
 
-    public function operatorIndex(Request $request, RoadPatrolTableService $roadPatrolTableService): JsonResponse
+    public function operatorIndex(Request $request, ReportService $roadPatrolTableService): JsonResponse
     {
         $data = $roadPatrolTableService->operatorCartableReport($request);
         return response()->json($data);
@@ -331,7 +331,7 @@ class RoadPatrolProjectController extends Controller
         return $this->successResponse($roadPatrol);
     }
 
-    public function operatorCartableReport(Request $request, RoadPatrolTableService $roadPatrolTableService): BinaryFileResponse
+    public function operatorCartableReport(Request $request, ReportService $roadPatrolTableService): BinaryFileResponse
     {
         $name = 'گزارش از کارتابل عملیات گشت راهداری ' . verta()->now()->format('Y-m-d H:i') . '.xlsx';
         $data = $roadPatrolTableService->operatorCartableReport($request, true);