fixing conflict

This commit is contained in:
amirrezaghabeli
2025-09-28 07:23:25 +03:30
parent 26a29003d9
commit fd19e8c66c
9 changed files with 92 additions and 77 deletions
+13 -4
View File
@@ -1,10 +1,8 @@
// 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 '../../core/network/network_manager.dart';
class NotificationsService {
@@ -18,7 +16,6 @@ class NotificationsService {
}) async {
final result = await _networkManager.makeRequest(
NotificationApi.getNotifications(limit: limit, offset: offset),
//NotificationApi.notifications,
method: 'GET',
(json) => NotificationResponseModel.fromJson(json),
);
@@ -52,7 +49,19 @@ class NotificationsService {
required int offset,
}) async {
final result = await _networkManager.makeRequest(
NotificationApi.unreadNotifications,
NotificationApi.getUnreadNotifications(limit: limit, offset: offset),
method: 'GET',
(json) => NotificationResponseModel.fromJson(json),
);
return result;
}
Future<Result<NotificationResponseModel>> getImportantNotifications({
required int limit,
required int offset,
}) async {
final result = await _networkManager.makeRequest(
NotificationApi.getImportantNotifications(limit: limit, offset: offset),
method: 'GET',
(json) => NotificationResponseModel.fromJson(json),
);