From 5870875c9103119858712c50d7f5c582b6f31065 Mon Sep 17 00:00:00 2001
From: gdlcf88 <gdlcf88@outlook.com>
Date: Sat, 11 Jun 2022 22:51:25 +0800
Subject: [PATCH] Refactor IInventoryActorProvider

---
 .../DaprActorsProductInventoryProvider.cs                   | 4 +---
 .../Products/DaprActorsInventory/IInventoryActorProvider.cs | 3 +--
 .../Products/DaprActorsInventory/InventoryActorProvider.cs  | 6 ++++--
 .../TestInventoryActorProvider.cs                           | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/plugins/Inventories/DaprActors/src/EasyAbp.EShop.Products.DaprActorsInventory.Domain/EasyAbp/EShop/Products/DaprActorsInventory/DaprActorsProductInventoryProvider.cs b/plugins/Inventories/DaprActors/src/EasyAbp.EShop.Products.DaprActorsInventory.Domain/EasyAbp/EShop/Products/DaprActorsInventory/DaprActorsProductInventoryProvider.cs
index 5c2561c4..14d4faa5 100644
--- a/plugins/Inventories/DaprActors/src/EasyAbp.EShop.Products.DaprActorsInventory.Domain/EasyAbp/EShop/Products/DaprActorsInventory/DaprActorsProductInventoryProvider.cs
+++ b/plugins/Inventories/DaprActors/src/EasyAbp.EShop.Products.DaprActorsInventory.Domain/EasyAbp/EShop/Products/DaprActorsInventory/DaprActorsProductInventoryProvider.cs
@@ -17,8 +17,6 @@ public class DaprActorsProductInventoryProvider : IProductInventoryProvider, ITr
 
     public string InventoryProviderName { get; } = DaprActorsProductInventoryProviderName;
 
-    public static string ActorType { get; set; } = "InventoryActor";
-
     private readonly ILogger<DaprActorsProductInventoryProvider> _logger;
     protected IInventoryActorProvider InventoryActorProvider { get; }
 
@@ -102,7 +100,7 @@ public class DaprActorsProductInventoryProvider : IProductInventoryProvider, ITr
 
     protected virtual async Task<IInventoryActor> GetActorAsync(InventoryQueryModel model)
     {
-        return await InventoryActorProvider.GetAsync(GetActorId(model), ActorType);
+        return await InventoryActorProvider.GetAsync(GetActorId(model));
     }
 
     protected virtual ActorId GetActorId(InventoryQueryModel model)
diff --git a/plugins/Inventories/DaprActors/src/EasyAbp.EShop.Products.DaprActorsInventory.Domain/EasyAbp/EShop/Products/DaprActorsInventory/IInventoryActorProvider.cs b/plugins/Inventories/DaprActors/src/EasyAbp.EShop.Products.DaprActorsInventory.Domain/EasyAbp/EShop/Products/DaprActorsInventory/IInventoryActorProvider.cs
index 8c0791fd..fc1dc827 100644
--- a/plugins/Inventories/DaprActors/src/EasyAbp.EShop.Products.DaprActorsInventory.Domain/EasyAbp/EShop/Products/DaprActorsInventory/IInventoryActorProvider.cs
+++ b/plugins/Inventories/DaprActors/src/EasyAbp.EShop.Products.DaprActorsInventory.Domain/EasyAbp/EShop/Products/DaprActorsInventory/IInventoryActorProvider.cs
@@ -1,11 +1,10 @@
 using System.Threading.Tasks;
 using Dapr.Actors;
 using EasyAbp.EShop.Plugins.Inventories.DaprActors;
-using JetBrains.Annotations;
 
 namespace EasyAbp.EShop.Products.DaprActorsInventory;
 
 public interface IInventoryActorProvider
 {
-    Task<IInventoryActor> GetAsync(ActorId actorId, [NotNull] string actorType);
+    Task<IInventoryActor> GetAsync(ActorId actorId);
 }
\ No newline at end of file
diff --git a/plugins/Inventories/DaprActors/src/EasyAbp.EShop.Products.DaprActorsInventory.Domain/EasyAbp/EShop/Products/DaprActorsInventory/InventoryActorProvider.cs b/plugins/Inventories/DaprActors/src/EasyAbp.EShop.Products.DaprActorsInventory.Domain/EasyAbp/EShop/Products/DaprActorsInventory/InventoryActorProvider.cs
index 11d016ae..16dd18f1 100644
--- a/plugins/Inventories/DaprActors/src/EasyAbp.EShop.Products.DaprActorsInventory.Domain/EasyAbp/EShop/Products/DaprActorsInventory/InventoryActorProvider.cs
+++ b/plugins/Inventories/DaprActors/src/EasyAbp.EShop.Products.DaprActorsInventory.Domain/EasyAbp/EShop/Products/DaprActorsInventory/InventoryActorProvider.cs
@@ -8,8 +8,10 @@ namespace EasyAbp.EShop.Products.DaprActorsInventory;
 
 public class InventoryActorProvider : IInventoryActorProvider, ITransientDependency
 {
-    public virtual Task<IInventoryActor> GetAsync(ActorId actorId, string actorType)
+    public static string ActorType { get; set; } = "InventoryActor";
+
+    public virtual Task<IInventoryActor> GetAsync(ActorId actorId)
     {
-        return Task.FromResult(ActorProxy.Create<IInventoryActor>(actorId, actorType));
+        return Task.FromResult(ActorProxy.Create<IInventoryActor>(actorId, ActorType));
     }
 }
\ No newline at end of file
diff --git a/plugins/Inventories/DaprActors/test/EasyAbp.EShop.Products.DaprActorsInventory.Domain.Tests/TestInventoryActorProvider.cs b/plugins/Inventories/DaprActors/test/EasyAbp.EShop.Products.DaprActorsInventory.Domain.Tests/TestInventoryActorProvider.cs
index db26bdad..1b889758 100644
--- a/plugins/Inventories/DaprActors/test/EasyAbp.EShop.Products.DaprActorsInventory.Domain.Tests/TestInventoryActorProvider.cs
+++ b/plugins/Inventories/DaprActors/test/EasyAbp.EShop.Products.DaprActorsInventory.Domain.Tests/TestInventoryActorProvider.cs
@@ -19,7 +19,7 @@ public class TestInventoryActorProvider : IInventoryActorProvider, ITransientDep
         _serviceProvider = serviceProvider;
     }
     
-    public Task<IInventoryActor> GetAsync(ActorId actorId, string actorType)
+    public Task<IInventoryActor> GetAsync(ActorId actorId)
     {
         return Task.FromResult(Actor ??= _serviceProvider.GetRequiredService<FakeInventoryActor>());
     }