chore: consolidate local integration changes

2026-06-09 21:03:05 +09:00
parent aa2848c3b6
commit 1341f07ef9
158 changed files with 10995 additions and 1490 deletions
--- a/backend/internal/service/worksmobile_sync_service_test.go
+++ b/backend/internal/service/worksmobile_sync_service_test.go
@@ -50,7 +50,7 @@ func TestWorksmobileSyncServiceRejectsAliasEmailAlreadyUsedByOtherUser(t *testin
 		nil,
 	)

-	item, err := service.EnqueueUserSync(context.Background(), rootID, target.ID, "")
+	item, err := service.EnqueueUserSync(context.Background(), rootID, target.ID, "", "")

 	require.Nil(t, item)
 	require.Error(t, err)
@@ -90,7 +90,7 @@ func TestWorksmobileSyncServiceEnqueuesSuspendedUserStatusWithOrganizations(t *t
 		nil,
 	)

-	item, err := service.EnqueueUserSync(context.Background(), rootID, target.ID, "")
+	item, err := service.EnqueueUserSync(context.Background(), rootID, target.ID, "", "")

 	require.NoError(t, err)
 	require.NotNil(t, item)
@@ -135,7 +135,7 @@ func TestWorksmobileSyncServiceEnqueuesUserCredentialBatchID(t *testing.T) {
 		nil,
 	)

-	item, err := service.EnqueueUserSync(context.Background(), rootID, target.ID, "batch-1")
+	item, err := service.EnqueueUserSync(context.Background(), rootID, target.ID, "batch-1", "InputPass1!")

 	require.NoError(t, err)
 	require.NotNil(t, item)
@@ -144,6 +144,53 @@ func TestWorksmobileSyncServiceEnqueuesUserCredentialBatchID(t *testing.T) {
 	require.NotEmpty(t, outboxRepo.created[0].Payload["credentialBatchCreatedAt"])
 	require.Equal(t, "Target", outboxRepo.created[0].Payload["displayName"])
 	require.Equal(t, "Saman", outboxRepo.created[0].Payload["primaryLeafOrgName"])
+	require.Equal(t, "InputPass1!", outboxRepo.created[0].Payload["initialPassword"])
+	request, ok := outboxRepo.created[0].Payload["request"].(WorksmobileUserPayload)
+	require.True(t, ok)
+	require.Equal(t, "ADMIN", request.PasswordConfig.PasswordCreationType)
+	require.Equal(t, "InputPass1!", request.PasswordConfig.Password)
+}
+
+func TestWorksmobileSyncServiceDoesNotAutoGenerateInitialPassword(t *testing.T) {
+	t.Setenv("SAMAN_DOMAIN_ID", "1001")
+	rootID := "root-tenant"
+	tenantID := "saman-tenant"
+	root := domain.Tenant{
+		ID:   rootID,
+		Slug: HanmacFamilyTenantSlug,
+		Name: "Hanmac Family",
+	}
+	tenant := domain.Tenant{
+		ID:       tenantID,
+		Slug:     "saman",
+		Name:     "Saman",
+		Type:     domain.TenantTypeCompany,
+		ParentID: &rootID,
+		Domains:  []domain.TenantDomain{{Domain: "samaneng.com"}},
+	}
+	target := domain.User{
+		ID:       "target-user",
+		Email:    "target@samaneng.com",
+		Name:     "Target",
+		Status:   domain.UserStatusActive,
+		TenantID: &tenantID,
+	}
+	outboxRepo := &fakeWorksmobileOutboxRepo{}
+	service := NewWorksmobileSyncService(
+		&fakeWorksmobileTenantService{tenants: map[string]domain.Tenant{rootID: root, tenantID: tenant}, list: []domain.Tenant{root, tenant}},
+		&fakeWorksmobileUserRepo{byID: map[string]domain.User{target.ID: target}, byTenant: []domain.User{target}},
+		outboxRepo,
+		nil,
+	)
+
+	item, err := service.EnqueueUserSync(context.Background(), rootID, target.ID, "batch-1", "")
+
+	require.NoError(t, err)
+	require.NotNil(t, item)
+	require.NotContains(t, outboxRepo.created[0].Payload, "initialPassword")
+	request, ok := outboxRepo.created[0].Payload["request"].(WorksmobileUserPayload)
+	require.True(t, ok)
+	require.Empty(t, request.PasswordConfig.Password)
 }

 func TestWorksmobileSyncServiceEnqueuesUserPasswordResetCredentialBatch(t *testing.T) {
@@ -382,7 +429,7 @@ func TestWorksmobileSyncServiceDeprovisionsArchivedUser(t *testing.T) {
 		nil,
 	)

-	item, err := service.EnqueueUserSync(context.Background(), rootID, target.ID, "")
+	item, err := service.EnqueueUserSync(context.Background(), rootID, target.ID, "", "")

 	require.NoError(t, err)
 	require.NotNil(t, item)
@@ -1548,6 +1595,48 @@ func TestWorksmobileSyncServiceSkipsArchivedUsersInComparison(t *testing.T) {
 	require.Empty(t, comparison.Users)
 }

+func TestWorksmobileSyncServiceSkipsSoftDeletedUsersInComparison(t *testing.T) {
+	rootID := "root-tenant"
+	companyID := "company-tenant"
+	root := domain.Tenant{
+		ID:   rootID,
+		Slug: HanmacFamilyTenantSlug,
+		Name: "한맥가족",
+	}
+	company := domain.Tenant{
+		ID:       companyID,
+		Name:     "계열사",
+		Type:     domain.TenantTypeCompany,
+		ParentID: &rootID,
+	}
+	deleted := domain.User{
+		ID:       "deleted-user",
+		Email:    "deleted@samaneng.com",
+		Name:     "Deleted",
+		TenantID: &companyID,
+		Status:   domain.UserStatusActive,
+		DeletedAt: gorm.DeletedAt{
+			Time:  time.Now(),
+			Valid: true,
+		},
+	}
+	service := NewWorksmobileSyncService(
+		&fakeWorksmobileTenantService{tenants: map[string]domain.Tenant{rootID: root, companyID: company}, list: []domain.Tenant{root, company}},
+		&fakeWorksmobileUserRepo{byTenant: []domain.User{deleted}},
+		&fakeWorksmobileOutboxRepo{},
+		&fakeWorksmobileDirectoryClient{users: []WorksmobileRemoteUser{{
+			ID:         "works-deleted",
+			ExternalID: deleted.ID,
+			Email:      deleted.Email,
+		}}},
+	)
+
+	comparison, err := service.GetComparison(context.Background(), rootID, true)
+
+	require.NoError(t, err)
+	require.Empty(t, comparison.Users)
+}
+
 func TestWorksmobileSyncServiceBackfillDryRunSkipsArchivedUsers(t *testing.T) {
 	rootID := "root-tenant"
 	companyID := "company-tenant"
@@ -1760,14 +1849,14 @@ func TestWorksmobileSyncServiceSkipsExcludedTenantAndUserEventSync(t *testing.T)
 	require.NoError(t, service.EnqueueTenantUpsertIfInScope(context.Background(), excludedOrg))
 	require.NoError(t, service.EnqueueTenantDeleteIfInScope(context.Background(), excludedOrg))
 	require.NoError(t, service.EnqueueUserUpsertIfInScope(context.Background(), user))
-	item, err := service.EnqueueUserSync(context.Background(), rootID, user.ID, "")
+	item, err := service.EnqueueUserSync(context.Background(), rootID, user.ID, "", "")

 	require.Nil(t, item)
 	require.ErrorContains(t, err, "excluded from Worksmobile sync")
 	require.Empty(t, outboxRepo.created)
 }

-func TestCompareWorksmobileUsersMarksManagerChangeNeedsUpdate(t *testing.T) {
+func TestCompareWorksmobileUsersIgnoresManagerChange(t *testing.T) {
 	tenantID := "tenant-leaf"
 	user := domain.User{
 		ID:       "user-manager",
@@ -1803,10 +1892,10 @@ func TestCompareWorksmobileUsersMarksManagerChangeNeedsUpdate(t *testing.T) {
 	)

 	require.Len(t, items, 1)
-	require.Equal(t, "needs_update", items[0].Status)
+	require.Equal(t, "matched", items[0].Status)
 }

-func TestCompareWorksmobileUsersMarksSecondaryManagerChangeNeedsUpdate(t *testing.T) {
+func TestCompareWorksmobileUsersIgnoresSecondaryManagerChange(t *testing.T) {
 	primaryTenantID := "tenant-company"
 	secondaryTenantID := "tenant-gpdtdc-leaf"
 	user := domain.User{
@@ -1853,10 +1942,10 @@ func TestCompareWorksmobileUsersMarksSecondaryManagerChangeNeedsUpdate(t *testin
 	)

 	require.Len(t, items, 1)
-	require.Equal(t, "needs_update", items[0].Status)
+	require.Equal(t, "matched", items[0].Status)
 }

-func TestCompareWorksmobileUsersMarksMissingSecondaryOrganizationNeedsUpdate(t *testing.T) {
+func TestCompareWorksmobileUsersIgnoresMissingSecondaryOrganization(t *testing.T) {
 	t.Setenv("SAMAN_DOMAIN_ID", "1001")
 	t.Setenv("GPDTDC_DOMAIN_ID", "1003")
 	rootID := "tenant-root"
@@ -1916,7 +2005,7 @@ func TestCompareWorksmobileUsersMarksMissingSecondaryOrganizationNeedsUpdate(t *
 	)

 	require.Len(t, items, 1)
-	require.Equal(t, "needs_update", items[0].Status)
+	require.Equal(t, "matched", items[0].Status)
 }

 func TestCompareWorksmobileUsersMarksPhoneAndEmployeeNumberChangesNeedsUpdate(t *testing.T) {
@@ -1952,6 +2041,35 @@ func TestCompareWorksmobileUsersMarksPhoneAndEmployeeNumberChangesNeedsUpdate(t
 	require.Equal(t, "needs_update", items[0].Status)
 }

+func TestCompareWorksmobileUsersMarksMalformedRemoteKoreanPhoneNeedsUpdate(t *testing.T) {
+	tenantID := "tenant-saman"
+	user := domain.User{
+		ID:       "user-phone-canonical",
+		Email:    "phone-canonical@samaneng.com",
+		Name:     "Phone Canonical User",
+		Phone:    "+821062836786",
+		TenantID: &tenantID,
+		Status:   domain.UserStatusActive,
+	}
+	items := compareWorksmobileUsers(
+		[]domain.User{user},
+		[]WorksmobileRemoteUser{{
+			ID:          "works-user-phone-canonical",
+			ExternalID:  user.ID,
+			Email:       user.Email,
+			DisplayName: user.Name,
+			CellPhone:   "+82+821062836786",
+		}},
+		true,
+		map[string]domain.Tenant{
+			tenantID: {ID: tenantID, Name: "삼안", Type: domain.TenantTypeCompany},
+		},
+	)
+
+	require.Len(t, items, 1)
+	require.Equal(t, "needs_update", items[0].Status)
+}
+
 type fakeWorksmobileTenantService struct {
 	tenants map[string]domain.Tenant
 	list    []domain.Tenant