fix(lint): 修复 CI 中的 ineffassign 和 unused 代码告警,修正 group 排序集成测试兼容性
This commit is contained in:
@@ -17,7 +17,6 @@ type adminUsageRepoCapture struct {
|
|||||||
service.UsageLogRepository
|
service.UsageLogRepository
|
||||||
listParams pagination.PaginationParams
|
listParams pagination.PaginationParams
|
||||||
listFilters usagestats.UsageLogFilters
|
listFilters usagestats.UsageLogFilters
|
||||||
statsParams pagination.PaginationParams
|
|
||||||
statsFilters usagestats.UsageLogFilters
|
statsFilters usagestats.UsageLogFilters
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -390,7 +390,7 @@ func apiKeyListOrder(params pagination.PaginationParams) []func(*entsql.Selector
|
|||||||
sortBy := strings.ToLower(strings.TrimSpace(params.SortBy))
|
sortBy := strings.ToLower(strings.TrimSpace(params.SortBy))
|
||||||
sortOrder := params.NormalizedSortOrder(pagination.SortOrderDesc)
|
sortOrder := params.NormalizedSortOrder(pagination.SortOrderDesc)
|
||||||
|
|
||||||
field := apikey.FieldID
|
var field string
|
||||||
switch sortBy {
|
switch sortBy {
|
||||||
case "name":
|
case "name":
|
||||||
field = apikey.FieldName
|
field = apikey.FieldName
|
||||||
@@ -402,8 +402,6 @@ func apiKeyListOrder(params pagination.PaginationParams) []func(*entsql.Selector
|
|||||||
field = apikey.FieldLastUsedAt
|
field = apikey.FieldLastUsedAt
|
||||||
case "created_at":
|
case "created_at":
|
||||||
field = apikey.FieldCreatedAt
|
field = apikey.FieldCreatedAt
|
||||||
case "id", "":
|
|
||||||
field = apikey.FieldID
|
|
||||||
default:
|
default:
|
||||||
field = apikey.FieldID
|
field = apikey.FieldID
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -250,7 +250,7 @@ func channelListOrderBy(params pagination.PaginationParams) string {
|
|||||||
sortBy := strings.ToLower(strings.TrimSpace(params.SortBy))
|
sortBy := strings.ToLower(strings.TrimSpace(params.SortBy))
|
||||||
sortOrder := strings.ToUpper(params.NormalizedSortOrder(pagination.SortOrderAsc))
|
sortOrder := strings.ToUpper(params.NormalizedSortOrder(pagination.SortOrderAsc))
|
||||||
|
|
||||||
column := "c.id"
|
var column string
|
||||||
switch sortBy {
|
switch sortBy {
|
||||||
case "":
|
case "":
|
||||||
column = "c.id"
|
column = "c.id"
|
||||||
|
|||||||
@@ -319,7 +319,7 @@ func groupListOrder(params pagination.PaginationParams) []func(*entsql.Selector)
|
|||||||
sortBy := strings.ToLower(strings.TrimSpace(params.SortBy))
|
sortBy := strings.ToLower(strings.TrimSpace(params.SortBy))
|
||||||
sortOrder := params.NormalizedSortOrder(pagination.SortOrderAsc)
|
sortOrder := params.NormalizedSortOrder(pagination.SortOrderAsc)
|
||||||
|
|
||||||
field := group.FieldSortOrder
|
var field string
|
||||||
tieField := group.FieldID
|
tieField := group.FieldID
|
||||||
defaultOrder := true
|
defaultOrder := true
|
||||||
switch sortBy {
|
switch sortBy {
|
||||||
|
|||||||
@@ -13,11 +13,17 @@ func (s *GroupRepoSuite) TestList_DefaultSortBySortOrderAsc() {
|
|||||||
s.Require().NoError(s.repo.Create(s.ctx, g1))
|
s.Require().NoError(s.repo.Create(s.ctx, g1))
|
||||||
s.Require().NoError(s.repo.Create(s.ctx, g2))
|
s.Require().NoError(s.repo.Create(s.ctx, g2))
|
||||||
|
|
||||||
groups, _, err := s.repo.List(s.ctx, pagination.PaginationParams{Page: 1, PageSize: 10})
|
groups, _, err := s.repo.List(s.ctx, pagination.PaginationParams{Page: 1, PageSize: 100})
|
||||||
s.Require().NoError(err)
|
s.Require().NoError(err)
|
||||||
s.Require().Len(groups, 2)
|
s.Require().GreaterOrEqual(len(groups), 2)
|
||||||
s.Require().Equal(g2.ID, groups[0].ID)
|
indexByID := make(map[int64]int, len(groups))
|
||||||
s.Require().Equal(g1.ID, groups[1].ID)
|
for i, g := range groups {
|
||||||
|
indexByID[g.ID] = i
|
||||||
|
}
|
||||||
|
s.Require().Contains(indexByID, g1.ID)
|
||||||
|
s.Require().Contains(indexByID, g2.ID)
|
||||||
|
// g2 has SortOrder=10, g1 has SortOrder=20; ascending means g2 comes first
|
||||||
|
s.Require().Less(indexByID[g2.ID], indexByID[g1.ID])
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *GroupRepoSuite) TestList_SortBySortOrderDesc() {
|
func (s *GroupRepoSuite) TestList_SortBySortOrderDesc() {
|
||||||
|
|||||||
@@ -161,7 +161,7 @@ func promoCodeListOrder(params pagination.PaginationParams) []func(*entsql.Selec
|
|||||||
sortBy := strings.ToLower(strings.TrimSpace(params.SortBy))
|
sortBy := strings.ToLower(strings.TrimSpace(params.SortBy))
|
||||||
sortOrder := params.NormalizedSortOrder(pagination.SortOrderDesc)
|
sortOrder := params.NormalizedSortOrder(pagination.SortOrderDesc)
|
||||||
|
|
||||||
field := promocode.FieldID
|
var field string
|
||||||
switch sortBy {
|
switch sortBy {
|
||||||
case "bonus_amount":
|
case "bonus_amount":
|
||||||
field = promocode.FieldBonusAmount
|
field = promocode.FieldBonusAmount
|
||||||
@@ -173,8 +173,6 @@ func promoCodeListOrder(params pagination.PaginationParams) []func(*entsql.Selec
|
|||||||
field = promocode.FieldCreatedAt
|
field = promocode.FieldCreatedAt
|
||||||
case "code":
|
case "code":
|
||||||
field = promocode.FieldCode
|
field = promocode.FieldCode
|
||||||
case "id", "":
|
|
||||||
field = promocode.FieldID
|
|
||||||
default:
|
default:
|
||||||
field = promocode.FieldID
|
field = promocode.FieldID
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3812,14 +3812,12 @@ func usageLogOrderBy(params pagination.PaginationParams) string {
|
|||||||
sortBy := strings.ToLower(strings.TrimSpace(params.SortBy))
|
sortBy := strings.ToLower(strings.TrimSpace(params.SortBy))
|
||||||
sortOrder := strings.ToUpper(params.NormalizedSortOrder(pagination.SortOrderDesc))
|
sortOrder := strings.ToUpper(params.NormalizedSortOrder(pagination.SortOrderDesc))
|
||||||
|
|
||||||
column := "id"
|
var column string
|
||||||
switch sortBy {
|
switch sortBy {
|
||||||
case "model":
|
case "model":
|
||||||
column = "COALESCE(NULLIF(TRIM(requested_model), ''), model)"
|
column = "COALESCE(NULLIF(TRIM(requested_model), ''), model)"
|
||||||
case "created_at":
|
case "created_at":
|
||||||
column = "created_at"
|
column = "created_at"
|
||||||
case "id", "":
|
|
||||||
column = "id"
|
|
||||||
default:
|
default:
|
||||||
column = "id"
|
column = "id"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1109,14 +1109,6 @@ func normalizeTablePreferences(defaultPageSize int, options []int) (int, []int)
|
|||||||
return defaultPageSize, normalizedOptions
|
return defaultPageSize, normalizedOptions
|
||||||
}
|
}
|
||||||
|
|
||||||
func containsInt(values []int, target int) bool {
|
|
||||||
for _, value := range values {
|
|
||||||
if value == target {
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
// getStringOrDefault 获取字符串值或默认值
|
// getStringOrDefault 获取字符串值或默认值
|
||||||
func (s *SettingService) getStringOrDefault(settings map[string]string, key, defaultValue string) string {
|
func (s *SettingService) getStringOrDefault(settings map[string]string, key, defaultValue string) string {
|
||||||
|
|||||||
Reference in New Issue
Block a user