Changeset 73b69b2 for ChapterX.Infrastructure/Repositories

Timestamp:

03/24/26 22:13:36 (3 months ago)

Author:

kikisrbinoska <srbinoskakristina07@…>

Branches:

main

Children:

7fbb91c

Parents:

acf690c

Message:

Fixed reading lists,comments and likes

Location:

ChapterX.Infrastructure/Repositories

Files:

• CommentRepository.cs (modified) (1 diff)
• LikesRepository.cs (modified) (2 diffs)
• NotificationRepository.cs (modified) (1 diff)
• ReadingListItemsRepository.cs (modified) (1 diff)
• ReadingListRepository.cs (modified) (2 diffs)
• StoryRepository.cs (modified) (1 diff)

ChapterX.Infrastructure/Repositories/CommentRepository.cs

@@ -19 +19 @@
 
         public async Task<IEnumerable<Comment>> GetByChapterIdAsync(int chapterId, CancellationToken cancellationToken = default)
-        {
-            return await _dbSet
-                .Where(c => c.StoryId == chapterId)
+            => await _dbSet.Where(c => c.StoryId == chapterId).ToListAsync(cancellationToken);
+
+        public async Task<IEnumerable<Comment>> GetByStoryIdAsync(int storyId, CancellationToken cancellationToken = default)
+            => await _dbSet
+                .Include(c => c.User)
+                .Where(c => c.StoryId == storyId)
+                .OrderByDescending(c => c.CreatedAt)
                 .ToListAsync(cancellationToken);
-        }
     }
 }

ChapterX.Infrastructure/Repositories/LikesRepository.cs

@@ -2 +2 @@
 using ChapterX.Domain.Repositories;
 using ChapterX.Infrastructure.Data.DataContext;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore;
 
 namespace ChapterX.Infrastructure.Repositories
@@ -15 +11 @@
         {
         }
+
+        public async Task<IEnumerable<Likes>> GetByStoryIdAsync(int storyId, CancellationToken cancellationToken = default)
+            => await _dbSet.Where(l => l.StoryId == storyId).ToListAsync(cancellationToken);
+
+        public async Task<bool> ExistsAsync(int userId, int storyId, CancellationToken cancellationToken = default)
+            => await _dbSet.AnyAsync(l => l.UserId == userId && l.StoryId == storyId, cancellationToken);
+
+        public async Task<bool> DeleteByUserAndStoryAsync(int userId, int storyId, CancellationToken cancellationToken = default)
+        {
+            var like = await _dbSet.FirstOrDefaultAsync(l => l.UserId == userId && l.StoryId == storyId, cancellationToken);
+            if (like == null) return false;
+            _dbSet.Remove(like);
+            await _context.SaveChangesAsync(cancellationToken);
+            return true;
+        }
     }
 }

ChapterX.Infrastructure/Repositories/NotificationRepository.cs

@@ -15 +15 @@
         // This method returns all notifications; adjust filter when a User relation is added.
         public async Task<IEnumerable<Notification>> GetByUserIdAsync(int userId, CancellationToken cancellationToken = default)
-        {
-            return await _dbSet.ToListAsync(cancellationToken);
-        }
+            => await _dbSet
+                .Where(n => n.RecipientUserId == userId)
+                .OrderByDescending(n => n.CreatedAt)
+                .ToListAsync(cancellationToken);
     }
 }

ChapterX.Infrastructure/Repositories/ReadingListItemsRepository.cs

@@ -14 +14 @@
         public async Task<bool> ExistsAsync(int listId, int storyId, CancellationToken cancellationToken = default)
             => await _dbSet.AnyAsync(i => i.ListId == listId && i.StoryId == storyId, cancellationToken);
+
+        public async Task<bool> DeleteByListAndStoryAsync(int listId, int storyId, CancellationToken cancellationToken = default)
+        {
+            var item = await _dbSet.FirstOrDefaultAsync(i => i.ListId == listId && i.StoryId == storyId, cancellationToken);
+            if (item == null) return false;
+            _dbSet.Remove(item);
+            await _context.SaveChangesAsync(cancellationToken);
+            return true;
+        }
     }
 }

ChapterX.Infrastructure/Repositories/ReadingListRepository.cs

@@ -15 +15 @@
         {
             return await _dbSet
+                .Include(r => r.User)
                 .Include(r => r.ReadingListItems)
+                    .ThenInclude(i => i.Story)
+                        .ThenInclude(s => s.Writer)
+                            .ThenInclude(w => w!.User)
+                .Include(r => r.ReadingListItems)
+                    .ThenInclude(i => i.Story)
+                        .ThenInclude(s => s.HasGenres)
+                            .ThenInclude(hg => hg.Genre)
                 .ToListAsync(cancellationToken);
         }
@@ -23 +31 @@
             return await _dbSet
                 .Where(r => r.UserId == userId)
+                .Include(r => r.User)
                 .Include(r => r.ReadingListItems)
+                    .ThenInclude(i => i.Story)
+                        .ThenInclude(s => s.Writer)
+                            .ThenInclude(w => w!.User)
+                .Include(r => r.ReadingListItems)
+                    .ThenInclude(i => i.Story)
+                        .ThenInclude(s => s.HasGenres)
+                            .ThenInclude(hg => hg.Genre)
                 .ToListAsync(cancellationToken);
         }

ChapterX.Infrastructure/Repositories/StoryRepository.cs

@@ -12 +12 @@
         }
 
+        public override async Task<IEnumerable<Story>> GetAllAsync(CancellationToken cancellationToken = default)
+        {
+            return await _dbSet
+                .Include(s => s.HasGenres)
+                    .ThenInclude(hg => hg.Genre)
+                .Include(s => s.Writer)
+                    .ThenInclude(w => w!.User)
+                .ToListAsync(cancellationToken);
+        }
+
         public async Task<IEnumerable<Story>> GetByWriterIdAsync(int writerId, CancellationToken cancellationToken = default)
         {