Stub objects for Bookmarks sync #713
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ayoy
approved these changes
Mar 15, 2024
There was a problem hiding this comment.
All works great! I've left a few minor comments, mostly to make tests more clear. Thanks @bwaresiak!
| @@ -171,11 +188,10 @@ final class BookmarksResponseHandler { | |||
| var queue = queues.removeFirst() | |||
| let parentUUID = parentUUIDs.removeFirst() | |||
| let parent = BookmarkEntity.fetchFolder(withUUID: parentUUID, in: context) | |||
| assert(parent != nil) | |||
|
|
||
| // For non-first sync we rely fully on the server response | ||
| if !shouldDeduplicateEntities { | ||
| parent?.childrenArray.forEach { parent?.removeFromChildren($0) } | ||
| (parent?.children?.array as? [BookmarkEntity] ?? []).forEach { parent?.removeFromChildren($0) } |
There was a problem hiding this comment.
Just curious, were bookmarks pending deletion messing up the order after being undeleted? 😱
There was a problem hiding this comment.
If bookmark gets undeleted it should still get processed here correctly. Problem was that the stubs were not cleaned up properly as they were not removed from parent here.
Comment on lines
95
to
99
| let validChildrenIds = bookmark.childrenArray.compactMap(\.uuid) | ||
|
|
||
| // Take stubs into account - we don't want to remove them. | ||
| let stubIds = (bookmark.children?.array as? [BookmarkEntity] ?? []).filter({ $0.isStub }).compactMap(\.uuid) | ||
| return validChildrenIds + stubIds |
There was a problem hiding this comment.
Why are stubs added at the end? I couldn't figure this out from the tech design.
There was a problem hiding this comment.
Yup, my bad, fixed and added a test. 👍
Comment on lines
+853
to
+855
| XCTAssertEqual(sent.count, 2) | ||
|
|
||
| let sentRootData = sent.first(where: { $0.payload["id"] as? String == rootFolder.uuid }) |
There was a problem hiding this comment.
We could use SyncableBookmarkAdapter to make this code a bit simpler:
XCTAssertEqual(sent.map({ SyncableBookmarkAdapter(syncable: $0).uuid }), [rootFolder.uuid, "3"])
let sentRootData = sent.first(where: { SyncableBookmarkAdapter(syncable: $0).uuid == rootFolder.uuid })But then again, SyncableBookmarkAdapter doesn't support folder changes at the moment, so the rest needs to stay as is.
Tests/SyncDataProvidersTests/Bookmarks/BookmarksProviderTests.swift
Outdated
Show resolved
Hide resolved
Tests/SyncDataProvidersTests/Bookmarks/BookmarksProviderTests.swift
Outdated
Show resolved
Hide resolved
Tests/SyncDataProvidersTests/Bookmarks/BookmarksProviderTests.swift
Outdated
Show resolved
Hide resolved
ayoy
approved these changes
Mar 15, 2024
afterxleep
pushed a commit
that referenced
this pull request
Mar 15, 2024
Required: Task/Issue URL: https://app.asana.com/0/0/1206831058661531/f iOS PR: duckduckgo/iOS#2593 macOS PR: duckduckgo/macos-browser#2418 What kind of version bump will this require?: Major Description: Provide implementation for stub objects.
afterxleep
added a commit
that referenced
this pull request
Mar 15, 2024
* Reset Cache on Subscription Purchase & Restore * Skip sending sign out notification if account is cleared as part of failed purchase flow * URL comparison * Fix URL * Update subscription product ids * Add TF product ids * Stub objects for Bookmarks sync (#713)
samsymons
added a commit
that referenced
this pull request
Mar 18, 2024
samsymons
added a commit
that referenced
this pull request
Mar 18, 2024
* main: Update wireguard-apple to 1.1.3. (#729) Improves VPN pixel info and adds tests (#732) Reset Cache on Subscription Purchase & Restore (#719) Revert "Remove Autoconsent subfeature (#697)" (#730) Stub objects for Bookmarks sync (#713) make history entry weak to avoid retain cycle (#727) NetP x Subscription Clean-up (#709) Moves AppLaunching out of BSK as it's macOS only (#721)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please review the release process for BrowserServicesKit here.
Required:
Task/Issue URL: https://app.asana.com/0/0/1206831058661531/f
iOS PR: duckduckgo/iOS#2593
macOS PR: duckduckgo/macos-browser#2418
What kind of version bump will this require?: Major
Description:
Provide implementation for stub objects.
Steps to test this PR:
On platforms, navigate to debug menu and populate stubs in the DB. UX should not be affected by stubs.
Validate tests if they cover all scenarios.
Smoke tests sync.
OS Testing:
Internal references:
Software Engineering Expectations
Technical Design Template