From 3b1159187fe5d80d302bb1757c1f8189aaf3ef2a Mon Sep 17 00:00:00 2001
From: v2board <org@v2board.com>
Date: Wed, 3 May 2023 18:24:30 +0800
Subject: [PATCH] update: user statistical

---
 app/Http/Controllers/User/StatController.php | 18 +++++++++++++++---
 library/V2ray.php                            | 14 --------------
 2 files changed, 15 insertions(+), 17 deletions(-)
 delete mode 100644 library/V2ray.php

diff --git a/app/Http/Controllers/User/StatController.php b/app/Http/Controllers/User/StatController.php
index a842452e..d0d53452 100644
--- a/app/Http/Controllers/User/StatController.php
+++ b/app/Http/Controllers/User/StatController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\User;
 
 use App\Http\Controllers\Controller;
 use App\Models\StatUser;
+use App\Services\StatisticalService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
@@ -11,7 +12,10 @@ class StatController extends Controller
 {
     public function getTrafficLog(Request $request)
     {
-        $builder = StatUser::select([
+        $statService = new StatisticalService();
+        $statService->setStartAt(strtotime(date('Y-m-d')));
+        $statService->setUserStats();
+        $stats = StatUser::select([
             'u',
             'd',
             'record_at',
@@ -20,9 +24,17 @@ class StatController extends Controller
         ])
             ->where('user_id', $request->user['id'])
             ->where('record_at', '>=', strtotime(date('Y-m-1')))
-            ->orderBy('record_at', 'DESC');
+            ->orderBy('record_at', 'DESC')
+            ->get()
+            ->toArray();
+
+        $stats = array_merge($stats, $statService->getStatUserByUserID($request->user['id']));
+        usort($stats, function ($a, $b) {
+            return $b['record_at'] - $a['record_at'];
+        });
+
         return response([
-            'data' => $builder->get()
+            'data' => $stats
         ]);
     }
 }
diff --git a/library/V2ray.php b/library/V2ray.php
deleted file mode 100644
index f83fa99c..00000000
--- a/library/V2ray.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace Library;
-
-
-class V2ray
-{
-    protected $config;
-
-    public function __construct()
-    {
-        $this->config = new \StdClass();
-    }
-}