From cadb46d832724ea1a17b085b992142aa32e212be Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Fri, 8 Dec 2017 08:39:15 +0100
Subject: Design second video upload step

---
 server/controllers/api/videos/index.ts | 28 ++++++++++++++++------------
 server/tests/api/single-server.ts      |  5 ++++-
 server/tests/utils/videos.ts           |  2 +-
 3 files changed, 21 insertions(+), 14 deletions(-)

(limited to 'server')

diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts
index 2b70d535e..f427a25c0 100644
--- a/server/controllers/api/videos/index.ts
+++ b/server/controllers/api/videos/index.ts
@@ -15,6 +15,7 @@ import { getServerAccount } from '../../../helpers/utils'
 import { CONFIG, VIDEO_CATEGORIES, VIDEO_LANGUAGES, VIDEO_LICENCES, VIDEO_MIMETYPE_EXT, VIDEO_PRIVACIES } from '../../../initializers'
 import { database as db } from '../../../initializers/database'
 import { sendAddVideo } from '../../../lib/activitypub/send/send-add'
+import { sendCreateViewToOrigin } from '../../../lib/activitypub/send/send-create'
 import { sendUpdateVideo } from '../../../lib/activitypub/send/send-update'
 import { shareVideoByServer } from '../../../lib/activitypub/share'
 import { getVideoActivityPubUrl } from '../../../lib/activitypub/url'
@@ -39,7 +40,6 @@ import { abuseVideoRouter } from './abuse'
 import { blacklistRouter } from './blacklist'
 import { videoChannelRouter } from './channel'
 import { rateVideoRouter } from './rate'
-import { sendCreateViewToOrigin } from '../../../lib/activitypub/send/send-create'
 
 const videosRouter = express.Router()
 
@@ -154,17 +154,20 @@ async function addVideoRetryWrapper (req: express.Request, res: express.Response
     errorMessage: 'Cannot insert the video with many retries.'
   }
 
-  await retryTransactionWrapper(addVideo, options)
+  const video = await retryTransactionWrapper(addVideo, options)
 
-  // TODO : include Location of the new video -> 201
-  res.type('json').status(204).end()
+  res.json({
+    video: {
+      id: video.id,
+      uuid: video.uuid
+    }
+  }).end()
 }
 
-async function addVideo (req: express.Request, res: express.Response, videoPhysicalFile: Express.Multer.File) {
+function addVideo (req: express.Request, res: express.Response, videoPhysicalFile: Express.Multer.File) {
   const videoInfo: VideoCreate = req.body
-  let videoUUID = ''
 
-  await db.sequelize.transaction(async t => {
+  return db.sequelize.transaction(async t => {
     const sequelizeOptions = { transaction: t }
 
     const videoData = {
@@ -223,7 +226,6 @@ async function addVideo (req: express.Request, res: express.Response, videoPhysi
     const videoCreated = await video.save(sequelizeOptions)
     // Do not forget to add video channel information to the created video
     videoCreated.VideoChannel = res.locals.videoChannel
-    videoUUID = videoCreated.uuid
 
     videoFile.videoId = video.id
 
@@ -238,15 +240,17 @@ async function addVideo (req: express.Request, res: express.Response, videoPhysi
     }
 
     // Let transcoding job send the video to friends because the video file extension might change
-    if (CONFIG.TRANSCODING.ENABLED === true) return undefined
+    if (CONFIG.TRANSCODING.ENABLED === true) return videoCreated
     // Don't send video to remote servers, it is private
-    if (video.privacy === VideoPrivacy.PRIVATE) return undefined
+    if (video.privacy === VideoPrivacy.PRIVATE) return videoCreated
 
     await sendAddVideo(video, t)
     await shareVideoByServer(video, t)
-  })
 
-  logger.info('Video with name %s and uuid %s created.', videoInfo.name, videoUUID)
+    logger.info('Video with name %s and uuid %s created.', videoInfo.name, videoCreated.uuid)
+
+    return videoCreated
+  })
 }
 
 async function updateVideoRetryWrapper (req: express.Request, res: express.Response, next: express.NextFunction) {
diff --git a/server/tests/api/single-server.ts b/server/tests/api/single-server.ts
index fbb2dd1fb..ed79f9e1c 100644
--- a/server/tests/api/single-server.ts
+++ b/server/tests/api/single-server.ts
@@ -104,7 +104,10 @@ describe('Test a single server', function () {
       licence: 6,
       tags: [ 'tag1', 'tag2', 'tag3' ]
     }
-    await uploadVideo(server.url, server.accessToken, videoAttributes)
+    const res = await uploadVideo(server.url, server.accessToken, videoAttributes)
+    expect(res.body.video).to.not.be.undefined
+    expect(res.body.video.id).to.equal(1)
+    expect(res.body.video.uuid).to.have.length.above(5)
   })
 
   it('Should seed the uploaded video', async function () {
diff --git a/server/tests/utils/videos.ts b/server/tests/utils/videos.ts
index ff7da9bb2..bdf3368ac 100644
--- a/server/tests/utils/videos.ts
+++ b/server/tests/utils/videos.ts
@@ -201,7 +201,7 @@ async function testVideoImage (url: string, imageName: string, imagePath: string
   }
 }
 
-async function uploadVideo (url: string, accessToken: string, videoAttributesArg: VideoAttributes, specialStatus = 204) {
+async function uploadVideo (url: string, accessToken: string, videoAttributesArg: VideoAttributes, specialStatus = 201) {
   const path = '/api/v1/videos/upload'
   let defaultChannelId = '1'
 
-- 
cgit v1.2.3