feat: documentID 기준으로 오름차순 정렬하여 페이지네이션 구현

Author: opficdev

Firebase/firestore.index.json

@@ -11,6 +11,10 @@
         {
           "fieldPath": "dueDate",
           "order": "ASCENDING"
+        },
+        {
+          "fieldPath": "__name__",
+          "order": "ASCENDING"
         }
       ]
     },

Firebase/functions/src/notification/cleanup.ts

@@ -81,12 +81,20 @@ export const cleanupSoftDeletedNotifications = onSchedule({
     },
     async () => {
         try {
+            let lastDocument:
+                FirebaseFirestore.QueryDocumentSnapshot<FirebaseFirestore.DocumentData> | undefined;
+
             while (true) {
-                const snapshot = await admin.firestore()
+                let query = admin.firestore()
                     .collectionGroup("notifications")
                     .where("isDeleted", "==", true)
+                    .orderBy(admin.firestore.FieldPath.documentId())
                     .limit(CLEANUP_BATCH_SIZE)
-                    .get();
+                if (lastDocument) {
+                    query = query.startAfter(lastDocument);
+                }
+
+                const snapshot = await query.get();
 
                 if (snapshot.empty) { return; }
 
@@ -97,6 +105,7 @@ export const cleanupSoftDeletedNotifications = onSchedule({
                 await batch.commit();
 
                 if (snapshot.size < CLEANUP_BATCH_SIZE) { return; }
+                lastDocument = snapshot.docs[snapshot.docs.length - 1];
             }
         } catch (error) {
             logger.error(
@@ -105,6 +114,7 @@ export const cleanupSoftDeletedNotifications = onSchedule({
                 {
                     collectionGroup: "notifications",
                     filter: "isDeleted == true",
+                    orderBy: "documentId",
                     cleanupBatchSize: CLEANUP_BATCH_SIZE
                 }
             );
@@ -127,6 +137,7 @@ export const cleanupUnusedTodoNotificationRecords = onSchedule({
                     .where("isCompleted", "==", true)
                     .where("dueDate", "<", admin.firestore.Timestamp.now())
                     .orderBy("dueDate")
+                    .orderBy(admin.firestore.FieldPath.documentId())
                     .limit(QUERY_BATCH_SIZE);
 
                 if (lastDocument) {
@@ -142,7 +153,7 @@ export const cleanupUnusedTodoNotificationRecords = onSchedule({
                 {
                     collectionGroup: "todoLists",
                     filter: "isCompleted == true && dueDate < now",
-                    orderBy: "dueDate",
+                    orderBy: ["dueDate", "documentId"],
                     queryBatchSize: QUERY_BATCH_SIZE
                 }
             );

Firebase/functions/src/todo/cleanup.ts

@@ -15,12 +15,20 @@ export const cleanupSoftDeletedTodos = onSchedule({
     },
     async () => {
         try {
+            let lastDocument:
+                FirebaseFirestore.QueryDocumentSnapshot<FirebaseFirestore.DocumentData> | undefined;
+
             while (true) {
-                const snapshot = await admin.firestore()
+                let query = admin.firestore()
                     .collectionGroup("todoLists")
                     .where("isDeleted", "==", true)
+                    .orderBy(admin.firestore.FieldPath.documentId())
                     .limit(QUERY_BATCH_SIZE)
-                    .get();
+                if (lastDocument) {
+                    query = query.startAfter(lastDocument);
+                }
+
+                const snapshot = await query.get();
                 if (snapshot.empty) { return; }
 
                 const batch = admin.firestore().batch();
@@ -30,6 +38,7 @@ export const cleanupSoftDeletedTodos = onSchedule({
                 await batch.commit();
 
                 if (snapshot.size < QUERY_BATCH_SIZE) { return; }
+                lastDocument = snapshot.docs[snapshot.docs.length - 1];
             }
         } catch (error) {
             logger.error(
@@ -38,6 +47,7 @@ export const cleanupSoftDeletedTodos = onSchedule({
                 {
                     collectionGroup: "todoLists",
                     filter: "isDeleted == true",
+                    orderBy: "documentId",
                     queryBatchSize: QUERY_BATCH_SIZE
                 }
             );

Firebase/functions/src/webPage/cleanup.ts

@@ -14,12 +14,20 @@ export const cleanupSoftDeletedWebPages = onSchedule({
     },
     async () => {
         try {
+            let lastDocument:
+                FirebaseFirestore.QueryDocumentSnapshot<FirebaseFirestore.DocumentData> | undefined;
+
             while (true) {
-                const snapshot = await admin.firestore()
+                let query = admin.firestore()
                     .collectionGroup("webPages")
                     .where("isDeleted", "==", true)
+                    .orderBy(admin.firestore.FieldPath.documentId())
                     .limit(CLEANUP_BATCH_SIZE)
-                    .get();
+                if (lastDocument) {
+                    query = query.startAfter(lastDocument);
+                }
+
+                const snapshot = await query.get();
 
                 if (snapshot.empty) { return; }
 
@@ -30,11 +38,13 @@ export const cleanupSoftDeletedWebPages = onSchedule({
                 await batch.commit();
 
                 if (snapshot.size < CLEANUP_BATCH_SIZE) { return; }
+                lastDocument = snapshot.docs[snapshot.docs.length - 1];
             }
         } catch (error) {
             logger.error("soft delete WebPage cleanup 실패", toError(error), {
                 collectionGroup: "webPages",
                 filter: "isDeleted == true",
+                orderBy: "documentId",
                 cleanupBatchSize: CLEANUP_BATCH_SIZE
             });
         }