Fix tests
CI / backend (push) Failing after 8m50s
CI / frontend (push) Failing after 1m45s

This commit is contained in:
voltsrage
2026-08-05 20:21:23 +08:00
parent b44954545b
commit a6a491a2da
16 changed files with 104 additions and 15 deletions
@@ -0,0 +1,39 @@
using System.Text.Json;
/// <summary>
/// Shared read helper for converters that write DB-wire strings (e.g. "ICU")
/// but must also accept default System.Text.Json client payloads (numeric enums)
/// and PascalCase enum names.
/// </summary>
internal static class DbStringEnumJson
{
public static TEnum Read<TEnum>(ref Utf8JsonReader reader, Func<string, TEnum> fromDbString)
where TEnum : struct, Enum
{
switch (reader.TokenType)
{
case JsonTokenType.Number:
if (reader.TryGetInt32(out var numeric)
&& Enum.IsDefined(typeof(TEnum), numeric))
return (TEnum)Enum.ToObject(typeof(TEnum), numeric);
throw new JsonException($"Invalid numeric value for {typeof(TEnum).Name}.");
case JsonTokenType.String:
var raw = reader.GetString()
?? throw new JsonException($"Null string for {typeof(TEnum).Name}.");
try
{
return fromDbString(raw);
}
catch (ArgumentOutOfRangeException) when (
Enum.TryParse(raw, ignoreCase: true, out TEnum byName))
{
return byName;
}
default:
throw new JsonException(
$"Unexpected token {reader.TokenType} when parsing {typeof(TEnum).Name}.");
}
}
}
@@ -4,7 +4,7 @@ using System.Text.Json.Serialization;
public sealed class DepartmentJsonConverter : JsonConverter<Department>
{
public override Department Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
=> DepartmentExtensions.FromDbString(reader.GetString()!);
=> DbStringEnumJson.Read(ref reader, DepartmentExtensions.FromDbString);
public override void Write(Utf8JsonWriter writer, Department value, JsonSerializerOptions options)
=> writer.WriteStringValue(value.ToDbString());