From 07c2de3749efae5ca1e44c88a2d076764ad386d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?= <67428053+kakkokari-gtyih@users.noreply.github.com> Date: Tue, 27 May 2025 13:50:45 +0900 Subject: [PATCH] =?UTF-8?q?fix(backend):=20typeorm=E3=81=AEbreaking=20chan?= =?UTF-8?q?ge=E3=81=AB=E5=AF=BE=E5=BF=9C=20(#16105)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix(backend): typeormのbreaking changeに対応 * attempt to fix test --- .../backend/test/unit/AbuseReportNotificationService.ts | 8 ++++---- packages/backend/test/unit/AnnouncementService.ts | 8 ++++---- packages/backend/test/unit/CustomEmojiService.ts | 2 +- packages/backend/test/unit/FlashService.ts | 6 +++--- packages/backend/test/unit/RoleService.ts | 8 ++++---- packages/backend/test/unit/SystemWebhookService.ts | 4 ++-- packages/backend/test/unit/UserSearchService.ts | 2 +- packages/backend/test/unit/UserWebhookService.ts | 4 ++-- packages/backend/test/unit/WebhookTestService.ts | 4 ++-- .../processors/CheckModeratorsActivityProcessorService.ts | 4 ++-- .../backend/test/unit/server/api/drive/files/create.ts | 4 ++-- 11 files changed, 27 insertions(+), 27 deletions(-) diff --git a/packages/backend/test/unit/AbuseReportNotificationService.ts b/packages/backend/test/unit/AbuseReportNotificationService.ts index 6d555326fb..9dad8e229d 100644 --- a/packages/backend/test/unit/AbuseReportNotificationService.ts +++ b/packages/backend/test/unit/AbuseReportNotificationService.ts @@ -162,10 +162,10 @@ describe('AbuseReportNotificationService', () => { emailService.sendEmail.mockClear(); webhookService.enqueueSystemWebhook.mockClear(); - await usersRepository.delete({}); - await userProfilesRepository.delete({}); - await systemWebhooksRepository.delete({}); - await abuseReportNotificationRecipientRepository.delete({}); + await usersRepository.createQueryBuilder().delete().execute(); + await userProfilesRepository.createQueryBuilder().delete().execute(); + await systemWebhooksRepository.createQueryBuilder().delete().execute(); + await abuseReportNotificationRecipientRepository.createQueryBuilder().delete().execute(); }); afterAll(async () => { diff --git a/packages/backend/test/unit/AnnouncementService.ts b/packages/backend/test/unit/AnnouncementService.ts index a79655c9aa..7b1ac30709 100644 --- a/packages/backend/test/unit/AnnouncementService.ts +++ b/packages/backend/test/unit/AnnouncementService.ts @@ -103,10 +103,10 @@ describe('AnnouncementService', () => { afterEach(async () => { await Promise.all([ - app.get(DI.metasRepository).delete({}), - usersRepository.delete({}), - announcementsRepository.delete({}), - announcementReadsRepository.delete({}), + app.get(DI.metasRepository).clear(), + usersRepository.createQueryBuilder().delete().execute(), + announcementsRepository.createQueryBuilder().delete().execute(), + announcementReadsRepository.createQueryBuilder().delete().execute(), ]); await app.close(); diff --git a/packages/backend/test/unit/CustomEmojiService.ts b/packages/backend/test/unit/CustomEmojiService.ts index 10b687c6a0..d6c73a2091 100644 --- a/packages/backend/test/unit/CustomEmojiService.ts +++ b/packages/backend/test/unit/CustomEmojiService.ts @@ -86,7 +86,7 @@ describe('CustomEmojiService', () => { } afterEach(async () => { - await emojisRepository.delete({}); + await emojisRepository.createQueryBuilder().delete().execute(); }); describe('単独', () => { diff --git a/packages/backend/test/unit/FlashService.ts b/packages/backend/test/unit/FlashService.ts index f2d9832f50..9e4bad147b 100644 --- a/packages/backend/test/unit/FlashService.ts +++ b/packages/backend/test/unit/FlashService.ts @@ -85,9 +85,9 @@ describe('FlashService', () => { }); afterEach(async () => { - await usersRepository.delete({}); - await userProfilesRepository.delete({}); - await flashsRepository.delete({}); + await usersRepository.createQueryBuilder().delete().execute(); + await userProfilesRepository.createQueryBuilder().delete().execute(); + await flashsRepository.createQueryBuilder().delete().execute(); }); afterAll(async () => { diff --git a/packages/backend/test/unit/RoleService.ts b/packages/backend/test/unit/RoleService.ts index 553ff0982a..d87794e09f 100644 --- a/packages/backend/test/unit/RoleService.ts +++ b/packages/backend/test/unit/RoleService.ts @@ -159,10 +159,10 @@ describe('RoleService', () => { clock.uninstall(); await Promise.all([ - app.get(DI.metasRepository).delete({}), - usersRepository.delete({}), - rolesRepository.delete({}), - roleAssignmentsRepository.delete({}), + app.get(DI.metasRepository).clear(), + usersRepository.createQueryBuilder().delete().execute(), + rolesRepository.createQueryBuilder().delete().execute(), + roleAssignmentsRepository.createQueryBuilder().delete().execute(), ]); await app.close(); diff --git a/packages/backend/test/unit/SystemWebhookService.ts b/packages/backend/test/unit/SystemWebhookService.ts index 61187e9f2a..1128d83be1 100644 --- a/packages/backend/test/unit/SystemWebhookService.ts +++ b/packages/backend/test/unit/SystemWebhookService.ts @@ -101,8 +101,8 @@ describe('SystemWebhookService', () => { } async function afterEachImpl() { - await usersRepository.delete({}); - await systemWebhooksRepository.delete({}); + await usersRepository.createQueryBuilder().delete().execute(); + await systemWebhooksRepository.createQueryBuilder().delete().execute(); } // -------------------------------------------------------------------------------------- diff --git a/packages/backend/test/unit/UserSearchService.ts b/packages/backend/test/unit/UserSearchService.ts index 697425beb8..75d3e58adc 100644 --- a/packages/backend/test/unit/UserSearchService.ts +++ b/packages/backend/test/unit/UserSearchService.ts @@ -127,7 +127,7 @@ describe('UserSearchService', () => { }); afterEach(async () => { - await usersRepository.delete({}); + await usersRepository.createQueryBuilder().delete().execute(); }); afterAll(async () => { diff --git a/packages/backend/test/unit/UserWebhookService.ts b/packages/backend/test/unit/UserWebhookService.ts index a2a85e9489..928b9d3c2b 100644 --- a/packages/backend/test/unit/UserWebhookService.ts +++ b/packages/backend/test/unit/UserWebhookService.ts @@ -95,8 +95,8 @@ describe('UserWebhookService', () => { } async function afterEachImpl() { - await usersRepository.delete({}); - await userWebhooksRepository.delete({}); + await usersRepository.createQueryBuilder().delete().execute(); + await userWebhooksRepository.createQueryBuilder().delete().execute(); } // -------------------------------------------------------------------------------------- diff --git a/packages/backend/test/unit/WebhookTestService.ts b/packages/backend/test/unit/WebhookTestService.ts index 736aac40b4..0e965021c2 100644 --- a/packages/backend/test/unit/WebhookTestService.ts +++ b/packages/backend/test/unit/WebhookTestService.ts @@ -111,8 +111,8 @@ describe('WebhookTestService', () => { userWebhookService.fetchWebhooks.mockClear(); systemWebhookService.fetchSystemWebhooks.mockClear(); - await usersRepository.delete({}); - await userProfilesRepository.delete({}); + await usersRepository.createQueryBuilder().delete().execute(); + await userProfilesRepository.createQueryBuilder().delete().execute(); }); afterAll(async () => { diff --git a/packages/backend/test/unit/queue/processors/CheckModeratorsActivityProcessorService.ts b/packages/backend/test/unit/queue/processors/CheckModeratorsActivityProcessorService.ts index 07618e7762..211846eef2 100644 --- a/packages/backend/test/unit/queue/processors/CheckModeratorsActivityProcessorService.ts +++ b/packages/backend/test/unit/queue/processors/CheckModeratorsActivityProcessorService.ts @@ -157,8 +157,8 @@ describe('CheckModeratorsActivityProcessorService', () => { afterEach(async () => { clock.uninstall(); - await usersRepository.delete({}); - await userProfilesRepository.delete({}); + await usersRepository.createQueryBuilder().delete().execute(); + await userProfilesRepository.createQueryBuilder().delete().execute(); roleService.getModerators.mockReset(); announcementService.create.mockReset(); emailService.sendEmail.mockReset(); diff --git a/packages/backend/test/unit/server/api/drive/files/create.ts b/packages/backend/test/unit/server/api/drive/files/create.ts index 9b38f4d744..723e399430 100644 --- a/packages/backend/test/unit/server/api/drive/files/create.ts +++ b/packages/backend/test/unit/server/api/drive/files/create.ts @@ -41,7 +41,7 @@ describe('/drive/files/create', () => { idService = module.get(IdService); const usersRepository = module.get(DI.usersRepository); - await usersRepository.delete({}); + await usersRepository.createQueryBuilder().delete().execute(); root = await usersRepository.insert({ id: idService.gen(), username: 'root', @@ -50,7 +50,7 @@ describe('/drive/files/create', () => { }).then(x => usersRepository.findOneByOrFail(x.identifiers[0])); const userProfilesRepository = module.get(DI.userProfilesRepository); - await userProfilesRepository.delete({}); + await userProfilesRepository.createQueryBuilder().delete().execute(); await userProfilesRepository.insert({ userId: root.id, });