From 6b4ce99237a9e4fd79619008097cee45058395dc Mon Sep 17 00:00:00 2001
From: Feng Yue <2525275@gmail.com>
Date: Thu, 14 Aug 2025 16:16:27 +0800
Subject: [PATCH] fix: usage stats issue

---
 src/routes/userRoutes.js                         |  4 ++--
 .../src/components/user/UserUsageStats.vue       | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/routes/userRoutes.js b/src/routes/userRoutes.js
index 58b0c1bc..e5dff478 100644
--- a/src/routes/userRoutes.js
+++ b/src/routes/userRoutes.js
@@ -294,8 +294,8 @@ router.get('/usage-stats', authenticateUser, async (req, res) => {
   try {
     const { period = 'week', model } = req.query
 
-    // 获取用户的API Keys
-    const userApiKeys = await apiKeyService.getUserApiKeys(req.user.id)
+    // 获取用户的API Keys (including deleted ones for complete usage stats)
+    const userApiKeys = await apiKeyService.getUserApiKeys(req.user.id, true)
     const apiKeyIds = userApiKeys.map((key) => key.id)
 
     if (apiKeyIds.length === 0) {
diff --git a/web/admin-spa/src/components/user/UserUsageStats.vue b/web/admin-spa/src/components/user/UserUsageStats.vue
index f06b9ac0..0cf885d4 100644
--- a/web/admin-spa/src/components/user/UserUsageStats.vue
+++ b/web/admin-spa/src/components/user/UserUsageStats.vue
@@ -298,10 +298,20 @@
                   <span
                     :class="[
                       'inline-flex items-center rounded-full px-2.5 py-0.5 text-xs font-medium',
-                      apiKey.isActive ? 'bg-green-100 text-green-800' : 'bg-red-100 text-red-800'
+                      apiKey.isDeleted === 'true' || apiKey.deletedAt
+                        ? 'bg-gray-100 text-gray-800'
+                        : apiKey.isActive
+                          ? 'bg-green-100 text-green-800'
+                          : 'bg-red-100 text-red-800'
                     ]"
                   >
-                    {{ apiKey.isActive ? 'Active' : 'Disabled' }}
+                    {{
+                      apiKey.isDeleted === 'true' || apiKey.deletedAt
+                        ? 'Deleted'
+                        : apiKey.isActive
+                          ? 'Active'
+                          : 'Disabled'
+                    }}
                   </span>
                 </td>
               </tr>
@@ -364,7 +374,7 @@ const loadUsageStats = async () => {
   try {
     const [stats, apiKeys] = await Promise.all([
       userStore.getUserUsageStats({ period: selectedPeriod.value }),
-      userStore.getUserApiKeys()
+      userStore.getUserApiKeys(true) // Include deleted keys
     ])
 
     usageStats.value = stats