Skip to content

Commit

Permalink
Fix brave/brave-ios#7710: isSpam data model update for `WalletUserA…
Browse files Browse the repository at this point in the history 
…sset` (brave/brave-ios#8008)
  • Loading branch information
@nuo-xu
nuo-xu committed Sep 1, 2023
1 parent e900942 commit 731a35f
Show file tree
Hide file tree
Showing 3 changed files with 237 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Sources/Data/models/Model.xcdatamodeld/.xccurrentversion
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<plist version="1.0">
<dict>
<key>_XCCurrentVersionName</key>
<string>Model22.xcdatamodel</string>
<string>Model23.xcdatamodel</string>
</dict>
</plist>
233 changes: 233 additions & 0 deletions Sources/Data/models/Model.xcdatamodeld/Model23.xcdatamodel/contents
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,233 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="21754" systemVersion="22F82" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
<entity name="BlockedResource" representedClassName="Data.BlockedResource" syncable="YES">
<attribute name="domain" optional="YES" attributeType="String"/>
<attribute name="faviconUrl" optional="YES" attributeType="String"/>
<attribute name="host" optional="YES" attributeType="String"/>
<attribute name="timestamp" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<fetchIndex name="byHost">
<fetchIndexElement property="host" type="Binary" order="ascending"/>
</fetchIndex>
<fetchIndex name="byDomain">
<fetchIndexElement property="domain" type="Binary" order="ascending"/>
</fetchIndex>
</entity>
<entity name="Bookmark" representedClassName="Data.Favorite" syncable="YES">
<attribute name="created" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="customTitle" optional="YES" attributeType="String"/>
<attribute name="isFavorite" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="isFolder" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="lastVisited" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="order" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="syncDisplayUUID" optional="YES" attributeType="String"/>
<attribute name="syncOrder" optional="YES" attributeType="String"/>
<attribute name="syncParentDisplayUUID" optional="YES" attributeType="String"/>
<attribute name="tags" optional="YES" attributeType="Transformable"/>
<attribute name="title" optional="YES" attributeType="String"/>
<attribute name="url" optional="YES" attributeType="String"/>
<attribute name="visits" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<relationship name="domain" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Domain" inverseName="bookmarks" inverseEntity="Domain"/>
<fetchIndex name="byLastVisitedIndex">
<fetchIndexElement property="lastVisited" type="Binary" order="ascending"/>
</fetchIndex>
<fetchIndex name="byUrlIndex">
<fetchIndexElement property="url" type="Binary" order="ascending"/>
</fetchIndex>
<fetchIndex name="byVisitsIndex">
<fetchIndexElement property="visits" type="Binary" order="ascending"/>
</fetchIndex>
</entity>
<entity name="BraveVPNAlert" representedClassName="Data.BraveVPNAlert" syncable="YES">
<attribute name="action" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="category" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="host" optional="YES" attributeType="String"/>
<attribute name="message" optional="YES" attributeType="String"/>
<attribute name="timestamp" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="title" optional="YES" attributeType="String"/>
<attribute name="uuid" optional="YES" attributeType="String"/>
<fetchIndex name="byUUID">
<fetchIndexElement property="uuid" type="Binary" order="ascending"/>
</fetchIndex>
<uniquenessConstraints>
<uniquenessConstraint>
<constraint value="uuid"/>
</uniquenessConstraint>
<uniquenessConstraint>
<constraint value="timestamp"/>
<constraint value="host"/>
</uniquenessConstraint>
</uniquenessConstraints>
</entity>
<entity name="CustomFilterListSetting" representedClassName="Data.CustomFilterListSetting" syncable="YES">
<attribute name="externalURL" optional="YES" attributeType="URI"/>
<attribute name="isEnabled" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="uuid" optional="YES" attributeType="String"/>
</entity>
<entity name="DataSaved" representedClassName="Data.DataSaved" syncable="YES">
<attribute name="amount" optional="YES" attributeType="String"/>
<attribute name="savedUrl" optional="YES" attributeType="String"/>
<uniquenessConstraints>
<uniquenessConstraint>
<constraint value="savedUrl"/>
</uniquenessConstraint>
</uniquenessConstraints>
</entity>
<entity name="Domain" representedClassName="Data.Domain" syncable="YES">
<attribute name="blockedFromTopSites" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="shield_adblockAndTp" optional="YES" attributeType="Boolean" usesScalarValueType="NO"/>
<attribute name="shield_allOff" optional="YES" attributeType="Boolean" usesScalarValueType="NO"/>
<attribute name="shield_fpProtection" optional="YES" attributeType="Boolean" usesScalarValueType="NO"/>
<attribute name="shield_httpse" optional="YES" attributeType="Boolean" usesScalarValueType="NO"/>
<attribute name="shield_noScript" optional="YES" attributeType="Boolean" usesScalarValueType="NO"/>
<attribute name="shield_safeBrowsing" optional="YES" attributeType="Boolean" usesScalarValueType="NO"/>
<attribute name="topsite" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="url" optional="YES" attributeType="String"/>
<attribute name="visits" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="wallet_permittedAccounts" optional="YES" attributeType="String"/>
<attribute name="wallet_solanaPermittedAcccounts" optional="YES" attributeType="String"/>
<attribute name="zoom_level" optional="YES" attributeType="Double" usesScalarValueType="NO"/>
<relationship name="bookmarks" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Bookmark" inverseName="domain" inverseEntity="Bookmark"/>
<fetchIndex name="byBlockedFromTopSitesIndex">
<fetchIndexElement property="blockedFromTopSites" type="Binary" order="ascending"/>
</fetchIndex>
<fetchIndex name="byUrlIndex">
<fetchIndexElement property="url" type="Binary" order="ascending"/>
</fetchIndex>
<fetchIndex name="byVisitsIndex">
<fetchIndexElement property="visits" type="Binary" order="ascending"/>
</fetchIndex>
</entity>
<entity name="FeedSourceOverride" representedClassName="Data.FeedSourceOverride" syncable="YES">
<attribute name="enabled" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="publisherID" attributeType="String"/>
<fetchIndex name="byPublisherID">
<fetchIndexElement property="publisherID" type="Binary" order="ascending"/>
</fetchIndex>
<uniquenessConstraints>
<uniquenessConstraint>
<constraint value="publisherID"/>
</uniquenessConstraint>
</uniquenessConstraints>
</entity>
<entity name="FilterListSetting" representedClassName="Data.FilterListSetting" syncable="YES">
<attribute name="componentId" optional="YES" attributeType="String"/>
<attribute name="folderPath" optional="YES" attributeType="String"/>
<attribute name="isAlwaysAggressive" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="isEnabled" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="order" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="uuid" attributeType="String"/>
</entity>
<entity name="PlaylistFolder" representedClassName="Data.PlaylistFolder" syncable="YES">
<attribute name="creatorLink" optional="YES" attributeType="String"/>
<attribute name="creatorName" optional="YES" attributeType="String"/>
<attribute name="dateAdded" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="order" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="sharedFolderETag" optional="YES" attributeType="String"/>
<attribute name="sharedFolderId" optional="YES" attributeType="String"/>
<attribute name="sharedFolderUrl" optional="YES" attributeType="String"/>
<attribute name="title" attributeType="String"/>
<attribute name="uuid" attributeType="String"/>
<relationship name="playlistItems" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="PlaylistItem" inverseName="playlistFolder" inverseEntity="PlaylistItem"/>
</entity>
<entity name="PlaylistItem" representedClassName="Data.PlaylistItem" syncable="YES">
<attribute name="cachedData" optional="YES" attributeType="Binary"/>
<attribute name="dateAdded" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="duration" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
<attribute name="lastPlayedOffset" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
<attribute name="mediaSrc" attributeType="String"/>
<attribute name="mimeType" attributeType="String"/>
<attribute name="name" attributeType="String"/>
<attribute name="order" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="pageSrc" attributeType="String"/>
<attribute name="pageTitle" optional="YES" attributeType="String"/>
<attribute name="uuid" optional="YES" attributeType="String"/>
<relationship name="playlistFolder" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="PlaylistFolder" inverseName="playlistItems" inverseEntity="PlaylistFolder"/>
</entity>
<entity name="RecentlyClosed" representedClassName="Data.RecentlyClosed" syncable="YES">
<attribute name="dateAdded" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="historyIndex" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="historyList" optional="YES" attributeType="Transformable"/>
<attribute name="interactionState" optional="YES" attributeType="Binary"/>
<attribute name="title" optional="YES" attributeType="String"/>
<attribute name="url" attributeType="String"/>
</entity>
<entity name="RecentSearch" representedClassName="Data.RecentSearch" syncable="YES">
<attribute name="dateAdded" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="searchType" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="text" optional="YES" attributeType="String"/>
<attribute name="websiteUrl" optional="YES" attributeType="String"/>
</entity>
<entity name="RSSFeedSource" representedClassName="Data.RSSFeedSource" syncable="YES">
<attribute name="feedUrl" attributeType="String"/>
<attribute name="title" optional="YES" attributeType="String"/>
<uniquenessConstraints>
<uniquenessConstraint>
<constraint value="feedUrl"/>
</uniquenessConstraint>
</uniquenessConstraints>
</entity>
<entity name="SessionTab" representedClassName="Data.SessionTab" syncable="YES">
<attribute name="index" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="interactionState" attributeType="Binary"/>
<attribute name="isPrivate" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="isSelected" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="lastUpdated" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="screenshotData" attributeType="Binary"/>
<attribute name="tabId" attributeType="UUID" usesScalarValueType="NO"/>
<attribute name="title" attributeType="String"/>
<attribute name="url" attributeType="URI"/>
<relationship name="sessionTabGroup" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SessionTabGroup" inverseName="sessionTabs" inverseEntity="SessionTabGroup"/>
<relationship name="sessionWindow" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SessionWindow" inverseName="sessionTabs" inverseEntity="SessionWindow"/>
</entity>
<entity name="SessionTabGroup" representedClassName="Data.SessionTabGroup" syncable="YES">
<attribute name="groupId" attributeType="UUID" usesScalarValueType="NO"/>
<attribute name="index" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="title" attributeType="String"/>
<relationship name="sessionTabs" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="SessionTab" inverseName="sessionTabGroup" inverseEntity="SessionTab"/>
<relationship name="sessionWindow" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="SessionWindow" inverseName="sessionTabGroups" inverseEntity="SessionWindow"/>
</entity>
<entity name="SessionWindow" representedClassName="Data.SessionWindow" syncable="YES">
<attribute name="index" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="isPrivate" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="isSelected" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="windowId" attributeType="UUID" usesScalarValueType="NO"/>
<relationship name="sessionTabGroups" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="SessionTabGroup" inverseName="sessionWindow" inverseEntity="SessionTabGroup"/>
<relationship name="sessionTabs" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="SessionTab" inverseName="sessionWindow" inverseEntity="SessionTab"/>
</entity>
<entity name="TabMO" representedClassName="Data.TabMO" syncable="YES">
<attribute name="color" optional="YES" attributeType="String"/>
<attribute name="isPrivate" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="isSelected" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="lastUpdate" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
<attribute name="order" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="screenshot" optional="YES" attributeType="Binary" allowsExternalBinaryDataStorage="YES"/>
<attribute name="screenshotUUID" optional="YES" attributeType="String"/>
<attribute name="syncUUID" optional="YES" attributeType="String"/>
<attribute name="title" optional="YES" attributeType="String"/>
<attribute name="url" optional="YES" attributeType="String"/>
<attribute name="urlHistoryCurrentIndex" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="urlHistorySnapshot" optional="YES" attributeType="Transformable"/>
</entity>
<entity name="WalletUserAsset" representedClassName="Data.WalletUserAsset" syncable="YES">
<attribute name="chainId" optional="YES" attributeType="String"/>
<attribute name="coin" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="coingeckoId" optional="YES" attributeType="String"/>
<attribute name="contractAddress" optional="YES" attributeType="String"/>
<attribute name="decimals" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES"/>
<attribute name="isERC20" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="isERC721" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="isERC1155" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="isNFT" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<attribute name="isSpam" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
<attribute name="logo" optional="YES" attributeType="String"/>
<attribute name="name" optional="YES" attributeType="String"/>
<attribute name="symbol" optional="YES" attributeType="String"/>
<attribute name="tokenId" optional="YES" attributeType="String"/>
<attribute name="visible" optional="YES" attributeType="Boolean" usesScalarValueType="YES"/>
<relationship name="walletUserAssetGroup" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="WalletUserAssetGroup" inverseName="walletUserAssets" inverseEntity="WalletUserAssetGroup"/>
</entity>
<entity name="WalletUserAssetGroup" representedClassName="Data.WalletUserAssetGroup" syncable="YES">
<attribute name="groupId" optional="YES" attributeType="String"/>
<relationship name="walletUserAssets" optional="YES" toMany="YES" deletionRule="Cascade" destinationEntity="WalletUserAsset" inverseName="walletUserAssetGroup" inverseEntity="WalletUserAsset"/>
</entity>
</model>
4 changes: 3 additions & 1 deletion Sources/Data/models/WalletUserAsset.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public final class WalletUserAsset: NSManagedObject, CRUD {
@NSManaged public var isERC721: Bool
@NSManaged public var isERC1155: Bool
@NSManaged public var isNFT: Bool
@NSManaged public var isSpam: Bool
@NSManaged public var symbol: String
@NSManaged public var decimals: Int32
@NSManaged public var visible: Bool
Expand All @@ -35,7 +36,7 @@ public final class WalletUserAsset: NSManagedObject, CRUD {
isErc721: self.isERC721,
isErc1155: self.isERC1155,
isNft: self.isNFT,
isSpam: false, // TODO: Handle `isSpam` in `WalletUserAsset`
isSpam: self.isSpam,
symbol: self.symbol,
decimals: self.decimals,
visible: self.visible,
Expand Down Expand Up @@ -71,6 +72,7 @@ public final class WalletUserAsset: NSManagedObject, CRUD {
self.isERC721 = asset.isErc721
self.isERC1155 = asset.isErc1155
self.isNFT = asset.isNft
self.isSpam = asset.isSpam
self.symbol = asset.symbol
self.decimals = asset.decimals
self.visible = asset.visible
Expand Down

0 comments on commit 731a35f

Please sign in to comment.