no message

BlauhausTechnology · Oct 14, 2024 · 2f79fc9 · 2f79fc9
1 parent 3bc0473
commit 2f79fc9
Show file tree

Hide file tree

Showing 29 changed files with 104 additions and 47 deletions.
diff --git a/src/Blauhaus.ClientActors.Abstractions/Blauhaus.ClientActors.Abstractions.csproj b/src/Blauhaus.ClientActors.Abstractions/Blauhaus.ClientActors.Abstractions.csproj
@@ -7,11 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blauhaus.Common.Utils" Version="2.4.0" />
-    <PackageReference Include="Blauhaus.Domain.Abstractions" Version="2.0.3" />
+    <PackageReference Include="Blauhaus.Common.Utils" Version="2.4.4" />
     <PackageReference Include="Blauhaus.Responses" Version="0.4.11" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
+    <PackageReference Include="Blauhaus.Ioc.Abstractions" Version="1.6.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Blauhaus.ClientActors.Abstractions/IActor.cs b/src/Blauhaus.ClientActors.Abstractions/IActor.cs
@@ -0,0 +1,9 @@
+using System;
+using Blauhaus.Common.Abstractions;
+
+namespace Blauhaus.ClientActors.Abstractions;
+
+public interface IActor<TId> : IAsyncDisposable, IAsyncInitializable<TId>, IAsyncReloadable, IHasId<TId>
+{
+
+}
diff --git a/src/Blauhaus.ClientActors.Abstractions/IActorContainer.cs b/src/Blauhaus.ClientActors.Abstractions/IActorContainer.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Blauhaus.Domain.Abstractions.Actors;
 
 namespace Blauhaus.ClientActors.Abstractions
 {

diff --git a/src/Blauhaus.ClientActors.Abstractions/IClientEntity.cs b/src/Blauhaus.ClientActors.Abstractions/IClientEntity.cs
@@ -0,0 +1,13 @@
+using System;
+using Blauhaus.Domain.Abstractions.Entities;
+
+namespace Blauhaus.ClientActors.Abstractions;
+
+public interface IClientEntity<out TId> : IEntity<TId>
+{
+    long ModifiedAtTicks { get; }
+}
+
+public interface IClientEntity : IClientEntity<Guid>
+{
+}
diff --git a/src/Blauhaus.ClientActors.Abstractions/IDtoLoader.cs b/src/Blauhaus.ClientActors.Abstractions/IDtoLoader.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Blauhaus.Common.Abstractions;
+
+namespace Blauhaus.ClientActors.Abstractions;
+
+public interface IDtoLoader<TDto, in TId> : IAsyncPublisher<TDto>
+    where TDto : class, IHasId<TId>
+    where TId : IEquatable<TId>
+{
+    Task<TDto> GetOneAsync(TId id);
+    Task<TDto?> TryGetOneAsync(TId id);
+    Task<IReadOnlyList<TDto>> GetAllAsync(); 
+}
diff --git a/src/Blauhaus.ClientActors.Abstractions/IDtoModelActor.cs b/src/Blauhaus.ClientActors.Abstractions/IDtoModelActor.cs
@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+using Blauhaus.Common.Abstractions;
+
+namespace Blauhaus.ClientActors.Abstractions;
+
+public interface IDtoModelActor<TModel, TDto, TId> : IModelActor<TModel, TId> 
+    where TModel : IHasId<TId>
+{
+    Task<TDto> GetDtoAsync();
+}
diff --git a/src/Blauhaus.ClientActors.Abstractions/IEntity.cs b/src/Blauhaus.ClientActors.Abstractions/IEntity.cs
@@ -0,0 +1,24 @@
+using Blauhaus.Common.Abstractions;
+using System;
+
+namespace Blauhaus.Domain.Abstractions.Entities
+{
+    public interface IEntity<out TId> : IHasId<TId>
+    {
+        EntityState EntityState { get; }
+    }
+
+    public interface IEntity: IEntity<Guid>
+    {
+
+    }
+
+}
+
+public enum EntityState
+{
+    Active,
+    Draft,
+    Archived,
+    Deleted
+}
diff --git a/src/Blauhaus.ClientActors.Abstractions/IModelActor.cs b/src/Blauhaus.ClientActors.Abstractions/IModelActor.cs
@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+using Blauhaus.Common.Abstractions;
+
+namespace Blauhaus.ClientActors.Abstractions;
+
+public interface IModelActor<TModel, TId> : IActor<TId>, IAsyncPublisher<TModel>
+    where TModel : IHasId<TId>
+{
+    Task<TModel> GetModelAsync();
+}
diff --git a/src/Blauhaus.ClientActors.Abstractions/IModelActorContainer.cs b/src/Blauhaus.ClientActors.Abstractions/IModelActorContainer.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Blauhaus.Common.Abstractions;
-using Blauhaus.Domain.Abstractions.Actors;
 
 namespace Blauhaus.ClientActors.Abstractions
 {

diff --git a/src/Blauhaus.ClientActors.TestHelpers/ActorContainerMockBuilder.cs b/src/Blauhaus.ClientActors.TestHelpers/ActorContainerMockBuilder.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Blauhaus.ClientActors.Abstractions;
-using Blauhaus.Domain.Abstractions.Actors;
 using Blauhaus.TestHelpers.MockBuilders;
 using Moq;
 

diff --git a/src/Blauhaus.ClientActors.TestHelpers/BaseModelActorMockBuilder.cs b/src/Blauhaus.ClientActors.TestHelpers/BaseModelActorMockBuilder.cs
@@ -2,7 +2,6 @@
 using Blauhaus.ClientActors.Abstractions;
 using Blauhaus.Common.Abstractions;
 using Blauhaus.Common.TestHelpers.MockBuilders;
-using Blauhaus.Domain.Abstractions.Actors;
 using Moq;
 
 namespace Blauhaus.ClientActors.TestHelpers

diff --git a/src/Blauhaus.ClientActors.TestHelpers/Blauhaus.ClientActors.TestHelpers.csproj b/src/Blauhaus.ClientActors.TestHelpers/Blauhaus.ClientActors.TestHelpers.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blauhaus.Common.TestHelpers" Version="2.4.0" />
+    <PackageReference Include="Blauhaus.Common.TestHelpers" Version="2.4.4" />
     <PackageReference Include="Blauhaus.TestHelpers" Version="1.4.4" />
   </ItemGroup>
 

diff --git a/src/Blauhaus.ClientActors.TestHelpers/Extensions/MockContainerExtensions.cs b/src/Blauhaus.ClientActors.TestHelpers/Extensions/MockContainerExtensions.cs
@@ -1,7 +1,6 @@
 using System;
 using Blauhaus.ClientActors.Abstractions;
 using Blauhaus.Common.Abstractions;
-using Blauhaus.Domain.Abstractions.Actors;
 using Blauhaus.TestHelpers;
 
 namespace Blauhaus.ClientActors.TestHelpers.Extensions

diff --git a/src/Blauhaus.ClientActors.TestHelpers/ModelActorContainerMockBuilder.cs b/src/Blauhaus.ClientActors.TestHelpers/ModelActorContainerMockBuilder.cs
@@ -3,7 +3,6 @@
 using System.Threading.Tasks;
 using Blauhaus.ClientActors.Abstractions;
 using Blauhaus.Common.Abstractions;
-using Blauhaus.Domain.Abstractions.Actors;
 using Blauhaus.TestHelpers.Builders.Base;
 using Moq;
 

diff --git a/src/Blauhaus.ClientActors.Tests/.Base/BaseActorTest.cs b/src/Blauhaus.ClientActors.Tests/.Base/BaseActorTest.cs
@@ -1,10 +1,9 @@
-using Blauhaus.Analytics.Abstractions;
-using Blauhaus.Analytics.Abstractions.Service;
-using Blauhaus.Analytics.TestHelpers.MockBuilders;
+using Blauhaus.Analytics.TestHelpers.MockBuilders;
 using Blauhaus.Ioc.Abstractions;
 using Blauhaus.Ioc.DotNetCoreIocService;
 using Blauhaus.TestHelpers.BaseTests;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
 using NUnit.Framework;
 
 namespace Blauhaus.ClientActors.Tests.Base
@@ -17,10 +16,9 @@ public virtual void Setup()
             base.Cleanup();
 
             Services.AddSingleton<IServiceLocator, DotNetCoreServiceLocator>();
+            Services.AddLogging(x => x.AddDebug());
 
-            AddService(x => MockLogger.Object);
         }
 
-        protected AnalyticsLoggerMockBuilder<TSut> MockLogger => AddMock<AnalyticsLoggerMockBuilder<TSut>, IAnalyticsLogger<TSut>>().Invoke();
     }
 }
diff --git a/src/Blauhaus.ClientActors.Tests/Actors/DtoModelActorTests/.Base/BaseDtoModelActorTest.cs b/src/Blauhaus.ClientActors.Tests/Actors/DtoModelActorTests/.Base/BaseDtoModelActorTest.cs
@@ -2,8 +2,8 @@
 using Blauhaus.ClientActors.Tests.Suts;
 using Microsoft.Extensions.DependencyInjection;
 using System;
-using Moq;
 using Blauhaus.ClientActors.Tests.Mocks;
+using Moq;
 
 namespace Blauhaus.ClientActors.Tests.Actors.DtoModelActorTests.Base
 {

diff --git a/src/Blauhaus.ClientActors.Tests/Blauhaus.ClientActors.Tests.csproj b/src/Blauhaus.ClientActors.Tests/Blauhaus.ClientActors.Tests.csproj
@@ -14,11 +14,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blauhaus.Ioc.TestHelpers" Version="1.5.4" />
-    <PackageReference Include="NUnit" Version="4.0.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="Blauhaus.Ioc.DotNetCoreIocService" Version="1.5.4" />
+    <PackageReference Include="Blauhaus.Ioc.TestHelpers" Version="1.6.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
+    <PackageReference Include="NUnit" Version="4.2.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Blauhaus.Ioc.DotNetCoreIocService" Version="1.6.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Blauhaus.ClientActors.Tests/Suts/ITestActor.cs b/src/Blauhaus.ClientActors.Tests/Suts/ITestActor.cs
@@ -1,4 +1,4 @@
-using Blauhaus.Domain.Abstractions.Actors;
+using Blauhaus.ClientActors.Abstractions;
 
 namespace Blauhaus.ClientActors.Tests.Suts
 {

diff --git a/src/Blauhaus.ClientActors.Tests/Suts/ITestDtoLoader.cs b/src/Blauhaus.ClientActors.Tests/Suts/ITestDtoLoader.cs
@@ -1,5 +1,5 @@
 using System;
-using Blauhaus.Domain.Abstractions.DtoCaches;
+using Blauhaus.ClientActors.Abstractions;
 
 namespace Blauhaus.ClientActors.Tests.Suts
 {

diff --git a/src/Blauhaus.ClientActors.Tests/Suts/ITestModelActor.cs b/src/Blauhaus.ClientActors.Tests/Suts/ITestModelActor.cs
@@ -1,5 +1,5 @@
 using System;
-using Blauhaus.Domain.Abstractions.Actors;
+using Blauhaus.ClientActors.Abstractions;
 
 namespace Blauhaus.ClientActors.Tests.Suts
 {

diff --git a/src/Blauhaus.ClientActors.Tests/Suts/TestBaseActor.cs b/src/Blauhaus.ClientActors.Tests/Suts/TestBaseActor.cs
@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
+using Blauhaus.ClientActors.Abstractions;
 using Blauhaus.ClientActors.Actors;
-using Blauhaus.Domain.Abstractions.Actors;
 
 namespace Blauhaus.ClientActors.Tests.Suts
 {

diff --git a/src/Blauhaus.ClientActors.Tests/Suts/TestDto.cs b/src/Blauhaus.ClientActors.Tests/Suts/TestDto.cs
@@ -1,5 +1,5 @@
 using System;
-using Blauhaus.Domain.Abstractions.Entities;
+using Blauhaus.ClientActors.Abstractions;
 
 namespace Blauhaus.ClientActors.Tests.Suts
 {

diff --git a/src/Blauhaus.ClientActors/.Ioc/ServiceCollectionExtensions.cs b/src/Blauhaus.ClientActors/.Ioc/ServiceCollectionExtensions.cs
@@ -1,7 +1,6 @@
 using Blauhaus.ClientActors.Abstractions;
 using Blauhaus.ClientActors.Containers;
 using Blauhaus.Common.Abstractions;
-using Blauhaus.Domain.Abstractions.Actors;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 

diff --git a/src/Blauhaus.ClientActors/Actors/BaseDtoModelActor.cs b/src/Blauhaus.ClientActors/Actors/BaseDtoModelActor.cs
@@ -2,9 +2,6 @@
 using System.Threading.Tasks;
 using Blauhaus.ClientActors.Abstractions;
 using Blauhaus.Common.Abstractions;
-using Blauhaus.Common.Utils.Disposables;
-using Blauhaus.Domain.Abstractions.Actors;
-using Blauhaus.Domain.Abstractions.DtoCaches;
 
 namespace Blauhaus.ClientActors.Actors
 {

diff --git a/src/Blauhaus.ClientActors/Actors/BaseIdActor.cs b/src/Blauhaus.ClientActors/Actors/BaseIdActor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Threading.Tasks;
 using Blauhaus.ClientActors.Abstractions;
-using Blauhaus.Domain.Abstractions.Actors;
 
 namespace Blauhaus.ClientActors.Actors
 {

diff --git a/src/Blauhaus.ClientActors/Actors/BaseModelActor.cs b/src/Blauhaus.ClientActors/Actors/BaseModelActor.cs
@@ -2,7 +2,6 @@
 using System.Threading.Tasks;
 using Blauhaus.ClientActors.Abstractions;
 using Blauhaus.Common.Abstractions;
-using Blauhaus.Domain.Abstractions.Actors;
 
 namespace Blauhaus.ClientActors.Actors
 {

diff --git a/src/Blauhaus.ClientActors/Blauhaus.ClientActors.csproj b/src/Blauhaus.ClientActors/Blauhaus.ClientActors.csproj
@@ -11,10 +11,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blauhaus.Domain.Abstractions" Version="2.0.3" />
-    <PackageReference Include="Blauhaus.Ioc.Abstractions" Version="1.5.4" />
-    <PackageReference Include="Blauhaus.Responses" Version="0.4.11" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
     <PackageReference Include="Winton.Extensions.Threading.Actor" Version="1.10.0" />
   </ItemGroup>
 

diff --git a/src/Blauhaus.ClientActors/Containers/ActorContainer.cs b/src/Blauhaus.ClientActors/Containers/ActorContainer.cs
@@ -2,11 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Blauhaus.Analytics.Abstractions;
-using Blauhaus.Analytics.Abstractions.Service;
 using Blauhaus.ClientActors.Abstractions;
 using Blauhaus.ClientActors.Actors;
-using Blauhaus.Domain.Abstractions.Actors;
 using Blauhaus.Ioc.Abstractions;
 using Microsoft.Extensions.Logging;
 using Winton.Extensions.Threading.Actor;
@@ -16,7 +13,7 @@ namespace Blauhaus.ClientActors.Containers
     public class ActorContainer<TActor, TId> : BaseActorContainer<TActor, TId> where TActor : class, IActor<TId>
     {
         public ActorContainer(
-            IAnalyticsLogger<ActorContainer<TActor, TId>> logger, 
+            ILogger<ActorContainer<TActor, TId>> logger, 
             IServiceLocator serviceLocator) 
                 : base(logger, serviceLocator)
         {
@@ -27,11 +24,11 @@ public abstract class BaseActorContainer<TActor, TId> : BaseActor, IActorContain
         where TActor : class, IActor<TId>
     {
         private readonly IServiceLocator _serviceLocator;
-        protected readonly IAnalyticsLogger Logger;
+        protected readonly ILogger Logger;
         private readonly Dictionary<TId, TActor> _actorCache = new();
 
         protected BaseActorContainer(
-            IAnalyticsLogger logger,
+            ILogger logger,
             IServiceLocator serviceLocator)
         {
             _serviceLocator = serviceLocator;

diff --git a/src/Blauhaus.ClientActors/Containers/ModelActorContainer.cs b/src/Blauhaus.ClientActors/Containers/ModelActorContainer.cs
@@ -1,12 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using Blauhaus.Analytics.Abstractions;
-using Blauhaus.Analytics.Abstractions.Service;
 using Blauhaus.ClientActors.Abstractions;
 using Blauhaus.Common.Abstractions;
 using Blauhaus.Common.Utils.Disposables;
-using Blauhaus.Domain.Abstractions.Actors;
 using Blauhaus.Ioc.Abstractions;
 using Microsoft.Extensions.Logging;
 
@@ -20,7 +17,7 @@ public class ModelActorContainer<TActor, TId, TModel> : BaseActorContainer<TActo
         private readonly List<SavedSubscription> _activeModelSubscriptions = new();
 
         public ModelActorContainer(
-            IAnalyticsLogger<ModelActorContainer<TActor, TId, TModel>> logger, 
+            ILogger<ModelActorContainer<TActor, TId, TModel>> logger, 
             IServiceLocator serviceLocator) 
                 : base(logger, serviceLocator)
         {