Merge pull request #137 from freetrade-io/fix/start-after-issue

Fix/start after issue
freetrade-io · Oct 6, 2022 · e1e37d0 · e1e37d0
2 parents 4824e1e + e7911ea
commit e1e37d0
Show file tree

Hide file tree

Showing 4 changed files with 81 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@freetrade-io/ts-firebase-driver-testing",
-  "version": "1.0.18",
+  "version": "1.0.19",
   "description": "Swap out Firebase as a driver for in-process testing",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/src/driver/Firestore/InProcessFirestore.ts b/src/driver/Firestore/InProcessFirestore.ts
@@ -283,13 +283,16 @@ export class InProcessFirestoreQuery implements IFirestoreQuery {
         if (_.isNumber(val)) {
             return val
         }
-
+        if (val instanceof InProcessFirestoreDocRef) {
+            return val.id
+        }
         if (val && typeof val.toISOString === "function") {
             val = val.toISOString()
         }
         if (val && typeof val.toString === "function") {
             val = val.toString()
         }
+
         return String(val)
     }
 

diff --git a/tests/driver/Firestore/InProcessFirestore.collectionGroup.startAfter.test.ts b/tests/driver/Firestore/InProcessFirestore.collectionGroup.startAfter.test.ts
@@ -130,4 +130,42 @@ describe("In-process Firestore start after query on collectionGroup", () => {
             result.docs.map((doc) => ({ id: doc.id, data: doc.data() })),
         ).toStrictEqual([{ id: "22da618d", data: { name: "aardvark" } }])
     })
+
+    test("startAfter document id", async () => {
+        // Given there is a collection of documents with ids;
+        await db.doc("livingthings/animals/22da618d").set({ name: "aardvark" })
+        await db.doc("livingthings/animals/00a3382").set({ name: "badger" })
+        await db.doc("livingthings/animals/11cbe6b5").set({ name: "camel" })
+
+        const startAfterDoc = db.doc("livingthings/animals/11cbe6b5")
+
+        // When we order the collection by the document id;
+        const result = await db
+            .collectionGroup("animals")
+            .orderBy(FieldPath.documentId())
+            .startAfter(startAfterDoc)
+            .get()
+
+        // Then we should get the collection ordered by that field.
+        expect(result.size).toEqual(1)
+        expect(
+            result.docs.map((doc) => ({ id: doc.id, data: doc.data() })),
+        ).toStrictEqual([{ id: "22da618d", data: { name: "aardvark" } }])
+    })
+
+    test("startAfter document id after using doc ref", async () => {
+        // Given there is a collection of documents with ids;
+        await db.doc("livingthings/animals/22da618d").set({ name: "aardvark" })
+        const startAfterDoc = db.doc("livingthings/animals/22da618d")
+
+        // When we order the collection by the document id;
+        const result = await db
+            .collectionGroup("animals")
+            .orderBy(FieldPath.documentId())
+            .startAfter(startAfterDoc)
+            .get()
+
+        // Then we should get no items
+        expect(result.size).toEqual(0)
+    })
 })
diff --git a/tests/driver/Firestore/InProcessFirestore.startAfter.test.ts b/tests/driver/Firestore/InProcessFirestore.startAfter.test.ts
@@ -122,4 +122,42 @@ describe("In-process Firestore start after query", () => {
             result.docs.map((doc) => ({ id: doc.id, data: doc.data() })),
         ).toStrictEqual([{ id: "22da618d", data: { name: "aardvark" } }])
     })
+
+    test.only("startAfter document id", async () => {
+        // Given there is a collection of documents with ids;
+        await db.doc("animals/22da618d").set({ name: "aardvark" })
+        await db.doc("animals/00a3382").set({ name: "badger" })
+        await db.doc("animals/11cbe6b5").set({ name: "camel" })
+
+        const startAfterDoc = db.doc("livingthings/animals/11cbe6b5")
+
+        // When we order the collection by the document id;
+        const result = await db
+            .collection("animals")
+            .orderBy(FieldPath.documentId())
+            .startAfter(startAfterDoc)
+            .get()
+
+        // Then we should get the collection ordered by that field.
+        expect(result.size).toEqual(1)
+        expect(
+            result.docs.map((doc) => ({ id: doc.id, data: doc.data() })),
+        ).toStrictEqual([{ id: "22da618d", data: { name: "aardvark" } }])
+    })
+
+    test("startAfter document id after using doc ref", async () => {
+        // Given there is a collection of documents with ids;
+        await db.doc("animals/22da618d").set({ name: "aardvark" })
+        const startAfterDoc = db.doc("animals/22da618d")
+
+        // When we order the collection by the document id;
+        const result = await db
+            .collection("animals")
+            .orderBy(FieldPath.documentId())
+            .startAfter(startAfterDoc)
+            .get()
+
+        // Then we should get no items
+        expect(result.size).toEqual(0)
+    })
 })