From c8665091896e62d7589fb49ce5f4198961e8dfb5 Mon Sep 17 00:00:00 2001 From: "allen.yan" Date: Fri, 27 Jun 2025 13:41:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AA=BF=E6=95=B4=E6=99=82=E9=96=93=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=2020250627?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/BranchControlController.php | 4 +-- .../Controllers/RoomControlController.php | 3 +- app/Http/Resources/RoomResource.php | 29 +++++++++++++++++++ 3 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 app/Http/Resources/RoomResource.php diff --git a/app/Http/Controllers/BranchControlController.php b/app/Http/Controllers/BranchControlController.php index fb31a98..0755297 100644 --- a/app/Http/Controllers/BranchControlController.php +++ b/app/Http/Controllers/BranchControlController.php @@ -80,8 +80,8 @@ class BranchControlController extends Controller $roomName => [ 'is_online' => $room->is_online, 'status' => $room->status?->value ?? null, - 'started_at' => $room->started_at, - 'ended_at' => $room->ended_at, + 'started_at' => optional($room->started_at)->timezone('Asia/Taipei')->format('Y-m-d H:i:s'), + 'ended_at' => optional($room->ended_at)->timezone('Asia/Taipei')->format('Y-m-d H:i:s'), ] ]; }), diff --git a/app/Http/Controllers/RoomControlController.php b/app/Http/Controllers/RoomControlController.php index ad80eb4..9b76c78 100644 --- a/app/Http/Controllers/RoomControlController.php +++ b/app/Http/Controllers/RoomControlController.php @@ -11,6 +11,7 @@ use App\Models\Branch; use App\Models\Room; use App\Enums\RoomStatus; use App\Http\Responses\ApiResponse; +use App\Http\Resources\RoomResource; use Illuminate\Support\Facades\Log; /** @@ -123,6 +124,6 @@ class RoomControlController extends Controller 'ended_at' => $validated['ended_at'], ] ); - return ApiResponse::success($room->refresh()); + return ApiResponse::success(new RoomResource($room->refresh())); } } diff --git a/app/Http/Resources/RoomResource.php b/app/Http/Resources/RoomResource.php new file mode 100644 index 0000000..c2eab34 --- /dev/null +++ b/app/Http/Resources/RoomResource.php @@ -0,0 +1,29 @@ + + */ + public function toArray(Request $request): array + { + return [ + 'id' => $this->id, + 'branch_id' => $this->branch_id, + 'type' => $this->type, + 'name' => $this->name, + 'floor' => $this->floor, + 'is_online' => $this->is_online, + 'status' => $this->status, + 'started_at' => optional($this->started_at)->timezone('Asia/Taipei')->format('Y-m-d H:i:s'), + 'ended_at' => optional($this->ended_at)->timezone('Asia/Taipei')->format('Y-m-d H:i:s'), + ]; + } +}