Innitial implementation of nested comments/replies

Streetcode/Streetcode.BLL/DTO/Streetcode/Comments/CommentDTO.cs

@@ -9,5 +9,7 @@
         public int StreetcodeId { get; set; }
         public string UserId { get; set; }
         public string UserFullName { get; set; }
+        public int? ParentCommentId { get; set; }
+        public IEnumerable<CommentDTO> Replies { get; set; }
     }
-}
+}

Streetcode/Streetcode.BLL/DTO/Streetcode/Comments/CreateCommentDTO.cs

@@ -5,5 +5,7 @@ public class CreateCommentDTO
         public string TextContent { get; set; }
 
         public int StreetcodeId { get; set; }
+
+        public int? ParentCommentId { get; set; }
     }
-}
+}

Streetcode/Streetcode.BLL/Mapping/Streetcode/Comments/CommentProfile.cs

@@ -10,13 +10,18 @@ public CommentProfile()
         {
             CreateMap<Comment, CommentDTO>()
                 .ForMember(dest => dest.UserFullName, opt => opt.MapFrom(src =>
-                    src.User != null ? $"{src.User.Name} {src.User.Surname}" : "Unknown User"));
+                    src.User != null ? $"{src.User.Name} {src.User.Surname}" : "Unknown User"))
+                .ForMember(dest => dest.ParentCommentId, opt => opt.MapFrom(src => src.ParentCommentId))
+                .ForMember(dest => dest.Replies, opt => opt.MapFrom(src => src.Replies));
+
+            CreateMap<CreateCommentDTO, Comment>()
+                .ForMember(dest => dest.ParentCommentId, opt => opt.MapFrom(src => src.ParentCommentId));
 
-            CreateMap<CreateCommentDTO, Comment>();
             CreateMap<UpdateCommentDTO, Comment>()
                 .ForMember(dest => dest.UserId, opt => opt.Ignore())
                 .ForMember(dest => dest.StreetcodeId, opt => opt.Ignore())
-                .ForMember(dest => dest.CreatedAt, opt => opt.Ignore());
+                .ForMember(dest => dest.CreatedAt, opt => opt.Ignore())
+                .ForMember(dest => dest.ParentCommentId, opt => opt.Ignore());
         }
     }
-}
+}

Streetcode/Streetcode.BLL/MediatR/Streetcode/Comments/Create/CreateCommentDTOValidator.cs

@@ -17,6 +17,11 @@ public CreateCommentDTOValidator()
 
             RuleFor(x => x.StreetcodeId)
                 .GreaterThan(0).WithMessage(Messages.Error_PropertyMustBeGreaterThanZero.Format(nameof(CreateCommentDTO.StreetcodeId)));
+
+            RuleFor(x => x.ParentCommentId)
+                .GreaterThan(0)
+                .When(x => x.ParentCommentId.HasValue)
+                .WithMessage(Messages.Error_PropertyMustBeGreaterThanZero.Format(nameof(CreateCommentDTO.ParentCommentId)));
         }
     }
-}
+}

Streetcode/Streetcode.BLL/MediatR/Streetcode/Comments/Create/CreateCommentHandler.cs

@@ -25,6 +25,19 @@ public CreateCommentHandler(IRepositoryWrapper repositoryWrapper, IMapper mapper
 
         public async Task<Result<CommentDTO>> Handle(CreateCommentCommand command, CancellationToken cancellationToken)
         {
+            if (command.Comment.ParentCommentId.HasValue)
+            {
+                var parentComment = await _repositoryWrapper.CommentRepository
+                    .GetFirstOrDefaultAsync(c => c.Id == command.Comment.ParentCommentId.Value);
+
+                if (parentComment == null)
+                {
+                    string errorParentMsg = "Parent comment not found.";
+                    _logger.LogError(command, errorParentMsg);
+                    return Result.Fail(new Error(errorParentMsg));
+                }
+            }
+
             var comment = _mapper.Map<Comment>(command.Comment);
 
             comment.UserId = command.UserId;
@@ -48,4 +61,4 @@ public async Task<Result<CommentDTO>> Handle(CreateCommentCommand command, Cance
             return Result.Fail(new Error(errorMsg));
         }
     }
-}
+}

Streetcode/Streetcode.BLL/MediatR/Streetcode/Comments/Delete/DeleteCommentHandler.cs

@@ -1,5 +1,6 @@
 using FluentResults;
 using MediatR;
+using Microsoft.EntityFrameworkCore;
 using Streetcode.BLL.Interfaces.Logging;
 using Streetcode.DAL.Entities.Streetcode.Comments;
 using Streetcode.DAL.Repositories.Interfaces.Base;
@@ -22,7 +23,9 @@ public DeleteCommentHandler(IRepositoryWrapper repositoryWrapper, ILoggerService
         public async Task<Result<Unit>> Handle(DeleteCommentCommand command, CancellationToken cancellationToken)
         {
             var comment = await _repositoryWrapper.CommentRepository
-                .GetFirstOrDefaultAsync(t => t.Id == command.Id);
+                .GetFirstOrDefaultAsync(
+                    predicate: t => t.Id == command.Id,
+                    include: x => x.Include(c => c.Replies));
 
             if (comment is null)
             {
@@ -54,4 +57,4 @@ public async Task<Result<Unit>> Handle(DeleteCommentCommand command, Cancellatio
             return Result.Fail(new Error(errorMsg));
         }
     }
-}
+}

Streetcode/Streetcode.BLL/MediatR/Streetcode/Comments/GetByStreetcodeId/GetCommentsByStreetcodeIdHandler.cs

@@ -25,11 +25,16 @@ public async Task<Result<IEnumerable<CommentDTO>>> Handle(GetCommentsByStreetcod
         {
             var comments = await _repositoryWrapper.CommentRepository.GetAllAsync(
                 predicate: c => c.StreetcodeId == request.StreetcodeId,
-                include: x => x.Include(c => c.User));
+                include: x => x.Include(c => c.User).Include(c => c.Replies));
 
-            var sortedComments = comments.OrderByDescending(c => c.CreatedAt);
+            var allMappedComments = _mapper.Map<IEnumerable<CommentDTO>>(comments);
 
-            return Result.Ok(_mapper.Map<IEnumerable<CommentDTO>>(sortedComments));
+            var rootComments = allMappedComments
+                .Where(c => c.ParentCommentId == null)
+                .OrderByDescending(c => c.CreatedAt)
+                .AsEnumerable();
+
+            return Result.Ok(rootComments);
         }
     }
-}
+}

Streetcode/Streetcode.BLL/MediatR/Streetcode/Comments/Update/UpdateCommentHandler.cs

@@ -47,7 +47,7 @@ public async Task<Result<CommentDTO>> Handle(UpdateCommentCommand command, Cance
                 return Result.Fail(new Error(errorAuthMsg));
             }
 
-            comment = _mapper.Map(command.Comment, comment);
+            _mapper.Map(command.Comment, comment);
             comment.UpdatedAt = DateTime.UtcNow;
 
             _repositoryWrapper.CommentRepository.Update(comment);
@@ -63,4 +63,4 @@ public async Task<Result<CommentDTO>> Handle(UpdateCommentCommand command, Cance
             return Result.Fail(new Error(errorMsg));
         }
     }
-}
+}

Streetcode/Streetcode.DAL/Entities/Streetcode/Comments/Comment.cs

@@ -29,5 +29,11 @@ public class Comment
         public string UserId { get; set; }
 
         public User? User { get; set; }
+
+        public int? ParentCommentId { get; set; }
+
+        public Comment? ParentComment { get; set; }
+
+        public ICollection<Comment> Replies { get; set; } = new List<Comment>();
     }
-}
+}

Streetcode/Streetcode.DAL/Persistence/StreetcodeDbContext.cs

@@ -320,5 +320,21 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
            .WithOne(t => t.User)
            .HasForeignKey(t => t.UserId)
            .OnDelete(DeleteBehavior.Cascade);
+
+        modelBuilder.Entity<Comment>(entity =>
+        {
+            entity.HasOne(c => c.ParentComment)
+                .WithMany(c => c.Replies)
+                .HasForeignKey(c => c.ParentCommentId)
+                .OnDelete(DeleteBehavior.Cascade);
+
+            entity.HasOne(c => c.Streetcode)
+                .WithMany(s => s.Comments)
+                .HasForeignKey(c => c.StreetcodeId);
+
+            entity.HasOne(c => c.User)
+                .WithMany(u => u.Comments)
+                .HasForeignKey(c => c.UserId);
+        });
     }
 }

Streetcode/Streetcode.WebApi/Controllers/Streetcode/Comments/CommentController.cs

@@ -65,4 +65,4 @@ public async Task<IActionResult> Delete([FromRoute] int id)
     {
         return User.FindFirst(ClaimTypes.NameIdentifier)?.Value;
     }
-}
+}

Streetcode/Streetcode.XUnitTest/MediatR/Comments/Create/CreateCommentHandlerTests.cs

@@ -59,72 +59,62 @@
             var userId = "user-123";
             var command = new CreateCommentCommand(createDto, userId);
 
-            var commentEntity = new Comment
-            {
-                Id = 1,
-                TextContent = createDto.TextContent,
-                StreetcodeId = createDto.StreetcodeId,
-                UserId = userId,
-            };
-
-            this.commentRepositoryMock.Setup(x => x.CreateAsync(It.IsAny<Comment>()))
-                .ReturnsAsync(commentEntity);
-
-            this.repositoryWrapperMock.Setup(x => x.SaveChangesAsync())
-                .ReturnsAsync(1);
-
-            this.userRepositoryMock
-                .Setup(x => x.GetFirstOrDefaultAsync(
-                    It.IsAny<Expression<Func<User, bool>>>(),
-                    null,
-                    It.IsAny<bool>()))
-                .ReturnsAsync(new User());
+            this.SetupStandardSuccessMocks(userId, createDto.TextContent);
 
             // Act
             var result = await this.handler.Handle(command, CancellationToken.None);
 
             // Assert
             result.IsSuccess.Should().BeTrue();
-            result.Value.Should().NotBeNull();
             result.Value.TextContent.Should().Be(createDto.TextContent);
-
-            this.commentRepositoryMock.Verify(x => x.CreateAsync(It.IsAny<Comment>()), Times.Once);
-            this.repositoryWrapperMock.Verify(x => x.SaveChangesAsync(), Times.Once);
         }
 
         [Fact]
-        public async Task Handle_SetsCorrectUser_WhenRequestIsValid()
+        public async Task Handle_ReturnsSuccess_WhenReplyIsValid()
         {
             // Arrange
+            int parentId = 1;
             var createDto = GetCreateCommentDTO();
-            var userId = "test-user-id";
+            createDto.ParentCommentId = parentId;
+            var userId = "user-123";
             var command = new CreateCommentCommand(createDto, userId);
 
-            var user = new User
-            {
-                Id = userId,
-                Name = "TestName",
-                Surname = "TestSurname",
-            };
+            this.commentRepositoryMock.Setup(x => x.GetFirstOrDefaultAsync(
+                It.IsAny<Expression<Func<Comment, bool>>>(), null, It.IsAny<bool>()))
+                .ReturnsAsync(new Comment { Id = parentId });
 
-            this.commentRepositoryMock.Setup(x => x.CreateAsync(It.IsAny<Comment>()))
-                .ReturnsAsync((Comment c) => c);
+            this.SetupStandardSuccessMocks(userId, createDto.TextContent);
 
-            this.repositoryWrapperMock.Setup(x => x.SaveChangesAsync()).ReturnsAsync(1);
+            // Act
+            var result = await this.handler.Handle(command, CancellationToken.None);
 
-            this.userRepositoryMock
-                .Setup(x => x.GetFirstOrDefaultAsync(
-                    It.IsAny<Expression<Func<User, bool>>>(),
-                    null,
-                    It.IsAny<bool>()))
-                .ReturnsAsync(user);
+            // Assert
+            result.IsSuccess.Should().BeTrue();
+            result.Value.ParentCommentId.Should().Be(parentId);
+            this.commentRepositoryMock.Verify(x => x.GetFirstOrDefaultAsync(It.IsAny<Expression<Func<Comment, bool>>>(), null, It.IsAny<bool>()), Times.Once);
+        }
+
+        [Fact]
+        public async Task Handle_ReturnsFail_WhenParentCommentNotFound()
+        {
+            // Arrange
+            int parentId = 999;
+            var createDto = GetCreateCommentDTO();
+            createDto.ParentCommentId = parentId;
+            var userId = "user-123";
+            var command = new CreateCommentCommand(createDto, userId);
+
+            this.commentRepositoryMock.Setup(x => x.GetFirstOrDefaultAsync(
+                It.IsAny<Expression<Func<Comment, bool>>>(), null, It.IsAny<bool>()))
+                .ReturnsAsync((Comment)null);
 
             // Act
             var result = await this.handler.Handle(command, CancellationToken.None);
 
             // Assert
-            result.Value.UserId.Should().Be(userId);
-            result.Value.UserFullName.Should().Be("TestName TestSurname");
+            result.IsFailed.Should().BeTrue();
+            result.Errors.First().Message.Should().Be("Parent comment not found.");
+            this.loggerMock.Verify(x => x.LogError(command, "Parent comment not found."), Times.Once);
         }
 
         [Fact]
@@ -135,24 +125,36 @@
             var userId = "user-123";
             var command = new CreateCommentCommand(createDto, userId);
 
-            this.commentRepositoryMock.Setup(x => x.CreateAsync(It.IsAny<Comment>()));
-
-            this.repositoryWrapperMock.Setup(x => x.SaveChangesAsync())
-                .ReturnsAsync(0);
-
-            var expectedErrorMsg = Messages.Error_FailedToCreateEntity.Format(nameof(Comment));
+            this.repositoryWrapperMock.Setup(x => x.SaveChangesAsync()).ReturnsAsync(0);
 
             // Act
             var result = await this.handler.Handle(command, CancellationToken.None);
 
             // Assert
             result.IsFailed.Should().BeTrue();
-            result.Errors.First().Message.Should().Be(expectedErrorMsg);
+            this.loggerMock.Verify(x => x.LogError(command, It.IsAny<string>()), Times.Once);
+        }
+
+        private void SetupStandardSuccessMocks(string userId, string textContent)
+        {
+            var commentEntity = new Comment
+            {
+                Id = 1,
+                TextContent = textContent,
+                UserId = userId,
+            };
+
+            this.commentRepositoryMock.Setup(x => x.CreateAsync(It.IsAny<Comment>()))
+                .ReturnsAsync(commentEntity);
+
+            this.repositoryWrapperMock.Setup(x => x.SaveChangesAsync()).ReturnsAsync(1);
 
-            this.loggerMock.Verify(x => x.LogError(command, expectedErrorMsg), Times.Once);
+            this.userRepositoryMock.Setup(x => x.GetFirstOrDefaultAsync(
+                It.IsAny<Expression<Func<User, bool>>>(), null, It.IsAny<bool>()))
+                .ReturnsAsync(new User { Id = userId, Name = "Name", Surname = "Surname" });
         }
 
         private static CreateCommentDTO GetCreateCommentDTO()
         {
             return new CreateCommentDTO
             {
@@ -161,4 +163,4 @@
             };
         }
     }
-}
+}