fix: Fixed a bug that occurred when changing the value when searching.

mathrunet · Feb 3, 2023 · c4c01bb · c4c01bb
1 parent 11543b3
commit c4c01bb
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 10 deletions.
diff --git a/packages/katana_model/example/pubspec.lock b/packages/katana_model/example/pubspec.lock
@@ -357,7 +357,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.5.5"
+    version: "1.5.6"
   lints:
     dependency: transitive
     description:

diff --git a/packages/katana_model/lib/src/collection_base.dart b/packages/katana_model/lib/src/collection_base.dart
@@ -362,6 +362,9 @@ abstract class CollectionBase<TModel extends DocumentBase>
   /// [update]の内容に応じて適切な処理を行ってください。
   @protected
   Future<void> handledOnUpdate(ModelUpdateNotification update) async {
+    if (update.query != modelQuery) {
+      return;
+    }
     var notify = false;
     switch (update.status) {
       case ModelUpdateNotificationStatus.added:

diff --git a/packages/katana_model/lib/src/document_base.dart b/packages/katana_model/lib/src/document_base.dart
@@ -490,6 +490,9 @@ abstract class DocumentBase<T> extends ChangeNotifier
   /// [update]の内容に応じて適切な処理を行ってください。
   @protected
   Future<void> handledOnUpdate(ModelUpdateNotification update) async {
+    if (update.query != modelQuery) {
+      return;
+    }
     final val = value;
     final filtered = _filterOnLoad(update.value);
     if (filtered.isEmpty) {

diff --git a/packages/katana_model/lib/src/model_adapter.dart b/packages/katana_model/lib/src/model_adapter.dart
@@ -526,9 +526,6 @@ class ModelAdapterCollectionQuery {
 
   @override
   int get hashCode {
-    if (origin != null) {
-      return origin.hashCode;
-    }
     return query.hashCode;
   }
 }
diff --git a/packages/katana_model/lib/src/model_query.dart b/packages/katana_model/lib/src/model_query.dart
@@ -1753,11 +1753,11 @@ class ModelQueryFilter {
         }
         final splitBygram = target.toLowerCase().splitByBigram();
         for (final text in splitBygram) {
-          if (source.get(text, false)) {
-            return true;
+          if (!source.get(text, false)) {
+            return false;
           }
         }
-        return false;
+        return true;
       default:
         return true;
     }

diff --git a/packages/katana_model/lib/src/model_update_notification.dart b/packages/katana_model/lib/src/model_update_notification.dart
@@ -38,6 +38,7 @@ class ModelUpdateNotification {
     required this.status,
     required this.value,
     required this.listen,
+    required this.query,
     this.origin,
     this.oldIndex,
     this.newIndex,
@@ -87,6 +88,11 @@ class ModelUpdateNotification {
   /// クエリーを監視中の場合は`true`.
   final bool listen;
 
+  /// [ModelQuery] to be updated.
+  ///
+  /// アップデート対象の[ModelQuery]。
+  final ModelQuery query;
+
   @override
   String toString() {
     return "$runtimeType(path: $path, id: $id, status: $status, origin: $origin, value: $value, listen: $listen)";

diff --git a/packages/katana_model/lib/src/no_sql_database.dart b/packages/katana_model/lib/src/no_sql_database.dart
@@ -347,7 +347,7 @@ class NoSqlDatabase {
               .removeEmpty(),
         )
         .sublist(0, limitValue);
-    _collectionEntries[query] = entries;
+    _collectionEntries[query] = List.from(entries);
     return Map<String, DynamicMap>.fromEntries(entries);
   }
 
@@ -405,7 +405,7 @@ class NoSqlDatabase {
               .removeEmpty(),
         )
         .sublist(0, limitValue);
-    _collectionEntries[query] = entries;
+    _collectionEntries[query] = List.from(entries);
     await onSaved?.call(this);
     return value;
   }
@@ -685,6 +685,7 @@ class NoSqlDatabase {
             value: Map.from(value),
             origin: query.origin,
             listen: query.listen,
+            query: element.query,
           ),
         ),
       );
@@ -712,6 +713,7 @@ class NoSqlDatabase {
                   oldIndex: null,
                   newIndex: newIndex,
                   listen: query.listen,
+                  query: element.query,
                 ),
               );
               break;
@@ -736,6 +738,7 @@ class NoSqlDatabase {
                       oldIndex: null,
                       newIndex: newIndex,
                       listen: query.listen,
+                      query: element.query,
                     ),
                   );
                 } else {
@@ -757,6 +760,7 @@ class NoSqlDatabase {
                       oldIndex: oldIndex < 0 ? null : oldIndex,
                       newIndex: newIndex,
                       listen: query.listen,
+                      query: element.query,
                     ),
                   );
                 }
@@ -776,6 +780,7 @@ class NoSqlDatabase {
                       oldIndex: oldIndex < 0 ? null : oldIndex,
                       newIndex: null,
                       listen: query.listen,
+                      query: element.query,
                     ),
                   );
                 }
@@ -796,6 +801,7 @@ class NoSqlDatabase {
                   oldIndex: oldIndex < 0 ? null : oldIndex,
                   newIndex: null,
                   listen: query.listen,
+                  query: element.query,
                 ),
               );
               break;

diff --git a/packages/katana_model_firestore/lib/adapter/listenable_firestore_model_adapter.dart b/packages/katana_model_firestore/lib/adapter/listenable_firestore_model_adapter.dart
@@ -137,6 +137,7 @@ class ListenableFirestoreModelAdapter extends ModelAdapter {
               newIndex: doc.newIndex,
               origin: query.origin,
               listen: availableListen,
+              query: query.query,
             ),
           );
         }
@@ -162,6 +163,7 @@ class ListenableFirestoreModelAdapter extends ModelAdapter {
           value: _convertFrom(doc.data()?.cast() ?? {}),
           origin: query.origin,
           listen: availableListen,
+          query: query.query,
         ),
       );
     });

diff --git a/packages/katana_model_firestore/pubspec.lock b/packages/katana_model_firestore/pubspec.lock
@@ -302,7 +302,7 @@ packages:
       path: "../katana_model"
       relative: true
     source: path
-    version: "1.5.4"
+    version: "1.5.6"
   lints:
     dependency: transitive
     description: