Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add profile config migration #33177

Merged
merged 1 commit into from
Sep 1, 2022
Merged

Add profile config migration #33177

merged 1 commit into from
Sep 1, 2022

Conversation

Pytal
Copy link
Member

@Pytal Pytal commented Jul 8, 2022 •
edited
Loading

Preserves visibility settings when migrating accounts

@Pytal Pytal added enhancement 3. to review Waiting for reviews feature: settings feature: profile PRs or issues related to the Profile feature (e.g. Profile page, API, etc.) feature: user migration Related to User migration labels Jul 8, 2022
@Pytal Pytal added this to the Nextcloud 25 milestone Jul 8, 2022
@Pytal Pytal requested review from CarlSchwan, come-nc and a team July 8, 2022 19:21
@Pytal Pytal self-assigned this Jul 8, 2022
@Pytal Pytal requested review from icewind1991 and removed request for a team July 8, 2022 19:21
@github-actions
Copy link
Contributor

github-actions bot commented Jul 8, 2022

Possible performance regression detected

Show Output 
1 queries added

= /remote.php/dav/files/test
≠ /remote.php/dav/files/test/test.txt with 1 queries added
  + UPDATE "oc_preferences" SET "configvalue" = :dcValue1 WHERE ("userid" = :dcValue2) AND ("appid" = :dcValue3) AND ("configkey" = :dcValue4)
≠ /remote.php/dav/files/test/many_files with 1 queries removed
  - UPDATE "oc_preferences" SET "configvalue" = :dcValue1 WHERE ("userid" = :dcValue2) AND ("appid" = :dcValue3) AND ("configkey" = :dcValue4)
= /remote.php/dav/files/test/new_file.txt
≠ /remote.php/dav/files/test/new_file.txt with 1 queries added
  + UPDATE "oc_preferences" SET "configvalue" = :dcValue1 WHERE ("userid" = :dcValue2) AND ("appid" = :dcValue3) AND ("configkey" = :dcValue4)

@Pytal Pytal force-pushed the enh/migrate-profile-config branch from 50848c2 to dc95343 Compare July 8, 2022 19:30
@come-nc
Copy link
Contributor

come-nc commented Jul 11, 2022

@Pytal Tests are failing:

There were 2 errors:

1) OCA\Settings\Tests\UserMigration\AccountMigratorTest::testImportExportAccount with data set #0 ('63404cb1-a5d8-40b3-bb18-ac3a987740aa', array(array('displayname', 'Steve Smith', 'v2-local', '0', ''), array('address', '123 Water St', 'v2-local', '0', ''), array('website', 'https://example.org', 'v2-local', '0', ''), array('email', '[email protected]', 'v2-federated', '0', ''), array('avatar', '', 'v2-local', '0', ''), array('phone', '+12178515387', 'v2-private', '0', ''), array('twitter', 'steve', 'v2-federated', '0', ''), array('organisation', 'Mytery Machine', 'v2-private', '0', ''), array('role', 'Manager', 'v2-private', '0', ''), array('headline', 'I am Steve', 'v2-local', '0', ''), array('biography', 'Lorem ipsum dolor sit amet, c...or eu.', 'v2-local', '0', ''), array('profile_enabled', '1', 'v2-local', '0', ''), array(array('additional_mail', '[email protected]', 'v2-published', '0', ''), array('additional_mail', '[email protected]', 'v2-local', '0', ''))), '/home/runner/work/server/serv...ex.jpg')

OCA\Settings\UserMigration\AccountMigratorException: Failed to import profile config

/home/runner/work/server/server/apps/settings/lib/UserMigration/AccountMigrator.php:199
/home/runner/work/server/server/apps/settings/tests/UserMigration/AccountMigratorTest.php:135

2) OCA\Settings\Tests\UserMigration\AccountMigratorTest::testImportExportAccount with data set #1 ('0c7caba9-4d45-4f56-a5ae-7132ff24b2ed', array(array('displayname', 'Emma Jones', 'v2-federated', '0', ''), array('address', '920 Grass St', 'v2-local', '0', ''), array('website', '', 'v2-local', '0', ''), array('email', '', 'v2-federated', '0', ''), array('avatar', '', 'v2-federated', '0', ''), array('phone', '', 'v2-local', '0', ''), array('twitter', '', 'v2-local', '0', ''), array('organisation', '', 'v2-local', '0', ''), array('role', '', 'v2-local', '0', ''), array('headline', '', 'v2-local', '0', ''), array('biography', '', 'v2-local', '0', ''), array('profile_enabled', '1', 'v2-local', '0', ''), array()), '/home/runner/work/server/serv...nt.png')

OCA\Settings\UserMigration\AccountMigratorException: Failed to import profile config

/home/runner/work/server/server/apps/settings/lib/UserMigration/AccountMigrator.php:199
/home/runner/work/server/server/apps/settings/tests/UserMigration/AccountMigratorTest.php:135

@Pytal Pytal added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Jul 11, 2022
@Pytal Pytal force-pushed the enh/migrate-profile-config branch from dc95343 to 875b3c1 Compare July 14, 2022 19:40
@Pytal Pytal changed the base branch from master to enh/export-array-content July 14, 2022 19:40
@Pytal Pytal added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Jul 14, 2022
@Pytal

This comment was marked as outdated.

Sign in to view
@Pytal Pytal marked this pull request as draft July 14, 2022 19:41
@Pytal Pytal force-pushed the enh/migrate-profile-config branch from 875b3c1 to 4f54c97 Compare August 2, 2022 17:49
@Pytal Pytal changed the base branch from enh/export-array-content to master August 2, 2022 17:50
@Pytal Pytal force-pushed the enh/migrate-profile-config branch 3 times, most recently from dd91d84 to 4175d2a Compare August 2, 2022 18:37
@Pytal Pytal marked this pull request as ready for review August 2, 2022 18:41
@Pytal Pytal requested a review from a team August 9, 2022 02:48
This was referenced Aug 12, 2022
Merged
Merged
This was referenced Aug 24, 2022
Merged
Merged
@Pytal
Copy link
Member Author

Pytal commented Sep 1, 2022

/rebase

PVince81
PVince81 approved these changes Sep 1, 2022
View reviewed changes
Copy link
Member

@PVince81 PVince81 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@PVince81 PVince81 added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Sep 1, 2022
@Pytal
Add profile config migration
98bc98a 
Signed-off-by: Christopher Ng <[email protected]>
@Pytal
Copy link
Member Author

Pytal commented Sep 1, 2022

CI failure unrelated

@Pytal Pytal merged commit f167fe0 into master Sep 1, 2022
@Pytal Pytal deleted the enh/migrate-profile-config branch September 1, 2022 18:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PVince81 PVince81 PVince81 approved these changes

@come-nc come-nc come-nc approved these changes

@CarlSchwan CarlSchwan Awaiting requested review from CarlSchwan

@icewind1991 icewind1991 Awaiting requested review from icewind1991

Assignees

@Pytal Pytal

Labels
4. to release Ready to be released and/or waiting for tests to finish enhancement feature: profile PRs or issues related to the Profile feature (e.g. Profile page, API, etc.) feature: settings feature: user migration Related to User migration
Projects
None yet
Milestone
Nextcloud 25
Development

Successfully merging this pull request may close these issues.
3 participants
@Pytal @come-nc @PVince81