Index: ChapterX.API/Controllers/StoriesController.cs
===================================================================
--- ChapterX.API/Controllers/StoriesController.cs	(revision a6e33d1f34c0dbbfff38bfb2c73eea32abfe7cff)
+++ ChapterX.API/Controllers/StoriesController.cs	(revision 877c13c3dd0934c1d31da7988d0d2c2c5925ed55)
@@ -5,5 +5,4 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
-using System.Security.Claims;
 
 namespace ChapterX.API.Controllers
@@ -29,22 +28,5 @@
             _logger.LogInformation("Fetching all stories");
             var response = await _mediator.Send(request);
-            var stories = response.Stories.Select(s => new
-            {
-                id = s.Id,
-                userId = s.UserId,
-                title = s.Title,
-                shortDescription = s.ShortDescription,
-                image = s.Image,
-                content = s.Content,
-                matureContent = s.MatureContent,
-                createdAt = s.CreatedAt,
-                updatedAt = s.UpdatedAt,
-                writer = s.Writer == null ? null : new { user = s.Writer.User == null ? null : new { username = s.Writer.User.Username } },
-                hasGenres = s.HasGenres.Select(hg => new { genre = new { name = hg.Genre?.Name ?? "" } }),
-                likes = s.Likes.Select(l => new { userId = l.UserId }),
-                comments = s.Comments.Select(c => new { id = c.Id }),
-                chapters = s.Chapters.Select(c => new { id = c.Id, viewCount = c.ViewCount }),
-            });
-            return Ok(new { stories });
+            return Ok(response);
         }
 
@@ -56,23 +38,5 @@
             _logger.LogInformation("Fetching story with ID: {StoryId}", id);
             var response = await _mediator.Send(new GetRequest(id));
-            if (response.Story == null) return NotFound();
-            var s = response.Story;
-            return Ok(new
-            {
-                id = s.Id,
-                userId = s.UserId,
-                title = s.Title,
-                shortDescription = s.ShortDescription,
-                image = s.Image,
-                content = s.Content,
-                matureContent = s.MatureContent,
-                createdAt = s.CreatedAt,
-                updatedAt = s.UpdatedAt,
-                writer = s.Writer == null ? null : new { user = s.Writer.User == null ? null : new { username = s.Writer.User.Username } },
-                hasGenres = s.HasGenres.Select(hg => new { genre = new { name = hg.Genre?.Name ?? "" } }),
-                likes = s.Likes.Select(l => new { userId = l.UserId }),
-                comments = s.Comments.Select(c => new { id = c.Id }),
-                chapters = s.Chapters.Select(c => new { id = c.Id, viewCount = c.ViewCount }),
-            });
+            return Ok(response);
         }
 
@@ -82,7 +46,6 @@
         public async Task<ActionResult> Add([FromBody] AddRequest request)
         {
-            var callerId = int.Parse(User.FindFirstValue(ClaimTypes.NameIdentifier)!);
-            _logger.LogInformation("Adding a new story for UserId: {UserId}", callerId);
-            var response = await _mediator.Send(request with { UserId = callerId });
+            _logger.LogInformation("Adding a new story for UserId: {UserId}", request.UserId);
+            var response = await _mediator.Send(request);
             return Ok(response);
         }
@@ -99,6 +62,5 @@
             }
 
-            var callerId = int.Parse(User.FindFirstValue(ClaimTypes.NameIdentifier)!);
-            var response = await _mediator.Send(request with { CallerId = callerId });
+            var response = await _mediator.Send(request);
             return Ok(response);
         }
@@ -110,7 +72,5 @@
         {
             _logger.LogInformation("Deleting story with ID: {StoryId}", id);
-            var callerId = int.Parse(User.FindFirstValue(ClaimTypes.NameIdentifier)!);
-            var isAdmin = User.IsInRole("Admin");
-            var response = await _mediator.Send(new DeleteRequest(id, callerId, isAdmin));
+            var response = await _mediator.Send(new DeleteRequest(id));
             return Ok(response);
         }