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

Handle unmaterialized sets in PageSerializer #223

Merged
merged 1 commit into from
Nov 12, 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
12 changes: 12 additions & 0 deletions Fauna.Test/Serialization/Serializers/PageSerializer.Tests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,16 @@ public void DeserializeIntoPageWithUserDefinedClass()
Assert.AreEqual(40, deserialized.Data[1].Age);
Assert.AreEqual("next_page_cursor", deserialized.After);
}

[Test]
public void DeserializeUnmaterializedSet()
{
const string token = "aftertoken";
const string wire = $$"""{"@set":"{{token}}"}""";

var serializer = Serializer.Generate<Page<object>>(s_ctx);
var deserialized = Helpers.Deserialize(serializer, s_ctx, wire)!;
Assert.IsEmpty(deserialized.Data);
Assert.AreEqual(token, deserialized.After);
}
}
67 changes: 41 additions & 26 deletions Fauna/Serialization/PageSerializer.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using Fauna.Exceptions;
using Fauna.Mapping;
using Fauna.Types;

Expand All @@ -13,11 +12,11 @@ public PageSerializer(ISerializer<T> elemSerializer)
_dataSerializer = new ListSerializer<T>(elemSerializer);
}

public override List<FaunaType> GetSupportedTypes() => new List<FaunaType> { FaunaType.Null, FaunaType.Set };
public override List<FaunaType> GetSupportedTypes() => [FaunaType.Null, FaunaType.Set];

public override Page<T> Deserialize(MappingContext ctx, ref Utf8FaunaReader reader)
{
var wrapInPage = false;
bool wrapInPage = false;
var endToken = TokenType.None;
switch (reader.CurrentTokenType)
{
Expand All @@ -32,36 +31,52 @@ public override Page<T> Deserialize(MappingContext ctx, ref Utf8FaunaReader read
break;
}

List<T>? data = null;
string? after = null;

if (wrapInPage)
{
data = _dataSerializer.Deserialize(ctx, ref reader);
var data = _dataSerializer.Deserialize(ctx, ref reader);
return new Page<T>(data, null);
}
else
{
while (reader.Read() && reader.CurrentTokenType != endToken)
{
var fieldName = reader.GetString()!;
reader.Read();

switch (fieldName)
{
case "data":
data = _dataSerializer.Deserialize(ctx, ref reader);
break;
case "after":
after = reader.GetString()!;
break;
}
}
reader.Read();
return reader.CurrentTokenType == TokenType.String
? HandleUnmaterialized(ctx, ref reader, endToken)
: HandleMaterialized(ctx, ref reader, endToken);
}

private Page<T> HandleUnmaterialized(MappingContext ctx, ref Utf8FaunaReader reader, TokenType endToken)
{
string after = reader.GetString()!;
reader.Read();
if (reader.CurrentTokenType != endToken)
{
throw UnexpectedToken(reader.CurrentTokenType);
}

if (data is null)
throw new SerializationException($"No page data found while deserializing into {typeof(Page<T>)}");
return new Page<T>([], after);
}

private Page<T> HandleMaterialized(MappingContext ctx, ref Utf8FaunaReader reader, TokenType endToken)
{
List<T> data = [];
string? after = null;

do
{
string fieldName = reader.GetString()!;
reader.Read();

switch (fieldName)
{
case "data":
data = _dataSerializer.Deserialize(ctx, ref reader);
break;
case "after":
after = reader.GetString()!;
break;
}
} while (reader.Read() && reader.CurrentTokenType != endToken);

return new Page<T>(data!, after);
return new Page<T>(data, after);
}

public override void Serialize(MappingContext context, Utf8FaunaWriter writer, object? o)
Expand Down
Loading