fix: 后台加人人数改为事务内实际插入数
This commit is contained in:
@@ -316,13 +316,6 @@ func (h *Handler) handleGroupAddMembers(w http.ResponseWriter, r *http.Request)
|
||||
return
|
||||
}
|
||||
|
||||
before, err := h.groupMemberCount(r.Context(), id)
|
||||
if err != nil {
|
||||
h.auditP(p, "group_add_members", id, "error", ip)
|
||||
httpx.WriteError(w, http.StatusInternalServerError, "internal", "内部错误")
|
||||
return
|
||||
}
|
||||
|
||||
res, err := h.groups.AdminAddMembers(r.Context(), id, req.MemberIDs)
|
||||
if err != nil {
|
||||
h.writeGroupErr(w, p, "group_add_members", id, ip, err)
|
||||
@@ -332,14 +325,7 @@ func (h *Handler) handleGroupAddMembers(w http.ResponseWriter, r *http.Request)
|
||||
if failed == nil {
|
||||
failed = []group.MemberFail{}
|
||||
}
|
||||
|
||||
after, err := h.groupMemberCount(r.Context(), id)
|
||||
if err != nil {
|
||||
h.auditP(p, "group_add_members", id, "error", ip)
|
||||
httpx.WriteError(w, http.StatusInternalServerError, "internal", "内部错误")
|
||||
return
|
||||
}
|
||||
added := after - before
|
||||
added := res.Added
|
||||
if added < 0 {
|
||||
added = 0
|
||||
}
|
||||
@@ -434,13 +420,6 @@ func (h *Handler) groupOwner(ctx context.Context, groupID string) (string, error
|
||||
return owner, err
|
||||
}
|
||||
|
||||
func (h *Handler) groupMemberCount(ctx context.Context, groupID string) (int, error) {
|
||||
var n int
|
||||
err := h.db.Read.QueryRowContext(ctx,
|
||||
`SELECT COUNT(*) FROM group_members WHERE group_id = ?`, groupID).Scan(&n)
|
||||
return n, err
|
||||
}
|
||||
|
||||
func (h *Handler) groupSummary(ctx context.Context, groupID string) (map[string]any, error) {
|
||||
var name, owner string
|
||||
var created int64
|
||||
|
||||
@@ -620,7 +620,7 @@ func (a *App) AdminAddMembers(ctx context.Context, groupID string, memberIDs []s
|
||||
failed = append(failed, MemberFail{ID: id, Code: protocol.CodeGroupFull})
|
||||
}
|
||||
if len(toAdd) == 0 {
|
||||
return AddResult{Failed: failed}, nil
|
||||
return AddResult{Failed: failed, Added: 0}, nil
|
||||
}
|
||||
now := a.nowMs()
|
||||
var inserted []string
|
||||
@@ -664,7 +664,7 @@ func (a *App) AdminAddMembers(ctx context.Context, groupID string, memberIDs []s
|
||||
for _, id := range inserted {
|
||||
a.emit(ctx, notify, groupID, eventMemberAdded, id, now)
|
||||
}
|
||||
return AddResult{Failed: failed}, nil
|
||||
return AddResult{Failed: failed, Added: len(inserted)}, nil
|
||||
}
|
||||
|
||||
func (a *App) createAdmin(ctx context.Context, ownerID, name, gid string, members []protocol.GroupMemberIn) (CreateResult, error) {
|
||||
|
||||
@@ -28,6 +28,8 @@ type CreateResult struct {
|
||||
// AddResult 是加人结果。
|
||||
type AddResult struct {
|
||||
Failed []MemberFail `json:"failed,omitempty"`
|
||||
// Added 是本请求在写事务内实际插入的人数。不进协议 JSON,供后台审计使用。
|
||||
Added int `json:"-"`
|
||||
}
|
||||
|
||||
// ListItem 是 group.list 一项。
|
||||
|
||||
Reference in New Issue
Block a user