Merge pull request #41 from witelgroup/feature/ReportRoadObservation

debug and fix

app/Http/Controllers/V3/Dashboard/RoadObservation/ReportController.php

@@ -8,6 +8,7 @@ use App\Exports\V3\RoadObservation\ProvinceCartableReport;
 use App\Facades\DataTable\DataTableFacade;
 use App\Http\Traits\ApiResponse;
 use App\Models\EdarateShahri;
+use App\Models\Province;
 use App\Models\RoadObserved;
 use App\Services\Cartables\RoadObservation\ReportService;
 use App\Services\Cartables\SafetyAndPrivacy\OperatorService;
@@ -46,14 +47,12 @@ class ReportController
 
     public function countryActivity(Request $request, ReportService $reportService): JsonResponse
     {
-
         $data = $reportService->countryActivity($request);
-        return response()->json($data['data']);
+        return $this->successResponse($data);
     }
 
     public function provinceActivity(Request $request, ReportService $reportService): JsonResponse
     {
-
         $data = $reportService->provinceActivity(
             province_id: $request->input('province_id')
         );
@@ -65,7 +64,7 @@ class ReportController
     }
     public function countryActivityExcel(Request $request, OperatorService $operatorService): BinaryFileResponse
     {
-        $data = $operatorService->countryActivity();
+        $data = $operatorService->countryActivity($request);
         $name = 'گزارش رسیدگی به شکایات واکنش سریع' . verta()->now()->format('Y-m-d H-i') . '.xlsx';
         return Excel::download(new CountryCartableReport($data), $name);
     }

app/Services/Cartables/RoadObservation/ReportService.php

@@ -132,13 +132,10 @@ class ReportService
                             edarate_shahri e
                         LEFT JOIN
                             road_observeds t ON t.edarate_shahri_id = e.id AND t.province_id = e.province_id
-                        WHERE
-                            e.province_id = :provinceId
                         ORDER BY
                             edare_id                               
                   ", [
             'provinceId' => $province_id,
         ]);
     }
-
 }