From a2b5e3621e78317c628289fcf0b1d2c48fb83033 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 10 Sep 2025 12:44:17 +0200
Subject: [PATCH] refactor amplitude event properties

---
 website/server/libs/analyticsService.js | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/website/server/libs/analyticsService.js b/website/server/libs/analyticsService.js
index 5e61bb0bb3..1799cdf46c 100644
--- a/website/server/libs/analyticsService.js
+++ b/website/server/libs/analyticsService.js
@@ -105,10 +105,12 @@ function _formatUserData (user, ipaddress, anonymize = false) {
     properties.contributorLevel = user.contributor.level;
   }
 
-  if (user.purchased && user.purchased.plan.planId) {
-    properties.subscription = user.purchased.plan.planId;
-  } else {
-    properties.subscription = null;
+  if (!anonymize) {
+    if (user.purchased && user.purchased.plan.planId) {
+      properties.subscription = user.purchased.plan.planId;
+    } else {
+      properties.subscription = null;
+    }
   }
 
   if (user._ABtests) {
@@ -125,6 +127,10 @@ function _formatUserData (user, ipaddress, anonymize = false) {
     properties.region = location.region1;
   }
 
+  if (anonymize) {
+    return _anonymizeProperties(properties);
+  }
+
   return properties;
 }
 
@@ -188,9 +194,6 @@ function _formatDataForAmplitude (data) {
 
   if (!consented) {
     ampData.event_properties = _anonymizeProperties(ampData.event_properties);
-    if (ampData.user_properties) {
-      ampData.user_properties = _anonymizeProperties(ampData.user_properties);
-    }
   }
 
   const itemName = _lookUpItemName(data.itemKey);