improve report

enrollments-events/app/enrollment.py

@@ -85,22 +85,19 @@ def enroll(
             transact.put(
                 item={
                     'id': entity.id,
-                    'sk': f'LINKED_ENTITIES#{entity.kind.value}#CHILD',
+                    'sk': f'LINKED_ENTITIES#CHILD#ENROLLMENT#{enrollment.id}',
                     'created_at': now_,
-                    'enrollment_id': enrollment.id,
                 },
                 cond_expr='attribute_not_exists(sk)',
                 table_name=entity.table_name,
             )
 
-            keyprefix = entity.kind.value.lower()
             # Child knows the parent
             transact.put(
                 item={
                     'id': enrollment.id,
-                    'sk': f'LINKED_ENTITIES#{entity.kind.value}#PARENT',
+                    'sk': f'LINKED_ENTITIES#PARENT#{entity.kind.value}#{entity.id}',
                     'created_at': now_,
-                    f'{keyprefix}_id': entity.id,
                 },
                 cond_expr='attribute_not_exists(sk)',
             )