feat: update getlist & get

masastack · Sep 12, 2024 · 2ca6d3e · 2ca6d3e
1 parent fcc04ab
commit 2ca6d3e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 2 deletions.
diff --git a/src/Application/Masa.Alert.Application.Contracts/AlarmRules/Dtos/AlarmRuleDto.cs b/src/Application/Masa.Alert.Application.Contracts/AlarmRules/Dtos/AlarmRuleDto.cs
@@ -38,4 +38,8 @@ public class AlarmRuleDto : AuditEntityDto<Guid, Guid>
     public List<AlarmRuleItemDto> Items { get; set; } = new();
 
     public string ModifierName { get; set; } = string.Empty;
+
+    public string Source { get; set; } = default!;
+
+    public bool Show { get; set; }
 }
diff --git a/src/Application/Masa.Alert.Application.Contracts/AlarmRules/Dtos/GetAlarmRuleInputDto.cs b/src/Application/Masa.Alert.Application.Contracts/AlarmRules/Dtos/GetAlarmRuleInputDto.cs
@@ -23,6 +23,8 @@ public class GetAlarmRuleInputDto : PaginatedOptionsDto<GetAlarmRuleInputDto>
 
     public Guid TeamId { get; set; }
 
+    public bool Show { get; set; } = true;
+
     public GetAlarmRuleInputDto()
     {
     }

diff --git a/src/Application/Masa.Alert.Application/AlarmRules/Commands/AlarmRuleCommandHandler.cs b/src/Application/Masa.Alert.Application/AlarmRules/Commands/AlarmRuleCommandHandler.cs
@@ -38,7 +38,7 @@ public async Task UpdateAsync(UpdateAlarmRuleCommand updateCommand)
         var queryable = await _repository.WithDetailsAsync();
         var entity = await queryable.FirstOrDefaultAsync(x => x.Id == updateCommand.AlarmRuleId);
 
-        MasaArgumentException.ThrowIfNull(entity, _i18n.T("AlarmRule"));
+        MasaArgumentException.ThrowIfNull(entity, _i18n.T("AlarmRule"));       
 
         updateCommand.AlarmRule.Adapt(entity);
 

diff --git a/src/Application/Masa.Alert.Application/AlarmRules/Queries/AlarmRuleQueryHandler.cs b/src/Application/Masa.Alert.Application/AlarmRules/Queries/AlarmRuleQueryHandler.cs
@@ -56,6 +56,7 @@ private async Task<Expression<Func<AlarmRuleQueryModel, bool>>> CreateFilteredPr
         Expression<Func<AlarmRuleQueryModel, bool>> condition = x => true;
         condition = condition.And(!string.IsNullOrEmpty(options.Filter), x => x.DisplayName.Contains(options.Filter));
         condition = condition.And(options.Type != default, x => x.Type == options.Type);
+        condition = condition.And(x => x.Show == options.Show);
         if (options.TimeType == AlarmRuleSearchTimeTypes.ModificationTime)
         {
             condition = condition.And(options.StartTime.HasValue, x => x.ModificationTime >= options.StartTime);

diff --git a/src/Domain/Masa.Alert.Domain/AlarmRules/Aggregates/AlarmRule.cs b/src/Domain/Masa.Alert.Domain/AlarmRules/Aggregates/AlarmRule.cs
@@ -51,7 +51,7 @@ public AlarmRule(string displayName, AlarmRuleTypes type, string projectIdentity
         IsGetTotal = isGetTotal;
         TotalVariable = totalVariable;
         WhereExpression = whereExpression;
-        Source = source;
+        Source = source ?? string.Empty;
         Show = show;
 
         SetChartConfig(chartYAxisUnit);