From e94fc29706cd8e8fd892182d4de0a3ae80a3820f Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 18 Jun 2018 10:24:53 +0200 Subject: Fix removing scheduled update --- server/controllers/api/videos/index.ts | 4 +++- server/middlewares/validators/videos.ts | 6 ++++++ server/models/video/schedule-video-update.ts | 11 +++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) (limited to 'server') diff --git a/server/controllers/api/videos/index.ts b/server/controllers/api/videos/index.ts index 79ca4699f..ca800a9a8 100644 --- a/server/controllers/api/videos/index.ts +++ b/server/controllers/api/videos/index.ts @@ -342,10 +342,12 @@ async function updateVideo (req: express.Request, res: express.Response) { updateAt: videoInfoToUpdate.scheduleUpdate.updateAt, privacy: videoInfoToUpdate.scheduleUpdate.privacy || null }, { transaction: t }) + } else if (videoInfoToUpdate.scheduleUpdate === null) { + await ScheduleVideoUpdateModel.deleteByVideoId(videoInstanceUpdated.id, t) } const isNewVideo = wasPrivateVideo && videoInstanceUpdated.privacy !== VideoPrivacy.PRIVATE - await federateVideoIfNeeded(videoInstanceUpdated, isNewVideo) + await federateVideoIfNeeded(videoInstanceUpdated, isNewVideo, t) }) logger.info('Video with name %s and uuid %s updated.', videoInstance.name, videoInstance.uuid) diff --git a/server/middlewares/validators/videos.ts b/server/middlewares/validators/videos.ts index da17b4a68..5595edf17 100644 --- a/server/middlewares/validators/videos.ts +++ b/server/middlewares/validators/videos.ts @@ -94,6 +94,9 @@ const videosAddValidator = [ body('channelId') .toInt() .custom(isIdValid).withMessage('Should have correct video channel id'), + body('scheduleUpdate') + .optional() + .customSanitizer(toValueOrNull), body('scheduleUpdate.updateAt') .optional() .custom(isDateValid).withMessage('Should have a valid schedule update date'), @@ -199,6 +202,9 @@ const videosUpdateValidator = [ .optional() .toInt() .custom(isIdValid).withMessage('Should have correct video channel id'), + body('scheduleUpdate') + .optional() + .customSanitizer(toValueOrNull), body('scheduleUpdate.updateAt') .optional() .custom(isDateValid).withMessage('Should have a valid schedule update date'), diff --git a/server/models/video/schedule-video-update.ts b/server/models/video/schedule-video-update.ts index 3cf5f6c99..1e56562e1 100644 --- a/server/models/video/schedule-video-update.ts +++ b/server/models/video/schedule-video-update.ts @@ -83,6 +83,17 @@ export class ScheduleVideoUpdateModel extends Model { return ScheduleVideoUpdateModel.findAll(query) } + static deleteByVideoId (videoId: number, t: Transaction) { + const query = { + where: { + videoId + }, + transaction: t + } + + return ScheduleVideoUpdateModel.destroy(query) + } + toFormattedJSON () { return { updateAt: this.updateAt, -- cgit v1.2.3