Merge pull request 'added_unread_allread_notification' (#157) from added_unread_allread_notification into main

Reviewed-on: https://repo.ravanertebat.com/TM/tm_app/pulls/157

lib/data/repositories/notification_repository.dart

@@ -12,13 +12,20 @@ class NotificationsRepository {
     required int limit,
     required int offset,
   }) async {
-    return _notificationsService.getNotifications(
+    return _notificationsService.getNotifications(limit: limit, offset: offset);
+  }
+
+  Future<Result<Map<String, dynamic>>> markAllAsRead() async {
+    return _notificationsService.markAllAsRead();
+  }
+
+  Future<Result<NotificationResponseModel>> getUnreadNotifications({
+    required int limit,
+    required int offset,
+  }) {
+    return _notificationsService.getUnreadNotifications(
       limit: limit,
       offset: offset,
     );
   }
-
-  Future<Result<NotificationResponseModel>> markAllAsRead() async {
-    return _notificationsService.markAllAsRead();
-  }
 }

lib/data/services/api/notification_api.dart

@@ -7,10 +7,11 @@ class NotificationApi {
 
 
 
-  static const String markAllAsRead = '/api/v1/notifications';
+  static const String markAllAsRead = '/api/v1/notifications/mark';
   static const String markAsRead = '/api/v1/notifications/mark-as-read';
   static const String tenderApprovalsTender = '/api/v1/notifications';
-  static String getTenderApprovalById({required String tenderId}) {
+  static const String unreadNotifications = '/api/v1/notifications?seen=false';
-    return '$tenderApprovalsTender/$tenderId';
+    static String getUnreadNotifications({required int limit, required int offset}) {
+    return '$unreadNotifications?limit=$limit&offset=$offset';
   }
 }

lib/data/services/notification_service.dart

@@ -1,9 +1,10 @@
 // notification_service.dart
 import 'dart:convert';
+
+import 'package:tm_app/core/utils/result.dart';
 import 'package:tm_app/data/services/api/notification_api.dart';
 import 'package:tm_app/data/services/model/notification__response/notification_response_model.dart';
 
-import 'package:tm_app/core/utils/result.dart';
 import '../../core/network/network_manager.dart';
 
 class NotificationsService {
@@ -24,11 +25,11 @@ class NotificationsService {
     return result;
   }
 
-  Future<Result<NotificationResponseModel>> markAllAsRead() async {
+  Future<Result<Map<String, dynamic>>> markAllAsRead() async {
     final result = await _networkManager.makeRequest(
       NotificationApi.markAllAsRead,
-      method: 'POST',
+      method: 'GET',
-      (json) => NotificationResponseModel.fromJson(json),
+      (json) => json,
     );
     return result;
   }
@@ -45,4 +46,16 @@ class NotificationsService {
     );  
     return result;
   }
+
+  Future<Result<NotificationResponseModel>> getUnreadNotifications({
+    required int limit,
+    required int offset,
+  }) async {
+    final result = await _networkManager.makeRequest(
+      NotificationApi.unreadNotifications, 
+      method: 'GET',
+      (json) => NotificationResponseModel.fromJson(json),
+    );
+    return result;
+  }
 }

lib/view_models/notification_view_model.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:tm_app/core/utils/app_toast.dart';
 import 'package:tm_app/core/utils/result.dart';
 import 'package:tm_app/data/repositories/notification_repository.dart';
 import 'package:tm_app/data/services/model/notification__response/notification_response_model.dart';
@@ -10,6 +11,7 @@ class NotificationViewModel with ChangeNotifier {
     : _repository = repositoryViewModel {
     WidgetsBinding.instance.addPostFrameCallback((_) {
       getNotifications();
+      getUnreadNotifications();
     });
   }
 
@@ -29,8 +31,15 @@ class NotificationViewModel with ChangeNotifier {
   bool get hasMoreData => _hasMoreData;
   int get totalPages => _totalPages;
 
+  NotificationResponseModel? _unreadNotificationResponse;
+  bool _isUnreadLoading = false;
+
+  NotificationResponseModel? get unreadNotificationResponse =>
+      _unreadNotificationResponse;
+  bool get isUnreadLoading => _isUnreadLoading;
+
   /// Fetch notifications
-Future<void> getNotifications({int page = 1, bool isMobile = false}) async {
+  Future<void> getNotifications({int page = 1, bool isMobile = false}) async {
     _isLoading = true;
     notifyListeners();
 
@@ -71,7 +80,7 @@ Future<void> getNotifications({int page = 1, bool isMobile = false}) async {
 
     _isLoading = false;
     notifyListeners();
-}
+  }
 
   /// Jump to page
   Future<void> jumpToPage(int page) async {
@@ -82,14 +91,20 @@ Future<void> getNotifications({int page = 1, bool isMobile = false}) async {
   }
 
   /// Mark all as read
-  Future<void> markAllAsRead() async {
+  Future<void> markAllAsRead(BuildContext context) async {
+    _isLoading = true;
     _errorMessage = null;
     notifyListeners();
 
     final result = await _repository.markAllAsRead();
 
     switch (result) {
-      case Ok<NotificationResponseModel>():
+      case Ok<Map<String, dynamic>>():
+        final response = result.value;
+        final success = response['success'] as bool? ?? false;
+        final message = response['message'] as String? ?? 'Unknown response';
+
+        if (success) {
           if (_notificationResponseModel?.data?.notifications != null) {
             final updatedNotifications =
                 _notificationResponseModel!.data!.notifications!
@@ -102,13 +117,26 @@ Future<void> getNotifications({int page = 1, bool isMobile = false}) async {
               ),
             );
           }
+
+          await getNotifications(page: currentPage, );
+          await getUnreadNotifications();
+
+
+          // toast success
+          AppToast.success(context, 'All notifications marked as read.');
+        } else {
+          _errorMessage = message;
+          AppToast.error(context, message);
+        }
         break;
 
-      case Error<NotificationResponseModel>():
+      case Error<Map<String, dynamic>>():
         _errorMessage = result.error.toString();
+        AppToast.error(context, _errorMessage!);
         break;
     }
 
+    _isLoading = false;
     notifyListeners();
   }
 
@@ -129,4 +157,28 @@ Future<void> getNotifications({int page = 1, bool isMobile = false}) async {
       return '${difference.inDays} days ago';
     }
   }
+
+  Future<void> getUnreadNotifications({int page = 1}) async {
+    _isUnreadLoading = true;
+    notifyListeners();
+
+    final int offset = _pageSize * page;
+
+    final result = await _repository.getUnreadNotifications(
+      limit: _pageSize,
+      offset: offset,
+    );
+
+    switch (result) {
+      case Ok<NotificationResponseModel>():
+        _unreadNotificationResponse = result.value;
+        break;
+      case Error<NotificationResponseModel>():
+        _errorMessage = result.error.toString();
+        break;
+    }
+
+    _isUnreadLoading = false;
+    notifyListeners();
+  }
 }

lib/views/notification/pages/d_notification_page.dart

@@ -4,12 +4,13 @@ import 'package:tm_app/core/theme/colors.dart';
 import 'package:tm_app/core/utils/size_config.dart';
 import 'package:tm_app/view_models/notification_view_model.dart';
 import 'package:tm_app/views/notification/strings/notification_strings.dart';
-import 'package:tm_app/views/shared/page_selection_dialog.dart';
 import 'package:tm_app/views/shared/desktop_navigation_widget.dart';
+import 'package:tm_app/views/shared/page_selection_dialog.dart';
+
+import '../../shared/main_tab_bar.dart';
 import '../widgets/notification_all_tab.dart';
 import '../widgets/notification_important_tab.dart';
 import '../widgets/notification_unread_tab.dart';
-import '../../shared/main_tab_bar.dart';
 
 class DesktopNotificationPage extends StatefulWidget {
   const DesktopNotificationPage({super.key});
@@ -65,7 +66,9 @@ class _DesktopNotificationPageState extends State<DesktopNotificationPage>
                       child: Align(
                         alignment: Alignment.centerRight,
                         child: InkWell(
-                          onTap: viewModel.markAllAsRead,
+                          onTap: () {
+                            viewModel.markAllAsRead(context);
+                          },
                           borderRadius: BorderRadius.circular(99),
                           child: Container(
                             width: 132.0.w(),
@@ -89,7 +92,9 @@ class _DesktopNotificationPageState extends State<DesktopNotificationPage>
                       ),
                     ),
                     SizedBox(height: 12.0.h()),
-                    Expanded(
+                    viewModel.isLoading
+                        ? Container()
+                        : Expanded(
                           child: TabBarView(
                             controller: controller,
                             children: const [
@@ -99,6 +104,15 @@ class _DesktopNotificationPageState extends State<DesktopNotificationPage>
                             ],
                           ),
                         ),
+                    if (viewModel.isLoading) ...[
+                     const Spacer(),
+                      const Center(
+                        child: CircularProgressIndicator(
+                          color: AppColors.secondary50,
+                        ),
+                      ),
+                     const Spacer(),
+                    ],
                     SizedBox(height: 10.0.h()),
                     Row(
                       children: [
@@ -116,8 +130,10 @@ class _DesktopNotificationPageState extends State<DesktopNotificationPage>
                           onTap: () async {
                             final selectedPage = await showDialog<int>(
                               context: context,
-                              builder: (context) => PageSelectionDialog(
+                              builder:
-                                  totalPages: viewModel.totalPages),
+                                  (context) => PageSelectionDialog(
+                                    totalPages: viewModel.totalPages,
+                                  ),
                             );
 
                             if (selectedPage != null) {

lib/views/notification/pages/m_notification_page.dart

@@ -51,7 +51,7 @@ class _MobileNotificationPageState extends State<MobileNotificationPage>
 
   @override
   Widget build(BuildContext context) {
-    final viewModel = context.watch<NotificationViewModel>(); // ✅ وصل به ویومدل
+    final viewModel = context.watch<NotificationViewModel>();
 
     return Scaffold(
       backgroundColor: AppColors.backgroundColor,
@@ -72,7 +72,9 @@ class _MobileNotificationPageState extends State<MobileNotificationPage>
             child: Align(
               alignment: Alignment.centerRight,
               child: InkWell(
-                onTap: viewModel.markAllAsRead, // ✅ مثل دسکتاپ/تبلت
+                onTap: () {
+                  viewModel.markAllAsRead(context);
+                },
                 borderRadius: BorderRadius.circular(99),
                 child: Container(
                   width: 132.0.w(),
@@ -96,20 +98,26 @@ class _MobileNotificationPageState extends State<MobileNotificationPage>
             ),
           ),
           SizedBox(height: 12.0.h()),
-          Expanded(
+          viewModel.isLoading
+              ? Container()
+              : Expanded(
                 child: TabBarView(
                   controller: controller,
                   children: [
                     NotificationAllTab(scrollController: _scrollController),
                     NotificationUnreadTab(scrollController: _scrollController),
-                NotificationImportantTab(scrollController: _scrollController),
+                    NotificationImportantTab(
+                      scrollController: _scrollController,
+                    ),
                   ],
                 ),
               ),
           if (viewModel.isLoading) ...[
-            SizedBox(height: 10.0.h()),
+            const Spacer(),
-            const Center(child: CircularProgressIndicator()),
+            const Center(
-            SizedBox(height: 10.0.h()),
+              child: CircularProgressIndicator(color: AppColors.secondary50),
+            ),
+            const Spacer(),
           ],
         ],
       ),

lib/views/notification/pages/t_notification_page.dart

@@ -70,7 +70,9 @@ class _TabletNotificationPageState extends State<TabletNotificationPage>
                 child: Align(
                   alignment: Alignment.centerRight,
                   child: InkWell(
-                    onTap: viewModel.markAllAsRead,
+                    onTap: () {
+                      viewModel.markAllAsRead(context);
+                    },
                     borderRadius: BorderRadius.circular(99),
                     child: Container(
                       width: 132.0.w(),
@@ -94,7 +96,9 @@ class _TabletNotificationPageState extends State<TabletNotificationPage>
                 ),
               ),
               SizedBox(height: 12.0.h()),
-              Expanded(
+              viewModel.isLoading
+                  ? Container()
+                  : Expanded(
                     child: TabBarView(
                       controller: controller,
                       children: const [
@@ -104,6 +108,15 @@ class _TabletNotificationPageState extends State<TabletNotificationPage>
                       ],
                     ),
                   ),
+              if (viewModel.isLoading) ...[
+                const Spacer(),
+                const Center(
+                  child: CircularProgressIndicator(
+                    color: AppColors.secondary50,
+                  ),
+                ),
+                const Spacer(),
+              ],
               SizedBox(height: 10.0.h()),
               Row(
                 children: [
@@ -121,7 +134,8 @@ class _TabletNotificationPageState extends State<TabletNotificationPage>
                     onTap: () async {
                       final selectedPage = await showDialog<int>(
                         context: context,
-                        builder: (context) => PageSelectionDialog(
+                        builder:
+                            (context) => PageSelectionDialog(
                               totalPages: viewModel.totalPages,
                             ),
                       );

lib/views/notification/widgets/notification_unread_tab.dart

@@ -12,9 +12,20 @@ class NotificationUnreadTab extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final viewModel = context.watch<NotificationViewModel>();
+
+    if (viewModel.isUnreadLoading) {
+      return const Center(child: CircularProgressIndicator());
+    }
+
     final notifications =
-        viewModel.notificationResponse?.data?.notifications ?? [];
+        viewModel.unreadNotificationResponse?.data?.notifications ?? [];
+
+    if (notifications.isEmpty) {
+      return const Center(child: Text('No unread notifications'));
+    }
+
     return ListView.builder(
+      controller: scrollController,
       itemCount: notifications.length,
       itemBuilder: (context, index) {
         final notification = notifications[index];