chore(codebase): full cleanup pass
This commit is contained in:
@@ -40,14 +40,14 @@ public class AddMessage(
|
||||
AddMessageRequest req,
|
||||
CancellationToken ct)
|
||||
{
|
||||
var message = new Message
|
||||
Message message = new()
|
||||
{
|
||||
Id = req.Id ?? Guid.CreateVersion7(),
|
||||
SubjectId = req.SubjectId,
|
||||
CreatedBy = User.GetUserId(),
|
||||
Value = req.Message
|
||||
};
|
||||
|
||||
};
|
||||
|
||||
await context.Messages.AddAsync(message, ct);
|
||||
|
||||
await context.SaveChangesAsync(ct);
|
||||
|
||||
@@ -20,7 +20,7 @@ internal sealed class AddReplyRequestValidator
|
||||
RuleFor(r => r.ParentId)
|
||||
.NotNull().WithMessage("You must specify a ParentId")
|
||||
.NotEmpty().WithMessage("You must specify a non-empty ParentId");
|
||||
|
||||
|
||||
RuleFor(r => r.SubjectId)
|
||||
.NotNull().WithMessage("You must specify a SubjectId")
|
||||
.NotEmpty().WithMessage("You must specify a non-empty SubjectId");
|
||||
@@ -45,10 +45,10 @@ internal sealed class AddReply(
|
||||
AddReplyRequest req,
|
||||
CancellationToken ct)
|
||||
{
|
||||
var message = new Message
|
||||
Message message = new()
|
||||
{
|
||||
Id = Guid.CreateVersion7(),
|
||||
SubjectId = req.SubjectId,
|
||||
SubjectId = req.SubjectId,
|
||||
ParentId = req.ParentId,
|
||||
CreatedBy = User.GetUserId(),
|
||||
Value = req.Message
|
||||
|
||||
@@ -39,15 +39,15 @@ public class ChangeMessage(
|
||||
ChangeMessageRequest req,
|
||||
CancellationToken ct)
|
||||
{
|
||||
var message = await context.Messages.FirstOrDefaultAsync(x => x.Id == req.Id, ct);
|
||||
|
||||
Message? message = await context.Messages.FirstOrDefaultAsync(x => x.Id == req.Id, ct);
|
||||
|
||||
if (message is null)
|
||||
{
|
||||
await SendNotFoundAsync(ct);
|
||||
return;
|
||||
}
|
||||
|
||||
var userId = HttpContext.User.GetUserId();
|
||||
|
||||
Guid userId = HttpContext.User.GetUserId();
|
||||
if (message.CreatedBy != userId)
|
||||
{
|
||||
await SendForbiddenAsync(ct);
|
||||
@@ -58,7 +58,7 @@ public class ChangeMessage(
|
||||
message.Value = req.Message;
|
||||
|
||||
context.Update(message);
|
||||
|
||||
|
||||
await context.SaveChangesAsync(ct);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,21 +30,21 @@ public class DeleteMessage(
|
||||
DeleteMessageRequest req,
|
||||
CancellationToken ct)
|
||||
{
|
||||
var message = await context.Messages.FirstOrDefaultAsync(x => x.Id == req.MessageId, ct);
|
||||
Message? message = await context.Messages.FirstOrDefaultAsync(x => x.Id == req.MessageId, ct);
|
||||
|
||||
if (message is null)
|
||||
{
|
||||
await SendNotFoundAsync(ct);
|
||||
return;
|
||||
}
|
||||
|
||||
var userId = HttpContext.User.GetUserId();
|
||||
|
||||
Guid userId = HttpContext.User.GetUserId();
|
||||
if (message.CreatedBy != userId)
|
||||
{
|
||||
await SendForbiddenAsync(ct);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
context.Messages.Remove(message);
|
||||
|
||||
await context.SaveChangesAsync(ct);
|
||||
|
||||
@@ -28,17 +28,14 @@ public class GetMessageCount(
|
||||
GetMessageCountRequest req,
|
||||
CancellationToken ct)
|
||||
{
|
||||
var messageCount = await context.GetMessageCountAsync(
|
||||
int messageCount = await context.GetMessageCountAsync(
|
||||
req.SubjectId,
|
||||
null,
|
||||
req.PageSize,
|
||||
ct);
|
||||
|
||||
|
||||
await SendAsync(
|
||||
new()
|
||||
{
|
||||
Count = messageCount
|
||||
},
|
||||
new GetMessageCountResponse { Count = messageCount },
|
||||
cancellation: ct);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,13 +30,13 @@ public class GetMessages(
|
||||
GetMessagesRequest req,
|
||||
CancellationToken ct)
|
||||
{
|
||||
var messages = await context.GetMessagesAsync(
|
||||
IEnumerable<MessageDto> messages = await context.GetMessagesAsync(
|
||||
req.SubjectId,
|
||||
null,
|
||||
req.LastId,
|
||||
req.PageSize,
|
||||
ct);
|
||||
|
||||
|
||||
await SendOkAsync(new GetMessagesResponse(messages), ct);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,16 +30,16 @@ public class GetMessagesByUser(
|
||||
GetMessagesByUserRequest req,
|
||||
CancellationToken ct)
|
||||
{
|
||||
var messages = await context
|
||||
List<Message> messages = await context
|
||||
.Messages
|
||||
.Where(c => c.CreatedBy == req.UserId)
|
||||
.Where(c => c.ParentId == null)
|
||||
.ToListAsync(cancellationToken: ct);
|
||||
.ToListAsync(ct);
|
||||
|
||||
var result = await Task.WhenAll(
|
||||
MessageDto[] result = await Task.WhenAll(
|
||||
messages.Select(async message =>
|
||||
{
|
||||
var user = await userLookup.GetUserAsync(message.CreatedBy, ct);
|
||||
UserReference? user = await userLookup.GetUserAsync(message.CreatedBy, ct);
|
||||
|
||||
return new MessageDto
|
||||
{
|
||||
|
||||
@@ -31,7 +31,7 @@ public class GetReplies(
|
||||
GetRepliesRequest req,
|
||||
CancellationToken ct)
|
||||
{
|
||||
var replies = await context.GetMessagesAsync(
|
||||
IEnumerable<MessageDto> replies = await context.GetMessagesAsync(
|
||||
req.SubjectId,
|
||||
req.ParentId,
|
||||
req.LastId,
|
||||
|
||||
Reference in New Issue
Block a user