@plusscommunities/pluss-core-aws 2.0.26-beta.0 → 2.0.26

package/db/analytics/logAnalyticsActivity.js

@@ -3,7 +3,8 @@ const moment = require("moment");
 const checkActivityExists = require("./checkActivityExists");
 const updateRef = require("../common/updateRef");
 const getRole = require("../users/getRole");
-const { getMultiRowId, getRowId } = require("../../helper");
+const getUser = require("../users/getUser");
+const { getMultiRowId, getRowId, log } = require("../../helper");
 
 /**
  * Creates an analytics entry
@@ -42,33 +43,56 @@ module.exports = async (
 		}
 	}
 
-	// Enrich analytics events with the user's site-specific role type and category.
-	// Always resolved here via getRole rather than expecting callers to provide them because:
-	// 1. Most callers can't — stream handlers only have minimal embedded objects with no
-	//    type/category fields.
-	// 2. user.type only carries the primary role, not the site-specific role.
-	// 3. user.category doesn't exist on the user object — category (staff/primary/linked)
-	//    lives on the role record.
-	// Centralising here avoids burdening call sites with role resolution and guarantees
-	// accuracy (always reads current role, not potentially stale caller-provided values).
-	// getRole is a DynamoDB point-read (~5ms) and this runs async, so no user-facing latency impact.
+	// Never fail on a missing user — persist with null enrichment.
+	const actor = user || {};
+
+	// Type/category are per-site role facts, so resolve them here — callers only
+	// carry minimal user objects.
 	let userType = null;
 	let userCategory = null;
+	let enrichmentFailed = false;
 
 	try {
-		const role = await getRole(site, user.id);
+		const role = await getRole(site, actor.id);
 		if (role) {
 			userType = role.type || null;
 			userCategory = role.category || null;
 		}
 	} catch (e) {
-		// getRole failed — fall through to master fallback below
+		// Log so an outage is distinguishable from a missing role, then fall
+		// through to the master fallback.
+		enrichmentFailed = true;
+		log("logActivity", "RoleLookupFailed", {
+			site,
+			userId: actor.id || null,
+			err: e,
+		});
 	}
 
-	// Best-effort fallback: user.type is set from primary role, may not always be present
-	if (!userType && user.type === "master") {
+	// Master fallback: previews omit type (undefined ≠ the system user's explicit
+	// null), so resolve it from the user record.
+	let primaryType = actor.type;
+	if (!userType && primaryType === undefined && actor.id) {
+		try {
+			const fullUser = await getUser(actor.id);
+			primaryType = fullUser ? fullUser.type : null;
+		} catch (e) {
+			// Best-effort — log so a lookup failure is distinguishable from a
+			// genuinely uncategorised user, but never block the activity write.
+			enrichmentFailed = true;
+			log("logActivity", "EnrichmentLookupFailed", {
+				site,
+				userId: actor.id,
+				err: e,
+			});
+		}
+	}
+	if (!userType && primaryType === "master") {
 		userType = "master";
-		userCategory = "master";
+	}
+	// Masters count as staff for category filtering.
+	if (userType === "master" && !userCategory) {
+		userCategory = "staff";
 	}
 
 	// Log the activity
@@ -78,8 +102,8 @@ module.exports = async (
 		Timestamp: timestamp || moment.utc().valueOf(),
 		EntityType: entityType,
 		SubjectId: entityId,
-		UserId: user.id,
-		User: user,
+		UserId: actor.id || null,
+		User: user || null,
 		Site: site,
 		EntityId: getRowId(entityId, entityType),
 		ActivityId: getMultiRowId([entityId, entityType, actionType]),
@@ -88,6 +112,14 @@ module.exports = async (
 		userCategory,
 	};
 
+	// An unresolved lookup failure means enrichment didn't happen — omit the
+	// keys so aggregation applies pre-enrichment totals semantics rather than
+	// recording a falsely "enriched but uncategorised" event.
+	if (enrichmentFailed && userType === null && userCategory === null) {
+		delete activity.userType;
+		delete activity.userCategory;
+	}
+
 	await updateRef(`analytics`, activity);
 	return true;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@plusscommunities/pluss-core-aws",
-	"version": "2.0.26-beta.0",
+	"version": "2.0.26",
 	"description": "Core extension package for Pluss Communities platform",
 	"scripts": {
 		"betapatch": "npm version prepatch --preid=beta",