feat: 添加用户和租户状态管理功能,包括状态列表和状态更新接口
This commit is contained in:
@@ -3,6 +3,7 @@ package dto
|
||||
import (
|
||||
"quyun/v2/app/requests"
|
||||
"quyun/v2/database/models"
|
||||
"quyun/v2/pkg/consts"
|
||||
)
|
||||
|
||||
type UserPageFilter struct {
|
||||
@@ -18,3 +19,7 @@ type UserItem struct {
|
||||
|
||||
StatusDescription string `json:"status_description,omitempty"`
|
||||
}
|
||||
|
||||
type UserStatusUpdateForm struct {
|
||||
Status consts.UserStatus `json:"status" validate:"required,oneof=normal disabled"`
|
||||
}
|
||||
|
||||
@@ -52,6 +52,10 @@ func (r *Routes) Register(router fiber.Router) {
|
||||
r.tenant.list,
|
||||
Query[dto.TenantFilter]("filter"),
|
||||
))
|
||||
r.log.Debugf("Registering route: Get /super/v1/tenants/statuses -> tenant.statusList")
|
||||
router.Get("/super/v1/tenants/statuses", DataFunc0(
|
||||
r.tenant.statusList,
|
||||
))
|
||||
r.log.Debugf("Registering route: Patch /super/v1/tenants/:tenantID -> tenant.updateExpire")
|
||||
router.Patch("/super/v1/tenants/:tenantID", Func2(
|
||||
r.tenant.updateExpire,
|
||||
@@ -70,6 +74,16 @@ func (r *Routes) Register(router fiber.Router) {
|
||||
r.user.list,
|
||||
Query[dto.UserPageFilter]("filter"),
|
||||
))
|
||||
r.log.Debugf("Registering route: Get /super/v1/users/statuses -> user.statusList")
|
||||
router.Get("/super/v1/users/statuses", DataFunc0(
|
||||
r.user.statusList,
|
||||
))
|
||||
r.log.Debugf("Registering route: Patch /super/v1/users/:userID/status -> user.updateStatus")
|
||||
router.Patch("/super/v1/users/:userID/status", Func2(
|
||||
r.user.updateStatus,
|
||||
PathParam[int64]("userID"),
|
||||
Body[dto.UserStatusUpdateForm]("form"),
|
||||
))
|
||||
|
||||
r.log.Info("Successfully registered all routes")
|
||||
}
|
||||
|
||||
@@ -5,8 +5,10 @@ import (
|
||||
"quyun/v2/app/http/super/dto"
|
||||
"quyun/v2/app/requests"
|
||||
"quyun/v2/app/services"
|
||||
"quyun/v2/pkg/consts"
|
||||
|
||||
"github.com/gofiber/fiber/v3"
|
||||
"github.com/samber/lo"
|
||||
)
|
||||
|
||||
// @provider
|
||||
@@ -63,3 +65,20 @@ func (*tenant) updateExpire(ctx fiber.Ctx, tenantID int64, form *dto.TenantExpir
|
||||
func (*tenant) updateStatus(ctx fiber.Ctx, tenantID int64, form *dto.TenantStatusUpdateForm) error {
|
||||
return services.Tenant.UpdateStatus(ctx, tenantID, form.Status)
|
||||
}
|
||||
|
||||
// statusList
|
||||
//
|
||||
// @Summary 租户状态列表
|
||||
// @Tags Super
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Success 200 {array} requests.KV
|
||||
//
|
||||
// @Router /super/v1/tenants/statuses [get]
|
||||
// @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
|
||||
}
|
||||
|
||||
@@ -5,8 +5,10 @@ import (
|
||||
"quyun/v2/app/requests"
|
||||
"quyun/v2/app/services"
|
||||
_ "quyun/v2/database/models"
|
||||
"quyun/v2/pkg/consts"
|
||||
|
||||
"github.com/gofiber/fiber/v3"
|
||||
"github.com/samber/lo"
|
||||
)
|
||||
|
||||
// @provider
|
||||
@@ -26,3 +28,36 @@ type user struct{}
|
||||
func (*user) list(ctx fiber.Ctx, filter *dto.UserPageFilter) (*requests.Pager, error) {
|
||||
return services.User.Page(ctx, filter)
|
||||
}
|
||||
|
||||
// updateStatus
|
||||
//
|
||||
// @Summary 更新用户状态
|
||||
// @Tags Super
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Param userID path int64 true "UserID"
|
||||
// @Param form body dto.UserStatusUpdateForm true "Form"
|
||||
//
|
||||
// @Router /super/v1/users/:userID/status [patch]
|
||||
// @Bind userID path
|
||||
// @Bind form body
|
||||
func (*user) updateStatus(ctx fiber.Ctx, userID int64, form *dto.UserStatusUpdateForm) error {
|
||||
return services.User.UpdateStatus(ctx, userID, form.Status)
|
||||
}
|
||||
|
||||
// statusList
|
||||
//
|
||||
// @Summary 用户状态列表
|
||||
// @Tags Super
|
||||
// @Accept json
|
||||
// @Produce json
|
||||
// @Success 200 {array} requests.KV
|
||||
//
|
||||
// @Router /super/v1/users/statuses [get]
|
||||
// @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
|
||||
}
|
||||
|
||||
10
backend/app/requests/label.go
Normal file
10
backend/app/requests/label.go
Normal file
@@ -0,0 +1,10 @@
|
||||
package requests
|
||||
|
||||
type KV struct {
|
||||
Key string `json:"key,omitempty"`
|
||||
Value any `json:"value,omitempty"`
|
||||
}
|
||||
|
||||
func NewKV(k string, v any) KV {
|
||||
return KV{Key: k, Value: v}
|
||||
}
|
||||
@@ -10,6 +10,7 @@ import (
|
||||
|
||||
"github.com/pkg/errors"
|
||||
"github.com/samber/lo"
|
||||
"github.com/sirupsen/logrus"
|
||||
"go.ipao.vip/gen"
|
||||
)
|
||||
|
||||
@@ -88,3 +89,21 @@ func (t *user) Page(ctx context.Context, filter *dto.UserPageFilter) (*requests.
|
||||
Items: items,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// UpdateStatus
|
||||
func (t *user) UpdateStatus(ctx context.Context, userID int64, status consts.UserStatus) error {
|
||||
logrus.WithField("user_id", userID).WithField("status", status).Info("update user status")
|
||||
|
||||
m, err := t.FindByID(ctx, userID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
m.Status = status
|
||||
_, err = m.Update(ctx)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user