Video channel API routes refractor

2 files changed, 58 insertions, 30 deletions

diff --git a/server/tests/api/videos/video-channels.ts b/server/tests/api/videos/video-channels.ts
index a7552a83a..04e7b8c6a 100644
--- a/server/tests/api/videos/video-channels.ts
+++ b/server/tests/api/videos/video-channels.ts
@@ -3,7 +3,7 @@
 import * as chai from 'chai'
 import 'mocha'
 import { User } from '../../../../shared/index'
-import { doubleFollow, flushAndRunMultipleServers, uploadVideo, wait } from '../../utils'
+import { doubleFollow, flushAndRunMultipleServers, getVideoChannelVideos, uploadVideo, wait } from '../../utils'
 import {
   addVideoChannel,
   deleteVideoChannel,
@@ -24,8 +24,9 @@ const expect = chai.expect
 describe('Test video channels', function () {
   let servers: ServerInfo[]
   let userInfo: User
-  let accountId: number
+  let accountUUID: string
   let videoChannelId: number
+  let videoChannelUUID: string
 
   before(async function () {
     this.timeout(30000)
@@ -38,8 +39,9 @@ describe('Test video channels', function () {
     await doubleFollow(servers[0], servers[1])
 
     {
-      const res = await getAccountsList(servers[0].url)
-      accountId = res.body.data[0].id
+      const res = await getMyUserInformation(servers[0].url, servers[0].accessToken)
+      const user: User = res.body
+      accountUUID = user.account.uuid
     }
 
     await wait(5000)
@@ -61,11 +63,12 @@ describe('Test video channels', function () {
       description: 'super video channel description',
       support: 'super video channel support text'
     }
-    const res = await addVideoChannel(servers[0].url, servers[0].accessToken, accountId, videoChannel)
+    const res = await addVideoChannel(servers[0].url, servers[0].accessToken, accountUUID, videoChannel)
     videoChannelId = res.body.videoChannel.id
+    videoChannelUUID = res.body.videoChannel.uuid
 
     // The channel is 1 is propagated to servers 2
-    await uploadVideo(servers[0].url, servers[0].accessToken, { channelId: videoChannelId })
+    await uploadVideo(servers[0].url, servers[0].accessToken, { name: 'my video name', channelId: videoChannelId })
 
     await wait(3000)
   })
@@ -127,7 +130,7 @@ describe('Test video channels', function () {
       support: 'video channel support text updated'
     }
 
-    await updateVideoChannel(servers[0].url, servers[0].accessToken, accountId, videoChannelId, videoChannelAttributes)
+    await updateVideoChannel(servers[0].url, servers[0].accessToken, accountUUID, videoChannelId, videoChannelAttributes)
 
     await wait(3000)
   })
@@ -146,7 +149,7 @@ describe('Test video channels', function () {
   })
 
   it('Should get video channel', async function () {
-    const res = await getVideoChannel(servers[0].url, accountId, videoChannelId)
+    const res = await getVideoChannel(servers[0].url, accountUUID, videoChannelId)
 
     const videoChannel = res.body
     expect(videoChannel.displayName).to.equal('video channel updated')
@@ -154,8 +157,20 @@ describe('Test video channels', function () {
     expect(videoChannel.support).to.equal('video channel support text updated')
   })
 
+  it('Should list the video channel videos', async function () {
+    this.timeout(10000)
+
+    for (const server of servers) {
+      const res = await getVideoChannelVideos(server.url, server.accessToken, accountUUID, videoChannelUUID, 0, 5)
+      expect(res.body.total).to.equal(1)
+      expect(res.body.data).to.be.an('array')
+      expect(res.body.data).to.have.lengthOf(1)
+      expect(res.body.data[0].name).to.equal('my video name')
+    }
+  })
+
   it('Should delete video channel', async function () {
-    await deleteVideoChannel(servers[0].url, servers[0].accessToken, accountId, videoChannelId)
+    await deleteVideoChannel(servers[0].url, servers[0].accessToken, accountUUID, videoChannelId)
   })
 
   it('Should have video channel deleted', async function () {
diff --git a/server/tests/api/videos/video-nsfw.ts b/server/tests/api/videos/video-nsfw.ts
index 4e5ab11ce..8901f38f9 100644
--- a/server/tests/api/videos/video-nsfw.ts
+++ b/server/tests/api/videos/video-nsfw.ts
@@ -7,8 +7,9 @@ import { userLogin } from '../../utils/users/login'
 import { createUser } from '../../utils/users/users'
 import { getMyVideos } from '../../utils/videos/videos'
 import {
+  getAccountVideos,
   getConfig, getCustomConfig,
-  getMyUserInformation,
+  getMyUserInformation, getVideoChannelVideos,
   getVideosListWithToken,
   runServer,
   searchVideo,
@@ -17,6 +18,7 @@ import {
 } from '../../utils'
 import { ServerConfig } from '../../../../shared/models'
 import { CustomConfig } from '../../../../shared/models/server/custom-config.model'
+import { User } from '../../../../shared/models/users'
 
 const expect = chai.expect
 
@@ -25,6 +27,31 @@ describe('Test video NSFW policy', function () {
   let userAccessToken: string
   let customConfig: CustomConfig
 
+  function getVideosFunctions (token?: string) {
+    return getMyUserInformation(server.url, server.accessToken)
+      .then(res => {
+        const user: User = res.body
+        const videoChannelUUID = user.videoChannels[0].uuid
+        const accountUUID = user.account.uuid
+
+        if (token) {
+          return Promise.all([
+            getVideosListWithToken(server.url, token),
+            searchVideoWithToken(server.url, 'n', token),
+            getAccountVideos(server.url, token, accountUUID, 0, 5),
+            getVideoChannelVideos(server.url, token, accountUUID, videoChannelUUID, 0, 5)
+          ])
+        }
+
+        return Promise.all([
+          getVideosList(server.url),
+          searchVideo(server.url, 'n'),
+          getAccountVideos(server.url, undefined, accountUUID, 0, 5),
+          getVideoChannelVideos(server.url, undefined, accountUUID, videoChannelUUID, 0, 5)
+        ])
+      })
+  }
+
   before(async function () {
     this.timeout(50000)
 
@@ -56,7 +83,7 @@ describe('Test video NSFW policy', function () {
       const serverConfig: ServerConfig = resConfig.body
       expect(serverConfig.instance.defaultNSFWPolicy).to.equal('display')
 
-      for (const res of [ await getVideosList(server.url), await searchVideo(server.url, 'n') ]) {
+      for (const res of await getVideosFunctions()) {
         expect(res.body.total).to.equal(2)
 
         const videos = res.body.data
@@ -74,7 +101,7 @@ describe('Test video NSFW policy', function () {
       const serverConfig: ServerConfig = resConfig.body
       expect(serverConfig.instance.defaultNSFWPolicy).to.equal('do_not_list')
 
-      for (const res of [ await getVideosList(server.url), await searchVideo(server.url, 'n') ]) {
+      for (const res of await getVideosFunctions()) {
         expect(res.body.total).to.equal(1)
 
         const videos = res.body.data
@@ -91,7 +118,7 @@ describe('Test video NSFW policy', function () {
       const serverConfig: ServerConfig = resConfig.body
       expect(serverConfig.instance.defaultNSFWPolicy).to.equal('blur')
 
-      for (const res of [ await getVideosList(server.url), await searchVideo(server.url, 'n') ]) {
+      for (const res of await getVideosFunctions()) {
         expect(res.body.total).to.equal(2)
 
         const videos = res.body.data
@@ -118,12 +145,7 @@ describe('Test video NSFW policy', function () {
     })
 
     it('Should display NSFW videos with blur user NSFW policy', async function () {
-      const results = [
-        await getVideosListWithToken(server.url, userAccessToken),
-        await searchVideoWithToken(server.url, 'n', userAccessToken)
-      ]
-
-      for (const res of results) {
+      for (const res of await getVideosFunctions(userAccessToken)) {
         expect(res.body.total).to.equal(2)
 
         const videos = res.body.data
@@ -140,12 +162,7 @@ describe('Test video NSFW policy', function () {
         nsfwPolicy: 'display'
       })
 
-      const results = [
-        await getVideosListWithToken(server.url, server.accessToken),
-        await searchVideoWithToken(server.url, 'n', server.accessToken)
-      ]
-
-      for (const res of results) {
+      for (const res of await getVideosFunctions(server.accessToken)) {
         expect(res.body.total).to.equal(2)
 
         const videos = res.body.data
@@ -162,11 +179,7 @@ describe('Test video NSFW policy', function () {
         nsfwPolicy: 'do_not_list'
       })
 
-      const results = [
-        await getVideosListWithToken(server.url, server.accessToken),
-        await searchVideoWithToken(server.url, 'n', server.accessToken)
-      ]
-      for (const res of results) {
+      for (const res of await getVideosFunctions(server.accessToken)) {
         expect(res.body.total).to.equal(1)
 
         const videos = res.body.data