Index: ChapterX.API/Controllers/CommentsController.cs =================================================================== --- ChapterX.API/Controllers/CommentsController.cs (revision e294f7d2cedd462a923c69ae9f85c996b5377c69) +++ ChapterX.API/Controllers/CommentsController.cs (revision 73b69b22fa1e9888b8530a66db4a150efb8f52bc) @@ -1,4 +1,5 @@ using ChapterX.Application.Comment.Commands; using ChapterX.Application.Comment.Queries; +using ChapterX.Domain.Repositories; using MediatR; using Microsoft.AspNetCore.Authorization; @@ -13,10 +14,29 @@ { private readonly IMediator _mediator; + private readonly ICommentRepository _commentRepository; private readonly ILogger _logger; - public CommentsController(IMediator mediator, ILogger logger) + public CommentsController(IMediator mediator, ICommentRepository commentRepository, ILogger logger) { _mediator = mediator; + _commentRepository = commentRepository; _logger = logger; + } + + [HttpGet("story/{storyId:int}")] + [AllowAnonymous] + public async Task GetByStory(int storyId) + { + var comments = await _commentRepository.GetByStoryIdAsync(storyId); + var result = comments.Select(c => new + { + id = c.Id, + content = c.Content, + userId = c.UserId, + storyId = c.StoryId, + username = c.User?.Username ?? "", + createdAt = c.CreatedAt, + }); + return Ok(result); } Index: ChapterX.API/Controllers/LikesController.cs =================================================================== --- ChapterX.API/Controllers/LikesController.cs (revision e294f7d2cedd462a923c69ae9f85c996b5377c69) +++ ChapterX.API/Controllers/LikesController.cs (revision 73b69b22fa1e9888b8530a66db4a150efb8f52bc) @@ -1,4 +1,5 @@ using ChapterX.Application.Likes.Commands; using ChapterX.Application.Likes.Queries; +using ChapterX.Domain.Repositories; using MediatR; using Microsoft.AspNetCore.Authorization; @@ -13,10 +14,29 @@ { private readonly IMediator _mediator; + private readonly ILikesRepository _likesRepository; private readonly ILogger _logger; - public LikesController(IMediator mediator, ILogger logger) + public LikesController(IMediator mediator, ILikesRepository likesRepository, ILogger logger) { _mediator = mediator; + _likesRepository = likesRepository; _logger = logger; + } + + [HttpGet("story/{storyId:int}")] + [AllowAnonymous] + public async Task GetByStory(int storyId) + { + var likes = await _likesRepository.GetByStoryIdAsync(storyId); + return Ok(new { count = likes.Count(), userIds = likes.Select(l => l.UserId).ToList() }); + } + + [HttpDelete("user/{userId:int}/story/{storyId:int}")] + [Authorize] + public async Task DeleteByUserAndStory(int userId, int storyId) + { + var deleted = await _likesRepository.DeleteByUserAndStoryAsync(userId, storyId); + if (!deleted) return NotFound(); + return Ok(); } @@ -43,5 +63,7 @@ public async Task Add([FromBody] AddRequest request) { - _logger.LogInformation("Adding a new like for ChapterId: {ChapterId}", request.ChapterId); + _logger.LogInformation("Adding a new like for StoryId: {StoryId}", request.StoryId); + var exists = await _likesRepository.ExistsAsync(request.UserId, request.StoryId); + if (exists) return Ok(); var response = await _mediator.Send(request); return Ok(response); Index: ChapterX.API/Controllers/NotificationsController.cs =================================================================== --- ChapterX.API/Controllers/NotificationsController.cs (revision e294f7d2cedd462a923c69ae9f85c996b5377c69) +++ ChapterX.API/Controllers/NotificationsController.cs (revision 73b69b22fa1e9888b8530a66db4a150efb8f52bc) @@ -1,4 +1,5 @@ using ChapterX.Application.Notification.Commands; using ChapterX.Application.Notification.Queries; +using ChapterX.Domain.Repositories; using MediatR; using Microsoft.AspNetCore.Authorization; @@ -13,10 +14,40 @@ { private readonly IMediator _mediator; + private readonly INotificationRepository _notificationRepository; private readonly ILogger _logger; - public NotificationsController(IMediator mediator, ILogger logger) + public NotificationsController(IMediator mediator, INotificationRepository notificationRepository, ILogger logger) { _mediator = mediator; + _notificationRepository = notificationRepository; _logger = logger; + } + + [HttpGet("user/{userId:int}")] + [Authorize] + public async Task GetByUser(int userId) + { + var notifications = await _notificationRepository.GetByUserIdAsync(userId); + var result = notifications.Select(n => new + { + id = n.Id, + content = n.Content, + isRead = n.IsRead, + createdAt = n.CreatedAt, + type = n.Type ?? "info", + link = n.Link, + }); + return Ok(result); + } + + [HttpPut("{id:int}/read")] + [Authorize] + public async Task MarkRead(int id) + { + var notification = await _notificationRepository.GetByIdAsync(id); + if (notification == null) return NotFound(); + notification.IsRead = true; + await _notificationRepository.UpdateAsync(notification); + return Ok(); } Index: ChapterX.API/Controllers/ReadingListItemsController.cs =================================================================== --- ChapterX.API/Controllers/ReadingListItemsController.cs (revision e294f7d2cedd462a923c69ae9f85c996b5377c69) +++ ChapterX.API/Controllers/ReadingListItemsController.cs (revision 73b69b22fa1e9888b8530a66db4a150efb8f52bc) @@ -1,4 +1,5 @@ using ChapterX.Application.ReadingListItems.Commands; using ChapterX.Application.ReadingListItems.Queries; +using ChapterX.Domain.Repositories; using MediatR; using Microsoft.AspNetCore.Authorization; @@ -13,9 +14,11 @@ { private readonly IMediator _mediator; + private readonly IReadingListItemsRepository _readingListItemsRepository; private readonly ILogger _logger; - public ReadingListItemsController(IMediator mediator, ILogger logger) + public ReadingListItemsController(IMediator mediator, IReadingListItemsRepository readingListItemsRepository, ILogger logger) { _mediator = mediator; + _readingListItemsRepository = readingListItemsRepository; _logger = logger; } @@ -70,4 +73,13 @@ return Ok(response); } + + [HttpDelete("{listId:int}/story/{storyId:int}")] + [Authorize] + public async Task DeleteByListAndStory(int listId, int storyId) + { + _logger.LogInformation("Removing story {StoryId} from list {ListId}", storyId, listId); + var deleted = await _readingListItemsRepository.DeleteByListAndStoryAsync(listId, storyId); + return deleted ? Ok() : NotFound(); + } } } Index: ChapterX.API/Controllers/ReadingListsController.cs =================================================================== --- ChapterX.API/Controllers/ReadingListsController.cs (revision e294f7d2cedd462a923c69ae9f85c996b5377c69) +++ ChapterX.API/Controllers/ReadingListsController.cs (revision 73b69b22fa1e9888b8530a66db4a150efb8f52bc) @@ -1,4 +1,5 @@ using ChapterX.Application.ReadingList.Commands; using ChapterX.Application.ReadingList.Queries; +using ChapterX.Domain.Repositories; using MediatR; using Microsoft.AspNetCore.Authorization; @@ -13,10 +14,22 @@ { private readonly IMediator _mediator; + private readonly IReadingListRepository _readingListRepository; private readonly ILogger _logger; - public ReadingListsController(IMediator mediator, ILogger logger) + public ReadingListsController(IMediator mediator, IReadingListRepository readingListRepository, ILogger logger) { _mediator = mediator; + _readingListRepository = readingListRepository; _logger = logger; + } + + [HttpGet("user/{userId:int}")] + [Authorize] + public async Task GetByUser(int userId) + { + _logger.LogInformation("Fetching reading lists for user {UserId}", userId); + var lists = await _readingListRepository.GetByUserIdAsync(userId); + var result = lists.Select(l => MapList(l)); + return Ok(result); } @@ -26,7 +39,28 @@ { _logger.LogInformation("Fetching all reading lists"); - var response = await _mediator.Send(new GetAllRequest()); - return Ok(response); + var lists = await _readingListRepository.GetAllAsync(); + var result = lists.Select(l => MapList(l)); + return Ok(result); } + + private static object MapList(Domain.Entities.ReadingList l) => new + { + id = l.Id, + name = l.Name, + content = l.Content, + isPublic = l.IsPublic, + userId = l.UserId, + createdAt = l.CreatedAt, + username = l.User?.Username ?? "", + readingListItems = l.ReadingListItems.Select(i => new + { + listId = i.ListId, + storyId = i.StoryId, + addedAt = i.AddedAt, + storyTitle = i.Story?.ShortDescription ?? "", + authorUsername = i.Story?.Writer?.User?.Username ?? "", + genres = i.Story?.HasGenres.Select(hg => hg.Genre?.Name).Where(n => n != null).ToList() ?? [] + }).ToList() + }; [HttpGet("{id:int}")]