merge(#24): add pagination

crowdparlay · Feb 19, 2024 · d933860 · d933860
2 parents 200b4c4 + 6ded245
commit d933860
Show file tree

Hide file tree

Showing 23 changed files with 604 additions and 558 deletions.
diff --git a/...pplication/Consumers/UserEventConsumer.cs → ...Social.Api/Consumers/UserEventConsumer.cs b/...pplication/Consumers/UserEventConsumer.cs → ...Social.Api/Consumers/UserEventConsumer.cs
@@ -2,7 +2,7 @@
 using CrowdParlay.Social.Application.Abstractions;
 using MassTransit;
 
-namespace CrowdParlay.Social.Application.Consumers;
+namespace CrowdParlay.Social.Api.Consumers;
 
 public class UserEventConsumer : IConsumer<UserCreatedEvent>, IConsumer<UserUpdatedEvent>, IConsumer<UserDeletedEvent>
 {

diff --git a/src/CrowdParlay.Social.Api/Extensions/ConfigureServices.cs b/src/CrowdParlay.Social.Api/Extensions/ConfigureServices.cs
@@ -1,6 +1,6 @@
 using CrowdParlay.Communication;
+using CrowdParlay.Social.Api.Consumers;
 using CrowdParlay.Social.Api.Middlewares;
-using CrowdParlay.Social.Application.Consumers;
 using MassTransit;
 
 namespace CrowdParlay.Social.Api.Extensions;

diff --git a/src/CrowdParlay.Social.Api/v1/Controllers/CommentsController.cs b/src/CrowdParlay.Social.Api/v1/Controllers/CommentsController.cs
@@ -33,12 +33,12 @@ public async Task<CommentDto> GetCommentById([FromRoute] Guid commentId) =>
     [ProducesResponseType(typeof(IEnumerable<CommentDto>), (int)HttpStatusCode.OK)]
     [ProducesResponseType(typeof(Problem), (int)HttpStatusCode.InternalServerError)]
     [ProducesResponseType(typeof(ValidationProblem), (int)HttpStatusCode.BadRequest)]
-    public async Task<IEnumerable<CommentDto>> SearchComments(
+    public async Task<Page<CommentDto>> SearchComments(
         [FromQuery] Guid? discussionId,
         [FromQuery] Guid? authorId,
-        [FromQuery, BindRequired] int page,
-        [FromQuery, BindRequired] int size) =>
-        await _comments.SearchAsync(discussionId, authorId, page, size);
+        [FromQuery, BindRequired] int offset,
+        [FromQuery, BindRequired] int count) =>
+        await _comments.SearchAsync(discussionId, authorId, offset, count);
 
     /// <summary>
     /// Creates a top-level comment in discussion.
@@ -66,11 +66,11 @@ public async Task<ActionResult<CommentDto>> Create([FromBody] CommentRequest req
     [ProducesResponseType(typeof(Problem), (int)HttpStatusCode.InternalServerError)]
     [ProducesResponseType(typeof(ValidationProblem), (int)HttpStatusCode.BadRequest)]
     [ProducesResponseType(typeof(Problem), (int)HttpStatusCode.NotFound)]
-    public async Task<IEnumerable<CommentDto>> GetRepliesToComment(
+    public async Task<Page<CommentDto>> GetRepliesToComment(
         [FromRoute] Guid parentCommentId,
-        [FromQuery, BindRequired] int page,
-        [FromQuery, BindRequired] int size) =>
-        await _comments.GetRepliesToCommentAsync(parentCommentId, page, size);
+        [FromQuery, BindRequired] int offset,
+        [FromQuery, BindRequired] int count) =>
+        await _comments.GetRepliesToCommentAsync(parentCommentId, offset, count);
 
     /// <summary>
     /// Creates a reply to the comment with the specified ID.

diff --git a/src/CrowdParlay.Social.Application/Abstractions/ICommentRepository.cs b/src/CrowdParlay.Social.Application/Abstractions/ICommentRepository.cs
@@ -5,9 +5,9 @@ namespace CrowdParlay.Social.Application.Abstractions;
 public interface ICommentRepository
 {
     public Task<CommentDto> GetByIdAsync(Guid id);
-    public Task<IEnumerable<CommentDto>> SearchAsync(Guid? discussionId, Guid? authorId, int page, int size);
+    public Task<Page<CommentDto>> SearchAsync(Guid? discussionId, Guid? authorId, int offset, int count);
     public Task<CommentDto> CreateAsync(Guid authorId, Guid discussionId, string content);
-    public Task<IEnumerable<CommentDto>> GetRepliesToCommentAsync(Guid parentCommentId, int page, int size);
+    public Task<Page<CommentDto>> GetRepliesToCommentAsync(Guid parentCommentId, int offset, int count);
     public Task<CommentDto> ReplyToCommentAsync(Guid authorId, Guid parentCommentId, string content);
     public Task DeleteAsync(Guid id);
 }
diff --git a/src/CrowdParlay.Social.Application/CrowdParlay.Social.Application.csproj b/src/CrowdParlay.Social.Application/CrowdParlay.Social.Application.csproj
@@ -15,7 +15,6 @@
       <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
       <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
       <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
-      <PackageReference Include="Neo4jClient" Version="5.1.11" />
       <PackageReference Include="Serilog" Version="3.0.1" />
       <PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
       <PackageReference Include="Serilog.Settings.AppSettings" Version="2.2.2" />

diff --git a/src/CrowdParlay.Social.Application/DTOs/CommentDto.cs b/src/CrowdParlay.Social.Application/DTOs/CommentDto.cs
@@ -5,7 +5,7 @@ public class CommentDto
     public Guid Id { get; set; }
     public string Content { get; set; }
     public AuthorDto Author { get; set; }
-    public DateTime CreatedAt { get; set; }
+    public DateTimeOffset CreatedAt { get; set; }
     public int ReplyCount { get; set; }
     public IEnumerable<AuthorDto> FirstRepliesAuthors { get; set; } = Enumerable.Empty<AuthorDto>();
 }
diff --git a/src/CrowdParlay.Social.Application/DTOs/Page.cs b/src/CrowdParlay.Social.Application/DTOs/Page.cs
@@ -0,0 +1,13 @@
+namespace CrowdParlay.Social.Application.DTOs;
+
+public class Page<T>
+{
+    public required int TotalCount { get; set; }
+    public required IEnumerable<T> Items { get; set; }
+
+    public static Page<T> Empty => new()
+    {
+        TotalCount = 0,
+        Items = Enumerable.Empty<T>()
+    };
+}
diff --git a/src/CrowdParlay.Social.Infrastructure.Persistence/ConfigureServices.cs b/src/CrowdParlay.Social.Infrastructure.Persistence/ConfigureServices.cs
@@ -2,7 +2,7 @@
 using CrowdParlay.Social.Infrastructure.Persistence.Services;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Neo4jClient;
+using Neo4j.Driver;
 
 namespace CrowdParlay.Social.Infrastructure.Persistence;
 
@@ -30,7 +30,7 @@ private static IServiceCollection AddNeo4j(this IServiceCollection services, ICo
             configuration["NEO4J_PASSWORD"] ??
             throw new InvalidOperationException("NEO4J_PASSWORD is not set!");
 
-        var client = new BoltGraphClient(uri, username, password);
-        return services.AddSingleton<IGraphClient>(client);
+        var driver = GraphDatabase.Driver(uri, AuthTokens.Basic(username, password));
+        return services.AddSingleton(driver);
     }
 }
diff --git a/...ay.Social.Infrastructure.Persistence/CrowdParlay.Social.Infrastructure.Persistence.csproj b/...ay.Social.Infrastructure.Persistence/CrowdParlay.Social.Infrastructure.Persistence.csproj
@@ -8,7 +8,7 @@
 
     <ItemGroup>
       <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
-      <PackageReference Include="Neo4jClient" Version="5.1.11" />
+      <PackageReference Include="Neo4j.Driver" Version="5.17.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/CrowdParlay.Social.Infrastructure.Persistence/Services/AuthorRepository.cs b/src/CrowdParlay.Social.Infrastructure.Persistence/Services/AuthorRepository.cs
@@ -1,89 +1,127 @@
 using CrowdParlay.Social.Application.Abstractions;
 using CrowdParlay.Social.Application.DTOs;
 using CrowdParlay.Social.Application.Exceptions;
-using Neo4jClient;
+using Mapster;
+using Neo4j.Driver;
 
 namespace CrowdParlay.Social.Infrastructure.Persistence.Services;
 
 public class AuthorRepository : IAuthorRepository
 {
-    private readonly IGraphClient _graphClient;
+    private readonly IDriver _driver;
 
-    public AuthorRepository(IGraphClient graphClient) => _graphClient = graphClient;
+    public AuthorRepository(IDriver driver) => _driver = driver;
 
     public async Task<AuthorDto> GetByIdAsync(Guid id)
     {
-        var results = await _graphClient.Cypher
-            .WithParams(new { id })
-            .Match("(a:Author { Id: $id })")
-            .Return<AuthorDto>("a")
-            .ResultsAsync;
+        await using var session = _driver.AsyncSession();
+        return await session.ExecuteReadAsync(async runner =>
+        {
+            var data = await runner.RunAsync(
+                """
+                MATCH (author:Author { Id: $id })
+                RETURN {
+                    Id: author.Id,
+                    Username: author.Username,
+                    DisplayName: author.DisplayName,
+                    AvatarUrl: author.AvatarUrl
+                }
+                """,
+                new { id = id.ToString() });
 
-        return
-            results.SingleOrDefault()
-            ?? throw new NotFoundException();
+            var record = await data.SingleAsync();
+            return record[0].Adapt<AuthorDto>();
+        });
     }
 
     public async Task<AuthorDto> CreateAsync(Guid id, string username, string displayName, string? avatarUrl)
     {
-        var results = await _graphClient.Cypher
-            .WithParams(new
-            {
-                id,
-                username,
-                displayName,
-                avatarUrl
-            })
-            .Create(
+        await using var session = _driver.AsyncSession();
+        return await session.ExecuteWriteAsync(async runner =>
+        {
+            var data = await runner.RunAsync(
                 """
-                (a:Author {
+                CREATE (author:Author {
                     Id: $id,
                     Username: $username,
                     DisplayName: $displayName,
                     AvatarUrl: $avatarUrl
                 })
-                """)
-            .Return<AuthorDto>("a")
-            .ResultsAsync;
+                RETURN {
+                    Id: author.Id,
+                    Username: author.Username,
+                    DisplayName: author.DisplayName,
+                    AvatarUrl: author.AvatarUrl
+                }
+                """,
+                new
+                {
+                    id = id.ToString(),
+                    username,
+                    displayName,
+                    avatarUrl
+                });
 
-        return results.Single();
+            var record = await data.SingleAsync();
+            return record[0].Adapt<AuthorDto>();
+        });
     }
 
     public async Task<AuthorDto> UpdateAsync(Guid id, string username, string displayName, string? avatarUrl)
     {
-        var results = await _graphClient.Cypher
-            .WithParams(new
-            {
-                id,
-                username,
-                displayName,
-                avatarUrl
-            })
-            .Match("(a:Author { Id: $id })")
-            .Set(
+        await using var session = _driver.AsyncSession();
+        return await session.ExecuteWriteAsync(async runner =>
+        {
+            var data = await runner.RunAsync(
                 """
-                a.Username = $username,
-                a.DisplayName = $displayName,
-                a.AvatarUrl = $avatarUrl
-                """)
-            .Return<AuthorDto>("a")
-            .ResultsAsync;
+                CREATE (author:Author {
+                    Id: $id,
+                    Username: $username,
+                    DisplayName: $displayName,
+                    AvatarUrl: $avatarUrl
+                })
+                MATCH (author:Author { Id: $id })
+                SET author.Username = $username,
+                    author.DisplayName = $displayName,
+                    author.AvatarUrl = $avatarUrl
+                RETURN {
+                    Id: author.Id,
+                    Username: author.Username,
+                    DisplayName: author.DisplayName,
+                    AvatarUrl: author.AvatarUrl
+                }
+                """,
+                new
+                {
+                    id = id.ToString(),
+                    username,
+                    displayName,
+                    avatarUrl
+                });
 
-        return
-            results.SingleOrDefault()
-            ?? throw new NotFoundException();
+            var record = await data.SingleAsync();
+            return record[0].Adapt<AuthorDto>();
+        });
     }
 
     public async Task DeleteAsync(Guid id)
     {
-        var results = await _graphClient.Cypher
-            .WithParams(new { id })
-            .OptionalMatch("(a:Author { Id: $id })")
-            .Delete("a")
-            .Return<bool>("COUNT(a) = 0")
-            .ResultsAsync;
+        await using var session = _driver.AsyncSession();
+        var notFount = await session.ExecuteWriteAsync(async runner =>
+        {
+            var data = await runner.RunAsync(
+                """
+                OPTIONAL MATCH (author:Author { Id: $id })
+                DETACH DELETE author
+                RETURN COUNT(author) = 0
+                """,
+                new { id = id.ToString() });
+
+            var record = await data.SingleAsync();
+            return record[0].As<bool>();
+        });
 
-        if (results.Single())
+        if (notFount)
             throw new NotFoundException();
     }
 }