Client/server
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(subscribe): improve logging and update query logic for server filtering

Browse Source
This commit is contained in:
Chang lue Tsen 2025-05-31 09:30:13 -04:00
parent 77f55f8708
commit ddf740600f
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/logic/subscribe/subscribeLogic.go
View File

@ -117,9 +117,12 @@ func (l *SubscribeLogic) getServers(userSub *user.Subscribe) ([]*server.Server,
serverIds := tool.StringToInt64Slice(subDetails.Server) serverIds := tool.StringToInt64Slice(subDetails.Server)
groupIds := tool.StringToInt64Slice(subDetails.ServerGroup) groupIds := tool.StringToInt64Slice(subDetails.ServerGroup)
logger.Debugf("[Generate Subscribe]serverIds: %v, groupIds: %v", serverIds, groupIds) l.Debugf("[Generate Subscribe]serverIds: %v, groupIds: %v", serverIds, groupIds)
servers, err := l.svc.ServerModel.FindServerDetailByGroupIdsAndIds(l.ctx.Request.Context(), groupIds, serverIds) servers, err := l.svc.ServerModel.FindServerDetailByGroupIdsAndIds(l.ctx.Request.Context(), groupIds, serverIds)
l.Debugf("[Query Subscribe]found servers: %v", len(servers))
if err != nil { if err != nil {
l.Errorw("[Generate Subscribe]find server details error: %v", logger.Field("error", err.Error())) l.Errorw("[Generate Subscribe]find server details error: %v", logger.Field("error", err.Error()))
return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find server details error: %v", err.Error()) return nil, errors.Wrapf(xerr.NewErrCode(xerr.DatabaseQueryError), "find server details error: %v", err.Error())

15
internal/model/server/model.go
View File

@ -117,13 +117,16 @@ func (m *customServerModel) FindServerDetailByGroupIdsAndIds(ctx context.Context
err := m.QueryNoCacheCtx(ctx, &list, func(conn *gorm.DB, v interface{}) error { err := m.QueryNoCacheCtx(ctx, &list, func(conn *gorm.DB, v interface{}) error {
conn = conn. conn = conn.
Model(&Server{}). Model(&Server{}).
Where("enable = ?", true) Where("`enable` = ?", true)
if len(groupId) > 0 { if len(groupId) > 0 && len(ids) > 0 {
conn = conn.Or("group_id IN ?", groupId) // OR is used to connect group_id and id conditions
} conn = conn.Where("(`group_id` IN ? OR `id` IN ?)", groupId, ids)
if len(ids) > 0 { } else if len(groupId) > 0 {
conn = conn.Where("id IN ?", ids) conn = conn.Where("`group_id` IN ?", groupId)
} else if len(ids) > 0 {
conn = conn.Where("`id` IN ?", ids)
} }
return conn.Order("sort ASC").Find(v).Error return conn.Order("sort ASC").Find(v).Error
}) })
return list, err return list, err