コミット: 0fe237d994965d47727cf4fdb77d61a5181cbfdd - TestNarou3 (git)

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

コミットメタ情報

• リビジョン: 0fe237d994965d47727cf4fdb77d61a5181cbfdd (tree)
• 日時: 2022-08-16 22:09:02
• 作者: yoshy <yoshy.org.bitbucket@gz.j...>
• コミッター: yoshy

ログメッセージ

[MOD] Model と ViewModel の同期を正しく行うように修正

変更サマリ

• modified: TestNarou3.Adaptor/Gateway/ViewModel/BookmarkCategoryViewModel.cs
• modified: TestNarou3.Adaptor/Gateway/ViewModel/BookmarkDetailListViewModel.cs
• modified: TestNarou3.Domain/Model/Entity/BookmarkCategory.cs
• modified: TestNarou3.Domain/Model/Entity/BookmarkDetailList.cs
• modified: TestNarou3.Domain/Service/NarouService.cs

差分

--- a/TestNarou3.Adaptor/Gateway/ViewModel/BookmarkCategoryViewModel.cs
+++ b/TestNarou3.Adaptor/Gateway/ViewModel/BookmarkCategoryViewModel.cs
@@ -1,4 +1,5 @@
-using NLog;
+using CleanAuLait.Core.Log;
+using NLog;
 using ObservableCollections;
 using Prism.Navigation;
 using Reactive.Bindings;
@@ -64,29 +65,15 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel
                         .WithINotifyCollectionChangedList()
                         .AddTo(disposables);
 
-                logger.Trace("BookmarkCategoryViewModel.SynchronizeWith: source rows [{0}], collection view [{1}]",
-                        source.Rows.Count, this.Rows.GetType().FullName);
+                logger.Trace("BookmarkCategoryViewModel.SynchronizeWith: source [{0}], collection view [{1}]",
+                        source.ToHashString(), this.Rows.GetType().FullName);
 
                 this.Source = source;
             }
             else
             {
-                int oldCount = this.Source.Rows.Count;
-
-                this.Source.Rows.Clear();
-
-                // due to the communication toolkit datagrid does not support range operations,
-                // we have to add the data row by row.
-
-                //this.Source.Rows.AddRange(source.Rows);
-
-                foreach (var row in source.Rows)
-                {
-                    this.Source.Rows.Add(row);
-                }
-
-                logger.Trace("BookmarkCategoryViewModel.SynchronizeWith: source rows [{0}] -> [{1}]",
-                        oldCount, source.Rows.Count);
+                logger.Trace("BookmarkCategoryViewModel.SynchronizeWith: viewmodel already synchronized to model [{0}]",
+                        this.Source.ToHashString());
             }
         }
 

--- a/TestNarou3.Adaptor/Gateway/ViewModel/BookmarkDetailListViewModel.cs
+++ b/TestNarou3.Adaptor/Gateway/ViewModel/BookmarkDetailListViewModel.cs
@@ -1,4 +1,5 @@
-using NLog;
+using CleanAuLait.Core.Log;
+using NLog;
 using ObservableCollections;
 using Prism.Navigation;
 using Reactive.Bindings;
@@ -83,27 +84,15 @@ namespace TestNarou3.Adaptor.Gateway.ViewModel
                         .WithINotifyCollectionChangedList()
                         .AddTo(disposables);
 
-                logger.Trace("BookmarkDetailListViewModel.SynchronizeWith: source rows [{0}], collection view [{1}]", source.Rows.Count, this.Rows.GetType().FullName);
+                logger.Trace("BookmarkDetailListViewModel.SynchronizeWith: source [{0}], collection view [{1}]",
+                        source.ToHashString(), this.Rows.GetType().FullName);
 
                 this.Source = source;
             }
             else
             {
-                int oldCount = this.Source.Rows.Count;
-
-                this.Source.Rows.Clear();
-
-                // due to the communication toolkit datagrid does not support range operations,
-                // we have to add the data row by row.
-
-                //this.Source.Rows.AddRange(source.Rows);
-
-                foreach (var row in source.Rows)
-                {
-                    this.Source.Rows.Add(row);
-                }
-
-                logger.Trace("BookmarkDetailListViewModel.SynchronizeWith: source rows [{0}] -> [{1}]", oldCount, source.Rows.Count);
+                logger.Trace("BookmarkDetailListViewModel.SynchronizeWith: viewmodel already synchronized to model [{0}]",
+                        this.Source.ToHashString());
             }
         }
 

--- a/TestNarou3.Domain/Model/Entity/BookmarkCategory.cs
+++ b/TestNarou3.Domain/Model/Entity/BookmarkCategory.cs
@@ -12,28 +12,24 @@ namespace TestNarou3.Domain.Model.Entity
         private bool disposedValue;
 
         public BookmarkCategory() : this(
-            Rows: new ObservableList<BookmarkCategoryRow>()
+            Rows: new()
         )
         {
         }
 
-        public BookmarkCategory(IEnumerable<BookmarkCategoryRow> lists) : this(
-            Rows: CreateRows(lists)
-        )
+        public void Refresh(IEnumerable<BookmarkCategoryRow> rows)
         {
-        }
+            this.Rows.Clear();
 
-        private static ObservableList<BookmarkCategoryRow>
-                CreateRows(IEnumerable<BookmarkCategoryRow> lists)
-        {
-            ObservableList<BookmarkCategoryRow> rows = new();
+            // due to the communication toolkit datagrid does not support range operations,
+            // we have to add the data row by row.
 
-            foreach (var row in lists)
+            //this.Rows.AddRange(rows);
+
+            foreach (var row in rows)
             {
-                rows.Add(row);
+                this.Rows.Add(row);
             }
-
-            return rows;
         }
 
         protected virtual void Dispose(bool disposing)

--- a/TestNarou3.Domain/Model/Entity/BookmarkDetailList.cs
+++ b/TestNarou3.Domain/Model/Entity/BookmarkDetailList.cs
@@ -12,28 +12,24 @@ namespace TestNarou3.Domain.Model.Entity
         private bool disposedValue;
 
         public BookmarkDetailList() : this(
-            Rows: new ObservableList<BookmarkDetailListRow>()
+            Rows: new()
         )
         {
         }
 
-        public BookmarkDetailList(IEnumerable<BookmarkDetailListRow> lists) : this(
-            Rows: CreateRows(lists)
-        )
+        public void Refresh(IEnumerable<BookmarkDetailListRow> rows)
         {
-        }
+            this.Rows.Clear();
 
-        private static ObservableList<BookmarkDetailListRow>
-                CreateRows(IEnumerable<BookmarkDetailListRow> lists)
-        {
-            ObservableList<BookmarkDetailListRow> rows = new();
+            // due to the communication toolkit datagrid does not support range operations,
+            // we have to add the data row by row.
 
-            foreach (var row in lists)
+            //this.Rows.AddRange(rows);
+
+            foreach (var row in rows)
             {
-                rows.Add(row);
+                this.Rows.Add(row);
             }
-
-            return rows;
         }
 
         protected virtual void Dispose(bool disposing)

--- a/TestNarou3.Domain/Service/NarouService.cs
+++ b/TestNarou3.Domain/Service/NarouService.cs
@@ -17,8 +17,8 @@ namespace TestNarou3.Domain.Service
 
         private string DataToken { get; set; }
 
-        private BookmarkCategory Categeory { get; set; }
-        private BookmarkDetailList DetailList { get; set; }
+        private BookmarkCategory Categeory { get; }
+        private BookmarkDetailList DetailList { get; }
 
         private readonly INarouRepository repo;
 
@@ -35,6 +35,9 @@ namespace TestNarou3.Domain.Service
 
             this.vmCategoryRowTranslator = vmCategoryRowTranslator;
             this.vmDetailRowTranslator = vmDetailRowTranslator;
+
+            this.Categeory = new();
+            this.DetailList = new();
         }
 
         public void Login(string id, string password)
@@ -63,8 +66,7 @@ namespace TestNarou3.Domain.Service
                     pair => this.vmCategoryRowTranslator.Translate(pair.category, pair.no)
             );
 
-            this.Categeory?.Dispose();
-            this.Categeory = new(rows);
+            this.Categeory.Refresh(rows);
 
             return this.Categeory;
         }
@@ -78,8 +80,7 @@ namespace TestNarou3.Domain.Service
             IEnumerable<BookmarkDetailListRow> detailRows =
                     novelInfos.Skip(1).Select(v => vmDetailRowTranslator.Translate(v));
 
-            this.DetailList?.Dispose();
-            this.DetailList = new(detailRows);
+            this.DetailList.Refresh(detailRows);
 
             return this.DetailList;
         }