조직도 기능 추가

backend/internal/repository/user_repository.go

@@ -42,11 +42,30 @@ func (r *userRepository) Create(ctx context.Context, user *domain.User) error {
 }
 
 func (r *userRepository) Update(ctx context.Context, user *domain.User) error {
-	// Use Upsert logic: if email exists, update all fields
-	return r.db.WithContext(ctx).Clauses(clause.OnConflict{
-		Columns:   []clause.Column{{Name: "email"}},
-		UpdateAll: true,
-	}).Save(user).Error
+	return r.db.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+		// 1. Resolve email conflicts: If another user in the local DB has this email but a different ID,
+		// we must remove the old local record because Kratos is the source of truth for ID <-> Email mapping.
+		var existing domain.User
+		if err := tx.Unscoped().Where("email = ?", user.Email).First(&existing).Error; err == nil {
+			if existing.ID != user.ID {
+				// Delete associated login IDs first to prevent FK constraint violation
+				if err := tx.Unscoped().Where("user_id = ?", existing.ID).Delete(&domain.UserLoginID{}).Error; err != nil {
+					return err
+				}
+				// Different ID holds this email locally. Hard delete the old record to avoid constraint violation.
+				if err := tx.Unscoped().Delete(&domain.User{}, "id = ?", existing.ID).Error; err != nil {
+					return err
+				}
+			}
+		}
+
+		// 2. Perform Upsert based on ID. 
+		// In GORM v2, true upsert requires Create() with OnConflict on the primary key.
+		return tx.Clauses(clause.OnConflict{
+			Columns:   []clause.Column{{Name: "id"}},
+			UpdateAll: true,
+		}).Create(user).Error
+	})
 }
 
 func (r *userRepository) FindByEmail(ctx context.Context, email string) (*domain.User, error) {
@@ -175,13 +194,14 @@ func (r *userRepository) List(ctx context.Context, offset, limit int, search str
 	db := r.db.WithContext(ctx).Model(&domain.User{})
 
 	if companyCode != "" {
-		db = db.Where("company_code = ?", companyCode)
+		// [Matrix Fix] Match users either by their primary company code OR by the slug of the department they are attached to
+		db = db.Joins("LEFT JOIN tenants ON users.tenant_id = tenants.id").
+			Where("users.company_code = ? OR tenants.slug = ?", companyCode, companyCode)
 	}
 
 	if search != "" {
 		searchTerm := "%" + search + "%"
-		// Search in basic fields and metadata (PostgreSQL JSONB)
-		db = db.Where("(email LIKE ? OR name LIKE ? OR company_code LIKE ? OR metadata::text LIKE ?)",
+		db = db.Where("(users.email LIKE ? OR users.name LIKE ? OR users.company_code LIKE ? OR users.metadata::text LIKE ?)",
 			searchTerm, searchTerm, searchTerm, searchTerm)
 	}
 
@@ -189,7 +209,7 @@ func (r *userRepository) List(ctx context.Context, offset, limit int, search str
 		return nil, 0, err
 	}
 
-	if err := db.Offset(offset).Limit(limit).Find(&users).Error; err != nil {
+	if err := db.Offset(offset).Limit(limit).Preload("Tenant").Find(&users).Error; err != nil {
 		return nil, 0, err
 	}