From 6b1b365734f3711648a449c23bfcee8708e3dbfa Mon Sep 17 00:00:00 2001 From: Chang lue Tsen Date: Thu, 21 Aug 2025 11:19:45 -0400 Subject: [PATCH] refactor(log): remove Reset Subscribe Traffic Log endpoint and related types --- apis/public/user.api | 13 ---- .../user/resetSubscribeTrafficLogHandler.go | 26 -------- internal/handler/routes.go | 3 - .../user/resetSubscribeTrafficLogLogic.go | 63 ------------------- internal/types/types.go | 11 ---- 5 files changed, 116 deletions(-) delete mode 100644 internal/handler/public/user/resetSubscribeTrafficLogHandler.go delete mode 100644 internal/logic/public/user/resetSubscribeTrafficLogLogic.go diff --git a/apis/public/user.api b/apis/public/user.api index 6b94ad8..66c8d08 100644 --- a/apis/public/user.api +++ b/apis/public/user.api @@ -35,15 +35,6 @@ type ( Amount int64 `json:"amount"` 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 { Page int `form:"page"` Size int `form:"size"` @@ -145,10 +136,6 @@ service ppanel { @handler Unsubscribe post /unsubscribe (UnsubscribeRequest) - @doc "Reset Subscribe Traffic Log" - @handler ResetSubscribeTrafficLog - get /subscribe/reset/log (ResetSubscribeTrafficLogRequest) returns (ResetSubscribeTrafficLogResponse) - @doc "Query User Balance Log" @handler QueryUserBalanceLog get /balance_log returns (QueryUserBalanceLogListResponse) diff --git a/internal/handler/public/user/resetSubscribeTrafficLogHandler.go b/internal/handler/public/user/resetSubscribeTrafficLogHandler.go deleted file mode 100644 index 20a047b..0000000 --- a/internal/handler/public/user/resetSubscribeTrafficLogHandler.go +++ /dev/null @@ -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) - } -} diff --git a/internal/handler/routes.go b/internal/handler/routes.go index 642e31b..8f28dab 100644 --- a/internal/handler/routes.go +++ b/internal/handler/routes.go @@ -762,9 +762,6 @@ func RegisterHandlers(router *gin.Engine, serverCtx *svc.ServiceContext) { // Query User Subscribe publicUserGroupRouter.GET("/subscribe", publicUser.QueryUserSubscribeHandler(serverCtx)) - // Reset Subscribe Traffic Log - publicUserGroupRouter.GET("/subscribe/reset/log", publicUser.ResetSubscribeTrafficLogHandler(serverCtx)) - // Get Subscribe Log publicUserGroupRouter.GET("/subscribe_log", publicUser.GetSubscribeLogHandler(serverCtx)) diff --git a/internal/logic/public/user/resetSubscribeTrafficLogLogic.go b/internal/logic/public/user/resetSubscribeTrafficLogLogic.go deleted file mode 100644 index a5e1aa8..0000000 --- a/internal/logic/public/user/resetSubscribeTrafficLogLogic.go +++ /dev/null @@ -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 -} diff --git a/internal/types/types.go b/internal/types/types.go index 1127d89..f6221fe 100644 --- a/internal/types/types.go +++ b/internal/types/types.go @@ -1435,17 +1435,6 @@ type ResetSubscribeTrafficLog struct { 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 { UserSubscribeID int64 `json:"user_subscribe_id"` Payment int64 `json:"payment"`