update related ids

http-api/app/rules/enrollment.py

@@ -18,7 +18,7 @@ DeduplicationWindow = TypedDict('DeduplicationWindow', {'offset_days': int})
 
 class RelatedId(str):
     def __new__(cls, id: str, kind: str) -> Self:
-        return super().__new__(cls, id)
+        return super().__new__(cls, '#'.join([kind.upper(), id]))
 
     def __init__(self, id: str, kind: str) -> None:
         # __init__ is used to store the parameters for later reference.
@@ -86,7 +86,11 @@ def enroll(
                 'sk': '0',
                 'create_date': now_,
                 'metadata__tenant_id': tenant_id,
-                'metadata__related_ids': {tenant_id, user.id} | related_ids,
+                'metadata__related_ids': {
+                    RelatedId(tenant_id, 'org'),
+                    RelatedId(user.id, 'user'),  # type: ignore
+                }
+                | related_ids,
                 **enrollment.model_dump(),
             },
         )
@@ -143,7 +147,7 @@ def enroll(
                     'id': enrollment.id,
                     'sk': f'related_ids#{kind}',
                     'create_date': now_,
-                    f'{kind}_id': related_id,
+                    f'{kind}_id': related_id.id,
                 }
             )