fix(server): improve message handling and data privacy
All checks were successful
Build Backend / build (push) Successful in 2m0s
Build Backend / build-docker (push) Successful in 7m38s

- fix unread count calculation logic in message repository
- implement logic to retrieve other participant's last read sequence in conversation handlers
- mask real names in verification record responses for privacy
- improve error reporting in main entry point by using stderr instead of zap logger during initialization
This commit is contained in:
2026-05-09 17:25:09 +08:00
parent 51fe517cb2
commit 9f3215d4eb
4 changed files with 22 additions and 8 deletions

View File

@@ -244,6 +244,12 @@ func (h *MessageHandler) GetConversationByID(c *gin.Context) {
// 获取对方用户的已读位置
otherLastReadSeq := int64(0)
for _, p := range allParticipants {
if p.UserID != userID {
otherLastReadSeq = p.LastReadSeq
break
}
}
response.Success(c, dto.ConvertConversationToDetailResponse(conv, participants, unreadCount, nil, myLastReadSeq, otherLastReadSeq, isPinned, notificationMuted))
}
@@ -768,6 +774,12 @@ func (h *MessageHandler) HandleGetConversation(c *gin.Context) {
// 获取对方用户的已读位置
otherLastReadSeq := int64(0)
for _, p := range allParticipants {
if p.UserID != userID {
otherLastReadSeq = p.LastReadSeq
break
}
}
response.Success(c, dto.ConvertConversationToDetailResponse(conv, participants, unreadCount, nil, myLastReadSeq, otherLastReadSeq, isPinned, notificationMuted))
}

View File

@@ -6,6 +6,7 @@ import (
"with_you/internal/dto"
"with_you/internal/model"
"with_you/internal/pkg/response"
"with_you/internal/pkg/sanitizer"
"with_you/internal/service"
"github.com/gin-gonic/gin"
@@ -114,7 +115,7 @@ func convertVerificationRecordToResponse(record *model.VerificationRecord) *dto.
UserID: record.UserID,
Identity: string(record.Identity),
Status: string(record.Status),
RealName: record.RealName,
RealName: sanitizer.MaskValue("real_name", record.RealName),
StudentID: record.StudentID,
EmployeeID: record.EmployeeID,
Department: record.Department,

View File

@@ -896,10 +896,11 @@ func (r *messageRepository) GetUnreadCountBatch(ctx context.Context, userID stri
}
var rows []row
err := r.db.WithContext(ctx).
Table("conversation_participants cp").
Select("cp.conversation_id, COALESCE(cnt.unread, 0) as count").
Joins("LEFT JOIN (SELECT m.conversation_id, COUNT(m.id) as unread FROM messages m WHERE m.sender_id <> ? AND m.deleted_at IS NULL AND m.conversation_id IN (?) GROUP BY m.conversation_id) cnt ON cnt.conversation_id = cp.conversation_id AND cnt.unread > cp.last_read_seq", userID, convIDs).
Where("cp.user_id = ? AND cp.conversation_id IN (?)", userID, convIDs).
Table("messages m").
Select("m.conversation_id, COUNT(m.id) as count").
Joins("JOIN conversation_participants cp ON cp.conversation_id = m.conversation_id AND cp.user_id = ?", userID).
Where("m.sender_id <> ? AND m.deleted_at IS NULL AND m.seq > cp.last_read_seq AND m.conversation_id IN (?)", userID, convIDs).
Group("m.conversation_id").
Scan(&rows).Error
if err != nil {
return nil, err