fix: correction of bugs found by new documentation tests

FgForrest · Feb 27, 2024 · decd40c · decd40c
1 parent 3a6bc07
commit decd40c
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 7 deletions.
diff --git a/EvitaDB.Client/DataTypes/EvitaDataTypes.cs b/EvitaDB.Client/DataTypes/EvitaDataTypes.cs
@@ -266,7 +266,7 @@ public static string FormatValue(object? value)
         }
         if (value is bool boolValue)
         {
-            return boolValue.ToString()!;
+            return boolValue.ToString().ToLower();
         }
         if (value is Range range)
         {
@@ -341,4 +341,4 @@ private static string DateTimeMillisecondFormat(int milliseconds)
         // Three or more digits in milliseconds, format with three milliseconds
         return  ".fff";
     }
-}
+}
diff --git a/EvitaDB.Client/Models/ExtraResults/Hierarchy.cs b/EvitaDB.Client/Models/ExtraResults/Hierarchy.cs
@@ -186,7 +186,7 @@ private void AppendLevelInfoTreeString(StringBuilder treeBuilder, LevelInfo leve
     }
 }
 
-public record LevelInfo(IEntityClassifier Entity, bool Requested, int? QueriedEntityCount, int? ChildrenCount, List<LevelInfo> Children)
+public record LevelInfo(IEntityClassifier Entity, bool Requested, int? QueriedEntityCount, int? ChildrenCount, List<LevelInfo> Children) : IComparable
 {
     public LevelInfo(LevelInfo levelInfo, List<LevelInfo> children) : 
         this(levelInfo.Entity, levelInfo.Requested, levelInfo.QueriedEntityCount, levelInfo.ChildrenCount, children)
@@ -202,4 +202,13 @@ public override string ToString()
 
         return $"[{QueriedEntityCount}:{ChildrenCount} {Entity}]";
     }
-}
+
+    public int CompareTo(object? other)
+    {
+        if (other is not LevelInfo levelInfo)
+        {
+            return 1;
+        }
+        return Entity.PrimaryKey!.Value.CompareTo(levelInfo.Entity.PrimaryKey!.Value);
+    }
+}
diff --git a/EvitaDB.Client/Queries/Filter/AttributeInRange.cs b/EvitaDB.Client/Queries/Filter/AttributeInRange.cs
@@ -24,9 +24,10 @@ namespace EvitaDB.Client.Queries.Filter;
 /// inRange("age", 63)
 /// </code>
 /// </summary>
-public class AttributeInRange<T> : AbstractAttributeFilterConstraintLeaf
+public class AttributeInRange<T> : AbstractAttributeFilterConstraintLeaf, IConstraintWithSuffix
     where T : IComparable
 {
+    private static readonly string SuffixNow = "now";
     private AttributeInRange(params object?[] arguments) : base(arguments)
     {
     }
@@ -73,4 +74,7 @@ public AttributeInRange(string attributeName, byte value) : base(attributeName,
     public TNumber? TheValue<TNumber>() where TNumber : struct, IComparable => Arguments is [_, TNumber theValue and (byte or short or int or long or decimal)]
         ? theValue
         : null;
+
+    public string? SuffixIfApplied => Arguments.Length == 1 ? SuffixNow : null;
+    public bool ArgumentImplicitForSuffix(object argument) => false;
 }
diff --git a/EvitaDB.Client/Queries/IQueryConstraints.cs b/EvitaDB.Client/Queries/IQueryConstraints.cs
@@ -184,7 +184,8 @@ dateTimeOffsetValue is null
         decimalValue is null ? null : new AttributeInRange<decimal>(attributeName, decimalValue.Value);
 
     /// <inheritdoc cref="Client.Queries.Filter.AttributeInRange{DateTimeOffset}"/>
-    static AttributeInRange<DateTimeOffset> AttributeInRangeNow(string attributeName) => new(attributeName);
+    static AttributeInRange<DateTimeOffset>? AttributeInRangeNow(string? attributeName) =>
+        attributeName is null ? null : new AttributeInRange<DateTimeOffset>(attributeName!);
 
     /// <inheritdoc cref="Client.Queries.Filter.AttributeInSet{T}"/>
     static AttributeInSet<T>? AttributeInSet<T>(string? attributeName, params T?[]? set)

diff --git a/EvitaDB.QueryValidator/Serialization/Json/Converters/EntitySerializer.cs b/EvitaDB.QueryValidator/Serialization/Json/Converters/EntitySerializer.cs
@@ -2,6 +2,7 @@
 using EvitaDB.Client.DataTypes;
 using EvitaDB.Client.Models.Data;
 using EvitaDB.Client.Models.Schemas;
+using EvitaDB.Client.Utils;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
@@ -43,7 +44,14 @@ public override void WriteJson(JsonWriter writer, ISealedEntity? value, JsonSeri
         if (value.InnerRecordHandling != PriceInnerRecordHandling.Unknown)
         {
             writer.WritePropertyName("priceInnerRecordHandling");
-            writer.WriteValue(value.InnerRecordHandling?.ToString().ToUpper());
+            if (value.InnerRecordHandling != null)
+            {
+                writer.WriteValue(StringUtils.ToUpperSnakeCase(value.InnerRecordHandling!.ToString()!));
+            }
+            else
+            {
+                writer.WriteNull();
+            }
         }
 
         WriteAttributes(writer, value);