refactor: enhance FAQ index removal logic and improve error handling in repository methods

internal/ai/rag/index.go

@@ -138,11 +138,17 @@ func (s *index) RemoveDocumentIndex(ctx context.Context, documentID int64) error
 
 func (s *index) RemoveFAQIndex(ctx context.Context, faqID int64) error {
 	chunks := repositories.KnowledgeChunkRepository.FindByFaqID(sqls.DB(), faqID)
-	return s.removeFAQIndexByChunks(ctx, faqID, chunks)
+	if len(chunks) == 0 {
+		return nil
 	}
-
+	if err := s.deleteChunkVectors(ctx, s.collectChunkVectorIDs(chunks)); err != nil {
-func (s *index) RemoveFAQIndexByChunkModels(ctx context.Context, faqID int64, chunks []models.KnowledgeChunk) error {
+		slog.Error("Failed to delete faq vectors", "error", err)
-	return s.removeFAQIndexByChunks(ctx, faqID, chunks)
+	}
+	if err := repositories.KnowledgeChunkRepository.DeleteByFaqID(sqls.DB(), faqID); err != nil {
+		return fmt.Errorf("failed to delete faq chunks: %w", err)
+	}
+	slog.Info("FAQ index removed", "faq_id", faqID, "chunks_removed", len(chunks))
+	return nil
 }
 
 func (s *index) RemoveKnowledgeBaseIndexByChunkModels(ctx context.Context, knowledgeBaseID int64, chunks []models.KnowledgeChunk) error {
@@ -159,20 +165,6 @@ func (s *index) RemoveKnowledgeBaseIndexByChunkModels(ctx context.Context, knowl
 	return nil
 }
 
-func (s *index) removeFAQIndexByChunks(ctx context.Context, faqID int64, chunks []models.KnowledgeChunk) error {
-	if len(chunks) == 0 {
-		return nil
-	}
-	if err := s.deleteChunkVectors(ctx, s.collectChunkVectorIDs(chunks)); err != nil {
-		slog.Error("Failed to delete faq vectors", "error", err)
-	}
-	if err := repositories.KnowledgeChunkRepository.DeleteByFaqID(sqls.DB(), faqID); err != nil {
-		return fmt.Errorf("failed to delete faq chunks: %w", err)
-	}
-	slog.Info("FAQ index removed", "faq_id", faqID, "chunks_removed", len(chunks))
-	return nil
-}
-
 func (s *index) getCollectionName() string {
 	return knowledgeCollectionName
 }

internal/repositories/knowledge_faq_repository.go

@@ -54,8 +54,8 @@ func (r *knowledgeFAQRepository) Updates(db *gorm.DB, id int64, columns map[stri
 	return db.Model(&models.KnowledgeFAQ{}).Where("id = ?", id).Updates(columns).Error
 }
 
-func (r *knowledgeFAQRepository) Delete(db *gorm.DB, id int64) {
+func (r *knowledgeFAQRepository) Delete(db *gorm.DB, id int64) error {
-	db.Delete(&models.KnowledgeFAQ{}, "id = ?", id)
+	return db.Delete(&models.KnowledgeFAQ{}, "id = ?", id).Error
 }
 
 func (r *knowledgeFAQRepository) DeleteByKnowledgeBaseID(db *gorm.DB, knowledgeBaseID int64) error {

internal/services/knowledge_faq_service.go

@@ -105,15 +105,10 @@ func (s *knowledgeFAQService) DeleteKnowledgeFAQ(id int64) error {
 	if current == nil {
 		return errorsx.InvalidParam("FAQ不存在")
 	}
-	chunks := repositories.KnowledgeChunkRepository.FindByFaqID(sqls.DB(), id)
+	if err := repositories.KnowledgeFAQRepository.Delete(sqls.DB(), id); err != nil {
-	if err := sqls.WithTransaction(func(ctx *sqls.TxContext) error {
-		ctx.Tx.Delete(&models.KnowledgeFAQ{}, "id = ?", id)
-		ctx.Tx.Delete(&models.KnowledgeChunk{}, "faq_id = ?", id)
-		return nil
-	}); err != nil {
 		return err
 	}
-	return rag.Index.RemoveFAQIndexByChunkModels(context.Background(), id, chunks)
+	return rag.Index.RemoveFAQIndex(context.Background(), id)
 }
 
 func (s *knowledgeFAQService) buildKnowledgeFAQModel(req request.CreateKnowledgeFAQRequest) (*models.KnowledgeFAQ, error) {