diff --git a/models/document/src/migration.ts b/models/document/src/migration.ts index d237959e87..b0d9a91980 100644 --- a/models/document/src/migration.ts +++ b/models/document/src/migration.ts @@ -275,11 +275,7 @@ async function migrateTeamspacesMixins (client: MigrationClient): Promise async function migrateContentField (client: MigrationClient): Promise { const ctx = new MeasureMetricsContext('migrate_content_field', {}) - const storage = client.storageAdapter - if (storage === undefined) { - return - } const documents = await client.find(DOMAIN_DOCUMENT, { _class: document.class.Document, @@ -290,17 +286,20 @@ async function migrateContentField (client: MigrationClient): Promise { try { const ydoc = await loadCollaborativeDoc(storage, client.workspaceId, document.content, ctx) if (ydoc === undefined) { + ctx.error('document content not found', { document: document.name }) continue } - if (!ydoc.share.has('')) { + if (!ydoc.share.has('') || ydoc.share.has('content')) { continue } yDocCopyXmlField(ydoc, '', 'content') await saveCollaborativeDoc(storage, client.workspaceId, document.content, ydoc, ctx) - } catch {} + } catch (err) { + ctx.error('error document content migration', { error: err, document: document.name }) + } } } diff --git a/packages/model/src/migration.ts b/packages/model/src/migration.ts index b901b9606a..641ada9945 100644 --- a/packages/model/src/migration.ts +++ b/packages/model/src/migration.ts @@ -104,7 +104,7 @@ export interface MigrationClient { model: ModelDb migrateState: Map> - storageAdapter?: StorageAdapter + storageAdapter: StorageAdapter workspaceId: WorkspaceId }