bug fix

Author: sergey-shandar

src/ResourceManager/Common/Commands.Common.Strategies/GetAsyncOperation.cs

@@ -15,11 +15,11 @@ public static async Task<IState> GetAsync<Model>(
             where Model : class
         {
             var context = new AsyncOperationContext(client, cancellationToken);
-            await context.AddStateAsync(config);
+            await context.AddStateAsyncResourceBase(config);
             return context.Result;
         }
 
-        static Task AddStateAsync(this AsyncOperationContext context, IResourceBaseConfig config)
+        static Task AddStateAsyncResourceBase(this AsyncOperationContext context, IResourceBaseConfig config)
             => config.Accept(new AddStateAsyncVisitor(), context);
 
         static async Task AddStateAsync<Model>(this AsyncOperationContext context, ResourceConfig<Model> config)
@@ -45,18 +45,18 @@ static async Task AddStateAsync<Model>(this AsyncOperationContext context, Resou
                         }
                         if (info == null)
                         {
-                            var tasks = config.Dependencies.Select(d => context.AddStateAsync(d));
+                            var tasks = config.Dependencies.Select(d => context.AddStateAsyncResourceBase(d));
                             await Task.WhenAll(tasks);
                             return null;
                         }
                         return info;
                     });
 
         static Task AddStateAsync<Model, ParentModel>(
-            AsyncOperationContext context, NestedResourceConfig<Model, ParentModel> config)
+            this AsyncOperationContext context, NestedResourceConfig<Model, ParentModel> config)
             where Model : class
             where ParentModel : class
-            => context.AddStateAsync(config.Parent);
+            => context.AddStateAsyncResourceBase(config.Parent);
 
         sealed class AddStateAsyncVisitor : IResourceBaseConfigVisitor<AsyncOperationContext, Task>
         {

src/ResourceManager/Common/Commands.Common.Strategies/IState.cs

@@ -17,9 +17,9 @@ public static Model Get<Model, ParentModel>(
             this IState state, NestedResourceConfig<Model, ParentModel> config)
             where Model : class
             where ParentModel : class
-            => config.Strategy.Get(state.Get(config.Parent), config.Name);
+            => config.Strategy.Get(state.GetResourceBase(config.Parent), config.Name);
 
-        public static Model Get<Model>(
+        public static Model GetResourceBase<Model>(
             this IState state, IResourceBaseConfig<Model> config)
             where Model : class
             => config.Accept(new GetVisitor<Model>(), state);

src/ResourceManager/Common/Commands.Common.Strategies/State.cs

@@ -11,7 +11,7 @@ public Model Get<Model>(ResourceConfig<Model> config)
 
         public Model GetOrAdd<Model>(ResourceConfig<Model> config, Func<Model> f)
             where Model : class
-            => Map.GetOrNull(config.DefaultIdStr()) as Model;
+            => Map.GetOrAdd(config.DefaultIdStr(), _ => f()) as Model;
 
         public bool Contains(IResourceBaseConfig config)
             => Map.ContainsKey(config.DefaultIdStr());