Skip to content
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
30 changes: 30 additions & 0 deletions src/IPData/Http/Serializer/IntJsonConverter.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
using System;
using System.Text.Json;
using System.Text.Json.Serialization;

namespace IPData.Http.Serializer
{
internal class IntJsonConverter : JsonConverter<int>
{
public override int Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
if (reader.TokenType == JsonTokenType.String)
{
var stringValue = reader.GetString();
if (int.TryParse(stringValue, out var value))
{
return value;
}

throw new JsonException($"Unable to convert \"{stringValue}\" to System.Int32.");
}

return reader.GetInt32();
}

public override void Write(Utf8JsonWriter writer, int value, JsonSerializerOptions options)
{
writer.WriteNumberValue(value);
}
}
}
2 changes: 2 additions & 0 deletions src/IPData/Models/IPLookupResult.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.Linq.Expressions;
using System.Text.Json.Serialization;
using IPData.Helpers.Extensions;
using IPData.Http.Serializer;

namespace IPData.Models
{
Expand Down Expand Up @@ -88,6 +89,7 @@ public class IPLookupResult
public int? Status { get; set; }

[JsonPropertyName("count")]
[JsonConverter(typeof(IntJsonConverter))]
public int Count { get; set; }

internal static string FieldName(Expression<Func<IPLookupResult, object>> expression)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,6 @@
"is_bogon": false,
"blocklists": []
},
"status": 200
"status": 200,
"count": "213586"
}
26 changes: 26 additions & 0 deletions test/Unit/IPData.Tests/Http/Serializer/JsonSerializerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,32 @@ public void Deserialize_WhenCalled_ReturnedIPLookupResult(string json)
actual.Should().NotBeNull();
}

[Fact]
public void Deserialize_CountAsString_ParsedCorrectly()
{
// Arrange - API returns count as a string (issue #35)
var json = "{\"count\": \"213586\"}";

// Act
var actual = _sut.Deserialize<IPLookupResult>(json);

// Assert
actual.Count.Should().Be(213586);
}

[Fact]
public void Deserialize_CountAsNumber_ParsedCorrectly()
{
// Arrange
var json = "{\"count\": 213586}";

// Act
var actual = _sut.Deserialize<IPLookupResult>(json);

// Assert
actual.Count.Should().Be(213586);
}

[Theory, AutoMoqData]
public void SerializeIPLookupResult_WhenCalled_ReturnedString(IPLookupResult ipInfo)
{
Expand Down
Loading