bug fix

app/Http/Controllers/Api/ProjectController.php

@@ -32,8 +32,18 @@ class ProjectController extends Controller
         $result = [];
 
         //年份清單
-        $regions = Region::where("visible", 1)->pluck("name", "id")->all();
-        $tags = Tag::where("visible", 1)->pluck("name", "id")->all();
+        $regions = Region::select(['id', 'name'])->where("visible", 1)->get()->map(function ($record) use ($locale){
+            return [
+                "id" => $record->id,
+                "name" => $record->getTranslation("name", $locale)
+            ];
+        });
+        $tags = Tag::select(['id', 'name'])->where("visible", 1)->get()->map(function ($record) use ($locale){
+            return [
+                "id" => $record->id,
+                "name" => $record->getTranslation("name", $locale)
+            ];
+        });
 
         $result["regions"] = $regions;
         $result["tags"] = $tags;
@@ -57,7 +67,12 @@ class ProjectController extends Controller
                 "region_id" => $project->region_id,
                 "region" => $project->region->getTranslation("name", $locale),
                 "address" => $project->getTranslation("address", $locale),
-                "tags" => $project->tags->pluck('name', 'id')->all(),
+                "tags" => $project->tags->map(function ($record) use ($locale){
+                    return [
+                        "id" => $record->id,
+                        "name" => $record->getTranslation("name", $locale)
+                    ];
+                }),
                 "name" => $project->getTranslation("name", $locale),
                 "imgUrl" => $project->first_list_img_url
             ];
@@ -71,6 +86,7 @@ class ProjectController extends Controller
         $project = Project::find($id);
 
         $projectHistories = [];
+        $projectSpaceInfo = [];
         foreach($project->histories as $history){
             $operateDate = Carbon::parse($history->operate_date);
             $projectHistories[$operateDate->format("Y")][] = [
@@ -78,26 +94,38 @@ class ProjectController extends Controller
                 "title" => $history->getTranslation("title", $locale)
             ];
         }
+        foreach($project->spaceInfos as $spaceInfo){
+            $projectSpaceInfo[] = [
+                "title" => $spaceInfo->getTranslation("title", $locale),
+                "content" => $spaceInfo->getTranslation("content", $locale)
+            ];
+        }
 
         $result = [
             "name" => $project->getTranslation("name", $locale),
             "subName" => $project->getTranslation("sub_name", $locale),
-            "sub_name" => $project->getTranslation("sub_name", $locale),
+            "description" => $project->getTranslation("summaries", $locale),
             "images" => $project->img_list,
             "region_id" => $project->region_id,
             "region" => $project->region->getTranslation("name", $locale),
             "address" => $project->getTranslation("address", $locale),
-            "tags" => $project->tags->pluck("name", "id")->all(),
+            "tags" => $project->tags->map(function ($record) use ($locale){
+                return [
+                    "id" => $record->id,
+                    "name" => $record->getTranslation("name", $locale)
+                ];
+            }),
             "floor_plan" => $project->getTranslation("floor_plan", $locale),
             "building_structure" => $project->getTranslation("building_structure", $locale),
             "design_unit" => $project->getTranslation("design_unit", $locale),
+            "badge_type" => $project->badge_type,
             "badges" => $project->getBadgesByType($locale, $project->badge_type),
             "contact_info" => [
                 "unitName" => $project->getTranslation("contact_unit", $locale),
                 "unitPhone" => $project->getTranslation("contact_phone", $locale),
                 "inversmentPhone" => $project->getTranslation("inversment_phone", $locale),
             ],
-            "spaceInfo" => $project->getTags($locale),
+            "spaceInfo" => $projectSpaceInfo,
             "historyList" => $projectHistories
         ];
         return Response::ok($result);

app/Models/Project.php

@@ -18,7 +18,7 @@ class Project extends Model
     ];
     protected $casts = ["img_url" => "array"];
 
-    protected $appends = ["first_list_img_url", "img_list", "meta_img_url"];
+    protected $appends = ["first_list_img_url", "img_list"];
 
     public function region()
     {
@@ -69,13 +69,6 @@ class Project extends Model
         return $this->hasMany(ProjectSpaceInfo::class);
     }
 
-    protected function metaImgUrl(): Attribute
-    {
-        return Attribute::make(
-            get: fn ($value) => is_null($this->meta_img) ? null :Storage::url($this->meta_img),
-        );
-    }
-
     public function firstListImgUrl(): Attribute
     {
         return Attribute::make(
@@ -104,7 +97,7 @@ class Project extends Model
                 $badges[] = [
                     "imgUrl" => $badge->imgUrlLink,
                     "name" => $badge->getTranslation("title", $locale),
-                    "rewardYear" => "取得年份 : " . $badge->reward_year
+                    "awardDate" => "取得時間 : " . $badge->award_date
                 ];
             }
         }
@@ -122,7 +115,7 @@ class Project extends Model
                     $badges[] = [
                         "imgUrl" => $badge->imgUrlLink,
                         "name" => null,
-                        "rewardYear" => null
+                        "awardDate" => null
                     ];
                 }
                 break;
@@ -132,7 +125,7 @@ class Project extends Model
                     $badges[] = [
                         "imgUrl" => $badge->imgUrlLink,
                         "name" => $badge->getTranslation("title", $locale),
-                        "rewardYear" => "取得年份 : " . $badge->award_date
+                        "awardDate" => "取得時間 : " . $badge->award_date
                     ];
                 }
                 break;