From 1b4a6da397d223ede8cdb2357fd55728f0a2e465 Mon Sep 17 00:00:00 2001
From: amirghasempoor <amirghasempoor79@gmail.com>
Date: Thu, 9 Jan 2025 12:31:57 +0330
Subject: [PATCH] return more data in api

---
 .../V3/Dashboard/Reports/RoadItemsReportController.php | 10 ++++++++--
 routes/v3.php                                          |  8 ++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/V3/Dashboard/Reports/RoadItemsReportController.php b/app/Http/Controllers/V3/Dashboard/Reports/RoadItemsReportController.php
index 103e4870..eda71fbf 100644
--- a/app/Http/Controllers/V3/Dashboard/Reports/RoadItemsReportController.php
+++ b/app/Http/Controllers/V3/Dashboard/Reports/RoadItemsReportController.php
@@ -62,6 +62,7 @@ class RoadItemsReportController extends Controller
         });
 
         $activities = $provinceRoadItemsPerSubItem->push(...$countryRoadItemsPerSubItem);
+        $provinces = Province::all(['id', 'name_fa']);
 
         $subItems = InfoItem::query()
             ->where('item', $item)
@@ -69,8 +70,8 @@ class RoadItemsReportController extends Controller
 
         return $this->successResponse([
             'activities' => $activities,
-            'items' => $infoItems,
             'sub_items' => $subItems,
+            'provinces' => $provinces,
         ]);
     }
 
@@ -110,6 +111,7 @@ class RoadItemsReportController extends Controller
             ->get();
 
         $items = InfoItem::query()->where('item', $item)->get()->keyBy('sub_item');
+        $edarateShahri = EdarateShahri::query()->where('province_id', '=', $province)->get(['id', 'name_fa']);
 
         $cityRoadItemsPerSubItem->each(function ($value) use ($items) {
             if (isset($items[$value->t])) {
@@ -118,10 +120,14 @@ class RoadItemsReportController extends Controller
         });
 
         $activities = $cityRoadItemsPerSubItem->push(...$provinceRoadItemsPerSubItem);
+        $subItems = InfoItem::query()
+            ->where('item', $item)
+            ->get(['id', 'item', 'item_str', 'sub_item_str', 'sub_item_unit', 'sub_item']);
 
         return $this->successResponse([
             'activities' => $activities,
-            'items' => $items
+            'edarateShahri' => $edarateShahri,
+            'sub_items' => $subItems,
         ]);
     }
 
diff --git a/routes/v3.php b/routes/v3.php
index 3c05630f..60f6140b 100644
--- a/routes/v3.php
+++ b/routes/v3.php
@@ -195,10 +195,10 @@ Route::prefix('road_item_reports')
     ->controller(RoadItemsReportController::class)
     ->group(function () {
         Route::get('/get_sub_items', 'getSubItems')->name('getSubItems');
-        Route::get('/get_items', 'provinceActivityPerSubItem')->name('provinceActivityPerSubItem');
-        Route::get('/get_items_city', 'cityActivityPerSubItem')->name('cityActivityPerSubItem');
-        Route::get('/province_statistics', 'provinceActivityPerItem')->name('provinceActivityPerItem');
-        Route::get('/city_statistics', 'cityActivityPerItem')->name('cityActivityPerItem');
+        Route::get('/province_activity_per_sub_item', 'provinceActivityPerSubItem')->name('provinceActivityPerSubItem');
+        Route::get('/city_activity_per_sub_item', 'cityActivityPerSubItem')->name('cityActivityPerSubItem');
+        Route::get('/province_activity_per_item', 'provinceActivityPerItem')->name('provinceActivityPerItem');
+        Route::get('/city_activity_per_item', 'cityActivityPerItem')->name('cityActivityPerItem');
         Route::get('/map', 'map')->name('map');
     });