- Checkpoint: Refactor Type Accessibility

NinjaRocks · NinjaRocks · commit ec174038c4d0 · 2025-07-18T22:53:06.000+01:00
diff --git a/src/SourceFlow.ConsoleApp/Program.cs b/src/SourceFlow.ConsoleApp/Program.cs
@@ -29,7 +29,7 @@
 var accountService = serviceProvider.GetRequiredService<IAccountService>();
 var saga = serviceProvider.GetRequiredService<ISaga>();
 var logger = serviceProvider.GetRequiredService<ILogger<Program>>();
-var accountFinder = serviceProvider.GetRequiredService<IViewModelFinder>();
+var accountFinder = serviceProvider.GetRequiredService<IViewFinder>();
 
 // Create account
 var accountId = await accountService.CreateAccountAsync("John Doe", 1000m);
diff --git a/src/SourceFlow.ConsoleApp/Services/AccountViewFinder.cs b/src/SourceFlow.ConsoleApp/Services/AccountViewFinder.cs
@@ -2,7 +2,7 @@
 
 namespace SourceFlow.ConsoleApp.Services
 {
-    public class AccountViewFinder : BaseViewModelFinder, IAccountFinder
+    public class AccountViewFinder : BaseViewFinder, IAccountFinder
     {
         public AccountViewFinder(IViewModelRepository repository) : base(repository)
         {
diff --git a/src/SourceFlow.ConsoleApp/ViewModels/AccountViewTransforms.cs b/src/SourceFlow.ConsoleApp/ViewModels/AccountViewTransforms.cs
@@ -2,10 +2,10 @@
 
 namespace SourceFlow.ConsoleApp.ViewModels
 {
-    public class AccountViewTransforms : IViewModelTransform<AccountCreated>
-                                       , IViewModelTransform<MoneyDeposited>
-                                       , IViewModelTransform<MoneyWithdrawn>
-                                       , IViewModelTransform<AccountClosed>
+    public class AccountViewTransforms : IViewTransform<AccountCreated>
+                                       , IViewTransform<MoneyDeposited>
+                                       , IViewTransform<MoneyWithdrawn>
+                                       , IViewTransform<AccountClosed>
     {
         private readonly IViewModelRepository repository;
 
diff --git a/src/SourceFlow/AggregateFactory.cs b/src/SourceFlow/AggregateFactory.cs
@@ -7,7 +7,7 @@ namespace SourceFlow
     /// <summary>
     /// Factory for creating aggregate roots in the event-driven architecture.
     /// </summary>
-    public class AggregateFactory : IAggregateFactory
+    internal class AggregateFactory : IAggregateFactory
     {
         /// <summary>
         /// Service provider for resolving dependencies.
diff --git a/src/SourceFlow/BaseViewFinder.cs b/src/SourceFlow/BaseViewFinder.cs
@@ -6,19 +6,19 @@ namespace SourceFlow
     /// <summary>
     /// Base class for implementing finders to retrieve view models by fetch criteria.
     /// </summary>
-    public abstract class BaseViewModelFinder : IViewModelFinder
+    public abstract class BaseViewFinder : IViewFinder
     {
         /// <summary>
         /// Repository for managing view models.
         /// </summary>
         protected readonly IViewModelRepository repository;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="BaseViewModelFinder"/> class.
+        /// Initializes a new instance of the <see cref="BaseViewFinder"/> class.
         /// </summary>
         /// <param name="repository"></param>
         /// <exception cref="ArgumentNullException"></exception>
-        protected BaseViewModelFinder(IViewModelRepository repository)
+        protected BaseViewFinder(IViewModelRepository repository)
         {
             this.repository = repository ?? throw new ArgumentNullException(nameof(repository));
         }
diff --git a/src/SourceFlow/BaseViewTransform.cs b/src/SourceFlow/BaseViewTransform.cs
@@ -6,7 +6,7 @@ namespace SourceFlow
     /// Base class for implementing event transform for ETL processing.
     /// </summary>
     /// <typeparam name="TEvent"></typeparam>
-    public abstract class BaseViewModelTransform<TEvent> : IViewModelTransform<TEvent>
+    public abstract class BaseViewTransform<TEvent> : IViewTransform<TEvent>
         where TEvent : IEvent
     {
         /// <summary>
diff --git a/src/SourceFlow/BusPublisher.cs b/src/SourceFlow/BusPublisher.cs
@@ -5,7 +5,7 @@ namespace SourceFlow
     /// <summary>
     /// Implementation of the IBusPublisher interface for publishing events to subscribers.
     /// </summary>
-    public class BusPublisher : IBusPublisher
+    internal class BusPublisher : IBusPublisher
     {
         /// <summary>
         /// The command bus used to publish events.
diff --git a/src/SourceFlow/BusSubscriber.cs b/src/SourceFlow/BusSubscriber.cs
@@ -3,7 +3,7 @@ namespace SourceFlow
     /// <summary>
     /// Implementation of the IBusSubscriber interface for subscribing sagas to the command bus.
     /// </summary>
-    public class BusSubscriber : IBusSubscriber
+    internal class BusSubscriber : IBusSubscriber
     {
         /// <summary>
         /// The command bus used to register sagas.
diff --git a/src/SourceFlow/ClassDiagram.cd b/src/SourceFlow/ClassDiagram.cd
@@ -93,7 +93,7 @@
     </TypeIdentifier>
     <Lollipop Position="0.2" />
   </Class>
-  <Class Name="SourceFlow.BaseViewModelTransform&lt;TEvent&gt;">
+  <Class Name="SourceFlow.BaseViewTransform&lt;TEvent&gt;">
     <Position X="3.75" Y="11.25" Width="2.5" />
     <AssociationLine Name="ViewModelRepository" Type="SourceFlow.IViewModelRepository" ManuallyRouted="true" FixedFromPoint="true" FixedToPoint="true">
       <Path>
@@ -107,7 +107,7 @@
     </AssociationLine>
     <TypeIdentifier>
       <HashCode>AAAAAAIAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>BaseViewModelTransform.cs</FileName>
+      <FileName>BaseViewTransform.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
       <Property Name="ViewModelRepository" />
@@ -124,11 +124,11 @@
       <Property Name="Handler" />
     </ShowAsAssociation>
   </Class>
-  <Class Name="SourceFlow.BaseViewModelFinder">
+  <Class Name="SourceFlow.BaseViewFinder">
     <Position X="7.25" Y="11" Width="2.25" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAACAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>BaseViewModelFinder.cs</FileName>
+      <FileName>BaseViewFinder.cs</FileName>
     </TypeIdentifier>
     <ShowAsAssociation>
       <Field Name="repository" />
@@ -228,11 +228,11 @@
       <FileName>IEventHandler.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="SourceFlow.IViewModelTransform&lt;TEvent&gt;">
+  <Interface Name="SourceFlow.IViewTransform&lt;TEvent&gt;">
     <Position X="0.75" Y="12.5" Width="2.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>IViewModelTransform.cs</FileName>
+      <FileName>IViewTransform.cs</FileName>
     </TypeIdentifier>
   </Interface>
   <Interface Name="SourceFlow.IViewModel">
@@ -263,18 +263,18 @@
       <FileName>IEntity.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="SourceFlow.IViewModelFinder">
+  <Interface Name="SourceFlow.IViewFinder">
     <Position X="7.25" Y="9.5" Width="2.25" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>IViewModelFinder.cs</FileName>
+      <FileName>IViewFinder.cs</FileName>
     </TypeIdentifier>
   </Interface>
-  <Interface Name="SourceFlow.IViewModelTransform">
+  <Interface Name="SourceFlow.IViewTransform">
     <Position X="0.75" Y="11.25" Width="2.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>IViewModelTransform.cs</FileName>
+      <FileName>IViewTransform.cs</FileName>
     </TypeIdentifier>
   </Interface>
   <Interface Name="SourceFlow.IEventPayload">
diff --git a/src/SourceFlow/CommandBus.cs b/src/SourceFlow/CommandBus.cs
@@ -9,7 +9,7 @@ namespace SourceFlow
     /// <summary>
     /// Command bus implementation that handles commands and events in an event-driven architecture.
     /// </summary>
-    public class CommandBus : ICommandBus
+    internal class CommandBus : ICommandBus
     {
         /// <summary>
         /// The event store used to persist events.
diff --git a/src/SourceFlow/ETLPublisher.cs b/src/SourceFlow/ETLPublisher.cs
@@ -14,7 +14,7 @@ public class ETLPublisher : IETLPublisher
         /// <summary>
         /// Collection of view model transforms that will be applied to the events to transform to view models upon publishing.
         /// </summary>
-        private IEnumerable<IViewModelTransform> transforms;
+        private IEnumerable<IViewTransform> transforms;
 
         /// <summary>
         /// Logger for the ETL publisher to log events and errors.
@@ -25,7 +25,7 @@ public class ETLPublisher : IETLPublisher
         /// Initializes a new instance of the <see cref="ETLPublisher"/> class.
         /// </summary>
         /// <param name="eventTransforms"></param>
-        public ETLPublisher(IEnumerable<IViewModelTransform> transforms, ILogger<ETLPublisher> logger)
+        public ETLPublisher(IEnumerable<IViewTransform> transforms, ILogger<ETLPublisher> logger)
         {
             this.transforms = transforms;
             this.logger = logger ?? throw new ArgumentNullException(nameof(logger));
@@ -45,9 +45,9 @@ public async Task Publish<TEvent>(TEvent @event)
             {
                 if (IsGenericEventHandler(transform, @event.GetType()))
                 {
-                    var method = typeof(IViewModelTransform<>)
+                    var method = typeof(IViewTransform<>)
                            .MakeGenericType(@event.GetType())
-                           .GetMethod(nameof(IViewModelTransform<TEvent>.Transform));
+                           .GetMethod(nameof(IViewTransform<TEvent>.Transform));
 
                     var task = (Task)method.Invoke(transform, new object[] { @event });
 
@@ -70,12 +70,12 @@ public async Task Publish<TEvent>(TEvent @event)
         /// <param name="instance"></param>
         /// <param name="eventType"></param>
         /// <returns></returns>
-        private static bool IsGenericEventHandler(IViewModelTransform instance, Type eventType)
+        private static bool IsGenericEventHandler(IViewTransform instance, Type eventType)
         {
             if (instance == null || eventType == null)
                 return false;
 
-            var handlerType = typeof(IViewModelTransform<>).MakeGenericType(eventType);
+            var handlerType = typeof(IViewTransform<>).MakeGenericType(eventType);
             return handlerType.IsAssignableFrom(instance.GetType());
         }
     }
diff --git a/src/SourceFlow/EventReplayer.cs b/src/SourceFlow/EventReplayer.cs
@@ -6,7 +6,7 @@ namespace SourceFlow
     /// <summary>
     /// Interface for replaying events in the event-driven architecture.
     /// </summary>
-    public class EventReplayer : IEventReplayer
+    internal class EventReplayer : IEventReplayer
     {
         /// <summary>
         /// The command bus used to replay events for a given aggregate.
diff --git a/src/SourceFlow/IBusSubscriber.cs b/src/SourceFlow/IBusSubscriber.cs
@@ -3,7 +3,7 @@ namespace SourceFlow
     /// <summary>
     /// Interface for subscribing sagas to the event bus.
     /// </summary>
-    public interface IBusSubscriber
+    internal interface IBusSubscriber
     {
         /// <summary>
         /// Subscribes a saga to the bus.
diff --git a/src/SourceFlow/ICommandBus.cs b/src/SourceFlow/ICommandBus.cs
@@ -6,7 +6,7 @@ namespace SourceFlow
     /// <summary>
     /// Interface for the command bus in the event-driven architecture.
     /// </summary>
-    public interface ICommandBus
+    internal interface ICommandBus
     {
         /// <summary>
         /// Publishes an event to all subscribed sagas.
diff --git a/src/SourceFlow/IETLPublisher.cs b/src/SourceFlow/IETLPublisher.cs
@@ -6,7 +6,7 @@ namespace SourceFlow
     /// <summary>
     /// Interface for publishing events to an ETL (Extract, Transform, Load) process.
     /// </summary>
-    public interface IETLPublisher
+    internal interface IETLPublisher
     {
         /// <summary>
         /// Publishes an event to the ETL process asynchronously.
diff --git a/src/SourceFlow/ISourceFlowConfig.cs b/src/SourceFlow/ISourceFlowConfig.cs
@@ -1,4 +1,4 @@
-﻿namespace SourceFlow
+namespace SourceFlow
 {
     /// <summary>
     /// Interface for SourceFlow configuration.
diff --git a/src/SourceFlow/IViewFinder.cs b/src/SourceFlow/IViewFinder.cs
@@ -3,7 +3,7 @@
 
 namespace SourceFlow
 {
-    public interface IViewModelFinder
+    public interface IViewFinder
     {
         Task<TViewModel> Find<TViewModel>(int id) where TViewModel : class, IViewModel;
     }
diff --git a/src/SourceFlow/IViewTransform.cs b/src/SourceFlow/IViewTransform.cs
@@ -5,15 +5,15 @@ namespace SourceFlow
     /// <summary>
     /// Interface for transforming an event to view model in the ETL processing.
     /// </summary>
-    public interface IViewModelTransform
+    public interface IViewTransform
     {
     }
 
     /// <summary>
     /// Interface for transforming an event to view model in the ETL processing.
     /// </summary>
     /// <typeparam name="TEvent"></typeparam>
-    public interface IViewModelTransform<TEvent> : IViewModelTransform
+    public interface IViewTransform<TEvent> : IViewTransform
         where TEvent : IEvent
     {
         /// <summary>
diff --git a/src/SourceFlow/IocExtensions.cs b/src/SourceFlow/IocExtensions.cs
@@ -39,8 +39,8 @@ public static void UseSourceFlow(this IServiceCollection services, Action<ISourc
             services.AddAsImplementationsOfInterface<IDomainRepository>(lifetime: ServiceLifetime.Singleton);
             services.AddAsImplementationsOfInterface<IViewModelRepository>(lifetime: ServiceLifetime.Singleton);
             services.AddAsImplementationsOfInterface<IEventStore>(lifetime: ServiceLifetime.Singleton);
-            services.AddAsImplementationsOfInterface<IViewModelFinder>(lifetime: ServiceLifetime.Singleton);
-            services.AddAsImplementationsOfInterface<IViewModelTransform>(lifetime: ServiceLifetime.Singleton);
+            services.AddAsImplementationsOfInterface<IViewFinder>(lifetime: ServiceLifetime.Singleton);
+            services.AddAsImplementationsOfInterface<IViewTransform>(lifetime: ServiceLifetime.Singleton);
 
             services.AddSingleton<ICommandBus, CommandBus>(c => new CommandBus(
                 c.GetService<IEventStore>(),
@@ -51,7 +51,7 @@ public static void UseSourceFlow(this IServiceCollection services, Action<ISourc
             services.AddSingleton<IBusPublisher, BusPublisher>(c => new BusPublisher(c.GetService<ICommandBus>()));
             services.AddSingleton<IEventReplayer, EventReplayer>(c => new EventReplayer(c.GetService<ICommandBus>()));
             services.AddSingleton<IBusSubscriber, BusSubscriber>(c => new BusSubscriber(c.GetService<ICommandBus>()));
-            services.AddSingleton<IETLPublisher, ETLPublisher>(c => new ETLPublisher(c.GetServices<IViewModelTransform>(), c.GetService<ILogger<ETLPublisher>>()));
+            services.AddSingleton<IETLPublisher, ETLPublisher>(c => new ETLPublisher(c.GetServices<IViewTransform>(), c.GetService<ILogger<ETLPublisher>>()));
 
             configuration(new SourceFlowConfig { Services = services });
 
diff --git a/src/SourceFlow/SagaHandler.cs b/src/SourceFlow/SagaHandler.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 
 namespace SourceFlow
 {
diff --git a/tests/SourceFlow.Core.Tests/E2E/Services/AccountViewFinder.cs b/tests/SourceFlow.Core.Tests/E2E/Services/AccountViewFinder.cs
@@ -2,7 +2,7 @@
 
 namespace SourceFlow.Core.Tests.E2E.Services
 {
-    public class AccountViewFinder : BaseViewModelFinder, IAccountFinder
+    public class AccountViewFinder : BaseViewFinder, IAccountFinder
     {
         public AccountViewFinder(IViewModelRepository repository) : base(repository)
         {

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace SourceFlow.ConsoleApp.Services`
`4`	`4`	`{`
`5`		`- public class AccountViewFinder : BaseViewModelFinder, IAccountFinder`
	`5`	`+ public class AccountViewFinder : BaseViewFinder, IAccountFinder`
`6`	`6`	`{`
`7`	`7`	`public AccountViewFinder(IViewModelRepository repository) : base(repository)`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,10 @@`
`2`	`2`
`3`	`3`	`namespace SourceFlow.ConsoleApp.ViewModels`
`4`	`4`	`{`
`5`		`- public class AccountViewTransforms : IViewModelTransform<AccountCreated>`
`6`		`- , IViewModelTransform<MoneyDeposited>`
`7`		`- , IViewModelTransform<MoneyWithdrawn>`
`8`		`- , IViewModelTransform<AccountClosed>`
	`5`	`+ public class AccountViewTransforms : IViewTransform<AccountCreated>`
	`6`	`+ , IViewTransform<MoneyDeposited>`
	`7`	`+ , IViewTransform<MoneyWithdrawn>`
	`8`	`+ , IViewTransform<AccountClosed>`
`9`	`9`	`{`
`10`	`10`	`private readonly IViewModelRepository repository;`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace SourceFlow`
`7`	`7`	`/// <summary>`
`8`	`8`	`/// Factory for creating aggregate roots in the event-driven architecture.`
`9`	`9`	`/// </summary>`
`10`		`- public class AggregateFactory : IAggregateFactory`
	`10`	`+ internal class AggregateFactory : IAggregateFactory`
`11`	`11`	`{`
`12`	`12`	`/// <summary>`
`13`	`13`	`/// Service provider for resolving dependencies.`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace SourceFlow`
`6`	`6`	`/// Base class for implementing event transform for ETL processing.`
`7`	`7`	`/// </summary>`
`8`	`8`	`/// <typeparam name="TEvent"></typeparam>`
`9`		`- public abstract class BaseViewModelTransform<TEvent> : IViewModelTransform<TEvent>`
	`9`	`+ public abstract class BaseViewTransform<TEvent> : IViewTransform<TEvent>`
`10`	`10`	`where TEvent : IEvent`
`11`	`11`	`{`
`12`	`12`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ namespace SourceFlow`
`5`	`5`	`/// <summary>`
`6`	`6`	`/// Implementation of the IBusPublisher interface for publishing events to subscribers.`
`7`	`7`	`/// </summary>`
`8`		`- public class BusPublisher : IBusPublisher`
	`8`	`+ internal class BusPublisher : IBusPublisher`
`9`	`9`	`{`
`10`	`10`	`/// <summary>`
`11`	`11`	`/// The command bus used to publish events.`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ namespace SourceFlow`
`3`	`3`	`/// <summary>`
`4`	`4`	`/// Implementation of the IBusSubscriber interface for subscribing sagas to the command bus.`
`5`	`5`	`/// </summary>`
`6`		`- public class BusSubscriber : IBusSubscriber`
	`6`	`+ internal class BusSubscriber : IBusSubscriber`
`7`	`7`	`{`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// The command bus used to register sagas.`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace SourceFlow`
`9`	`9`	`/// <summary>`
`10`	`10`	`/// Command bus implementation that handles commands and events in an event-driven architecture.`
`11`	`11`	`/// </summary>`
`12`		`- public class CommandBus : ICommandBus`
	`12`	`+ internal class CommandBus : ICommandBus`
`13`	`13`	`{`
`14`	`14`	`/// <summary>`
`15`	`15`	`/// The event store used to persist events.`