improvise the code

Author: milaGGL

packages/firestore/src/core/filter.ts

@@ -56,8 +56,6 @@ export abstract class Filter {
   abstract getFlattenedFilters(): readonly FieldFilter[];
 
   abstract getFilters(): Filter[];
-
-  abstract getInequalityFilters(): readonly FieldFilter[];
 }
 
 export class FieldFilter extends Filter {
@@ -194,13 +192,6 @@ export class FieldFilter extends Filter {
   getFilters(): Filter[] {
     return [this];
   }
-
-  getInequalityFilters(): readonly FieldFilter[] {
-    if (this.isInequality()) {
-      return [this];
-    }
-    return [];
-  }
 }
 
 export class CompositeFilter extends Filter {
@@ -246,14 +237,6 @@ export class CompositeFilter extends Filter {
   getFilters(): Filter[] {
     return Object.assign([], this.filters);
   }
-
-  // Performs a depth-first search to find and return the inequality FieldFilters in the composite
-  // filter. Returns an empty array if none of the FieldFilters has inequality filters.
-  getInequalityFilters(): readonly FieldFilter[] {
-    return this.getFlattenedFilters().filter((filter: FieldFilter) =>
-      filter.isInequality()
-    );
-  }
 }
 
 export function compositeFilterIsConjunction(

packages/firestore/src/core/query.ts

@@ -26,7 +26,7 @@ import {
   boundSortsAfterDocument,
   boundSortsBeforeDocument
 } from './bound';
-import { Filter } from './filter';
+import { FieldFilter, Filter } from './filter';
 import { Direction, OrderBy } from './order_by';
 import {
   canonifyTarget,
@@ -170,11 +170,11 @@ export function queryMatchesAllDocuments(query: Query): boolean {
 export function getInequalityFilterFields(query: Query): SortedSet<FieldPath> {
   let result = new SortedSet<FieldPath>(FieldPath.comparator);
   query.filters.forEach((filter: Filter) => {
-    const inequalityFields = filter
-      .getInequalityFilters()
-      .map(filter => filter.field);
-    inequalityFields.forEach((field: FieldPath) => {
-      result = result.add(field);
+    const subFilters = filter.getFlattenedFilters();
+    subFilters.forEach((filter: FieldFilter) => {
+      if (filter.isInequality()) {
+        result = result.add(filter.field);
+      }
     });
   });
   return result;

packages/firestore/test/unit/core/query.test.ts

@@ -852,6 +852,23 @@ describe('Query', () => {
       orderBy(fieldPath('a.a')), // field name with dot
       orderBy(DOCUMENT_KEY_NAME)
     );
+
+    // composite filter
+    assertImplicitOrderBy(
+      query(
+        'foo',
+        filter('a', '<', 5),
+        andFilter(
+          orFilter(filter('b', '>=', 1), filter('c', '<=', 1)),
+          orFilter(filter('d', '>', 1), filter('e', '==', 1))
+        )
+      ),
+      orderBy('a'),
+      orderBy('b'),
+      orderBy('c'),
+      orderBy('d'),
+      orderBy(DOCUMENT_KEY_NAME)
+    );
   });
 
   it('matchesAllDocuments() considers filters, orders and bounds', () => {