reactor : Handle Code review

masastack · Jul 20, 2023 · c4df0ac · c4df0ac
1 parent f3002ad
commit c4df0ac
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/...ways/Caller/Masa.Mc.ApiGateways.Caller/Services/MessageTasks/MessageTaskHistoryService.cs b/...ways/Caller/Masa.Mc.ApiGateways.Caller/Services/MessageTasks/MessageTaskHistoryService.cs
@@ -22,9 +22,9 @@ public async Task<PaginatedListDto<MessageTaskHistoryDto>> GetListAsync(GetMessa
         return await GetAsync<MessageTaskHistoryDto>($"{id}");
     }
 
-    public async Task<List<MessageTaskReceiverDto>> GetReceiverUsersAsync(Guid id)
+    public async Task<List<MessageTaskReceiverDto>> GetReceiversAsync(Guid id)
     {
-        return await GetAsync<List<MessageTaskReceiverDto>>($"{id}/receiverUsers") ?? new();
+        return await GetAsync<List<MessageTaskReceiverDto>>($"{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
@@ -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/...etMessageTaskHistoryReceiverUsersQuery.cs → ...es/GetMessageTaskHistoryReceiversQuery.cs b/...etMessageTaskHistoryReceiverUsersQuery.cs → ...es/GetMessageTaskHistoryReceiversQuery.cs
@@ -3,7 +3,7 @@
 
 namespace Masa.Mc.Service.Admin.Application.MessageTasks.Queries;
 
-public record GetMessageTaskHistoryReceiverUsersQuery(Guid MessageTaskHistoryId) : Query<List<MessageTaskReceiverDto>>
+public record GetMessageTaskHistoryReceiversQuery(Guid MessageTaskHistoryId) : Query<List<MessageTaskReceiverDto>>
 {
     public override List<MessageTaskReceiverDto> Result { get; set; } = new();
 }
diff --git 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<List<MessageTaskReceiverDto>> GetReceiverUsersAsync(IEventBus eventBus, Guid id)
+    [RoutePattern("{id}/receivers", StartWithBaseUri = true, HttpMethod = "Get")]
+    public async Task<List<MessageTaskReceiverDto>> 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
@@ -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);
     }
 }