♻ refactor: Wasm support

masastack · Jan 11, 2025 · 9982078 · 9982078
1 parent 0a559ee
commit 9982078
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/src/Services/Masa.Alert.Service/Services/AlarmHistoryService.cs b/src/Services/Masa.Alert.Service/Services/AlarmHistoryService.cs
@@ -1,6 +1,9 @@
 // Copyright (c) MASA Stack All rights reserved.
 // Licensed under the Apache License. See LICENSE.txt in the project root for license information.
 
+using Masa.Alert.Domain.Shared.AlarmHistory;
+using Masa.Alert.Domain.Shared.AlarmRules;
+
 namespace Masa.Alert.Service.Admin.Services;
 
 public class AlarmHistoryService : ServiceBase
@@ -11,8 +14,9 @@ public AlarmHistoryService(IServiceCollection services) : base()
     }
 
     [RoutePattern("", StartWithBaseUri = true, HttpMethod = "Get")]
-    public async Task<PaginatedListDto<AlarmHistoryDto>> GetListAsync(IEventBus eventbus, GetAlarmHistoryInputDto inputDto)
+    public async Task<PaginatedListDto<AlarmHistoryDto>> GetListAsync(IEventBus eventbus, [FromQuery] Guid? alarmRuleId, [FromQuery] DateTime? startTime, [FromQuery] DateTime? endTime, [FromQuery] Guid? handler, [FromQuery] AlarmHistorySearchTypes searchType = default, [FromQuery] AlarmHistorySearchTimeTypes timeType = default, [FromQuery] AlertSeverity alertSeverity = default, [FromQuery] AlarmHistoryHandleStatuses handleStatus = default, [FromQuery] string filter = "", [FromQuery] string sorting = "", [FromQuery] int page = 1, [FromQuery] int pagesize = 10)
     {
+        var inputDto = new GetAlarmHistoryInputDto(filter, alarmRuleId, searchType, timeType, startTime, endTime, alertSeverity, handleStatus, handler ?? default, sorting, page, pagesize);
         var query = new GetAlarmHistoryListQuery(inputDto);
         await eventbus.PublishAsync(query);
         return query.Result;

diff --git a/src/Services/Masa.Alert.Service/Services/AlarmRuleRecordService.cs b/src/Services/Masa.Alert.Service/Services/AlarmRuleRecordService.cs
@@ -11,8 +11,9 @@ public AlarmRuleRecordService(IServiceCollection services) : base()
     }
 
     [RoutePattern("", StartWithBaseUri = true, HttpMethod = "Get")]
-    public async Task<PaginatedListDto<AlarmRuleRecordDto>> GetListAsync(IEventBus eventbus, GetAlarmRuleRecordInputDto inputDto)
+    public async Task<PaginatedListDto<AlarmRuleRecordDto>> GetListAsync(IEventBus eventbus, [FromQuery] Guid alarmHistoryId, [FromQuery] DateTime? startTime, [FromQuery] DateTime? endTime, [FromQuery] bool? isTrigger, [FromQuery] string sorting = "", [FromQuery] int page = 1, [FromQuery] int pagesize = 10)
     {
+        var inputDto = new GetAlarmRuleRecordInputDto(alarmHistoryId, startTime, endTime, isTrigger, sorting, page, pagesize);
         var query = new GetAlarmRuleRecordListQuery(inputDto);
         await eventbus.PublishAsync(query);
         return query.Result;

diff --git a/src/Services/Masa.Alert.Service/Services/AlarmRuleService.cs b/src/Services/Masa.Alert.Service/Services/AlarmRuleService.cs
@@ -1,6 +1,8 @@
 // Copyright (c) MASA Stack All rights reserved.
 // Licensed under the Apache License. See LICENSE.txt in the project root for license information.
 
+using Masa.Alert.Domain.Shared.AlarmRules;
+
 namespace Masa.Alert.Service.Admin.Services;
 
 public class AlarmRuleService : ServiceBase
@@ -11,8 +13,9 @@ public AlarmRuleService(IServiceCollection services) : base()
     }
 
     [RoutePattern("", StartWithBaseUri = true, HttpMethod = "Get")]
-    public async Task<PaginatedListDto<AlarmRuleDto>> GetListAsync(IEventBus eventbus, GetAlarmRuleInputDto inputDto)
+    public async Task<PaginatedListDto<AlarmRuleDto>> GetListAsync(IEventBus eventbus, [FromQuery] DateTime? startTime, [FromQuery] DateTime? endTime, [FromQuery] AlarmRuleTypes type = default, [FromQuery] AlarmRuleSearchTimeTypes timeType = default, [FromQuery] string projectIdentity = "", [FromQuery] string appIdentity = "", [FromQuery] string metricId = "", [FromQuery] string filter = "", [FromQuery] string sorting = "", [FromQuery] int page = 1, [FromQuery] int pagesize = 10)
     {
+        var inputDto = new GetAlarmRuleInputDto(filter, type, timeType, startTime, endTime, projectIdentity, appIdentity, metricId, sorting, page, pagesize);
         var query = new GetAlarmRuleListQuery(inputDto);
         await eventbus.PublishAsync(query);
         return query.Result;

diff --git a/src/Services/Masa.Alert.Service/Services/WebHookService.cs b/src/Services/Masa.Alert.Service/Services/WebHookService.cs
@@ -11,8 +11,9 @@ public WebHookService(IServiceCollection services) : base()
     }
 
     [RoutePattern("", StartWithBaseUri = true, HttpMethod = "Get")]
-    public async Task<PaginatedListDto<WebHookDto>> GetListAsync(IEventBus eventbus, GetWebHookInputDto inputDto)
+    public async Task<PaginatedListDto<WebHookDto>> GetListAsync(IEventBus eventbus, [FromQuery] string filter = "", [FromQuery] string sorting = "", [FromQuery] int page = 1, [FromQuery] int pagesize = 10)
     {
+        var inputDto = new GetWebHookInputDto(filter, sorting, page, pagesize);
         var query = new GetWebHookListQuery(inputDto);
         await eventbus.PublishAsync(query);
         return query.Result;