From 1716f2f6cab62e2695126af90c877cfd74a5266c Mon Sep 17 00:00:00 2001
From: tokumeikoi <tokumeikoi@protonmail.com>
Date: Wed, 5 Jan 2022 23:18:38 +0800
Subject: [PATCH] update: change server log api to getServerLogs

---
 .../Controllers/User/ServerController.php     | 24 ++++---------------
 app/Http/Routes/UserRoute.php                 |  2 +-
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/app/Http/Controllers/User/ServerController.php b/app/Http/Controllers/User/ServerController.php
index aa6d4b1a..2e1308e3 100644
--- a/app/Http/Controllers/User/ServerController.php
+++ b/app/Http/Controllers/User/ServerController.php
@@ -31,37 +31,21 @@ class ServerController extends Controller
         ]);
     }
 
-    public function logFetch(Request $request)
+    public function getServerLogs(Request $request)
     {
-        $type = $request->input('type') ? $request->input('type') : 0;
-        $current = $request->input('current') ? $request->input('current') : 1;
-        $pageSize = $request->input('pageSize') >= 10 ? $request->input('pageSize') : 10;
         $serverLogModel = ServerLog::select([
             DB::raw('sum(u) as u'),
             DB::raw('sum(d) as d'),
             'log_at',
             'user_id',
-            'updated_at'
+            DB::raw('avg(rate) as rate'),
         ])
             ->where('user_id', $request->session()->get('id'))
+            ->where('log_at', '>=', strtotime(date('Y-m-1')))
             ->groupBy('log_at', 'user_id')
             ->orderBy('log_at', 'DESC');
-        switch ($type) {
-            case 0:
-                $serverLogModel->where('log_at', '>=', strtotime(date('Y-m-d')));
-                break;
-            case 1:
-                $serverLogModel->where('log_at', '>=', strtotime(date('Y-m-d')) - 604800);
-                break;
-            case 2:
-                $serverLogModel->where('log_at', '>=', strtotime(date('Y-m-1')));
-        }
-        $total = $serverLogModel->count();
-        $res = $serverLogModel->forPage($current, $pageSize)
-            ->get();
         return response([
-            'data' => $res,
-            'total' => $total
+            'data' => $serverLogModel->get()
         ]);
     }
 }
diff --git a/app/Http/Routes/UserRoute.php b/app/Http/Routes/UserRoute.php
index 51f4cf17..8dda5bc9 100644
--- a/app/Http/Routes/UserRoute.php
+++ b/app/Http/Routes/UserRoute.php
@@ -45,7 +45,7 @@ class UserRoute
             $router->post('/ticket/withdraw', 'User\\TicketController@withdraw');
             // Server
             $router->get ('/server/fetch', 'User\\ServerController@fetch');
-            $router->get ('/server/log/fetch', 'User\\ServerController@logFetch');
+            $router->get ('/server/getServerLogs', 'User\\ServerController@getServerLogs');
             // Coupon
             $router->post('/coupon/check', 'User\\CouponController@check');
             // Telegram