From e6141e82977d264c2f3efb1aa71d7566e1d54989 Mon Sep 17 00:00:00 2001
From: Jing Li <lym125@gmail.com>
Date: Sun, 6 Aug 2023 15:15:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A8=BB=E8=99=BE=E6=AF=8F?=
 =?UTF-8?q?=E5=91=A8=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/ChartController.php        | 6 +++---
 app/Http/Controllers/WeeksPerYearController.php | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/ChartController.php b/app/Http/Controllers/ChartController.php
index a401196..ce8e2b2 100644
--- a/app/Http/Controllers/ChartController.php
+++ b/app/Http/Controllers/ChartController.php
@@ -8,9 +8,9 @@ use App\Models\RiceShrimpFlow;
 use App\Models\RiceShrimpIndustry;
 use App\Models\RiceShrimpPrice;
 use App\Models\RiceShrimpWeeklyPrice;
-use Peidikeji\Keywords\Models\Keywords;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Peidikeji\Keywords\Models\Keywords;
 
 class ChartController extends Controller
 {
@@ -72,7 +72,7 @@ class ChartController extends Controller
     {
         $now = now();
 
-        $weeks = Keywords::where('type_key', 'weeks-per-year')->pluck('name', 'id');
+        $weeks = Keywords::where('type_key', 'weeks-per-year')->pluck('name', 'key');
 
         $years = RiceShrimpWeeklyPrice::select('year')
             ->groupBy('year')
@@ -105,7 +105,7 @@ class ChartController extends Controller
         $riceShrimpWeeklyPricesTable = (new RiceShrimpWeeklyPrice)->getTable();
 
         $latestPrice = RiceShrimpWeeklyPrice::query()
-            ->join($keywordsTable, fn ($join) => $join->on("$riceShrimpWeeklyPricesTable.week", '=', "$keywordsTable.id"))
+            ->join($keywordsTable, fn ($join) => $join->on("$riceShrimpWeeklyPricesTable.week", '=', "$keywordsTable.key"))
             ->where("$keywordsTable.type_key", 'weeks-per-year')
             ->latest("$riceShrimpWeeklyPricesTable.year")
             ->latest(DB::raw("$keywordsTable.key::INTEGER"))
diff --git a/app/Http/Controllers/WeeksPerYearController.php b/app/Http/Controllers/WeeksPerYearController.php
index 5a3baa6..06dfbeb 100644
--- a/app/Http/Controllers/WeeksPerYearController.php
+++ b/app/Http/Controllers/WeeksPerYearController.php
@@ -10,6 +10,8 @@ class WeeksPerYearController extends Controller
 {
     public function __invoke(Request $request)
     {
-        return Keywords::select('name', 'id')->where('type_key', 'weeks-per-year')->get();
+        $keywords = Keywords::where('type_key', 'weeks-per-year')->pluck('name', 'key');
+
+        return $keywords->map(fn ($item) => ['id' => $item->key, 'name' => $item->name])->values();
     }
 }