Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix criteria DateTimeOffset and DateTime JSON parsing #7180

Merged
merged 3 commits into from
Jun 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Serenity.Net.Data/Criteria/CriteriaJsonConverter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ private BaseCriteria Parse(JsonElement[] array)
throw new ArgumentNullException("item");

if (item.ValueKind == JsonValueKind.String)
list.Add(item.GetString());
list.Add(item.GetString());
else if (item.ValueKind == JsonValueKind.Number)
list.Add(item.GetDouble());
else if (item.ValueKind == JsonValueKind.True)
Expand Down
35 changes: 35 additions & 0 deletions src/Serenity.Net.Entity/FieldTypes/DateTimeOffsetField.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,41 @@ public static DateTimeOffsetField Factory(ICollection<Field> collection, string
return new DateTimeOffsetField(collection, name, caption, size, flags, getValue, setValue);
}

/// <summary>
/// Converts the value.
/// </summary>
/// <param name="source">The source.</param>
/// <param name="provider">The provider.</param>
/// <returns></returns>
public override object ConvertValue(object source, IFormatProvider provider)
{
if (source is Newtonsoft.Json.Linq.JValue jValue)
source = jValue.Value;

if (source == null)
return null;

if (source is DateTime dt)
return dt;

if (source is DateTimeOffset dto)
return dto.DateTime;

if (source is string s)
{
if (DateTimeOffset.TryParse(s, provider, DateTimeStyles.None, out var dtOffset))
return dtOffset;

if (s.TryParseISO8601DateTime(out var dateTime))
return dateTime;

if (DateTime.TryParse(s, provider, DateTimeStyles.None, out dateTime))
return dateTime;
}

return Convert.ChangeType(source, typeof(DateTime), provider);
}

/// <summary>
/// Gets field value from a data reader.
/// </summary>
Expand Down
10 changes: 4 additions & 6 deletions src/Serenity.Net.Entity/FieldTypes/GenericValueField.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,11 @@ public override object ConvertValue(object source, IFormatProvider provider)

if (source == null)
return null;
else
{
if (source is TValue val)
return val;

return Convert.ChangeType(source, typeof(TValue), provider);
}
if (source is TValue val)
return val;

return Convert.ChangeType(source, typeof(TValue), provider);
}

/// <summary>
Expand Down
Loading