botris.social/femto-backend
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

return postdto from post create

Browse source
This commit is contained in:
john 2025-05-28 20:05:00 +02:00
parent 8ad4302ec8
commit d1687f276b
15 changed files with 226 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Femto.Api/Controllers/Posts/Dto/CreatePostResponse.cs
View file

@ -1,3 +1,3 @@
namespace Femto.Api.Controllers.Posts.Dto;
public record CreatePostResponse(Guid PostId);
public record CreatePostResponse(PostDto Post);

0
Femto.Api/Controllers/Posts/Dto/GetAllPublicPostsResponse.cs → Femto.Api/Controllers/Posts/Dto/LoadPostsResponse.cs
View file

3
Femto.Api/Controllers/Posts/Dto/PostDto.cs
View file

@ -9,5 +9,6 @@ public record PostDto(
string Content,
IEnumerable<PostMediaDto> Media,
IEnumerable<PostReactionDto> Reactions,
DateTimeOffset CreatedAt
DateTimeOffset CreatedAt,
IEnumerable<string> PossibleReactions
);

2
Femto.Api/Controllers/Posts/Dto/PostReactionDto.cs
View file

@ -1,3 +1,3 @@
namespace Femto.Api.Controllers.Posts.Dto;
public record PostReactionDto(Guid ReactionId, string Emoji, int Count, bool DidReact);
public record PostReactionDto(string Emoji, int Count, bool DidReact);

30
Femto.Api/Controllers/Posts/PostsController.cs
View file

@ -11,7 +11,8 @@ namespace Femto.Api.Controllers.Posts;
[ApiController]
[Route("posts")]
public class PostsController(IBlogModule blogModule, ICurrentUserContext currentUserContext) : ControllerBase
public class PostsController(IBlogModule blogModule, ICurrentUserContext currentUserContext)
: ControllerBase
{
[HttpGet]
public async Task<ActionResult<LoadPostsResponse>> LoadPosts(
@ -36,8 +37,9 @@ public class PostsController(IBlogModule blogModule, ICurrentUserContext current
p.PostId,
p.Text,
p.Media.Select(m => new PostMediaDto(m.Url, m.Width, m.Height)),
p.Reactions?.Select(r => new PostReactionDto(r.ReactionId, r.Emoji, r.Count, r.DidReact)),
p.CreatedAt
p.Reactions.Select(r => new PostReactionDto(r.Emoji, r.Count, r.DidReact)),
p.CreatedAt,
p.PossibleReactions
)),
res.Next
);
@ -50,7 +52,7 @@ public class PostsController(IBlogModule blogModule, ICurrentUserContext current
CancellationToken cancellationToken
)
{
var guid = await blogModule.Command(
var post = await blogModule.Command(
new CreatePostCommand(
req.AuthorId,
req.Content,
@ -65,18 +67,32 @@ public class PostsController(IBlogModule blogModule, ICurrentUserContext current
media.Height
)
),
req.IsPublic
req.IsPublic,
currentUserContext.CurrentUser!
),
cancellationToken
);
return new CreatePostResponse(guid);
return new CreatePostResponse(
new PostDto(
new PostAuthorDto(post.Author.AuthorId, post.Author.Username),
post.PostId,
post.Text,
post.Media.Select(m => new PostMediaDto(m.Url, m.Width, m.Height)),
post.Reactions.Select(r => new PostReactionDto(r.Emoji, r.Count, r.DidReact)).ToList(),
post.CreatedAt,
post.PossibleReactions
)
);
}
[HttpDelete("{postId}")]
[Authorize]
public async Task DeletePost(Guid postId, CancellationToken cancellationToken)
{
await blogModule.Command(new DeletePostCommand(postId, currentUserContext.CurrentUser!.Id), cancellationToken);
await blogModule.Command(
new DeletePostCommand(postId, currentUserContext.CurrentUser!.Id),
cancellationToken
);
}
}

2
Femto.Database/Migrations/20250518193113_AddUserRole.sql
View file

@ -6,4 +6,4 @@ CREATE TABLE authn.user_role
user_id uuid REFERENCES authn.user_identity(id),
role int,
primary key (user_id, role)
);
)

3
Femto.Database/Migrations/20250526220032_AddReactions.sql
View file

@ -8,5 +8,6 @@ CREATE TABLE blog.post_reaction
(
post_id uuid REFERENCES blog.post(id),
author_id uuid REFERENCES blog.author(id),
emoji text not null
emoji text not null,
primary key (post_id, author_id, emoji)
);

19
Femto.Database/Seed/TestDataSeeder.cs
View file

@ -35,12 +35,12 @@ public static class TestDataSeeder
;
INSERT INTO blog.post
(id, author_id, content)
(id, author_id, possible_reactions, content)
VALUES
('019691a0-48ed-7eba-b8d3-608e25e07d4b', @id, 'However, authors often misinterpret the zoology as a smothered advantage, when in actuality it feels more like a blindfold accordion. They were lost without the chastest puppy that composed their Santa.'),
('019691a0-4ace-7bb5-a8f3-e3362920eba0', @id, 'Extending this logic, a swim can hardly be considered a seasick duckling without also being a tornado. Some posit the whity voyage to be less than dippy.'),
('019691a0-4c3e-726f-b8f6-bcbaabe789ae', @id,'Few can name a springless sun that isn''t a thudding Vietnam. The burn of a competitor becomes a frosted target.'),
('019691a0-4dd3-7e89-909e-94a6fd19a05e', @id,'Some unwitched marbles are thought of simply as currencies. A boundary sees a nepal as a chordal railway.')
('019691a0-48ed-7eba-b8d3-608e25e07d4b', @id, '["🍆", "🧢", "🧑🏾‍🎓", "🥕", "🕗"]', 'However, authors often misinterpret the zoology as a smothered advantage, when in actuality it feels more like a blindfold accordion. They were lost without the chastest puppy that composed their Santa.'),
('019691a0-4ace-7bb5-a8f3-e3362920eba0', @id, '["🍆", "🧢", "🧑🏾‍🎓", "🥕", "🕗"]', 'Extending this logic, a swim can hardly be considered a seasick duckling without also being a tornado. Some posit the whity voyage to be less than dippy.'),
('019691a0-4c3e-726f-b8f6-bcbaabe789ae', @id, '["🍆", "🧢", "🧑🏾‍🎓", "🥕", "🕗"]', 'Few can name a springless sun that isn''t a thudding Vietnam. The burn of a competitor becomes a frosted target.'),
('019691a0-4dd3-7e89-909e-94a6fd19a05e', @id, '["🍆", "🧢", "🧑🏾‍🎓", "🥕", "🕗"]', 'Some unwitched marbles are thought of simply as currencies. A boundary sees a nepal as a chordal railway.')
;
INSERT INTO blog.post_media
@ -54,6 +54,15 @@ public static class TestDataSeeder
('019691b6-2608-7088-8110-f0f6e35fa633', '019691a0-4dd3-7e89-909e-94a6fd19a05e', 'https://www.pinclipart.com/picdir/big/535-5356059_big-transparent-chungus-png-background-big-chungus-clipart.png', 0)
;
INSERT INTO blog.post_reaction
(post_id, author_id, emoji)
VALUES
('019691a0-48ed-7eba-b8d3-608e25e07d4b', @id, '🍆'),
('019691a0-4ace-7bb5-a8f3-e3362920eba0', @id, '🍆'),
('019691a0-4c3e-726f-b8f6-bcbaabe789ae', @id, '🧑🏾‍'),
('019691a0-4c3e-726f-b8f6-bcbaabe789ae', @id, '🕗')
;
INSERT INTO authn.user_identity
(id, username, password_hash, password_salt)
VALUES

20
Femto.Modules.Blog/Application/Commands/CreatePost/CreatePostCommand.cs
View file

@ -1,8 +1,22 @@
using Femto.Common;
using Femto.Common.Domain;
using Femto.Modules.Blog.Application.Queries.GetPosts.Dto;
namespace Femto.Modules.Blog.Application.Commands.CreatePost;
public record CreatePostCommand(Guid AuthorId, string Content, IEnumerable<CreatePostMedia> Media, bool? IsPublic)
: ICommand<Guid>;
public record CreatePostCommand(
Guid AuthorId,
string Content,
IEnumerable<CreatePostMedia> Media,
bool? IsPublic,
CurrentUser CurrentUser
) : ICommand<PostDto>;
public record CreatePostMedia(Guid MediaId, Uri Url, string? Type, int Order, int? Width, int? Height);
public record CreatePostMedia(
Guid MediaId,
Uri Url,
string? Type,
int Order,
int? Width,
int? Height
);

18
Femto.Modules.Blog/Application/Commands/CreatePost/CreatePostCommandHandler.cs
View file

@ -1,12 +1,16 @@
using Femto.Modules.Blog.Application.Queries.GetPosts.Dto;
using Femto.Modules.Blog.Domain.Posts;
using MediatR;
namespace Femto.Modules.Blog.Application.Commands.CreatePost;
internal class CreatePostCommandHandler(BlogContext context)
: IRequestHandler<CreatePostCommand, Guid>
: IRequestHandler<CreatePostCommand, PostDto>
{
public async Task<Guid> Handle(CreatePostCommand request, CancellationToken cancellationToken)
public async Task<PostDto> Handle(
CreatePostCommand request,
CancellationToken cancellationToken
)
{
var post = new Post(
request.AuthorId,
@ -27,6 +31,14 @@ internal class CreatePostCommandHandler(BlogContext context)
await context.AddAsync(post, cancellationToken);
return post.Id;
return new PostDto(
post.Id,
post.Content,
post.Media.Select(m => new PostMediaDto(m.Url, m.Width, m.Height)).ToList(),
post.PostedOn,
new PostAuthorDto(post.AuthorId, request.CurrentUser.Username),
[],
post.PossibleReactions
);
}
}

5
Femto.Modules.Blog/Application/Configurations/PostConfiguration.cs
View file

@ -11,5 +11,10 @@ internal class PostConfiguration : IEntityTypeConfiguration<Post>
table.ToTable("post");
table.OwnsMany(post => post.Media).WithOwner();
table.OwnsMany(post => post.Reactions).WithOwner();
table.Property<string>("PossibleReactionsJson")
.HasColumnName("possible_reactions");
table.Ignore(e => e.PossibleReactions);
}
}

4
Femto.Modules.Blog/Application/Queries/GetPosts/Dto/PostDto.cs
View file

@ -6,4 +6,6 @@ public record PostDto(
IList<PostMediaDto> Media,
DateTimeOffset CreatedAt,
PostAuthorDto Author,
IList<PostReactionDto> Reactions);
IList<PostReactionDto> Reactions,
IEnumerable<string> PossibleReactions
);

177
Femto.Modules.Blog/Application/Queries/GetPosts/GetPostsQueryHandler.cs
View file

@ -1,3 +1,4 @@
using System.Text.Json;
using Dapper;
using Femto.Common.Infrastructure.DbConnection;
using Femto.Modules.Blog.Application.Queries.GetPosts.Dto;
@ -15,42 +16,29 @@ public class GetPostsQueryHandler(IDbConnectionFactory connectionFactory)
{
using var conn = connectionFactory.GetConnection();
var orderBy = query.Direction is GetPostsDirection.Backward ? "desc" : "asc";
var pageFilter = query.Direction is GetPostsDirection.Backward ? "<=" : ">=";
var username = query.Author;
var authorGuid = query.AuthorId;
var cursor = query.From;
var showPrivate = query.CurrentUserId is not null;
// lang=sql
var sql = $$"""
with page as (
select blog.post.*, blog.author.username as Username, blog.author.id as AuthorId
var loadPostsResult = await conn.QueryAsync<LoadPostRow>(
"""
select
blog.post.id as PostId,
blog.post.content as Content,
blog.post.posted_on as PostedOn,
blog.author.username as Username,
blog.author.id as AuthorId,
blog.post.possible_reactions as PossibleReactions
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 (@showPrivate or blog.post.is_public = true)
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}}
and (@cursor is null or blog.post.id <= @cursor)
order by blog.post.id desc
limit @amount
)
select
page.id as PostId,
page.content as Content,
blog.post_media.url as MediaUrl,
blog.post_media.width as MediaWidth,
blog.post_media.height as MediaHeight,
page.posted_on as PostedOn,
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,
@ -62,54 +50,115 @@ public class GetPostsQueryHandler(IDbConnectionFactory connectionFactory)
}
);
var rows = result.ToList();
var loadedPosts = loadPostsResult.ToList();
var posts = loadedPosts.Take(query.Amount).ToList();
var next = loadedPosts.LastOrDefault()?.PostId;
var posts = rows.GroupBy(row => row.PostId)
.Select(group =>
var postIds = posts.Select(p => p.PostId).ToList();
var loadMediaResult = await conn.QueryAsync<LoadMediaRow>(
"""
select
pm.url as MediaUrl,
pm.type as MediaType,
pm.width as MediaWidth,
pm.height as MediaHeight,
pm.post_id as PostId
from blog.post_media pm where pm.post_id = ANY (@postIds)
order by pm.ordering
""",
new { postIds }
);
var loadReactionsResult = await conn.QueryAsync<LoadReactionRow>(
"""
select
pr.post_id as PostId,
pr.author_id as AuthorId,
pr.emoji as Emoji
from blog.post_reaction pr
where pr.post_id = ANY (@postIds)
""",
new { postIds }
);
var reactionsByPostId = loadReactionsResult
.GroupBy(r => r.PostId)
.ToDictionary(
group => group.Key,
group =>
group
.GroupBy(
r => r.Emoji,
(key, g) =>
{
var postId = group.Key;
var post = group.First();
var media = group
.Select(row =>
{
if (row.MediaUrl is not null)
{
return new PostMediaDto(
new Uri(row.MediaUrl),
row.MediaHeight,
row.MediaHeight
var reactions = g.ToList();
return new PostReactionDto(
key,
reactions.Count,
reactions.Any(r => r.AuthorId == query.CurrentUserId)
);
}
else
return null;
})
.OfType<PostMediaDto>()
.ToList();
return new PostDto(
postId,
post.Content,
media,
post.PostedOn,
new PostAuthorDto(post.AuthorId, post.Username)
)
.ToList()
);
})
.ToList();
var next = rows.Count >= query.Amount ? rows.LastOrDefault()?.PostId : null;
var mediaByPostId = loadMediaResult
.GroupBy(m => m.PostId)
.ToDictionary(
g => g.Key,
g =>
g.Select(m => new PostMediaDto(
new Uri(m.MediaUrl),
m.MediaWidth,
m.MediaHeight
))
.ToList()
);
return new GetPostsQueryResult(posts, next);
return new GetPostsQueryResult(
posts
.Select(p => new PostDto(
p.PostId,
p.Content,
mediaByPostId.TryGetValue(p.PostId, out var mediaDtos) ? mediaDtos : [],
p.PostedOn,
new PostAuthorDto(p.AuthorId, p.Username),
reactionsByPostId.TryGetValue(p.PostId, out var reactionDtos)
? reactionDtos.ToList()
: [],
!string.IsNullOrEmpty(p.PossibleReactions)
? JsonSerializer.Deserialize<IEnumerable<string>>(p.PossibleReactions)!
: []
))
.ToList(),
next
);
}
internal class QueryResult
internal record LoadPostRow
{
public Guid PostId { get; set; }
public string Content { get; set; }
public string? MediaUrl { get; set; }
public string? MediaType { get; set; }
public int? MediaWidth { get; set; }
public int? MediaHeight { get; set; }
public DateTimeOffset PostedOn { get; set; }
public Guid AuthorId { get; set; }
public string Username { get; set; }
public Guid PostId { get; init; }
public string Content { get; init; }
public DateTimeOffset PostedOn { get; init; }
public string Username { get; init; }
public Guid AuthorId { get; init; }
public string? PossibleReactions { get; init; }
}
internal record LoadMediaRow
{
public string MediaUrl { get; init; }
public string? MediaType { get; init; }
public int? MediaWidth { get; init; }
public int? MediaHeight { get; init; }
public Guid PostId { get; init; }
}
internal record LoadReactionRow
{
public Guid PostId { get; init; }
public Guid AuthorId { get; init; }
public string Emoji { get; init; }
}
}

19
Femto.Modules.Blog/Domain/Posts/Post.cs
View file

@ -1,3 +1,4 @@
using System.Text.Json;
using Femto.Common.Domain;
using Femto.Modules.Blog.Domain.Posts.Events;
using Femto.Modules.Blog.Emoji;
@ -14,6 +15,16 @@ internal class Post : Entity
public IList<PostReaction> Reactions { get; private set; } = [];
public bool IsPublic { get; set; }
public DateTimeOffset PostedOn { get; private set; }
private string PossibleReactionsJson { get; set; } = null!;
public IEnumerable<string> PossibleReactions
{
get => JsonSerializer.Deserialize<IEnumerable<string>>(this.PossibleReactionsJson)!;
init => PossibleReactionsJson = JsonSerializer.Serialize(value);
}
private Post() { }
public Post(Guid authorId, string content, IList<PostMedia> media)
@ -22,13 +33,9 @@ internal class Post : Entity
this.AuthorId = authorId;
this.Content = content;
this.Media = media;
this.Reactions = AllEmoji
.GetRandomEmoji(5)
.Select(emoji => new PostReaction(emoji, 0))
.ToList();
this.PossibleReactions = AllEmoji.GetRandomEmoji(5);
this.PostedOn = DateTimeOffset.UtcNow;
this.AddDomainEvent(new PostCreated(this));
}
}

11
Femto.Modules.Blog/Domain/Posts/PostReaction.cs
View file

@ -2,15 +2,14 @@ namespace Femto.Modules.Blog.Domain.Posts;
public class PostReaction
{
public Guid Id { get; private set; }
public Guid AuthorId { get; private set; }
public Guid PostId { get; private set; }
public string Emoji { get; private set; } = null!;
public int Count { get; private set; }
public PostReaction(string emoji, int count)
public PostReaction(Guid authorId, Guid postId, string emoji)
{
this.Id = Guid.CreateVersion7();
this.AuthorId = authorId;
this.PostId = postId;
this.Emoji = emoji;
this.Count = count;
}
private PostReaction() { }