bulltrackers-module 1.0.993 → 1.0.994

package/functions/api-v3/routes/tutorial.js

@@ -27,6 +27,59 @@ function getTutorialProgressRef(db, cid) {
     .doc('progress');
 }
 
+async function getDerivedCompletions(db, cid) {
+  const completed = new Set();
+  const userDocRef = db.collection('SignedInUsers').doc(String(cid));
+
+  try {
+    const userDoc = await userDocRef.get();
+    if (userDoc.exists) {
+      completed.add('account_create');
+    }
+  } catch (e) {
+    // Non-fatal; ignore and continue.
+  }
+
+  try {
+    const verificationRef = userDocRef.collection('verification').doc('data');
+    const verificationSnap = await verificationRef.get();
+    if (verificationSnap.exists) {
+      const vData = verificationSnap.data() || {};
+      if (vData.etoroCID || vData.etoroUsername || vData.accountSetupComplete) {
+        completed.add('account_link_etoro');
+      }
+    }
+  } catch (e) {
+    // Non-fatal; ignore and continue.
+  }
+
+  try {
+    const subSnap = await userDocRef
+      .collection('alert_subscriptions')
+      .limit(1)
+      .get();
+    if (!subSnap.empty) {
+      completed.add('alerts_create_threshold');
+    }
+  } catch (e) {
+    // Non-fatal; ignore and continue.
+  }
+
+  try {
+    const alertsSnap = await userDocRef
+      .collection('alerts')
+      .limit(1)
+      .get();
+    if (!alertsSnap.empty) {
+      completed.add('alerts_receive_notification');
+    }
+  } catch (e) {
+    // Non-fatal; ignore and continue.
+  }
+
+  return completed;
+}
+
 async function getTutorialConfig(req) {
   const config = (req.config && req.config.tutorial) || {};
   return {
@@ -40,15 +93,31 @@ router.get('/progress', requireVerifiedUser, async (req, res, next) => {
     const { db } = req.services;
     const cid = req.targetUserId;
 
-    const doc = await getTutorialProgressRef(db, cid).get();
-    const data = doc.exists ? doc.data() : {};
+    const ref = getTutorialProgressRef(db, cid);
+    const doc = await ref.get();
+    const data = doc.exists ? doc.data() || {} : {};
+
+    const persistedCompleted = new Set(
+      Array.isArray(data.completedTaskIds) ? data.completedTaskIds : []
+    );
+    const derivedCompleted = await getDerivedCompletions(db, cid);
+    const mergedCompleted = Array.from(
+      new Set([...persistedCompleted, ...derivedCompleted])
+    );
+
+    if (mergedCompleted.length !== persistedCompleted.size) {
+      await ref.set(
+        {
+          completedTaskIds: mergedCompleted,
+        },
+        { merge: true }
+      );
+    }
 
     res.json({
       success: true,
       data: {
-        completedTaskIds: Array.isArray(data.completedTaskIds)
-          ? data.completedTaskIds
-          : [],
+        completedTaskIds: mergedCompleted,
         explicitlyDismissedTaskIds: Array.isArray(
           data.explicitlyDismissedTaskIds
         )

package/package.json

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