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

replace nativedb extractChangedInstanceIdsFromChangeSets #213

Merged
merged 1 commit into from
Oct 10, 2024
Merged

replace nativedb extractChangedInstanceIdsFromChangeSets #213

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
132 changes: 62 additions & 70 deletions packages/transformer/src/test/standalone/IModelTransformerHub.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import {
IModelDb,
IModelHost,
IModelJsFs,
IModelJsNative,
ModelSelector,
NativeLoggerCategory,
PhysicalModel,
Expand Down Expand Up @@ -75,6 +74,7 @@ import {
} from "@itwin/core-common";
import { Point3d, YawPitchRollAngles } from "@itwin/core-geometry";
import {
ChangedInstanceIds,
IModelExporter,
IModelImporter,
IModelTransformer,
Expand Down Expand Up @@ -1699,26 +1699,21 @@ describe("IModelTransformerHub", () => {
for (const masterDbChangeset of masterDbChangesets) {
assert.isDefined(masterDbChangeset.id);
assert.isDefined(masterDbChangeset.description); // test code above always included a change description when pushChanges was called
const changesetPath = masterDbChangeset.pathname;
assert.isTrue(IModelJsFs.existsSync(changesetPath));
// below is one way of determining the set of elements that were deleted in a specific changeset
/* eslint-disable deprecation/deprecation */
const statusOrResult =
master.db.nativeDb.extractChangedInstanceIdsFromChangeSets([
changesetPath,
]);
/* eslint-enable deprecation/deprecation */
assert.isUndefined(statusOrResult.error);
const result = statusOrResult.result;
const changedInstanceIds = await ChangedInstanceIds.initialize({
iModel: master.db,
csFileProps: [masterDbChangeset],
});
const result = changedInstanceIds;
if (result === undefined) throw Error("expected to be defined");

if (result.element?.delete) {
result.element.delete.forEach((id: Id64String) =>
if (result.element.deleteIds) {
result.element.deleteIds.forEach((id: Id64String) =>
masterDeletedElementIds.add(id)
);
}
if (result.relationship?.delete) {
result.relationship.delete.forEach((id: Id64String) =>
if (result.relationship.deleteIds) {
result.relationship.deleteIds.forEach((id: Id64String) =>
masterDeletedRelationshipIds.add(id)
);
}
Expand Down Expand Up @@ -1784,18 +1779,16 @@ describe("IModelTransformerHub", () => {
const changesetPath = replayedDbChangeset.pathname;
assert.isTrue(IModelJsFs.existsSync(changesetPath));
// below is one way of determining the set of elements that were deleted in a specific changeset
/* eslint-disable deprecation/deprecation */
const statusOrResult =
replayedDb.nativeDb.extractChangedInstanceIdsFromChangeSets([
changesetPath,
]);
/* eslint-enable deprecation/deprecation */
const result = statusOrResult.result;
const changedInstanceIds = await ChangedInstanceIds.initialize({
iModel: replayedDb,
csFileProps: [replayedDbChangeset],
});
const result = changedInstanceIds;
if (result === undefined) throw Error("expected to be defined");

assert.isDefined(result.element);
if (result.element?.delete) {
result.element.delete.forEach((id: Id64String) =>
if (result.element.deleteIds) {
result.element.deleteIds.forEach((id: Id64String) =>
replayedDeletedElementIds.add(id)
);
}
Expand Down Expand Up @@ -1918,17 +1911,17 @@ describe("IModelTransformerHub", () => {
});
expect(sourceDbChangesets).to.have.length(2);
const latestChangeset = sourceDbChangesets[1];
/* eslint-disable deprecation/deprecation */
const extractedChangedIds =
sourceDb.nativeDb.extractChangedInstanceIdsFromChangeSets([
latestChangeset.pathname,
]);
/* eslint-enable deprecation/deprecation */
const expectedChangedIds: IModelJsNative.ChangedInstanceIdsProps = {
element: { update: [modelSelectorId] },
model: { update: [IModel.dictionaryId] }, // containing model will also get last modification time updated
};
expect(extractedChangedIds.result).to.deep.equal(expectedChangedIds);
const changedInstanceIds = await ChangedInstanceIds.initialize({
iModel: sourceDb,
csFileProps: [latestChangeset],
});
const result = changedInstanceIds;
if (result === undefined) throw Error("expected to be defined");
const expectedElementUpdateIds = new Set<Id64String>([modelSelectorId]);
const expectedModelUpdateIds = new Set<Id64String>([IModel.dictionaryId]); // containing model will also get last modification time updated

expect(result.element.updateIds).to.deep.equal(expectedElementUpdateIds);
expect(result.model.updateIds).to.deep.equal(expectedModelUpdateIds);

// synchronize
let didExportModelSelector = false,
Expand Down Expand Up @@ -2725,12 +2718,13 @@ describe("IModelTransformerHub", () => {
});
expect(branchDbChangesets).to.have.length(2);
const latestChangeset = branchDbChangesets[1];
/* eslint-disable deprecation/deprecation */
const extractedChangedIds =
branchDb.nativeDb.extractChangedInstanceIdsFromChangeSets([
latestChangeset.pathname,
]);
/* eslint-enable deprecation/deprecation */

const changedInstanceIds = await ChangedInstanceIds.initialize({
iModel: branchDb,
csFileProps: [latestChangeset],
});
const result = changedInstanceIds;
if (result === undefined) throw Error("expected to be defined");
const aspectDeletions = [
...modelToDeleteWithElem.aspects,
...childSubject.aspects,
Expand All @@ -2741,35 +2735,33 @@ describe("IModelTransformerHub", () => {
...elemToDeleteWithChildren.aspects,
...childElemOfDeleted.aspects,
].map((a) => a.id);

const expectedChangedIds: IModelJsNative.ChangedInstanceIdsProps = {
...(aspectDeletions.length > 0 && {
aspect: {
delete: aspectDeletions,
},
}),
element: {
delete: [
modelToDeleteWithElemId,
elemInModelToDeleteId,
elemToDeleteWithChildrenId,
childElemOfDeletedId,
childSubjectId,
modelInChildSubjectId,
childSubjectChildId,
modelInChildSubjectChildId,
],
},
model: {
update: [IModelDb.rootSubjectId, notDeletedModelId], // containing model will also get last modification time updated
delete: [
modelToDeleteWithElemId,
modelInChildSubjectId,
modelInChildSubjectChildId,
],
},
};
expect(extractedChangedIds.result).to.deep.equal(expectedChangedIds);
const expectedAspectDeleteIds = aspectDeletions.length
? new Set<Id64String>(aspectDeletions)
: new Set<Id64String>();
const expectedElementDeleteIds = new Set<Id64String>([
modelToDeleteWithElemId,
elemInModelToDeleteId,
elemToDeleteWithChildrenId,
childElemOfDeletedId,
childSubjectId,
modelInChildSubjectId,
childSubjectChildId,
modelInChildSubjectChildId,
]);
const expectedModelDeleteIds = new Set<Id64String>([
modelToDeleteWithElemId,
modelInChildSubjectId,
modelInChildSubjectChildId,
]);
const expectedModelUpdateIds = new Set<Id64String>([
IModelDb.rootSubjectId,
notDeletedModelId,
]); // containing model will also get last modification time updated

expect(result.aspect.deleteIds).to.deep.equal(expectedAspectDeleteIds);
expect(result.element.deleteIds).to.deep.equal(expectedElementDeleteIds);
expect(result.model.deleteIds).to.deep.equal(expectedModelDeleteIds);
expect(result.model.updateIds).to.deep.equal(expectedModelUpdateIds);

const synchronizer = new IModelTransformer(branchDb, masterDb, {
// NOTE: not using a targetScopeElementId because this test deals with temporary dbs, but that is a bad practice, use one
Expand Down
Loading