delete flush fix

Author: max-ostapenko

infra/README.md

@@ -103,7 +103,7 @@ curl -X POST http://localhost:8080/ \
           "job": {
             "jobConfiguration": {
               "query": {
-                "query": "/* {\"dataform_trigger\": \"report_cwv_tech_complete\", \"date\": \"2024-10-01\", \"name\": \"adoption\", \"type\": \"report\"} *\/"
+                "query": "/* {\"dataform_trigger\": \"report_cwv_tech_complete\", \"date\": \"2024-11-01\", \"name\": \"adoption\", \"type\": \"report\"} *\/"
               }
             }
           }

infra/dataform-export/firestore.js

@@ -90,7 +90,6 @@ export class FirestoreBatch {
 
       snapshot.forEach(async (doc) => {
         this.currentBatch.push(doc)
-        totalDocsDeleted++
 
         if (this.currentBatch.length >= this.batchSize) {
           this.queueBatch('delete')
@@ -99,12 +98,13 @@ export class FirestoreBatch {
         if (this.batchPromises.length >= this.maxConcurrentBatches) {
           await this.commitBatches()
         }
+        totalDocsDeleted++
       })
-      await this.finalFlush('delete')
-
-      const duration = (Date.now() - startTime) / 1000
-      console.info(`Deletion complete. Total docs deleted: ${totalDocsDeleted}. Time: ${duration} seconds`)
     }
+    await this.finalFlush('delete')
+
+    const duration = (Date.now() - startTime) / 1000
+    console.info(`Deletion complete. Total docs deleted: ${totalDocsDeleted}. Time: ${duration} seconds`)
   }
 
   /**