refactor(bookmark): 引入书签显示模型整合阅读统计信息

Refactors bookmark-related features to encapsulate bookmarks and reading statistics within a BookmarkDisplayModel.

Author: shadowfish07

.trae/rules/project_rules.md

@@ -162,14 +162,14 @@ ReadeckApp 中的 Repository 必须使用正确的通知机制：
 ```dart
 class ExampleRepository {
   final StreamController<void> _dataChangedController = StreamController<void>.broadcast();
-  
+
   Stream<void> get dataChanged => _dataChangedController.stream;
-  
+
   Future<void> saveData() async {
     // 保存数据逻辑
     _dataChangedController.add(null); // 通知数据变更
   }
-  
+
   void dispose() {
     _dataChangedController.close();
   }
@@ -521,8 +521,6 @@ test_resources/                    # 测试资源
 
 ### ReadeckApp 代码示例
 
----
-
 ## 错误处理和错误页面规范
 
 ### 统一错误页面组件
@@ -595,3 +593,25 @@ ReadeckApp 项目严格遵循 Flutter 官方推荐的架构模式，结合以下
 - **清晰的代码结构**
 
 通过遵循本规范，ReadeckApp 项目将具备良好的可维护性、可测试性和可扩展性，为后续开发和维护提供坚实的基础。
+
+## Development Workflow
+
+### Commit Messages
+
+This project uses [semantic-release](https://github.com/semantic-release/semantic-release) to automate version management and package publishing. Therefore, all commit messages must follow the [Conventional Commits specification](https://www.conventionalcommits.org/en/v1.0.0/).
+
+- **chore**: For commits that do not modify the source code or test files (e.g., changes to build scripts, documentation, or project configuration).
+- **feat**: For new features.
+- **fix**: For bug fixes.
+- **refactor**: For code refactoring that does not change external behavior.
+- **docs**: For documentation changes.
+- **style**: For code style changes (e.g., formatting).
+- **test**: For adding or modifying tests.
+- **perf**: For performance improvements.
+- **ci**: For changes to CI configuration files and scripts.
+- **build**: For changes that affect the build system or external dependencies.
+- **revert**: For reverting a previous commit.
+
+### Test-Driven Development (TDD)
+
+This project follows a Test-Driven Development (TDD) approach. All new features or bug fixes should start with writing a failing unit test that describes the desired functionality or reproduces the bug. Only after the test is written should the implementation code be written to make the test pass.

GEMINI.md

@@ -0,0 +1 @@
+@.trae/rules/project_rules.md

lib/config/dependencies.dart

@@ -42,10 +42,12 @@ List<SingleChildWidget> providers(String host, String token) {
     Provider(
         create: (context) => ArticleRepository(
             context.read(), context.read(), context.read(), context.read())),
-    Provider(create: (context) => BookmarkRepository(context.read())),
+    Provider(create: (context) => ReadingStatsRepository(context.read())),
+    Provider(
+        create: (context) =>
+            BookmarkRepository(context.read(), context.read())),
     Provider(create: (context) => DailyReadHistoryRepository(context.read())),
     Provider(create: (context) => LabelRepository(context.read())),
-    Provider(create: (context) => ReadingStatsRepository(context.read())),
     Provider(
         create: (context) =>
             BookmarkOperationUseCases(context.read(), context.read())),

lib/data/repository/bookmark/bookmark_repository.dart

@@ -1,17 +1,20 @@
 import 'dart:math';
 
+import 'package:readeck_app/data/repository/reading_stats/reading_stats_repository.dart';
 import 'package:readeck_app/data/service/readeck_api_client.dart';
 import 'package:readeck_app/domain/models/bookmark/bookmark.dart';
+import 'package:readeck_app/domain/models/bookmark_display_model/bookmark_display_model.dart';
 import 'package:readeck_app/main.dart';
 import 'package:result_dart/result_dart.dart';
 
 /// 书签数据变化监听器类型定义
 typedef BookmarkChangeListener = void Function();
 
 class BookmarkRepository {
-  BookmarkRepository(this._readeckApiClient);
+  BookmarkRepository(this._readeckApiClient, this._readingStatsRepository);
 
   final ReadeckApiClient _readeckApiClient;
+  final ReadingStatsRepository _readingStatsRepository;
 
   // 全局共享数据管理 - 单一数据源
   final List<Bookmark> _bookmarks = [];
@@ -92,21 +95,36 @@ class BookmarkRepository {
     _listeners.clear();
   }
 
-  AsyncResult<List<Bookmark>> loadBookmarksByIds(List<String> ids) async {
+  AsyncResult<List<BookmarkDisplayModel>> _wrapBookmarksWithStats(
+    List<Bookmark> bookmarks,
+  ) async {
+    final models = await Future.wait(
+      bookmarks.map((b) async {
+        final statsRes = await _readingStatsRepository.getReadingStats(b.id);
+        return statsRes.isSuccess()
+            ? BookmarkDisplayModel(bookmark: b, stats: statsRes.getOrThrow())
+            : BookmarkDisplayModel(bookmark: b);
+      }),
+      eagerError: false,
+    );
+    return Success(models);
+  }
+  AsyncResult<List<BookmarkDisplayModel>> loadBookmarksByIds(
+      List<String> ids) async {
     appLogger.i('开始根据ID加载书签，数量: ${ids.length}');
     final result = await _readeckApiClient.getBookmarks(ids: ids);
     if (result.isSuccess()) {
       final bookmarks = result.getOrThrow();
       appLogger.i('成功加载书签 ${bookmarks.length} 个');
       _insertOrUpdateCachedBookmarks(bookmarks);
-      return result;
+      return _wrapBookmarksWithStats(bookmarks);
     }
 
     appLogger.e('根据ID加载书签失败', error: result.exceptionOrNull());
-    return result;
+    return Failure(result.exceptionOrNull()!);
   }
 
-  AsyncResult<List<Bookmark>> loadUnarchivedBookmarks({
+  AsyncResult<List<BookmarkDisplayModel>> loadUnarchivedBookmarks({
     int limit = 10,
     int page = 1,
   }) async {
@@ -120,14 +138,14 @@ class BookmarkRepository {
       final bookmarks = result.getOrThrow();
       appLogger.i('成功加载未归档书签 ${bookmarks.length} 个');
       _insertOrUpdateCachedBookmarks(bookmarks);
-      return result;
+      return _wrapBookmarksWithStats(bookmarks);
     }
 
     appLogger.e('加载未归档书签失败', error: result.exceptionOrNull());
-    return result;
+    return Failure(result.exceptionOrNull()!);
   }
 
-  AsyncResult<List<Bookmark>> loadArchivedBookmarks({
+  AsyncResult<List<BookmarkDisplayModel>> loadArchivedBookmarks({
     int limit = 10,
     int page = 1,
   }) async {
@@ -141,14 +159,14 @@ class BookmarkRepository {
       final bookmarks = result.getOrThrow();
       appLogger.i('成功加载已归档书签 ${bookmarks.length} 个');
       _insertOrUpdateCachedBookmarks(bookmarks);
-      return result;
+      return _wrapBookmarksWithStats(bookmarks);
     }
 
     appLogger.e('加载已归档书签失败', error: result.exceptionOrNull());
-    return result;
+    return Failure(result.exceptionOrNull()!);
   }
 
-  AsyncResult<List<Bookmark>> loadMarkedBookmarks({
+  AsyncResult<List<BookmarkDisplayModel>> loadMarkedBookmarks({
     int limit = 10,
     int page = 1,
   }) async {
@@ -162,23 +180,25 @@ class BookmarkRepository {
       final bookmarks = result.getOrThrow();
       appLogger.i('成功加载已标记书签 ${bookmarks.length} 个');
       _insertOrUpdateCachedBookmarks(bookmarks);
-      return result;
+      return _wrapBookmarksWithStats(bookmarks);
     }
 
     appLogger.e('加载已标记书签失败', error: result.exceptionOrNull());
-    return result;
+    return Failure(result.exceptionOrNull()!);
   }
 
-  AsyncResult<List<Bookmark>> loadRandomUnarchivedBookmarks(
+  AsyncResult<List<BookmarkDisplayModel>> loadRandomUnarchivedBookmarks(
       int randomCount) async {
     appLogger.i('开始加载随机未归档书签，请求数量: $randomCount');
     final allBookmarks = await loadUnarchivedBookmarks(limit: 100);
 
     if (allBookmarks.isSuccess()) {
-      _insertOrUpdateCachedBookmarks(allBookmarks.getOrThrow());
+      _insertOrUpdateCachedBookmarks(
+          allBookmarks.getOrThrow().map((e) => e.bookmark).toList());
 
       // 随机打乱并取前5个
-      final shuffled = List<Bookmark>.from(allBookmarks.getOrDefault([]));
+      final shuffled =
+          List<BookmarkDisplayModel>.from(allBookmarks.getOrDefault([]));
       shuffled.shuffle(Random());
       final randomBookmarks = shuffled.take(5).toList();
 

lib/domain/models/bookmark_display_model/bookmark_display_model.dart

@@ -0,0 +1,13 @@
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:readeck_app/domain/models/bookmark/bookmark.dart';
+import 'package:readeck_app/utils/reading_stats_calculator.dart';
+
+part 'bookmark_display_model.freezed.dart';
+
+@freezed
+abstract class BookmarkDisplayModel with _$BookmarkDisplayModel {
+  factory BookmarkDisplayModel({
+    required Bookmark bookmark,
+    ReadingStatsForView? stats,
+  }) = _BookmarkDisplayModel;
+}