Skip to content

Commit

Permalink
2
Browse files Browse the repository at this point in the history
  • Loading branch information
IlyaM1 committed Jan 14, 2024
1 parent 980ee40 commit 86fc09e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
7 changes: 4 additions & 3 deletions Chat/Api/ChatController.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Backend.Auth.Dto;
using Backend.Chat.Dal.Models;
using Backend.Chat.Dto;
using Backend.Chat.Logic;

Expand Down Expand Up @@ -35,9 +36,9 @@ public async Task<ChatGetOneMessageDto> GetOneMessage([FromHeader] UserAuthInfo

[HttpPost]
[Route("{chatId}/message")]
public async Task<IResult> SendMessage([FromHeader] UserAuthInfo authInfo, [FromRoute] int chatId, [FromBody] ChatSendMessageDto messageDto)
public async Task<MessageModel> SendMessage([FromHeader] UserAuthInfo authInfo, [FromRoute] int chatId, [FromBody] ChatSendMessageDto messageDto)
{
await _chatService.SendMessageAsync(authInfo, chatId, messageDto);
return Results.Ok();
var message = await _chatService.SendMessageAsync(authInfo, chatId, messageDto);
return message;
}
}
5 changes: 3 additions & 2 deletions Chat/Logic/ChatService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public async Task<ChatGetOneMessageDto> GetMessageAsync(UserAuthInfo authInfo, i
return new ChatGetOneMessageDto() { Message = mappedMessageId };
}

public async Task SendMessageAsync(UserAuthInfo authInfo, int chatId, ChatSendMessageDto chatSendMessageDto)
public async Task<MessageModel> SendMessageAsync(UserAuthInfo authInfo, int chatId, ChatSendMessageDto chatSendMessageDto)
{
var newMessage = new MessageModel() {
ChatId = chatId,
Expand All @@ -76,7 +76,8 @@ public async Task SendMessageAsync(UserAuthInfo authInfo, int chatId, ChatSendMe
UserId = chatSendMessageDto.UserId
};

await messageRepo.CreateEntityAsync(newMessage);
var id = await messageRepo.CreateEntityAsync(newMessage);
return await messageRepo.GetEntityByIdAsync(id);
}

internal enum GettingUserChatIndex
Expand Down

0 comments on commit 86fc09e

Please sign in to comment.