fix: Fixed a bug when processing that requires sorting by a different…

… key.
mathrunet · Mar 22, 2024 · a54ef68 · a54ef68
1 parent bb2e477
commit a54ef68
Showing 1 changed file with 35 additions and 0 deletions.
diff --git a/packages/katana_model_firestore/lib/src/firestore_model_field_value_converter.dart b/packages/katana_model_firestore/lib/src/firestore_model_field_value_converter.dart
@@ -272,6 +272,12 @@ abstract class FirestoreModelFieldValueConverter {
           return null;
         }
         final key = filter.key!;
+        firestoreQuery = _fixDifferentKeys(
+          key,
+          firestoreQuery,
+          filter,
+          query,
+        );
         firestoreQuery = firestoreQuery.orderBy(
           convertQueryKey(key, filter, query, adapter),
         );
@@ -281,6 +287,12 @@ abstract class FirestoreModelFieldValueConverter {
           return null;
         }
         final key = filter.key!;
+        firestoreQuery = _fixDifferentKeys(
+          key,
+          firestoreQuery,
+          filter,
+          query,
+        );
         firestoreQuery = firestoreQuery.orderBy(
           convertQueryKey(key, filter, query, adapter),
           descending: true,
@@ -394,6 +406,29 @@ abstract class FirestoreModelFieldValueConverter {
         ];
     }
   }
+
+  // 下記の不具合の修正
+  // https://stackoverflow.com/questions/68166318/the-initial-orderby-field-fieldpathid-true00-has-to-be-the-same
+  Query<DynamicMap> _fixDifferentKeys(
+    String key,
+    Query<DynamicMap> firestoreQuery,
+    ModelQueryFilter filter,
+    ModelAdapterCollectionQuery query,
+  ) {
+    final filters = query.query.filters.where((item) =>
+        item.type == ModelQueryFilterType.isNotNull ||
+        item.type == ModelQueryFilterType.greaterThan ||
+        item.type == ModelQueryFilterType.greaterThanOrEqualTo ||
+        item.type == ModelQueryFilterType.lessThan ||
+        item.type == ModelQueryFilterType.lessThanOrEqualTo ||
+        item.type == ModelQueryFilterType.notEqualTo);
+    if (filters.isNotEmpty && !filters.any((item) => item.key == key)) {
+      firestoreQuery = firestoreQuery.orderBy(
+        convertQueryKey(filters.first.key ?? "", filter, query),
+      );
+    }
+    return firestoreQuery;
+  }
 }
 
 /// Base class for implementing [FirestoreModelAdapter].