Skip to content

chore: move db models to wire data package (second attempt) - WPB-19688 #3819

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

Merged
merged 17 commits into from
Nov 5, 2025
Merged

chore: move db models to wire data package (second attempt) - WPB-19688 #3819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
a81e822
Move zmessaging data model to WireData
samwyndham Oct 31, 2025
3a75d16
Fix 2.131.0 class names
samwyndham Oct 31, 2025
67e67d8
Update class modules
samwyndham Oct 31, 2025
ff3d2a5
Update Databases Changelog
samwyndham Oct 31, 2025
6d264a5
Move ZMEventModel to WireData
samwyndham Oct 31, 2025
b039c8f
Update class module for ZMEventModel
samwyndham Oct 31, 2025
fb5bb5d
Update Database Changelog
samwyndham Oct 31, 2025
5faf8d4
Update bundle location and add SchemaTests
samwyndham Oct 31, 2025
25de301
Fix WireRequestStrategyTests
samwyndham Oct 31, 2025
1d0b5b7
Fix WireNotificationEngineTests
samwyndham Oct 31, 2025
b650248
Fix WireShareEngineTests
samwyndham Oct 31, 2025
485dab2
Commit Xcode project auto change
samwyndham Oct 31, 2025
c715985
Fix WireDomainTests
samwyndham Oct 31, 2025
a8acd57
Attempt to fix testWhenDecryptionOfMLSMessagesIsSuccessfulThenEventsA…
samwyndham Oct 31, 2025
3728fff
Merge branch 'develop' into chore/move-core-data
samwyndham Nov 4, 2025
da14281
Move 2.132.0 data model to WireData
samwyndham Nov 4, 2025
669dfc7
Update 2.132.0 representedClassName
samwyndham Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ...ta-model/Resources/Databases Changelog.md → ...es/WireData/Schema/Databases Changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

As it is hard to spot changes from version to version of database models (.xcdatamodeld), here's a changelog highlighting changes per version.

## Special changes

### Moving of `zmessaging` & `ZMEventModel` to `WireData` SPM target

* Move `zmessaging` & `ZMEventModel` to `WireData` SPM target while keeping managed object subclasses in `WireDataModel` project target. This is an intermediary state. Eventually all managed object subclasses should be moved to `WireData` target. To achieve this, in **ALL VERSIONS** of `zmessaging` the _Module_ field in the Data Model Inspector was set to `WireDataModel` for non obj-c based entities. The same changes were applied to `ZMEventModel`. These changes did not require a migration.

## zmessaging

### 2.132.0
Expand Down
0 ...EventModel.xcdatamodeld/.xccurrentversion → ...EventModel.xcdatamodeld/.xccurrentversion
View file
Open in desktop
File renamed without changes.
0 ...amodeld/ZMEventModel.xcdatamodel/contents → ...amodeld/ZMEventModel.xcdatamodel/contents
View file
Open in desktop
File renamed without changes.
0 ...deld/ZMEventModel2.0.xcdatamodel/contents → ...deld/ZMEventModel2.0.xcdatamodel/contents
View file
Open in desktop
File renamed without changes.
0 ...deld/ZMEventModel3.0.xcdatamodel/contents → ...deld/ZMEventModel3.0.xcdatamodel/contents
View file
Open in desktop
File renamed without changes.
0 ...deld/ZMEventModel4.0.xcdatamodel/contents → ...deld/ZMEventModel4.0.xcdatamodel/contents
View file
Open in desktop
File renamed without changes.
0 ...deld/ZMEventModel5.0.xcdatamodel/contents → ...deld/ZMEventModel5.0.xcdatamodel/contents
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...deld/ZMEventModel6.0.xcdatamodel/contents → ...deld/ZMEventModel6.0.xcdatamodel/contents
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<attribute name="source" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
<attribute name="uuidString" optional="YES" attributeType="String" syncable="YES"/>
</entity>
<entity name="StoredUpdateEventEnvelope" representedClassName=".StoredUpdateEventEnvelope" syncable="YES">
<entity name="StoredUpdateEventEnvelope" representedClassName="WireDataModel.StoredUpdateEventEnvelope" syncable="YES">
<attribute name="data" attributeType="Binary" syncable="YES"/>
<attribute name="sortIndex" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" indexed="YES" syncable="YES"/>
</entity>
Expand Down
0 ...zmessaging.xcdatamodeld/.xccurrentversion → ...zmessaging.xcdatamodeld/.xccurrentversion
View file
Open in desktop
File renamed without changes.
28 changes: 14 additions & 14 deletions ...ld/zmessaging2.100.0.xcdatamodel/contents → ...ld/zmessaging2.100.0.xcdatamodel/contents
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="19574" systemVersion="21C52" minimumToolsVersion="Xcode 4.3" sourceLanguage="Objective-C" userDefinedModelVersionIdentifier="2.100.0">
<entity name="Action" representedClassName=".Action" syncable="YES">
<entity name="Action" representedClassName="WireDataModel.Action" syncable="YES">
<attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
<relationship name="role" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Role" inverseName="actions" inverseEntity="Role" syncable="YES"/>
</entity>
<entity name="AddressBookEntry" representedClassName=".AddressBookEntry" syncable="YES">
<entity name="AddressBookEntry" representedClassName="WireDataModel.AddressBookEntry" syncable="YES">
<attribute name="cachedName" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="localIdentifier" optional="YES" attributeType="String" indexed="YES" syncable="YES"/>
<relationship name="user" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="User" inverseName="addressBookEntry" inverseEntity="User" syncable="YES"/>
</entity>
<entity name="AssetClientMessage" representedClassName=".ZMAssetClientMessage" parentEntity="Message" syncable="YES">
<entity name="AssetClientMessage" representedClassName="WireDataModel.ZMAssetClientMessage" parentEntity="Message" syncable="YES">
<attribute name="assetId" optional="YES" transient="YES" syncable="YES"/>
<attribute name="assetId_data" optional="YES" attributeType="Binary" syncable="YES"/>
<attribute name="associatedTaskIdentifier" optional="YES" transient="YES" syncable="YES"/>
Expand All @@ -23,13 +23,13 @@
<attribute name="version" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
<relationship name="dataSet" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="GenericMessageData" inverseName="asset" inverseEntity="GenericMessageData" syncable="YES"/>
</entity>
<entity name="ButtonState" representedClassName=".ButtonState" syncable="YES">
<entity name="ButtonState" representedClassName="WireDataModel.ButtonState" syncable="YES">
<attribute name="isExpired" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO" syncable="YES"/>
<attribute name="remoteIdentifier" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="stateValue" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
<relationship name="message" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Message" inverseName="buttonStates" inverseEntity="Message" syncable="YES"/>
</entity>
<entity name="ClientMessage" representedClassName=".ZMClientMessage" parentEntity="Message" syncable="YES">
<entity name="ClientMessage" representedClassName="WireDataModel.ZMClientMessage" parentEntity="Message" syncable="YES">
<attribute name="linkPreviewState" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
<attribute name="updatedTimestamp" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
<relationship name="dataSet" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="GenericMessageData" inverseName="message" inverseEntity="GenericMessageData" syncable="YES"/>
Expand Down Expand Up @@ -101,7 +101,7 @@
</compoundIndex>
</compoundIndexes>
</entity>
<entity name="Feature" representedClassName=".Feature" syncable="YES">
<entity name="Feature" representedClassName="WireDataModel.Feature" syncable="YES">
<attribute name="configData" optional="YES" attributeType="Binary" syncable="YES"/>
<attribute name="hasInitialDefault" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO" syncable="YES"/>
<attribute name="modifiedKeys" optional="YES" attributeType="Transformable" valueTransformerName="ExtendedSecureUnarchiveFromData" syncable="YES"/>
Expand All @@ -110,7 +110,7 @@
<attribute name="needsToNotifyUser" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO" syncable="YES"/>
<attribute name="statusValue" attributeType="String" syncable="YES"/>
</entity>
<entity name="FeatureFlag" representedClassName=".FeatureFlag" syncable="YES">
<entity name="FeatureFlag" representedClassName="WireDataModel.FeatureFlag" syncable="YES">
<attribute name="identifier" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="isEnabled" optional="YES" attributeType="Boolean" usesScalarValueType="NO" syncable="YES"/>
<attribute name="modifiedKeys" optional="YES" attributeType="Transformable" valueTransformerName="ExtendedSecureUnarchiveFromData" syncable="YES"/>
Expand All @@ -134,7 +134,7 @@
<attribute name="originalSize_data" optional="YES" attributeType="Binary" syncable="YES"/>
</entity>
<entity name="KnockMessage" representedClassName="ZMKnockMessage" parentEntity="Message" syncable="YES"/>
<entity name="Label" representedClassName=".Label" syncable="YES">
<entity name="Label" representedClassName="WireDataModel.Label" syncable="YES">
<attribute name="markedForDeletion" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO" syncable="YES"/>
<attribute name="modifiedKeys" optional="YES" attributeType="Transformable" valueTransformerName="ExtendedSecureUnarchiveFromData" syncable="YES"/>
<attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
Expand All @@ -143,7 +143,7 @@
<attribute name="type" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
<relationship name="conversations" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Conversation" inverseName="labels" inverseEntity="Conversation" syncable="YES"/>
</entity>
<entity name="Member" representedClassName=".Member" syncable="YES">
<entity name="Member" representedClassName="WireDataModel.Member" syncable="YES">
<attribute name="createdAt" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
<attribute name="needsToBeUpdatedFromBackend" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO" syncable="YES"/>
<attribute name="permissionsRawValue" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="NO" syncable="YES"/>
Expand Down Expand Up @@ -201,19 +201,19 @@
<relationship name="message" maxCount="1" deletionRule="Nullify" destinationEntity="Message" inverseName="confirmations" inverseEntity="Message" syncable="YES"/>
<relationship name="user" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="User" syncable="YES"/>
</entity>
<entity name="ParticipantRole" representedClassName=".ParticipantRole" syncable="YES">
<entity name="ParticipantRole" representedClassName="WireDataModel.ParticipantRole" syncable="YES">
<attribute name="modifiedKeys" optional="YES" attributeType="Transformable" valueTransformerName="ExtendedSecureUnarchiveFromData" syncable="YES"/>
<relationship name="conversation" maxCount="1" deletionRule="Nullify" destinationEntity="Conversation" inverseName="participantRoles" inverseEntity="Conversation" syncable="YES"/>
<relationship name="role" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Role" inverseName="participantRoles" inverseEntity="Role" syncable="YES"/>
<relationship name="user" maxCount="1" deletionRule="Nullify" destinationEntity="User" inverseName="participantRoles" inverseEntity="User" syncable="YES"/>
</entity>
<entity name="Reaction" representedClassName=".Reaction" syncable="YES">
<entity name="Reaction" representedClassName="WireDataModel.Reaction" syncable="YES">
<attribute name="modifiedKeys" optional="YES" attributeType="Transformable" valueTransformerName="ExtendedSecureUnarchiveFromData" syncable="YES"/>
<attribute name="unicodeValue" optional="YES" attributeType="String" syncable="YES"/>
<relationship name="message" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Message" inverseName="reactions" inverseEntity="Message" syncable="YES"/>
<relationship name="users" toMany="YES" deletionRule="Nullify" destinationEntity="User" inverseName="reactions" inverseEntity="User" syncable="YES"/>
</entity>
<entity name="Role" representedClassName=".Role" syncable="YES">
<entity name="Role" representedClassName="WireDataModel.Role" syncable="YES">
<attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
<relationship name="actions" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="Action" inverseName="role" inverseEntity="Action" syncable="YES"/>
<relationship name="conversation" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Conversation" inverseName="nonTeamRoles" inverseEntity="Conversation" syncable="YES"/>
Expand Down Expand Up @@ -241,7 +241,7 @@
<relationship name="removedUsers" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="User" inverseName="showingUserRemoved" inverseEntity="User" syncable="YES"/>
<relationship name="users" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="User" inverseName="systemMessages" inverseEntity="User" syncable="YES"/>
</entity>
<entity name="Team" representedClassName=".Team" syncable="YES">
<entity name="Team" representedClassName="WireDataModel.Team" syncable="YES">
<attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="needsToBeUpdatedFromBackend" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="NO" syncable="YES"/>
<attribute name="needsToDownloadRoles" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="NO" syncable="YES"/>
Expand Down Expand Up @@ -306,7 +306,7 @@
<relationship name="showingUserRemoved" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="SystemMessage" inverseName="removedUsers" inverseEntity="SystemMessage" syncable="YES"/>
<relationship name="systemMessages" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="SystemMessage" inverseName="users" inverseEntity="SystemMessage" syncable="YES"/>
</entity>
<entity name="UserClient" representedClassName=".UserClient" syncable="YES">
<entity name="UserClient" representedClassName="WireDataModel.UserClient" syncable="YES">
<attribute name="activationAddress" optional="YES" attributeType="String" syncable="YES"/>
<attribute name="activationDate" optional="YES" attributeType="Date" usesScalarValueType="NO" syncable="YES"/>
<attribute name="activationLocationLatitude" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="NO" syncable="YES"/>
Expand Down
Loading
Loading