bulltrackers-module 1.0.507 → 1.0.509

package/functions/generic-api/user-api/helpers/core/path_resolution_helpers.js

@@ -5,7 +5,53 @@
  */
 
 const { FieldValue } = require('@google-cloud/firestore');
-const { getCollectionPath, resolvePath, getCollectionMetadata } = require('../../../../../../config/collection_registry');
+
+// Try to require registry functions, but they may be injected instead
+let getCollectionPath, resolvePath, getCollectionMetadata;
+try {
+    const registry = require('../../../../../../config/collection_registry');
+    getCollectionPath = registry.getCollectionPath;
+    resolvePath = registry.resolvePath;
+    getCollectionMetadata = registry.getCollectionMetadata;
+} catch (error) {
+    // Registry will be injected via dependencies
+    getCollectionPath = null;
+    resolvePath = null;
+    getCollectionMetadata = null;
+}
+
+/**
+ * Get registry functions from options or fallback to module-level
+ * @param {object} options - Options object that may contain collectionRegistry
+ * @returns {object} - Object with getCollectionPath, resolvePath, getCollectionMetadata
+ */
+function getRegistryFunctions(options = {}) {
+    // Try to get from options first (injected)
+    if (options.collectionRegistry) {
+        return {
+            getCollectionPath: options.collectionRegistry.getCollectionPath,
+            resolvePath: options.collectionRegistry.resolvePath || resolvePath,
+            getCollectionMetadata: options.collectionRegistry.getCollectionMetadata || options.collectionRegistry.getCollectionMetadata
+        };
+    }
+    
+    // Fallback to module-level (if required successfully)
+    if (getCollectionPath && resolvePath && getCollectionMetadata) {
+        return { getCollectionPath, resolvePath, getCollectionMetadata };
+    }
+    
+    // Last resort: try to require again (in case it's available now)
+    try {
+        const registry = require('../../../../../../config/collection_registry');
+        return {
+            getCollectionPath: registry.getCollectionPath,
+            resolvePath: registry.resolvePath,
+            getCollectionMetadata: registry.getCollectionMetadata
+        };
+    } catch (error) {
+        throw new Error('Collection registry functions not available. Please provide collectionRegistry in dependencies.');
+    }
+}
 
 /**
  * Get eToro CID from Firebase UID
@@ -30,11 +76,13 @@ async function getCidFromFirebaseUid(db, firebaseUid) {
  * @param {string} category - Registry category (e.g., 'signedInUsers')
  * @param {string} subcategory - Subcategory name (e.g., 'notifications')
  * @param {object} params - Dynamic segment values (e.g., { cid: '123' })
+ * @param {object} options - Options object that may contain collectionRegistry
  * @returns {string} - Resolved path
  */
-function getNewPath(category, subcategory, params = {}) {
+function getNewPath(category, subcategory, params = {}, options = {}) {
     try {
-        return getCollectionPath(category, subcategory, params);
+        const { getCollectionPath: getPath } = getRegistryFunctions(options);
+        return getPath(category, subcategory, params);
     } catch (error) {
         console.error(`[getNewPath] Error resolving path for ${category}/${subcategory}:`, error.message);
         throw error;
@@ -64,11 +112,12 @@ function getNewPath(category, subcategory, params = {}) {
  * @param {string} subcategory - Registry subcategory (e.g., 'notifications', 'alerts') - optional
  * @returns {string|null} - Legacy path template or null if no legacy path exists
  */
-function getLegacyPath(dataType, userCid, config = {}, params = {}, category = null, subcategory = null) {
+function getLegacyPath(dataType, userCid, config = {}, params = {}, category = null, subcategory = null, options = {}) {
     // Try to get legacy paths from collection registry first
     if (category && subcategory) {
         try {
-            const metadata = getCollectionMetadata(category, subcategory);
+            const { getCollectionMetadata: getMetadata, resolvePath: resolve } = getRegistryFunctions(options);
+            const metadata = getMetadata(category, subcategory);
             if (metadata && metadata.legacyPaths && metadata.legacyPaths.length > 0) {
                 // Use first legacy path from registry (can be enhanced to try multiple)
                 let legacyPathTemplate = metadata.legacyPaths[0];
@@ -92,7 +141,7 @@ function getLegacyPath(dataType, userCid, config = {}, params = {}, category = n
                 };
                 
                 // Resolve path template
-                legacyPathTemplate = resolvePath(legacyPathTemplate, resolvedParams);
+                legacyPathTemplate = resolve(legacyPathTemplate, resolvedParams);
                 
                 // Replace any remaining placeholders
                 for (const [key, value] of Object.entries(resolvedParams)) {
@@ -183,15 +232,19 @@ async function readWithMigration(db, category, subcategory, params, options = {}
         dataType = null, 
         config = {}, 
         logger = null,
-        documentId = null 
+        documentId = null,
+        collectionRegistry = null
     } = options;
     
+    // Add collectionRegistry to options for registry function access
+    const registryOptions = { collectionRegistry };
+    
     const userCid = params.cid || params.userCid;
     
     // Get new path from registry
     let newPath;
     try {
-        newPath = getNewPath(category, subcategory, params);
+        newPath = getNewPath(category, subcategory, params, registryOptions);
     } catch (error) {
         if (logger) logger.log('WARN', `[readWithMigration] Could not resolve new path for ${category}/${subcategory}: ${error.message}`);
         newPath = null;
@@ -224,7 +277,7 @@ async function readWithMigration(db, category, subcategory, params, options = {}
     
     // Fallback to legacy path
     if (dataType && userCid) {
-        const legacyPathTemplate = getLegacyPath(dataType, userCid, config, params);
+        const legacyPathTemplate = getLegacyPath(dataType, userCid, config, params, category, subcategory, registryOptions);
         if (legacyPathTemplate) {
             try {
                 // Resolve legacy path (may have additional params like date, username)
@@ -388,20 +441,25 @@ async function writeWithMigration(db, category, subcategory, params, data, optio
         dataType = null,
         config = {},
         documentId = null,
-        dualWrite = true // Default to dual write during migration period
+        dualWrite = true, // Default to dual write during migration period
+        collectionRegistry = null
     } = options;
     
+    // Add collectionRegistry to options for registry function access
+    const registryOptions = { collectionRegistry };
+    
     const userCid = params.cid || params.userCid;
     
     // Get new path
-    const newPath = getNewPath(category, subcategory, params);
+    const newPath = getNewPath(category, subcategory, params, registryOptions);
     
     // Get legacy path if dual write is enabled
     let legacyPath = null;
     if (dualWrite && dataType && userCid) {
-        legacyPath = getLegacyPath(dataType, userCid, config);
+        const { resolvePath: resolve } = getRegistryFunctions(registryOptions);
+        legacyPath = getLegacyPath(dataType, userCid, config, params, null, null, registryOptions);
         if (legacyPath) {
-            legacyPath = resolvePath(legacyPath, params);
+            legacyPath = resolve(legacyPath, params);
         }
     }
     
@@ -463,14 +521,14 @@ async function writeWithMigration(db, category, subcategory, params, data, optio
 
 /**
  * Get collection path helper (for backward compatibility)
- * @param {object} collectionRegistry - Collection registry (not used, kept for compatibility)
+ * @param {object} collectionRegistry - Collection registry (injected)
  * @param {string} category - Registry category
  * @param {string} subcategory - Subcategory name
  * @param {object} params - Path parameters
  * @returns {string} - Resolved path
  */
 function getCollectionPathHelper(collectionRegistry, category, subcategory, params = {}) {
-    return getNewPath(category, subcategory, params);
+    return getNewPath(category, subcategory, params, { collectionRegistry });
 }
 
 module.exports = {

package/functions/generic-api/user-api/helpers/data/portfolio_helpers.js

@@ -5,7 +5,7 @@
 
 const { findLatestPortfolioDate } = require('../core/data_lookup_helpers');
 const { checkIfUserIsPI } = require('../core/user_status_helpers');
-const { getEffectiveCid, getDevOverride } = require('../dev_helpers');
+const { getEffectiveCid, getDevOverride } = require('../dev/dev_helpers');
 
 /**
  * GET /user/me/portfolio

package/functions/generic-api/user-api/helpers/profile/pi_profile_helpers.js

@@ -26,7 +26,8 @@ async function getPiAnalytics(req, res, dependencies, config) {
                 isCollection: false,
                 dataType: 'piAnalytics',
                 config,
-                documentId: String(cid)
+                documentId: String(cid),
+                collectionRegistry: dependencies.collectionRegistry
             }
         );
         

package/functions/generic-api/user-api/helpers/profile/profile_view_helpers.js

@@ -50,7 +50,8 @@ async function trackProfileView(req, res, dependencies, config) {
                     isCollection: false,
                     dataType: 'piProfileViews',
                     config,
-                    documentId: today
+                    documentId: today,
+                    collectionRegistry: dependencies.collectionRegistry
                 }
             );
             
@@ -77,7 +78,8 @@ async function trackProfileView(req, res, dependencies, config) {
                 dataType: 'piProfileViews',
                 config,
                 documentId: today,
-                dualWrite: true
+                dualWrite: true,
+                collectionRegistry: dependencies.collectionRegistry
             }
         );
         
@@ -105,7 +107,8 @@ async function trackProfileView(req, res, dependencies, config) {
                     dataType: 'piIndividualViews',
                     config,
                     documentId: viewId,
-                    dualWrite: true
+                    dualWrite: true,
+                    collectionRegistry: dependencies.collectionRegistry
                 }
             );
         }

package/functions/generic-api/user-api/helpers/profile/user_profile_helpers.js

@@ -62,6 +62,7 @@ async function getUserVerification(req, res, dependencies, config) {
             'verification',
             { cid: effectiveCid },
             {
+                collectionRegistry: dependencies.collectionRegistry,
                 isCollection: false,
                 dataType: 'verification',
                 config,

package/functions/generic-api/user-api/helpers/recommendations/recommendation_helpers.js

@@ -29,7 +29,8 @@ async function getUserRecommendations(req, res, dependencies, config, type = 'he
                 dataType: 'recommendations',
                 config,
                 logger,
-                documentId: type
+                documentId: type,
+                collectionRegistry: dependencies.collectionRegistry
             }
         );
         

package/functions/generic-api/user-api/helpers/search/pi_request_helpers.js

@@ -86,7 +86,8 @@ async function checkPisInRankings(req, res, dependencies, config) {
                 dataType: 'watchlists',
                 config,
                 logger,
-                documentId: id
+                documentId: id,
+                collectionRegistry: dependencies.collectionRegistry
             }
         );
         

package/functions/generic-api/user-api/helpers/watchlist/watchlist_analytics_helpers.js

@@ -31,7 +31,8 @@ async function getWatchlistTriggerCounts(req, res, dependencies, config) {
                 dataType: 'watchlists',
                 config,
                 logger,
-                documentId: id
+                documentId: id,
+                collectionRegistry: dependencies.collectionRegistry
             }
         );
         

package/functions/generic-api/user-api/helpers/watchlist/watchlist_data_helpers.js

@@ -33,7 +33,8 @@ async function getWatchlist(req, res, dependencies, config) {
                 isCollection: true,
                 dataType: 'watchlists',
                 config,
-                logger
+                logger,
+                collectionRegistry: dependencies.collectionRegistry
             }
         );
         
@@ -115,7 +116,8 @@ async function updateWatchlist(req, res, dependencies, config) {
                 dataType: 'watchlists',
                 config,
                 documentId: entryId,
-                dualWrite: true
+                dualWrite: true,
+                collectionRegistry: dependencies.collectionRegistry
             }
         );
         

package/functions/generic-api/user-api/helpers/watchlist/watchlist_generation_helpers.js

@@ -211,7 +211,8 @@ async function autoGenerateWatchlist(req, res, dependencies, config) {
                 isCollection: true,
                 dataType: 'watchlists',
                 config,
-                logger
+                logger,
+                collectionRegistry: dependencies.collectionRegistry
             }
         );
         
@@ -237,7 +238,8 @@ async function autoGenerateWatchlist(req, res, dependencies, config) {
                             dataType: 'watchlists',
                             config,
                             documentId: watchlistId,
-                            dualWrite: true
+                            dualWrite: true,
+                            collectionRegistry: dependencies.collectionRegistry
                         }
                     );
                     logger.log('SUCCESS', `[autoGenerateWatchlist] Updated auto-generated watchlist ${watchlistId} for user ${userCid}`);
@@ -278,6 +280,7 @@ async function autoGenerateWatchlist(req, res, dependencies, config) {
                 merge: false,
                 dataType: 'watchlists',
                 config,
+                collectionRegistry: dependencies.collectionRegistry,
                 documentId: watchlistId,
                 dualWrite: true
             }

package/package.json

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