refactor(log): consolidate logging models and update related logic for improved clarity and functionality
This commit is contained in:
@@ -3,13 +3,13 @@ package user
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/perfect-panel/server/internal/model/log"
|
||||
"github.com/perfect-panel/server/pkg/constant"
|
||||
|
||||
"github.com/perfect-panel/server/internal/model/user"
|
||||
"github.com/perfect-panel/server/internal/svc"
|
||||
"github.com/perfect-panel/server/internal/types"
|
||||
"github.com/perfect-panel/server/pkg/logger"
|
||||
"github.com/perfect-panel/server/pkg/tool"
|
||||
"github.com/perfect-panel/server/pkg/xerr"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
@@ -35,15 +35,34 @@ func (l *GetSubscribeLogLogic) GetSubscribeLog(req *types.GetSubscribeLogRequest
|
||||
logger.Error("current user is not found in context")
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.InvalidAccess), "Invalid Access")
|
||||
}
|
||||
data, total, err := l.svcCtx.UserModel.FilterSubscribeLogList(l.ctx, req.Page, req.Size, &user.SubscribeLogFilterParams{
|
||||
UserId: u.Id,
|
||||
data, total, err := l.svcCtx.LogModel.FilterSystemLog(l.ctx, &log.FilterParams{
|
||||
Page: req.Page,
|
||||
Size: req.Size,
|
||||
Type: log.TypeSubscribe.Uint8(),
|
||||
ObjectID: u.Id,
|
||||
})
|
||||
if err != nil {
|
||||
l.Errorw("[GetUserSubscribeLogs] Get User Subscribe Logs Error:", logger.Field("err", err.Error()))
|
||||
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "Get User Subscribe Logs Error")
|
||||
}
|
||||
var list []types.UserSubscribeLog
|
||||
tool.DeepCopy(&list, data)
|
||||
|
||||
for _, item := range data {
|
||||
var content log.Subscribe
|
||||
if err = content.Unmarshal([]byte(item.Content)); err != nil {
|
||||
l.Errorf("[GetUserSubscribeLogs] unmarshal subscribe log content failed: %v", err.Error())
|
||||
continue
|
||||
}
|
||||
list = append(list, types.UserSubscribeLog{
|
||||
Id: item.Id,
|
||||
UserId: item.ObjectID,
|
||||
UserSubscribeId: content.SubscribeId,
|
||||
Token: content.Token,
|
||||
IP: content.ClientIP,
|
||||
UserAgent: content.UserAgent,
|
||||
CreatedAt: item.CreatedAt.UnixMilli(),
|
||||
})
|
||||
}
|
||||
|
||||
return &types.GetSubscribeLogResponse{
|
||||
List: list,
|
||||
|
||||
Reference in New Issue
Block a user