From a3b472a12ec6e57dbe2f650419f8064864686eab Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 10 Aug 2022 11:51:13 +0200 Subject: Add ability to list imports of a channel sync --- .../api/check-params/channel-import-videos.ts | 172 +++++++++++++++++++++ server/tests/api/check-params/index.ts | 1 + server/tests/api/check-params/video-channels.ts | 113 +------------- server/tests/api/check-params/video-imports.ts | 9 ++ server/tests/api/videos/channel-import-videos.ts | 72 ++++++++- server/tests/api/videos/video-channel-syncs.ts | 12 ++ server/tests/api/videos/video-imports.ts | 9 ++ 7 files changed, 276 insertions(+), 112 deletions(-) create mode 100644 server/tests/api/check-params/channel-import-videos.ts (limited to 'server/tests') diff --git a/server/tests/api/check-params/channel-import-videos.ts b/server/tests/api/check-params/channel-import-videos.ts new file mode 100644 index 000000000..90d61f20a --- /dev/null +++ b/server/tests/api/check-params/channel-import-videos.ts @@ -0,0 +1,172 @@ +/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ + +import 'mocha' +import { FIXTURE_URLS } from '@server/tests/shared' +import { areHttpImportTestsDisabled } from '@shared/core-utils' +import { HttpStatusCode } from '@shared/models' +import { ChannelsCommand, cleanupTests, createSingleServer, PeerTubeServer, setAccessTokensToServers } from '@shared/server-commands' + +describe('Test videos import in a channel API validator', function () { + let server: PeerTubeServer + const userInfo = { + accessToken: '', + channelName: 'fake_channel', + id: -1, + videoQuota: -1, + videoQuotaDaily: -1 + } + let command: ChannelsCommand + + // --------------------------------------------------------------- + + before(async function () { + this.timeout(30000) + + server = await createSingleServer(1) + + await setAccessTokensToServers([ server ]) + + const userCreds = { + username: 'fake', + password: 'fake_password' + } + + { + const user = await server.users.create({ username: userCreds.username, password: userCreds.password }) + userInfo.id = user.id + userInfo.accessToken = await server.login.getAccessToken(userCreds) + } + + command = server.channels + }) + + it('Should fail when HTTP upload is disabled', async function () { + await server.config.disableImports() + + await command.importVideos({ + channelName: 'super_channel', + externalChannelUrl: FIXTURE_URLS.youtubeChannel, + token: server.accessToken, + expectedStatus: HttpStatusCode.FORBIDDEN_403 + }) + + await server.config.enableImports() + }) + + it('Should fail when externalChannelUrl is not provided', async function () { + await command.importVideos({ + channelName: 'super_channel', + externalChannelUrl: null, + token: server.accessToken, + expectedStatus: HttpStatusCode.BAD_REQUEST_400 + }) + }) + + it('Should fail when externalChannelUrl is malformed', async function () { + await command.importVideos({ + channelName: 'super_channel', + externalChannelUrl: 'not-a-url', + token: server.accessToken, + expectedStatus: HttpStatusCode.BAD_REQUEST_400 + }) + }) + + it('Should fail with a bad sync id', async function () { + await command.importVideos({ + channelName: 'super_channel', + externalChannelUrl: FIXTURE_URLS.youtubeChannel, + videoChannelSyncId: 'toto' as any, + token: server.accessToken, + expectedStatus: HttpStatusCode.BAD_REQUEST_400 + }) + }) + + it('Should fail with a unknown sync id', async function () { + await command.importVideos({ + channelName: 'super_channel', + externalChannelUrl: FIXTURE_URLS.youtubeChannel, + videoChannelSyncId: 42, + token: server.accessToken, + expectedStatus: HttpStatusCode.NOT_FOUND_404 + }) + }) + + it('Should fail with no authentication', async function () { + await command.importVideos({ + channelName: 'super_channel', + externalChannelUrl: FIXTURE_URLS.youtubeChannel, + token: null, + expectedStatus: HttpStatusCode.UNAUTHORIZED_401 + }) + }) + + it('Should fail when sync is not owned by the user', async function () { + await command.importVideos({ + channelName: 'super_channel', + externalChannelUrl: FIXTURE_URLS.youtubeChannel, + token: userInfo.accessToken, + expectedStatus: HttpStatusCode.FORBIDDEN_403 + }) + }) + + it('Should fail when the user has no quota', async function () { + await server.users.update({ + userId: userInfo.id, + videoQuota: 0 + }) + + await command.importVideos({ + channelName: 'fake_channel', + externalChannelUrl: FIXTURE_URLS.youtubeChannel, + token: userInfo.accessToken, + expectedStatus: HttpStatusCode.PAYLOAD_TOO_LARGE_413 + }) + + await server.users.update({ + userId: userInfo.id, + videoQuota: userInfo.videoQuota + }) + }) + + it('Should fail when the user has no daily quota', async function () { + await server.users.update({ + userId: userInfo.id, + videoQuotaDaily: 0 + }) + + await command.importVideos({ + channelName: 'fake_channel', + externalChannelUrl: FIXTURE_URLS.youtubeChannel, + token: userInfo.accessToken, + expectedStatus: HttpStatusCode.PAYLOAD_TOO_LARGE_413 + }) + + await server.users.update({ + userId: userInfo.id, + videoQuotaDaily: userInfo.videoQuotaDaily + }) + }) + + it('Should succeed when sync is run by its owner', async function () { + if (!areHttpImportTestsDisabled()) return + + await command.importVideos({ + channelName: 'fake_channel', + externalChannelUrl: FIXTURE_URLS.youtubeChannel, + token: userInfo.accessToken + }) + }) + + it('Should succeed when sync is run with root and for another user\'s channel', async function () { + if (!areHttpImportTestsDisabled()) return + + await command.importVideos({ + channelName: 'fake_channel', + externalChannelUrl: FIXTURE_URLS.youtubeChannel + }) + }) + + after(async function () { + await cleanupTests([ server ]) + }) +}) diff --git a/server/tests/api/check-params/index.ts b/server/tests/api/check-params/index.ts index 5f1168b53..149305f49 100644 --- a/server/tests/api/check-params/index.ts +++ b/server/tests/api/check-params/index.ts @@ -28,6 +28,7 @@ import './video-comments' import './video-files' import './video-imports' import './video-channel-syncs' +import './channel-import-videos' import './video-playlists' import './video-source' import './video-studio' diff --git a/server/tests/api/check-params/video-channels.ts b/server/tests/api/check-params/video-channels.ts index 337ea1dd4..9024126c0 100644 --- a/server/tests/api/check-params/video-channels.ts +++ b/server/tests/api/check-params/video-channels.ts @@ -3,8 +3,8 @@ import 'mocha' import * as chai from 'chai' import { omit } from 'lodash' -import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination, FIXTURE_URLS } from '@server/tests/shared' -import { areHttpImportTestsDisabled, buildAbsoluteFixturePath } from '@shared/core-utils' +import { checkBadCountPagination, checkBadSortPagination, checkBadStartPagination } from '@server/tests/shared' +import { buildAbsoluteFixturePath } from '@shared/core-utils' import { HttpStatusCode, VideoChannelUpdate } from '@shared/models' import { ChannelsCommand, @@ -354,115 +354,6 @@ describe('Test video channels API validator', function () { }) }) - describe('When triggering full synchronization', function () { - - it('Should fail when HTTP upload is disabled', async function () { - await server.config.disableImports() - - await command.importVideos({ - channelName: 'super_channel', - externalChannelUrl: FIXTURE_URLS.youtubeChannel, - token: server.accessToken, - expectedStatus: HttpStatusCode.FORBIDDEN_403 - }) - - await server.config.enableImports() - }) - - it('Should fail when externalChannelUrl is not provided', async function () { - await command.importVideos({ - channelName: 'super_channel', - externalChannelUrl: null, - token: server.accessToken, - expectedStatus: HttpStatusCode.BAD_REQUEST_400 - }) - }) - - it('Should fail when externalChannelUrl is malformed', async function () { - await command.importVideos({ - channelName: 'super_channel', - externalChannelUrl: 'not-a-url', - token: server.accessToken, - expectedStatus: HttpStatusCode.BAD_REQUEST_400 - }) - }) - - it('Should fail with no authentication', async function () { - await command.importVideos({ - channelName: 'super_channel', - externalChannelUrl: FIXTURE_URLS.youtubeChannel, - token: null, - expectedStatus: HttpStatusCode.UNAUTHORIZED_401 - }) - }) - - it('Should fail when sync is not owned by the user', async function () { - await command.importVideos({ - channelName: 'super_channel', - externalChannelUrl: FIXTURE_URLS.youtubeChannel, - token: userInfo.accessToken, - expectedStatus: HttpStatusCode.FORBIDDEN_403 - }) - }) - - it('Should fail when the user has no quota', async function () { - await server.users.update({ - userId: userInfo.id, - videoQuota: 0 - }) - - await command.importVideos({ - channelName: 'fake_channel', - externalChannelUrl: FIXTURE_URLS.youtubeChannel, - token: userInfo.accessToken, - expectedStatus: HttpStatusCode.PAYLOAD_TOO_LARGE_413 - }) - - await server.users.update({ - userId: userInfo.id, - videoQuota: userInfo.videoQuota - }) - }) - - it('Should fail when the user has no daily quota', async function () { - await server.users.update({ - userId: userInfo.id, - videoQuotaDaily: 0 - }) - - await command.importVideos({ - channelName: 'fake_channel', - externalChannelUrl: FIXTURE_URLS.youtubeChannel, - token: userInfo.accessToken, - expectedStatus: HttpStatusCode.PAYLOAD_TOO_LARGE_413 - }) - - await server.users.update({ - userId: userInfo.id, - videoQuotaDaily: userInfo.videoQuotaDaily - }) - }) - - it('Should succeed when sync is run by its owner', async function () { - if (!areHttpImportTestsDisabled()) return - - await command.importVideos({ - channelName: 'fake_channel', - externalChannelUrl: FIXTURE_URLS.youtubeChannel, - token: userInfo.accessToken - }) - }) - - it('Should succeed when sync is run with root and for another user\'s channel', async function () { - if (!areHttpImportTestsDisabled()) return - - await command.importVideos({ - channelName: 'fake_channel', - externalChannelUrl: FIXTURE_URLS.youtubeChannel - }) - }) - }) - describe('When deleting a video channel', function () { it('Should fail with a non authenticated user', async function () { await command.delete({ token: 'coucou', channelName: 'super_channel', expectedStatus: HttpStatusCode.UNAUTHORIZED_401 }) diff --git a/server/tests/api/check-params/video-imports.ts b/server/tests/api/check-params/video-imports.ts index 5cdd0d925..85382b261 100644 --- a/server/tests/api/check-params/video-imports.ts +++ b/server/tests/api/check-params/video-imports.ts @@ -59,6 +59,15 @@ describe('Test video imports API validator', function () { await checkBadSortPagination(server.url, myPath, server.accessToken) }) + it('Should fail with a bad videoChannelSyncId param', async function () { + await makeGetRequest({ + url: server.url, + path: myPath, + query: { videoChannelSyncId: 'toto' }, + token: server.accessToken + }) + }) + it('Should success with the correct parameters', async function () { await makeGetRequest({ url: server.url, path: myPath, expectedStatus: HttpStatusCode.OK_200, token: server.accessToken }) }) diff --git a/server/tests/api/videos/channel-import-videos.ts b/server/tests/api/videos/channel-import-videos.ts index f7540e1ba..7cfd02fbb 100644 --- a/server/tests/api/videos/channel-import-videos.ts +++ b/server/tests/api/videos/channel-import-videos.ts @@ -1,3 +1,5 @@ +/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */ + import { expect } from 'chai' import { FIXTURE_URLS } from '@server/tests/shared' import { areHttpImportTestsDisabled } from '@shared/core-utils' @@ -29,7 +31,7 @@ describe('Test videos import in a channel', function () { await server.config.enableChannelSync() }) - it('Should import a whole channel', async function () { + it('Should import a whole channel without specifying the sync id', async function () { this.timeout(240_000) await server.channels.importVideos({ channelName: server.store.channel.name, externalChannelUrl: FIXTURE_URLS.youtubeChannel }) @@ -39,6 +41,74 @@ describe('Test videos import in a channel', function () { expect(videos.total).to.equal(2) }) + it('These imports should not have a sync id', async function () { + const { total, data } = await server.imports.getMyVideoImports() + + expect(total).to.equal(2) + expect(data).to.have.lengthOf(2) + + for (const videoImport of data) { + expect(videoImport.videoChannelSync).to.not.exist + } + }) + + it('Should import a whole channel and specifying the sync id', async function () { + this.timeout(240_000) + + { + server.store.channel.name = 'channel2' + const { id } = await server.channels.create({ attributes: { name: server.store.channel.name } }) + server.store.channel.id = id + } + + { + const attributes = { + externalChannelUrl: FIXTURE_URLS.youtubeChannel, + videoChannelId: server.store.channel.id + } + + const { videoChannelSync } = await server.channelSyncs.create({ attributes }) + server.store.videoChannelSync = videoChannelSync + + await waitJobs(server) + } + + await server.channels.importVideos({ + channelName: server.store.channel.name, + externalChannelUrl: FIXTURE_URLS.youtubeChannel, + videoChannelSyncId: server.store.videoChannelSync.id + }) + + await waitJobs(server) + }) + + it('These imports should have a sync id', async function () { + const { total, data } = await server.imports.getMyVideoImports() + + expect(total).to.equal(4) + expect(data).to.have.lengthOf(4) + + const importsWithSyncId = data.filter(i => !!i.videoChannelSync) + expect(importsWithSyncId).to.have.lengthOf(2) + + for (const videoImport of importsWithSyncId) { + expect(videoImport.videoChannelSync).to.exist + expect(videoImport.videoChannelSync.id).to.equal(server.store.videoChannelSync.id) + } + }) + + it('Should be able to filter imports by this sync id', async function () { + const { total, data } = await server.imports.getMyVideoImports({ videoChannelSyncId: server.store.videoChannelSync.id }) + + expect(total).to.equal(2) + expect(data).to.have.lengthOf(2) + + for (const videoImport of data) { + expect(videoImport.videoChannelSync).to.exist + expect(videoImport.videoChannelSync.id).to.equal(server.store.videoChannelSync.id) + } + }) + after(async function () { await server?.kill() }) diff --git a/server/tests/api/videos/video-channel-syncs.ts b/server/tests/api/videos/video-channel-syncs.ts index 229c01f68..835d3cb09 100644 --- a/server/tests/api/videos/video-channel-syncs.ts +++ b/server/tests/api/videos/video-channel-syncs.ts @@ -23,7 +23,10 @@ describe('Test channel synchronizations', function () { describe('Sync using ' + mode, function () { let server: PeerTubeServer let command: ChannelSyncsCommand + let startTestDate: Date + + let rootChannelSyncId: number const userInfo = { accessToken: '', username: 'user1', @@ -90,6 +93,7 @@ describe('Test channel synchronizations', function () { token: server.accessToken, expectedStatus: HttpStatusCode.OK_200 }) + rootChannelSyncId = videoChannelSync.id // Ensure any missing video not already fetched will be considered as new await changeDateForSync(videoChannelSync.id, '1970-01-01') @@ -208,6 +212,14 @@ describe('Test channel synchronizations', function () { } }) + it('Should list imports of a channel synchronization', async function () { + const { total, data } = await server.imports.getMyVideoImports({ videoChannelSyncId: rootChannelSyncId }) + + expect(total).to.equal(1) + expect(data).to.have.lengthOf(1) + expect(data[0].video.name).to.equal('test') + }) + it('Should remove user\'s channel synchronizations', async function () { await command.delete({ channelSyncId: userInfo.syncId }) diff --git a/server/tests/api/videos/video-imports.ts b/server/tests/api/videos/video-imports.ts index a487062a2..f082d4bd7 100644 --- a/server/tests/api/videos/video-imports.ts +++ b/server/tests/api/videos/video-imports.ts @@ -228,6 +228,15 @@ describe('Test video imports', function () { expect(videoImports[0].targetUrl).to.equal(FIXTURE_URLS.youtube) }) + it('Should search in my imports', async function () { + const { total, data: videoImports } = await servers[0].imports.getMyVideoImports({ search: 'peertube2' }) + expect(total).to.equal(1) + expect(videoImports).to.have.lengthOf(1) + + expect(videoImports[0].magnetUri).to.equal(FIXTURE_URLS.magnet) + expect(videoImports[0].video.name).to.equal('super peertube2 video') + }) + it('Should have the video listed on the two instances', async function () { this.timeout(120_000) -- cgit v1.2.3