fix: Dashboard stats error (#306)

* fix: Subgroup name display issue

* fix: Dashboard stats error

Author: tbphp

internal/handler/dashboard_handler.go

@@ -123,9 +123,13 @@ func (s *Server) Chart(c *gin.Context) {
 	startHour := endHour.Add(-23 * time.Hour)
 
 	var hourlyStats []models.GroupHourlyStat
-	query := s.DB.Where("time >= ? AND time < ?", startHour, endHour.Add(time.Hour))
+	query := s.DB.Table("group_hourly_stats").
+		Where("time >= ? AND time < ?", startHour, endHour.Add(time.Hour))
 	if groupID != "" {
 		query = query.Where("group_id = ?", groupID)
+	} else {
+		query = query.Where("group_id NOT IN (?)",
+			s.DB.Table("groups").Select("id").Where("group_type = ?", "aggregate"))
 	}
 	if err := query.Order("time asc").Find(&hourlyStats).Error; err != nil {
 		response.ErrorI18nFromAPIError(c, app_errors.ErrDatabase, "database.chart_data_failed")
@@ -184,9 +188,11 @@ type hourlyStatResult struct {
 
 func (s *Server) getHourlyStats(startTime, endTime time.Time) (hourlyStatResult, error) {
 	var result hourlyStatResult
-	err := s.DB.Model(&models.GroupHourlyStat{}).
-		Select("sum(success_count) + sum(failure_count) as total_requests, sum(failure_count) as total_failures").
+	err := s.DB.Table("group_hourly_stats").
 		Where("time >= ? AND time < ?", startTime, endTime).
+		Where("group_id NOT IN (?)",
+			s.DB.Table("groups").Select("id").Where("group_type = ?", "aggregate")).
+		Select("COALESCE(SUM(success_count), 0) + COALESCE(SUM(failure_count), 0) as total_requests, COALESCE(SUM(failure_count), 0) as total_failures").
 		Scan(&result).Error
 	return result, err
 }

web/src/components/keys/SubGroupTable.vue

@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { keysApi } from "@/api/keys";
 import type { Group, SubGroupInfo } from "@/types/models";
+import { getGroupDisplayName } from "@/utils/display";
 import { Add, CreateOutline, InformationCircleOutline, Trash } from "@vicons/ionicons5";
 import { NButton, NButtonGroup, NEmpty, NIcon, NSpin, useDialog } from "naive-ui";
 import { computed, ref } from "vue";
@@ -62,7 +63,7 @@ async function deleteSubGroup(subGroup: SubGroupInfo) {
 
   const d = dialog.warning({
     title: t("subGroups.removeSubGroup"),
-    content: t("subGroups.confirmRemoveSubGroup", { name: subGroup.display_name || subGroup.name }),
+    content: t("subGroups.confirmRemoveSubGroup", { name: getGroupDisplayName(subGroup) }),
     positiveText: t("common.confirm"),
     negativeText: t("common.cancel"),
     onPositiveClick: async () => {
@@ -81,16 +82,12 @@ async function deleteSubGroup(subGroup: SubGroupInfo) {
   });
 }
 
-// 统一的成功处理函数
+// Handle success after modal operations
 function handleSuccess() {
   emit("refresh");
 }
 
-function formatDisplayName(subGroup: SubGroupInfo): string {
-  return subGroup.display_name || subGroup.name;
-}
-
-// 跳转到分组信息
+// Navigate to group info
 function goToGroupInfo(groupId: number) {
   emit("group-select", groupId);
 }
@@ -126,11 +123,11 @@ function goToGroupInfo(groupId: number) {
             class="key-card status-sub-group"
             :class="{ disabled: subGroup.weight === 0 }"
           >
-            <!-- 主要信息行：显示名 + 分组名 -->
+            <!-- Main info row: display name + group name -->
             <div class="key-main">
               <div class="key-section">
                 <div class="sub-group-names">
-                  <span class="display-name">{{ formatDisplayName(subGroup) }}</span>
+                  <span class="display-name">{{ getGroupDisplayName(subGroup) }}</span>
                 </div>
                 <div class="quick-actions">
                   <span class="group-name">#{{ subGroup.name }}</span>

web/src/utils/display.ts

@@ -1,4 +1,4 @@
-import type { Group } from "@/types/models";
+import type { Group, SubGroupInfo } from "@/types/models";
 
 /**
  * Formats a string from camelCase, snake_case, or kebab-case
@@ -30,11 +30,11 @@ export function formatDisplayName(name: string): string {
 }
 
 /**
- * Gets the display name for a group, falling back to a formatted version of its name.
- * @param group The group object.
+ * Gets the display name for a group or subgroup, falling back to a formatted version of its name.
+ * @param group The group or subgroup object.
  * @returns The display name for the group.
  */
-export function getGroupDisplayName(group: Group): string {
+export function getGroupDisplayName(group: Group | SubGroupInfo): string {
   return group.display_name || formatDisplayName(group.name);
 }