Add example deserializing a more complex type

The dictionary still requires a private setter, as the deserializer will not just invoke Add for each entry, unfortunately.
devlooped · Aug 8, 2023 · 6ecb693 · 6ecb693
1 parent 66bd704
commit 6ecb693
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 13 deletions.
diff --git a/src/CloudActors.CodeAnaysis/Diagnostics.cs b/src/CloudActors.CodeAnaysis/Diagnostics.cs
@@ -40,7 +40,10 @@ public static class Diagnostics
         DiagnosticSeverity.Error,
         isEnabledByDefault: true);
 
-    public static SymbolDisplayFormat FullName { get; } = new(SymbolDisplayGlobalNamespaceStyle.Omitted, SymbolDisplayTypeQualificationStyle.NameAndContainingTypesAndNamespaces);
+    public static SymbolDisplayFormat FullName { get; } = new(
+        typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameAndContainingTypesAndNamespaces,
+        genericsOptions: SymbolDisplayGenericsOptions.IncludeTypeParameters,
+        miscellaneousOptions: SymbolDisplayMiscellaneousOptions.ExpandNullable);
 
     public static string ToFileName(this ITypeSymbol type) => type.ToDisplayString(FullName).Replace('+', '.');
 

diff --git a/src/CloudActors.Streamstone/StreamstoneStorage.cs b/src/CloudActors.Streamstone/StreamstoneStorage.cs
@@ -54,13 +54,13 @@ public StreamstoneStorage(CloudStorageAccount storage, StreamstoneOptions? optio
 
     public async Task ClearStateAsync<T>(string stateName, GrainId grainId, IGrainState<T> grainState)
     {
-        var table = await GetTable<T>(storage, stateName);
+        var table = await GetTable(storage, stateName);
         await table.ExecuteAsync(TableOperation.Delete(new TableEntity(table.Name, grainId.Key.ToString()!)));
     }
 
     public async Task ReadStateAsync<T>(string stateName, GrainId grainId, IGrainState<T> grainState)
     {
-        var table = await GetTable<T>(storage, stateName);
+        var table = await GetTable(storage, stateName);
         var rowId = grainId.Key.ToString();
 
         if (grainState.State is IEventSourced state)
@@ -122,7 +122,7 @@ entity.Data is not string data ||
 
     public async Task WriteStateAsync<T>(string stateName, GrainId grainId, IGrainState<T> grainState)
     {
-        var table = await GetTable<T>(storage, stateName);
+        var table = await GetTable(storage, stateName);
         var rowId = grainId.Key.ToString();
         var type = typeof(T);
         var asm = typeof(T).Assembly.GetName();
@@ -186,7 +186,7 @@ await Stream.WriteAsync(partition,
         }
     }
 
-    async Task<CloudTable> GetTable<T>(CloudStorageAccount storage, string name)
+    async Task<CloudTable> GetTable(CloudStorageAccount storage, string name)
     {
         var getTable = tables.GetOrAdd(name, async key =>
         {

diff --git a/src/Tests/StreamstoneTests.cs b/src/Tests/StreamstoneTests.cs
@@ -1,4 +1,5 @@
-using System.Text.Json;
+using System.Collections.Generic;
+using System.Text.Json;
 using System.Threading.Tasks;
 using Devlooped.CloudActors;
 using Microsoft.Azure.Cosmos.Table;
@@ -25,13 +26,7 @@ await CloudStorageAccount.DevelopmentStorageAccount
         account.Withdraw(new Withdraw(50));
         account.Close(new Close(CloseReason.Customer));
 
-        var storage = new StreamstoneStorage(CloudStorageAccount.DevelopmentStorageAccount, new StreamstoneOptions
-        {
-            JsonOptions = new JsonSerializerOptions(StreamstoneOptions.Default.JsonOptions)
-            {
-                //TypeInfoResolver = 
-            }
-        });
+        var storage = new StreamstoneStorage(CloudStorageAccount.DevelopmentStorageAccount);
         await storage.WriteStateAsync(nameof(Account), GrainId.Parse("account/1"), GrainState.Create(account));
 
         var state = GrainState.Create<Account>(new Account("1"));
@@ -41,6 +36,45 @@ await CloudStorageAccount.DevelopmentStorageAccount
         Assert.Equal(account.IsClosed, state.State.IsClosed);
         Assert.Equal(account.Reason, state.State.Reason);
     }
+
+    [Fact]
+    public async Task ReadWriteComplexObject()
+    {
+        await CloudStorageAccount.DevelopmentStorageAccount
+            .CreateCloudTableClient()
+            .GetTableReference("CloudActorWallet")
+            .DeleteIfExistsAsync();
+
+        var wallet = new Wallet("1");
+        wallet.AddFunds("USD", 100);
+        wallet.AddFunds("EUR", 50);
+        wallet.AddFunds("EUR", 25);
+
+        var storage = new StreamstoneStorage(CloudStorageAccount.DevelopmentStorageAccount);
+        await storage.WriteStateAsync("CloudActorWallet", GrainId.Parse("wallet/1"), GrainState.Create(wallet));
+
+        var state = GrainState.Create<Wallet>(new Wallet("1"));
+        await storage.ReadStateAsync("CloudActorWallet", GrainId.Parse("wallet/1"), state);
+
+        Assert.Equal(wallet.Funds, state.State.Funds);
+    }
+}
+
+
+[Actor("CloudActorWallet")]
+public partial class Wallet(string id)
+{
+    public string Id => id;
+
+    public Dictionary<string, decimal> Funds { get; private set; } = new();
+
+    public void AddFunds(string currency, decimal amount)
+    {
+        if (Funds.TryGetValue(currency, out var balance))
+            Funds[currency] = balance + amount;
+        else
+            Funds.Add(currency, amount);
+    }
 }
 
 static class GrainState