diff --git a/backend/app/http/super/tenant.go b/backend/app/http/super/tenant.go index 6f9c999..54be804 100644 --- a/backend/app/http/super/tenant.go +++ b/backend/app/http/super/tenant.go @@ -8,7 +8,6 @@ import ( "quyun/v2/pkg/consts" "github.com/gofiber/fiber/v3" - "github.com/samber/lo" ) // @provider @@ -78,7 +77,5 @@ func (*tenant) updateStatus(ctx fiber.Ctx, tenantID int64, form *dto.TenantStatu // @Bind userID path // @Bind form body func (*tenant) statusList(ctx fiber.Ctx) ([]requests.KV, error) { - return lo.Map(consts.TenantStatusValues(), func(item consts.TenantStatus, _ int) requests.KV { - return requests.NewKV(item.String(), item.Description()) - }), nil + return consts.TenantStatusItems(), nil } diff --git a/backend/app/http/super/user.go b/backend/app/http/super/user.go index 6018a96..e54b3b6 100644 --- a/backend/app/http/super/user.go +++ b/backend/app/http/super/user.go @@ -8,7 +8,6 @@ import ( "quyun/v2/pkg/consts" "github.com/gofiber/fiber/v3" - "github.com/samber/lo" ) // @provider @@ -57,9 +56,7 @@ func (*user) updateStatus(ctx fiber.Ctx, userID int64, form *dto.UserStatusUpdat // @Bind userID path // @Bind form body func (*user) statusList(ctx fiber.Ctx) ([]requests.KV, error) { - return lo.Map(consts.UserStatusValues(), func(item consts.UserStatus, _ int) requests.KV { - return requests.NewKV(item.String(), item.Description()) - }), nil + return consts.UserStatusItems(), nil } // statistics diff --git a/backend/pkg/consts/consts.go b/backend/pkg/consts/consts.go index 016e5ce..ffe6398 100644 --- a/backend/pkg/consts/consts.go +++ b/backend/pkg/consts/consts.go @@ -25,8 +25,8 @@ func (t Role) Description() string { } } -// Items returns the KV list for FE dropdowns. -func (Role) Items() []requests.KV { +// RoleItems returns the KV list for FE dropdowns. +func RoleItems() []requests.KV { values := RoleValues() items := make([]requests.KV, 0, len(values)) for _, v := range values { @@ -53,8 +53,8 @@ func (t UserStatus) Description() string { } } -// Items returns the KV list for FE dropdowns. -func (UserStatus) Items() []requests.KV { +// UserStatusItems returns the KV list for FE dropdowns. +func UserStatusItems() []requests.KV { values := UserStatusValues() items := make([]requests.KV, 0, len(values)) for _, v := range values { @@ -83,8 +83,8 @@ func (t TenantStatus) Description() string { } } -// Items returns the KV list for FE dropdowns. -func (TenantStatus) Items() []requests.KV { +// TenantStatusItems returns the KV list for FE dropdowns. +func TenantStatusItems() []requests.KV { values := TenantStatusValues() items := make([]requests.KV, 0, len(values)) for _, v := range values { @@ -109,8 +109,8 @@ func (t TenantUserRole) Description() string { } } -// Items returns the KV list for FE dropdowns. -func (TenantUserRole) Items() []requests.KV { +// TenantUserRoleItems returns the KV list for FE dropdowns. +func TenantUserRoleItems() []requests.KV { values := TenantUserRoleValues() items := make([]requests.KV, 0, len(values)) for _, v := range values { @@ -139,8 +139,8 @@ func (t MediaAssetType) Description() string { } } -// Items returns the KV list for FE dropdowns. -func (MediaAssetType) Items() []requests.KV { +// MediaAssetTypeItems returns the KV list for FE dropdowns. +func MediaAssetTypeItems() []requests.KV { values := MediaAssetTypeValues() items := make([]requests.KV, 0, len(values)) for _, v := range values { @@ -171,8 +171,8 @@ func (t MediaAssetStatus) Description() string { } } -// Items returns the KV list for FE dropdowns. -func (MediaAssetStatus) Items() []requests.KV { +// MediaAssetStatusItems returns the KV list for FE dropdowns. +func MediaAssetStatusItems() []requests.KV { values := MediaAssetStatusValues() items := make([]requests.KV, 0, len(values)) for _, v := range values { @@ -205,8 +205,8 @@ func (t ContentStatus) Description() string { } } -// Items returns the KV list for FE dropdowns. -func (ContentStatus) Items() []requests.KV { +// ContentStatusItems returns the KV list for FE dropdowns. +func ContentStatusItems() []requests.KV { values := ContentStatusValues() items := make([]requests.KV, 0, len(values)) for _, v := range values { @@ -233,8 +233,8 @@ func (t ContentVisibility) Description() string { } } -// Items returns the KV list for FE dropdowns. -func (ContentVisibility) Items() []requests.KV { +// ContentVisibilityItems returns the KV list for FE dropdowns. +func ContentVisibilityItems() []requests.KV { values := ContentVisibilityValues() items := make([]requests.KV, 0, len(values)) for _, v := range values { @@ -261,8 +261,8 @@ func (t ContentAssetRole) Description() string { } } -// Items returns the KV list for FE dropdowns. -func (ContentAssetRole) Items() []requests.KV { +// ContentAssetRoleItems returns the KV list for FE dropdowns. +func ContentAssetRoleItems() []requests.KV { values := ContentAssetRoleValues() items := make([]requests.KV, 0, len(values)) for _, v := range values { @@ -297,8 +297,8 @@ func (t DiscountType) Description() string { } } -// Items returns the KV list for FE dropdowns. -func (DiscountType) Items() []requests.KV { +// DiscountTypeItems returns the KV list for FE dropdowns. +func DiscountTypeItems() []requests.KV { values := DiscountTypeValues() items := make([]requests.KV, 0, len(values)) for _, v := range values { @@ -321,8 +321,8 @@ func (t Currency) Description() string { } } -// Items returns the KV list for FE dropdowns. -func (Currency) Items() []requests.KV { +// CurrencyItems returns the KV list for FE dropdowns. +func CurrencyItems() []requests.KV { values := CurrencyValues() items := make([]requests.KV, 0, len(values)) for _, v := range values { @@ -351,8 +351,8 @@ func (t ContentAccessStatus) Description() string { } } -// Items returns the KV list for FE dropdowns. -func (ContentAccessStatus) Items() []requests.KV { +// ContentAccessStatusItems returns the KV list for FE dropdowns. +func ContentAccessStatusItems() []requests.KV { values := ContentAccessStatusValues() items := make([]requests.KV, 0, len(values)) for _, v := range values {