From b46bd53254e14b972b8d4f26b60b577d2746ebdf Mon Sep 17 00:00:00 2001
From: amirghasempoor <amirghasempoor79@gmail.com>
Date: Tue, 15 Apr 2025 11:14:38 +0330
Subject: [PATCH] return the correct data values

---
 .../Reports/SafetyAndPrivacyReportController.php       |  4 ++--
 .../Cartables/SafetyAndPrivacyTableService.php         | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/V3/Dashboard/Reports/SafetyAndPrivacyReportController.php b/app/Http/Controllers/V3/Dashboard/Reports/SafetyAndPrivacyReportController.php
index cc3d5673..3346cdb7 100644
--- a/app/Http/Controllers/V3/Dashboard/Reports/SafetyAndPrivacyReportController.php
+++ b/app/Http/Controllers/V3/Dashboard/Reports/SafetyAndPrivacyReportController.php
@@ -22,7 +22,7 @@ class SafetyAndPrivacyReportController extends Controller
     {
         $data = $safetyAndPrivacyTableService->countryActivity($request);
         return $this->successResponse([
-            'activities' => $data['activities'],
+            'activities' => $data,
             'provinces' => Province::all(['id', 'name_fa'])
         ]);
     }
@@ -31,7 +31,7 @@ class SafetyAndPrivacyReportController extends Controller
     {
         $data = $safetyAndPrivacyTableService->provinceActivity($request);
         return $this->successResponse([
-            'activities' => $data['activities'],
+            'activities' => $data,
             'edarateShahri' => EdarateShahri::query()->where('province_id', '=', $request->province_id)->get(['id', 'name_fa']),
         ]);
     }
diff --git a/app/Services/Cartables/SafetyAndPrivacyTableService.php b/app/Services/Cartables/SafetyAndPrivacyTableService.php
index 304c3532..33b8645a 100644
--- a/app/Services/Cartables/SafetyAndPrivacyTableService.php
+++ b/app/Services/Cartables/SafetyAndPrivacyTableService.php
@@ -72,14 +72,14 @@ class SafetyAndPrivacyTableService
             '90' => ['1' => 0, '2' => 0, '3' => 0,],
             '91' => ['1' => 0, '2' => 0, '3' => 0,],
         ];
-        foreach ($country as $key => $value) {
+        foreach ($country['data'] as $key => $value) {
             $countryTotalSum += $value->qty;
             $countryData[$value->info_id][$value->step] = $value->qty;
             $countryData["sum"] = $countryTotalSum;
         }
 
         $activities[] = (object) $countryData;
-        $provinceQuery = Province::query()->selectRaw('province_id, province_fa, COUNT(*) as qty,info_id, step');
+        $provinceQuery = SafetyAndPrivacy::query()->selectRaw('province_id, province_fa, COUNT(*) as qty,info_id, step');
         $provinces = DataTableFacade::run(
             $provinceQuery,
             $request,
@@ -88,7 +88,7 @@ class SafetyAndPrivacyTableService
             allowedGroupBy: ['info_id', 'step', 'province_id', 'province_fa']
         );
 
-        foreach ($provinces as $value)
+        foreach ($provinces['data'] as $value)
         {
             $provinceId = $value->province_id;
             if (!isset($activities[$provinceId])) {
@@ -129,7 +129,7 @@ class SafetyAndPrivacyTableService
             '90' => ['1' => 0, '2' => 0, '3' => 0,],
             '91' => ['1' => 0, '2' => 0, '3' => 0,],
         ];
-        foreach ($province as $key => $value) {
+        foreach ($province['data'] as $key => $value) {
             $provinceTotalSum += $value->qty;
             $provinceData["sum"] = $provinceTotalSum;
             $provinceData[$value->info_id][$value->step] = $value->qty;
@@ -145,7 +145,7 @@ class SafetyAndPrivacyTableService
             allowedGroupBy: ['info_id', 'step', 'edare_shahri_id']
         );
 
-        foreach ($cities as $value)
+        foreach ($cities['data'] as $value)
         {
             $cityId = $value->edare_shahri_id;
             if (!isset($activities[$cityId])) {