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', 'key');
+        $weeks = Keywords::where('type_key', 'weeks-per-year')->pluck('name', 'id');
 
         $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", '=', DB::raw("$keywordsTable.key::INTEGER")))
+            ->join($keywordsTable, fn ($join) => $join->on("$riceShrimpWeeklyPricesTable.week", '=', "$keywordsTable.id"))
             ->where("$keywordsTable.type_key", 'weeks-per-year')
             ->latest("$riceShrimpWeeklyPricesTable.year")
             ->latest(DB::raw("$keywordsTable.key::INTEGER"))

app/Http/Controllers/WeeksPerYearController.php

@@ -10,8 +10,6 @@ class WeeksPerYearController extends Controller
 {
     public function __invoke(Request $request)
     {
-        $keywords = Keywords::where('type_key', 'weeks-per-year')->pluck('name', 'key');
-
-        return $keywords->map(fn ($name, $key) => ['id' => $key, 'name' => $name])->values();
+        return Keywords::select('name', 'id')->where('type_key', 'weeks-per-year')->get();
     }
 }