コミット: 237d5d40225eea9561135640d7467d241705092c - TestNarou (git)

なろうブックマーク分析用ツールのPrism+WPFサンプル実装

コミットメタ情報

• リビジョン: 237d5d40225eea9561135640d7467d241705092c (tree)
• 日時: 2022-08-06 15:31:53
• 作者: yoshy <yoshy.org.bitbucket@gz.j...>
• コミッター: yoshy

ログメッセージ

[ADD] ブックマーク詳細リストをカテゴリNoごとにキャッシュする機能を追加

変更サマリ

• modified: 30Adaptor/AdaptorModule.cs
• modified: 30Adaptor/Boundary/Controller/IAppWindowController.cs
• modified: 30Adaptor/Boundary/Gateway/ViewModel/IBookmarkDetailListViewModel.cs
• modified: 30Adaptor/Controller/AppWindowController.cs
• modified: 30Adaptor/Gateway/ViewModel/BookmarkDetailListViewModel.cs
• modified: 30Adaptor/Gateway/ViewModel/BookmarkViewModel.cs
• modified: 30Adaptor/Gateway/ViewModel/Child/BookmarkCategoryRowViewModel.cs
• modified: 30Adaptor/Gateway/ViewModel/LoginFormViewModel.cs
• modified: 30Adaptor/Presenter/NarouRefreshBookmarkDetailListPresenter.cs
• modified: 40OuterEdge/OuterEdgeModule.cs
• modified: 40OuterEdge/Repository/API/HttpClientHelper.cs

差分

--- a/30Adaptor/AdaptorModule.cs
+++ b/30Adaptor/AdaptorModule.cs
@@ -58,7 +58,7 @@ namespace TestNarou.Adaptor
             containerRegistry.RegisterSingleton<IBookmarkViewModel, BookmarkViewModel>();
 
             containerRegistry.RegisterSingleton<IBookmarkCategoryViewModel, BookmarkCategoryViewModel>();
-            containerRegistry.RegisterSingleton<IBookmarkDetailListViewModel, BookmarkDetailListViewModel>();
+            containerRegistry.Register<IBookmarkDetailListViewModel, BookmarkDetailListViewModel>();
 
             //
             // Translators

--- a/30Adaptor/Boundary/Controller/IAppWindowController.cs
+++ b/30Adaptor/Boundary/Controller/IAppWindowController.cs
@@ -1,4 +1,6 @@
 using CleanAuLait.Adaptor.Boundary.Controller;
+using TestNarou.Adaptor.Boundary.Gateway.ViewModel;
+using TestNarou.Domain.Model.Entity;
 
 namespace TestNarou.Adaptor.Boundary.Controller
 {
@@ -6,5 +8,10 @@ namespace TestNarou.Adaptor.Boundary.Controller
     {
         void NavigateLoginFormView();
         void NavigateBookmarkView();
+
+        bool ContainsCategoryNo(int categoryNo);
+        void RegisterDetailList(int categoryNo, IBookmarkDetailListViewModel vm);
+        void NavigateBookmarkListView(int index);
+        void SynchronizeBookmarkDetailList(int categoryNo, BookmarkDetailList detailList);
     }
 }

--- a/30Adaptor/Boundary/Gateway/ViewModel/IBookmarkDetailListViewModel.cs
+++ b/30Adaptor/Boundary/Gateway/ViewModel/IBookmarkDetailListViewModel.cs
@@ -1,4 +1,5 @@
 using Reactive.Bindings;
+using System;
 using System.ComponentModel;
 using TestNarou.Adaptor.Boundary.Gateway.ViewModel.Child;
 using TestNarou.Domain.Model.Entity;
@@ -7,6 +8,10 @@ namespace TestNarou.Adaptor.Boundary.Gateway.ViewModel
 {
     public interface IBookmarkDetailListViewModel
     {
+        internal const string CATEGORY_NO_KEY = "CATEGORY_NO";
+
+        internal static readonly Uri URI = new("BookmarkDetailListView", UriKind.Relative);
+
         ReactiveCommand CommandOpenBookmark { get; }
         ICollectionView Rows { get; }
         BookmarkDetailList Source { get; }

--- a/30Adaptor/Controller/AppWindowController.cs
+++ b/30Adaptor/Controller/AppWindowController.cs
@@ -1,15 +1,25 @@
 using CleanAuLait.Adaptor.Boundary.Controller;
 using CleanAuLait.Adaptor.Controller;
 using CleanAuLait.Core.DI;
+using CleanAuLait.Core.Log;
+using NLog;
 using Prism.Regions;
+using System.Collections.Generic;
 using TestNarou.Adaptor.Boundary.Controller;
 using TestNarou.Adaptor.Boundary.Gateway.ViewModel;
+using TestNarou.Domain.Model.Entity;
+using TestNarou.UseCase.Request;
 
 namespace TestNarou.Adaptor.Controller
 {
     internal class AppWindowController
             : AbstractWindowController, IAppWindowController
     {
+        private static readonly ILogger logger = LogManager.GetCurrentClassLogger();
+
+        private IDictionary<int, IBookmarkDetailListViewModel> CategoryNoMap { get; }
+                = new Dictionary<int, IBookmarkDetailListViewModel>();
+
         private readonly IRegionManager rm;
 
         public AppWindowController(
@@ -23,14 +33,66 @@ namespace TestNarou.Adaptor.Controller
 
         public void NavigateLoginFormView()
         {
+            logger.Trace("NavigateLoginFormView");
+
             this.rm.RequestNavigate(
                     IMainWindowViewModel.REGION_NAME, ILoginFormViewModel.URI);
         }
 
         public void NavigateBookmarkView()
         {
+            logger.Trace("NavigateBookmarkView");
+
             this.rm.RequestNavigate(
                     IMainWindowViewModel.REGION_NAME, IBookmarkViewModel.URI);
         }
+
+        public bool ContainsCategoryNo(int categoryNo)
+        {
+            return this.CategoryNoMap.ContainsKey(categoryNo);
+        }
+
+        public void RegisterDetailList(int categoryNo, IBookmarkDetailListViewModel vm)
+        {
+            logger.Trace("RegisterDetailList: categoryNo {0}, vm {1}", categoryNo, vm.ToHashString());
+
+            this.CategoryNoMap.Add(categoryNo, vm);
+        }
+
+        public void NavigateBookmarkListView(int categoryNo)
+        {
+            logger.Trace("NavigateBookmarkListView: categoryNo {0}", categoryNo);
+
+            bool needsRefresh = !CategoryNoMap.ContainsKey(categoryNo);
+
+            NavigationParameters args = new()
+            {
+                { IBookmarkDetailListViewModel.CATEGORY_NO_KEY, categoryNo }
+            };
+
+            this.rm.RequestNavigate(
+                    IBookmarkViewModel.DETAIL_LIST_REGION_NAME, IBookmarkDetailListViewModel.URI, args);
+
+            if (!needsRefresh)
+            {
+                return;
+            }
+
+            NarouRefreshBookmarkDetailListRequest req = new(categoryNo);
+
+            _ = Execute(req);
+        }
+
+        public void SynchronizeBookmarkDetailList(int categoryNo, BookmarkDetailList detailList)
+        {
+            logger.Trace("SynchronizeBookmarkDetailList: categoryNo {0}", categoryNo);
+
+            if (!CategoryNoMap.TryGetValue(categoryNo, out IBookmarkDetailListViewModel vm))
+            {
+                return;
+            }
+
+            vm.SynchronizeWith(detailList);
+        }
     }
 }

--- a/30Adaptor/Gateway/ViewModel/BookmarkDetailListViewModel.cs
+++ b/30Adaptor/Gateway/ViewModel/BookmarkDetailListViewModel.cs
@@ -1,12 +1,15 @@
 using NLog;
 using ObservableCollections;
 using Prism.Navigation;
+using Prism.Regions;
 using Reactive.Bindings;
 using Reactive.Bindings.Extensions;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Reactive.Disposables;
 using System.Windows.Data;
+using TestNarou.Adaptor.Boundary.Controller;
 using TestNarou.Adaptor.Boundary.Gateway.ViewModel;
 using TestNarou.Adaptor.Boundary.Gateway.ViewModel.Child;
 using TestNarou.Adaptor.Translator;
@@ -16,13 +19,11 @@ using TestNarou.Domain.Model.Entity.Child;
 namespace TestNarou.Adaptor.Gateway.ViewModel
 {
     internal class BookmarkDetailListViewModel
-            : IBookmarkDetailListViewModel, INotifyPropertyChanged, IDestructible
+            : IBookmarkDetailListViewModel, INotifyPropertyChanged, INavigationAware, IDestructible
     {
         private static readonly ILogger logger = LogManager.GetCurrentClassLogger();
 
-#pragma warning disable CS0067
         public event PropertyChangedEventHandler PropertyChanged;
-#pragma warning restore CS0067
 
         public ReactiveCommand CommandOpenBookmark { get; }
 
@@ -30,16 +31,25 @@ namespace TestNarou.Adaptor.Gateway.ViewModel
 
         public ICollectionView Rows { get; private set; } = null;
 
+        private IAppWindowController WindowController { get; }
+
+        private int CategoryNo { get; set; } = -1;
+
         private ISynchronizedListView<BookmarkDetailListRow, IBookmarkDetailListRowViewModel> internalRows;
         private IBookmarkDetailListRowViewModel selectedRow;
 
         private readonly IBookmarkDetailListRowViewModelTranslator vmTranslator;
         private readonly CompositeDisposable disposables = new();
 
-        public BookmarkDetailListViewModel(IBookmarkDetailListRowViewModelTranslator vmTranslator)
+        public BookmarkDetailListViewModel(
+                IAppWindowController wc,
+                IBookmarkDetailListRowViewModelTranslator vmTranslator)
         {
+            this.WindowController = wc;
             this.vmTranslator = vmTranslator;
-            this.CommandOpenBookmark = new ReactiveCommand().WithSubscribe(OpenBookmark).AddTo(disposables);
+
+            this.CommandOpenBookmark = new ReactiveCommand()
+                    .WithSubscribe(OpenBookmark).AddTo(disposables);
         }
 
         public void NotifySelectedItemChanged(
@@ -90,5 +100,51 @@ namespace TestNarou.Adaptor.Gateway.ViewModel
         {
             this.disposables.Dispose();
         }
+
+        #region INavigationAware
+
+        public bool IsNavigationTarget(NavigationContext ctx)
+        {
+            int categoryNo = GetCategoryNoFromNavigationContext(ctx);
+
+            //logger.Trace("IsNavigationTarget: to:{0} <> this:{1}", categoryNo, this.CategoryNo);
+
+            if (this.CategoryNo == -1 && !WindowController.ContainsCategoryNo(categoryNo))
+            {
+                //logger.Trace("IsNavigationTarget: new Category");
+                return true;
+            }
+
+            bool isTarget = categoryNo == this.CategoryNo;
+
+            //logger.Trace("IsNavigationTarget: isTarget {0}", isTarget);
+
+            return isTarget;
+        }
+
+        public void OnNavigatedTo(NavigationContext ctx)
+        {
+            int categoryNo = GetCategoryNoFromNavigationContext(ctx);
+
+            //logger.Trace("OnNavigatedTo: to:{0} -> this:{1}", categoryNo, this.CategoryNo);
+
+            if (this.CategoryNo == -1)
+            {
+                this.CategoryNo = categoryNo;
+                this.WindowController.RegisterDetailList(this.CategoryNo, this);
+            }
+        }
+
+        public void OnNavigatedFrom(NavigationContext ctx)
+        {
+            // NOP
+        }
+
+        private static int GetCategoryNoFromNavigationContext(NavigationContext ctx)
+        {
+            return ctx.Parameters.GetValue<int>(IBookmarkDetailListViewModel.CATEGORY_NO_KEY);
+        }
+
+        #endregion
     }
 }

--- a/30Adaptor/Gateway/ViewModel/BookmarkViewModel.cs
+++ b/30Adaptor/Gateway/ViewModel/BookmarkViewModel.cs
@@ -1,52 +1,24 @@
-using NLog;
-using Prism.Navigation;
-using Prism.Regions;
+using Prism.Navigation;
 using System.ComponentModel;
 using System.Reactive.Disposables;
 using TestNarou.Adaptor.Boundary.Gateway.ViewModel;
 
 namespace TestNarou.Adaptor.Gateway.ViewModel
 {
-    internal class BookmarkViewModel : INavigationAware, IBookmarkViewModel, IDestructible
+    internal class BookmarkViewModel : IBookmarkViewModel, IDestructible
     {
-        private static readonly ILogger logger = LogManager.GetCurrentClassLogger();
+        //private static readonly ILogger logger = LogManager.GetCurrentClassLogger();
 
 #pragma warning disable CS0067
         public event PropertyChangedEventHandler PropertyChanged;
 #pragma warning restore CS0067
 
-        private readonly IRegionManager rm;
-
         private readonly CompositeDisposable disposables = new();
 
-        public BookmarkViewModel(IRegionManager rm)
-        {
-            this.rm = rm;
-        }
-
         public void Destroy()
         {
             this.disposables.Dispose();
         }
 
-        #region INavigationAware
-
-        public bool IsNavigationTarget(NavigationContext ctx)
-        {
-            logger.Trace("BookmarkViewModel: IsNavigationTarget {0}", ctx.Uri);
-
-            return true;
-        }
-
-        public void OnNavigatedFrom(NavigationContext ctx)
-        {
-            // NOP
-        }
-
-        public void OnNavigatedTo(NavigationContext ctx)
-        {
-        }
-
-        #endregion
     }
 }

--- a/30Adaptor/Gateway/ViewModel/Child/BookmarkCategoryRowViewModel.cs
+++ b/30Adaptor/Gateway/ViewModel/Child/BookmarkCategoryRowViewModel.cs
@@ -41,9 +41,7 @@ namespace TestNarou.Adaptor.Gateway.ViewModel.Child
                 return;
             }
 
-            NarouRefreshBookmarkDetailListRequest req = new(this.Index);
-
-            _ = this.Parent.WindowController.Execute(req);
+            this.Parent.WindowController.NavigateBookmarkListView(this.Index);
         }
 
         protected virtual void Dispose(bool disposing)

--- a/30Adaptor/Gateway/ViewModel/LoginFormViewModel.cs
+++ b/30Adaptor/Gateway/ViewModel/LoginFormViewModel.cs
@@ -56,16 +56,8 @@ namespace TestNarou.Adaptor.Gateway.ViewModel
                 return;
             }
 
-            NarouRefreshBookmarkDetailListRequest req2 = new(1);
-
-            var res2 = this.wc.Execute(req2);
-
-            if (res2.IsAborted)
-            {
-                return;
-            }
-
             this.wc.NavigateBookmarkView();
+            this.wc.NavigateBookmarkListView(1);
         }
 
         #endregion

--- a/30Adaptor/Presenter/NarouRefreshBookmarkDetailListPresenter.cs
+++ b/30Adaptor/Presenter/NarouRefreshBookmarkDetailListPresenter.cs
@@ -1,4 +1,5 @@
-using TestNarou.Adaptor.Boundary.Gateway.ViewModel;
+using TestNarou.Adaptor.Boundary.Controller;
+using TestNarou.Adaptor.Boundary.Gateway.ViewModel;
 using TestNarou.UseCase.Boundary.Presenter;
 using TestNarou.UseCase.Request;
 using TestNarou.UseCase.Response;
@@ -8,12 +9,13 @@ namespace TestNarou.Adaptor.Presenter
     internal class NarouRefreshBookmarkDetailListPresenter
             : INarouRefreshBookmarkDetailListPresenter
     {
-        private readonly IBookmarkDetailListViewModel vm;
+        private readonly IAppWindowController wc;
 
         public NarouRefreshBookmarkDetailListPresenter(
-                IBookmarkDetailListViewModel vm)
+                IAppWindowController wc
+        )
         {
-            this.vm = vm;
+            this.wc = wc;
         }
 
         public NarouRefreshBookmarkDetailListResponse Present(
@@ -21,7 +23,7 @@ namespace TestNarou.Adaptor.Presenter
                 NarouRefreshBookmarkDetailListResponse res
         )
         {
-            this.vm.SynchronizeWith(res.DetailList);
+            this.wc.SynchronizeBookmarkDetailList(req.CategoryNo, res.DetailList);
 
             return res;
         }

--- a/40OuterEdge/OuterEdgeModule.cs
+++ b/40OuterEdge/OuterEdgeModule.cs
@@ -25,6 +25,8 @@ namespace TestNarou.OuterEdge
             containerRegistry.RegisterForNavigation<LoginFormView>();
             containerRegistry.RegisterForNavigation<BookmarkView>();
 
+            containerRegistry.RegisterForNavigation<BookmarkDetailListView>();
+
             ///
             /// Repositories
             ///

--- a/40OuterEdge/Repository/API/HttpClientHelper.cs
+++ b/40OuterEdge/Repository/API/HttpClientHelper.cs
@@ -74,8 +74,8 @@ namespace TestNarou.OuterEdge.Repository.API
 
             var response = await httpClient.SendAsync(request).ConfigureAwait(false);
 
-            ShowResponseHeaders(response);
-            ShowCookies();
+            //ShowResponseHeaders(response);
+            //ShowCookies();
 
             logger.Trace("StatusCode: {0}", response.StatusCode);
 
@@ -99,8 +99,8 @@ namespace TestNarou.OuterEdge.Repository.API
 
             var response = await httpClient.SendAsync(request).ConfigureAwait(false);
 
-            ShowResponseHeaders(response);
-            ShowCookies();
+            //ShowResponseHeaders(response);
+            //ShowCookies();
 
             logger.Trace("StatusCode: {0}", response.StatusCode);