Exclude user_id and userId from custom data in all cases

Co-authored-by: jonathan <[email protected]>

Author: cursoragent

devcycle_python_sdk/models/user.py

@@ -130,10 +130,10 @@ def create_user_from_context(
         private_custom_data: Dict[str, Any] = {}
         if context and context.attributes:
             for key, value in context.attributes.items():
-                # Skip user_id and userId if they were used as the user ID
-                if key == "user_id" and user_id_source == "user_id":
+                # Skip user_id and userId - these are reserved for user ID mapping
+                if key == "user_id":
                     continue
-                if key == "userId" and user_id_source == "userId":
+                if key == "userId":
                     continue
 
                 if value is not None:

test/models/test_user.py

@@ -96,31 +96,33 @@ def test_create_user_from_context_user_id_priority(self):
         user = DevCycleUser.create_user_from_context(context)
         self.assertEqual(user.user_id, userId)
 
-    def test_create_user_from_context_userId_in_custom_data_when_not_used(self):
+    def test_create_user_from_context_user_id_fields_always_excluded(self):
         targeting_key_id = "targeting-12345"
         userId = "userId-12345"
+        user_id = "user_id-12345"
 
-        # When targeting_key is used, userId should be in custom data
+        # When targeting_key is used, both user_id and userId should be excluded from custom data
         context = EvaluationContext(
             targeting_key=targeting_key_id, 
-            attributes={"userId": userId, "other_field": "value"}
+            attributes={"user_id": user_id, "userId": userId, "other_field": "value"}
         )
         user = DevCycleUser.create_user_from_context(context)
         self.assertEqual(user.user_id, targeting_key_id)
         self.assertIsNotNone(user.customData)
-        self.assertEqual(user.customData["userId"], userId)
+        self.assertNotIn("user_id", user.customData)
+        self.assertNotIn("userId", user.customData)
         self.assertEqual(user.customData["other_field"], "value")
 
-        # When user_id is used, userId should be in custom data
-        user_id = "user_id-12345"
+        # When user_id is used, userId should still be excluded from custom data
         context = EvaluationContext(
             targeting_key=None, 
             attributes={"user_id": user_id, "userId": userId, "other_field": "value"}
         )
         user = DevCycleUser.create_user_from_context(context)
         self.assertEqual(user.user_id, user_id)
         self.assertIsNotNone(user.customData)
-        self.assertEqual(user.customData["userId"], userId)
+        self.assertNotIn("user_id", user.customData)
+        self.assertNotIn("userId", user.customData)
         self.assertEqual(user.customData["other_field"], "value")
 
     def test_create_user_from_context_userId_excluded_when_used(self):