Remove prev filters implementation and add configuration to use new filters

Author: Bardin08

src/X.Serilog.Sinks.Telegram/Filters/Fluent/IFilterExecutor.cs

@@ -0,0 +1,6 @@
+namespace X.Serilog.Sinks.Telegram.Filters.Fluent;
+
+public interface IFilterExecutor
+{
+    bool Evaluate(LogEvent entry);
+}

src/X.Serilog.Sinks.Telegram/Filters/Fluent/LogEntryPredicate.cs

@@ -1,3 +1,3 @@
 namespace X.Serilog.Sinks.Telegram.Filters.Fluent;
 
-public delegate bool LogEntryPredicate(LogEntry entry);
+public delegate bool LogEntryPredicate(LogEvent entry);

src/X.Serilog.Sinks.Telegram/Filters/Fluent/LogQueryBuilder.cs

@@ -4,7 +4,8 @@ public class LogQueryBuilder :
     IMessageRuleBuilder,
     IExceptionRuleBuilder,
     IPropertiesRuleBuilder,
-    ILevelRuleBuilder
+    ILevelRuleBuilder,
+    IFilterExecutor
 {
     private ConditionGroup _currentGroup = new();
     private readonly List<ConditionGroup> _groups = [];
@@ -14,7 +15,7 @@ public class LogQueryBuilder :
     public IPropertiesRuleBuilder Properties => this;
     public ILevelRuleBuilder Level => this;
 
-    public LogQueryBuilder()
+    private LogQueryBuilder()
     {
         _groups.Add(_currentGroup);
     }
@@ -28,21 +29,7 @@ public ILogQueryBuilder Or()
         return this;
     }
 
-    // public LogQueryBuilder And(LogEntryPredicate predicate)
-    // {
-    //     _currentGroup.Conditions.Add(new Condition(predicate));
-    //     return this;
-    // }
-
-    // public LogQueryBuilder Or(LogEntryPredicate predicate)
-    // {
-    //     _currentGroup = new ConditionGroup(isOrGroup: true);
-    //     _groups.Add(_currentGroup);
-    //     _currentGroup.Conditions.Add(new Condition(predicate));
-    //     return this;
-    // }
-
-    public bool Evaluate(LogEntry entry)
+    public bool Evaluate(LogEvent entry)
     {
         foreach (var group in _groups)
         {
@@ -61,7 +48,7 @@ public bool Evaluate(LogEntry entry)
         return false;
     }
 
-    private bool EvaluateCondition(object condition, LogEntry entry)
+    private bool EvaluateCondition(object condition, LogEvent entry)
     {
         return condition switch
         {
@@ -75,44 +62,46 @@ private bool EvaluateCondition(object condition, LogEntry entry)
 
     #region IMessageRuleBuilder
 
-    ILogQueryBuilder IMessageRuleBuilder.Contains(string key)
+    ILogQueryBuilder IMessageRuleBuilder.Contains(string substring)
     {
-        var condition = new Condition(e => e.RenderedMessage?.Contains(key) ?? false);
+        var condition = new Condition(e => e.RenderMessage().Contains(substring));
         _currentGroup.Conditions.Add(condition);
         return this;
     }
 
     ILogQueryBuilder IMessageRuleBuilder.NotContains(string substring)
     {
-        var condition = new Condition(e => !e.RenderedMessage?.Contains(substring) ?? false);
+        var condition = new Condition(e => !e.RenderMessage().Contains(substring));
         _currentGroup.Conditions.Add(condition);
         return this;
     }
 
     ILogQueryBuilder IMessageRuleBuilder.Equals(string substring, StringComparison comparison)
     {
-        var condition = new Condition(e => e.RenderedMessage?.Equals(substring, comparison) ?? false);
+        var condition = new Condition(e => e.RenderMessage().Equals(substring, comparison));
         _currentGroup.Conditions.Add(condition);
         return this;
     }
 
     ILogQueryBuilder IMessageRuleBuilder.NotEquals(string substring, StringComparison comparison)
     {
-        var condition = new Condition(e => !e.RenderedMessage?.Equals(substring, comparison) ?? false);
+        var condition = new Condition(e => !e.RenderMessage().Equals(substring, comparison));
         _currentGroup.Conditions.Add(condition);
         return this;
     }
 
     ILogQueryBuilder IMessageRuleBuilder.Null()
     {
-        var condition = new Condition(e => e.RenderedMessage is null);
+        // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
+        var condition = new Condition(e => e.RenderMessage() is null);
         _currentGroup.Conditions.Add(condition);
         return this;
     }
 
     ILogQueryBuilder IMessageRuleBuilder.NotNull()
     {
-        var condition = new Condition(e => e.RenderedMessage is not null);
+        // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
+        var condition = new Condition(e => e.RenderMessage() is not null);
         _currentGroup.Conditions.Add(condition);
         return this;
     }
@@ -121,30 +110,30 @@ ILogQueryBuilder IMessageRuleBuilder.NotNull()
 
     #region IExceptionRuleBuilder
 
-    ILogQueryBuilder IExceptionRuleBuilder.Contains(string key)
+    ILogQueryBuilder IExceptionRuleBuilder.Contains(string substring)
     {
-        var condition = new Condition(e => e.Exception?.Contains(key) ?? false);
+        var condition = new Condition(e => e.Exception?.Message.Contains(substring) ?? false);
         _currentGroup.Conditions.Add(condition);
         return this;
     }
 
     ILogQueryBuilder IExceptionRuleBuilder.NotContains(string substring)
     {
-        var condition = new Condition(e => !e.Exception?.Contains(substring) ?? false);
+        var condition = new Condition(e => !e.Exception?.Message.Contains(substring) ?? false);
         _currentGroup.Conditions.Add(condition);
         return this;
     }
 
     ILogQueryBuilder IExceptionRuleBuilder.Equals(string substring, StringComparison comparison)
     {
-        var condition = new Condition(e => e.Exception?.Equals(substring, comparison) ?? false);
+        var condition = new Condition(e => e.Exception?.Message.Equals(substring, comparison) ?? false);
         _currentGroup.Conditions.Add(condition);
         return this;
     }
 
     ILogQueryBuilder IExceptionRuleBuilder.NotEquals(string substring, StringComparison comparison)
     {
-        var condition = new Condition(e => !e.Exception?.Equals(substring, comparison) ?? false);
+        var condition = new Condition(e => !e.Exception?.Message.Equals(substring, comparison) ?? false);
         _currentGroup.Conditions.Add(condition);
         return this;
     }
@@ -167,59 +156,49 @@ ILogQueryBuilder IExceptionRuleBuilder.NotNull()
 
     #region IPropertiesRuleBuilder
 
-    ILogQueryBuilder IPropertiesRuleBuilder.Contains(string key)
+    ILogQueryBuilder IPropertiesRuleBuilder.Contains(string substring)
     {
-        var condition = new Condition(e => e.Properties?.ContainsKey(key) ?? false);
+        var condition = new Condition(e => e.Properties.ContainsKey(substring));
         _currentGroup.Conditions.Add(condition);
         return this;
     }
 
     ILogQueryBuilder IPropertiesRuleBuilder.NotContains(string key)
     {
-        var condition = new Condition(e => !e.Properties?.ContainsKey(key) ?? false);
+        var condition = new Condition(e => !e.Properties.ContainsKey(key));
         _currentGroup.Conditions.Add(condition);
         return this;
     }
 
     ILogQueryBuilder IPropertiesRuleBuilder.Equals(string key, string value, StringComparison comparison)
     {
-        var condition = new Condition(e =>
-        {
-            if (!e.Properties?.ContainsKey(key) ?? true)
-            {
-                return false;
-            }
-
-            return e.Properties![key].Equals(value, comparison);
-        });
+        var condition = new Condition(
+            e => e.Properties.TryGetValue(key, out var prop) &&
+                 prop.ToString().Equals(value, comparison));
         _currentGroup.Conditions.Add(condition);
         return this;
     }
 
     ILogQueryBuilder IPropertiesRuleBuilder.NotEquals(string key, string value, StringComparison comparison)
     {
-        var condition = new Condition(e =>
-        {
-            if (!e.Properties?.ContainsKey(key) ?? true)
-            {
-                return false;
-            }
-
-            return e.Properties![key].Equals(value, comparison);
-        });
+        var condition = new Condition(
+            e => !(e.Properties.TryGetValue(key, out var prop) &&
+                   prop.ToString().Equals(value, comparison)));
         _currentGroup.Conditions.Add(condition);
         return this;
     }
 
     ILogQueryBuilder IPropertiesRuleBuilder.Null()
     {
+        // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
         var condition = new Condition(e => e.Properties is null);
         _currentGroup.Conditions.Add(condition);
         return this;
     }
 
     ILogQueryBuilder IPropertiesRuleBuilder.NotNull()
     {
+        // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
         var condition = new Condition(e => e.Properties is not null);
         _currentGroup.Conditions.Add(condition);
         return this;
@@ -231,12 +210,32 @@ ILogQueryBuilder IPropertiesRuleBuilder.NotNull()
 
     ILogQueryBuilder ILevelRuleBuilder.InRange(LogEventLevel min, LogEventLevel max)
     {
-        throw new NotImplementedException();
+        var minInt = (int)min;
+        var maxInt = (int)max;
+
+        var condition = new Condition(e =>
+        {
+            var logLevelInt = (int)e.Level;
+            return minInt <= logLevelInt && logLevelInt <= maxInt;
+        });
+
+        _currentGroup.Conditions.Add(condition);
+        return this;
     }
 
     ILogQueryBuilder ILevelRuleBuilder.NotInRange(LogEventLevel min, LogEventLevel max)
     {
-        throw new NotImplementedException();
+        var minInt = (int)min;
+        var maxInt = (int)max;
+
+        var condition = new Condition(e =>
+        {
+            var logLevelInt = (int)e.Level;
+            return !(logLevelInt >= minInt && logLevelInt <= maxInt);
+        });
+
+        _currentGroup.Conditions.Add(condition);
+        return this;
     }
 
     ILogQueryBuilder ILevelRuleBuilder.Equals(LogEventLevel level)
@@ -254,4 +253,9 @@ ILogQueryBuilder ILevelRuleBuilder.NotEquals(LogEventLevel level)
     }
 
     #endregion
+
+    public static LogQueryBuilder Create()
+    {
+        return new LogQueryBuilder();
+    }
 }

src/X.Serilog.Sinks.Telegram/Filters/IFilter.cs

@@ -1,25 +1,14 @@
-using System.Collections.Immutable;
-using X.Serilog.Sinks.Telegram.Configuration;
+using X.Serilog.Sinks.Telegram.Configuration;
+using X.Serilog.Sinks.Telegram.Filters.Fluent;
 
 namespace X.Serilog.Sinks.Telegram.Filters;
 
 public class LogFilterManager(LogsFiltersConfiguration configuration)
 {
-    private readonly IImmutableList<IFilter> _logsFilters = configuration.Filters ??
-                                                            ImmutableArray<IFilter>.Empty;
+    private readonly IFilterExecutor _logsFilter = (IFilterExecutor)configuration.QueryBuilder!;
 
     public bool ApplyFilter(LogEvent logEvent)
     {
-        var filterResults = _logsFilters
-            .Select(filter => filter.IsPassedAsync(logEvent));
-
-        var isPassed = configuration.FiltersOperator switch
-        {
-            LogFiltersOperator.And => filterResults.All(result => result),
-            LogFiltersOperator.Or => filterResults.Any(result => result),
-            _ => throw new ArgumentOutOfRangeException()
-        };
-
-        return isPassed;
+        return _logsFilter.Evaluate(logEvent);
     }
 }