This commit is contained in:
john 2025-05-04 00:57:27 +02:00
parent ab2e20f7e1
commit befaa207d7
23 changed files with 244 additions and 95 deletions

View file

@ -1,5 +1,5 @@
using Femto.Api.Controllers.Authors.Dto;
using Femto.Modules.Blog.Domain.Posts.Commands.GetAuthorPosts;
using Femto.Modules.Blog.Domain.Posts.Commands.GetPosts;
using MediatR;
using Microsoft.AspNetCore.Mvc;
@ -9,20 +9,32 @@ namespace Femto.Api.Controllers.Authors;
[Route("authors")]
public class AuthorsController(IMediator mediator) : ControllerBase
{
[HttpGet("{authorId}/posts")]
[HttpGet("{username}/posts")]
public async Task<ActionResult<GetAuthorPostsResponse>> GetAuthorPosts(
Guid authorId,
string username,
[FromQuery] GetAuthorPostsSearchParams searchParams,
CancellationToken cancellationToken
)
{
var posts = await mediator.Send(
new GetAuthorPostsQuery(authorId, searchParams.Cursor, searchParams.Count),
var res = await mediator.Send(
new GetPostsQuery
{
Username = username,
Amount = searchParams.Amount ?? 20,
From = searchParams.From,
},
cancellationToken
);
return new GetAuthorPostsResponse(
posts.Select(p => new AuthorPostDto(p.PostId, p.Text, p.Media.Select(m => m.Url)))
res.Posts.Select(p => new AuthorPostDto(
p.PostId,
p.Text,
p.Media.Select(m => m.Url),
p.CreatedAt,
new AuthoPostAuthorDto(p.Author.AuthorId, p.Author.Username)
)),
res.Next
);
}
}

View file

@ -0,0 +1,6 @@
using JetBrains.Annotations;
namespace Femto.Api.Controllers.Authors.Dto;
[PublicAPI]
public record AuthoPostAuthorDto(Guid AuthorId, string Username);

View file

@ -0,0 +1,6 @@
using JetBrains.Annotations;
namespace Femto.Api.Controllers.Authors.Dto;
[PublicAPI]
public record AuthorPostDto(Guid PostId, string Content, IEnumerable<Uri> Media, DateTime CreatedAt, AuthoPostAuthorDto Author );

View file

@ -3,7 +3,4 @@ using JetBrains.Annotations;
namespace Femto.Api.Controllers.Authors.Dto;
[PublicAPI]
public record GetAuthorPostsResponse(IEnumerable<AuthorPostDto> Posts);
[PublicAPI]
public record AuthorPostDto(Guid PostId, string Content, IEnumerable<Uri> Media);
public record GetAuthorPostsResponse(IEnumerable<AuthorPostDto> Posts, Guid? Next);

View file

@ -0,0 +1,3 @@
namespace Femto.Api.Controllers.Authors;
public record GetAuthorPostsSearchParams(Guid? From, int? Amount);

View file

@ -1,3 +0,0 @@
namespace Femto.Api.Controllers.Authors;
public record GetAuthorPostsSearchParams(Guid? Cursor, int? Count);

View file

@ -0,0 +1,6 @@
using JetBrains.Annotations;
namespace Femto.Api.Controllers.Posts.Dto;
[PublicAPI]
public record GetAllPublicPostsResponse(IEnumerable<PublicPostDto> Posts, Guid? Next);

View file

@ -1,6 +0,0 @@
namespace Femto.Api.Controllers.Posts.Dto;
public record GetPostResponse
{
}

View file

@ -0,0 +1,6 @@
using JetBrains.Annotations;
namespace Femto.Api.Controllers.Posts.Dto;
[PublicAPI]
public record GetPublicPostsSearchParams(Guid? From, int? Amount);

View file

@ -0,0 +1,6 @@
using JetBrains.Annotations;
namespace Femto.Api.Controllers.Posts.Dto;
[PublicAPI]
public record PublicPostAuthorDto(Guid AuthorId, string Username);

View file

@ -0,0 +1,12 @@
using JetBrains.Annotations;
namespace Femto.Api.Controllers.Posts.Dto;
[PublicAPI]
public record PublicPostDto(
PublicPostAuthorDto Author,
Guid PostId,
string Content,
IEnumerable<Uri> Media,
DateTime CreatedAt
);

View file

@ -1,5 +1,6 @@
using Femto.Api.Controllers.Posts.Dto;
using Femto.Modules.Blog.Domain.Posts.Commands.CreatePost;
using Femto.Modules.Blog.Domain.Posts.Commands.GetPosts;
using MediatR;
using Microsoft.AspNetCore.Mvc;
@ -9,6 +10,33 @@ namespace Femto.Api.Controllers.Posts;
[Route("posts")]
public class PostsController(IMediator mediator) : ControllerBase
{
[HttpGet]
public async Task<ActionResult<GetAllPublicPostsResponse>> GetAllPublicPosts(
[FromQuery] GetPublicPostsSearchParams searchParams,
CancellationToken cancellationToken
)
{
var res = await mediator.Send(
new GetPostsQuery
{
From = searchParams.From,
Amount = searchParams.Amount ?? 20
},
cancellationToken
);
return new GetAllPublicPostsResponse(
res.Posts.Select(p => new PublicPostDto(
new PublicPostAuthorDto(p.Author.AuthorId, p.Author.Username),
p.PostId,
p.Text,
p.Media.Select(m => m.Url),
p.CreatedAt
)),
res.Next
);
}
[HttpPost]
public async Task<ActionResult<CreatePostResponse>> Post(
[FromBody] CreatePostRequest req,

View file

@ -14,6 +14,16 @@ builder.Services.UseBlogModule(databaseConnectionString);
builder.Services.AddControllers();
builder.Services.AddCors(options =>
{
options.AddPolicy(
"DefaultCorsPolicy",
b =>
{
b.AllowAnyHeader().AllowAnyMethod().AllowAnyOrigin();
}
);
});
builder
.Services.AddControllers()
.AddJsonOptions(options =>
@ -27,6 +37,8 @@ builder
var app = builder.Build();
app.UseCors("DefaultCorsPolicy");
if (app.Environment.IsDevelopment())
{
app.MapOpenApi();

View file

@ -5,7 +5,7 @@
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": false,
"applicationUrl": "http://localhost:5181",
"applicationUrl": "http://0.0.0.0:5181",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
@ -14,7 +14,7 @@
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": false,
"applicationUrl": "https://localhost:7269;http://localhost:5181",
"applicationUrl": "https://0.0.0.0:7269;http://0.0.0.0:5181",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}

View file

@ -1,5 +0,0 @@
namespace Femto.Modules.Blog.Contracts.Dto;
public record GetAuthorPostsDto(Guid PostId, string Text, IList<GetAuthorPostsMediaDto> Media);
public record GetAuthorPostsMediaDto(Uri Url);

View file

@ -1,6 +0,0 @@
using Femto.Modules.Blog.Contracts.Dto;
using MediatR;
namespace Femto.Modules.Blog.Domain.Posts.Commands.GetAuthorPosts;
public record GetAuthorPostsQuery(Guid AuthorId, Guid? Cursor, int? Count) : IRequest<IList<GetAuthorPostsDto>>;

View file

@ -1,61 +0,0 @@
using Dapper;
using Femto.Modules.Blog.Contracts.Dto;
using Femto.Modules.Blog.Infrastructure.DbConnection;
using MediatR;
using Microsoft.Data.SqlClient;
namespace Femto.Modules.Blog.Domain.Posts.Commands.GetAuthorPosts;
public class GetAuthorPostsQueryHandler(IDbConnectionFactory connectionFactory)
: IRequestHandler<GetAuthorPostsQuery, IList<GetAuthorPostsDto>>
{
public async Task<IList<GetAuthorPostsDto>> Handle(
GetAuthorPostsQuery query,
CancellationToken cancellationToken
)
{
using var conn = connectionFactory.GetConnection();
var sql = $$"""
with post_page as (
select * from blog.post
where blog.post.author_id = @authorId
and (@cursor is null or blog.post.id < @cursor)
order by blog.post.id desc
limit @count
)
select
p.id as PostId,
p.content as Content,
pm.url as MediaUrl
from post_page p
left join blog.post_media pm on pm.post_id = p.id
order by p.id desc
""";
var result = await conn.QueryAsync<QueryResult>(
sql,
new { authorId = query.AuthorId, cursor = query.Cursor, count = query.Count }
);
return result
.GroupBy(row => row.PostId)
.Select(group => new GetAuthorPostsDto(
group.Key,
group.First().Content,
group
.Select(row => row.MediaUrl)
.OfType<string>()
.Select(url => new GetAuthorPostsMediaDto(new Uri(url)))
.ToList()
))
.ToList();
}
internal class QueryResult
{
public Guid PostId { get; set; }
public string Content { get; set; }
public string? MediaUrl { get; set; }
}
}

View file

@ -0,0 +1,3 @@
namespace Femto.Modules.Blog.Domain.Posts.Commands.GetPosts.Dto;
public record GetPostsQueryResult(IList<PostDto> Posts, Guid? Next);

View file

@ -0,0 +1,3 @@
namespace Femto.Modules.Blog.Domain.Posts.Commands.GetPosts.Dto;
public record PostAuthorDto(Guid AuthorId, string Username);

View file

@ -0,0 +1,3 @@
namespace Femto.Modules.Blog.Domain.Posts.Commands.GetPosts.Dto;
public record PostDto(Guid PostId, string Text, IList<PostMediaDto> Media, DateTime CreatedAt, PostAuthorDto Author);

View file

@ -0,0 +1,3 @@
namespace Femto.Modules.Blog.Domain.Posts.Commands.GetPosts.Dto;
public record PostMediaDto(Uri Url);

View file

@ -0,0 +1,25 @@
using Femto.Modules.Blog.Domain.Posts.Commands.GetPosts.Dto;
using MediatR;
namespace Femto.Modules.Blog.Domain.Posts.Commands.GetPosts;
public class GetPostsQuery : IRequest<GetPostsQueryResult>
{
public string? Username { get; init; }
public Guid? From { get; init; }
public int Amount { get; init; } = 20;
public Guid? AuthorGuid { get; init; }
/// <summary>
/// Default is to load in reverse chronological order
/// TODO this is not exposed on the client as it probably wouldn't work that well
/// </summary>
public GetPostsDirection Direction { get; init; } = GetPostsDirection.Backward;
}
public enum GetPostsDirection
{
Forward,
Backward
}

View file

@ -0,0 +1,99 @@
using Dapper;
using Femto.Modules.Blog.Domain.Posts.Commands.GetPosts.Dto;
using Femto.Modules.Blog.Infrastructure.DbConnection;
using MediatR;
namespace Femto.Modules.Blog.Domain.Posts.Commands.GetPosts;
public class GetPostsQueryHandler(IDbConnectionFactory connectionFactory)
: IRequestHandler<GetPostsQuery, GetPostsQueryResult>
{
public async Task<GetPostsQueryResult> Handle(
GetPostsQuery query,
CancellationToken cancellationToken
)
{
using var conn = connectionFactory.GetConnection();
if (query.Username is not null && query.AuthorGuid is not null)
throw new ArgumentException(
"Cannot specify both username and authorGuid",
nameof(query)
);
var orderBy = query.Direction is GetPostsDirection.Backward ? "desc" : "asc";
var pageFilter = query.Direction is GetPostsDirection.Backward ? "<=" : ">=";
// lang=sql
var sql = $$"""
with page as (
select blog.post.*, blog.author.username as Username, blog.author.id as AuthorId
from blog.post
inner join blog.author on blog.author.id = blog.post.author_id
where (@username is null or blog.author.username = @username)
and (@authorGuid is null or blog.author.id = @authorGuid)
and (@cursor is null or blog.post.id {{pageFilter}} @cursor)
order by blog.post.id {{orderBy}}
limit @amount
)
select
page.id as PostId,
page.content as Content,
blog.post_media.url as MediaUrl,
page.created_on as CreatedAt,
page.Username,
page.AuthorId
from page
left join blog.post_media on blog.post_media.post_id = page.id
order by page.id {{orderBy}}
""";
var result = await conn.QueryAsync<QueryResult>(
sql,
new
{
username = query.Username,
authorGuid = query.AuthorGuid,
cursor = query.From,
// load an extra one to take for the curst
amount = query.Amount + 1,
}
);
var rows = result.ToList();
var posts = rows.GroupBy(row => row.PostId)
.Select(group =>
{
var postId = group.Key;
var post = group.First();
var media = group
.Select(row => row.MediaUrl)
.OfType<string>()
.Select(url => new PostMediaDto(new Uri(url)))
.ToList();
return new PostDto(
postId,
post.Content,
media,
post.CreatedAt,
new PostAuthorDto(post.AuthorId, post.Username)
);
})
.ToList();
var next = rows.Count >= query.Amount ? rows.LastOrDefault()?.PostId : null;
return new GetPostsQueryResult(posts, next);
}
internal class QueryResult
{
public Guid PostId { get; set; }
public string Content { get; set; }
public string? MediaUrl { get; set; }
public DateTime CreatedAt { get; set; }
public Guid AuthorId { get; set; }
public string Username { get; set; }
}
}