From 76c99c66c72350a5639d17c850875df1d155e5d8 Mon Sep 17 00:00:00 2001 From: Jing Li Date: Thu, 2 Jun 2022 10:59:43 +0800 Subject: [PATCH 1/2] WIP --- .../Http/Resources/UserInfoSimpleResource.php | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 app/Endpoint/Api/Http/Resources/UserInfoSimpleResource.php diff --git a/app/Endpoint/Api/Http/Resources/UserInfoSimpleResource.php b/app/Endpoint/Api/Http/Resources/UserInfoSimpleResource.php new file mode 100644 index 00000000..082b6c72 --- /dev/null +++ b/app/Endpoint/Api/Http/Resources/UserInfoSimpleResource.php @@ -0,0 +1,23 @@ + (string) $this->nickname, + 'avatar' => (string) $this->avatar, + 'code' => (string) $this->code, + ]; + } +} From 51eb230253515c68d702383471e28ff987bd738e Mon Sep 17 00:00:00 2001 From: Jing Li Date: Thu, 2 Jun 2022 11:05:12 +0800 Subject: [PATCH 2/2] WIP --- app/Endpoint/Api/Http/Controllers/DrawLogController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Endpoint/Api/Http/Controllers/DrawLogController.php b/app/Endpoint/Api/Http/Controllers/DrawLogController.php index 577a4686..9ac052f4 100644 --- a/app/Endpoint/Api/Http/Controllers/DrawLogController.php +++ b/app/Endpoint/Api/Http/Controllers/DrawLogController.php @@ -13,6 +13,7 @@ class DrawLogController extends Controller public function index($drawActivityId, Request $request) { $drawLogs = DrawLog::with(['userInfo', 'prize']) + ->whereDoesntHave('prize', fn ($builder) => $builder->where('type', DrawPrizeType::None)) ->where('draw_activity_id', $drawActivityId) ->latest('id') ->simplePaginate($request->input('per_page'));