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
20 changes: 14 additions & 6 deletions src/Utils/StreamJsonConverter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,16 @@ public static class StreamJsonConverter
NamingStrategy = new SnakeCaseNamingStrategy(), // this handles ForeignId => foreign_id etc. conversion for us
},
NullValueHandling = NullValueHandling.Ignore,
DateTimeZoneHandling = DateTimeZoneHandling.Utc // always convert time to UTC
DateTimeZoneHandling = DateTimeZoneHandling.Utc, // always convert time to UTC
};

public static JsonSerializer Serializer { get; } = JsonSerializer.Create(Settings);
public static string SerializeObject(object obj) => JsonConvert.SerializeObject(obj, Settings);
public static T DeserializeObject<T>(string json) => JsonConvert.DeserializeObject<T>(json, Settings);

public static string SerializeObject(object obj) =>
JsonConvert.SerializeObject(obj, Settings);

public static T DeserializeObject<T>(string json) =>
JsonConvert.DeserializeObject<T>(json, Settings);
}

public static class StreamJsonConverterUTC
Expand All @@ -31,11 +35,15 @@ public static class StreamJsonConverterUTC
NamingStrategy = new SnakeCaseNamingStrategy(), // this handles ForeignId => foreign_id etc. conversion for us
},
NullValueHandling = NullValueHandling.Ignore,
DateTimeZoneHandling = DateTimeZoneHandling.Utc // always convert time to UTC
DateTimeZoneHandling = DateTimeZoneHandling.Utc, // always convert time to UTC
};

public static JsonSerializer Serializer { get; } = JsonSerializer.Create(Settings);
public static string SerializeObject(object obj) => JsonConvert.SerializeObject(obj, Settings);
public static T DeserializeObject<T>(string json) => JsonConvert.DeserializeObject<T>(json, Settings);

public static string SerializeObject(object obj) =>
JsonConvert.SerializeObject(obj, Settings);

public static T DeserializeObject<T>(string json) =>
JsonConvert.DeserializeObject<T>(json, Settings);
}
}
2 changes: 1 addition & 1 deletion src/stream-net.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<DefineConstants>TRACE;DEBUG;NETCORE</DefineConstants>
</PropertyGroup>
<PropertyGroup>
<TargetFrameworks>net45;net46;net47;net48;netstandard1.6;netstandard2.0;netstandard2.1;net5.0;net6.0</TargetFrameworks>
<TargetFrameworks>netstandard1.6;netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<PackageId>stream-net</PackageId>
Expand Down
9 changes: 3 additions & 6 deletions tests/ReactionTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,7 @@ public async Task TestReactionPagination()
Guid.NewGuid().ToString(),
"upvote",
"mary",
data
);
data);

// activity id
var filter = ReactionFiltering.Default;
Expand All @@ -140,15 +139,13 @@ public async Task TestReactionPagination()
// with limit
reactionsByActivity = await Client.Reactions.FilterAsync(
filter.WithLimit(1),
pagination
);
pagination);
Assert.AreEqual(1, reactionsByActivity.Count());

// with data
var reactionsByActivityWithData = await Client.Reactions.FilterWithActivityAsync(
filter.WithLimit(1),
pagination
);
pagination);
Assert.AreEqual(1, reactionsByActivity.Count());
Assert.AreEqual(data, reactionsByActivity.FirstOrDefault().Data);

Expand Down
2 changes: 1 addition & 1 deletion tests/UtilsTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public async Task TestActivityIdSameAsBackend()
}

[Test]
public async Task TestStreamJsonConverterUTC()
public void TestStreamJsonConverterUTC()
{
var date0 = new DateTime(2023, 5, 10, 12, 30, 15, DateTimeKind.Utc);
var date0AsJsonNewtonsoft = Newtonsoft.Json.JsonConvert.SerializeObject(date0);
Expand Down