From b4bf11d9da44cc1d980b6922f532ff487fe582df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20S=C3=B3jko?= Date: Mon, 11 Sep 2023 12:23:11 +0200 Subject: [PATCH] fix(revisions): legacy table syncing and select for metadata --- packages/revisions/migrations/mysql/1669113322388-init.ts | 4 ++-- .../src/Infra/TypeORM/MongoDB/MongoDBRevisionRepository.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/revisions/migrations/mysql/1669113322388-init.ts b/packages/revisions/migrations/mysql/1669113322388-init.ts index 9782e7912..a61f87589 100644 --- a/packages/revisions/migrations/mysql/1669113322388-init.ts +++ b/packages/revisions/migrations/mysql/1669113322388-init.ts @@ -4,11 +4,11 @@ export class init1669113322388 implements MigrationInterface { name = 'init1669113322388' public async up(queryRunner: QueryRunner): Promise { - await this.syncSchemaBetweenLegacyRevisions(queryRunner) - await queryRunner.query( 'CREATE TABLE `revisions_revisions` (`uuid` varchar(36) NOT NULL, `item_uuid` varchar(36) NOT NULL, `user_uuid` varchar(36) NULL, `content` mediumtext NULL, `content_type` varchar(255) NULL, `items_key_id` varchar(255) NULL, `enc_item_key` text NULL, `auth_hash` varchar(255) NULL, `creation_date` date NULL, `created_at` datetime(6) NULL, `updated_at` datetime(6) NULL, INDEX `item_uuid` (`item_uuid`), INDEX `user_uuid` (`user_uuid`), INDEX `creation_date` (`creation_date`), INDEX `created_at` (`created_at`), PRIMARY KEY (`uuid`)) ENGINE=InnoDB', ) + + await this.syncSchemaBetweenLegacyRevisions(queryRunner) } public async down(queryRunner: QueryRunner): Promise { diff --git a/packages/revisions/src/Infra/TypeORM/MongoDB/MongoDBRevisionRepository.ts b/packages/revisions/src/Infra/TypeORM/MongoDB/MongoDBRevisionRepository.ts index 2b8572afa..7055056cb 100644 --- a/packages/revisions/src/Infra/TypeORM/MongoDB/MongoDBRevisionRepository.ts +++ b/packages/revisions/src/Infra/TypeORM/MongoDB/MongoDBRevisionRepository.ts @@ -144,7 +144,7 @@ export class MongoDBRevisionRepository implements RevisionRepositoryInterface { }) } else { persistence = await this.mongoRepository.find({ - select: ['_id', 'contentType', 'createdAt', 'updatedAt'], + select: ['_id', 'contentType', 'createdAt', 'updatedAt', 'sharedVaultUuid', 'itemUuid'], where: { $and: [{ itemUuid: { $eq: itemUuid.value } }, { userUuid: { $eq: userUuid.value } }], },