Merge pull request #70 from r-koubou/refavtor/find_usecase

FindUseCaseの改修
r-koubou · Nov 30, 2023 · 3fc2838 · 3fc2838
2 parents 542d098 + 5d1ce37
commit 3fc2838
Show file tree

Hide file tree

Showing 10 changed files with 96 additions and 106 deletions.
diff --git a/...chManager/Sources/Runtime/Applications/Standalone.Core/Controllers/Find/FindController.cs b/...chManager/Sources/Runtime/Applications/Standalone.Core/Controllers/Find/FindController.cs
@@ -47,10 +47,10 @@ public void Dispose()
         public async Task ExecuteAsync( CancellationToken cancellationToken )
         {
             IFindUseCase interactor = new FindInteractor( DatabaseRepository, Presenter );
-            var request = new FindRequest( DeveloperName, ProductName, InstrumentName );
-            var response = await interactor.ExecuteAsync( request, cancellationToken );
+            var inputValue = new FindInputValue( DeveloperName, ProductName, InstrumentName );
+            var inputData = new FindInputData( inputValue );
 
-            Presenter.Complete( response );
+            await interactor.HandleAsync( inputData, cancellationToken );
         }
     }
 }
diff --git a/...er/Sources/Runtime/Applications/Standalone.Core/Controllers/Find/FindControllerFactory.cs b/...er/Sources/Runtime/Applications/Standalone.Core/Controllers/Find/FindControllerFactory.cs
@@ -1,4 +1,5 @@
 using KeySwitchManager.Applications.Standalone.Core.Helpers;
+using KeySwitchManager.Applications.Standalone.Core.Presenters;
 using KeySwitchManager.Applications.Standalone.Core.Views.LogView;
 
 namespace KeySwitchManager.Applications.Standalone.Core.Controllers.Find

diff --git a/...tchManager/Sources/Runtime/Applications/Standalone.Core/Controllers/Find/FindPresenter.cs b/...tchManager/Sources/Runtime/Applications/Standalone.Core/Controllers/Find/FindPresenter.cs
diff --git a/KeySwitchManager/Sources/Runtime/Applications/Standalone.Core/Presenters/FindPresenter.cs b/KeySwitchManager/Sources/Runtime/Applications/Standalone.Core/Presenters/FindPresenter.cs
@@ -0,0 +1,43 @@
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+using KeySwitchManager.Applications.Standalone.Core.Views.LogView;
+using KeySwitchManager.UseCase.KeySwitches.Find;
+
+namespace KeySwitchManager.Applications.Standalone.Core.Presenters
+{
+    public sealed class FindPresenter : IFindPresenter
+    {
+        private ILogTextView TextView { get; }
+
+        public FindPresenter( ILogTextView textView )
+        {
+            TextView = textView;
+        }
+
+        public async Task HandleAsync( FindOutputData outputData, CancellationToken cancellationToken = default )
+        {
+            var sb = new StringBuilder( 128 );
+            var keySwitches = outputData.Value.Result;
+
+            foreach( var k in keySwitches.OrderBy( x => x.DeveloperName.Value )
+                                         .ThenBy( x => x.ProductName.Value )
+                                         .ThenBy( x => x.InstrumentName.Value ) )
+            {
+                sb.Clear();
+                sb.Append( k );
+                TextView.Append( sb.ToString() );
+            }
+
+            TextView.Append( "---------------------------------" );
+            TextView.Append( $"{keySwitches.Count} record(s) found" );
+            TextView.Append( "Complete" );
+
+            TextView.ScrollToEnd();
+
+            await Task.CompletedTask;
+        }
+    }
+}
diff --git a/KeySwitchManager/Sources/Runtime/Interactors/KeySwitches/FindInteractor.cs b/KeySwitchManager/Sources/Runtime/Interactors/KeySwitches/FindInteractor.cs
@@ -1,26 +1,19 @@
-using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
 using KeySwitchManager.Domain.KeySwitches;
-using KeySwitchManager.Domain.KeySwitches.Models;
 using KeySwitchManager.Domain.KeySwitches.Models.Values;
 using KeySwitchManager.UseCase.KeySwitches.Find;
 
 using RkHelper.Primitives;
 
 namespace KeySwitchManager.Interactors.KeySwitches
 {
-    public class FindInteractor : IFindUseCase
+    public sealed class FindInteractor : IFindUseCase
     {
         private IKeySwitchRepository Repository { get; }
         private IFindPresenter Presenter { get; }
 
-        public FindInteractor(
-            IKeySwitchRepository repository ) :
-            this( repository, new IFindPresenter.Null() )
-        {}
-
         public FindInteractor(
             IKeySwitchRepository repository,
             IFindPresenter presenter )
@@ -29,52 +22,59 @@ public FindInteractor(
             Presenter  = presenter;
         }
 
-        public async Task<FindResponse> ExecuteAsync( FindRequest request, CancellationToken cancellationToken )
+        public async Task HandleAsync( FindInputData inputData, CancellationToken cancellationToken = default )
         {
-            var developerName = request.DeveloperName;
-            var productName = request.ProductName;
-            var instrumentName = request.InstrumentName;
+            var developerName = inputData.Value.DeveloperName;
+            var productName = inputData.Value.ProductName;
+            var instrumentName = inputData.Value.InstrumentName;
 
             #region By Developer, Product, Instrument
             if( !StringHelper.IsEmpty( developerName, productName, instrumentName ) )
             {
                 var keySwitches = await Repository.FindAsync(
-                    new DeveloperName( request.DeveloperName ),
-                    new ProductName( request.ProductName ),
-                    new InstrumentName( request.InstrumentName ),
+                    new DeveloperName( developerName ),
+                    new ProductName( productName ),
+                    new InstrumentName( instrumentName ),
                     cancellationToken
                 );
 
-                return new FindResponse( keySwitches );
+                var output = new FindOutputData( new FindOutputValue( keySwitches ) );
+
+                await Presenter.HandleAsync( output, cancellationToken );
+                return;
             }
             #endregion
 
             #region By Developer, Product
             if( !StringHelper.IsEmpty( developerName, productName ) )
             {
                 var keySwitches = await Repository.FindAsync(
-                    new DeveloperName( request.DeveloperName ),
-                    new ProductName( request.ProductName ),
+                    new DeveloperName( developerName ),
+                    new ProductName( productName ),
                     cancellationToken
                 );
 
-                return new FindResponse( keySwitches );
+                var output = new FindOutputData( new FindOutputValue( keySwitches ) );
+
+                await Presenter.HandleAsync( output, cancellationToken );
+                return;
             }
             #endregion
 
             #region By Developer
             if( !StringHelper.IsEmpty( developerName ) )
             {
                 var keySwitches = await Repository.FindAsync(
-                    new DeveloperName( request.DeveloperName ),
+                    new DeveloperName( developerName ),
                     cancellationToken
                 );
 
-                return new FindResponse( keySwitches );
+                var output = new FindOutputData( new FindOutputValue( keySwitches ) );
+
+                await Presenter.HandleAsync( output, cancellationToken );
+                return;
             }
             #endregion
-
-            return new FindResponse( new List<KeySwitch>() );
         }
     }
 }
diff --git a/.../UseCases/KeySwitches/Find/FindRequest.cs → ...seCases/KeySwitches/Find/FindInputData.cs b/.../UseCases/KeySwitches/Find/FindRequest.cs → ...seCases/KeySwitches/Find/FindInputData.cs
@@ -1,12 +1,14 @@
+using KeySwitchManager.UseCase.Commons;
+
 namespace KeySwitchManager.UseCase.KeySwitches.Find
 {
-    public class FindRequest
+    public sealed class FindInputValue
     {
         public string DeveloperName { get; }
         public string ProductName { get; }
         public string InstrumentName { get; }
 
-        public FindRequest(
+        public FindInputValue(
             string developerName = "",
             string productName = "",
             string instrumentName = "" )
@@ -16,4 +18,9 @@ public FindRequest(
             InstrumentName = instrumentName;
         }
     }
-}
+
+    public sealed class FindInputData : InputData<FindInputValue>
+    {
+        public FindInputData( FindInputValue value ) : base( value ) {}
+    }
+}
diff --git a/KeySwitchManager/Sources/Runtime/UseCases/KeySwitches/Find/FindOutputData.cs b/KeySwitchManager/Sources/Runtime/UseCases/KeySwitches/Find/FindOutputData.cs
@@ -0,0 +1,9 @@
+using KeySwitchManager.UseCase.Commons;
+
+namespace KeySwitchManager.UseCase.KeySwitches.Find
+{
+    public sealed class FindOutputData : InputData<FindOutputValue>
+    {
+        public FindOutputData( FindOutputValue value ) : base( value ) {}
+    }
+}
diff --git a/...UseCases/KeySwitches/Find/FindResponse.cs → ...Cases/KeySwitches/Find/FindOutputValue.cs b/...UseCases/KeySwitches/Find/FindResponse.cs → ...Cases/KeySwitches/Find/FindOutputValue.cs
@@ -4,15 +4,15 @@
 
 namespace KeySwitchManager.UseCase.KeySwitches.Find
 {
-    public class FindResponse
+    public sealed class FindOutputValue
     {
         public IReadOnlyCollection<KeySwitch> Result { get; }
         public int FoundCount { get; }
 
-        public FindResponse( IReadOnlyCollection<KeySwitch> result )
+        public FindOutputValue( IReadOnlyCollection<KeySwitch> result )
         {
             Result     = result;
             FoundCount = Result.Count;
         }
     }
-}
+}
diff --git a/KeySwitchManager/Sources/Runtime/UseCases/KeySwitches/Find/IFindPresenter.cs b/KeySwitchManager/Sources/Runtime/UseCases/KeySwitches/Find/IFindPresenter.cs
@@ -2,22 +2,5 @@
 
 namespace KeySwitchManager.UseCase.KeySwitches.Find
 {
-    public interface IFindPresenter : IPresenter<FindResponse>
-    {
-        public class Null : IFindPresenter
-        {}
-
-        public class Console : IFindPresenter
-        {
-            public void Present<T>( T param )
-            {
-                System.Console.WriteLine( param );
-            }
-
-            public void Message( string message )
-            {
-                System.Console.WriteLine( message );
-            }
-        }
-    }
-}
+    public interface IFindPresenter : IOutputPort<FindOutputData> {}
+}
diff --git a/KeySwitchManager/Sources/Runtime/UseCases/KeySwitches/Find/IFindUseCase.cs b/KeySwitchManager/Sources/Runtime/UseCases/KeySwitches/Find/IFindUseCase.cs
@@ -1,13 +1,6 @@
-using System.Threading;
-using System.Threading.Tasks;
+using KeySwitchManager.UseCase.Commons;
 
 namespace KeySwitchManager.UseCase.KeySwitches.Find
 {
-    public interface IFindUseCase
-    {
-        public FindResponse Execute( FindRequest request )
-            => ExecuteAsync( request ).GetAwaiter().GetResult();
-
-        public Task<FindResponse> ExecuteAsync( FindRequest request, CancellationToken cancellationToken = default );
-    }
+    public interface IFindUseCase : IInputPort<FindInputData> {}
 }