Add ability to list imports of a channel sync

7 files changed, 23 insertions, 8 deletions

diff --git a/shared/models/server/job.model.ts b/shared/models/server/job.model.ts
index ba1f83684..9c0b5ea56 100644
--- a/shared/models/server/job.model.ts
+++ b/shared/models/server/job.model.ts
@@ -236,6 +236,8 @@ export interface VideoStudioEditionPayload {
 export interface VideoChannelImportPayload {
   externalChannelUrl: string
   videoChannelId: number
+
+  partOfChannelSyncId?: number
 }
 
 export interface AfterVideoChannelImportPayload {
diff --git a/shared/models/videos/import/index.ts b/shared/models/videos/import/index.ts
index 8884ee8f2..b38a67b5f 100644
--- a/shared/models/videos/import/index.ts
+++ b/shared/models/videos/import/index.ts
@@ -1,3 +1,4 @@
 export * from './video-import-create.model'
 export * from './video-import-state.enum'
 export * from './video-import.model'
+export * from './videos-import-in-channel-create.model'
diff --git a/shared/models/videos/import/video-import.model.ts b/shared/models/videos/import/video-import.model.ts
index 92856c70f..6aed7a91a 100644
--- a/shared/models/videos/import/video-import.model.ts
+++ b/shared/models/videos/import/video-import.model.ts
@@ -16,4 +16,9 @@ export interface VideoImport {
   error?: string
 
   video?: Video & { tags: string[] }
+
+  videoChannelSync?: {
+    id: number
+    externalChannelUrl: string
+  }
 }
diff --git a/shared/models/videos/import/videos-import-in-channel-create.model.ts b/shared/models/videos/import/videos-import-in-channel-create.model.ts
new file mode 100644
index 000000000..fbfef63f8
--- /dev/null
+++ b/shared/models/videos/import/videos-import-in-channel-create.model.ts
@@ -0,0 +1,4 @@
+export interface VideosImportInChannelCreate {
+  externalChannelUrl: string
+  videoChannelSyncId?: number
+}
diff --git a/shared/server-commands/server/server.ts b/shared/server-commands/server/server.ts
index 7acbc978f..c05d16ad2 100644
--- a/shared/server-commands/server/server.ts
+++ b/shared/server-commands/server/server.ts
@@ -2,7 +2,7 @@ import { ChildProcess, fork } from 'child_process'
 import { copy } from 'fs-extra'
 import { join } from 'path'
 import { parallelTests, randomInt, root } from '@shared/core-utils'
-import { Video, VideoChannel, VideoCreateResult, VideoDetails } from '@shared/models'
+import { Video, VideoChannel, VideoChannelSync, VideoCreateResult, VideoDetails } from '@shared/models'
 import { BulkCommand } from '../bulk'
 import { CLICommand } from '../cli'
 import { CustomPagesCommand } from '../custom-pages'
@@ -80,6 +80,7 @@ export class PeerTubeServer {
     }
 
     channel?: VideoChannel
+    videoChannelSync?: Partial<VideoChannelSync>
 
     video?: Video
     videoCreated?: VideoCreateResult
diff --git a/shared/server-commands/videos/channels-command.ts b/shared/server-commands/videos/channels-command.ts
index a688a120f..385d0fe73 100644
--- a/shared/server-commands/videos/channels-command.ts
+++ b/shared/server-commands/videos/channels-command.ts
@@ -6,7 +6,8 @@ import {
   VideoChannel,
   VideoChannelCreate,
   VideoChannelCreateResult,
-  VideoChannelUpdate
+  VideoChannelUpdate,
+  VideosImportInChannelCreate
 } from '@shared/models'
 import { unwrapBody } from '../requests'
 import { AbstractCommand, OverrideCommandOptions } from '../shared'
@@ -182,11 +183,10 @@ export class ChannelsCommand extends AbstractCommand {
     })
   }
 
-  importVideos (options: OverrideCommandOptions & {
+  importVideos (options: OverrideCommandOptions & VideosImportInChannelCreate & {
     channelName: string
-    externalChannelUrl: string
   }) {
-    const { channelName, externalChannelUrl } = options
+    const { channelName, externalChannelUrl, videoChannelSyncId } = options
 
     const path = `/api/v1/video-channels/${channelName}/import-videos`
 
@@ -194,7 +194,7 @@ export class ChannelsCommand extends AbstractCommand {
       ...options,
 
       path,
-      fields: { externalChannelUrl },
+      fields: { externalChannelUrl, videoChannelSyncId },
       implicitToken: true,
       defaultExpectedStatus: HttpStatusCode.NO_CONTENT_204
     })
diff --git a/shared/server-commands/videos/imports-command.ts b/shared/server-commands/videos/imports-command.ts
index c931ac481..07d810ec1 100644
--- a/shared/server-commands/videos/imports-command.ts
+++ b/shared/server-commands/videos/imports-command.ts
@@ -57,15 +57,17 @@ export class ImportsCommand extends AbstractCommand {
   getMyVideoImports (options: OverrideCommandOptions & {
     sort?: string
     targetUrl?: string
+    videoChannelSyncId?: number
+    search?: string
   } = {}) {
-    const { sort, targetUrl } = options
+    const { sort, targetUrl, videoChannelSyncId, search } = options
     const path = '/api/v1/users/me/videos/imports'
 
     return this.getRequestBody<ResultList<VideoImport>>({
       ...options,
 
       path,
-      query: { sort, targetUrl },
+      query: { sort, targetUrl, videoChannelSyncId, search },
       implicitToken: true,
       defaultExpectedStatus: HttpStatusCode.OK_200
     })