690320:2126 UUID agian by Claude Sonnet #02

2026-03-20 21:26:23 +07:00
parent 90cbbb8f11
commit a723cae244
20 changed files with 93 additions and 77 deletions
@@ -85,6 +85,7 @@ export class UserService {
      .leftJoinAndSelect('user.preference', 'preference') // Optional
      .leftJoinAndSelect('user.assignments', 'assignments')
      .leftJoinAndSelect('assignments.role', 'role')
+      .leftJoin('user.organization', 'organization') // ADR-019: expose uuid, not INT
      .select([
        'user.user_id',
        'user.uuid',
@@ -93,13 +94,15 @@ export class UserService {
        'user.firstName',
        'user.lastName',
        'user.lineId',
-        'user.primaryOrganizationId',
        'user.isActive',
        'user.createdAt',
        'user.updatedAt',
        'assignments.id',
        'role.roleId',
        'role.roleName',
+        'organization.uuid',
+        'organization.organizationCode',
+        'organization.organizationName',
      ]);

    // Apply Filters
@@ -165,6 +168,7 @@ export class UserService {
        'assignments',
        'assignments.role',
        'assignments.role.permissions',
+        'organization', // ADR-019: expose org.uuid, not INT primaryOrganizationId
      ],
    });