From c4df0ac5073247521d095cd2ad9b471eab8abc43 Mon Sep 17 00:00:00 2001 From: wzh425 Date: Thu, 20 Jul 2023 17:54:07 +0800 Subject: [PATCH] reactor : Handle Code review --- .../Services/MessageTasks/MessageTaskHistoryService.cs | 4 ++-- .../MessageTasks/MessageTaskHistoryQueryHandler.cs | 2 +- ...ersQuery.cs => GetMessageTaskHistoryReceiversQuery.cs} | 2 +- .../Masa.Mc.Service/Services/MessageTaskHistoryService.cs | 6 +++--- .../MessageTasks/Modules/MessageTaskDetailModal.razor.cs | 8 ++++---- 5 files changed, 11 insertions(+), 11 deletions(-) rename src/Services/Masa.Mc.Service/Application/MessageTasks/Queries/{GetMessageTaskHistoryReceiverUsersQuery.cs => GetMessageTaskHistoryReceiversQuery.cs} (71%) diff --git a/src/ApiGateways/Caller/Masa.Mc.ApiGateways.Caller/Services/MessageTasks/MessageTaskHistoryService.cs b/src/ApiGateways/Caller/Masa.Mc.ApiGateways.Caller/Services/MessageTasks/MessageTaskHistoryService.cs index 5edeb5aa..c309d5d0 100644 --- a/src/ApiGateways/Caller/Masa.Mc.ApiGateways.Caller/Services/MessageTasks/MessageTaskHistoryService.cs +++ b/src/ApiGateways/Caller/Masa.Mc.ApiGateways.Caller/Services/MessageTasks/MessageTaskHistoryService.cs @@ -22,9 +22,9 @@ public async Task> GetListAsync(GetMessa return await GetAsync($"{id}"); } - public async Task> GetReceiverUsersAsync(Guid id) + public async Task> GetReceiversAsync(Guid id) { - return await GetAsync>($"{id}/receiverUsers") ?? new(); + return await GetAsync>($"{id}/receivers") ?? new(); } public async Task WithdrawnAsync(Guid id) diff --git a/src/Services/Masa.Mc.Service/Application/MessageTasks/MessageTaskHistoryQueryHandler.cs b/src/Services/Masa.Mc.Service/Application/MessageTasks/MessageTaskHistoryQueryHandler.cs index f11cd11f..f73eb817 100644 --- a/src/Services/Masa.Mc.Service/Application/MessageTasks/MessageTaskHistoryQueryHandler.cs +++ b/src/Services/Masa.Mc.Service/Application/MessageTasks/MessageTaskHistoryQueryHandler.cs @@ -46,7 +46,7 @@ public async Task GetListAsync(GetMessageTaskHistoryListQuery query) } [EventHandler] - public async Task GetReceiverUsersAsync(GetMessageTaskHistoryReceiverUsersQuery query) + public async Task GetReceiversAsync(GetMessageTaskHistoryReceiversQuery query) { var messageTaskHistory = await _context.MessageTaskHistoryQueries.Include(x => x.MessageTask).FirstOrDefaultAsync(x=>x.Id == query.MessageTaskHistoryId); MasaArgumentException.ThrowIfNull(messageTaskHistory, _i18n.T("MessageTaskHistory")); diff --git a/src/Services/Masa.Mc.Service/Application/MessageTasks/Queries/GetMessageTaskHistoryReceiverUsersQuery.cs b/src/Services/Masa.Mc.Service/Application/MessageTasks/Queries/GetMessageTaskHistoryReceiversQuery.cs similarity index 71% rename from src/Services/Masa.Mc.Service/Application/MessageTasks/Queries/GetMessageTaskHistoryReceiverUsersQuery.cs rename to src/Services/Masa.Mc.Service/Application/MessageTasks/Queries/GetMessageTaskHistoryReceiversQuery.cs index 52c44a56..0d523143 100644 --- a/src/Services/Masa.Mc.Service/Application/MessageTasks/Queries/GetMessageTaskHistoryReceiverUsersQuery.cs +++ b/src/Services/Masa.Mc.Service/Application/MessageTasks/Queries/GetMessageTaskHistoryReceiversQuery.cs @@ -3,7 +3,7 @@ namespace Masa.Mc.Service.Admin.Application.MessageTasks.Queries; -public record GetMessageTaskHistoryReceiverUsersQuery(Guid MessageTaskHistoryId) : Query> +public record GetMessageTaskHistoryReceiversQuery(Guid MessageTaskHistoryId) : Query> { public override List Result { get; set; } = new(); } \ No newline at end of file diff --git a/src/Services/Masa.Mc.Service/Services/MessageTaskHistoryService.cs b/src/Services/Masa.Mc.Service/Services/MessageTaskHistoryService.cs index ebf56de7..2a10527d 100644 --- a/src/Services/Masa.Mc.Service/Services/MessageTaskHistoryService.cs +++ b/src/Services/Masa.Mc.Service/Services/MessageTaskHistoryService.cs @@ -34,10 +34,10 @@ public async Task WithdrawnAsync(IEventBus eventBus, Guid id) await eventBus.PublishAsync(command); } - [RoutePattern("{id}/receiverUsers", StartWithBaseUri = true, HttpMethod = "Get")] - public async Task> GetReceiverUsersAsync(IEventBus eventBus, Guid id) + [RoutePattern("{id}/receivers", StartWithBaseUri = true, HttpMethod = "Get")] + public async Task> GetReceiversAsync(IEventBus eventBus, Guid id) { - var query = new GetMessageTaskHistoryReceiverUsersQuery(id); + var query = new GetMessageTaskHistoryReceiversQuery(id); await eventBus.PublishAsync(query); return query.Result; } diff --git a/src/Web/Masa.Mc.Web.Admin/Pages/MessageTasks/Modules/MessageTaskDetailModal.razor.cs b/src/Web/Masa.Mc.Web.Admin/Pages/MessageTasks/Modules/MessageTaskDetailModal.razor.cs index 5b6839db..889ef21b 100644 --- a/src/Web/Masa.Mc.Web.Admin/Pages/MessageTasks/Modules/MessageTaskDetailModal.razor.cs +++ b/src/Web/Masa.Mc.Web.Admin/Pages/MessageTasks/Modules/MessageTaskDetailModal.razor.cs @@ -46,7 +46,7 @@ private async Task GetFormDataAsync() { _historyInfo = _histories.Result[0]; - await GetReceiverUsersAsync(_historyInfo.Id); + await GetReceiversAsync(_historyInfo.Id); } } @@ -112,7 +112,7 @@ private async Task LoadData() private async Task HandleItemSelect(MessageTaskHistoryDto item) { _historyInfo = item; - await GetReceiverUsersAsync(_historyInfo.Id); + await GetReceiversAsync(_historyInfo.Id); } private async Task HandlePageChanged(int page) @@ -145,8 +145,8 @@ private async Task WithdrawnAsync() } } - private async Task GetReceiverUsersAsync(Guid id) + private async Task GetReceiversAsync(Guid id) { - _receiverUsers = await MessageTaskHistoryService.GetReceiverUsersAsync(id); + _receiverUsers = await MessageTaskHistoryService.GetReceiversAsync(id); } }