refactor(log): remove Reset Subscribe Traffic Log endpoint and related types
This commit is contained in:
parent
062533412a
commit
6b1b365734
@ -35,15 +35,6 @@ type (
|
|||||||
Amount int64 `json:"amount"`
|
Amount int64 `json:"amount"`
|
||||||
CreatedAt int64 `json:"created_at"`
|
CreatedAt int64 `json:"created_at"`
|
||||||
}
|
}
|
||||||
ResetSubscribeTrafficLogRequest {
|
|
||||||
Page int `form:"page"`
|
|
||||||
Size int `form:"size"`
|
|
||||||
UserSubscribeId int64 `form:"user_subscribe_id"`
|
|
||||||
}
|
|
||||||
ResetSubscribeTrafficLogResponse {
|
|
||||||
List []ResetSubscribeTrafficLog `json:"list"`
|
|
||||||
Total int64 `json:"total"`
|
|
||||||
}
|
|
||||||
QueryUserCommissionLogListRequest {
|
QueryUserCommissionLogListRequest {
|
||||||
Page int `form:"page"`
|
Page int `form:"page"`
|
||||||
Size int `form:"size"`
|
Size int `form:"size"`
|
||||||
@ -145,10 +136,6 @@ service ppanel {
|
|||||||
@handler Unsubscribe
|
@handler Unsubscribe
|
||||||
post /unsubscribe (UnsubscribeRequest)
|
post /unsubscribe (UnsubscribeRequest)
|
||||||
|
|
||||||
@doc "Reset Subscribe Traffic Log"
|
|
||||||
@handler ResetSubscribeTrafficLog
|
|
||||||
get /subscribe/reset/log (ResetSubscribeTrafficLogRequest) returns (ResetSubscribeTrafficLogResponse)
|
|
||||||
|
|
||||||
@doc "Query User Balance Log"
|
@doc "Query User Balance Log"
|
||||||
@handler QueryUserBalanceLog
|
@handler QueryUserBalanceLog
|
||||||
get /balance_log returns (QueryUserBalanceLogListResponse)
|
get /balance_log returns (QueryUserBalanceLogListResponse)
|
||||||
|
|||||||
@ -1,26 +0,0 @@
|
|||||||
package user
|
|
||||||
|
|
||||||
import (
|
|
||||||
"github.com/gin-gonic/gin"
|
|
||||||
"github.com/perfect-panel/server/internal/logic/public/user"
|
|
||||||
"github.com/perfect-panel/server/internal/svc"
|
|
||||||
"github.com/perfect-panel/server/internal/types"
|
|
||||||
"github.com/perfect-panel/server/pkg/result"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Reset Subscribe Traffic Log
|
|
||||||
func ResetSubscribeTrafficLogHandler(svcCtx *svc.ServiceContext) func(c *gin.Context) {
|
|
||||||
return func(c *gin.Context) {
|
|
||||||
var req types.ResetSubscribeTrafficLogRequest
|
|
||||||
_ = c.ShouldBind(&req)
|
|
||||||
validateErr := svcCtx.Validate(&req)
|
|
||||||
if validateErr != nil {
|
|
||||||
result.ParamErrorResult(c, validateErr)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
l := user.NewResetSubscribeTrafficLogLogic(c.Request.Context(), svcCtx)
|
|
||||||
resp, err := l.ResetSubscribeTrafficLog(&req)
|
|
||||||
result.HttpResult(c, resp, err)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -762,9 +762,6 @@ func RegisterHandlers(router *gin.Engine, serverCtx *svc.ServiceContext) {
|
|||||||
// Query User Subscribe
|
// Query User Subscribe
|
||||||
publicUserGroupRouter.GET("/subscribe", publicUser.QueryUserSubscribeHandler(serverCtx))
|
publicUserGroupRouter.GET("/subscribe", publicUser.QueryUserSubscribeHandler(serverCtx))
|
||||||
|
|
||||||
// Reset Subscribe Traffic Log
|
|
||||||
publicUserGroupRouter.GET("/subscribe/reset/log", publicUser.ResetSubscribeTrafficLogHandler(serverCtx))
|
|
||||||
|
|
||||||
// Get Subscribe Log
|
// Get Subscribe Log
|
||||||
publicUserGroupRouter.GET("/subscribe_log", publicUser.GetSubscribeLogHandler(serverCtx))
|
publicUserGroupRouter.GET("/subscribe_log", publicUser.GetSubscribeLogHandler(serverCtx))
|
||||||
|
|
||||||
|
|||||||
@ -1,63 +0,0 @@
|
|||||||
package user
|
|
||||||
|
|
||||||
import (
|
|
||||||
"context"
|
|
||||||
|
|
||||||
"github.com/perfect-panel/server/internal/model/log"
|
|
||||||
"github.com/perfect-panel/server/pkg/xerr"
|
|
||||||
"github.com/pkg/errors"
|
|
||||||
|
|
||||||
"github.com/perfect-panel/server/internal/svc"
|
|
||||||
"github.com/perfect-panel/server/internal/types"
|
|
||||||
"github.com/perfect-panel/server/pkg/logger"
|
|
||||||
)
|
|
||||||
|
|
||||||
type ResetSubscribeTrafficLogLogic struct {
|
|
||||||
logger.Logger
|
|
||||||
ctx context.Context
|
|
||||||
svcCtx *svc.ServiceContext
|
|
||||||
}
|
|
||||||
|
|
||||||
// NewResetSubscribeTrafficLogLogic Reset Subscribe Traffic Log
|
|
||||||
func NewResetSubscribeTrafficLogLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ResetSubscribeTrafficLogLogic {
|
|
||||||
return &ResetSubscribeTrafficLogLogic{
|
|
||||||
Logger: logger.WithContext(ctx),
|
|
||||||
ctx: ctx,
|
|
||||||
svcCtx: svcCtx,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (l *ResetSubscribeTrafficLogLogic) ResetSubscribeTrafficLog(req *types.ResetSubscribeTrafficLogRequest) (resp *types.ResetSubscribeTrafficLogResponse, err error) {
|
|
||||||
data, total, err := l.svcCtx.LogModel.FilterSystemLog(l.ctx, &log.FilterParams{
|
|
||||||
Page: req.Page,
|
|
||||||
Size: req.Size,
|
|
||||||
Type: log.TypeResetSubscribe.Uint8(),
|
|
||||||
ObjectID: req.UserSubscribeId,
|
|
||||||
})
|
|
||||||
if err != nil {
|
|
||||||
l.Errorf("[ResetSubscribeTrafficLog] failed to filter system log: %v", err)
|
|
||||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "FilterSystemLog failed, err: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
var list []types.ResetSubscribeTrafficLog
|
|
||||||
|
|
||||||
for _, item := range data {
|
|
||||||
var content log.ResetSubscribe
|
|
||||||
if err = content.Unmarshal([]byte(item.Content)); err != nil {
|
|
||||||
l.Errorf("[ResetSubscribeTrafficLog] failed to unmarshal log: %v", err)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
list = append(list, types.ResetSubscribeTrafficLog{
|
|
||||||
Id: item.Id,
|
|
||||||
Type: content.Type,
|
|
||||||
OrderNo: content.OrderNo,
|
|
||||||
ResetAt: content.ResetAt,
|
|
||||||
UserSubscribeId: item.ObjectID,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
return &types.ResetSubscribeTrafficLogResponse{
|
|
||||||
Total: total,
|
|
||||||
List: list,
|
|
||||||
}, nil
|
|
||||||
}
|
|
||||||
@ -1435,17 +1435,6 @@ type ResetSubscribeTrafficLog struct {
|
|||||||
ResetAt int64 `json:"reset_at"`
|
ResetAt int64 `json:"reset_at"`
|
||||||
}
|
}
|
||||||
|
|
||||||
type ResetSubscribeTrafficLogRequest struct {
|
|
||||||
Page int `form:"page"`
|
|
||||||
Size int `form:"size"`
|
|
||||||
UserSubscribeId int64 `form:"user_subscribe_id"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type ResetSubscribeTrafficLogResponse struct {
|
|
||||||
List []ResetSubscribeTrafficLog `json:"list"`
|
|
||||||
Total int64 `json:"total"`
|
|
||||||
}
|
|
||||||
|
|
||||||
type ResetTrafficOrderRequest struct {
|
type ResetTrafficOrderRequest struct {
|
||||||
UserSubscribeID int64 `json:"user_subscribe_id"`
|
UserSubscribeID int64 `json:"user_subscribe_id"`
|
||||||
Payment int64 `json:"payment"`
|
Payment int64 `json:"payment"`
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user