diff --git a/backend/internal/router/admin/cards.go b/backend/internal/router/admin/cards.go index c5c1654..5851aed 100644 --- a/backend/internal/router/admin/cards.go +++ b/backend/internal/router/admin/cards.go @@ -446,27 +446,24 @@ func handleGetCards(c *gin.Context) { var total int64 query.Count(&total) - baseQuery := database.DB.Model(&model.Card{}). - Joins("JOIN card_types ON cards.card_type_id = card_types.id"). - Joins("JOIN applications ON card_types.application_id = applications.id") - - if len(authorizedAppIDs) > 0 { - baseQuery = baseQuery.Where("applications.user_id = ? OR (cards.application_id IN ? AND cards.creator_id = ?)", userID, authorizedAppIDs, userID) - } else { - baseQuery = baseQuery.Where("applications.user_id = ?", userID) + countBase := func(status string) int64 { + var count int64 + q := database.DB.Model(&model.Card{}). + Joins("JOIN card_types ON cards.card_type_id = card_types.id"). + Joins("JOIN applications ON card_types.application_id = applications.id") + if len(authorizedAppIDs) > 0 { + q = q.Where("applications.user_id = ? OR (cards.application_id IN ? AND cards.creator_id = ?)", userID, authorizedAppIDs, userID) + } else { + q = q.Where("applications.user_id = ?", userID) + } + q.Where("cards.status = ?", status).Count(&count) + return count } - var unusedCount int64 - baseQuery.Where("cards.status = ?", "unused").Count(&unusedCount) - - var usedCount int64 - baseQuery.Where("cards.status = ?", "used").Count(&usedCount) - - var bannedCount int64 - baseQuery.Where("cards.status = ?", "banned").Count(&bannedCount) - - var expiredCount int64 - baseQuery.Where("cards.status = ?", "expired").Count(&expiredCount) + unusedCount := countBase("unused") + usedCount := countBase("used") + bannedCount := countBase("banned") + expiredCount := countBase("expired") page, _ := strconv.Atoi(c.DefaultQuery("page", "1")) pageSize, _ := strconv.Atoi(c.DefaultQuery("page_size", "20")) diff --git a/frontend/src/pages/admin/cards/components/data-table.vue b/frontend/src/pages/admin/cards/components/data-table.vue index bfa1b93..518ace3 100644 --- a/frontend/src/pages/admin/cards/components/data-table.vue +++ b/frontend/src/pages/admin/cards/components/data-table.vue @@ -19,6 +19,7 @@ const props = defineProps, 'columns'> & { onToggleStatus: (row: Card) => void onDelete: (row: Card) => void searchFilter?: string + serverPagination?: DataTableProps['serverPagination'] }>() const emit = defineEmits<{ @@ -45,6 +46,7 @@ const table = generateVueTable({ get data() { return props.data }, get loading() { return props.loading }, columns: columns.value, + serverPagination: props.serverPagination, }) const columnLabels: Record = { @@ -67,7 +69,7 @@ defineExpose({