@roit/roit-data-firestore 0.0.39 → 0.0.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@roit/roit-data-firestore",
-  "version": "0.0.39",
+  "version": "0.0.40",
   "main": "dist/index.js",
   "types": "src/index.ts",
   "scripts": {
@@ -25,7 +25,7 @@
   "dependencies": {
     "@google-cloud/firestore": "4.10.1",
     "@roit/roit-date": "1.7.0",
-    "class-validator": "0.12.0",
+    "class-validator": "0.13.0",
     "class-validator-jsonschema": "^3.1.0",
     "firebase": "^9.2.0",
     "node-cache": "5.1.2",

package/src/model/Paging.ts

@@ -1,11 +1,11 @@
 
 export class Paging {
 
-    orderBy?: string = 'id'
+    orderBy?: string | string[] = 'id'
 
     orderByDirection?: Direction = 'asc'
 
-    cursor?: string | null = null
+    cursor?: string | string[] | null = null
 
     limit: number = 1000
 }

package/src/query/QueryCreatorConfig.ts

@@ -4,20 +4,21 @@ import { Paging } from "../model/Paging";
 export class QueryCreatorConfig {
 
     buildPaging(collectionRef: CollectionReference<DocumentData>, paging?: Paging): Query<DocumentData> {
-
-        const orderBy = paging?.orderBy || ''
         const orderByDirection = paging?.orderByDirection || 'asc'
-        const startAfter = paging?.cursor
         const limit = paging?.limit ?? 1000
 
         let documentRef: Query<DocumentData> = collectionRef.limit(limit)
 
-        if (orderBy) {
-            documentRef = documentRef.orderBy(orderBy, orderByDirection)
+        if (paging?.orderBy) {
+            const ordersBy = Array.isArray(paging.orderBy) ? paging.orderBy : [paging.orderBy]
+            ordersBy.forEach(order =>
+                documentRef = documentRef.orderBy(order, orderByDirection)
+            )
         }
 
-        if (startAfter) {
-            documentRef= documentRef.startAfter(startAfter)
+        if (paging?.cursor) {
+            const startAfter = Array.isArray(paging.cursor) ? paging.cursor : [paging.cursor]
+            documentRef = documentRef.startAfter(...startAfter)
         }
 
         return documentRef