365ef1fdf7
Follow-up to the available-channels review pass. No behavior change for end users; tightens internals based on three independent code reviews. Backend - service/channel.go: collapse buildPricingLookup + pricedNamesFor into a single platformPricingIndex (byLower + originalCase + ordered names), built once per SupportedModels call. Fixes a casing- consistency bug where the same logical model appeared with mapping case in the exact branch but pricing case in the wildcard branch — pricing's original case now wins everywhere. - service/channel.go: doc that a mapping key of just "*" expands to every priced model on the platform (intentional "passthrough all"). - service/channel_available.go: normalize empty BillingModelSource to channel_mapped at construction time, removing the same fallback duplicated in the admin DTO mapper and the admin Vue template. - handler/admin/available_channel_handler.go: unexport availableChannelToAdminResponse (same-package usage only); mapper is now a pure passthrough. - handler/available_channel_handler.go: drop the middleware2 alias (no name collision in this file). Frontend - utils/pricing.ts: extract formatScaled, used by SupportedModelChip and PricingRow. - api/admin/channels.ts: re-export BillingMode from constants/channel; tighten Channel.status / billing_model_source to ChannelStatus / BillingModelSource (and same for AvailableChannel). - components/channels/AvailableChannelsTable.vue: drop dead withDefaults wrapper (loading is required, both call sites pass it). - views/admin/AvailableChannelsView.vue: drop the redundant || BILLING_MODEL_SOURCE_CHANNEL_MAPPED fallback (now applied in service layer); remove unused import. - i18n zh + en: delete unused tierLabel and tokenRange keys from both availableChannels.pricing and admin.availableChannels.pricing. Tests - New: SupportedModels_ExactKeyUsesPricedCaseWhenAvailable locks the pricing-case-wins rule. - New: SupportedModels_AsteriskOnlyMappingExpandsAllPriced documents the "*" expansion rule. - Admin handler: existing tests adjusted to pass an explicit BillingModelSource (default-fill is now exercised by service tests).
96 lines
3.3 KiB
Go
96 lines
3.3 KiB
Go
package admin
|
|
|
|
import (
|
|
"github.com/Wei-Shaw/sub2api/internal/pkg/response"
|
|
"github.com/Wei-Shaw/sub2api/internal/service"
|
|
|
|
"github.com/gin-gonic/gin"
|
|
)
|
|
|
|
// AvailableChannelHandler 处理「可用渠道」聚合视图的管理员接口。
|
|
//
|
|
// 该视图以只读方式聚合渠道基础信息、关联分组与推导出的支持模型列表（无通配符）。
|
|
type AvailableChannelHandler struct {
|
|
channelService *service.ChannelService
|
|
}
|
|
|
|
// NewAvailableChannelHandler 创建 AvailableChannelHandler 实例。
|
|
func NewAvailableChannelHandler(channelService *service.ChannelService) *AvailableChannelHandler {
|
|
return &AvailableChannelHandler{channelService: channelService}
|
|
}
|
|
|
|
// availableGroupResponse 响应中的分组概要。
|
|
type availableGroupResponse struct {
|
|
ID int64 `json:"id"`
|
|
Name string `json:"name"`
|
|
Platform string `json:"platform"`
|
|
}
|
|
|
|
// supportedModelResponse 响应中的支持模型条目。
|
|
type supportedModelResponse struct {
|
|
Name string `json:"name"`
|
|
Platform string `json:"platform"`
|
|
Pricing *channelModelPricingResponse `json:"pricing"`
|
|
}
|
|
|
|
// availableChannelResponse 管理员视图完整字段集。
|
|
type availableChannelResponse struct {
|
|
ID int64 `json:"id"`
|
|
Name string `json:"name"`
|
|
Description string `json:"description"`
|
|
Status string `json:"status"`
|
|
BillingModelSource string `json:"billing_model_source"`
|
|
RestrictModels bool `json:"restrict_models"`
|
|
Groups []availableGroupResponse `json:"groups"`
|
|
SupportedModels []supportedModelResponse `json:"supported_models"`
|
|
}
|
|
|
|
// availableChannelToAdminResponse 将 service 层的 AvailableChannel 转为管理员 DTO。
|
|
// 同 package 内复用；也用于构造测试 fixture。
|
|
func availableChannelToAdminResponse(ch service.AvailableChannel) availableChannelResponse {
|
|
groups := make([]availableGroupResponse, 0, len(ch.Groups))
|
|
for _, g := range ch.Groups {
|
|
groups = append(groups, availableGroupResponse{ID: g.ID, Name: g.Name, Platform: g.Platform})
|
|
}
|
|
models := make([]supportedModelResponse, 0, len(ch.SupportedModels))
|
|
for i := range ch.SupportedModels {
|
|
m := ch.SupportedModels[i]
|
|
var pricing *channelModelPricingResponse
|
|
if m.Pricing != nil {
|
|
p := pricingToResponse(m.Pricing)
|
|
pricing = &p
|
|
}
|
|
models = append(models, supportedModelResponse{
|
|
Name: m.Name,
|
|
Platform: m.Platform,
|
|
Pricing: pricing,
|
|
})
|
|
}
|
|
return availableChannelResponse{
|
|
ID: ch.ID,
|
|
Name: ch.Name,
|
|
Description: ch.Description,
|
|
Status: ch.Status,
|
|
BillingModelSource: ch.BillingModelSource,
|
|
RestrictModels: ch.RestrictModels,
|
|
Groups: groups,
|
|
SupportedModels: models,
|
|
}
|
|
}
|
|
|
|
// List 列出所有可用渠道（管理员视图）。
|
|
// GET /api/v1/admin/channels/available
|
|
func (h *AvailableChannelHandler) List(c *gin.Context) {
|
|
channels, err := h.channelService.ListAvailable(c.Request.Context())
|
|
if err != nil {
|
|
response.ErrorFrom(c, err)
|
|
return
|
|
}
|
|
|
|
out := make([]availableChannelResponse, 0, len(channels))
|
|
for _, ch := range channels {
|
|
out = append(out, availableChannelToAdminResponse(ch))
|
|
}
|
|
response.Success(c, gin.H{"items": out})
|
|
}
|