diff --git a/backend/Hosts/Musify.Api/Program.cs b/backend/Hosts/Musify.Api/Program.cs index 71b704f..fd874db 100644 --- a/backend/Hosts/Musify.Api/Program.cs +++ b/backend/Hosts/Musify.Api/Program.cs @@ -1,7 +1,6 @@ using System.Text.Json.Serialization; using Musify.Api.Endpoints; using Musify.Api.Extensions; -using Musify.Api.Serialization; using Musify.Infrastructure.Observability; using Scalar.AspNetCore; @@ -12,9 +11,10 @@ var builder = WebApplication.CreateBuilder(args); builder.Services.ConfigureHttpJsonOptions(options => { options.SerializerOptions.Converters.Add(new JsonStringEnumConverter()); - options.SerializerOptions.Converters.Add(new LongAsStringConverter()); - options.SerializerOptions.Converters.Add(new NullableLongAsStringConverter()); -}); + options.SerializerOptions.NumberHandling = + JsonNumberHandling.AllowReadingFromString | + JsonNumberHandling.WriteAsString; +} ); builder.Services .AddApplicationServices(builder.Configuration) diff --git a/backend/Hosts/Musify.Api/Serialization/LongAsStringConverter.cs b/backend/Hosts/Musify.Api/Serialization/LongAsStringConverter.cs deleted file mode 100644 index 587708c..0000000 --- a/backend/Hosts/Musify.Api/Serialization/LongAsStringConverter.cs +++ /dev/null @@ -1,37 +0,0 @@ -using System.Globalization; -using System.Text.Json; -using System.Text.Json.Serialization; - -namespace Musify.Api.Serialization; - -public sealed class LongAsStringConverter : JsonConverter -{ - public override long Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) => - reader.TokenType == JsonTokenType.String - ? long.Parse(reader.GetString()!, CultureInfo.InvariantCulture) - : reader.GetInt64(); - - public override void Write(Utf8JsonWriter writer, long value, JsonSerializerOptions options) => - writer.WriteStringValue(value.ToString(CultureInfo.InvariantCulture)); -} - -public sealed class NullableLongAsStringConverter : JsonConverter -{ - public override long? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) - { - if (reader.TokenType == JsonTokenType.Null) - return null; - - return reader.TokenType == JsonTokenType.String - ? string.IsNullOrEmpty(reader.GetString()) ? null : long.Parse(reader.GetString()!, CultureInfo.InvariantCulture) - : reader.GetInt64(); - } - - public override void Write(Utf8JsonWriter writer, long? value, JsonSerializerOptions options) - { - if (value.HasValue) - writer.WriteStringValue(value.Value.ToString(CultureInfo.InvariantCulture)); - else - writer.WriteNullValue(); - } -}