Refactor order and tenant ledger models to use consts for Currency and Type fields; add new UserStatus values; implement comprehensive test cases for content, creator, order, super, and wallet services.
This commit is contained in:
@@ -2,15 +2,24 @@ package services
|
||||
|
||||
import (
|
||||
"context"
|
||||
"time"
|
||||
|
||||
"quyun/v2/app/errorx"
|
||||
super_dto "quyun/v2/app/http/v1/dto"
|
||||
"quyun/v2/app/requests"
|
||||
"quyun/v2/database/models"
|
||||
"quyun/v2/pkg/consts"
|
||||
|
||||
"github.com/google/uuid"
|
||||
"github.com/spf13/cast"
|
||||
"go.ipao.vip/gen/types"
|
||||
)
|
||||
|
||||
// @provider
|
||||
type super struct{}
|
||||
|
||||
func (s *super) Login(ctx context.Context, form *super_dto.LoginForm) (*super_dto.LoginResponse, error) {
|
||||
// TODO: Admin specific login or reuse User service
|
||||
return &super_dto.LoginResponse{}, nil
|
||||
}
|
||||
|
||||
@@ -19,51 +28,236 @@ func (s *super) CheckToken(ctx context.Context) (*super_dto.LoginResponse, error
|
||||
}
|
||||
|
||||
func (s *super) ListUsers(ctx context.Context, page, limit int, username string) (*requests.Pager, error) {
|
||||
return &requests.Pager{}, nil
|
||||
tbl, q := models.UserQuery.QueryContext(ctx)
|
||||
if username != "" {
|
||||
q = q.Where(tbl.Username.Like("%" + username + "%")).Or(tbl.Nickname.Like("%" + username + "%"))
|
||||
}
|
||||
|
||||
p := requests.Pagination{Page: int64(page), Limit: int64(limit)}
|
||||
total, err := q.Count()
|
||||
if err != nil {
|
||||
return nil, errorx.ErrDatabaseError
|
||||
}
|
||||
|
||||
list, err := q.Offset(int(p.Offset())).Limit(int(p.Limit)).Order(tbl.ID.Desc()).Find()
|
||||
if err != nil {
|
||||
return nil, errorx.ErrDatabaseError
|
||||
}
|
||||
|
||||
var data []super_dto.UserItem
|
||||
for _, u := range list {
|
||||
data = append(data, super_dto.UserItem{
|
||||
SuperUserLite: super_dto.SuperUserLite{
|
||||
ID: u.ID,
|
||||
Username: u.Username,
|
||||
Roles: u.Roles,
|
||||
Status: u.Status,
|
||||
// StatusDescription: u.Status.Description(), // Status is consts.UserStatus, it has Description()
|
||||
// But u.Status might be string if gen didn't map it properly? No, it's consts.UserStatus.
|
||||
StatusDescription: u.Status.Description(),
|
||||
CreatedAt: u.CreatedAt.Format(time.RFC3339),
|
||||
UpdatedAt: u.UpdatedAt.Format(time.RFC3339),
|
||||
},
|
||||
Balance: u.Balance,
|
||||
BalanceFrozen: u.BalanceFrozen,
|
||||
})
|
||||
}
|
||||
|
||||
return &requests.Pager{
|
||||
Pagination: p,
|
||||
Total: total,
|
||||
Items: data,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (s *super) GetUser(ctx context.Context, id int64) (*super_dto.UserItem, error) {
|
||||
return &super_dto.UserItem{}, nil
|
||||
tbl, q := models.UserQuery.QueryContext(ctx)
|
||||
u, err := q.Where(tbl.ID.Eq(id)).First()
|
||||
if err != nil {
|
||||
return nil, errorx.ErrRecordNotFound
|
||||
}
|
||||
return &super_dto.UserItem{
|
||||
SuperUserLite: super_dto.SuperUserLite{
|
||||
ID: u.ID,
|
||||
Username: u.Username,
|
||||
Roles: u.Roles,
|
||||
Status: u.Status,
|
||||
StatusDescription: u.Status.Description(),
|
||||
CreatedAt: u.CreatedAt.Format(time.RFC3339),
|
||||
UpdatedAt: u.UpdatedAt.Format(time.RFC3339),
|
||||
},
|
||||
Balance: u.Balance,
|
||||
BalanceFrozen: u.BalanceFrozen,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (s *super) UpdateUserStatus(ctx context.Context, id int64, form *super_dto.UserStatusUpdateForm) error {
|
||||
tbl, q := models.UserQuery.QueryContext(ctx)
|
||||
_, err := q.Where(tbl.ID.Eq(id)).Update(tbl.Status, consts.UserStatus(form.Status))
|
||||
if err != nil {
|
||||
return errorx.ErrDatabaseError
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *super) UpdateUserRoles(ctx context.Context, id int64, form *super_dto.UserRolesUpdateForm) error {
|
||||
var roles types.Array[consts.Role]
|
||||
for _, r := range form.Roles {
|
||||
roles = append(roles, r)
|
||||
}
|
||||
tbl, q := models.UserQuery.QueryContext(ctx)
|
||||
_, err := q.Where(tbl.ID.Eq(id)).Update(tbl.Roles, roles)
|
||||
if err != nil {
|
||||
return errorx.ErrDatabaseError
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *super) ListTenants(ctx context.Context, page, limit int, name string) (*requests.Pager, error) {
|
||||
return &requests.Pager{}, nil
|
||||
tbl, q := models.TenantQuery.QueryContext(ctx)
|
||||
if name != "" {
|
||||
q = q.Where(tbl.Name.Like("%" + name + "%"))
|
||||
}
|
||||
|
||||
p := requests.Pagination{Page: int64(page), Limit: int64(limit)}
|
||||
total, err := q.Count()
|
||||
if err != nil {
|
||||
return nil, errorx.ErrDatabaseError
|
||||
}
|
||||
|
||||
list, err := q.Offset(int(p.Offset())).Limit(int(p.Limit)).Order(tbl.ID.Desc()).Find()
|
||||
if err != nil {
|
||||
return nil, errorx.ErrDatabaseError
|
||||
}
|
||||
|
||||
var data []super_dto.TenantItem
|
||||
for _, t := range list {
|
||||
data = append(data, super_dto.TenantItem{
|
||||
ID: t.ID,
|
||||
UUID: t.UUID.String(),
|
||||
Name: t.Name,
|
||||
Code: t.Code,
|
||||
Status: t.Status,
|
||||
StatusDescription: t.Status.Description(),
|
||||
UserID: t.UserID,
|
||||
CreatedAt: t.CreatedAt.Format(time.RFC3339),
|
||||
UpdatedAt: t.UpdatedAt.Format(time.RFC3339),
|
||||
})
|
||||
}
|
||||
|
||||
return &requests.Pager{
|
||||
Pagination: p,
|
||||
Total: total,
|
||||
Items: data,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (s *super) CreateTenant(ctx context.Context, form *super_dto.TenantCreateForm) error {
|
||||
uid := cast.ToInt64(form.AdminUserID)
|
||||
if _, err := models.UserQuery.WithContext(ctx).Where(models.UserQuery.ID.Eq(uid)).First(); err != nil {
|
||||
return errorx.ErrRecordNotFound.WithMsg("用户不存在")
|
||||
}
|
||||
|
||||
t := &models.Tenant{
|
||||
UserID: uid,
|
||||
Name: form.Name,
|
||||
Code: form.Code,
|
||||
UUID: types.UUID(uuid.New()),
|
||||
Status: consts.TenantStatusVerified,
|
||||
}
|
||||
if err := models.TenantQuery.WithContext(ctx).Create(t); err != nil {
|
||||
return errorx.ErrDatabaseError
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *super) GetTenant(ctx context.Context, id int64) (*super_dto.TenantItem, error) {
|
||||
return &super_dto.TenantItem{}, nil
|
||||
tbl, q := models.TenantQuery.QueryContext(ctx)
|
||||
t, err := q.Where(tbl.ID.Eq(id)).First()
|
||||
if err != nil {
|
||||
return nil, errorx.ErrRecordNotFound
|
||||
}
|
||||
return &super_dto.TenantItem{
|
||||
ID: t.ID,
|
||||
UUID: t.UUID.String(),
|
||||
Name: t.Name,
|
||||
Code: t.Code,
|
||||
Status: t.Status,
|
||||
StatusDescription: t.Status.Description(),
|
||||
UserID: t.UserID,
|
||||
CreatedAt: t.CreatedAt.Format(time.RFC3339),
|
||||
UpdatedAt: t.UpdatedAt.Format(time.RFC3339),
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (s *super) UpdateTenantStatus(ctx context.Context, id int64, form *super_dto.TenantStatusUpdateForm) error {
|
||||
tbl, q := models.TenantQuery.QueryContext(ctx)
|
||||
_, err := q.Where(tbl.ID.Eq(id)).Update(tbl.Status, consts.TenantStatus(form.Status))
|
||||
if err != nil {
|
||||
return errorx.ErrDatabaseError
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *super) UpdateTenantExpire(ctx context.Context, id int64, form *super_dto.TenantExpireUpdateForm) error {
|
||||
expire := time.Now().AddDate(0, 0, form.Duration)
|
||||
tbl, q := models.TenantQuery.QueryContext(ctx)
|
||||
_, err := q.Where(tbl.ID.Eq(id)).Update(tbl.ExpiredAt, expire)
|
||||
if err != nil {
|
||||
return errorx.ErrDatabaseError
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *super) ListContents(ctx context.Context, page, limit int) (*requests.Pager, error) {
|
||||
return &requests.Pager{}, nil
|
||||
tbl, q := models.ContentQuery.QueryContext(ctx)
|
||||
p := requests.Pagination{Page: int64(page), Limit: int64(limit)}
|
||||
total, err := q.Count()
|
||||
if err != nil {
|
||||
return nil, errorx.ErrDatabaseError
|
||||
}
|
||||
list, err := q.Offset(int(p.Offset())).Limit(int(p.Limit)).Order(tbl.ID.Desc()).Find()
|
||||
if err != nil {
|
||||
return nil, errorx.ErrDatabaseError
|
||||
}
|
||||
// Simplified DTO for list
|
||||
var data []any
|
||||
for _, c := range list {
|
||||
data = append(data, c) // TODO: Map to DTO
|
||||
}
|
||||
return &requests.Pager{
|
||||
Pagination: p,
|
||||
Total: total,
|
||||
Items: data,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (s *super) UpdateContentStatus(ctx context.Context, tenantID, contentID int64, form *super_dto.SuperTenantContentStatusUpdateForm) error {
|
||||
tbl, q := models.ContentQuery.QueryContext(ctx)
|
||||
_, err := q.Where(tbl.ID.Eq(contentID), tbl.TenantID.Eq(tenantID)).Update(tbl.Status, consts.ContentStatus(form.Status))
|
||||
if err != nil {
|
||||
return errorx.ErrDatabaseError
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *super) ListOrders(ctx context.Context, page, limit int) (*requests.Pager, error) {
|
||||
return &requests.Pager{}, nil
|
||||
tbl, q := models.OrderQuery.QueryContext(ctx)
|
||||
p := requests.Pagination{Page: int64(page), Limit: int64(limit)}
|
||||
total, err := q.Count()
|
||||
if err != nil {
|
||||
return nil, errorx.ErrDatabaseError
|
||||
}
|
||||
list, err := q.Offset(int(p.Offset())).Limit(int(p.Limit)).Order(tbl.ID.Desc()).Find()
|
||||
if err != nil {
|
||||
return nil, errorx.ErrDatabaseError
|
||||
}
|
||||
// TODO: Map to DTO
|
||||
return &requests.Pager{
|
||||
Pagination: p,
|
||||
Total: total,
|
||||
Items: list,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (s *super) GetOrder(ctx context.Context, id int64) (*super_dto.SuperOrderDetail, error) {
|
||||
@@ -83,9 +277,9 @@ func (s *super) UserStatistics(ctx context.Context) ([]super_dto.UserStatistics,
|
||||
}
|
||||
|
||||
func (s *super) UserStatuses(ctx context.Context) ([]requests.KV, error) {
|
||||
return []requests.KV{}, nil
|
||||
return consts.UserStatusItems(), nil
|
||||
}
|
||||
|
||||
func (s *super) TenantStatuses(ctx context.Context) ([]requests.KV, error) {
|
||||
return []requests.KV{}, nil
|
||||
}
|
||||
return consts.TenantStatusItems(), nil
|
||||
}
|
||||
Reference in New Issue
Block a user