Merge pull request #504 from OpenPecha/fix/mala-personal-lifetime-count

Fix/mala personal lifetime count

Author: tentamdin

lib/features/mala/data/datasources/mala_local_datasource.dart

@@ -17,13 +17,17 @@ class LocalMalaState {
   const LocalMalaState({
     this.total = 0,
     this.syncedTotal = 0,
+    this.totalCounted = 0,
     this.accumulatorId,
     this.beadImageUrl,
     this.beadImageBase64,
   });
 
   final int total;
   final int syncedTotal;
+
+  /// Lifetime `total_counted` baseline from the server, updated on sync.
+  final int totalCounted;
   final String? accumulatorId;
 
   /// Cached bead-image URL so the strand can render offline on a cold start,
@@ -49,12 +53,14 @@ class LocalMalaState {
   LocalMalaState copyWith({
     int? total,
     int? syncedTotal,
+    int? totalCounted,
     String? accumulatorId,
     String? beadImageUrl,
     String? beadImageBase64,
   }) => LocalMalaState(
     total: total ?? this.total,
     syncedTotal: syncedTotal ?? this.syncedTotal,
+    totalCounted: totalCounted ?? this.totalCounted,
     accumulatorId: accumulatorId ?? this.accumulatorId,
     beadImageUrl: beadImageUrl ?? this.beadImageUrl,
     beadImageBase64: beadImageBase64 ?? this.beadImageBase64,
@@ -63,6 +69,7 @@ class LocalMalaState {
   Map<String, dynamic> toJson() => {
     'total': total,
     'syncedTotal': syncedTotal,
+    'totalCounted': totalCounted,
     if (accumulatorId != null) 'accumulatorId': accumulatorId,
     if (beadImageUrl != null) 'beadImageUrl': beadImageUrl,
     if (beadImageBase64 != null) 'beadImageBase64': beadImageBase64,
@@ -71,6 +78,7 @@ class LocalMalaState {
   factory LocalMalaState.fromJson(Map<String, dynamic> j) => LocalMalaState(
     total: (j['total'] as num?)?.toInt() ?? 0,
     syncedTotal: (j['syncedTotal'] as num?)?.toInt() ?? 0,
+    totalCounted: (j['totalCounted'] as num?)?.toInt() ?? 0,
     accumulatorId: j['accumulatorId'] as String?,
     beadImageUrl: j['beadImageUrl'] as String?,
     beadImageBase64: j['beadImageBase64'] as String?,
@@ -199,6 +207,7 @@ class MalaLocalDataSource {
       userId,
       presetId,
       LocalMalaState(
+        totalCounted: s.totalCounted,
         beadImageUrl: s.beadImageUrl,
         beadImageBase64: s.beadImageBase64,
       ),

lib/features/mala/data/models/accumulator_model.dart

@@ -233,6 +233,7 @@ class AccumulatorDetailModel {
   MalaCount toMalaCount() => MalaCount(
     accumulatorId: accumulatorId,
     total: currentCount,
+    totalCounted: totalCounted,
     beadImageUrl: beadImageUrl,
   );
 }

lib/features/mala/domain/entities/mala_count.dart

@@ -1,10 +1,11 @@
 import 'package:equatable/equatable.dart';
 
-/// The current user's lifetime count for one accumulator.
+/// The current user's counts for one accumulator preset.
 ///
-/// Maps to the user-owned accumulator (`GET/POST/PUT /accumulators/user`),
-/// where [total] is its `current_count` and [accumulatorId] is the user
-/// accumulator id (distinct from the preset id).
+/// Maps to the user-owned accumulator (`GET/POST/PUT /accumulators/user`) and
+/// `GET /accumulators/{parent_id}` detail, where [total] is the active session
+/// `current_count`, [totalCounted] is lifetime `total_counted`, and
+/// [accumulatorId] is the user accumulator id (distinct from the preset id).
 class MalaCount extends Equatable {
   /// The user-owned accumulator id. Null before the user's accumulator has
   /// been created (lazy-created on first sync).
@@ -13,9 +14,12 @@ class MalaCount extends Equatable {
   /// The mantra this count is for (links to the preset / content).
   final String? mantraId;
 
-  /// Lifetime `current_count`.
+  /// Active session `current_count`.
   final int total;
 
+  /// Lifetime `total_counted` across all sessions for this preset.
+  final int totalCounted;
+
   /// Per-user bead artwork (`mala_image_url`), when the user has customized it.
   /// Null falls back to the preset/mantra image.
   final String? beadImageUrl;
@@ -26,11 +30,12 @@ class MalaCount extends Equatable {
     this.accumulatorId,
     this.mantraId,
     required this.total,
+    this.totalCounted = 0,
     this.beadImageUrl,
     this.updatedAt,
   });
 
   @override
   List<Object?> get props =>
-      [accumulatorId, mantraId, total, beadImageUrl, updatedAt];
+      [accumulatorId, mantraId, total, totalCounted, beadImageUrl, updatedAt];
 }

lib/features/mala/presentation/providers/mala_counter_notifier.dart

@@ -17,6 +17,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 class MalaCounterState {
   const MalaCounterState({
     this.total = 0,
+    this.totalCounted = 0,
     this.beadsPerRound = kBeadsPerRound,
     this.isSeeding = true,
     this.seedFailed = false,
@@ -26,6 +27,9 @@ class MalaCounterState {
   });
 
   final int total;
+
+  /// Lifetime `total_counted` baseline from `GET /accumulators/{parent_id}`.
+  final int totalCounted;
   final int beadsPerRound;
 
   /// Per-user bead artwork from the accumulator detail. Null falls back to the
@@ -50,6 +54,7 @@ class MalaCounterState {
 
   MalaCounterState copyWith({
     int? total,
+    int? totalCounted,
     int? beadsPerRound,
     bool? isSeeding,
     bool? seedFailed,
@@ -58,6 +63,7 @@ class MalaCounterState {
     Uint8List? beadImageBytes,
   }) => MalaCounterState(
     total: total ?? this.total,
+    totalCounted: totalCounted ?? this.totalCounted,
     beadsPerRound: beadsPerRound ?? this.beadsPerRound,
     isSeeding: isSeeding ?? this.isSeeding,
     seedFailed: seedFailed ?? this.seedFailed,
@@ -112,6 +118,27 @@ class MalaCounterNotifier extends StateNotifier<MalaCounterState> {
 
   String get _presetId => _mantra.presetId;
 
+  /// Lifetime total for [GroupAccumulationsSheet]: API `total_counted` baseline
+  /// plus any unsynced session taps.
+  int get displayLifetimeCount {
+    final userId = _userId;
+    if (userId == null) return state.totalCounted;
+    final local = _local.read(userId, _presetId);
+    final dirty = local.total - local.syncedTotal;
+    if (dirty <= 0) return state.totalCounted;
+    return state.totalCounted + dirty;
+  }
+
+  /// Refreshes [MalaCounterState.totalCounted] after a successful personal sync.
+  void handlePersonalCountSynced(String presetId) {
+    if (presetId != _presetId || !mounted) return;
+    final userId = _userId;
+    if (userId == null) return;
+    state = state.copyWith(
+      totalCounted: _local.read(userId, _presetId).totalCounted,
+    );
+  }
+
   static Future<List<int>> _emptyImageDownload(String _) async => const [];
 
   /// Seed local state first, then reconcile remote state when available.
@@ -131,6 +158,7 @@ class MalaCounterNotifier extends StateNotifier<MalaCounterState> {
     final fallbackImageUrl = localState.beadImageUrl ?? _mantra.beadImageUrl;
     state = state.copyWith(
       total: localState.total,
+      totalCounted: localState.totalCounted,
       isSeeding: false,
       seedFailed: false,
       beadImageUrl: fallbackImageUrl,
@@ -167,19 +195,22 @@ class MalaCounterNotifier extends StateNotifier<MalaCounterState> {
         final syncedTotal = serverAccId != null ? serverTotal : 0;
 
         final beadImageUrl = detail.beadImageUrl ?? localState.beadImageUrl;
+        final totalCounted = max(detail.totalCounted, localState.totalCounted);
         _local.write(
           userId,
           _presetId,
           localState.copyWith(
             total: total,
             syncedTotal: syncedTotal,
+            totalCounted: totalCounted,
             accumulatorId: serverAccId ?? localState.accumulatorId,
             beadImageUrl: beadImageUrl,
           ),
         );
 
         state = state.copyWith(
           total: total,
+          totalCounted: totalCounted,
           isSeeding: false,
           seedFailed: false,
           beadImageUrl: beadImageUrl,

lib/features/mala/presentation/providers/mala_providers.dart

@@ -159,16 +159,27 @@ final malaSoundPlayerProvider = Provider.autoDispose<MalaSoundPlayer>((ref) {
 
 final malaCounterProvider = StateNotifierProvider.autoDispose
     .family<MalaCounterNotifier, MalaCounterState, Mantra>((ref, mantra) {
-      return MalaCounterNotifier(
+      final sync = ref.watch(malaSyncManagerProvider);
+      final notifier = MalaCounterNotifier(
         mantra: mantra,
         local: ref.watch(malaLocalDataSourceProvider),
         getAccumulatorDetail: ref.watch(getAccumulatorDetailUseCaseProvider),
         deleteUserAccumulator: ref.watch(deleteUserAccumulatorUseCaseProvider),
         downloadImageBytes:
             ref.watch(malaRemoteDataSourceProvider).fetchImageBytes,
-        sync: ref.watch(malaSyncManagerProvider),
+        sync: sync,
         currentUserId: () => resolveMalaUserId(ref),
         analytics: ref.watch(analyticsServiceProvider),
         sound: ref.watch(malaSoundPlayerProvider),
       );
+      void onPersonalCountSynced(String presetId) {
+        notifier.handlePersonalCountSynced(presetId);
+      }
+      sync.onPersonalCountSynced = onPersonalCountSynced;
+      ref.onDispose(() {
+        if (sync.onPersonalCountSynced == onPersonalCountSynced) {
+          sync.onPersonalCountSynced = null;
+        }
+      });
+      return notifier;
     });

lib/features/mala/presentation/providers/mala_sync_manager.dart

@@ -72,6 +72,10 @@ class MalaSyncManager with WidgetsBindingObserver {
   /// totals from `GET /accumulators/{id}/groups`.
   void Function(String groupAccumulatorId)? onGroupCountSynced;
 
+  /// Called after a personal session PUT succeeds so UI can refresh lifetime
+  /// `total_counted` for [GroupAccumulationsSheet].
+  void Function(String presetId)? onPersonalCountSynced;
+
   /// Attach lifecycle + connectivity observers and flush any offline tail.
   void start() {
     if (_started) return;
@@ -305,7 +309,8 @@ class MalaSyncManager with WidgetsBindingObserver {
   }
 
   Future<void> _pushTotal(String userId, String presetId, int sending) async {
-    final s = _local.read(userId, presetId);
+    final beforePush = _local.read(userId, presetId);
+    final s = beforePush;
 
     // First time only: mint the accumulator once via POST {parent_id}.
     // The new accumulator starts at 0; the absolute total is pushed by the
@@ -341,12 +346,18 @@ class MalaSyncManager with WidgetsBindingObserver {
         // Re-read: taps may have landed during the round-trip.
         final after = _local.read(userId, presetId);
         final confirmedTotal = max(count.total, sending);
+        final syncedDelta = confirmedTotal - beforePush.syncedTotal;
+        final nextTotalCounted =
+            syncedDelta > 0
+                ? beforePush.totalCounted + syncedDelta
+                : beforePush.totalCounted;
         await _local.write(
           userId,
           presetId,
           after.copyWith(
             total: max(after.total, count.total),
             syncedTotal: confirmedTotal,
+            totalCounted: nextTotalCounted,
             accumulatorId: count.accumulatorId ?? accumulatorId,
           ),
         );
@@ -357,6 +368,7 @@ class MalaSyncManager with WidgetsBindingObserver {
             'total': max(after.total, count.total),
           },
         );
+        onPersonalCountSynced?.call(presetId);
       },
     );
   }

lib/features/mala/presentation/screens/mala_screen.dart

@@ -272,7 +272,7 @@ class _MalaScreenState extends ConsumerState<MalaScreen> {
                 const SizedBox(height: 12),
                 GroupAccumulationsBar(
                   presetId: mantra.presetId,
-                  userTotalCount: counter.total,
+                  personalLifetimeCount: notifier.displayLifetimeCount,
                 ),
               ],
             ),

lib/features/mala/presentation/widgets/group_accumulations_bar.dart

@@ -16,18 +16,18 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 /// `GET /accumulators/{presetId}/groups?joined_only=true` returns groups.
 ///
 /// Tapping opens [GroupAccumulationsSheet], which shows lifetime
-/// [AccumulatorGroup.userTotalCount] per group. The mala counter above uses
-/// session counts from [groupAccumulationCountsProvider] when a group is selected.
+/// [AccumulatorGroup.userTotalCount] per group and personal `total_counted`.
+/// The mala counter above uses session counts when a group is selected.
 class GroupAccumulationsBar extends ConsumerWidget {
   const GroupAccumulationsBar({
     super.key,
     required this.presetId,
-    required this.userTotalCount,
+    required this.personalLifetimeCount,
   });
 
   final String presetId;
-  /// Personal active session total (`MalaCounterState.total`), shown on the user row.
-  final int userTotalCount;
+  /// Personal lifetime total (`MalaCounterNotifier.displayLifetimeCount`).
+  final int personalLifetimeCount;
 
   static const barHeight = 40.0;
   static const _avatarSize = 28.0;
@@ -45,7 +45,7 @@ class GroupAccumulationsBar extends ConsumerWidget {
           return _GroupAccumulationsBarContent(
             presetId: presetId,
             groups: groups,
-            userTotalCount: userTotalCount,
+            personalLifetimeCount: personalLifetimeCount,
             avatarSize: _avatarSize,
             avatarOverlap: _avatarOverlap,
           );
@@ -61,14 +61,14 @@ class _GroupAccumulationsBarContent extends ConsumerWidget {
   const _GroupAccumulationsBarContent({
     required this.presetId,
     required this.groups,
-    required this.userTotalCount,
+    required this.personalLifetimeCount,
     required this.avatarSize,
     required this.avatarOverlap,
   });
 
   final String presetId;
   final List<AccumulatorGroup> groups;
-  final int userTotalCount;
+  final int personalLifetimeCount;
   final double avatarSize;
   final double avatarOverlap;
 
@@ -95,7 +95,7 @@ class _GroupAccumulationsBarContent extends ConsumerWidget {
                 context,
                 presetId: presetId,
                 groups: groups,
-                personalTotalCount: userTotalCount,
+                personalLifetimeCount: personalLifetimeCount,
               ),
           child: Container(
             height: GroupAccumulationsBar.barHeight,

lib/features/mala/presentation/widgets/group_accumulations_sheet.dart

@@ -19,25 +19,27 @@ import 'package:intl/intl.dart';
 /// Group row counts show lifetime totals from
 /// `GET /accumulators/{presetId}/groups` (`user_total_count`), plus any unsynced
 /// local taps via [GroupAccumulationCountsNotifier.displayLifetimeCount]. The
-/// on-screen mala counter uses session counts from [groupAccumulationCountsProvider]
-/// instead; those reset to 0 on group DELETE while lifetime totals here do not.
+/// personal row shows lifetime `total_counted` from
+/// `GET /accumulators/{parent_id}` via [MalaCounterNotifier.displayLifetimeCount].
+/// The on-screen mala counter uses session counts instead; those reset to 0 on
+/// DELETE while lifetime totals here do not.
 class GroupAccumulationsSheet extends ConsumerStatefulWidget {
   const GroupAccumulationsSheet({
     super.key,
     required this.presetId,
     required this.groups,
-    required this.personalTotalCount,
+    required this.personalLifetimeCount,
   });
 
   final String presetId;
   final List<AccumulatorGroup> groups;
-  final int personalTotalCount;
+  final int personalLifetimeCount;
 
   static Future<void> show(
     BuildContext context, {
     required String presetId,
     required List<AccumulatorGroup> groups,
-    required int personalTotalCount,
+    required int personalLifetimeCount,
   }) {
     return showModalBottomSheet<void>(
       context: context,
@@ -48,7 +50,7 @@ class GroupAccumulationsSheet extends ConsumerStatefulWidget {
           (_) => GroupAccumulationsSheet(
             presetId: presetId,
             groups: groups,
-            personalTotalCount: personalTotalCount,
+            personalLifetimeCount: personalLifetimeCount,
           ),
     );
   }
@@ -138,7 +140,7 @@ class _GroupAccumulationsSheetState
                 title: user != null ? _userDisplayName(user) : '—',
                 formattedCount: NumberFormat.decimalPattern(
                   locale,
-                ).format(widget.personalTotalCount),
+                ).format(widget.personalLifetimeCount),
               ),
               const SizedBox(height: 12),
               Divider(height: 1, thickness: 1, color: dividerColor),