Remove NotificationResponseType that's because the frontend already sent the type of notification

Author: 0xmahmoudd

AskFm/AskFm.BLL/DTO/NotificationTypeResponse.cs

@@ -6,7 +6,7 @@ namespace AskFm.BLL.Services;
 public interface INotificationService
 {
     Task<List<NotificationDto>> GetUserNotifications(int userId, int pageNumber = 1, int pageSize = 10);
-    Task<NotificationTypeResponse> GetNotificationsByType(int userId, string category, int pageNumber = 1, int pageSize = 10);
+    Task<List<NotificationDto>> GetNotificationsByType(int userId, string category, int pageNumber = 1, int pageSize = 10);
     Task<string> MarkNotificationAsRead(int notificationId);
     Task<string> MarkAllNotificationsAsRead(int userId);
     Task CreateNotification(int userId, NotificationStatus type, int resourceId, string message);

AskFm/AskFm.BLL/Services/INotificationService.cs

@@ -57,21 +57,23 @@ public async Task<List<NotificationDto>> GetUserNotifications(int userId, int pa
         return notificationDtos;
     }
 
-    public async Task<NotificationTypeResponse> GetNotificationsByType(int userId, string category, int pageNumber = 1, int pageSize = 10)
+    public async Task<List<NotificationDto>> GetNotificationsByType(int userId, string category, int pageNumber = 1, int pageSize = 10)
     {
-        // first we have to convert category to upper case and match it with enum
-        if (!Enum.TryParse<NotificationStatus>(category, true, out var notificationType))
+        // Convert category to uppercase and match with enum
+        if (!Enum.TryParse<NotificationStatus>(category.ToUpper(), out var notificationType))
             throw new ArgumentException($"Invalid notification category: {category}");
 
         var (notifications, totalCount) = await _notificationRepository.GetNotificationsByType(userId, notificationType, pageNumber, pageSize);
-        
+
+        var totalPages = (int)Math.Ceiling((double)totalCount / pageSize);
+
         var notificationDtos = new List<NotificationDto>();
 
         foreach (var notification in notifications)
         {
             var actorUser = await _notificationRepository.GetActorUserByResourceId(notification.ResourceId, notification.Type);
             notificationDtos.Add(new NotificationDto
-            { 
+            {
                 Id = notification.Id,
                 UserId = notification.UserId,
                 Type = notification.Type.ToString(),
@@ -84,27 +86,20 @@ public async Task<NotificationTypeResponse> GetNotificationsByType(int userId, s
                     Id = actorUser.Id,
                     Username = actorUser?.UserName ?? "Unknown",
                     AvatarPath = actorUser?.AvatarPath ?? String.Empty
+                },
+                Pagination = new PaginationDto
+                {
+                    CurrentPage = pageNumber,
+                    TotalPages = totalPages,
+                    TotalCount = totalCount,
+                    HasNext = pageNumber < totalPages,
+                    HasPrevious = pageNumber > 1
                 }
             });
         }
 
-        var totalPages = (int)Math.Ceiling((double)totalCount / pageSize);
-        
-        return new NotificationTypeResponse
-        {
-            Type = category.ToUpper(),
-            Notifications = notificationDtos,
-            Pagination = new PaginationDto
-            {
-                CurrentPage = pageNumber,
-                TotalPages = totalPages,
-                TotalCount = totalCount,
-                HasNext = pageNumber < totalPages,
-                HasPrevious = pageNumber > 1
-            }
-        };
+        return notificationDtos;
     }
-
     public async Task<string> MarkNotificationAsRead(int notificationId)
     {
         await _notificationRepository.MarkNotificationAsRead(notificationId);