refactor(di): migrate from setter to constructor injection for logService
- Remove SetLogService methods from user, post, comment, and admin post services - Add logService as constructor parameter to all dependent services - Centralize call-related and message error definitions in app_errors.go - Add ConversationID field to WSEventResponse for improved message tracking - Simplify wire provider functions by removing manual setter calls
This commit is contained in:
@@ -3,11 +3,11 @@ package service
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"carrot_bbs/internal/config"
|
||||
apperrors "carrot_bbs/internal/errors"
|
||||
"carrot_bbs/internal/model"
|
||||
"carrot_bbs/internal/pkg/ws"
|
||||
"carrot_bbs/internal/repository"
|
||||
@@ -16,16 +16,6 @@ import (
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
var (
|
||||
ErrCallNotFound = errors.New("call not found")
|
||||
ErrCallNotActive = errors.New("call is not active")
|
||||
ErrCallInProgress = errors.New("call already in progress between users")
|
||||
ErrNotParticipant = errors.New("user is not a participant of this call")
|
||||
ErrInvalidCallState = errors.New("invalid call state for this operation")
|
||||
ErrCalleeOffline = errors.New("callee is offline")
|
||||
ErrCallAlreadyAnswered = errors.New("call already answered on another device")
|
||||
)
|
||||
|
||||
// 通话相关常量
|
||||
const (
|
||||
CallLifetimeMs = 60000 // 通话邀请有效期 60秒 (参考 Matrix)
|
||||
@@ -82,7 +72,7 @@ func NewCallService(
|
||||
func (s *callService) Invite(ctx context.Context, callerID, calleeID, conversationID, mediaType string) (*model.CallSession, bool, error) {
|
||||
active, err := s.callRepo.GetActiveCallByConversationID(conversationID)
|
||||
if err == nil && active != nil {
|
||||
return nil, false, fmt.Errorf("%w: call %s", ErrCallInProgress, active.ID)
|
||||
return nil, false, apperrors.Wrap(fmt.Errorf("call %s", active.ID), apperrors.ErrCallInProgress)
|
||||
}
|
||||
|
||||
now := time.Now()
|
||||
@@ -152,12 +142,12 @@ func (s *callService) Invite(ctx context.Context, callerID, calleeID, conversati
|
||||
func (s *callService) Accept(ctx context.Context, callID, userID string) (*model.CallSession, error) {
|
||||
call, err := s.callRepo.GetCallByIDWithParticipants(callID)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("%w: %v", ErrCallNotFound, err)
|
||||
return nil, apperrors.Wrap(err, apperrors.ErrCallNotFound)
|
||||
}
|
||||
|
||||
// 检查用户是否是参与者
|
||||
if !isParticipant(call, userID) {
|
||||
return nil, ErrNotParticipant
|
||||
return nil, apperrors.ErrNotCallParticipant
|
||||
}
|
||||
|
||||
// === 修改:使用乐观锁更新状态 ===
|
||||
@@ -176,7 +166,7 @@ func (s *callService) Accept(ctx context.Context, callID, userID string) (*model
|
||||
}
|
||||
if result.RowsAffected == 0 {
|
||||
// 没有更新任何行,说明通话已被其他设备接听
|
||||
return nil, ErrCallAlreadyAnswered
|
||||
return nil, apperrors.ErrCallAlreadyAnswered
|
||||
}
|
||||
|
||||
// 更新参与者状态
|
||||
@@ -213,13 +203,13 @@ func (s *callService) Accept(ctx context.Context, callID, userID string) (*model
|
||||
func (s *callService) Reject(ctx context.Context, callID, userID string) error {
|
||||
call, err := s.callRepo.GetCallByIDWithParticipants(callID)
|
||||
if err != nil {
|
||||
return fmt.Errorf("%w: %v", ErrCallNotFound, err)
|
||||
return apperrors.Wrap(err, apperrors.ErrCallNotFound)
|
||||
}
|
||||
if call.Status != model.CallStatusCalling {
|
||||
return ErrInvalidCallState
|
||||
return apperrors.ErrInvalidCallState
|
||||
}
|
||||
if !isParticipant(call, userID) {
|
||||
return ErrNotParticipant
|
||||
return apperrors.ErrNotCallParticipant
|
||||
}
|
||||
|
||||
now := time.Now()
|
||||
@@ -249,13 +239,13 @@ func (s *callService) Reject(ctx context.Context, callID, userID string) error {
|
||||
func (s *callService) Busy(ctx context.Context, callID, userID string) error {
|
||||
call, err := s.callRepo.GetCallByIDWithParticipants(callID)
|
||||
if err != nil {
|
||||
return fmt.Errorf("%w: %v", ErrCallNotFound, err)
|
||||
return apperrors.Wrap(err, apperrors.ErrCallNotFound)
|
||||
}
|
||||
if call.Status != model.CallStatusCalling {
|
||||
return ErrInvalidCallState
|
||||
return apperrors.ErrInvalidCallState
|
||||
}
|
||||
if !isParticipant(call, userID) {
|
||||
return ErrNotParticipant
|
||||
return apperrors.ErrNotCallParticipant
|
||||
}
|
||||
|
||||
now := time.Now()
|
||||
@@ -276,14 +266,14 @@ func (s *callService) Busy(ctx context.Context, callID, userID string) error {
|
||||
func (s *callService) End(ctx context.Context, callID, userID string, reason string) (*model.CallSession, error) {
|
||||
call, err := s.callRepo.GetCallByIDWithParticipants(callID)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("%w: %v", ErrCallNotFound, err)
|
||||
return nil, apperrors.Wrap(err, apperrors.ErrCallNotFound)
|
||||
}
|
||||
if !call.IsActive() {
|
||||
return nil, ErrCallNotActive
|
||||
return nil, apperrors.ErrCallNotActive
|
||||
}
|
||||
// 允许系统结束通话时 userID 为空
|
||||
if userID != "" && !isParticipant(call, userID) {
|
||||
return nil, ErrNotParticipant
|
||||
return nil, apperrors.ErrNotCallParticipant
|
||||
}
|
||||
|
||||
now := time.Now()
|
||||
@@ -337,13 +327,13 @@ func (s *callService) End(ctx context.Context, callID, userID string, reason str
|
||||
func (s *callService) RelaySignal(ctx context.Context, callID, fromUserID string, signalType string, payload json.RawMessage) error {
|
||||
call, err := s.callRepo.GetCallByIDWithParticipants(callID)
|
||||
if err != nil {
|
||||
return fmt.Errorf("%w: %v", ErrCallNotFound, err)
|
||||
return apperrors.Wrap(err, apperrors.ErrCallNotFound)
|
||||
}
|
||||
if !call.IsActive() {
|
||||
return ErrCallNotActive
|
||||
return apperrors.ErrCallNotActive
|
||||
}
|
||||
if !isParticipant(call, fromUserID) {
|
||||
return ErrNotParticipant
|
||||
return apperrors.ErrNotCallParticipant
|
||||
}
|
||||
|
||||
participants, _ := s.callRepo.GetCallParticipants(callID)
|
||||
@@ -363,13 +353,13 @@ func (s *callService) RelaySignal(ctx context.Context, callID, fromUserID string
|
||||
func (s *callService) SetMuted(ctx context.Context, callID, userID string, muted bool) error {
|
||||
call, err := s.callRepo.GetCallByIDWithParticipants(callID)
|
||||
if err != nil {
|
||||
return fmt.Errorf("%w: %v", ErrCallNotFound, err)
|
||||
return apperrors.Wrap(err, apperrors.ErrCallNotFound)
|
||||
}
|
||||
if !call.IsActive() {
|
||||
return ErrCallNotActive
|
||||
return apperrors.ErrCallNotActive
|
||||
}
|
||||
if !isParticipant(call, userID) {
|
||||
return ErrNotParticipant
|
||||
return apperrors.ErrNotCallParticipant
|
||||
}
|
||||
|
||||
participants, _ := s.callRepo.GetCallParticipants(callID)
|
||||
|
||||
Reference in New Issue
Block a user