사용자 테넌트 소속 데이터 정리

backend/internal/service/ory_service.go

@@ -44,7 +44,7 @@ func (o *OryProvider) GetMetadata() (*domain.IDPMetadata, error) {
 	return &domain.IDPMetadata{
 		SupportedFields: []string{
 			"id", "custom_login_ids", "login_id", "email", "name", "phone_number",
-			"grade", "department", "affiliationType", "companyCode",
+			"grade", "department", "affiliationType", "tenant_id",
 		},
 	}, nil
 }

backend/internal/service/user_group_service.go

@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	"github.com/lib/pq"
 )
 
 type UserGroupService interface {
@@ -228,7 +227,8 @@ func (s *userGroupService) AddMember(ctx context.Context, groupID, userID string
 			if traits == nil {
 				traits = make(map[string]interface{})
 			}
-			traits["companyCode"] = tenant.Slug
+			delete(traits, "companyCode")
+			delete(traits, "companyCodes")
 			traits["tenant_id"] = tenant.ID
 			traits["department"] = group.Name
 
@@ -257,7 +257,6 @@ func (s *userGroupService) AddMember(ctx context.Context, groupID, userID string
 			}
 		}
 		if localUser != nil {
-			localUser.CompanyCode = tenant.Slug
 			localUser.TenantID = &tenant.ID
 			localUser.Department = group.Name
 			if err := s.userRepo.Update(ctx, localUser); err != nil {
@@ -313,11 +312,6 @@ func mapUserGroupKratosIdentityToLocalUser(identity KratosIdentity) *domain.User
 		grade = ""
 	}
 
-	companyCode := userGroupTraitString(traits, "companyCode")
-	if companyCode == "" {
-		companyCode = userGroupTraitString(traits, "company_code")
-	}
-
 	user := &domain.User{
 		ID:              identity.ID,
 		Email:           userGroupTraitString(traits, "email"),
@@ -325,7 +319,6 @@ func mapUserGroupKratosIdentityToLocalUser(identity KratosIdentity) *domain.User
 		Phone:           userGroupTraitString(traits, "phone_number"),
 		Role:            role,
 		Status:          userGroupIdentityStatus(identity.State),
-		CompanyCode:     companyCode,
 		Department:      userGroupTraitString(traits, "department"),
 		Grade:           grade,
 		Position:        userGroupTraitString(traits, "position"),
@@ -341,8 +334,6 @@ func mapUserGroupKratosIdentityToLocalUser(identity KratosIdentity) *domain.User
 	if relyingPartyID := userGroupTraitString(traits, "relying_party_id"); relyingPartyID != "" {
 		user.RelyingPartyID = &relyingPartyID
 	}
-	user.CompanyCodes = pq.StringArray(userGroupTraitStringArray(traits, "companyCodes"))
-
 	coreTraits := map[string]bool{
 		"email": true, "name": true, "phone_number": true,
 		"grade": true, "role": true, "companyCode": true, "company_code": true,

backend/internal/service/user_group_service_test.go

@@ -302,15 +302,15 @@ func TestUserGroupService_AddMemberUpsertsLocalReadModelWhenMissing(t *testing.T
 		State: "active",
 	}, nil)
 	mockKratos.On("UpdateIdentity", mock.Anything, userID, mock.MatchedBy(func(traits map[string]interface{}) bool {
-		return traits["companyCode"] == tenantSlug && traits["tenant_id"] == tenantID && traits["department"] == "Sales"
+		_, hasCompanyCode := traits["companyCode"]
+		return !hasCompanyCode && traits["tenant_id"] == tenantID && traits["department"] == "Sales"
 	}), "active").Return(&KratosIdentity{
 		ID: userID,
 		Traits: map[string]interface{}{
-			"email":       "user@test.com",
-			"name":        "User Test",
-			"companyCode": tenantSlug,
-			"tenant_id":   tenantID,
-			"department":  "Sales",
+			"email":      "user@test.com",
+			"name":       "User Test",
+			"tenant_id":  tenantID,
+			"department": "Sales",
 		},
 		State: "active",
 	}, nil)
@@ -325,7 +325,7 @@ func TestUserGroupService_AddMemberUpsertsLocalReadModelWhenMissing(t *testing.T
 	assert.NoError(t, err)
 	assert.Len(t, mockUserRepo.updatedUsers, 1)
 	assert.Equal(t, userID, mockUserRepo.updatedUsers[0].ID)
-	assert.Equal(t, tenantSlug, mockUserRepo.updatedUsers[0].CompanyCode)
+	assert.Empty(t, mockUserRepo.updatedUsers[0].CompanyCode)
 	assert.NotNil(t, mockUserRepo.updatedUsers[0].TenantID)
 	assert.Equal(t, tenantID, *mockUserRepo.updatedUsers[0].TenantID)
 	assert.Equal(t, "Sales", mockUserRepo.updatedUsers[0].Department)

backend/internal/service/user_projection_sync_service.go

@@ -7,8 +7,6 @@ import (
 	"fmt"
 	"strings"
 	"time"
-
-	"github.com/lib/pq"
 )
 
 type UserProjectionSyncService struct {
@@ -73,11 +71,6 @@ func MapKratosIdentityToLocalUser(identity KratosIdentity) domain.User {
 		grade = ""
 	}
 
-	companyCode := kratosProjectionTraitString(traits, "companyCode")
-	if companyCode == "" {
-		companyCode = kratosProjectionTraitString(traits, "company_code")
-	}
-
 	user := domain.User{
 		ID:              identity.ID,
 		Email:           kratosProjectionTraitString(traits, "email"),
@@ -85,8 +78,6 @@ func MapKratosIdentityToLocalUser(identity KratosIdentity) domain.User {
 		Phone:           kratosProjectionTraitString(traits, "phone_number"),
 		Role:            role,
 		Status:          normalizeProjectionStatus(identity.State),
-		CompanyCode:     companyCode,
-		CompanyCodes:    pq.StringArray(kratosProjectionTraitStringArray(traits, "companyCodes")),
 		Department:      kratosProjectionTraitString(traits, "department"),
 		Grade:           grade,
 		Position:        kratosProjectionTraitString(traits, "position"),

backend/internal/service/user_projection_sync_service_test.go

@@ -70,8 +70,8 @@ func TestUserProjectionSyncService_ReconcileReplacesProjectionFromKratos(t *test
 	assert.Equal(t, "one@example.com", repo.replacedUsers[0].Email)
 	assert.Equal(t, "One", repo.replacedUsers[0].Name)
 	assert.Equal(t, "+821012345678", repo.replacedUsers[0].Phone)
-	assert.Equal(t, "saman", repo.replacedUsers[0].CompanyCode)
-	assert.Equal(t, []string{"saman", "group-a"}, []string(repo.replacedUsers[0].CompanyCodes))
+	assert.Empty(t, repo.replacedUsers[0].CompanyCode)
+	assert.Empty(t, repo.replacedUsers[0].CompanyCodes)
 	require.NotNil(t, repo.replacedUsers[0].TenantID)
 	assert.Equal(t, tenantID, *repo.replacedUsers[0].TenantID)
 	assert.Equal(t, "kept", repo.replacedUsers[0].Metadata["customAttr"])