resolve comments

googleapis · Mar 29, 2021 · 68a6ef1 · 68a6ef1
1 parent 2cf01c2
commit 68a6ef1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/dev/src/reference.ts b/dev/src/reference.ts
@@ -1515,28 +1515,21 @@ export class Query<T = firestore.DocumentData> implements firestore.Query<T> {
     }
 
     const fieldOrders = this._queryOptions.fieldOrders.slice();
-    let hasDocumentId = false;
 
+    // If no explicit ordering is specified, use the first inequality to
+    // define an implicit order.
     if (fieldOrders.length === 0) {
-      // If no explicit ordering is specified, use the first inequality to
-      // define an implicit order.
       for (const fieldFilter of this._queryOptions.fieldFilters) {
-        if (FieldPath.documentId().isEqual(fieldFilter.field)) {
-          hasDocumentId = true;
-        }
         if (fieldFilter.isInequalityFilter()) {
           fieldOrders.push(new FieldOrder(fieldFilter.field));
           break;
         }
       }
-    } else {
-      for (const fieldOrder of fieldOrders) {
-        if (FieldPath.documentId().isEqual(fieldOrder.field)) {
-          hasDocumentId = true;
-        }
-      }
     }
 
+    const hasDocumentId = !!fieldOrders.find(fieldOrder =>
+      FieldPath.documentId().isEqual(fieldOrder.field)
+    );
     if (!hasDocumentId) {
       // Add implicit sorting by name, using the last specified direction.
       const lastDirection =

diff --git a/dev/test/query.ts b/dev/test/query.ts
@@ -348,7 +348,7 @@ export function queryEquals(
 ): void {
   queryEqualsWithParentAndReadTime(
     actual,
-    '',
+    /* parent= */ '',
     /* readTime= */ undefined,
     ...protoComponents
   );