bulltrackers-module 1.0.590 → 1.0.591

package/functions/computation-system/persistence/ResultCommitter.js

@@ -3,6 +3,7 @@
  * UPDATED: Fixed bug where Alert Computations failed to trigger Pub/Sub on empty FINAL flush.
  * UPDATED: Added support for 'isPage' mode to store per-user data in subcollections.
  * UPDATED: Implemented TTL retention policy. Defaults to 90 days from the computation date.
+ * UPDATED: Fixed issue where switching to 'isPage' mode didn't clean up old sharded/raw data.
  */
 const { commitBatchInChunks, generateDataHash } = require('../utils/utils');
 const { updateComputationStatus }          = require('./StatusRepository');
@@ -26,7 +27,9 @@ async function commitResults(stateObj, dStr, passName, config, deps, skipStatusW
     const schemas        = [];
     const cleanupTasks   = []; 
     const alertTriggers  = []; 
-    const { logger, db } = deps;
+    const { logger, db, calculationUtils } = deps; // Extract calculationUtils if available
+    const withRetry = calculationUtils?.withRetry || (fn => fn());
+
     const pid            = generateProcessId(PROCESS_TYPES.STORAGE, passName, dStr);
     
     const flushMode        = options.flushMode || 'STANDARD';
@@ -141,6 +144,30 @@ async function commitResults(stateObj, dStr, passName, config, deps, skipStatusW
                     .collection(config.resultsSubcollection).doc(calc.manifest.category)
                     .collection(config.computationsSubcollection).doc(name);
 
+                // --- CLEANUP START: Remove old storage formats (Sharded/Compressed) ---
+                // If the computation previously ran in Standard mode, we must remove shards
+                // and clear the main document data to avoid conflicting flags.
+                try {
+                    const docSnap = await mainDocRef.get();
+                    if (docSnap.exists) {
+                        const dData = docSnap.data();
+                        if (dData._sharded) {
+                            const shardCol = mainDocRef.collection('_shards');
+                            const shardDocs = await withRetry(() => shardCol.listDocuments());
+                            
+                            if (shardDocs.length > 0) {
+                                const cleanupOps = shardDocs.map(d => ({ type: 'DELETE', ref: d }));
+                                await commitBatchInChunks(config, deps, cleanupOps, `${name}::PageModeCleanup`);
+                                runMetrics.io.deletes += cleanupOps.length;
+                                logger.log('INFO', `[PageMode] ${name}: Cleaned up ${cleanupOps.length} old shard documents.`);
+                            }
+                        }
+                    }
+                } catch (cleanupErr) {
+                    logger.log('WARN', `[PageMode] ${name}: Cleanup warning: ${cleanupErr.message}`);
+                }
+                // --- CLEANUP END ---
+
                 // Calculate expiration based on computation date
                 const expireAt = calculateExpirationDate(dStr, ttlDays);
 
@@ -181,7 +208,9 @@ async function commitResults(stateObj, dStr, passName, config, deps, skipStatusW
                         _expireAt: expireAt // Ensure the header also gets deleted
                     };
                     
-                    await mainDocRef.set(headerData, { merge: true });
+                    // CHANGED: Use merge: false to FORCE overwrite. 
+                    // This clears old "payload" (compressed), raw data keys, and old flags like "_sharded".
+                    await mainDocRef.set(headerData, { merge: false });
                     runMetrics.io.writes += 1;
                     
                     if (calc.manifest.hash) { 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bulltrackers-module",
-  "version": "1.0.590",
+  "version": "1.0.591",
   "description": "Helper Functions for Bulltrackers.",
   "main": "index.js",
   "files": [